Skip to content

[query] Support SCAN_METHOD hint #211

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

Open
schallert wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[query] Support SCAN_METHOD hint #211

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec82dc7
[query] Support SCAN_METHOD hint
schallert Feb 20, 2025
5f9ca68
Don't allow "auto" for scan method
schallert Feb 20, 2025
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
14 changes: 13 additions & 1 deletion backend/query/query_validator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ constexpr absl::string_view kHintTableScanGroupByScanOptimization =
constexpr absl::string_view kUseAdditionalParallelism =
"use_additional_parallelism";

constexpr absl::string_view kScanMethod = "scan_method";
constexpr absl::string_view kScanMethodBatch = "batch";
constexpr absl::string_view kScanMethodRow = "row";

// Lock scanned ranges
constexpr absl::string_view kHintLockScannedRange = "lock_scanned_ranges";
constexpr absl::string_view kHintLockScannedRangeShared = "shared";
Expand Down Expand Up @@ -210,7 +214,7 @@ absl::Status QueryValidator::CheckSpannerHintName(
zetasql_base::StringViewCaseEqual>>{
{zetasql::RESOLVED_TABLE_SCAN,
{kHintForceIndex, kHintTableScanGroupByScanOptimization,
kHintIndexStrategy}},
kHintIndexStrategy, kScanMethod}},
{zetasql::RESOLVED_JOIN_SCAN,
{kHintJoinTypeDeprecated, kHintJoinMethod, kHashJoinBuildSide,
kHintJoinForceOrder, kHashJoinExecution}},
Expand All @@ -236,6 +240,7 @@ absl::Status QueryValidator::CheckSpannerHintName(
kHintAllowSearchIndexesInTransaction,
kRequireEnhanceQuery,
kEnhanceQueryTimeoutMs,
kScanMethod,
}},
{zetasql::RESOLVED_SUBQUERY_EXPR,
{kHintJoinTypeDeprecated, kHintJoinMethod, kHashJoinBuildSide,
Expand Down Expand Up @@ -298,6 +303,7 @@ absl::Status QueryValidator::CheckHintValue(
{kHintAllowSearchIndexesInTransaction, zetasql::types::BoolType()},
{kRequireEnhanceQuery, zetasql::types::BoolType()},
{kEnhanceQueryTimeoutMs, zetasql::types::Int64Type()},
{kScanMethod, zetasql::types::StringType()},
}};

const auto& iter = supported_hint_types->find(name);
Expand Down Expand Up @@ -393,6 +399,12 @@ absl::Status QueryValidator::CheckHintValue(
kHintIndexStrategyForceIndexUnion)) {
return error::InvalidHintValue(name, value.DebugString());
}
} else if (absl::EqualsIgnoreCase(name, kScanMethod)) {
const std::string& string_value = value.string_value();
if (!(absl::EqualsIgnoreCase(string_value, kScanMethodBatch) ||
absl::EqualsIgnoreCase(string_value, kScanMethodRow))) {
return error::InvalidHintValue(name, value.DebugString());
}
}
return absl::OkStatus();
}
Expand Down