aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsabdenovch <sabdenovch@yandex-team.com>2024-11-19 00:14:00 +0300
committersabdenovch <sabdenovch@yandex-team.com>2024-11-19 00:23:23 +0300
commit5ddee2c0eae63bf00af3f8292af86f12b8ea566a (patch)
treec6434a9b5eb2420ab73c9e54c4a72f46762f8d44
parent56a3c599f48eeba1f9c5b318a2b2e600a0aad4a2 (diff)
downloadydb-5ddee2c0eae63bf00af3f8292af86f12b8ea566a.tar.gz
Cosmetics
commit_hash:d90aaaa0da419f9bda8492506c27ff3759b97c23
-rw-r--r--yt/yt/client/api/client_common.h36
-rw-r--r--yt/yt/client/driver/command-inl.h2
2 files changed, 19 insertions, 19 deletions
diff --git a/yt/yt/client/api/client_common.h b/yt/yt/client/api/client_common.h
index a5569fb074..373d4ac61b 100644
--- a/yt/yt/client/api/client_common.h
+++ b/yt/yt/client/api/client_common.h
@@ -141,20 +141,20 @@ struct TSelectRowsOptionsBase
, public TSuppressableAccessTrackingOptions
{
//! Limits range expanding.
- ui64 RangeExpansionLimit = 200000;
- //! Limits maximum parallel subqueries.
- int MaxSubqueries = std::numeric_limits<int>::max();
+ ui64 RangeExpansionLimit = 200'000;
//! Limits parallel subqueries by row count.
- ui64 MinRowCountPerSubquery = 100'000;
+ i64 MinRowCountPerSubquery = 100'000;
//! Path in Cypress with UDFs.
std::optional<TString> UdfRegistryPath;
+ //! Limits maximum parallel subqueries.
+ int MaxSubqueries = std::numeric_limits<int>::max();
+ //! Query language syntax version.
+ int SyntaxVersion = 1;
//! If |true| then logging is more verbose.
bool VerboseLogging = false;
// COMPAT(lukyan)
//! Use fixed and rewritten range inference.
bool NewRangeInference = true;
- //! Query language syntax version.
- int SyntaxVersion = 1;
};
DEFINE_ENUM(EExecutionBackend,
@@ -169,16 +169,8 @@ struct TSelectRowsOptions
std::optional<i64> InputRowLimit;
//! If null then connection defaults are used.
std::optional<i64> OutputRowLimit;
- //! Allow queries without any condition on key columns.
- bool AllowFullScan = true;
- //! Allow queries with join condition which implies foreign query with IN operator.
- bool AllowJoinWithoutIndex = false;
//! Execution pool.
std::optional<TString> ExecutionPool;
- //! If |true| then incomplete result would lead to a failure.
- bool FailOnIncompleteResult = true;
- //! Enables generated code caching.
- bool EnableCodeCache = true;
//! Used to prioritize requests.
TUserWorkloadDescriptor WorkloadDescriptor;
//! Memory limit per execution node.
@@ -189,10 +181,6 @@ struct TSelectRowsOptions
NYson::TYsonString PlaceholderValues;
//! Native or WebAssembly execution backend.
std::optional<EExecutionBackend> ExecutionBackend;
- //! Enables canonical SQL behaviour for relational operators, i.e. null </=/> value -> null.
- bool UseCanonicalNullRelations = false;
- //! Merge versioned rows from different stores when reading.
- bool MergeVersionedRows = true;
//! Expected schemas for tables in a query (used for replica fallback in replicated tables).
using TExpectedTableSchemas = THashMap<NYPath::TYPath, NTableClient::TTableSchemaPtr>;
TExpectedTableSchemas ExpectedTableSchemas;
@@ -200,6 +188,18 @@ struct TSelectRowsOptions
NTableClient::TVersionedReadOptions VersionedReadOptions;
//! Explicitly allow or forbid the usage of row cache.
std::optional<bool> UseLookupCache;
+ //! Allow queries without any condition on key columns.
+ bool AllowFullScan = true;
+ //! Allow queries with join condition which implies foreign query with IN operator.
+ bool AllowJoinWithoutIndex = false;
+ //! If |true| then incomplete result would lead to a failure.
+ bool FailOnIncompleteResult = true;
+ //! Enables generated code caching.
+ bool EnableCodeCache = true;
+ //! Enables canonical SQL behaviour for relational operators, i.e. null </=/> value -> null.
+ bool UseCanonicalNullRelations = false;
+ //! Merge versioned rows from different stores when reading.
+ bool MergeVersionedRows = true;
};
struct TFallbackReplicaOptions
diff --git a/yt/yt/client/driver/command-inl.h b/yt/yt/client/driver/command-inl.h
index 4b595a57df..54f0d40f4e 100644
--- a/yt/yt/client/driver/command-inl.h
+++ b/yt/yt/client/driver/command-inl.h
@@ -392,7 +392,7 @@ void TSelectRowsCommandBase<
.GreaterThan(0)
.Optional(/*init*/ false);
- registrar.template ParameterWithUniversalAccessor<ui64>(
+ registrar.template ParameterWithUniversalAccessor<i64>(
"min_row_count_per_subquery",
[] (TThis* command) -> auto& {
return command->Options.MinRowCountPerSubquery;