Skip to content

Commit 89ab785

Browse files
ssmikezinal
authored andcommitted
Dont consider prefix indices (ydb-platform#12315) (ydb-platform#12345)
1 parent 8d9694b commit 89ab785

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

ydb/core/kqp/opt/logical/kqp_opt_log_ranges_predext.cpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,21 @@ TExprBase KqpPushExtractedPredicateToReadTable(TExprBase node, TExprContext& ctx
333333
for (auto& index : mainTableDesc.Metadata->Indexes) {
334334
if (index.Type != TIndexDescription::EType::GlobalAsync && index.State == TIndexDescription::EIndexState::Ready) {
335335
auto& tableDesc = kqpCtx.Tables->ExistingTable(kqpCtx.Cluster, mainTableDesc.Metadata->GetIndexMetadata(TString(index.Name)).first->Name);
336+
337+
bool uselessIndex = true;
338+
for (size_t i = 0; i < mainTableDesc.Metadata->KeyColumnNames.size(); ++i) {
339+
if (i >= tableDesc.Metadata->KeyColumnNames.size()) {
340+
break;
341+
}
342+
if (mainTableDesc.Metadata->KeyColumnNames[i] != tableDesc.Metadata->KeyColumnNames[i]) {
343+
uselessIndex = false;
344+
break;
345+
}
346+
}
347+
if (uselessIndex) {
348+
continue;
349+
}
350+
336351
auto buildResult = extractor->BuildComputeNode(tableDesc.Metadata->KeyColumnNames, ctx, typesCtx);
337352
bool needsJoin = calcNeedsJoin(tableDesc.Metadata);
338353

ydb/core/kqp/ut/opt/kqp_ne_ut.cpp

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4137,8 +4137,10 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
41374137
Key Int32,
41384138
Fk Int32,
41394139
Value String,
4140+
Value2 String,
41404141
PRIMARY KEY (Key, Fk),
4141-
INDEX Index GLOBAL ON (Value)
4142+
INDEX Index GLOBAL ON (Value),
4143+
INDEX ByPk GLOBAL ON (Key)
41424144
);
41434145
)").GetValueSync());
41444146

@@ -4167,6 +4169,17 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) {
41674169
)", TTxControl::BeginTx(TTxSettings::SerializableRW()), querySettings).GetValueSync();
41684170
AssertSuccessResult(result);
41694171
AssertTableReads(result, "/Root/ComplexKey", 2);
4172+
4173+
result = session.ExecuteDataQuery(R"(
4174+
--!syntax_v1
4175+
SELECT Key, Fk, Value FROM `/Root/ComplexKey`
4176+
WHERE Key = 2
4177+
ORDER BY Value DESC, Value2 DESC
4178+
LIMIT 1;
4179+
)", TTxControl::BeginTx(TTxSettings::SerializableRW()), querySettings).GetValueSync();
4180+
AssertSuccessResult(result);
4181+
AssertTableReads(result, "/Root/ComplexKey", 2);
4182+
AssertTableReads(result, "/Root/ComplexKey/ByPk/indexImplTable", 0);
41704183
}
41714184

41724185
Y_UNIT_TEST(MultipleBroadcastJoin) {

0 commit comments

Comments
 (0)