Merge branch 'master' into SNOW-1313625-Verify-value-bindings-exceedi…

…ng-CLIENT_STAGE_ARRAY_BINDING_THRESHOLD
snowflakedb · Nov 28, 2024 · 128730c · 128730c
2 parents 3ddc536 + a20f2cf
commit 128730c
Show file tree

Hide file tree

Showing 324 changed files with 6,962 additions and 5,701 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -29,7 +29,7 @@ jobs:
         name: Build
         runs-on: ubuntu-20.04
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v4
             - name: Build
               shell: bash
               env:
@@ -38,13 +38,16 @@ jobs:
 
     test-windows:
         needs: build
-        name: ${{ matrix.runConfig.cloud }} Windows java ${{ matrix.runConfig.javaVersion }} JDBC${{ matrix.additionalMavenProfile }} ${{ matrix.category }}
+        name: ${{ matrix.runConfig.cloud }} Windows java ${{ matrix.runConfig.javaVersion }} JDBC${{ matrix.additionalMavenProfile }} ${{ matrix.category.name }}
         runs-on: windows-latest
         strategy:
             fail-fast: false
             matrix:
                 runConfig: [ {cloud: 'AWS', javaVersion: '8'}, {cloud: 'GCP', javaVersion: '11'}, {cloud: 'AZURE', javaVersion: '17'}, {cloud: 'AWS', javaVersion: '21'}]
-                category: ['TestCategoryResultSet,TestCategoryStatement,TestCategoryLoader', 'TestCategoryOthers', 'TestCategoryArrow,TestCategoryConnection,TestCategoryCore,TestCategoryDiagnostic', 'TestCategoryFips']
+                category: [{suites: 'ResultSetTestSuite,StatementTestSuite,LoaderTestSuite', name: 'TestCategoryResultSet,TestCategoryStatement,TestCategoryLoader'},
+                           {suites: 'OthersTestSuite', name: 'TestCategoryOthers'},
+                           {suites: 'ArrowTestSuite,ConnectionTestSuite,CoreTestSuite,DiagnosticTestSuite', name: 'TestCategoryArrow,TestCategoryConnection,TestCategoryCore,TestCategoryDiagnostic'},
+                           {suites: 'FipsTestSuite', name: "TestCategoryFips"}]
                 additionalMavenProfile: ['']
         steps:
             - uses: actions/checkout@v4
@@ -53,7 +56,7 @@ jobs:
                 java-version: ${{ matrix.runConfig.javaVersion }}
                 distribution: 'temurin'
                 cache: maven
-            - uses: actions/setup-python@v4
+            - uses: actions/setup-python@v5
               with:
                 python-version: '3.7'
                 architecture: 'x64'
@@ -62,19 +65,22 @@ jobs:
               env:
                 PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
                 CLOUD_PROVIDER: ${{ matrix.runConfig.cloud }}
-                JDBC_TEST_CATEGORY: ${{ matrix.category }}
+                JDBC_TEST_SUITES: ${{ matrix.category.suites }}
                 ADDITIONAL_MAVEN_PROFILE: ${{ matrix.additionalMavenProfile }}
               run: ci\\test_windows.bat
 
     test-mac:
         needs: build
-        name: ${{ matrix.runConfig.cloud }} Mac java ${{ matrix.runConfig.javaVersion }} JDBC${{ matrix.additionalMavenProfile }} ${{ matrix.category }}
+        name: ${{ matrix.runConfig.cloud }} Mac java ${{ matrix.runConfig.javaVersion }} JDBC${{ matrix.additionalMavenProfile }} ${{ matrix.category.name }}
         runs-on: macos-13
         strategy:
             fail-fast: false
             matrix:
                 runConfig: [ {cloud: 'AWS', javaVersion: '8'}, {cloud: 'GCP', javaVersion: '11'}, {cloud: 'AZURE', javaVersion: '17'}, {cloud: 'AWS', javaVersion: '21'}]
-                category: ['TestCategoryResultSet,TestCategoryStatement,TestCategoryLoader', 'TestCategoryOthers', 'TestCategoryArrow,TestCategoryConnection,TestCategoryCore,TestCategoryDiagnostic', 'TestCategoryFips']
+                category: [{suites: 'ResultSetTestSuite,StatementTestSuite,LoaderTestSuite', name: 'TestCategoryResultSet,TestCategoryStatement,TestCategoryLoader'},
+                           {suites: 'OthersTestSuite', name: 'TestCategoryOthers'},
+                           {suites: 'ArrowTestSuite,ConnectionTestSuite,CoreTestSuite,DiagnosticTestSuite', name: 'TestCategoryArrow,TestCategoryConnection,TestCategoryCore,TestCategoryDiagnostic'},
+                           {suites: 'FipsTestSuite', name: "TestCategoryFips"}]
                 additionalMavenProfile: ['']
         steps:
             - uses: actions/checkout@v4
@@ -83,7 +89,7 @@ jobs:
                 java-version: ${{ matrix.runConfig.javaVersion }}
                 distribution: 'temurin'
                 cache: maven
-            - uses: actions/setup-python@v4
+            - uses: actions/setup-python@v5
               with:
                 python-version: '3.7'
             - name: Install Homebrew Bash
@@ -94,51 +100,56 @@ jobs:
               env:
                 PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
                 CLOUD_PROVIDER: ${{ matrix.runConfig.cloud }}
-                JDBC_TEST_CATEGORY: ${{ matrix.category }}
+                JDBC_TEST_SUITES: ${{ matrix.category.suites }}
                 ADDITIONAL_MAVEN_PROFILE: ${{ matrix.additionalMavenProfile }}
               run: /usr/local/bin/bash ./ci/test_mac.sh
 
     test-linux:
         needs: build
-        name: ${{ matrix.cloud }} Linux java on ${{ matrix.image }} JDBC${{ matrix.additionalMavenProfile }} ${{ matrix.category }}
+        name: ${{ matrix.cloud }} Linux java on ${{ matrix.image }} JDBC${{ matrix.additionalMavenProfile }} ${{ matrix.category.name }}
         runs-on: ubuntu-latest
         strategy:
             fail-fast: false
             matrix:
                 image: [ 'jdbc-centos7-openjdk8', 'jdbc-centos7-openjdk11', 'jdbc-centos7-openjdk17', 'jdbc-centos7-openjdk21' ]
                 cloud: [ 'AWS', 'AZURE', 'GCP' ]
-                category: ['TestCategoryResultSet,TestCategoryStatement,TestCategoryLoader', 'TestCategoryOthers', 'TestCategoryArrow,TestCategoryConnection,TestCategoryCore,TestCategoryDiagnostic', 'TestCategoryFips']
+                category: [{suites: 'ResultSetTestSuite,StatementTestSuite,LoaderTestSuite', name: 'TestCategoryResultSet,TestCategoryStatement,TestCategoryLoader'},
+                           {suites: 'OthersTestSuite', name: 'TestCategoryOthers'},
+                           {suites: 'ArrowTestSuite,ConnectionTestSuite,CoreTestSuite,DiagnosticTestSuite', name: 'TestCategoryArrow,TestCategoryConnection,TestCategoryCore,TestCategoryDiagnostic'},
+                           {suites: 'FipsTestSuite', name: "TestCategoryFips"}]
                 additionalMavenProfile: ['', '-Dthin-jar']
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v4
             - name: Tests
               shell: bash
               env:
                 PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
                 CLOUD_PROVIDER: ${{ matrix.cloud }}
                 TARGET_DOCKER_TEST_IMAGE: ${{ matrix.image }}
-                JDBC_TEST_CATEGORY: ${{ matrix.category }}
+                JDBC_TEST_SUITES: ${{ matrix.category.suites }}
                 ADDITIONAL_MAVEN_PROFILE: ${{ matrix.additionalMavenProfile }}
               run: ./ci/test.sh
 
     test-linux-old-driver:
-        name: Old JDBC ${{ matrix.category }} on ${{ matrix.image }}
+        name: Old JDBC ${{ matrix.category.name }} on ${{ matrix.image }}
         runs-on: ubuntu-latest
         strategy:
             fail-fast: false
             matrix:
                 image: [ 'jdbc-centos7-openjdk8' ]
                 cloud: [ 'AWS' ]
-                category: ['TestCategoryOthers', 'TestCategoryConnection,TestCategoryStatement', 'TestCategoryCore,TestCategoryLoader,TestCategoryResultSet']
+                category: [{suites: 'OthersOldDriverTestSuite', name: 'TestCategoryOthers'},
+                           {suites: 'ConnectionOldDriverTestSuite,StatementOldDriverTestSuite', name: 'TestCategoryConnection,TestCategoryStatement'},
+                           {suites: 'LoaderOldDriverTestSuite,ResultSetOldDriverTestSuite', name: 'TestCategoryLoader,TestCategoryResultSet'}]
                 is_old_driver: ['true']
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v4
             - name: Tests
               shell: bash
               env:
                 PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
                 CLOUD_PROVIDER: ${{ matrix.cloud }}
                 TARGET_DOCKER_TEST_IMAGE: ${{ matrix.image }}
-                JDBC_TEST_CATEGORY: ${{ matrix.category }}
+                JDBC_TEST_SUITES: ${{ matrix.category.suites }}
                 is_old_driver: ${{ matrix.is_old_driver }}
               run: ./ci/test.sh
diff --git a/.github/workflows/check-style.yml b/.github/workflows/check-style.yml
@@ -9,7 +9,7 @@ jobs:
         name: Check Style
         runs-on: ubuntu-20.04
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v4
             - name: Check Style
               shell: bash
               run: mvn clean validate --batch-mode --show-version -P check-style
diff --git a/.github/workflows/jira_close.yml b/.github/workflows/jira_close.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: snowflakedb/gh-actions
           ref: jira_v1

diff --git a/.github/workflows/jira_issue.yml b/.github/workflows/jira_issue.yml
@@ -14,7 +14,7 @@ jobs:
     if: ((github.event_name == 'issue_comment' && github.event.comment.body == 'recreate jira' && github.event.comment.user.login == 'sfc-gh-mkeller') || (github.event_name == 'issues' && github.event.pull_request.user.login != 'whitesource-for-github-com[bot]'))
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: snowflakedb/gh-actions
           ref: jira_v1

diff --git a/.github/workflows/snyk-issue.yml b/.github/workflows/snyk-issue.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: checkout action
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: snowflakedb/whitesource-actions
         token: ${{ secrets.WHITESOURCE_ACTION_TOKEN }}

diff --git a/.github/workflows/snyk-pr.yml b/.github/workflows/snyk-pr.yml
@@ -15,13 +15,13 @@ jobs:
     if: ${{ github.event.pull_request.user.login == 'sfc-gh-snyk-sca-sa' }}
     steps:
     - name: checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: ${{ github.event.pull_request.head.ref }}
         fetch-depth: 0
 
     - name: checkout action
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: snowflakedb/whitesource-actions
         token: ${{ secrets.WHITESOURCE_ACTION_TOKEN }}

diff --git a/FIPS/pom.xml b/FIPS/pom.xml
@@ -510,6 +510,22 @@
                        <pattern>io.grpc</pattern>
                        <shadedPattern>${shadeBase}.grpc</shadedPattern>
                      </relocation>
+                     <relocation>
+                       <pattern>META-INF.native.io_grpc_netty_shaded_netty_tcnative</pattern>
+                       <shadedPattern>META-INF.native.${shadeNativeBase}_grpc_netty_shaded_netty_tcnative</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>META-INF.native.libio_grpc_netty_shaded_netty_tcnative</pattern>
+                       <shadedPattern>META-INF.native.lib${shadeNativeBase}_grpc_netty_shaded_netty_tcnative</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>META-INF.native.io_grpc_netty_shaded_netty_transport_native_epoll</pattern>
+                       <shadedPattern>META-INF.native.${shadeNativeBase}_grpc_netty_shaded_netty_transport_native_epoll</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>META-INF.native.libio_grpc_netty_shaded_netty_transport_native_epoll</pattern>
+                       <shadedPattern>META-INF.native.lib${shadeNativeBase}_grpc_netty_shaded_netty_transport_native_epoll</shadedPattern>
+                     </relocation>
                      <relocation>
                        <pattern>org.checkerframework</pattern>
                        <shadedPattern>${shadeBase}.org.checkerframework</shadedPattern>
@@ -526,6 +542,18 @@
                        <pattern>org.conscrypt</pattern>
                        <shadedPattern>${shadeBase}.org.conscrypt</shadedPattern>
                      </relocation>
+                     <relocation>
+                       <pattern>conscrypt_openjdk_jni</pattern>
+                       <shadedPattern>${shadeNativeBase}_conscrypt_openjdk_jni</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>META-INF.native.conscrypt_openjdk_jni</pattern>
+                       <shadedPattern>META-INF.native.${shadeNativeBase}_conscrypt_openjdk_jni</shadedPattern>
+                     </relocation>
+                     <relocation>
+                       <pattern>META-INF.native.libconscrypt_openjdk_jni</pattern>
+                       <shadedPattern>META-INF.native.lib${shadeNativeBase}_conscrypt_openjdk_jni</shadedPattern>
+                     </relocation>
                      <relocation>
                        <pattern>opencensus</pattern>
                        <shadedPattern>${shadeBase}.opencensus</shadedPattern>
@@ -589,7 +617,9 @@
                    </filters>
                   <transformers>
                     <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                    <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"/>
+                    <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                      <resource>META-INF/io.netty.versions.properties</resource>
                     </transformer>
                   </transformers>
                 </configuration>
@@ -695,6 +725,13 @@
         <plugins>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.maven.surefire</groupId>
+                <artifactId>surefire-junit-platform</artifactId>
+                <version>${version.plugin.surefire}</version>
+              </dependency>
+            </dependencies>
             <version>${version.plugin.failsafe}</version>
             <configuration>
               <argLine>
@@ -739,6 +776,13 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.maven.surefire</groupId>
+                <artifactId>surefire-junit-platform</artifactId>
+                <version>${version.plugin.surefire}</version>
+              </dependency>
+            </dependencies>
             <version>${version.plugin.failsafe}</version>
             <executions>
               <execution>

diff --git a/FIPS/src/test/java/net/snowflake/client/AbstractDriverIT.java b/FIPS/src/test/java/net/snowflake/client/AbstractDriverIT.java
@@ -21,12 +21,10 @@
 import java.util.TimeZone;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.junit.Rule;
 
 /** Base test class with common constants, data structures and methods */
 public class AbstractDriverIT {
   // This is required to use ConditionalIgnore annotation.
-  @Rule public ConditionalIgnoreRule rule = new ConditionalIgnoreRule();
 
   public static final String DRIVER_CLASS = "net.snowflake.client.jdbc.SnowflakeDriver";
   public static final String DRIVER_CLASS_COM = "com.snowflake.client.jdbc.SnowflakeDriver";