Update implementation of custom query executor

Author: alex268

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

@@ -23,6 +23,7 @@
 import tech.ydb.jdbc.impl.YdbStaticResultSet;
 import tech.ydb.jdbc.query.QueryType;
 import tech.ydb.jdbc.query.YdbQuery;
+import tech.ydb.jdbc.settings.YdbOperationProperties;
 import tech.ydb.query.QueryClient;
 import tech.ydb.query.QuerySession;
 import tech.ydb.query.QueryStream;
@@ -42,27 +43,28 @@
  * @author Aleksandr Gorshenin
  */
 public class QueryServiceExecutor extends BaseYdbExecutor {
-    protected final Duration sessionTimeout;
-    protected final QueryClient queryClient;
+    private final Duration sessionTimeout;
+    private final QueryClient queryClient;
     private final boolean useStreamResultSet;
 
-    protected int transactionLevel;
-    protected boolean isReadOnly;
-    protected boolean isAutoCommit;
-    protected TxMode txMode;
+    private int transactionLevel;
+    private boolean isReadOnly;
+    private boolean isAutoCommit;
+    private TxMode txMode;
 
-    protected final AtomicReference<QueryTransaction> tx = new AtomicReference<>();
-    protected volatile boolean isClosed;
+    private final AtomicReference<QueryTransaction> tx = new AtomicReference<>();
+    private volatile boolean isClosed;
 
-    public QueryServiceExecutor(YdbContext ctx, int transactionLevel, boolean autoCommit) throws SQLException {
+    public QueryServiceExecutor(YdbContext ctx) throws SQLException {
         super(ctx);
-        this.sessionTimeout = ctx.getOperationProperties().getSessionTimeout();
+        YdbOperationProperties options = ctx.getOperationProperties();
+        this.sessionTimeout = options.getSessionTimeout();
         this.queryClient = ctx.getQueryClient();
-        this.useStreamResultSet = ctx.getOperationProperties().getUseStreamResultSets();
+        this.useStreamResultSet = options.getUseStreamResultSets();
 
-        this.transactionLevel = transactionLevel;
+        this.transactionLevel = options.getTransactionLevel();
+        this.isAutoCommit = options.isAutoCommit();
         this.isReadOnly = transactionLevel != Connection.TRANSACTION_SERIALIZABLE;
-        this.isAutoCommit = autoCommit;
         this.txMode = txMode(transactionLevel, isReadOnly);
         this.isClosed = false;
     }
@@ -179,22 +181,26 @@ public void commit(YdbContext ctx, YdbValidator validator) throws SQLException {
             return;
         }
 
-        YdbTracer tracer = ctx.getTracer();
-        tracer.trace("--> commit");
-        tracer.query(null);
-
-        CommitTransactionSettings settings = ctx.withRequestTimeout(CommitTransactionSettings.newBuilder()).build();
         try {
-            validator.clearWarnings();
-            validator.call("Commit TxId: " + localTx.getId(), tracer, () -> localTx.commit(settings));
+            commitImpl(ctx, validator, localTx);
         } finally {
             if (tx.compareAndSet(localTx, null)) {
                 localTx.getSession().close();
             }
-            tracer.close();
+            ctx.getTracer().close();
         }
     }
 
+    protected void commitImpl(YdbContext ctx, YdbValidator validator, QueryTransaction tx) throws SQLException {
+        YdbTracer tracer = ctx.getTracer();
+        tracer.trace("--> commit");
+        tracer.query(null);
+
+        CommitTransactionSettings settings = ctx.withRequestTimeout(CommitTransactionSettings.newBuilder()).build();
+        validator.clearWarnings();
+        validator.call("Commit TxId: " + tx.getId(), tracer, () -> tx.commit(settings));
+    }
+
     @Override
     public void rollback(YdbContext ctx, YdbValidator validator) throws SQLException {
         ensureOpened();
@@ -223,9 +229,8 @@ public void rollback(YdbContext ctx, YdbValidator validator) throws SQLException
     }
 
     @Override
-    public YdbQueryResult executeDataQuery(
-            YdbStatement statement, YdbQuery query, String preparedYql, Params params, long timeout, boolean keepInCache
-    ) throws SQLException {
+    public YdbQueryResult executeDataQuery(YdbStatement statement, YdbQuery query, String preparedYql, Params params,
+            long timeout, boolean keepInCache) throws SQLException {
         ensureOpened();
 
         YdbValidator validator = statement.getValidator();

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

@@ -15,6 +15,7 @@
 import tech.ydb.jdbc.impl.YdbStaticResultSet;
 import tech.ydb.jdbc.query.QueryType;
 import tech.ydb.jdbc.query.YdbQuery;
+import tech.ydb.jdbc.settings.YdbOperationProperties;
 import tech.ydb.table.Session;
 import tech.ydb.table.query.DataQueryResult;
 import tech.ydb.table.query.ExplainDataQueryResult;
@@ -35,10 +36,11 @@ public class TableServiceExecutor extends BaseYdbExecutor {
     private final boolean failOnTruncatedResult;
     private volatile TxState tx;
 
-    public TableServiceExecutor(YdbContext ctx, int transactionLevel, boolean autoCommit) throws SQLException {
+    public TableServiceExecutor(YdbContext ctx) throws SQLException {
         super(ctx);
-        this.tx = createTx(transactionLevel, autoCommit);
-        this.failOnTruncatedResult = ctx.getOperationProperties().isFailOnTruncatedResult();
+        YdbOperationProperties options = ctx.getOperationProperties();
+        this.tx = createTx(options.getTransactionLevel(), options.isAutoCommit());
+        this.failOnTruncatedResult = options.isFailOnTruncatedResult();
     }
 
     @Override