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

Jump to bottom

Fixed TableClient impelemntation by QueryService #311

Merged
merged 1 commit into from
Sep 16, 2024
Merged

Fixed TableClient impelemntation by QueryService #311

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
13 changes: 4 additions & 9 deletions query/src/main/java/tech/ydb/query/impl/TableClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ public void close() {
proxy.close();
}

private YdbQuery.TransactionControl mapTxControl(tech.ydb.table.transaction.TxControl<?> tx) {
YdbTable.TransactionControl tc = tx.toPb();
private YdbQuery.TransactionControl mapTxControl(YdbTable.TransactionControl tc) {
if (tc.hasTxId()) {
return TxControl.txIdCtrl(tc.getTxId(), tc.getCommitTx());
}
Expand Down Expand Up @@ -149,13 +148,9 @@ private class TableSession extends BaseSession {
}

@Override
public CompletableFuture<Result<DataQueryResult>> executeDataQuery(
String query,
tech.ydb.table.transaction.TxControl<?> txControl,
Params prms,
ExecuteDataQuerySettings settings
) {
YdbQuery.TransactionControl tc = mapTxControl(txControl);
public CompletableFuture<Result<DataQueryResult>> executeDataQueryInternal(
String query, YdbTable.TransactionControl tx, Params prms, ExecuteDataQuerySettings settings) {
YdbQuery.TransactionControl tc = mapTxControl(tx);
ExecuteQuerySettings qs = ExecuteQuerySettings.newBuilder()
.withTraceId(settings.getTraceId())
.withRequestTimeout(settings.getTimeoutDuration())
Expand Down
2 changes: 1 addition & 1 deletion table/src/main/java/tech/ydb/table/impl/BaseSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,7 +770,7 @@ private static YdbTable.TransactionSettings txSettings(Transaction.Mode transact
return settings.build();
}

private CompletableFuture<Result<DataQueryResult>> executeDataQueryInternal(
protected CompletableFuture<Result<DataQueryResult>> executeDataQueryInternal(
String query, YdbTable.TransactionControl txControl, Params params, ExecuteDataQuerySettings settings) {
YdbTable.ExecuteDataQueryRequest.Builder request = YdbTable.ExecuteDataQueryRequest.newBuilder()
.setSessionId(id)
Expand Down