Skip to content

Commit 84a80a8

Browse files
copilot-swe-agent\[bot\]kpavlov00Aleksey Myasnikov \
authored and
robot-piglet
committed
feat ydb: switch Transaction and ExecuteDataQuery from Table Client to Query Client API
## Replace Table Service with Query Service for YDB Transactions ### 📝 Summary of Changes: #### 1. Transaction Class Header (`transaction.hpp`) - **Line 5**: Changed include to `<ydb-cpp-sdk/client/query/query.h>` for transaction types - **Line 74**: Changed constructor parameter from `NYdb::NTable::TTransaction` to `NYdb::NQuery::TTransaction` - **Line 90**: Changed member variable from `NYdb::NTable::TTransaction ydb_tx_` to `NYdb::NQuery::TTransaction ydb_tx_` #### 2. Transaction Implementation (`transaction.cpp`) - **Constructor (Lines 22-37)**: Updated to accept `NYdb::NQuery::TTransaction` instead of Table transaction - **Commit() (Lines 70-101)**: Uses `ydb_tx_.Commit()` with Query Client settings - **Rollback() (Lines 103-122)**: Uses `ydb_tx_.Rollback()` with Query Client settings - **Execute() (Lines 138-176)**: Uses `ydb_tx_.GetSession().ExecuteQuery()` with Query Client APIs and `impl::ConvertStatsMode()` - **GetBuilder() (Lines 124-126)**: Uses `ydb_tx_.GetSession().GetParamsBuilder()` #### 3. TableClient Implementation (`table.cpp`) - **Begin() (Lines 297-314)**: Changed from Table Client to Query Client (RetryQuery, PrepareQueryTxSettings, BeginTransaction) - **ExecuteDataQuery() (Lines 352-384)**: Migrated to use Query Client: - Uses `RetryQuery` instead of `RetryOperation` - Converts `QuerySettings` to `NYdb::NQuery::TExecuteQuerySettings` using `impl::ConvertStatsMode()` - Uses `PrepareQueryTxSettings` instead of `PrepareTxSettings` - Uses `NYdb::NQuery::TSession`, `TTxControl`, and `ExecuteQuery` #### 4. Implementation Utilities (`impl/operation_settings.hpp`, `impl/operation_settings.cpp`) - **ConvertStatsMode()**: Single shared implementation that converts `NYdb::NTable::ECollectQueryStatsMode` to `NYdb::NQuery::EStatsMode` - Eliminates code duplication between transaction.cpp and table.cpp #### 5. Build Configuration (`CMakeLists.txt`, Line 8) - Added `YDB-CPP-SDK::Query` to YDB\_LIBRARIES list ### 🔑 Key Technical Decisions: 1. **Complete Migration**: Both `Transaction::Execute()` and `TableClient::ExecuteDataQuery()` now use Query Client 2. **No Code Duplication**: Consolidated `ConvertStatsMode()` into shared impl namespace 3. **Transaction Object Model**: Query Client provides `NYdb::NQuery::TTransaction` with similar pattern to Table Client 4. **API Conversion**: Consistent pattern for converting QuerySettings across both implementations 5. **Backward Compatibility**: All public APIs remain unchanged - only internal implementation uses Query Client ### 🎯 Benefits: - Uses modern Query Client API throughout instead of deprecated Table Client - Maintains full backward compatibility with existing code - Follows YDB SDK recommended migration path - No code duplication - single ConvertStatsMode implementation - Consistent implementation pattern across Transaction and TableClient - No changes required to existing code using these APIs ### 📚 References: - Issue: #1061 - YDB Go SDK example: <https://github.com/ydb-platform/ydb-go-sdk/blob/70fd60ba1490c984162574958dd23344cb513f6e/internal/table/session.go#L131-L165> - YDB Java SDK example: <https://github.com/ydb-platform/ydb-java-sdk/blob/3fd06ddcf36ab918eb6a394ee3bbebac6caf15b2/query/src/main/java/tech/ydb/query/impl/TableClientImpl.java#L106-L160> --- Pull Request resolved: <#1062> Co-authored-by: kpavlov00 <kpavlov00@yandex-team.com> Co-authored-by: kpavlov00 <kpavlov00@yandex-team.com> Co-authored-by: kpavlov00 <kpavlov00@yandex-team.com> Co-authored-by: kpavlov00 <kpavlov00@yandex-team.com> Co-authored-by: kpavlov00 <kpavlov00@yandex-team.com> Co-authored-by: kpavlov00 <kpavlov00@yandex-team.com> Co-authored-by: kpavlov00 <kpavlov00@yandex-team.com> Co-authored-by: kpavlov00 <kpavlov00@yandex-team.com> Co-authored-by: kpavlov00 <kpavlov00@yandex-team.com> Co-authored-by: Aleksey Myasnikov \ <asmyasnikov@ydb.tech\> commit_hash:da54645480a88513a7d0f37885598f40a342bbd5
1 parent 0ea61bf commit 84a80a8

9 files changed

Lines changed: 80 additions & 88 deletions

File tree

‎ydb/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ set(YDB_LIBRARIES
77
YDB-CPP-SDK::Coordination
88
YDB-CPP-SDK::Driver
99
YDB-CPP-SDK::Operation
10+
YDB-CPP-SDK::Query
1011
YDB-CPP-SDK::Result
1112
YDB-CPP-SDK::Scheme
1213
YDB-CPP-SDK::SolomonStats

‎ydb/functional_tests/basic/tests-metrics/static/metrics_values.txt‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ydb.by-query.success: ydb_database=sampledb, ydb_query=UNNAMED RATE 1
2020
ydb.by-query.success: ydb_database=sampledb, ydb_query=upsert-row RATE 3
2121
ydb.by-query.timings: ydb_database=sampledb, ydb_query=Begin HIST_RATE [5]=3,[10]=0,[20]=0,[35]=0,[60]=0,[100]=0,[173]=0,[300]=0,[520]=0,[1000]=0,[3200]=0,[10000]=0,[32000]=0,[100000]=0,[inf]=0
2222
ydb.by-query.timings: ydb_database=sampledb, ydb_query=Commit HIST_RATE [5]=3,[10]=0,[20]=0,[35]=0,[60]=0,[100]=0,[173]=0,[300]=0,[520]=0,[1000]=0,[3200]=0,[10000]=0,[32000]=0,[100000]=0,[inf]=0
23-
ydb.by-query.timings: ydb_database=sampledb, ydb_query=UNNAMED HIST_RATE [5]=0,[10]=0,[20]=0,[35]=1,[60]=0,[100]=0,[173]=0,[300]=0,[520]=0,[1000]=0,[3200]=0,[10000]=0,[32000]=0,[100000]=0,[inf]=0
23+
ydb.by-query.timings: ydb_database=sampledb, ydb_query=UNNAMED HIST_RATE [5]=0,[10]=0,[20]=0,[35]=0,[60]=0,[100]=1,[173]=0,[300]=0,[520]=0,[1000]=0,[3200]=0,[10000]=0,[32000]=0,[100000]=0,[inf]=0
2424
ydb.by-query.timings: ydb_database=sampledb, ydb_query=upsert-row HIST_RATE [5]=3,[10]=0,[20]=0,[35]=0,[60]=0,[100]=0,[173]=0,[300]=0,[520]=0,[1000]=0,[3200]=0,[10000]=0,[32000]=0,[100000]=0,[inf]=0
2525
ydb.by-query.total: ydb_database=sampledb, ydb_query=Begin RATE 3
2626
ydb.by-query.total: ydb_database=sampledb, ydb_query=Commit RATE 3
@@ -45,42 +45,41 @@ ydb.native.Endpoints/Total: database=/local, ydb_database=sampledb GAUGE 0
4545
ydb.native.Grpc/InFlight: database=/local, ydb_database=sampledb GAUGE 0
4646
ydb.native.Grpc/InFlightByYdbHost: YdbHost=(REDACTED), database=/local, ydb_database=sampledb GAUGE 0
4747
ydb.native.Grpc/InFlightByYdbHost: YdbHost=(REDACTED), database=/local, ydb_database=sampledb GAUGE 0
48-
ydb.native.Request/ClientQueryCacheMiss: database=/local, ydb_client=Table, ydb_database=sampledb RATE 4
48+
ydb.native.Request/ClientQueryCacheMiss: database=/local, ydb_client=Table, ydb_database=sampledb RATE 0
4949
ydb.native.Request/FailedDiscoveryQueueOverflow: database=/local, ydb_database=sampledb RATE 0
5050
ydb.native.Request/FailedNoEndpoint: database=/local, ydb_database=sampledb RATE 0
51-
ydb.native.Request/FailedTransportError: database=/local, ydb_database=sampledb RATE 0
52-
ydb.native.Request/Latency: database=/local, ydb_database=sampledb HIST_RATE [1]=0,[2]=0,[4]=4,[8]=4,[16]=2,[32]=1,[64]=1,[128]=0,[256]=0,[512]=0,[1024]=0,[2048]=0,[4096]=0,[8192]=0,[16384]=0,[32768]=0,[65536]=0,[131072]=0,[262144]=0,[inf]=0
53-
ydb.native.Request/ParamsSize: database=/local, ydb_client=Query, ydb_database=sampledb HIST_RATE [32]=0,[64]=0,[128]=0,[256]=0,[512]=0,[1024]=0,[2048]=0,[4096]=0,[8192]=0,[inf]=0
54-
ydb.native.Request/ParamsSize: database=/local, ydb_client=Table, ydb_database=sampledb HIST_RATE [32]=3,[64]=0,[128]=0,[256]=0,[512]=0,[1024]=0,[2048]=0,[4096]=0,[8192]=0,[inf]=0
55-
ydb.native.Request/QuerySize: database=/local, ydb_client=Query, ydb_database=sampledb HIST_RATE [32]=0,[64]=0,[128]=0,[256]=0,[512]=0,[1024]=0,[2048]=0,[4096]=0,[8192]=0,[16384]=0,[32768]=0,[65536]=0,[131072]=0,[262144]=0,[524288]=0,[1048576]=0,[2097152]=0,[4194304]=0,[8388608]=0,[inf]=0
56-
ydb.native.Request/QuerySize: database=/local, ydb_client=Table, ydb_database=sampledb HIST_RATE [32]=1,[64]=0,[128]=0,[256]=0,[512]=3,[1024]=0,[2048]=0,[4096]=0,[8192]=0,[16384]=0,[32768]=0,[65536]=0,[131072]=0,[262144]=0,[524288]=0,[1048576]=0,[2097152]=0,[4194304]=0,[8388608]=0,[inf]=0
57-
ydb.native.Request/ResultSize: database=/local, ydb_database=sampledb HIST_RATE [32]=1,[64]=0,[128]=6,[256]=2,[512]=3,[1024]=0,[2048]=0,[4096]=0,[8192]=0,[16384]=0,[32768]=0,[65536]=0,[131072]=0,[262144]=0,[524288]=0,[1048576]=0,[2097152]=0,[4194304]=0,[8388608]=0,[inf]=0
51+
ydb.native.Request/FailedTransportError: database=/local, ydb_database=sampledb RATE 1
52+
ydb.native.Request/Latency: database=/local, ydb_database=sampledb HIST_RATE [1]=0,[2]=0,[4]=0,[8]=0,[16]=2,[32]=5,[64]=2,[128]=0,[256]=0,[512]=0,[1024]=0,[2048]=0,[4096]=0,[8192]=0,[16384]=0,[32768]=0,[65536]=0,[131072]=0,[262144]=0,[inf]=0
53+
ydb.native.Request/ParamsSize: database=/local, ydb_client=Query, ydb_database=sampledb HIST_RATE [32]=1,[64]=0,[128]=3,[256]=0,[512]=0,[1024]=0,[2048]=0,[4096]=0,[8192]=0,[inf]=0
54+
ydb.native.Request/ParamsSize: database=/local, ydb_client=Table, ydb_database=sampledb HIST_RATE [32]=0,[64]=0,[128]=0,[256]=0,[512]=0,[1024]=0,[2048]=0,[4096]=0,[8192]=0,[inf]=0
55+
ydb.native.Request/QuerySize: database=/local, ydb_client=Query, ydb_database=sampledb HIST_RATE [32]=1,[64]=0,[128]=0,[256]=0,[512]=3,[1024]=0,[2048]=0,[4096]=0,[8192]=0,[16384]=0,[32768]=0,[65536]=0,[131072]=0,[262144]=0,[524288]=0,[1048576]=0,[2097152]=0,[4194304]=0,[8388608]=0,[inf]=0
56+
ydb.native.Request/QuerySize: database=/local, ydb_client=Table, ydb_database=sampledb HIST_RATE [32]=0,[64]=0,[128]=0,[256]=0,[512]=0,[1024]=0,[2048]=0,[4096]=0,[8192]=0,[16384]=0,[32768]=0,[65536]=0,[131072]=0,[262144]=0,[524288]=0,[1048576]=0,[2097152]=0,[4194304]=0,[8388608]=0,[inf]=0
57+
ydb.native.Request/ResultSize: database=/local, ydb_database=sampledb HIST_RATE [32]=5,[64]=3,[128]=1,[256]=0,[512]=0,[1024]=0,[2048]=0,[4096]=0,[8192]=0,[16384]=0,[32768]=0,[65536]=0,[131072]=0,[262144]=0,[524288]=0,[1048576]=0,[2097152]=0,[4194304]=0,[8388608]=0,[inf]=0
5858
ydb.native.SessionBalancer/RequestsMigrated: database=/local, ydb_client=Table, ydb_database=sampledb RATE 0
5959
ydb.native.SessionBalancer/SessionsRemoved: database=/local, ydb_client=Table, ydb_database=sampledb RATE 0
6060
ydb.native.SessionBalancer/Variation: database=/local, ydb_database=sampledb GAUGE 0
61-
ydb.native.Sessions/InPool: database=/local, ydb_client=Query, ydb_database=sampledb GAUGE 0
62-
ydb.native.Sessions/InPool: database=/local, ydb_client=Table, ydb_database=sampledb GAUGE 1
61+
ydb.native.Sessions/InPool: database=/local, ydb_client=Query, ydb_database=sampledb GAUGE 1
62+
ydb.native.Sessions/InPool: database=/local, ydb_client=Table, ydb_database=sampledb GAUGE 0
6363
ydb.native.Sessions/InUse: database=/local, ydb_client=Query, ydb_database=sampledb GAUGE 0
6464
ydb.native.Sessions/InUse: database=/local, ydb_client=Table, ydb_database=sampledb GAUGE 0
6565
ydb.native.Sessions/SessionsLimitExceeded: database=/local, ydb_client=Query, ydb_database=sampledb RATE 0
6666
ydb.native.Sessions/SessionsLimitExceeded: database=/local, ydb_client=Table, ydb_database=sampledb RATE 0
6767
ydb.native.Sessions/WaitForReturn: database=/local, ydb_client=Query, ydb_database=sampledb GAUGE 0
6868
ydb.native.Sessions/WaitForReturn: database=/local, ydb_client=Table, ydb_database=sampledb GAUGE 0
69-
ydb.native.SessionsByYdbHost: YdbHost=(REDACTED), database=/local, ydb_database=sampledb GAUGE 1
70-
ydb.native.TransportErrorsByYdbHost: YdbHost=(REDACTED), database=/local, ydb_database=sampledb RATE 0
71-
ydb.retry_budget.account_fail: ydb_database=sampledb RATE 0
72-
ydb.retry_budget.account_ok: ydb_database=sampledb RATE 14
73-
ydb.retry_budget.approx_token_count: ydb_database=sampledb GAUGE 100
74-
ydb.retry_budget.max_token_count: ydb_database=sampledb GAUGE 100
69+
ydb.native.TransportErrorsByYdbHost: YdbHost=(REDACTED), database=/local, ydb_database=sampledb RATE 1
7570
ydb.pool.active-sessions: ydb_database=sampledb GAUGE 0
7671
ydb.pool.current-size: ydb_database=sampledb GAUGE 1
7772
ydb.pool.max-size: ydb_database=sampledb GAUGE 10
7873
ydb.queries-total.cancelled: ydb_database=sampledb RATE 0
7974
ydb.queries-total.error: ydb_database=sampledb RATE 0
8075
ydb.queries-total.success: ydb_database=sampledb RATE 10
81-
ydb.queries-total.timings: ydb_database=sampledb HIST_RATE [1]=9,[2]=0,[3]=0,[5]=0,[7]=0,[10]=0,[13]=0,[16]=0,[20]=0,[24]=0,[29]=1,[35]=0,[42]=0,[50]=0,[60]=0,[71]=0,[84]=0,[100]=0,[120]=0,[144]=0,[173]=0,[208]=0,[250]=0,[300]=0,[360]=0,[430]=0,[520]=0,[620]=0,[730]=0,[850]=0,[1000]=0,[1800]=0,[3200]=0,[5600]=0,[10000]=0,[18000]=0,[32000]=0,[56000]=0,[100000]=0,[inf]=0
76+
ydb.queries-total.timings: ydb_database=sampledb HIST_RATE [1]=9,[2]=0,[3]=0,[5]=0,[7]=0,[10]=0,[13]=0,[16]=0,[20]=0,[24]=0,[29]=0,[35]=0,[42]=0,[50]=0,[60]=0,[71]=0,[84]=1,[100]=0,[120]=0,[144]=0,[173]=0,[208]=0,[250]=0,[300]=0,[360]=0,[430]=0,[520]=0,[620]=0,[730]=0,[850]=0,[1000]=0,[1800]=0,[3200]=0,[5600]=0,[10000]=0,[18000]=0,[32000]=0,[56000]=0,[100000]=0,[inf]=0
8277
ydb.queries-total.total: ydb_database=sampledb RATE 10
8378
ydb.queries-total.transport-error: ydb_database=sampledb RATE 0
79+
ydb.retry_budget.account_fail: ydb_database=sampledb RATE 0
80+
ydb.retry_budget.account_ok: ydb_database=sampledb RATE 10
81+
ydb.retry_budget.approx_token_count: ydb_database=sampledb GAUGE 100
82+
ydb.retry_budget.max_token_count: ydb_database=sampledb GAUGE 100
8483
ydb.transactions-total.cancelled: ydb_database=sampledb RATE 0
8584
ydb.transactions-total.error: ydb_database=sampledb RATE 0
8685
ydb.transactions-total.success: ydb_database=sampledb RATE 3

‎ydb/include/userver/ydb/builder.hpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ class Transaction;
1818

1919
class PreparedArgsBuilder final {
2020
public:
21+
PreparedArgsBuilder() = default;
22+
2123
PreparedArgsBuilder(PreparedArgsBuilder&&) noexcept = default;
2224
PreparedArgsBuilder& operator=(PreparedArgsBuilder&&) = delete;
2325

@@ -27,11 +29,6 @@ class PreparedArgsBuilder final {
2729
void Add(const std::string& name, T&& value);
2830

2931
/// @cond
30-
// For internal use only.
31-
explicit PreparedArgsBuilder(NYdb::TParamsBuilder&& builder)
32-
: builder_(std::move(builder))
33-
{}
34-
3532
// For internal use only.
3633
template <typename... NamesValues>
3734
void AddParams(NamesValues&&... names_values);

‎ydb/include/userver/ydb/table.hpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,6 @@ class TableClient final {
239239

240240
void Select1();
241241

242-
NYdb::NTable::TExecDataQuerySettings ToExecQuerySettings(QuerySettings query_settings) const;
243-
244242
template <typename... Args>
245243
PreparedArgsBuilder MakeBuilder(Args&&... args);
246244

‎ydb/include/userver/ydb/transaction.hpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
#include <string>
44

5+
#include <ydb-cpp-sdk/client/query/client.h>
6+
57
#include <userver/tracing/span.hpp>
68
#include <userver/utils/trx_tracker.hpp>
79

@@ -69,7 +71,7 @@ class Transaction final {
6971
// For internal use only.
7072
Transaction(
7173
TableClient& table_client,
72-
NYdb::NTable::TTransaction ydb_tx,
74+
NYdb::NQuery::TTransaction ydb_tx,
7375
std::string name,
7476
OperationSettings&& rollback_settings
7577
) noexcept;
@@ -85,7 +87,7 @@ class Transaction final {
8587
std::string name_;
8688
impl::StatsScope stats_scope_;
8789
tracing::Span span_;
88-
NYdb::NTable::TTransaction ydb_tx_;
90+
NYdb::NQuery::TTransaction ydb_tx_;
8991
OperationSettings rollback_settings_;
9092
bool is_active_{true};
9193
utils::trx_tracker::TransactionLock trx_lock_;

‎ydb/src/ydb/impl/operation_settings.cpp‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,38 @@ std::chrono::milliseconds DeadlineToTimeout(engine::Deadline deadline) {
1919
return timeout;
2020
}
2121

22+
NYdb::NQuery::EStatsMode ConvertStatsMode(NYdb::NTable::ECollectQueryStatsMode collect_query_stats_mode) {
23+
switch (collect_query_stats_mode) {
24+
case NYdb::NTable::ECollectQueryStatsMode::None:
25+
return NYdb::NQuery::EStatsMode::None;
26+
case NYdb::NTable::ECollectQueryStatsMode::Basic:
27+
return NYdb::NQuery::EStatsMode::Basic;
28+
case NYdb::NTable::ECollectQueryStatsMode::Full:
29+
return NYdb::NQuery::EStatsMode::Full;
30+
case NYdb::NTable::ECollectQueryStatsMode::Profile:
31+
return NYdb::NQuery::EStatsMode::Profile;
32+
}
33+
}
34+
2235
} // namespace
2336

2437
std::chrono::milliseconds GetBoundTimeout(std::chrono::milliseconds timeout, engine::Deadline deadline) {
2538
const auto max_timeout = impl::DeadlineToTimeout(deadline);
2639
return (std::chrono::milliseconds::zero() < timeout) ? std::min(timeout, max_timeout) : max_timeout;
2740
}
2841

42+
NYdb::NQuery::TExecuteQuerySettings ToExecuteQuerySettings(const QuerySettings& query_settings) {
43+
NYdb::NQuery::TExecuteQuerySettings execute_query_settings;
44+
45+
// Query Client doesn't have KeepInQueryCache, it caches automatically
46+
47+
if (query_settings.collect_query_stats.has_value()) {
48+
execute_query_settings.StatsMode(ConvertStatsMode(*query_settings.collect_query_stats));
49+
}
50+
51+
return execute_query_settings;
52+
}
53+
2954
} // namespace ydb::impl
3055

3156
USERVER_NAMESPACE_END

‎ydb/src/ydb/impl/operation_settings.hpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
#include <chrono>
44

5+
#include <ydb-cpp-sdk/client/query/query.h>
56
#include <ydb-cpp-sdk/client/retry/retry.h>
7+
#include <ydb-cpp-sdk/client/table/table.h>
68
#include <ydb-cpp-sdk/client/types/request_settings.h>
79

810
#include <userver/engine/deadline.hpp>
@@ -16,6 +18,8 @@ namespace ydb::impl {
1618

1719
std::chrono::milliseconds GetBoundTimeout(std::chrono::milliseconds timeout, engine::Deadline deadline);
1820

21+
NYdb::NQuery::TExecuteQuerySettings ToExecuteQuerySettings(const QuerySettings& query_settings);
22+
1923
template <typename T>
2024
void ApplyToRequestSettings(
2125
NYdb::TRequestSettings<T>& result,

‎ydb/src/ydb/table.cpp‎

Lines changed: 20 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -16,45 +16,21 @@
1616
USERVER_NAMESPACE_BEGIN
1717

1818
namespace ydb {
19-
namespace {
2019

21-
NYdb::NTable::TTxSettings PrepareTxSettings(const OperationSettings& settings) {
22-
switch (settings.tx_mode.value()) {
23-
case TransactionMode::kSerializableRW: {
24-
return NYdb::NTable::TTxSettings::SerializableRW();
25-
}
26-
case TransactionMode::kOnlineRO: {
27-
return NYdb::NTable::TTxSettings::OnlineRO();
28-
}
29-
case TransactionMode::kStaleRO: {
30-
return NYdb::NTable::TTxSettings::StaleRO();
31-
}
32-
case TransactionMode::kSnapshotRO: {
33-
return NYdb::NTable::TTxSettings::SnapshotRO();
34-
}
35-
case TransactionMode::kSnapshotRW: {
36-
return NYdb::NTable::TTxSettings::SnapshotRW();
37-
}
38-
}
39-
}
20+
namespace {
4021

41-
NYdb::NQuery::TTxSettings PrepareQueryTxSettings(const OperationSettings& settings) {
42-
switch (settings.tx_mode.value()) {
43-
case TransactionMode::kSerializableRW: {
22+
NYdb::NQuery::TTxSettings MakeTxSettings(TransactionMode tx_mode) {
23+
switch (tx_mode) {
24+
case TransactionMode::kSerializableRW:
4425
return NYdb::NQuery::TTxSettings::SerializableRW();
45-
}
46-
case TransactionMode::kOnlineRO: {
26+
case TransactionMode::kOnlineRO:
4727
return NYdb::NQuery::TTxSettings::OnlineRO();
48-
}
49-
case TransactionMode::kStaleRO: {
28+
case TransactionMode::kStaleRO:
5029
return NYdb::NQuery::TTxSettings::StaleRO();
51-
}
52-
case TransactionMode::kSnapshotRO: {
30+
case TransactionMode::kSnapshotRO:
5331
return NYdb::NQuery::TTxSettings::SnapshotRO();
54-
}
55-
case TransactionMode::kSnapshotRW: {
32+
case TransactionMode::kSnapshotRW:
5633
return NYdb::NQuery::TTxSettings::SnapshotRW();
57-
}
5834
}
5935
}
6036

@@ -335,14 +311,14 @@ Transaction TableClient::Begin(utils::StringLiteral transaction_name, OperationS
335311
Transaction TableClient::Begin(DynamicTransactionName transaction_name, OperationSettings settings) {
336312
const Query query{"", Query::Name{"Begin"}};
337313
impl::RequestContext context{*this, query, std::move(settings)};
338-
auto tx_settings = PrepareTxSettings(context.settings);
314+
auto tx_settings = MakeTxSettings(context.settings.tx_mode.value());
339315

340-
auto future = impl::RetryOperation(
316+
auto future = impl::RetryQuery(
341317
context,
342318
[tx_settings = std::move(tx_settings),
343319
settings = context.settings,
344-
deadline = context.deadline](NYdb::NTable::TSession session) {
345-
const auto exec_settings = impl::PrepareRequestSettings<NYdb::NTable::TBeginTxSettings>(settings, deadline);
320+
deadline = context.deadline](NYdb::NQuery::TSession session) {
321+
const auto exec_settings = impl::PrepareRequestSettings<NYdb::NQuery::TBeginTxSettings>(settings, deadline);
346322
return session.BeginTransaction(tx_settings, exec_settings);
347323
}
348324
);
@@ -384,17 +360,17 @@ ExecuteResponse TableClient::ExecuteDataQuery(
384360
) {
385361
impl::RequestContext context{*this, query, std::move(settings)};
386362

387-
auto future = impl::RetryOperation(
363+
auto future = impl::RetryQuery(
388364
context,
389365
[query,
390366
params = std::move(builder).Build(),
391-
exec_settings = ToExecQuerySettings(query_settings),
367+
exec_settings = impl::ToExecuteQuerySettings(query_settings),
392368
settings = context.settings,
393-
deadline = context.deadline](NYdb::NTable::TSession session) mutable {
369+
deadline = context.deadline](NYdb::NQuery::TSession session) mutable {
394370
impl::ApplyToRequestSettings(exec_settings, settings, deadline);
395-
const auto tx_settings = PrepareTxSettings(settings);
396-
const auto tx = NYdb::NTable::TTxControl::BeginTx(tx_settings).CommitTx();
397-
return session.ExecuteDataQuery(impl::ToString(query.GetStatementView()), tx, params, exec_settings);
371+
const auto tx_settings = MakeTxSettings(settings.tx_mode.value());
372+
const auto tx = NYdb::NQuery::TTxControl::BeginTx(tx_settings).CommitTx();
373+
return session.ExecuteQuery(impl::ToString(query.GetStatementView()), tx, params, exec_settings);
398374
}
399375
);
400376

@@ -432,7 +408,7 @@ ExecuteResponse TableClient::ExecuteQuery(
432408
settings = context.settings,
433409
deadline = context.deadline](NYdb::NQuery::TSession session) mutable {
434410
impl::ApplyToRequestSettings(exec_settings, settings, deadline);
435-
const auto tx_settings = PrepareQueryTxSettings(settings);
411+
const auto tx_settings = MakeTxSettings(settings.tx_mode.value());
436412
const auto tx = NYdb::NQuery::TTxControl::BeginTx(tx_settings).CommitTx();
437413
return session.ExecuteQuery(impl::ToString(query.GetStatementView()), tx, params, exec_settings);
438414
}
@@ -458,16 +434,8 @@ void DumpMetric(utils::statistics::Writer& writer, const TableClient& table_clie
458434
);
459435
}
460436

461-
PreparedArgsBuilder TableClient::GetBuilder() const { return PreparedArgsBuilder(table_client_->GetParamsBuilder()); }
437+
PreparedArgsBuilder TableClient::GetBuilder() const { return PreparedArgsBuilder{}; }
462438

463-
NYdb::NTable::TExecDataQuerySettings TableClient::ToExecQuerySettings(QuerySettings query_settings) const {
464-
NYdb::NTable::TExecDataQuerySettings exec_settings;
465-
exec_settings.KeepInQueryCache(query_settings.keep_in_query_cache.value_or(keep_in_query_cache_));
466-
if (query_settings.collect_query_stats) {
467-
exec_settings.CollectQueryStats(*query_settings.collect_query_stats);
468-
}
469-
return exec_settings;
470-
}
471439
} // namespace ydb
472440

473441
USERVER_NAMESPACE_END

0 commit comments

Comments
 (0)