Merge pull request #320 from alex268/master

alex268 · web-flow · commit cc7bfa0b142d · 2024-09-26T16:34:56.000+01:00
Small fix and CI action update
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -4,36 +4,113 @@ on:
   push:
     branches:
       - master
-      - develop
       - release*
   pull_request:
       type: [opened, reopened, edited, synchronize]
 
 jobs:
+  prepare:
+    name: Prepare Maven cache
+    runs-on: ubuntu-latest
+
+    env:
+        MAVEN_ARGS: --batch-mode -Dstyle.color=always
+
+    steps:
+      - name: Checkout YDB Java SDK
+        uses: actions/checkout@v4
+        with:
+          path: sdk
+
+      - name: Checkout YDB YC Auth provider
+        uses: actions/checkout@v4
+        with:
+          repository: ydb-platform/ydb-java-yc
+          path: yc
+
+      - name: Checkout YDB JDBC Driver
+        uses: actions/checkout@v4
+        with:
+          repository: ydb-platform/ydb-jdbc-driver
+          path: jdbc
+
+      - name: Checkout YDB Java Examples
+        uses: actions/checkout@v4
+        with:
+          repository: ydb-platform/ydb-java-examples
+          path: examples
+
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: 'temurin'
+          cache: 'maven'
+          cache-dependency-path: |
+              sdk/pom.xml
+              sdk/bom/pom.xml
+              yc/pom.xml
+              jdbc/pom.xml
+
+      - name: Download YDB Java SDK dependencies
+        working-directory: ./sdk
+        run: mvn $MAVEN_ARGS dependency:go-offline
+
+      - name: Download YDB YC Auth provider dependencies
+        working-directory: ./yc
+        run: mvn $MAVEN_ARGS dependency:go-offline
+
+      - name: Download YDB JDBC Driver dependencies
+        working-directory: ./jdbc
+        run: mvn $MAVEN_ARGS dependency:go-offline
+
+      - name: Download YDB Java Examples dependencies
+        working-directory: ./examples
+        run: mvn $MAVEN_ARGS dependency:go-offline
+
   build:
-    name: YDB Java SDK CI with Maven
+    name: YDB Java SDK CI on JDK
     runs-on: ubuntu-latest
+    needs: prepare
 
     strategy:
       matrix:
         java: [ '8', '11', '17']
 
     env:
-        MAVEN_ARGS: --batch-mode --update-snapshots -Dstyle.color=always -DYDB_DOCKER_ISOLATION=true
+        MAVEN_ARGS: --batch-mode -Dstyle.color=always -DYDB_DOCKER_ISOLATION=true
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout YDB Java SDK
+        uses: actions/checkout@v4
         with:
           path: sdk
 
-      - name: Set up JDK 8
+      - name: Checkout YDB YC Auth provider
+        uses: actions/checkout@v4
+        with:
+          repository: ydb-platform/ydb-java-yc
+          path: yc
+
+      - name: Checkout YDB JDBC Driver
+        uses: actions/checkout@v4
+        with:
+          repository: ydb-platform/ydb-jdbc-driver
+          path: jdbc
+
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
           cache: 'maven'
+          cache-dependency-path: |
+              sdk/pom.xml
+              sdk/bom/pom.xml
+              yc/pom.xml
+              jdbc/pom.xml
 
-      - name: Extract SDK version
+      - name: Extract YDB Java SDK version
         working-directory: ./sdk
         run: |
           VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
@@ -45,38 +122,30 @@ jobs:
           VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
           echo "AUTH_API_VERSION=$VERSION" >> "$GITHUB_ENV"
 
-      - name: Download YDK SDK dependencies
-        working-directory: ./sdk
-        run: mvn $MAVEN_ARGS dependency:go-offline
-
-      - name: Build YDB SDK
+      - name: Build YDB Java SDK
         working-directory: ./sdk
         run: mvn $MAVEN_ARGS install
 
-      - uses: actions/checkout@v4
-        with:
-          repository: ydb-platform/ydb-java-yc
-          ref: develop
-          path: yc
-
-      - name: Download YDB YC Auth provider dependencies
-        working-directory: ./yc
-        run: mvn $MAVEN_ARGS -Dydb.auth-api.version=$AUTH_API_VERSION dependency:go-offline
-
       - name: Build YDB YC Auth provider
         working-directory: ./yc
         run: mvn $MAVEN_ARGS -Dydb.auth-api.version=$AUTH_API_VERSION install
 
-      - uses: actions/checkout@v4
+      - 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"
+
+      - name: Build YDB JDBC Driver with tests
+        working-directory: ./jdbc
+        run: mvn $MAVEN_ARGS -Dydb.sdk.version=$SDK_VERSION install
+
+      - name: Checkout YDB Java Examples
+        uses: actions/checkout@v4
         with:
           repository: ydb-platform/ydb-java-examples
-          ref: master
           path: examples
 
-      - name: Download dependencies
-        working-directory: ./examples
-        run: mvn $MAVEN_ARGS -Dydb.sdk.version=$SDK_VERSION dependency:go-offline
-
       - name: Test examples with Maven
         working-directory: ./examples
-        run: mvn $MAVEN_ARGS -Dydb.sdk.version=$SDK_VERSION test
+        run: mvn $MAVEN_ARGS -Dydb.sdk.version=$SDK_VERSION -Dydb.jdbc.version=$JDBC_VERSION test
diff --git a/query/src/main/java/tech/ydb/query/impl/QueryClientImpl.java b/query/src/main/java/tech/ydb/query/impl/QueryClientImpl.java
@@ -11,6 +11,7 @@
 import tech.ydb.core.grpc.GrpcTransport;
 import tech.ydb.query.QueryClient;
 import tech.ydb.query.QuerySession;
+import tech.ydb.table.SessionPoolStats;
 
 /**
  *
@@ -46,8 +47,8 @@ public void updatePoolMaxSize(int maxSize) {
         pool.updateMaxSize(maxSize);
     }
 
-    SessionPool getSessionPool() {
-        return pool;
+    public SessionPoolStats getSessionPoolStats() {
+        return pool.getStats();
     }
 
     @Override
diff --git a/query/src/main/java/tech/ydb/query/impl/SessionPool.java b/query/src/main/java/tech/ydb/query/impl/SessionPool.java
@@ -250,6 +250,8 @@ public void destroy() {
 
         @Override
         public void close() {
+            logger.trace("QuerySession[{}] closed with broke status {}", getId(), isBroken);
+
             stats.released.increment();
             if (isBroken || isStopped) {
                 queue.delete(this);
diff --git a/query/src/main/java/tech/ydb/query/impl/TableClientImpl.java b/query/src/main/java/tech/ydb/query/impl/TableClientImpl.java
@@ -49,7 +49,7 @@ public ScheduledExecutorService getScheduler() {
 
     @Override
     public SessionPoolStats sessionPoolStats() {
-        return proxy.getSessionPool().getStats();
+        return proxy.getSessionPoolStats();
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`import tech.ydb.core.grpc.GrpcTransport;`
`12`	`12`	`import tech.ydb.query.QueryClient;`
`13`	`13`	`import tech.ydb.query.QuerySession;`
	`14`	`+import tech.ydb.table.SessionPoolStats;`
`14`	`15`
`15`	`16`	`/**`
`16`	`17`	`*`
`@@ -46,8 +47,8 @@ public void updatePoolMaxSize(int maxSize) {`
`46`	`47`	`pool.updateMaxSize(maxSize);`
`47`	`48`	`}`
`48`	`49`
`49`		`- SessionPool getSessionPool() {`
`50`		`- return pool;`
	`50`	`+ public SessionPoolStats getSessionPoolStats() {`
	`51`	`+ return pool.getStats();`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public ScheduledExecutorService getScheduler() {`
`49`	`49`
`50`	`50`	`@Override`
`51`	`51`	`public SessionPoolStats sessionPoolStats() {`
`52`		`- return proxy.getSessionPool().getStats();`
	`52`	`+ return proxy.getSessionPoolStats();`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`