Skip to content
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

Explicitely restict TCL statements in QueryService. (KIKIMR-16294) #980

Merged
merged 1 commit into from
Jan 12, 2024
Merged

Explicitely restict TCL statements in QueryService. (KIKIMR-16294) #980

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
5 changes: 4 additions & 1 deletion ydb/core/kqp/provider/yql_kikimr_type_ann.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1655,6 +1655,7 @@ virtual TStatus HandleCreateTable(TKiCreateTable create, TExprContext& ctx) over
auto settings = NCommon::ParseCommitSettings(node, ctx);

bool isFlushCommit = false;
bool isRollback = false;
if (settings.Mode) {
auto mode = settings.Mode.Cast().Value();

Expand All @@ -1665,6 +1666,7 @@ virtual TStatus HandleCreateTable(TKiCreateTable create, TExprContext& ctx) over
}

isFlushCommit = (mode == KikimrCommitModeFlush());
isRollback = (mode == KikimrCommitModeRollback());
}

if (!settings.EnsureEpochEmpty(ctx)) {
Expand All @@ -1682,8 +1684,9 @@ virtual TStatus HandleCreateTable(TKiCreateTable create, TExprContext& ctx) over

default:
if (!isFlushCommit) {
auto opName = isRollback ? "ROLLBACK" : "COMMIT";
ctx.AddError(YqlIssue(ctx.GetPosition(node.Pos()), TIssuesIds::KIKIMR_BAD_OPERATION, TStringBuilder()
<< "COMMIT not supported inside Kikimr query"));
<< opName << " not supported inside YDB query"));

return TStatus::Error;
}
Expand Down
19 changes: 19 additions & 0 deletions ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1356,6 +1356,25 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::PRECONDITION_FAILED, result.GetIssues().ToString());
}

Y_UNIT_TEST(Tcl) {
auto kikimr = DefaultKikimrRunner();
auto db = kikimr.GetQueryClient();

auto result = db.ExecuteQuery(R"(
SELECT 1;
COMMIT;
)", TTxControl::NoTx()).ExtractValueSync();
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::GENERIC_ERROR, result.GetIssues().ToString());
UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::KIKIMR_BAD_OPERATION));

result = db.ExecuteQuery(R"(
SELECT 1;
ROLLBACK;
)", TTxControl::NoTx()).ExtractValueSync();
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::GENERIC_ERROR, result.GetIssues().ToString());
UNIT_ASSERT(HasIssue(result.GetIssues(), NYql::TIssuesIds::KIKIMR_BAD_OPERATION));
}

Y_UNIT_TEST(MaterializeTxResults) {
auto kikimr = DefaultKikimrRunner();
auto db = kikimr.GetQueryClient();
Expand Down
29 changes: 27 additions & 2 deletions ydb/core/kqp/ut/service/kqp_qs_scripts_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,14 +690,14 @@ Y_UNIT_TEST_SUITE(KqpQueryServiceScripts) {

TFetchScriptResultsResult results = db.FetchScriptResults(scriptExecutionOperation.Id(), 0).ExtractValueSync();
UNIT_ASSERT_C(results.IsSuccess(), results.GetIssues().ToString());

UNIT_ASSERT(results.GetResultSet().Truncated());
}

Y_UNIT_TEST(TestFetchMoreThanLimit) {
constexpr size_t NUMER_BATCHES = 5;
constexpr size_t ROWS_LIMIT = 20;

NKikimrConfig::TAppConfig appCfg;
appCfg.MutableTableServiceConfig()->MutableQueryLimits()->set_resultrowslimit(ROWS_LIMIT);

Expand All @@ -718,6 +718,31 @@ Y_UNIT_TEST_SUITE(KqpQueryServiceScripts) {
UNIT_ASSERT_VALUES_EQUAL(resultSet.ColumnParser(0).GetInt32(), i);
}
}

Y_UNIT_TEST(Tcl) {
auto kikimr = DefaultKikimrRunner();
auto db = kikimr.GetQueryClient();

auto op = db.ExecuteScript(R"(
SELECT 1;
COMMIT;
)").ExtractValueSync();
UNIT_ASSERT_VALUES_EQUAL_C(op.Status().GetStatus(), EStatus::SUCCESS, op.Status().GetIssues().ToString());

auto readyOp = WaitScriptExecutionOperation(op.Id(), kikimr.GetDriver());
UNIT_ASSERT_VALUES_EQUAL_C(readyOp.Status().GetStatus(), EStatus::GENERIC_ERROR, readyOp.Status().GetIssues().ToString());
UNIT_ASSERT(HasIssue(readyOp.Status().GetIssues(), NYql::TIssuesIds::KIKIMR_BAD_OPERATION));

op = db.ExecuteScript(R"(
SELECT 1;
ROLLBACK;
)").ExtractValueSync();
UNIT_ASSERT_VALUES_EQUAL_C(op.Status().GetStatus(), EStatus::SUCCESS, op.Status().GetIssues().ToString());

readyOp = WaitScriptExecutionOperation(op.Id(), kikimr.GetDriver());
UNIT_ASSERT_VALUES_EQUAL_C(readyOp.Status().GetStatus(), EStatus::GENERIC_ERROR, readyOp.Status().GetIssues().ToString());
UNIT_ASSERT(HasIssue(readyOp.Status().GetIssues(), NYql::TIssuesIds::KIKIMR_BAD_OPERATION));
}
}

} // namespace NKqp
Expand Down
Loading