Skip to content

Commit c45eac2

Browse files
GazizonokiGazizonoki
authored
[C++ SDK] Supported topic-to-table transactions in Query Service (#15984)
1 parent 24a3abb commit c45eac2

File tree

43 files changed

+2063
-775
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2063
-775
lines changed

‎ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,7 +1142,7 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
11421142

11431143
{
11441144
const TString query = "UPDATE TwoShard SET Value2 = 0";
1145-
auto result = transaction.GetSession().ExecuteQuery(query, TTxControl::Tx(transaction.GetId())).ExtractValueSync();
1145+
auto result = transaction.GetSession().ExecuteQuery(query, TTxControl::Tx(transaction)).ExtractValueSync();
11461146
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
11471147
}
11481148

@@ -1196,7 +1196,7 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
11961196
UNIT_ASSERT(transaction->IsActive());
11971197

11981198
const TString query2 = "UPDATE KeyValue SET Value = 'Vic'";
1199-
auto result2 = session.ExecuteQuery(query2, TTxControl::Tx(transaction->GetId())).ExtractValueSync();
1199+
auto result2 = session.ExecuteQuery(query2, TTxControl::Tx(*transaction)).ExtractValueSync();
12001200
UNIT_ASSERT_VALUES_EQUAL_C(result2.GetStatus(), EStatus::SUCCESS, result2.GetIssues().ToString());
12011201
auto transaction2 = result2.GetTransaction();
12021202
UNIT_ASSERT(transaction2->IsActive());
@@ -1264,7 +1264,7 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
12641264
checkResult(R"([[[1u];["One"];[-1]];[[2u];["Two"];[0]];[[3u];["Three"];[1]];[[4000000001u];["BigOne"];[-1]];[[4000000002u];["BigTwo"];[0]];[[4000000003u];["BigThree"];[1]]])");
12651265

12661266
result = session.ExecuteQuery("UPDATE TwoShard SET Value2 = 1 WHERE Key = 1",
1267-
TTxControl::Tx(transaction->GetId()).CommitTx()).ExtractValueSync();;
1267+
TTxControl::Tx(*transaction).CommitTx()).ExtractValueSync();;
12681268
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
12691269
UNIT_ASSERT(!result.GetTransaction());
12701270

@@ -4311,7 +4311,7 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
43114311
result = session.ExecuteQuery(R"(
43124312
INSERT INTO `/Root/DataShard` (Col1, Col2, Col3) VALUES
43134313
(2u, "test2", 2);
4314-
)", NYdb::NQuery::TTxControl::Tx(tx->GetId()).CommitTx()).ExtractValueSync();
4314+
)", NYdb::NQuery::TTxControl::Tx(*tx).CommitTx()).ExtractValueSync();
43154315
UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());
43164316
}
43174317

@@ -4328,7 +4328,7 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
43284328
result = session.ExecuteQuery(R"(
43294329
INSERT INTO `/Root/ColumnShard` (Col1, Col2, Col3) VALUES
43304330
(4u, "test2", 4);
4331-
)", NYdb::NQuery::TTxControl::Tx(tx->GetId()).CommitTx()).ExtractValueSync();
4331+
)", NYdb::NQuery::TTxControl::Tx(*tx).CommitTx()).ExtractValueSync();
43324332
UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());
43334333
}
43344334

@@ -5030,7 +5030,7 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
50305030

50315031
result = session.ExecuteQuery(fmt::format(R"(
50325032
INSERT INTO `/Root/DataShard` (Col1, Col2) VALUES ({}u, 0);
5033-
)", index), NYdb::NQuery::TTxControl::Tx(tx->GetId()).CommitTx()).ExtractValueSync();
5033+
)", index), NYdb::NQuery::TTxControl::Tx(*tx).CommitTx()).ExtractValueSync();
50345034
if (GetIsOlap()) {
50355035
// https://github.com/ydb-platform/ydb/issues/14383
50365036
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::BAD_REQUEST, result.GetIssues().ToString());
@@ -5310,22 +5310,22 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
53105310
auto prepareResult = session2.ExecuteQuery(R"(
53115311
REPLACE INTO `/Root/DataShard` (Col1, Col2, Col3) VALUES
53125312
(10u, "test1", 10), (20u, "test2", 11), (2147483647u, "test3", 12), (2147483640u, NULL, 13);
5313-
)", TTxControl::Tx(tx.GetId()), TExecuteQuerySettings().ClientTimeout(TDuration::MilliSeconds(5000))).ExtractValueSync();
5313+
)", TTxControl::Tx(tx), TExecuteQuerySettings().ClientTimeout(TDuration::MilliSeconds(5000))).ExtractValueSync();
53145314
UNIT_ASSERT_C(prepareResult.IsSuccess(), prepareResult.GetIssues().ToString());
53155315
}
53165316

53175317
{
53185318
auto prepareResult = session2.ExecuteQuery(R"(
53195319
REPLACE INTO `/Root/DataShard2` (Col1, Col2, Col3) VALUES
53205320
(11u, "test1", 10), (21u, "test2", 11), (2147483646u, "test3", 12), (2147483641u, NULL, 13);
5321-
)", TTxControl::Tx(tx.GetId()), TExecuteQuerySettings().ClientTimeout(TDuration::MilliSeconds(5000))).ExtractValueSync();
5321+
)", TTxControl::Tx(tx), TExecuteQuerySettings().ClientTimeout(TDuration::MilliSeconds(5000))).ExtractValueSync();
53225322
UNIT_ASSERT_C(prepareResult.IsSuccess(), prepareResult.GetIssues().ToString());
53235323
}
53245324

53255325
{
53265326
auto it = session2.StreamExecuteQuery(R"(
53275327
SELECT COUNT(*) FROM `/Root/DataShard`;
5328-
)", TTxControl::Tx(tx.GetId()), TExecuteQuerySettings().ClientTimeout(TDuration::MilliSeconds(5000))).ExtractValueSync();
5328+
)", TTxControl::Tx(tx), TExecuteQuerySettings().ClientTimeout(TDuration::MilliSeconds(5000))).ExtractValueSync();
53295329
UNIT_ASSERT_VALUES_EQUAL_C(it.GetStatus(), EStatus::SUCCESS, it.GetIssues().ToString());
53305330
TString output = StreamResultToYson(it);
53315331
CompareYson(
@@ -5336,15 +5336,15 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
53365336
{
53375337
auto prepareResult = session2.ExecuteQuery(R"(
53385338
SELECT * FROM `/Root/DataShard2`;
5339-
)", TTxControl::Tx(tx.GetId()), TExecuteQuerySettings().ClientTimeout(TDuration::MilliSeconds(5000))).ExtractValueSync();
5339+
)", TTxControl::Tx(tx), TExecuteQuerySettings().ClientTimeout(TDuration::MilliSeconds(5000))).ExtractValueSync();
53405340
UNIT_ASSERT_C(prepareResult.IsSuccess(), prepareResult.GetIssues().ToString());
53415341
}
53425342

53435343
{
53445344
auto prepareResult = session2.ExecuteQuery(R"(
53455345
REPLACE INTO `/Root/DataShard2` (Col1, Col2, Col3) VALUES
53465346
(11u, "test1", 10), (21u, "test2", 11), (2147483646u, "test3", 12), (2147483641u, NULL, 13);
5347-
)", TTxControl::Tx(tx.GetId()), TExecuteQuerySettings().ClientTimeout(TDuration::MilliSeconds(5000))).ExtractValueSync();
5347+
)", TTxControl::Tx(tx), TExecuteQuerySettings().ClientTimeout(TDuration::MilliSeconds(5000))).ExtractValueSync();
53485348
UNIT_ASSERT_C(prepareResult.IsSuccess(), prepareResult.GetIssues().ToString());
53495349
}
53505350

‎ydb/core/kqp/ut/tx/kqp_locks_ut.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ Y_UNIT_TEST_SUITE(KqpLocks) {
302302

303303
result = session.ExecuteQuery(R"sql(
304304
INSERT INTO `/Root/ColumnShard` (Col1, Col2, Col3) VALUES (2u, 1, "test");
305-
)sql", NYdb::NQuery::TTxControl::Tx(tx->GetId()).CommitTx()).ExtractValueSync();
305+
)sql", NYdb::NQuery::TTxControl::Tx(*tx).CommitTx()).ExtractValueSync();
306306
UNIT_ASSERT_C(!result.IsSuccess(), result.GetIssues().ToString());
307307
UNIT_ASSERT_STRING_CONTAINS_C(result.GetIssues().ToString(), "Transaction locks invalidated. Table: `/Root/DataShard`", result.GetIssues().ToString());
308308
}

‎ydb/core/kqp/ut/tx/kqp_sink_locks_ut.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Y_UNIT_TEST_SUITE(KqpSinkLocks) {
4040
result = session1.ExecuteQuery(Q_(R"(
4141
UPSERT INTO `/Root/Test` (Group, Name, Comment)
4242
VALUES (11U, "Sergey", "BadRow");
43-
)"), TTxControl::Tx(tx1->GetId()).CommitTx()).ExtractValueSync();
43+
)"), TTxControl::Tx(*tx1).CommitTx()).ExtractValueSync();
4444
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::ABORTED, result.GetIssues().ToString());
4545
result.GetIssues().PrintTo(Cerr);
4646
UNIT_ASSERT_C(HasIssue(result.GetIssues(), NYql::TIssuesIds::KIKIMR_LOCKS_INVALIDATED,
@@ -145,7 +145,7 @@ Y_UNIT_TEST_SUITE(KqpSinkLocks) {
145145

146146
result = session1.ExecuteQuery(Q_(R"(
147147
SELECT "Nothing";
148-
)"), TTxControl::Tx(tx1->GetId()).CommitTx()).ExtractValueSync();
148+
)"), TTxControl::Tx(*tx1).CommitTx()).ExtractValueSync();
149149
UNIT_ASSERT_C(result.IsSuccess(), result.GetIssues().ToString());
150150
}
151151
};
@@ -190,7 +190,7 @@ Y_UNIT_TEST_SUITE(KqpSinkLocks) {
190190
result = session1.ExecuteQuery(Q1_(R"(
191191
UPSERT INTO Test (Group, Name, Amount) VALUES
192192
(11, "Session1", 1);
193-
)"), TTxControl::Tx(tx1->GetId()).CommitTx()).ExtractValueSync();
193+
)"), TTxControl::Tx(*tx1).CommitTx()).ExtractValueSync();
194194
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::ABORTED, result.GetIssues().ToString());
195195
result.GetIssues().PrintTo(Cerr);
196196
UNIT_ASSERT_C(HasIssue(result.GetIssues(), NYql::TIssuesIds::KIKIMR_LOCKS_INVALIDATED,
@@ -249,7 +249,7 @@ Y_UNIT_TEST_SUITE(KqpSinkLocks) {
249249
250250
UPSERT INTO Test (Group, Name, Amount) VALUES
251251
(11, "Session1", 1);
252-
)"), TTxControl::Tx(tx1->GetId()).CommitTx()).ExtractValueSync();
252+
)"), TTxControl::Tx(*tx1).CommitTx()).ExtractValueSync();
253253
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::ABORTED, result.GetIssues().ToString());
254254
result.GetIssues().PrintTo(Cerr);
255255
UNIT_ASSERT_C(HasIssue(result.GetIssues(), NYql::TIssuesIds::KIKIMR_LOCKS_INVALIDATED,
@@ -305,7 +305,7 @@ Y_UNIT_TEST_SUITE(KqpSinkLocks) {
305305
{
306306
result = session1.ExecuteQuery(Q1_(R"(
307307
SELECT * FROM Test WHERE Group = 11;
308-
)"), TTxControl::Tx(tx1->GetId())).ExtractValueSync();
308+
)"), TTxControl::Tx(*tx1)).ExtractValueSync();
309309
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
310310
CompareYson(R"([[[2u];#;11u;"TEST"]])", FormatResultSetYson(result.GetResultSet(0)));
311311
}

‎ydb/core/kqp/ut/tx/kqp_sink_mvcc_ut.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Y_UNIT_TEST_SUITE(KqpSinkMvcc) {
4444
Sleep(TDuration::Seconds(1));
4545
auto result = session1.ExecuteQuery(Q_(R"(
4646
SELECT * FROM `/Root/KV` WHERE Key = 1u OR Key = 4000000001u;
47-
)"), TTxControl::Tx(tx->GetId())).ExtractValueSync();
47+
)"), TTxControl::Tx(*tx)).ExtractValueSync();
4848
if (result.GetStatus() == EStatus::SUCCESS)
4949
continue;
5050

@@ -113,7 +113,7 @@ Y_UNIT_TEST_SUITE(KqpSinkMvcc) {
113113

114114
result = session1.ExecuteQuery(Q_(R"(
115115
SELECT * FROM `/Root/KV` WHERE Key = 1u;
116-
)"), TTxControl::Tx(tx->GetId())).ExtractValueSync();
116+
)"), TTxControl::Tx(*tx)).ExtractValueSync();
117117

118118
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
119119
CompareYson(R"([
@@ -122,7 +122,7 @@ Y_UNIT_TEST_SUITE(KqpSinkMvcc) {
122122

123123
result = session1.ExecuteQuery(Q_(R"(
124124
SELECT * FROM `/Root/KV` WHERE Key = 2u OR Key = 4000000002u ORDER BY Key;
125-
)"), TTxControl::Tx(tx->GetId()).CommitTx()).ExtractValueSync();
125+
)"), TTxControl::Tx(*tx).CommitTx()).ExtractValueSync();
126126

127127
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
128128
CompareYson(R"([
@@ -172,7 +172,7 @@ Y_UNIT_TEST_SUITE(KqpSinkMvcc) {
172172

173173
result = session1.ExecuteQuery(Q_(R"(
174174
UPSERT INTO `/Root/KV` (Key, Value) VALUES (1u, "TwiceChangedOne");
175-
)"), TTxControl::Tx(tx->GetId()).CommitTx()).ExtractValueSync();
175+
)"), TTxControl::Tx(*tx).CommitTx()).ExtractValueSync();
176176

177177
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::ABORTED, result.GetIssues().ToString());
178178
UNIT_ASSERT_C(HasIssue(result.GetIssues(), NYql::TIssuesIds::KIKIMR_LOCKS_INVALIDATED), result.GetIssues().ToString());
@@ -224,7 +224,7 @@ Y_UNIT_TEST_SUITE(KqpSinkMvcc) {
224224
result = session1.ExecuteQuery(Q_(R"(
225225
UPDATE `/Root/KV` SET Value = "Something" WHERE Key = 1u;
226226
UPDATE `/Root/KV2` SET Value = "AnotherString" WHERE Key = 101u;
227-
)"), TTxControl::Tx(tx->GetId()).CommitTx()).ExtractValueSync();
227+
)"), TTxControl::Tx(*tx).CommitTx()).ExtractValueSync();
228228

229229
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::ABORTED, result.GetIssues().ToString());
230230
UNIT_ASSERT_C(HasIssue(result.GetIssues(), NYql::TIssuesIds::KIKIMR_LOCKS_INVALIDATED), result.GetIssues().ToString());
@@ -271,7 +271,7 @@ Y_UNIT_TEST_SUITE(KqpSinkMvcc) {
271271

272272
result = session1.ExecuteQuery(Q_(R"(
273273
SELECT * FROM `/Root/KV` WHERE Key = 2u OR Key = 4000000002u ORDER BY Key;
274-
)"), TTxControl::Tx(tx->GetId())).ExtractValueSync();
274+
)"), TTxControl::Tx(*tx)).ExtractValueSync();
275275

276276
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
277277
CompareYson(R"([
@@ -281,7 +281,7 @@ Y_UNIT_TEST_SUITE(KqpSinkMvcc) {
281281

282282
result = session1.ExecuteQuery(Q_(R"(
283283
UPSERT INTO `/Root/KV` (Key, Value) VALUES (2u, "TwiceChangedTwo");
284-
)"), TTxControl::Tx(tx->GetId()).CommitTx()).ExtractValueSync();
284+
)"), TTxControl::Tx(*tx).CommitTx()).ExtractValueSync();
285285

286286
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::ABORTED, result.GetIssues().ToString());
287287
UNIT_ASSERT_C(HasIssue(result.GetIssues(), NYql::TIssuesIds::KIKIMR_LOCKS_INVALIDATED), result.GetIssues().ToString());

‎ydb/core/kqp/ut/tx/kqp_sink_tx_ut.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Y_UNIT_TEST_SUITE(KqpSinkTx) {
7676

7777
auto result = session.ExecuteQuery(Q_(R"(
7878
UPSERT INTO `/Root/KV` (Key, Value) VALUES (10u, "New");
79-
)"), TTxControl::Tx(tx.GetId())).ExtractValueSync();
79+
)"), TTxControl::Tx(tx)).ExtractValueSync();
8080
UNIT_ASSERT(result.IsSuccess());
8181

8282
result = session.ExecuteQuery(Q_(R"(
@@ -143,7 +143,7 @@ Y_UNIT_TEST_SUITE(KqpSinkTx) {
143143

144144
result = session.ExecuteQuery(Q_(R"(
145145
UPDATE `/Root/KV` SET Value = "third" WHERE Key = 4;
146-
)"), TTxControl::Tx(tx->GetId())).ExtractValueSync();
146+
)"), TTxControl::Tx(*tx)).ExtractValueSync();
147147
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
148148

149149
auto commitResult = tx->Commit().ExtractValueSync();
@@ -177,13 +177,13 @@ Y_UNIT_TEST_SUITE(KqpSinkTx) {
177177

178178
auto result = session.ExecuteQuery(Q_(R"(
179179
INSERT INTO `/Root/KV` (Key, Value) VALUES (1u, "New");
180-
)"), TTxControl::Tx(tx.GetId())).ExtractValueSync();
180+
)"), TTxControl::Tx(tx)).ExtractValueSync();
181181
result.GetIssues().PrintTo(Cerr);
182182
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::PRECONDITION_FAILED, result.GetIssues().ToString());
183183

184184
result = session.ExecuteQuery(Q_(R"(
185185
UPSERT INTO `/Root/KV` (Key, Value) VALUES (1u, "New");
186-
)"), TTxControl::Tx(tx.GetId())).ExtractValueSync();
186+
)"), TTxControl::Tx(tx)).ExtractValueSync();
187187
result.GetIssues().PrintTo(Cerr);
188188
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::NOT_FOUND, result.GetIssues().ToString());
189189
}
@@ -214,12 +214,12 @@ Y_UNIT_TEST_SUITE(KqpSinkTx) {
214214

215215
auto result = session.ExecuteQuery(R"(
216216
SELECT * FROM `/Root/KV`
217-
)", TTxControl::Tx(tx.GetId())).ExtractValueSync();
217+
)", TTxControl::Tx(tx)).ExtractValueSync();
218218
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
219219

220220
result = session.ExecuteQuery(R"(
221221
UPSERT INTO `/Root/KV` (Key, Value) VALUES (1u, "New");
222-
)", TTxControl::Tx(tx.GetId()).CommitTx()).ExtractValueSync();
222+
)", TTxControl::Tx(tx).CommitTx()).ExtractValueSync();
223223
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
224224

225225
result = session.ExecuteQuery(R"(
@@ -319,7 +319,7 @@ Y_UNIT_TEST_SUITE(KqpSinkTx) {
319319
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
320320

321321
result = session.ExecuteQuery(readQuery,
322-
TTxControl::Tx(tx->GetId()).CommitTx()).ExtractValueSync();
322+
TTxControl::Tx(*tx).CommitTx()).ExtractValueSync();
323323
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
324324
CompareYson(readResult, FormatResultSetYson(result.GetResultSet(0)));
325325
}
@@ -357,7 +357,7 @@ Y_UNIT_TEST_SUITE(KqpSinkTx) {
357357
UNIT_ASSERT(tx.IsActive());
358358

359359
auto result = session.ExecuteQuery(readQuery,
360-
TTxControl::Tx(tx.GetId())).ExtractValueSync();
360+
TTxControl::Tx(tx)).ExtractValueSync();
361361
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
362362
CompareYson(readResult, FormatResultSetYson(result.GetResultSet(0)));
363363

@@ -368,7 +368,7 @@ Y_UNIT_TEST_SUITE(KqpSinkTx) {
368368
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
369369

370370
result = session.ExecuteQuery(readQuery,
371-
TTxControl::Tx(tx.GetId())).ExtractValueSync();
371+
TTxControl::Tx(tx)).ExtractValueSync();
372372
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
373373
CompareYson(readResult, FormatResultSetYson(result.GetResultSet(0)));
374374

‎ydb/core/kqp/ut/tx/kqp_snapshot_isolation_ut.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ Y_UNIT_TEST_SUITE(KqpSnapshotIsolation) {
9090
result = session1.ExecuteQuery(Q_(R"(
9191
UPSERT INTO `/Root/Test` (Group, Name, Comment)
9292
VALUES (1U, "Paul", "Changed");
93-
)"), TTxControl::Tx(tx1->GetId()).CommitTx()).ExtractValueSync();
93+
)"), TTxControl::Tx(*tx1).CommitTx()).ExtractValueSync();
9494
// Keys changed since taking snapshot.
9595
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::ABORTED, result.GetIssues().ToString());
9696

@@ -148,7 +148,7 @@ Y_UNIT_TEST_SUITE(KqpSnapshotIsolation) {
148148
result = session1.ExecuteQuery(Q_(R"(
149149
UPSERT INTO `/Root/Test` (Group, Name, Comment)
150150
VALUES (1U, "Paul", "Changed");
151-
)"), TTxControl::Tx(tx1->GetId()).CommitTx()).ExtractValueSync();
151+
)"), TTxControl::Tx(*tx1).CommitTx()).ExtractValueSync();
152152
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
153153

154154
result = session2.ExecuteQuery(Q_(R"(
@@ -205,7 +205,7 @@ Y_UNIT_TEST_SUITE(KqpSnapshotIsolation) {
205205

206206
result = session1.ExecuteQuery(Q_(R"(
207207
SELECT * FROM `/Root/Test` WHERE Name == "Paul" ORDER BY Group, Name;
208-
)"), TTxControl::Tx(tx1->GetId()).CommitTx()).ExtractValueSync();
208+
)"), TTxControl::Tx(*tx1).CommitTx()).ExtractValueSync();
209209
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
210210
CompareYson(R"([[[300u];["None"];1u;"Paul"]])", FormatResultSetYson(result.GetResultSet(0)));
211211

‎ydb/core/statistics/service/ut/ut_basic_statistics.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ namespace NKikimr {
1111
namespace NStat {
1212

1313
using namespace NYdb;
14-
using namespace NYdb::NTable;
1514
using namespace NYdb::NScheme;
1615

1716
namespace {

‎ydb/library/yql/providers/pq/gateway/dummy/yql_pq_file_topic_client.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ class TFileTopicWriteSession : public NYdb::NTopic::IWriteSession, private NYdb:
192192
}
193193

194194
void Write(NYdb::NTopic::TContinuationToken&&, NYdb::NTopic::TWriteMessage&& message,
195-
NYdb::NTable::TTransaction* tx) override {
195+
NYdb::TTransactionBase* tx) override {
196196
Y_UNUSED(tx);
197197

198198
auto size = message.Data.size();
@@ -214,7 +214,7 @@ class TFileTopicWriteSession : public NYdb::NTopic::IWriteSession, private NYdb:
214214

215215
// Ignores codec in message and always writes raw for debugging purposes
216216
void WriteEncoded(NYdb::NTopic::TContinuationToken&& token, NYdb::NTopic::TWriteMessage&& params,
217-
NYdb::NTable::TTransaction* tx) override {
217+
NYdb::TTransactionBase* tx) override {
218218
Y_UNUSED(tx);
219219

220220
NYdb::NTopic::TWriteMessage message(params.Data);

0 commit comments

Comments
 (0)