Skip to content

fix(native): Replace raw assert() with VELOX_CHECK in PrestoToVeloxConnectorUtils #27306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tanjialiang merged 2 commits into from
Mar 11, 2026
Merged

fix(native): Replace raw assert() with VELOX_CHECK in PrestoToVeloxConnectorUtils #27306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc96870
Replace throw std::invalid_argument with VELOX_USER_FAIL in presto-na…
tanjialiang Mar 10, 2026
7ad50bb
Replace raw assert() with VELOX_CHECK in PrestoToVeloxConnectorUtils …
tanjialiang Mar 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions presto-native-execution/presto_cpp/main/PrestoExchangeSource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ std::string extractTaskId(const std::string& path) {

VLOG(1) << "Failed to extract task ID from remote split: " << path;

throw std::invalid_argument(
fmt::format("Cannot extract task ID from remote split URL: {}", path));
VELOX_FAIL("Cannot extract task ID from remote split URL: {}", path);
}

void onFinalFailure(
Expand Down
6 changes: 4 additions & 2 deletions presto-native-execution/presto_cpp/main/connectors/PrestoToVeloxConnectorUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

#include <folly/String.h>
#include "presto_cpp/main/types/TypeParser.h"
#include "velox/common/base/Exceptions.h"
#include "velox/connectors/hive/TableHandle.h"
#include "velox/type/fbhive/HiveTypeParser.h"

Expand Down Expand Up @@ -389,7 +390,8 @@ std::unique_ptr<common::Filter> combineIntegerRanges(
if (bigintFilters.size() == 2 &&
bigintFilters[0]->lower() == std::numeric_limits<int64_t>::min() &&
bigintFilters[1]->upper() == std::numeric_limits<int64_t>::max()) {
assert(bigintFilters[0]->upper() + 1 <= bigintFilters[1]->lower() - 1);
VELOX_CHECK_LE(
bigintFilters[0]->upper() + 1, bigintFilters[1]->lower() - 1);
return std::make_unique<common::NegatedBigintRange>(
bigintFilters[0]->upper() + 1,
bigintFilters[1]->lower() - 1,
Expand All @@ -398,7 +400,7 @@ std::unique_ptr<common::Filter> combineIntegerRanges(

bool allNegatedValues = true;
bool foundMaximum = false;
assert(bigintFilters.size() > 1); // true by size checks on ranges
VELOX_CHECK_GT(bigintFilters.size(), 1);
std::vector<int64_t> rejectedValues;

// check if int64 min is a rejected value
Expand Down
6 changes: 2 additions & 4 deletions presto-native-execution/presto_cpp/main/types/PrestoToVeloxExpr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ velox::variant VeloxExprConverter::getConstantValue(
std::string(valueVector->as<velox::SimpleVector<velox::StringView>>()
->valueAt(0)));
default:
throw std::invalid_argument(
fmt::format("Unexpected Block type: {}", typeKind));
VELOX_UNSUPPORTED("Unexpected Block type: {}", typeKind);
}
}

Expand Down Expand Up @@ -902,8 +901,7 @@ TypedExprPtr VeloxExprConverter::toVeloxExpr(
return toVeloxExpr(lambda);
}

throw std::invalid_argument(
"Unsupported RowExpression type: " + pexpr->_type);
VELOX_UNSUPPORTED("Unsupported RowExpression type: {}", pexpr->_type);
}

} // namespace facebook::presto
Loading