Merge remote-tracking branch 'upstream/master' into develop

# Conflicts:
#	jdbc/src/main/java/tech/ydb/jdbc/impl/YdbTypes.java

Author: KirillKurdyukov

.github/workflows/build.yaml

@@ -12,7 +12,7 @@ on:
 jobs:
   prepare:
     name: Prepare Maven cache
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     env:
         MAVEN_ARGS: --batch-mode -Dstyle.color=always
@@ -33,7 +33,7 @@ jobs:
 
   build:
     name: Build JDBC Driver
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: prepare
 
     strategy:
@@ -103,7 +103,7 @@ jobs:
   coverage:
     if: github.repository == 'ydb-platform/ydb-jdbc-driver'
     name: Coverage JDBC Driver
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build
 
     env:

.github/workflows/ci.yaml

@@ -11,7 +11,7 @@ on:
 jobs:
   prepare:
     name: Prepare Maven cache
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     env:
         MAVEN_ARGS: --batch-mode -Dstyle.color=always
@@ -47,7 +47,7 @@ jobs:
 
   build:
     name: YDB JDBC Driver CI on JDK
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: prepare
 
     strategy:
@@ -75,8 +75,10 @@ jobs:
       - name: Extract YDB JDBC Driver version
         working-directory: ./jdbc
         run: |
-          VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-          echo "JDBC_VERSION=$VERSION" >> "$GITHUB_ENV"
+          JDBC_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          SDK_VERSION=$(mvn help:evaluate -Dexpression=ydb.sdk.version -q -DforceStdout)
+          echo "JDBC_VERSION=$JDBC_VERSION" >> "$GITHUB_ENV"
+          echo "SDK_VERSION=$SDK_VERSION" >> "$GITHUB_ENV"
 
       - name: Build YDB JDBC Driver
         working-directory: ./jdbc
@@ -90,4 +92,4 @@ jobs:
 
       - name: Test examples with Maven
         working-directory: ./examples
-        run: mvn $MAVEN_ARGS -Dydb.jdbc.version=$JDBC_VERSION test
+        run: mvn $MAVEN_ARGS -Dydb.sdk.version=$SDK_VERSION -Dydb.jdbc.version=$JDBC_VERSION test

.github/workflows/publish.yaml

@@ -8,7 +8,7 @@ on:
 jobs:
   validate:
     name: Validate YDB JDBC Driver
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
@@ -52,7 +52,7 @@ jobs:
 
   publish:
     name: Publish YDB JDBC Driver
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: validate
 
     env:

CHANGELOG.md

@@ -1,3 +1,47 @@
+## 2.3.10 ##
+
+* Added .metadata folder to system tables
+* Added support of GRANT/REVOKE keywords
+
+## 2.3.9 ##
+
+* Added option 'forceJdbcParameters' to detect ? in whole query text
+* Added option 'tokenProvider' to use custom auth provider
+* Upgrade to Java SDK 2.3.13
+
+## 2.3.8 ##
+
+* Added option 'grpcCompression'
+* Added bulk upsert validation
+* All grpc calls isolated from parent context
+
+## 2.3.7 ##
+
+* Added slf4j-to-jul to shaded jar
+* Upgrade to use Java SDK v2.3.8
+
+## 2.3.6 ##
+
+* Added jdbc_table which can be converted to AS_TABLE($list)
+
+## 2.3.5 ##
+
+* Disabled stream reader sets for SCAN queries
+
+## 2.3.4 ##
+
+* Upgraded to YDB Java SDK 2.3.6
+* Fixed closing of ResultSet on prepareStatement and createStatement
+* Added support of convertion IN (?, ?, ?) to IN $list
+* Added option cachedTransportsCount to shard JDBC connections
+
+## 2.3.3 ##
+
+* Upgraded to YDB Java SDK 2.3.5
+* Added support of setString for all YDB types
+* Fixed disablePrepareDataQuery option
+* Added support of UUID and custom decimal types
+
 ## 2.3.2 ##
 
 * Fixed typo in YdbTracer

README.md

@@ -26,14 +26,14 @@ Specify the YDB JDBC driver in the dependencies:
     <dependency>
         <groupId>tech.ydb.jdbc</groupId>
         <artifactId>ydb-jdbc-driver</artifactId>
-        <version>2.3.2</version>
+        <version>2.3.10</version>
     </dependency>
 
     <!-- Shaded version with included dependencies -->
     <dependency>
         <groupId>tech.ydb.jdbc</groupId>
         <artifactId>ydb-jdbc-driver-shaded</artifactId>
-        <version>2.3.2</version>
+        <version>2.3.10</version>
     </dependency>
 </dependencies>
 ```

jdbc-shaded/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>tech.ydb.jdbc</groupId>
         <artifactId>ydb-jdbc-driver-parent</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>ydb-jdbc-driver-shaded</artifactId>
@@ -19,6 +19,11 @@
             <groupId>tech.ydb.jdbc</groupId>
             <artifactId>ydb-jdbc-driver</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -117,6 +122,12 @@
                                 <exclude>META-INF/*.RSA</exclude>
                             </excludes>
                         </filter>
+                        <filter>
+                            <artifact>org.slf4j:slf4j-api</artifact>
+                            <excludes>
+                                <exclude>org/slf4j/impl/**</exclude>
+                            </excludes>
+                        </filter>
                     </filters>
 
                     <relocations>

jdbc/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>tech.ydb.jdbc</groupId>
         <artifactId>ydb-jdbc-driver-parent</artifactId>
-        <version>2.3.3-SNAPSHOT</version>
+        <version>2.3.11-SNAPSHOT</version>
     </parent>
 
     <artifactId>ydb-jdbc-driver</artifactId>
@@ -77,6 +77,7 @@
                     <environmentVariables>
                         <TESTCONTAINERS_REUSE_ENABLE>true</TESTCONTAINERS_REUSE_ENABLE>
                         <YDB_DOCKER_IMAGE>ydbplatform/local-ydb:trunk</YDB_DOCKER_IMAGE>
+                        <YDB_DOCKER_FEATURE_FLAGS>enable_parameterized_decimal</YDB_DOCKER_FEATURE_FLAGS>
                     </environmentVariables>
                     <systemPropertyVariables>
                         <java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>

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

@@ -6,11 +6,7 @@ public final class YdbConst {
     public static final int UNKNOWN_SQL_TYPE = Integer.MIN_VALUE;
 
     public static final int SQL_KIND_PRIMITIVE = 10000;
-    public static final int SQL_KIND_DECIMAL = 1 << 15; // 32768
-
-    // YDB does not support types with custom precision yet
-    public static final int SQL_DECIMAL_DEFAULT_PRECISION = 22;
-    public static final int SQL_DECIMAL_DEFAULT_SCALE = 9;
+    public static final int SQL_KIND_DECIMAL = 1 << 14; // 16384
 
     // Built-in limits
     public static final int MAX_PRIMARY_KEY_SIZE = 1024 * 1024; // 1 MiB per index

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

@@ -47,7 +47,7 @@ public YdbConnection connect(String url, Properties info) throws SQLException {
         }
 
         YdbConfig config = YdbConfig.from(url, info);
-        LOGGER.log(Level.FINE, "About to connect to [{0}] using properties {1}", new Object[] {
+        LOGGER.log(Level.FINE, "Connect to [{0}] using properties {1}", new Object[] {
             config.getSafeUrl(),
             config.getSafeProps()
         });
@@ -80,7 +80,7 @@ public YdbContext getCachedContext(YdbConfig config) throws SQLException {
         // Was fixed in Java 9+
         YdbContext context = cache.get(config);
         if (context != null) {
-            LOGGER.log(Level.FINE, "Reusing YDB connection to {0}", config.getSafeUrl());
+            LOGGER.log(Level.FINEST, "Reusing YDB connection to {0}", config.getSafeUrl());
             return context;
         }
 

jdbc/src/main/java/tech/ydb/jdbc/common/FixedResultSetFactory.java

@@ -317,6 +317,22 @@ public Duration getInterval() {
             return value.getInterval();
         }
 
+        public LocalDate getDate32() {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        public LocalDateTime getDatetime64() {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        public Instant getTimestamp64() {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
+        public Duration getInterval64() {
+            throw new UnsupportedOperationException("Not supported yet.");
+        }
+
         @Override
         public ZonedDateTime getTzDate() {
             return value.getTzDate();

jdbc/src/main/java/tech/ydb/jdbc/common/MappingGetters.java

@@ -64,17 +64,17 @@ static Getters buildGetters(Type type) {
                         castToBooleanNotSupported(clazz),
                         castToByteNotSupported(clazz),
                         castToShortNotSupported(clazz),
-                        value -> value.getDecimal().toBigInteger().intValue(),
-                        value -> value.getDecimal().toBigInteger().longValue(),
-                        value -> value.getDecimal().toBigDecimal().floatValue(),
-                        value -> value.getDecimal().toBigDecimal().doubleValue(),
+                        value -> safeDecimalInt(value.getDecimal()),
+                        value -> safeDecimalLong(value.getDecimal()),
+                        value -> safeDecimal(value.getDecimal()).floatValue(),
+                        value -> safeDecimal(value.getDecimal()).doubleValue(),
                         castToBytesNotSupported(clazz),
-                        value -> value.getDecimal().toBigDecimal(),
+                        value -> safeDecimal(value.getDecimal()),
                         castToClassNotSupported(clazz),
                         castToInstantNotSupported(clazz),
                         castToNStringNotSupported(clazz),
                         castToUrlNotSupported(clazz),
-                        value -> value.getDecimal().toBigDecimal(),
+                        value -> safeDecimal(value.getDecimal()),
                         castToReaderNotSupported(clazz)
                 );
             case VOID:
@@ -235,6 +235,35 @@ private static ValueToBoolean valueToBoolean(PrimitiveType id) {
         }
     }
 
+    private static BigDecimal safeDecimal(DecimalValue value) throws SQLException {
+        if (value.isInf() || value.isNegativeInf() || value.isNan()) {
+            throw cannotConvert(value.getType(), BigDecimal.class, value.toString());
+        }
+        return value.toBigDecimal();
+    }
+
+    private static int safeDecimalInt(DecimalValue value) throws SQLException {
+        if (value.isInf() || value.isNegativeInf() || value.isNan()) {
+            throw cannotConvert(value.getType(), int.class, value.toString());
+        }
+        try {
+            return value.toBigDecimal().intValueExact();
+        } catch (ArithmeticException ex) {
+            throw cannotConvert(value.getType(), int.class, value.toString());
+        }
+    }
+
+    private static long safeDecimalLong(DecimalValue value) throws SQLException {
+        if (value.isInf() || value.isNegativeInf() || value.isNan()) {
+            throw cannotConvert(value.getType(), long.class, value.toString());
+        }
+        try {
+            return value.toBigDecimal().longValueExact();
+        } catch (ArithmeticException ex) {
+            throw cannotConvert(value.getType(), long.class, value.toString());
+        }
+    }
+
     private static byte checkByteValue(PrimitiveType id, int value) throws SQLException {
         int ch = value >= 0 ? value : ~value;
         if ((ch & 0x7F) != ch) {
@@ -574,8 +603,9 @@ private static SqlType buildPrimitiveType(int sqlType, PrimitiveType id) {
             case Text:
             case Json:
             case JsonDocument:
-            case Uuid:
                 return new SqlType(sqlType, String.class);
+            case Uuid:
+                return new SqlType(sqlType, UUID.class);
             case Bytes:
             case Yson:
                 return new SqlType(sqlType, byte[].class);
@@ -857,7 +887,7 @@ private static ValueToClass valueToClass(PrimitiveType id) {
         }
     }
 
-    private static SQLException cannotConvert(PrimitiveType type, Class<?> javaType, Object value) {
+    private static SQLException cannotConvert(Type type, Class<?> javaType, Object value) {
         return new SQLException(String.format(YdbConst.UNABLE_TO_CONVERT, type, value, javaType));
     }