Use custom codes for non standard transaction levels

Author: alex268

jdbc/src/main/java/tech/ydb/jdbc/YdbConst.java

@@ -1,7 +1,5 @@
 package tech.ydb.jdbc;
 
-import java.sql.Connection;
-
 public final class YdbConst {
 
     // SQL types
@@ -107,33 +105,25 @@ public final class YdbConst {
     public static final String MISSING_REQUIRED_VALUE = "Missing required value for parameter: ";
     public static final String INVALID_PARAMETER_TYPE = "Cannot cast parameter [%s] from [%s] to [%s]";
 
-    // Transaction levels
-    // See details in https://cloud.yandex.ru/docs/ydb/concepts/transactions
-
-    // Please note:
-    // Serializable transaction (RW) always uses "for-share" row-level locks before filter stage!
+    // Custom transaction levels
+    // See details in https://ydb.tech/docs/en/concepts/transactions#modes
 
-    /**
-     * All transactions are serialized one-by-one. If the DB detects a write collision among
-     * several concurrent transactions, only the first one is committed.
-     * This is the strongest level. And the only level at which data changes are possible.
-     */
-    public static final int TRANSACTION_SERIALIZABLE_READ_WRITE = Connection.TRANSACTION_SERIALIZABLE;
     /**
      * The most recent consistent state of the database. Read only.
      */
-    public static final int ONLINE_CONSISTENT_READ_ONLY = Connection.TRANSACTION_REPEATABLE_READ;
+    public static final int ONLINE_CONSISTENT_READ_ONLY = 16;
     /**
      * The most recent inconsistent state of the database. Read only.
      * A phantom read may occurs when, in the course of a transaction, some new rows are added
      * by another transaction to the records being read. This is the weakest level.
      */
-    public static final int ONLINE_INCONSISTENT_READ_ONLY = Connection.TRANSACTION_READ_COMMITTED;
+    public static final int ONLINE_INCONSISTENT_READ_ONLY = ONLINE_CONSISTENT_READ_ONLY + 1;
+
     /**
      * An <em>almost</em> recent consistent state of the database. Read only.
      * This level is faster then {@code ONLINE_CONSISTENT_READ_ONLY}, but may return stale data.
      */
-    public static final int STALE_CONSISTENT_READ_ONLY = 3; // TODO: verify if we can do that
+    public static final int STALE_CONSISTENT_READ_ONLY = 32;
 
     // Processing queries
     public static final String EXPLAIN_COLUMN_AST = "AST";

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

@@ -1,5 +1,6 @@
 package tech.ydb.jdbc.context;
 
+import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
 
@@ -38,7 +39,7 @@ public boolean isAutoCommit() {
     }
 
     public boolean isReadOnly() {
-        return transactionLevel != YdbConst.TRANSACTION_SERIALIZABLE_READ_WRITE;
+        return transactionLevel != Connection.TRANSACTION_SERIALIZABLE;
     }
 
     public boolean isInsideTransaction() {
@@ -64,7 +65,7 @@ public YdbTxState withReadOnly(boolean readOnly) throws SQLException {
         if (readOnly) {
             return create(YdbConst.ONLINE_CONSISTENT_READ_ONLY, isAutoCommit());
         } else {
-            return create(YdbConst.TRANSACTION_SERIALIZABLE_READ_WRITE, isAutoCommit());
+            return create(Connection.TRANSACTION_SERIALIZABLE, isAutoCommit());
         }
     }
 
@@ -111,7 +112,7 @@ public static YdbTxState create(int level, boolean autoCommit) throws SQLExcepti
     private static YdbTxState create(Session session, String txId, int level, boolean autoCommit)
             throws SQLException {
         switch (level) {
-            case YdbConst.TRANSACTION_SERIALIZABLE_READ_WRITE:
+            case Connection.TRANSACTION_SERIALIZABLE:
                 if (txId != null) {
                     return new TransactionInProgress(txId, session, autoCommit);
                 } else {
@@ -134,7 +135,7 @@ private static YdbTxState create(Session session, String txId, int level, boolea
 
     private static class EmptyTransaction extends YdbTxState {
         EmptyTransaction() {
-            super(TxControl.serializableRw().setCommitTx(false), YdbConst.TRANSACTION_SERIALIZABLE_READ_WRITE);
+            super(TxControl.serializableRw().setCommitTx(false), Connection.TRANSACTION_SERIALIZABLE);
         }
 
         @Override
@@ -158,7 +159,7 @@ private static class TransactionInProgress extends YdbTxState {
         private final Session session;
 
         TransactionInProgress(String id, Session session, boolean autoCommit) {
-            super(TxControl.id(id).setCommitTx(autoCommit), YdbConst.TRANSACTION_SERIALIZABLE_READ_WRITE);
+            super(TxControl.id(id).setCommitTx(autoCommit), Connection.TRANSACTION_SERIALIZABLE);
             this.id = id;
             this.session = session;
         }

jdbc/src/main/java/tech/ydb/jdbc/impl/YdbDatabaseMetaDataImpl.java

@@ -1,5 +1,6 @@
 package tech.ydb.jdbc.impl;
 
+import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.RowIdLifetime;
 import java.sql.SQLException;
@@ -616,7 +617,7 @@ public int getMaxUserNameLength() {
 
     @Override
     public int getDefaultTransactionIsolation() {
-        return YdbConst.TRANSACTION_SERIALIZABLE_READ_WRITE;
+        return Connection.TRANSACTION_SERIALIZABLE;
     }
 
     @Override
@@ -627,7 +628,7 @@ public boolean supportsTransactions() {
     @Override
     public boolean supportsTransactionIsolationLevel(int level) {
         switch (level) {
-            case YdbConst.TRANSACTION_SERIALIZABLE_READ_WRITE:
+            case Connection.TRANSACTION_SERIALIZABLE:
             case YdbConst.ONLINE_CONSISTENT_READ_ONLY:
             case YdbConst.ONLINE_INCONSISTENT_READ_ONLY:
             case YdbConst.STALE_CONSISTENT_READ_ONLY:

jdbc/src/test/java/tech/ydb/jdbc/YdbDriverProperitesTest.java

@@ -366,7 +366,7 @@ static Properties customizedProperties() {
         properties.setProperty("sessionTimeout", "6s");
         properties.setProperty("deadlineTimeout", "1s");
         properties.setProperty("autoCommit", "true");
-        properties.setProperty("transactionLevel", "4");
+        properties.setProperty("transactionLevel", "16");
 
         properties.setProperty("cacheConnectionsInDriver", "false");
         properties.setProperty("preparedStatementCacheQueries", "100");
@@ -407,7 +407,7 @@ static DriverPropertyInfo[] customizedPropertyInfo() {
                 YdbOperationProperty.SESSION_TIMEOUT.toDriverPropertyInfo("6s"),
                 YdbOperationProperty.DEADLINE_TIMEOUT.toDriverPropertyInfo("1s"),
                 YdbOperationProperty.AUTOCOMMIT.toDriverPropertyInfo("true"),
-                YdbOperationProperty.TRANSACTION_LEVEL.toDriverPropertyInfo("4"),
+                YdbOperationProperty.TRANSACTION_LEVEL.toDriverPropertyInfo("16"),
 
                 YdbOperationProperty.CACHE_CONNECTIONS_IN_DRIVER.toDriverPropertyInfo("false"),
                 YdbOperationProperty.PREPARED_STATEMENT_CACHE_SIZE.toDriverPropertyInfo("100"),

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

@@ -536,7 +536,7 @@ public void readOnly() throws SQLException {
         jdbc.connection().setReadOnly(true);
 
         Assertions.assertTrue(jdbc.connection().isReadOnly());
-        Assertions.assertEquals(Connection.TRANSACTION_REPEATABLE_READ, jdbc.connection().getTransactionIsolation());
+        Assertions.assertEquals(Connection.TRANSACTION_SERIALIZABLE, jdbc.connection().getTransactionIsolation());
 
         jdbc.connection().setReadOnly(false);
         Assertions.assertFalse(jdbc.connection().isReadOnly());
@@ -559,10 +559,10 @@ public void schema() throws SQLException {
 
     @ParameterizedTest(name = "Check supported isolation level {0}")
     @ValueSource(ints = {
-        YdbConst.TRANSACTION_SERIALIZABLE_READ_WRITE, // 8
-        YdbConst.ONLINE_CONSISTENT_READ_ONLY, // 4
-        YdbConst.ONLINE_INCONSISTENT_READ_ONLY, // 2
-        YdbConst.STALE_CONSISTENT_READ_ONLY // 3
+        Connection.TRANSACTION_SERIALIZABLE,    // 8
+        YdbConst.ONLINE_CONSISTENT_READ_ONLY,   // 16
+        YdbConst.ONLINE_INCONSISTENT_READ_ONLY, // 17
+        YdbConst.STALE_CONSISTENT_READ_ONLY     // 32
     })
     public void supportedTransactionIsolations(int level) throws SQLException {
         jdbc.connection().setTransactionIsolation(level);
@@ -574,7 +574,7 @@ public void supportedTransactionIsolations(int level) throws SQLException {
     }
 
     @ParameterizedTest(name = "Check supported isolation level {0}")
-    @ValueSource(ints = { 0, 1, /*2, 3, 4,*/ 5, 6, 7, /*8,*/ 9, 10 })
+    @ValueSource(ints = { 0, 1, 2, 3, 4, 5, 6, 7, /*8,*/ 9, 10 })
     public void unsupportedTransactionIsolations(int level) throws SQLException {
         ExceptionAssert.sqlException("Unsupported transaction level: " + level,
                 () -> jdbc.connection().setTransactionIsolation(level)

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

@@ -251,11 +251,10 @@ public void metaDataValuesTest() throws SQLException {
         Assertions.assertEquals(YdbConst.MAX_ELEMENT_NAME_LENGTH, metaData.getMaxTableNameLength());
         Assertions.assertEquals(0, metaData.getMaxStatements());
         Assertions.assertEquals(YdbConst.MAX_ELEMENT_NAME_LENGTH, metaData.getMaxTableNameLength());
-        Assertions.assertEquals(
-                YdbConst.TRANSACTION_SERIALIZABLE_READ_WRITE, metaData.getDefaultTransactionIsolation());
+        Assertions.assertEquals(Connection.TRANSACTION_SERIALIZABLE, metaData.getDefaultTransactionIsolation());
 
         Assertions.assertTrue(metaData.supportsTransactions());
-        Assertions.assertTrue(metaData.supportsTransactionIsolationLevel(YdbConst.TRANSACTION_SERIALIZABLE_READ_WRITE));
+        Assertions.assertTrue(metaData.supportsTransactionIsolationLevel(Connection.TRANSACTION_SERIALIZABLE));
         Assertions.assertTrue(metaData.supportsTransactionIsolationLevel(YdbConst.ONLINE_CONSISTENT_READ_ONLY));
         Assertions.assertTrue(metaData.supportsTransactionIsolationLevel(YdbConst.ONLINE_INCONSISTENT_READ_ONLY));
         Assertions.assertTrue(metaData.supportsTransactionIsolationLevel(YdbConst.STALE_CONSISTENT_READ_ONLY));