Skip to content

Ensure returning is in the same block #6980

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 2 commits into from
Jul 24, 2024
Merged

Ensure returning is in the same block #6980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
523216f
Ensure returning is in the same block
ssmike Jul 23, 2024
85e9204
add ut
ssmike Jul 23, 2024
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
19 changes: 18 additions & 1 deletion ydb/core/kqp/provider/yql_kikimr_opt_build.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,14 +247,18 @@ struct TKiExploreTxResults {
}
}

void AddResult(const TExprBase& result) {
void PrepareForResult() {
if (QueryBlocks.empty()) {
AddQueryBlock();
}

if (!ConcurrentResults && QueryBlocks.back().Results.size() > 0) {
AddQueryBlock();
}
}

void AddResult(const TExprBase& result) {
PrepareForResult();

auto& curBlock = QueryBlocks.back();
curBlock.Results.push_back(result);
Expand Down Expand Up @@ -422,6 +426,10 @@ bool ExploreTx(TExprBase node, TExprContext& ctx, const TKiDataSink& dataSink, T
const auto& tableData = tablesData->ExistingTable(cluster, table);
YQL_ENSURE(tableData.Metadata);

if (!write.ReturningColumns().Empty()) {
txRes.PrepareForResult();
}

if (tableOp == TYdbOperation::UpdateOn) {
auto inputColumnsSetting = GetSetting(write.Settings().Ref(), "input_columns");
YQL_ENSURE(inputColumnsSetting);
Expand Down Expand Up @@ -482,6 +490,11 @@ bool ExploreTx(TExprBase node, TExprContext& ctx, const TKiDataSink& dataSink, T
for (const auto& item : updateStructType->GetItems()) {
updateColumns.emplace(item->GetName());
}

if (!update.ReturningColumns().Empty()) {
txRes.PrepareForResult();
}

txRes.AddUpdateOpToQueryBlock(node, tableData.Metadata, updateColumns);
if (!update.ReturningColumns().Empty()) {
txRes.AddResult(
Expand Down Expand Up @@ -517,6 +530,10 @@ bool ExploreTx(TExprBase node, TExprContext& ctx, const TKiDataSink& dataSink, T
YQL_ENSURE(tablesData);
const auto& tableData = tablesData->ExistingTable(cluster, table);
YQL_ENSURE(tableData.Metadata);
if (!del.ReturningColumns().Empty()) {
txRes.PrepareForResult();
}

txRes.AddWriteOpToQueryBlock(node, tableData.Metadata, tableOp & KikimrReadOps());
if (!del.ReturningColumns().Empty()) {
txRes.AddResult(
Expand Down
11 changes: 10 additions & 1 deletion ydb/core/kqp/ut/opt/kqp_returning_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,8 @@ Y_UNIT_TEST(ReturningColumnsOrder) {
}

auto settings = NYdb::NQuery::TExecuteQuerySettings()
.Syntax(NYdb::NQuery::ESyntax::YqlV1);
.Syntax(NYdb::NQuery::ESyntax::YqlV1)
.ConcurrentResultSets(false);
{
auto result = db.ExecuteQuery(R"(
UPSERT INTO test1 (id, v) VALUES (1, '321') RETURNING id, v;
Expand All @@ -171,6 +172,14 @@ Y_UNIT_TEST(ReturningColumnsOrder) {
CompareYson(R"([[[1];["321"]]])", FormatResultSetYson(result.GetResultSet(0)));
CompareYson(R"([[["111"];[1]]])", FormatResultSetYson(result.GetResultSet(1)));
}
{
auto it = db.StreamExecuteQuery(R"(
UPSERT INTO test1 (id, v) VALUES (2, '321') RETURNING id, v;
REPLACE INTO test1 (id, v) VALUES (2, '111') RETURNING v, id;
)", NYdb::NQuery::TTxControl::BeginTx().CommitTx(), settings).ExtractValueSync();
UNIT_ASSERT_VALUES_EQUAL_C(it.GetStatus(), EStatus::SUCCESS, it.GetIssues().ToString());
Cerr << StreamResultToYson(it);
}

}

Expand Down