feat(ydb): migrate transactions and data queries from Table Client to Query Client API by Copilot · Pull Request #1062 · userver-framework/userver

Copilot · 2025-11-20T17:08:48Z

Migration Complete: Replace Table Service with Query Service for YDB Transactions

✅ All Tasks Completed:

📝 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 Header (`table.hpp`)

Removed: ToExecQuerySettings() method declaration (was creating Table Client settings)

4. TableClient Implementation (`table.cpp`)

ToExecuteQuerySettings() (Lines 49-59): New free function in anonymous namespace that creates NYdb::NQuery::TExecuteQuerySettings for Query Client
Begin() (Lines 297-314): Changed from Table Client to Query Client (RetryQuery, PrepareQueryTxSettings, BeginTransaction)
ExecuteDataQuery() (Lines 364-387):
- Migrated to use Query Client
- Uses new ToExecuteQuerySettings() free function instead of old member method
- Uses RetryQuery, ExecuteQuery, and Query Client types throughout
Removed: Old ToExecQuerySettings() member method that created Table Client settings

5. 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

6. Build Configuration (`CMakeLists.txt`, Line 8)

Added YDB-CPP-SDK::Query to YDB_LIBRARIES list

🔑 Key Technical Decisions:

Complete Migration: Both Transaction::Execute() and TableClient::ExecuteDataQuery() now use Query Client
No Code Duplication: Consolidated ConvertStatsMode() into shared impl namespace
Free Function Pattern: Converted ToExecQuerySettings from member method to free function ToExecuteQuerySettings that creates Query Client settings
Transaction Object Model: Query Client provides NYdb::NQuery::TTransaction with similar pattern to Table Client
API Conversion: Consistent pattern for converting QuerySettings across both implementations
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
Clean separation of concerns with free functions for conversions
Consistent implementation pattern across Transaction and TableClient
No changes required to existing code using these APIs

📚 References:

Original prompt

This section details on the original issue you should resolve

<issue_title>Заменить Table Service на Query Service при работе с YDB транзакциями</issue_title>
<issue_description>При вызове метода Begin создается объект Transaction, который использует для выполнения запросов в YDB устаревший Table Client API. Вместо этого нужно использовать Query Client (класс TQueryClient в YDB С++ SDK).

Для этого нужно:

Создавать транзакцию внутри объекта Transaction через Query Client.

Использовать Query Client для выполнения запросов в методах Execute внутри объекта Transaction

Сохранить сигнатуру существующих методов интерактивной транзакции

Текущая сигнатура Execute зависит от API для Table Client, нужно будет сделать конвертацию под Query Client. Вот примеры такой конвертации в YDB Go SDK и YDB Java SDK.

API Query Client и Table Client немного отличаются, например ExecuteQuery вместо ExecuteDataQuery и RetryQuery вместо RetryOperation. Есть еще отличия, их лучше самому посмотреть в коде YDB C++ SDK: Table Client API и Query Client API.

Код компоненты userver для работы с YDB находится здесь.

Создание транзакции: include, source
Работа с транзакциями: include, source</issue_description>

Comments on the Issue (you are @copilot in this section)

Fixes Заменить Table Service на Query Service при работе с YDB транзакциями #1061

💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

- Updated Transaction class to use NYdb::NQuery::TSession and transaction ID - Changed Transaction::Execute() to use Query Client's ExecuteQuery - Modified Transaction::Commit() and Rollback() to use Query Client APIs - Updated TableClient::Begin() to use RetryQuery and Query Client BeginTransaction - Added YDB-CPP-SDK::Query library to CMakeLists.txt - Added conversion logic for QuerySettings between Table and Query Client APIs Co-authored-by: asmyasnikov <14202262+asmyasnikov@users.noreply.github.com>

- Updated Transaction class to use NYdb::NQuery::TTransaction object - This matches the pattern of Table Client but uses Query namespace - Transaction object provides Commit(), Rollback(), and GetSession() methods - Execute uses TTxControl::Tx(transaction) for transaction control Co-authored-by: asmyasnikov <14202262+asmyasnikov@users.noreply.github.com>

Extract the stats mode conversion logic from Transaction::Execute() into a standalone ConvertStatsMode() helper function in anonymous namespace. This improves code readability and maintainability. Co-authored-by: asmyasnikov <14202262+asmyasnikov@users.noreply.github.com>

robot-magpie · 2025-11-20T19:01:35Z

@asmyasnikov has triggered the import of a pull request, but it hasn't started. If you are a Yandex employee, you can view the log.

asmyasnikov

@copilot давай функция ConvertStatsMode будет принимать значение collect_query_stats и отдавать NYdb::NQuery::EStatsMode
именно конвертацию одного енама в другой енам, без лишних зависимостей и вызовов

my opinion not effective

Change ConvertStatsMode to take collect_query_stats value as input and return NYdb::NQuery::EStatsMode instead of modifying settings object. This makes the function more functional and easier to understand. Co-authored-by: asmyasnikov <14202262+asmyasnikov@users.noreply.github.com>

Moved ConvertStatsMode from duplicate implementations in transaction.cpp and table.cpp to a single shared implementation in impl/operation_settings. Both files now use impl::ConvertStatsMode() to avoid code duplication. Co-authored-by: asmyasnikov <14202262+asmyasnikov@users.noreply.github.com>

Copilot · 2025-11-21T09:40:04Z

@copilot в твоем коде копипаста ConvertStatsMode - надо оставить единую реализацию

Fixed. Moved ConvertStatsMode to a single shared implementation in ydb/src/ydb/impl/operation_settings.cpp. Both transaction.cpp and table.cpp now use impl::ConvertStatsMode(). (commit 5d89601)

kpavlov00 · 2025-11-21T10:55:32Z

LGTM

robot-magpie · 2025-11-21T10:56:28Z

@kpavlov00 has triggered the import of a pull request, but it hasn't started. If you are a Yandex employee, you can view the log.

kpavlov00 · 2025-11-21T11:09:54Z

LGTM

robot-magpie · 2025-11-21T11:10:15Z

@kpavlov00 has triggered the import of a pull request, but it hasn't started. If you are a Yandex employee, you can view the log.

Copilot

Pull Request Overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

apolukhin · 2025-11-21T11:46:26Z

LGTM

robot-magpie · 2025-11-21T11:47:01Z

Many thanks for the PR! @apolukhin is now importing your pull request into our internal upstream repository.

asmyasnikov · 2025-11-21T13:15:08Z

@copilot давай старый метод ToExecQuerySettings превратим в свободную функцию и переделаем для создания NYdb::NQuery::TExecuteQuerySettings

Replaced TableClient::ToExecQuerySettings (which created Table Client settings) with a free function ToExecuteQuerySettings in anonymous namespace that creates NYdb::NQuery::TExecuteQuerySettings for Query Client API. Updated ExecuteDataQuery to use the new function. This completes the migration from Table Client to Query Client API. Co-authored-by: asmyasnikov <14202262+asmyasnikov@users.noreply.github.com>

Copilot · 2025-11-21T13:22:17Z

@copilot давай старый метод ToExecQuerySettings превратим в свободную функцию и переделаем для создания NYdb::NQuery::TExecuteQuerySett...

Done. Converted ToExecQuerySettings to a free function ToExecuteQuerySettings in anonymous namespace that creates NYdb::NQuery::TExecuteQuerySettings for Query Client. Removed the old member method. (commit 5e9a513)

robot-magpie · 2025-12-25T16:11:00Z

@asmyasnikov has triggered the import of a pull request, but it hasn't started. If you are a Yandex employee, you can view the log.

…service

robot-magpie · 2025-12-25T16:12:04Z

@asmyasnikov has triggered the import of a pull request, but it hasn't started. If you are a Yandex employee, you can view the log.

robot-magpie · 2026-03-23T12:13:10Z

✅ This pull request is being closed because it has been successfully merged into our internal monorepository.
Your changes will be pushed to this repository soon. Thank you for your contribution!

…nt 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

Initial plan

e4e7141

Copilot AI assigned Copilot and asmyasnikov Nov 20, 2025

Copilot started work on behalf of asmyasnikov November 20, 2025 17:09 View session

Copilot AI and others added 2 commits November 20, 2025 17:17

Copilot AI changed the title ~~[WIP] Replace Table Service with Query Service for YDB transactions~~ feat(ydb): migrate transactions from Table Client to Query Client API Nov 20, 2025

Copilot AI requested a review from asmyasnikov November 20, 2025 17:26

Copilot finished work on behalf of asmyasnikov November 20, 2025 17:26

asmyasnikov requested a review from Copilot November 20, 2025 17:28

asmyasnikov marked this pull request as ready for review November 20, 2025 18:00

asmyasnikov requested review from Copilot and removed request for Copilot November 20, 2025 18:02

asmyasnikov reviewed Nov 20, 2025

View reviewed changes

Comment thread ydb/src/ydb/transaction.cpp Outdated

Copilot started work on behalf of asmyasnikov November 20, 2025 18:56 View session

Copilot AI requested a review from asmyasnikov November 20, 2025 19:00

Copilot finished work on behalf of asmyasnikov November 20, 2025 19:00

asmyasnikov requested review from Copilot and removed request for Copilot November 20, 2025 19:00

asmyasnikov previously approved these changes Nov 20, 2025

View reviewed changes

asmyasnikov reviewed Nov 20, 2025

View reviewed changes

Comment thread ydb/src/ydb/transaction.cpp Outdated

asmyasnikov reviewed Nov 20, 2025

View reviewed changes

Copilot started reviewing on behalf of asmyasnikov November 20, 2025 20:20 View session

Copilot finished reviewing on behalf of asmyasnikov November 20, 2025 20:21

Copilot started work on behalf of asmyasnikov November 20, 2025 20:54 View session

Copilot AI requested a review from asmyasnikov November 20, 2025 20:57

Copilot started work on behalf of asmyasnikov November 21, 2025 09:36 View session

Copilot finished work on behalf of asmyasnikov November 21, 2025 09:41

asmyasnikov requested a review from Copilot November 21, 2025 09:49

Copilot started reviewing on behalf of asmyasnikov November 21, 2025 11:05 View session

Copilot finished reviewing on behalf of asmyasnikov November 21, 2025 11:08

Copilot AI reviewed Nov 21, 2025

View reviewed changes

Comment thread ydb/src/ydb/impl/operation_settings.cpp

Update ydb/src/ydb/impl/operation_settings.cpp

ce7c217

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

kpavlov00 reviewed Nov 21, 2025

View reviewed changes

Comment thread ydb/src/ydb/table.cpp Outdated

Copilot started work on behalf of asmyasnikov November 21, 2025 13:18 View session

Copilot finished work on behalf of asmyasnikov November 21, 2025 13:23

asmyasnikov approved these changes Dec 25, 2025

View reviewed changes

Merge branch 'develop' into copilot/replace-table-service-with-query-…

9a59e66

…service

asmyasnikov approved these changes Dec 25, 2025

View reviewed changes

asmyasnikov self-requested a review January 4, 2026 08:29

robot-magpie Bot closed this Mar 23, 2026

Conversation

Copilot AI commented Nov 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Migration Complete: Replace Table Service with Query Service for YDB Transactions

✅ All Tasks Completed:

📝 Summary of Changes:

1. Transaction Class Header (transaction.hpp)

2. Transaction Implementation (transaction.cpp)

3. TableClient Header (table.hpp)

4. TableClient Implementation (table.cpp)

5. Implementation Utilities (impl/operation_settings.hpp, impl/operation_settings.cpp)

6. Build Configuration (CMakeLists.txt, Line 8)

🔑 Key Technical Decisions:

🎯 Benefits:

📚 References:

Comments on the Issue (you are @copilot in this section)

Uh oh!

Uh oh!

robot-magpie Bot commented Nov 20, 2025

Uh oh!

Uh oh!

asmyasnikov left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI commented Nov 21, 2025

Uh oh!

kpavlov00 commented Nov 21, 2025

Uh oh!

robot-magpie Bot commented Nov 21, 2025

Uh oh!

kpavlov00 commented Nov 21, 2025

Uh oh!

robot-magpie Bot commented Nov 21, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

Uh oh!

apolukhin commented Nov 21, 2025

Uh oh!

robot-magpie Bot commented Nov 21, 2025

Uh oh!

asmyasnikov commented Nov 21, 2025

Uh oh!

Copilot AI commented Nov 21, 2025

Uh oh!

robot-magpie Bot commented Dec 25, 2025

Uh oh!

robot-magpie Bot commented Dec 25, 2025

Uh oh!

robot-magpie Bot commented Mar 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Copilot AI commented Nov 20, 2025 •

edited

Loading

1. Transaction Class Header (`transaction.hpp`)

2. Transaction Implementation (`transaction.cpp`)

3. TableClient Header (`table.hpp`)

4. TableClient Implementation (`table.cpp`)

5. Implementation Utilities (`impl/operation_settings.hpp`, `impl/operation_settings.cpp`)

6. Build Configuration (`CMakeLists.txt`, Line 8)

asmyasnikov left a comment •

edited

Loading