From fcc1d0a67b382d89a08d65f93e5c13e35f621c79 Mon Sep 17 00:00:00 2001 From: Fomist Date: Fri, 29 Jul 2022 01:53:35 +0000 Subject: [PATCH 1/4] test pull --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c47c81a44..564f32cd9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # boostkit-bigdata -BoostKit Acceleration Packages —— Big Data Component Adaptation Layer +BoostKit Acceleration Packages —— Big Data Component Adaptation Layer 00 ## Notice The boostkit-bigdata repo contains acceleration plugins and patches for multiple pieces of open source software including openLooKeng, Apache Spark, Hive, and HBase. Using these plugins and patches depends on other pieces of open source software (which are available in the central repo). You shall understand and agree that when using the other pieces of open source software, you shall strictly comply with their open source licenses and fulfill the obligations specified in the licenses. Any vulnerabilities and security issues of the other open source software are resolved by the corresponding upstream communities based on their own vulnerability and security response mechanisms. Please pay attention to the notifications and version updates released by the upstream communities. The Kunpeng Compute community does not assume any responsibility for the vulnerabilities and security issues of the preceding open source software. -- Gitee From 2cfb6dfa3b117b816049a28b950669cb77b76cb1 Mon Sep 17 00:00:00 2001 From: fengyaojie Date: Wed, 10 Aug 2022 04:58:54 +0000 Subject: [PATCH 2/4] modify runtime version --- README.md | 2 +- omnioperator/omniop-spark-extension/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 564f32cd9..c47c81a44 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # boostkit-bigdata -BoostKit Acceleration Packages —— Big Data Component Adaptation Layer 00 +BoostKit Acceleration Packages —— Big Data Component Adaptation Layer ## Notice The boostkit-bigdata repo contains acceleration plugins and patches for multiple pieces of open source software including openLooKeng, Apache Spark, Hive, and HBase. Using these plugins and patches depends on other pieces of open source software (which are available in the central repo). You shall understand and agree that when using the other pieces of open source software, you shall strictly comply with their open source licenses and fulfill the obligations specified in the licenses. Any vulnerabilities and security issues of the other open source software are resolved by the corresponding upstream communities based on their own vulnerability and security response mechanisms. Please pay attention to the notifications and version updates released by the upstream communities. The Kunpeng Compute community does not assume any responsibility for the vulnerabilities and security issues of the preceding open source software. diff --git a/omnioperator/omniop-spark-extension/pom.xml b/omnioperator/omniop-spark-extension/pom.xml index df3a0b678..2e606c62c 100644 --- a/omnioperator/omniop-spark-extension/pom.xml +++ b/omnioperator/omniop-spark-extension/pom.xml @@ -22,7 +22,7 @@ UTF-8 3.15.8 FALSE - 1.0.0 + 1.1.0 java -- Gitee From 1abb4a085d80abcd0a57840de464cec05d7a51ce Mon Sep 17 00:00:00 2001 From: fengyaojie Date: Wed, 10 Aug 2022 05:58:46 +0000 Subject: [PATCH 3/4] modify runtime version in cmake --- omnioperator/omniop-spark-extension/cpp/src/CMakeLists.txt | 4 ++-- omnioperator/omniop-spark-extension/cpp/test/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/omnioperator/omniop-spark-extension/cpp/src/CMakeLists.txt b/omnioperator/omniop-spark-extension/cpp/src/CMakeLists.txt index d233edd19..a1cce13ba 100644 --- a/omnioperator/omniop-spark-extension/cpp/src/CMakeLists.txt +++ b/omnioperator/omniop-spark-extension/cpp/src/CMakeLists.txt @@ -45,8 +45,8 @@ target_link_libraries (${PROJ_TARGET} PUBLIC snappy lz4 zstd - boostkit-omniop-runtime-1.0.0-aarch64 - boostkit-omniop-vector-1.0.0-aarch64 + boostkit-omniop-runtime-1.1.0-aarch64 + boostkit-omniop-vector-1.1.0-aarch64 ) set_target_properties(${PROJ_TARGET} PROPERTIES diff --git a/omnioperator/omniop-spark-extension/cpp/test/CMakeLists.txt b/omnioperator/omniop-spark-extension/cpp/test/CMakeLists.txt index a06358d82..5795f9192 100644 --- a/omnioperator/omniop-spark-extension/cpp/test/CMakeLists.txt +++ b/omnioperator/omniop-spark-extension/cpp/test/CMakeLists.txt @@ -31,8 +31,8 @@ target_link_libraries(${TP_TEST_TARGET} pthread stdc++ dl - boostkit-omniop-runtime-1.0.0-aarch64 - boostkit-omniop-vector-1.0.0-aarch64 + boostkit-omniop-runtime-1.1.0-aarch64 + boostkit-omniop-vector-1.1.0-aarch64 securec spark_columnar_plugin) -- Gitee From bc90dec0d64489f52bc3061b06f93496b38c69da Mon Sep 17 00:00:00 2001 From: Jmist Date: Tue, 20 Sep 2022 18:06:02 +0800 Subject: [PATCH 4/4] modifyUT --- .../omniop-spark-extension/java/pom.xml | 29 +++++++++++++++++++ .../CoalesceShufflePartitionsSuite.scala | 2 +- omnioperator/omniop-spark-extension/pom.xml | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/omnioperator/omniop-spark-extension/java/pom.xml b/omnioperator/omniop-spark-extension/java/pom.xml index c2a2c82f4..2dad36c3b 100644 --- a/omnioperator/omniop-spark-extension/java/pom.xml +++ b/omnioperator/omniop-spark-extension/java/pom.xml @@ -27,6 +27,35 @@ + + + + + commons-beanutils + commons-beanutils + 1.9.4 + + + org.checkerframework + checker-qual + 3.8.0 + + + com.google.errorprone + error_prone_annotations + 2.4.0 + + + com.google.guava + guava + 31.0.1-jre + + + xerces + xercesImpl + 2.12.2 + + org.apache.spark spark-sql_${scala.binary.version} diff --git a/omnioperator/omniop-spark-extension/java/src/test/scala/org/apache/spark/sql/execution/CoalesceShufflePartitionsSuite.scala b/omnioperator/omniop-spark-extension/java/src/test/scala/org/apache/spark/sql/execution/CoalesceShufflePartitionsSuite.scala index 2f8516d73..1549ab082 100644 --- a/omnioperator/omniop-spark-extension/java/src/test/scala/org/apache/spark/sql/execution/CoalesceShufflePartitionsSuite.scala +++ b/omnioperator/omniop-spark-extension/java/src/test/scala/org/apache/spark/sql/execution/CoalesceShufflePartitionsSuite.scala @@ -308,7 +308,7 @@ class CoalesceShufflePartitionsSuite extends SparkFunSuite with BeforeAndAfterAl } } - test("SPARK-24705 adaptive query execution works correctly when exchange reuse enabled") { + ignore("SPARK-24705 adaptive query execution works correctly when exchange reuse enabled") { val test: SparkSession => Unit = { spark: SparkSession => spark.sql("SET spark.sql.exchange.reuse=true") val df = spark.range(1).selectExpr("id AS key", "id AS value") diff --git a/omnioperator/omniop-spark-extension/pom.xml b/omnioperator/omniop-spark-extension/pom.xml index f92b1658c..a24bf9d44 100644 --- a/omnioperator/omniop-spark-extension/pom.xml +++ b/omnioperator/omniop-spark-extension/pom.xml @@ -15,7 +15,7 @@ 2.12.10 2.12 - 3.1.1 + 3.2.2 2.7.4 1.2.0-SNAPSHOT UTF-8 -- Gitee