diff options
| author | Daniil Cherednik <dan.cherednik@gmail.com> | 2022-06-15 13:44:01 +0300 |
|---|---|---|
| committer | Daniil Cherednik <dan.cherednik@gmail.com> | 2022-06-15 13:44:01 +0300 |
| commit | 5a3638c13b62d589c8a63c99b28dc19f666fd4a7 (patch) | |
| tree | fa53601a6d8aba38b35b6a96fe4a697ca8e050da | |
| parent | a26f504e5ded277ef98fe9b1232514eb7af628cf (diff) | |
| download | ydb-5a3638c13b62d589c8a63c99b28dc19f666fd4a7.tar.gz | |
Fix regression due to early add index table in to table operation for read request. KIKIMR-15065
REVIEW: 2631058
REVIEW: 2631946
x-ydb-stable-ref: 304aaa4bb3809793a23f50259db7274ac19e150e
| -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 f9d25268ae..3917aea405 100644 --- a/ydb/core/kqp/ut/kqp_scheme_ut.cpp +++ b/ydb/core/kqp/ut/kqp_scheme_ut.cpp @@ -368,12 +368,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()); } { |