Skip to content

Commit bd72067

Browse files
Merge 4926d50 into 5e4ed6c
2 parents 5e4ed6c + 4926d50 commit bd72067

File tree

1 file changed

+32
-2
lines changed

1 file changed

+32
-2
lines changed

ydb/core/viewer/json_query.h

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class TJsonQuery : public TViewerPipeClient<TJsonQuery> {
3939
TString Stats;
4040
TString Syntax;
4141
TString QueryId;
42+
TString TransactionMode;
4243
bool Direct = false;
4344
bool IsBase64Encode = true;
4445

@@ -82,6 +83,7 @@ class TJsonQuery : public TViewerPipeClient<TJsonQuery> {
8283
Schema = StringToSchemaType(schemaStr);
8384
Syntax = params.Get("syntax");
8485
QueryId = params.Get("query_id");
86+
TransactionMode = params.Get("transaction_mode");
8587
Direct = FromStringWithDefault<bool>(params.Get("direct"), Direct);
8688
IsBase64Encode = FromStringWithDefault<bool>(params.Get("base64"), true);
8789
}
@@ -97,6 +99,7 @@ class TJsonQuery : public TViewerPipeClient<TJsonQuery> {
9799
Action = Action.empty() ? requestData["action"].GetStringSafe({}) : Action;
98100
Syntax = Syntax.empty() ? requestData["syntax"].GetStringSafe({}) : Syntax;
99101
QueryId = QueryId.empty() ? requestData["query_id"].GetStringSafe({}) : QueryId;
102+
TransactionMode = TransactionMode.empty() ? requestData["transaction_mode"].GetStringSafe({}) : TransactionMode;
100103
}
101104
return success;
102105
}
@@ -202,6 +205,22 @@ class TJsonQuery : public TViewerPipeClient<TJsonQuery> {
202205
Send(NKqp::MakeKqpProxyID(SelfId().NodeId()), event.release());
203206
}
204207

208+
void SetTransactionMode(NKikimrKqp::TQueryRequest& request) {
209+
if (TransactionMode == "serializable-read-write") {
210+
request.mutable_txcontrol()->mutable_begin_tx()->mutable_serializable_read_write();
211+
request.mutable_txcontrol()->set_commit_tx(true);
212+
} else if (TransactionMode == "online-read-only") {
213+
request.mutable_txcontrol()->mutable_begin_tx()->mutable_online_read_only();
214+
request.mutable_txcontrol()->set_commit_tx(true);
215+
} else if (TransactionMode == "stale-read-only") {
216+
request.mutable_txcontrol()->mutable_begin_tx()->mutable_stale_read_only();
217+
request.mutable_txcontrol()->set_commit_tx(true);
218+
} else if (TransactionMode == "snapshot-read-only") {
219+
request.mutable_txcontrol()->mutable_begin_tx()->mutable_snapshot_read_only();
220+
request.mutable_txcontrol()->set_commit_tx(true);
221+
}
222+
}
223+
205224
void HandleReply(NKqp::TEvKqp::TEvCreateSessionResponse::TPtr& ev) {
206225
if (ev->Get()->Record.GetYdbStatus() != Ydb::StatusIds::SUCCESS) {
207226
return ReplyAndPassAway(
@@ -236,6 +255,7 @@ class TJsonQuery : public TViewerPipeClient<TJsonQuery> {
236255
request.SetAction(NKikimrKqp::QUERY_ACTION_EXECUTE);
237256
request.SetType(NKikimrKqp::QUERY_TYPE_SQL_GENERIC_QUERY);
238257
request.SetKeepSession(false);
258+
SetTransactionMode(request);
239259
} else if (Action == "explain-query") {
240260
request.SetAction(NKikimrKqp::QUERY_ACTION_EXPLAIN);
241261
request.SetType(NKikimrKqp::QUERY_TYPE_SQL_GENERIC_QUERY);
@@ -247,9 +267,8 @@ class TJsonQuery : public TViewerPipeClient<TJsonQuery> {
247267
} else if (Action == "execute-data") {
248268
request.SetAction(NKikimrKqp::QUERY_ACTION_EXECUTE);
249269
request.SetType(NKikimrKqp::QUERY_TYPE_SQL_DML);
250-
request.mutable_txcontrol()->mutable_begin_tx()->mutable_serializable_read_write();
251-
request.mutable_txcontrol()->set_commit_tx(true);
252270
request.SetKeepSession(false);
271+
SetTransactionMode(request);
253272
} else if (Action == "explain" || Action == "explain-ast" || Action == "explain-data") {
254273
request.SetAction(NKikimrKqp::QUERY_ACTION_EXPLAIN);
255274
request.SetType(NKikimrKqp::QUERY_TYPE_SQL_DML);
@@ -685,6 +704,17 @@ YAML::Node TJsonRequestSwagger<TJsonQuery>::GetSwagger() {
685704
type: string
686705
enum: [profile, full]
687706
required: false
707+
- name: transaction_mode
708+
in: query
709+
description: >
710+
transaction mode:
711+
* `serializable-read-write`
712+
* `online-read-only`
713+
* `stale-read-only`
714+
* `snapshot-read-only`
715+
type: string
716+
enum: [serializable-read-write, online-read-only, stale-read-only, snapshot-read-only]
717+
required: false
688718
- name: direct
689719
in: query
690720
description: force processing query on current node

0 commit comments

Comments
 (0)