From d5e8064a9a3081da511c9d9ef25bf66a82633bc6 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Mon, 30 Oct 2023 10:57:25 +0800 Subject: [PATCH 1/4] Test: Bump Kyuubi TPC-DS connector 1.8.0 --- build.gradle | 1 + gradle.properties | 2 +- spark-3.3/build.gradle | 4 +--- spark-3.4/build.gradle | 4 +--- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index a656f58e..67692fe0 100644 --- a/build.gradle +++ b/build.gradle @@ -61,6 +61,7 @@ allprojects { repositories { maven { url = "$mavenCentralMirror" } + maven { url = "https://repository.apache.org/content/repositories/orgapachekyuubi-1039/" } } } diff --git a/gradle.properties b/gradle.properties index 31d65d4d..4930d619 100644 --- a/gradle.properties +++ b/gradle.properties @@ -48,7 +48,7 @@ commons_codec_version=1.16.0 jakarta_annotation_api_version=1.3.5 # Test only -kyuubi_version=1.7.1 +kyuubi_version=1.8.0 testcontainers_scala_version=0.41.0 scalatest_version=3.2.15 flexmark_version=0.62.2 diff --git a/spark-3.3/build.gradle b/spark-3.3/build.gradle index 682625e8..3e2970f1 100644 --- a/spark-3.3/build.gradle +++ b/spark-3.3/build.gradle @@ -80,9 +80,7 @@ project(":clickhouse-spark-it-${spark_binary_version}_$scala_binary_version") { testImplementation("com.clickhouse:clickhouse-jdbc:$clickhouse_jdbc_version:all") { transitive = false } - if (scala_binary_version == "2.12") { - testImplementation "org.apache.kyuubi:kyuubi-spark-connector-tpcds_${scala_binary_version}:$kyuubi_version" - } + testImplementation "org.apache.kyuubi:kyuubi-spark-connector-tpcds_${scala_binary_version}:$kyuubi_version" } test { diff --git a/spark-3.4/build.gradle b/spark-3.4/build.gradle index ad33aba9..2162699c 100644 --- a/spark-3.4/build.gradle +++ b/spark-3.4/build.gradle @@ -80,9 +80,7 @@ project(":clickhouse-spark-it-${spark_binary_version}_$scala_binary_version") { testImplementation("com.clickhouse:clickhouse-jdbc:$clickhouse_jdbc_version:all") { transitive = false } - if (scala_binary_version == "2.12") { - testImplementation "org.apache.kyuubi:kyuubi-spark-connector-tpcds_${scala_binary_version}:$kyuubi_version" - } + testImplementation "org.apache.kyuubi:kyuubi-spark-connector-tpcds_${scala_binary_version}:$kyuubi_version" } test { From 754965afe8f71a04604793fc1cc87e26479b9ffb Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Mon, 30 Oct 2023 11:06:46 +0800 Subject: [PATCH 2/4] enable tpcds test for scala 2.13 --- .github/workflows/tpcds.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tpcds.yml b/.github/workflows/tpcds.yml index 45820737..3fa20fa2 100644 --- a/.github/workflows/tpcds.yml +++ b/.github/workflows/tpcds.yml @@ -31,6 +31,7 @@ jobs: fail-fast: false matrix: spark: [ 3.3, 3.4 ] + scala: [ 2.12, 2.13 ] steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 @@ -41,6 +42,7 @@ jobs: - run: >- ./gradlew clean slowTest --no-daemon --refresh-dependencies -Dspark_binary_version=${{ matrix.spark }} + -Dscala_binary_version=${{ matrix.scala }} -PmavenCentralMirror=https://maven-central.storage-download.googleapis.com/maven2/ - name: Upload test logs if: failure() From b50ed68dd295e13d9ebda6791c34b8dd196f1e64 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Fri, 3 Nov 2023 22:47:44 +0800 Subject: [PATCH 3/4] rc1 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 67692fe0..07529ebd 100644 --- a/build.gradle +++ b/build.gradle @@ -61,7 +61,7 @@ allprojects { repositories { maven { url = "$mavenCentralMirror" } - maven { url = "https://repository.apache.org/content/repositories/orgapachekyuubi-1039/" } + maven { url = "https://repository.apache.org/content/repositories/orgapachekyuubi-1040/" } } } From 23ed50410607aaa612bdc484672a32541c1e1394 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Tue, 7 Nov 2023 10:03:27 +0800 Subject: [PATCH 4/4] Update build.gradle --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 07529ebd..a656f58e 100644 --- a/build.gradle +++ b/build.gradle @@ -61,7 +61,6 @@ allprojects { repositories { maven { url = "$mavenCentralMirror" } - maven { url = "https://repository.apache.org/content/repositories/orgapachekyuubi-1040/" } } }