Skip to content

Commit 1806010

Browse files
committed
Removed unused timeout config
1 parent a90c8de commit 1806010

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

jdbc/src/main/java/tech/ydb/jdbc/context/QueryServiceExecutor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ public void commit(YdbContext ctx, YdbValidator validator) throws SQLException {
160160
return;
161161
}
162162

163-
CommitTransactionSettings settings = ctx.withOperationTimeout(CommitTransactionSettings.newBuilder()).build();
163+
CommitTransactionSettings settings = ctx.withRequestTimeout(CommitTransactionSettings.newBuilder()).build();
164164
try {
165165
validator.clearWarnings();
166166
validator.call("Commit TxId: " + tx.getId(), () -> tx.commit(settings));
@@ -177,7 +177,7 @@ public void rollback(YdbContext ctx, YdbValidator validator) throws SQLException
177177
return;
178178
}
179179

180-
RollbackTransactionSettings settings = ctx.withOperationTimeout(RollbackTransactionSettings.newBuilder())
180+
RollbackTransactionSettings settings = ctx.withRequestTimeout(RollbackTransactionSettings.newBuilder())
181181
.build();
182182

183183
try {

jdbc/src/main/java/tech/ydb/jdbc/context/YdbContext.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import tech.ydb.core.grpc.GrpcTransport;
1717
import tech.ydb.core.grpc.GrpcTransportBuilder;
1818
import tech.ydb.core.settings.BaseRequestSettings;
19-
import tech.ydb.core.settings.OperationSettings;
2019
import tech.ydb.jdbc.YdbConst;
2120
import tech.ydb.jdbc.YdbPrepareMode;
2221
import tech.ydb.jdbc.exception.ExceptionFactory;
@@ -237,16 +236,7 @@ public <T extends BaseRequestSettings.BaseBuilder<T>> T withRequestTimeout(T bui
237236
return builder;
238237
}
239238

240-
return builder.withRequestTimeout(operation.plusSeconds(1));
241-
}
242-
243-
public <T extends OperationSettings.OperationBuilder<T>> T withOperationTimeout(T builder) {
244-
Duration operation = operationProps.getDeadlineTimeout();
245-
if (operation.isNegative() || operation.isZero()) {
246-
return builder;
247-
}
248-
249-
return builder.withOperationTimeout(operation).withRequestTimeout(operation.plusSeconds(1));
239+
return builder.withRequestTimeout(operation);
250240
}
251241

252242
public YdbQuery parseYdbQuery(String sql) throws SQLException {

0 commit comments

Comments
 (0)