This is an automated email from the ASF dual-hosted git repository.
hongze pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 154f8750e [VL] Daily Update Velox Version (2024_04_11) (#5360)
154f8750e is described below
commit 154f8750e1f9cd93c4b5362bbca2db219193e01f
Author: Gluten Performance Bot
<[email protected]>
AuthorDate: Thu Apr 11 17:38:52 2024 +0800
[VL] Daily Update Velox Version (2024_04_11) (#5360)
---
ep/build-velox/src/build_velox.sh | 3 ++-
ep/build-velox/src/get_velox.sh | 2 +-
.../scala/org/apache/spark/sql/GlutenQueryTest.scala | 16 +++++++++++++++-
.../org/apache/gluten/execution/VeloxIcebergSuite.scala | 9 ++++++---
.../apache/gluten/execution/VeloxTPCHIcebergSuite.scala | 5 +++++
5 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/ep/build-velox/src/build_velox.sh
b/ep/build-velox/src/build_velox.sh
index 47423f335..a38107c8f 100755
--- a/ep/build-velox/src/build_velox.sh
+++ b/ep/build-velox/src/build_velox.sh
@@ -114,7 +114,8 @@ function compile {
fi
fi
- COMPILE_OPTION="-DVELOX_ENABLE_PARQUET=ON -DVELOX_BUILD_TESTING=OFF"
+ CXX_FLAGS='-Wno-missing-field-initializers'
+ COMPILE_OPTION="-DCMAKE_CXX_FLAGS=\"$CXX_FLAGS\" -DVELOX_ENABLE_PARQUET=ON
-DVELOX_BUILD_TESTING=OFF"
if [ $BUILD_TEST_UTILS == "ON" ]; then
COMPILE_OPTION="$COMPILE_OPTION -DVELOX_BUILD_TEST_UTILS=ON"
fi
diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index f4c2e4313..fa6deb374 100755
--- a/ep/build-velox/src/get_velox.sh
+++ b/ep/build-velox/src/get_velox.sh
@@ -17,7 +17,7 @@
set -exu
VELOX_REPO=https://github.com/oap-project/velox.git
-VELOX_BRANCH=2024_04_10
+VELOX_BRANCH=2024_04_11
VELOX_HOME=""
#Set on run gluten on HDFS
diff --git
a/gluten-core/src/test/scala/org/apache/spark/sql/GlutenQueryTest.scala
b/gluten-core/src/test/scala/org/apache/spark/sql/GlutenQueryTest.scala
index ae83a56d1..d6a2a0c63 100644
--- a/gluten-core/src/test/scala/org/apache/spark/sql/GlutenQueryTest.scala
+++ b/gluten-core/src/test/scala/org/apache/spark/sql/GlutenQueryTest.scala
@@ -26,7 +26,7 @@ import org.apache.spark.SPARK_VERSION_SHORT
import org.apache.spark.rpc.GlutenDriverEndpoint
import org.apache.spark.sql.catalyst.expressions.Attribute
import org.apache.spark.sql.catalyst.plans._
-import org.apache.spark.sql.catalyst.plans.logical.{Join, LogicalPlan, Sort,
Subquery, SubqueryAlias}
+import org.apache.spark.sql.catalyst.plans.logical._
import org.apache.spark.sql.catalyst.util._
import org.apache.spark.sql.execution.SQLExecution
import org.apache.spark.sql.execution.columnar.InMemoryRelation
@@ -44,6 +44,20 @@ abstract class GlutenQueryTest extends PlanTest {
protected def spark: SparkSession
+ def ignore(
+ testName: String,
+ minSparkVersion: Option[String] = None,
+ maxSparkVersion: Option[String] = None)(testFun: => Any): Unit = {
+ if (
+ minSparkVersion.forall(_ <= SPARK_VERSION_SHORT)
+ && maxSparkVersion.forall(_ >= SPARK_VERSION_SHORT)
+ ) {
+ ignore(testName) {
+ testFun
+ }
+ }
+ }
+
def testWithSpecifiedSparkVersion(
testName: String,
minSparkVersion: Option[String] = None,
diff --git
a/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxIcebergSuite.scala
b/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxIcebergSuite.scala
index d9abd6472..9ffcc80cf 100644
---
a/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxIcebergSuite.scala
+++
b/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxIcebergSuite.scala
@@ -58,7 +58,8 @@ class VeloxIcebergSuite extends WholeStageTransformerSuite {
}
}
- testWithSpecifiedSparkVersion("iceberg bucketed join", Some("3.4")) {
+ // Ignored due to failures, see
https://github.com/apache/incubator-gluten/issues/5362
+ ignore("iceberg bucketed join", Some("3.4")) {
val leftTable = "p_str_tb"
val rightTable = "p_int_tb"
withTable(leftTable, rightTable) {
@@ -138,7 +139,8 @@ class VeloxIcebergSuite extends WholeStageTransformerSuite {
}
}
- testWithSpecifiedSparkVersion("iceberg bucketed join with partition",
Some("3.4")) {
+ // Ignored due to failures, see
https://github.com/apache/incubator-gluten/issues/5362
+ ignore("iceberg bucketed join with partition", Some("3.4")) {
val leftTable = "p_str_tb"
val rightTable = "p_int_tb"
withTable(leftTable, rightTable) {
@@ -218,7 +220,8 @@ class VeloxIcebergSuite extends WholeStageTransformerSuite {
}
}
- testWithSpecifiedSparkVersion("iceberg bucketed join with partition filter",
Some("3.4")) {
+ // Ignored due to failures, see
https://github.com/apache/incubator-gluten/issues/5362
+ ignore("iceberg bucketed join with partition filter", Some("3.4")) {
val leftTable = "p_str_tb"
val rightTable = "p_int_tb"
withTable(leftTable, rightTable) {
diff --git
a/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxTPCHIcebergSuite.scala
b/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxTPCHIcebergSuite.scala
index 44badf159..b452e9340 100644
---
a/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxTPCHIcebergSuite.scala
+++
b/gluten-iceberg/src/test/scala/org/apache/gluten/execution/VeloxTPCHIcebergSuite.scala
@@ -19,9 +19,12 @@ package org.apache.gluten.execution
import org.apache.spark.SparkConf
import org.apache.iceberg.spark.SparkWriteOptions
+import org.scalatest.Ignore
import java.io.File
+// Ignored due to failures, see
https://github.com/apache/incubator-gluten/issues/5362
+@Ignore
class VeloxTPCHIcebergSuite extends VeloxTPCHSuite {
protected val tpchBasePath: String = new File(
@@ -93,6 +96,8 @@ class VeloxTPCHIcebergSuite extends VeloxTPCHSuite {
}
}
+// Ignored due to failures, see
https://github.com/apache/incubator-gluten/issues/5362
+@Ignore
class VeloxPartitionedTableTPCHIcebergSuite extends VeloxTPCHIcebergSuite {
override protected def createTPCHNotNullTables(): Unit = {
TPCHTables.map {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
