Removed QueryService impelemntation of scanQuery

Author: alex268

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

@@ -1,15 +1,25 @@
 package tech.ydb.jdbc.context;
 
 import java.sql.SQLException;
+import java.time.Duration;
 import java.util.Collections;
 import java.util.concurrent.atomic.AtomicReference;
 
+import tech.ydb.core.Result;
+import tech.ydb.core.UnexpectedResultException;
+import tech.ydb.core.grpc.GrpcReadStream;
 import tech.ydb.jdbc.YdbConst;
 import tech.ydb.jdbc.YdbStatement;
+import tech.ydb.jdbc.exception.ExceptionFactory;
 import tech.ydb.jdbc.impl.YdbQueryResult;
 import tech.ydb.jdbc.query.QueryType;
 import tech.ydb.jdbc.query.YdbQuery;
+import tech.ydb.table.Session;
 import tech.ydb.table.SessionRetryContext;
+import tech.ydb.table.TableClient;
+import tech.ydb.table.query.Params;
+import tech.ydb.table.result.ResultSetReader;
+import tech.ydb.table.settings.ExecuteScanQuerySettings;
 import tech.ydb.table.settings.ExecuteSchemeQuerySettings;
 import tech.ydb.table.values.ListValue;
 
@@ -19,13 +29,27 @@
  */
 public abstract class BaseYdbExecutor implements YdbExecutor {
     private final SessionRetryContext retryCtx;
+    private final Duration sessionTimeout;
+    private final TableClient tableClient;
     private final AtomicReference<YdbQueryResult> currResult;
 
     public BaseYdbExecutor(YdbContext ctx) {
         this.retryCtx = ctx.getRetryCtx();
+        this.sessionTimeout = ctx.getOperationProperties().getSessionTimeout();
+        this.tableClient = ctx.getTableClient();
         this.currResult = new AtomicReference<>();
     }
 
+    protected Session createNewTableSession(YdbValidator validator) throws SQLException {
+        try {
+            Result<Session> session = tableClient.createSession(sessionTimeout).join();
+            validator.addStatusIssues(session.getStatus());
+            return session.getValue();
+        } catch (UnexpectedResultException ex) {
+            throw ExceptionFactory.createException("Cannot create session with " + ex.getStatus(), ex);
+        }
+    }
+
     protected void closeCurrentResult() throws SQLException {
         YdbQueryResult rs = currResult.get();
         if (rs != null) {
@@ -79,4 +103,29 @@ public YdbQueryResult executeBulkUpsert(YdbStatement statement, YdbQuery query,
 
         return updateCurrentResult(new StaticQueryResult(query, Collections.emptyList()));
     }
+
+    @Override
+    public YdbQueryResult executeScanQuery(YdbStatement statement, YdbQuery query, String yql, Params params)
+            throws SQLException {
+        ensureOpened();
+
+        YdbContext ctx = statement.getConnection().getCtx();
+        YdbValidator validator = statement.getValidator();
+        Duration scanQueryTimeout = ctx.getOperationProperties().getScanQueryTimeout();
+        ExecuteScanQuerySettings settings = ExecuteScanQuerySettings.newBuilder()
+                .withRequestTimeout(scanQueryTimeout)
+                .build();
+
+        final Session session = createNewTableSession(validator);
+
+        String msg = QueryType.SCAN_QUERY + " >>\n" + yql;
+        StreamQueryResult lazy = validator.call(msg, () -> {
+            GrpcReadStream<ResultSetReader> stream = session.executeScanQuery(yql, params, settings);
+            StreamQueryResult result = new StreamQueryResult(msg, statement, query, stream::cancel);
+            return result.execute(stream, session::close);
+        });
+
+        return updateCurrentResult(lazy);
+    }
+
 }

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

@@ -245,30 +245,6 @@ public YdbQueryResult executeDataQuery(
         }
     }
 
-    @Override
-    public YdbQueryResult executeScanQuery(YdbStatement statement, YdbQuery query, String yql, Params params)
-            throws SQLException {
-        ensureOpened();
-
-        YdbContext ctx = statement.getConnection().getCtx();
-        YdbValidator validator = statement.getValidator();
-
-        Duration scanQueryTimeout = ctx.getOperationProperties().getScanQueryTimeout();
-        ExecuteQuerySettings settings = ExecuteQuerySettings.newBuilder()
-                .withRequestTimeout(scanQueryTimeout)
-                .build();
-
-        final QuerySession session = createNewQuerySession(validator);
-        String msg = "STREAM_QUERY >>\n" + yql;
-        StreamQueryResult lazy = validator.call(msg, () -> {
-            QueryStream stream = session.createQuery(yql, TxMode.SNAPSHOT_RO, params, settings);
-            StreamQueryResult result = new StreamQueryResult(msg, statement, query, stream::cancel);
-            return result.execute(stream, session::close);
-        });
-
-        return updateCurrentResult(lazy);
-    }
-
     @Override
     public YdbQueryResult executeSchemeQuery(YdbStatement statement, YdbQuery query) throws SQLException {
         ensureOpened();

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

@@ -7,26 +7,20 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import tech.ydb.core.Result;
-import tech.ydb.core.UnexpectedResultException;
-import tech.ydb.core.grpc.GrpcReadStream;
 import tech.ydb.jdbc.YdbConst;
 import tech.ydb.jdbc.YdbResultSet;
 import tech.ydb.jdbc.YdbStatement;
-import tech.ydb.jdbc.exception.ExceptionFactory;
 import tech.ydb.jdbc.impl.YdbQueryResult;
 import tech.ydb.jdbc.impl.YdbStaticResultSet;
 import tech.ydb.jdbc.query.QueryType;
 import tech.ydb.jdbc.query.YdbQuery;
 import tech.ydb.table.Session;
-import tech.ydb.table.TableClient;
 import tech.ydb.table.query.DataQueryResult;
 import tech.ydb.table.query.ExplainDataQueryResult;
 import tech.ydb.table.query.Params;
 import tech.ydb.table.result.ResultSetReader;
 import tech.ydb.table.settings.CommitTxSettings;
 import tech.ydb.table.settings.ExecuteDataQuerySettings;
-import tech.ydb.table.settings.ExecuteScanQuerySettings;
 import tech.ydb.table.settings.ExplainDataQuerySettings;
 import tech.ydb.table.settings.KeepAliveSessionSettings;
 import tech.ydb.table.settings.RollbackTxSettings;
@@ -37,15 +31,11 @@
  * @author Aleksandr Gorshenin
  */
 public class TableServiceExecutor extends BaseYdbExecutor {
-    private final Duration sessionTimeout;
-    private final TableClient tableClient;
     private final boolean failOnTruncatedResult;
     private volatile TxState tx;
 
     public TableServiceExecutor(YdbContext ctx, int transactionLevel, boolean autoCommit) throws SQLException {
         super(ctx);
-        this.sessionTimeout = ctx.getOperationProperties().getSessionTimeout();
-        this.tableClient = ctx.getTableClient();
         this.tx = createTx(transactionLevel, autoCommit);
         this.failOnTruncatedResult = ctx.getOperationProperties().isFailOnTruncatedResult();
     }
@@ -63,16 +53,6 @@ private void updateState(TxState newTx) {
         this.tx = newTx;
     }
 
-    protected Session createNewTableSession(YdbValidator validator) throws SQLException {
-        try {
-            Result<Session> session = tableClient.createSession(sessionTimeout).join();
-            validator.addStatusIssues(session.getStatus());
-            return session.getValue();
-        } catch (UnexpectedResultException ex) {
-            throw ExceptionFactory.createException("Cannot create session with " + ex.getStatus(), ex);
-        }
-    }
-
     @Override
     public void setTransactionLevel(int level) throws SQLException {
         ensureOpened();
@@ -233,30 +213,6 @@ public YdbQueryResult executeDataQuery(YdbStatement statement, YdbQuery query, S
         }
     }
 
-    @Override
-    public YdbQueryResult executeScanQuery(YdbStatement statement, YdbQuery query, String yql, Params params)
-            throws SQLException {
-        ensureOpened();
-
-        YdbContext ctx = statement.getConnection().getCtx();
-        YdbValidator validator = statement.getValidator();
-        Duration scanQueryTimeout = ctx.getOperationProperties().getScanQueryTimeout();
-        ExecuteScanQuerySettings settings = ExecuteScanQuerySettings.newBuilder()
-                .withRequestTimeout(scanQueryTimeout)
-                .build();
-
-        final Session session = createNewTableSession(validator);
-
-        String msg = QueryType.SCAN_QUERY + " >>\n" + yql;
-        StreamQueryResult lazy = validator.call(msg, () -> {
-            GrpcReadStream<ResultSetReader> stream = session.executeScanQuery(yql, params, settings);
-            StreamQueryResult result = new StreamQueryResult(msg, statement, query, stream::cancel);
-            return result.execute(stream, session::close);
-        });
-
-        return updateCurrentResult(lazy);
-    }
-
     @Override
     public boolean isValid(YdbValidator validator, int timeout) throws SQLException {
         ensureOpened();

jdbc/src/test/java/tech/ydb/jdbc/impl/YdbQueryConnectionImplTest.java

@@ -828,18 +828,6 @@ public void testWarningsInQuery() throws SQLException {
                             warnings.getMessage());
                     Assertions.assertNull(warnings.getNextWarning());
                 }
-
-                try (ResultSet rs = statement.executeQuery("SCAN " + query)) {
-                    Assertions.assertFalse(rs.next());
-
-                    SQLWarning warnings = statement.getWarnings();
-                    Assertions.assertNotNull(warnings);
-
-                    Assertions.assertEquals("#1060 Execution (S_WARNING)\n  "
-                            + "2:1 - 2:1: #2503 Given predicate is not suitable for used index: idx_value (S_WARNING)",
-                            warnings.getMessage());
-                    Assertions.assertNull(warnings.getNextWarning());
-                }
             } finally {
                 statement.execute(dropTempTable);
             }

jdbc/src/test/java/tech/ydb/jdbc/impl/YdbQueryPreparedStatementImplTest.java

@@ -350,7 +350,7 @@ public void executeScanQueryAsUpdate() throws SQLException {
             statement.setInt(1, 1);
             statement.setString(2, "value-1");
 
-            ExceptionAssert.ydbException("Operation 'Upsert' can't be performed in read only transaction",
+            ExceptionAssert.ydbException("Scan query should have a single result set",
                     statement::executeQuery);
         }
     }