From 1a50a68ff1fe7040454bc1784a907a48e63d67a3 Mon Sep 17 00:00:00 2001 From: Wei-Ting Chen Date: Sat, 30 Nov 2024 00:41:34 +0800 Subject: [PATCH] Preparing for Gltuen v1.2.1-rc0 (#8110) --- backends-clickhouse/pom.xml | 2 +- backends-velox/pom.xml | 2 +- ep/build-velox/src/get_velox.sh | 2 +- gluten-celeborn/clickhouse/pom.xml | 2 +- gluten-celeborn/common/pom.xml | 2 +- gluten-celeborn/package/pom.xml | 2 +- gluten-celeborn/pom.xml | 2 +- gluten-celeborn/velox/pom.xml | 2 +- gluten-core/pom.xml | 2 +- gluten-data/pom.xml | 2 +- gluten-delta/pom.xml | 2 +- gluten-iceberg/pom.xml | 2 +- gluten-ras/common/pom.xml | 2 +- gluten-ras/planner/pom.xml | 2 +- gluten-ras/pom.xml | 2 +- gluten-ui/pom.xml | 2 +- gluten-uniffle/package/pom.xml | 2 +- gluten-uniffle/pom.xml | 2 +- gluten-uniffle/velox/pom.xml | 2 +- gluten-ut/common/pom.xml | 2 +- gluten-ut/pom.xml | 2 +- gluten-ut/spark32/pom.xml | 2 +- gluten-ut/spark33/pom.xml | 2 +- gluten-ut/spark34/pom.xml | 2 +- gluten-ut/spark35/pom.xml | 2 +- gluten-ut/test/pom.xml | 2 +- package/pom.xml | 2 +- pom.xml | 2 +- shims/common/pom.xml | 2 +- shims/pom.xml | 2 +- shims/spark32/pom.xml | 2 +- shims/spark33/pom.xml | 2 +- shims/spark34/pom.xml | 2 +- shims/spark35/pom.xml | 2 +- tools/gluten-it/common/pom.xml | 4 ++-- .../org/apache/gluten/integration/command/SparkRunModes.java | 2 +- tools/gluten-it/package/pom.xml | 2 +- tools/gluten-it/pom.xml | 4 ++-- tools/workload/tpcds/run_tpcds/run_tpcds.sh | 2 +- 39 files changed, 41 insertions(+), 41 deletions(-) diff --git a/backends-clickhouse/pom.xml b/backends-clickhouse/pom.xml index 0dcd20c929af..98b05bc6521f 100644 --- a/backends-clickhouse/pom.xml +++ b/backends-clickhouse/pom.xml @@ -5,7 +5,7 @@ gluten-parent org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 diff --git a/backends-velox/pom.xml b/backends-velox/pom.xml index 7d08a50c41cc..b3911bf67569 100755 --- a/backends-velox/pom.xml +++ b/backends-velox/pom.xml @@ -5,7 +5,7 @@ gluten-parent org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh index 67cf9a47462d..ac2cb0dab98b 100755 --- a/ep/build-velox/src/get_velox.sh +++ b/ep/build-velox/src/get_velox.sh @@ -18,7 +18,7 @@ set -exu VELOX_REPO=https://github.com/oap-project/velox.git -VELOX_BRANCH=branch-1.2 +VELOX_BRANCH=gluten-1.2.2 VELOX_HOME="" #Set on run gluten on HDFS diff --git a/gluten-celeborn/clickhouse/pom.xml b/gluten-celeborn/clickhouse/pom.xml index 9e614499b49a..6306e3466533 100755 --- a/gluten-celeborn/clickhouse/pom.xml +++ b/gluten-celeborn/clickhouse/pom.xml @@ -5,7 +5,7 @@ gluten-celeborn org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml 4.0.0 diff --git a/gluten-celeborn/common/pom.xml b/gluten-celeborn/common/pom.xml index fc67dcd9ec93..598eed96b913 100755 --- a/gluten-celeborn/common/pom.xml +++ b/gluten-celeborn/common/pom.xml @@ -5,7 +5,7 @@ gluten-celeborn org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml 4.0.0 diff --git a/gluten-celeborn/package/pom.xml b/gluten-celeborn/package/pom.xml index 6ecb80cc72c1..d1042e94556d 100644 --- a/gluten-celeborn/package/pom.xml +++ b/gluten-celeborn/package/pom.xml @@ -5,7 +5,7 @@ gluten-celeborn org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/gluten-celeborn/pom.xml b/gluten-celeborn/pom.xml index cc512eb3516f..f0320b0cb481 100755 --- a/gluten-celeborn/pom.xml +++ b/gluten-celeborn/pom.xml @@ -5,7 +5,7 @@ gluten-parent org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml 4.0.0 diff --git a/gluten-celeborn/velox/pom.xml b/gluten-celeborn/velox/pom.xml index 545425c5b701..37c46ef84beb 100755 --- a/gluten-celeborn/velox/pom.xml +++ b/gluten-celeborn/velox/pom.xml @@ -5,7 +5,7 @@ gluten-celeborn org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml 4.0.0 diff --git a/gluten-core/pom.xml b/gluten-core/pom.xml index 5b5963496762..eb0a7ba976e2 100644 --- a/gluten-core/pom.xml +++ b/gluten-core/pom.xml @@ -5,7 +5,7 @@ gluten-parent org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 4.0.0 diff --git a/gluten-data/pom.xml b/gluten-data/pom.xml index d3c254269e46..ec9f405f1957 100644 --- a/gluten-data/pom.xml +++ b/gluten-data/pom.xml @@ -5,7 +5,7 @@ gluten-parent org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml 4.0.0 diff --git a/gluten-delta/pom.xml b/gluten-delta/pom.xml index 6a81437172b7..eadd020e1517 100755 --- a/gluten-delta/pom.xml +++ b/gluten-delta/pom.xml @@ -5,7 +5,7 @@ gluten-parent org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml 4.0.0 diff --git a/gluten-iceberg/pom.xml b/gluten-iceberg/pom.xml index 7420c3025397..9ea6e2775c4b 100644 --- a/gluten-iceberg/pom.xml +++ b/gluten-iceberg/pom.xml @@ -5,7 +5,7 @@ gluten-parent org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml 4.0.0 diff --git a/gluten-ras/common/pom.xml b/gluten-ras/common/pom.xml index e4118c7b526b..0662956de026 100644 --- a/gluten-ras/common/pom.xml +++ b/gluten-ras/common/pom.xml @@ -5,7 +5,7 @@ org.apache.gluten gluten-ras - 1.2.1-SNAPSHOT + 1.2.1 gluten-ras-common Gluten Ras Common diff --git a/gluten-ras/planner/pom.xml b/gluten-ras/planner/pom.xml index df95b8b458e4..92fb5fad2cde 100644 --- a/gluten-ras/planner/pom.xml +++ b/gluten-ras/planner/pom.xml @@ -5,7 +5,7 @@ org.apache.gluten gluten-ras - 1.2.1-SNAPSHOT + 1.2.1 gluten-ras-planner Gluten Ras Planner diff --git a/gluten-ras/pom.xml b/gluten-ras/pom.xml index f249f6da614b..fa58115b6a86 100644 --- a/gluten-ras/pom.xml +++ b/gluten-ras/pom.xml @@ -17,7 +17,7 @@ org.apache.gluten gluten-parent - 1.2.1-SNAPSHOT + 1.2.1 gluten-ras pom diff --git a/gluten-ui/pom.xml b/gluten-ui/pom.xml index 4ed2795ec972..393aa8b2e531 100644 --- a/gluten-ui/pom.xml +++ b/gluten-ui/pom.xml @@ -6,7 +6,7 @@ org.apache.gluten gluten-parent - 1.2.1-SNAPSHOT + 1.2.1 gluten-ui diff --git a/gluten-uniffle/package/pom.xml b/gluten-uniffle/package/pom.xml index 438bfb3b5fdd..c4cfa9c22888 100644 --- a/gluten-uniffle/package/pom.xml +++ b/gluten-uniffle/package/pom.xml @@ -5,7 +5,7 @@ gluten-uniffle org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml 4.0.0 diff --git a/gluten-uniffle/pom.xml b/gluten-uniffle/pom.xml index 2b9ea6090f8e..50d6c21f991f 100644 --- a/gluten-uniffle/pom.xml +++ b/gluten-uniffle/pom.xml @@ -5,7 +5,7 @@ gluten-parent org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml 4.0.0 diff --git a/gluten-uniffle/velox/pom.xml b/gluten-uniffle/velox/pom.xml index 2d2ebd5ac1bb..126024943981 100755 --- a/gluten-uniffle/velox/pom.xml +++ b/gluten-uniffle/velox/pom.xml @@ -5,7 +5,7 @@ gluten-uniffle org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml 4.0.0 diff --git a/gluten-ut/common/pom.xml b/gluten-ut/common/pom.xml index 5508c22a7af2..f79e1f65cd0d 100644 --- a/gluten-ut/common/pom.xml +++ b/gluten-ut/common/pom.xml @@ -5,7 +5,7 @@ gluten-ut org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml 4.0.0 diff --git a/gluten-ut/pom.xml b/gluten-ut/pom.xml index 9f4cca83b503..d9632fb99e71 100644 --- a/gluten-ut/pom.xml +++ b/gluten-ut/pom.xml @@ -20,7 +20,7 @@ org.apache.gluten gluten-parent - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/gluten-ut/spark32/pom.xml b/gluten-ut/spark32/pom.xml index 0aec36dc2a14..c0e902b69581 100644 --- a/gluten-ut/spark32/pom.xml +++ b/gluten-ut/spark32/pom.xml @@ -5,7 +5,7 @@ gluten-ut org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml 4.0.0 diff --git a/gluten-ut/spark33/pom.xml b/gluten-ut/spark33/pom.xml index 0777e26c6746..61b25966ad79 100644 --- a/gluten-ut/spark33/pom.xml +++ b/gluten-ut/spark33/pom.xml @@ -5,7 +5,7 @@ gluten-ut org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml 4.0.0 diff --git a/gluten-ut/spark34/pom.xml b/gluten-ut/spark34/pom.xml index 8825a454741c..9e781de3cf3d 100644 --- a/gluten-ut/spark34/pom.xml +++ b/gluten-ut/spark34/pom.xml @@ -5,7 +5,7 @@ gluten-ut org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml 4.0.0 diff --git a/gluten-ut/spark35/pom.xml b/gluten-ut/spark35/pom.xml index 9e1d77b548e4..c6728a88abf1 100644 --- a/gluten-ut/spark35/pom.xml +++ b/gluten-ut/spark35/pom.xml @@ -5,7 +5,7 @@ gluten-ut org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml 4.0.0 diff --git a/gluten-ut/test/pom.xml b/gluten-ut/test/pom.xml index dc6aefc5d488..4e50f65759c2 100644 --- a/gluten-ut/test/pom.xml +++ b/gluten-ut/test/pom.xml @@ -5,7 +5,7 @@ gluten-ut org.apache.gluten - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml 4.0.0 diff --git a/package/pom.xml b/package/pom.xml index 8101f76a648a..a7bc2c134117 100644 --- a/package/pom.xml +++ b/package/pom.xml @@ -20,7 +20,7 @@ org.apache.gluten gluten-parent - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/pom.xml b/pom.xml index 8aa6001d1345..167af34d39c8 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ 4.0.0 org.apache.gluten gluten-parent - 1.2.1-SNAPSHOT + 1.2.1 pom Gluten Parent Pom diff --git a/shims/common/pom.xml b/shims/common/pom.xml index 0cc64893c299..78fbb9c33c1b 100644 --- a/shims/common/pom.xml +++ b/shims/common/pom.xml @@ -20,7 +20,7 @@ org.apache.gluten spark-sql-columnar-shims - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/shims/pom.xml b/shims/pom.xml index 4f64f52b7ed4..44d390e30d30 100644 --- a/shims/pom.xml +++ b/shims/pom.xml @@ -20,7 +20,7 @@ org.apache.gluten gluten-parent - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/shims/spark32/pom.xml b/shims/spark32/pom.xml index 84995d26f22c..00229ba95fa4 100644 --- a/shims/spark32/pom.xml +++ b/shims/spark32/pom.xml @@ -20,7 +20,7 @@ org.apache.gluten spark-sql-columnar-shims - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/shims/spark33/pom.xml b/shims/spark33/pom.xml index 88eac484baa6..0aad3b429eaf 100644 --- a/shims/spark33/pom.xml +++ b/shims/spark33/pom.xml @@ -20,7 +20,7 @@ org.apache.gluten spark-sql-columnar-shims - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/shims/spark34/pom.xml b/shims/spark34/pom.xml index 930e4f8bfb9b..9ae2a38efb2e 100644 --- a/shims/spark34/pom.xml +++ b/shims/spark34/pom.xml @@ -20,7 +20,7 @@ org.apache.gluten spark-sql-columnar-shims - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/shims/spark35/pom.xml b/shims/spark35/pom.xml index d11a526a2c72..6733a5af46cb 100644 --- a/shims/spark35/pom.xml +++ b/shims/spark35/pom.xml @@ -20,7 +20,7 @@ org.apache.gluten spark-sql-columnar-shims - 1.2.1-SNAPSHOT + 1.2.1 ../pom.xml diff --git a/tools/gluten-it/common/pom.xml b/tools/gluten-it/common/pom.xml index 76530bff7bb0..d79bff84070b 100644 --- a/tools/gluten-it/common/pom.xml +++ b/tools/gluten-it/common/pom.xml @@ -7,11 +7,11 @@ org.apache.gluten gluten-it - 1.2.1-SNAPSHOT + 1.2.1 gluten-it-common - 1.2.1-SNAPSHOT + 1.2.1 jar diff --git a/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/command/SparkRunModes.java b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/command/SparkRunModes.java index c998d18192ff..e43da37cc185 100644 --- a/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/command/SparkRunModes.java +++ b/tools/gluten-it/common/src/main/java/org/apache/gluten/integration/command/SparkRunModes.java @@ -101,7 +101,7 @@ public Map extraSparkConf() { private static class LocalClusterMode implements Mode { // We should transfer the jars to be tested in the integration testing to executors - public static final String[] EXTRA_JARS = new String[]{"gluten-package-1.2.0.jar"}; + public static final String[] EXTRA_JARS = new String[]{"gluten-package-1.2.1.jar"}; @CommandLine.Option(names = {"--local-cluster"}, description = "Run in Spark local cluster mode", required = true) private boolean enabled; diff --git a/tools/gluten-it/package/pom.xml b/tools/gluten-it/package/pom.xml index 37e51a48c780..5a47d65cf632 100644 --- a/tools/gluten-it/package/pom.xml +++ b/tools/gluten-it/package/pom.xml @@ -5,7 +5,7 @@ org.apache.gluten gluten-it - 1.2.1-SNAPSHOT + 1.2.1 gluten-it-package Archetype - assembly diff --git a/tools/gluten-it/pom.xml b/tools/gluten-it/pom.xml index cbc6afc43e56..551e514af789 100644 --- a/tools/gluten-it/pom.xml +++ b/tools/gluten-it/pom.xml @@ -6,7 +6,7 @@ org.apache.gluten gluten-it - 1.2.1-SNAPSHOT + 1.2.1 pom common @@ -23,7 +23,7 @@ 3 0.3.2-incubating 0.8.0 - 1.2.1-SNAPSHOT + 1.2.1 32.0.1-jre 1.1 1.4 diff --git a/tools/workload/tpcds/run_tpcds/run_tpcds.sh b/tools/workload/tpcds/run_tpcds/run_tpcds.sh index 1827f282639d..b361a1093d45 100755 --- a/tools/workload/tpcds/run_tpcds/run_tpcds.sh +++ b/tools/workload/tpcds/run_tpcds/run_tpcds.sh @@ -37,4 +37,4 @@ cat tpcds_parquet.scala | ${SPARK_HOME}/bin/spark-shell \ # e.g. # --conf spark.gluten.loadLibFromJar=true \ # --jars /PATH_TO_GLUTEN_HOME/package/target/thirdparty-lib/gluten-thirdparty-lib-ubuntu-22.04-x86_64.jar, - # /PATH_TO_GLUTEN_HOME/package/target/gluten-velox-bundle-spark3.3_2.12-ubuntu_22.04_x86_64-1.2.0.jar + # /PATH_TO_GLUTEN_HOME/package/target/gluten-velox-bundle-spark3.3_2.12-ubuntu_22.04_x86_64-1.2.1.jar