Fixed NPE for keepAlive (#96)

ydb-platform · Jan 20, 2025 · f7d1060 · f7d1060
2 parents 1c6c428 + 1e9e8f0
commit f7d1060
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/jdbc/src/main/java/tech/ydb/jdbc/context/TableServiceExecutor.java b/jdbc/src/main/java/tech/ydb/jdbc/context/TableServiceExecutor.java
@@ -248,7 +248,7 @@ public boolean isValid(YdbValidator validator, int timeout) throws SQLException
         try {
             KeepAliveSessionSettings settings = new KeepAliveSessionSettings().setTimeout(Duration.ofSeconds(timeout));
             Session.State keepAlive = validator.call(
-                    "Keep alive: " + tx.txID(), null,
+                    "Keep alive: " + tx.txID(),
                     () -> session.keepAlive(settings)
             );
             return keepAlive == Session.State.READY;

diff --git a/jdbc/src/test/java/tech/ydb/jdbc/YdbDriverTablesTest.java b/jdbc/src/test/java/tech/ydb/jdbc/YdbDriverTablesTest.java
@@ -59,6 +59,8 @@ public void defaultModeTest() throws SQLException {
 
             connection.createStatement().execute(CREATE_TABLE);
 
+            Assertions.assertTrue(connection.isValid(10));
+
             LocalDate ld = LocalDate.of(2017, 12, 3);
             String prefix = "text-value-";
             int idx = 0;
@@ -141,6 +143,8 @@ public void customQueriesTest() throws SQLException {
 
             conn.createStatement().execute(CREATE_TABLE);
 
+            Assertions.assertTrue(conn.isValid(10));
+
             LocalDate ld = LocalDate.of(2017, 12, 3);
             String prefix = "text-value-";
             int idx = 0;
@@ -219,6 +223,8 @@ public void forceScanAndBulkTest() throws SQLException {
 
             conn.createStatement().execute(CREATE_TABLE);
 
+            Assertions.assertTrue(conn.isValid(10));
+
             LocalDate ld = LocalDate.of(2017, 12, 3);
             String prefix = "text-value-";
             int idx = 0;
@@ -330,6 +336,8 @@ public void streamResultsTest() throws SQLException {
 
             conn.createStatement().execute(CREATE_TABLE);
 
+            Assertions.assertTrue(conn.isValid(10));
+
             LocalDate ld = LocalDate.of(2017, 12, 3);
             String prefix = "text-value-";
             int idx = 0;
@@ -454,6 +462,8 @@ public void tableServiceModeTest() throws SQLException {
 
             connection.createStatement().execute(CREATE_TABLE);
 
+            Assertions.assertTrue(connection.isValid(10));
+
             LocalDate ld = LocalDate.of(2017, 12, 3);
             String prefix = "text-value-";
             int idx = 0;

diff --git a/jdbc/src/test/java/tech/ydb/jdbc/impl/helper/JdbcConnectionExtention.java b/jdbc/src/test/java/tech/ydb/jdbc/impl/helper/JdbcConnectionExtention.java
@@ -39,9 +39,8 @@ private JdbcConnectionExtention(JdbcUrlHelper jdbcURL) {
     public JdbcConnectionExtention(YdbHelperExtension ydb, boolean autoCommit) {
         this(new JdbcUrlHelper(ydb)
                 .withArg("failOnTruncatedResult", "true")
-                .withArg("enableTxTracer", "true")
                 .withArg("autoCommit", String.valueOf(autoCommit))
-//                .withArg("useQueryService", "true")
+//                .withArg("useQueryService", "false")
         );
     }