Skip to content

ensure reads are sequential (#11280) #11317

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
merged 1 commit into from
Nov 6, 2024
Merged

ensure reads are sequential (#11280) #11317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ydb/core/kqp/opt/logical/kqp_opt_log_ranges_predext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,18 @@ TMaybeNode<TCoLambda> ExtractTopSortKeySelector(TExprBase node, const NYql::TPar
return {};
}

bool IsIdLambda(TExprBase body) {
if (auto cond = body.Maybe<TCoConditionalValueBase>()) {
if (auto boolLit = cond.Cast().Predicate().Maybe<TCoBool>()) {
return boolLit.Literal().Cast().Value() == "true" && cond.Value().Maybe<TCoArgument>();
}
}
if (body.Maybe<TCoArgument>()) {
return true;
}
return false;
}

} // namespace

TExprBase KqpPushExtractedPredicateToReadTable(TExprBase node, TExprContext& ctx, const TKqpOptimizeContext& kqpCtx,
Expand Down Expand Up @@ -305,7 +317,7 @@ TExprBase KqpPushExtractedPredicateToReadTable(TExprBase node, TExprContext& ctx
const NYql::TKikimrTableDescription & tableDesc) -> TIndexComparisonKey
{
return std::make_tuple(
keySelector.IsValid() && IsSortKeyPrimary(keySelector.Cast(), tableDesc),
keySelector.IsValid() && IsSortKeyPrimary(keySelector.Cast(), tableDesc) && IsIdLambda(TCoLambda(buildResult.PrunedLambda).Body()),
buildResult.PointPrefixLen >= descriptionKeyColumns,
buildResult.PointPrefixLen >= descriptionKeyColumns ? 0 : buildResult.PointPrefixLen,
buildResult.UsedPrefixLen >= descriptionKeyColumns,
Expand Down
95 changes: 91 additions & 4 deletions ydb/core/kqp/ut/opt/kqp_ne_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4062,24 +4062,111 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
Y_UNIT_TEST(AutoChooseIndexOrderByLimit) {
TKikimrSettings settings;
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetIndexAutoChooseMode(NKikimrConfig::TTableServiceConfig_EIndexAutoChooseMode_ONLY_POINTS);
appConfig.MutableTableServiceConfig()->SetIndexAutoChooseMode(NKikimrConfig::TTableServiceConfig_EIndexAutoChooseMode_MAX_USED_PREFIX);
settings.SetAppConfig(appConfig);

TKikimrRunner kikimr(settings);

auto db = kikimr.GetTableClient();
auto session = db.CreateSession().GetValueSync().GetSession();
CreateSampleTablesWithIndex(session);
{
auto session = db.CreateSession().GetValueSync().GetSession();
AssertSuccessResult(session.ExecuteSchemeQuery(R"(
--!syntax_v1
CREATE TABLE `/Root/ComplexKey` (
Key1 Int32,
Key2 Int32,
Key3 Int32,
Value Int32,
PRIMARY KEY (Key1, Key2, Key3),
INDEX Index GLOBAL ON (Key2)
);
)").GetValueSync());

auto result2 = session.ExecuteDataQuery(R"(
REPLACE INTO `/Root/ComplexKey` (Key1, Key2, Key3, Value) VALUES
(1, 1, 101, 1),
(2, 2, 102, 1),
(2, 2, 103, 3),
(3, 3, 103, 2);
)", TTxControl::BeginTx().CommitTx()).GetValueSync();
UNIT_ASSERT_C(result2.IsSuccess(), result2.GetIssues().ToString());
}

NYdb::NTable::TExecDataQuerySettings querySettings;
querySettings.CollectQueryStats(ECollectQueryStatsMode::Profile);

{
auto result = session.ExecuteDataQuery(R"(
--!syntax_v1
SELECT Key1, Key2, Key3 FROM `/Root/ComplexKey`
WHERE Key1 = 2 and Key2 = 2;
)", TTxControl::BeginTx(TTxSettings::SerializableRW()), querySettings).GetValueSync();
AssertSuccessResult(result);
AssertTableReads(result, "/Root/ComplexKey/Index/indexImplTable", 2);
}

{
auto result = session.ExecuteDataQuery(R"(
--!syntax_v1
SELECT Key1, Key2, Key3 FROM `/Root/ComplexKey`
WHERE Key1 = 2 and Key2 = 2
ORDER BY Key1 DESC
LIMIT 1;
)", TTxControl::BeginTx(TTxSettings::SerializableRW()), querySettings).GetValueSync();
AssertSuccessResult(result);
AssertTableReads(result, "/Root/ComplexKey/Index/indexImplTable", 0);
}
}

Y_UNIT_TEST(AutoChooseIndexOrderByLambda) {
TKikimrSettings settings;
NKikimrConfig::TAppConfig appConfig;
appConfig.MutableTableServiceConfig()->SetIndexAutoChooseMode(NKikimrConfig::TTableServiceConfig_EIndexAutoChooseMode_MAX_USED_PREFIX);
settings.SetAppConfig(appConfig);

TKikimrRunner kikimr(settings);

auto db = kikimr.GetTableClient();
auto session = db.CreateSession().GetValueSync().GetSession();
{
auto session = db.CreateSession().GetValueSync().GetSession();
AssertSuccessResult(session.ExecuteSchemeQuery(R"(
--!syntax_v1
CREATE TABLE `/Root/ComplexKey` (
Key Int32,
Fk Int32,
Value String,
PRIMARY KEY (Key, Fk),
INDEX Index GLOBAL ON (Value)
);
)").GetValueSync());

auto result2 = session.ExecuteDataQuery(R"(
REPLACE INTO `/Root/ComplexKey` (Key, Fk, Value) VALUES
(null, null, "NullValue"),
(1, 101, "Value1"),
(2, 102, "Value1"),
(2, 103, "Value3"),
(3, 103, "Value2"),
(4, 104, "Value2"),
(5, 105, "Value3");
)", TTxControl::BeginTx().CommitTx()).GetValueSync();
UNIT_ASSERT_C(result2.IsSuccess(), result2.GetIssues().ToString());
}

NYdb::NTable::TExecDataQuerySettings querySettings;
querySettings.CollectQueryStats(ECollectQueryStatsMode::Profile);

auto result = session.ExecuteDataQuery(R"(
--!syntax_v1
SELECT Fk, Key FROM `/Root/SecondaryKeys` WHERE Fk = 1 ORDER BY Key DESC LIMIT 1;
SELECT Key, Fk, Value FROM `/Root/ComplexKey`
WHERE Key = 2
ORDER BY Value DESC
LIMIT 1;
)", TTxControl::BeginTx(TTxSettings::SerializableRW()), querySettings).GetValueSync();
AssertSuccessResult(result);
AssertTableReads(result, "/Root/SecondaryKeys/Index/indexImplTable", 0);
AssertTableReads(result, "/Root/ComplexKey", 2);
}

Y_UNIT_TEST(MultipleBroadcastJoin) {
Expand Down
Loading