diff options
| author | Daniil Cherednik <dan.cherednik@gmail.com> | 2022-06-10 13:50:33 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dan.cherednik@gmail.com> | 2022-06-10 13:50:33 +0300 |
| commit | c7b4bbd7ffa7caccea787cd7e0564809b84f9a18 (patch) | |
| tree | a0e1167512f7358ab418ad498525d52ee580e153 | |
| parent | 8d4bfe167dcefd335d0bce4711e93e1816ab2d48 (diff) | |
| download | ydb-c7b4bbd7ffa7caccea787cd7e0564809b84f9a18.tar.gz | |
Fix regression due to early add index table in to table operation for read request. KIKIMR-15065
ref:ba28c78cd609214dd50abac06dfc7553b999ca8e
| -rw-r--r-- | ydb/core/kqp/provider/yql_kikimr_opt_build.cpp | 4 | ||||
| -rw-r--r-- | ydb/core/kqp/ut/kqp_scheme_ut.cpp | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/ydb/core/kqp/provider/yql_kikimr_opt_build.cpp b/ydb/core/kqp/provider/yql_kikimr_opt_build.cpp index 2c5e4bd311..627ada30bc 100644 --- a/ydb/core/kqp/provider/yql_kikimr_opt_build.cpp +++ b/ydb/core/kqp/provider/yql_kikimr_opt_build.cpp @@ -132,10 +132,6 @@ bool ExploreTx(TExprBase node, TExprContext& ctx, const TKiDataSink& dataSink, T txRes.Ops.insert(node.Raw()); auto result = ExploreTx(maybeRead.Cast().World(), ctx, dataSink, txRes); - if (const auto& view = key.GetView()) { - auto indexTable = IKikimrGateway::CreateIndexTablePath(table, view.GetRef()); - txRes.TableOperations.push_back(BuildTableOpNode(cluster, indexTable, TYdbOperation::Select, read.Pos(), ctx)); - } txRes.TableOperations.push_back(BuildTableOpNode(cluster, table, TYdbOperation::Select, read.Pos(), ctx)); return result; } diff --git a/ydb/core/kqp/ut/kqp_scheme_ut.cpp b/ydb/core/kqp/ut/kqp_scheme_ut.cpp index 13c3ad4ccd..875aaa08ba 100644 --- a/ydb/core/kqp/ut/kqp_scheme_ut.cpp +++ b/ydb/core/kqp/ut/kqp_scheme_ut.cpp @@ -379,12 +379,10 @@ Y_UNIT_TEST_SUITE(KqpScheme) { { auto result = session.ExecuteDataQuery(query, TTxControl::BeginTx(), execSettings).ExtractValueSync(); - UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), write ? EStatus::SUCCESS : EStatus::SUCCESS, result.GetIssues().ToString()); + UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), (write || UseNewEngine) ? EStatus::SUCCESS : EStatus::ABORTED, result.GetIssues().ToString()); - if (write) { - auto commit = result.GetTransaction()->Commit().GetValueSync(); - UNIT_ASSERT_VALUES_EQUAL_C(commit.GetStatus(), UseNewEngine ? EStatus::SUCCESS : EStatus::SUCCESS, commit.GetIssues().ToString()); - } + auto commit = result.GetTransaction()->Commit().GetValueSync(); + UNIT_ASSERT_VALUES_EQUAL_C(commit.GetStatus(), (write || UseNewEngine) ? EStatus::SUCCESS : EStatus::BAD_REQUEST, commit.GetIssues().ToString()); } { |