This is an automated email from the ASF dual-hosted git repository.
yuanzhou 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 5414fbfefc [GLUTEN-6887][VL] Daily Update Velox Version (2025_07_07)
(#10130)
5414fbfefc is described below
commit 5414fbfefc15b4e59a627ddaf102025c7f4814dc
Author: Gluten Performance Bot
<[email protected]>
AuthorDate: Mon Jul 7 22:01:31 2025 +0100
[GLUTEN-6887][VL] Daily Update Velox Version (2025_07_07) (#10130)
* [GLUTEN-6887][VL] Daily Update Velox Version (2025_07_07)
Upstream Velox's New Commits:
c3c8008a1 by Eric Jia, feat: Add OOM injector into TableEvolutionFuzzer
(#13995)
Signed-off-by: glutenperfbot <[email protected]>
* fix variant array api
Signed-off-by: Yuan <[email protected]>
* fix repo for enhanced feature
Signed-off-by: Yuan <[email protected]>
* ignore failed ut
Signed-off-by: Yuan <[email protected]>
---------
Signed-off-by: glutenperfbot <[email protected]>
Signed-off-by: Yuan <[email protected]>
Co-authored-by: glutenperfbot <[email protected]>
Co-authored-by: Yuan <[email protected]>
---
cpp/velox/substrait/SubstraitToVeloxExpr.cc | 6 +++---
ep/build-velox/src/get_velox.sh | 4 ++--
.../scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala | 2 ++
.../scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala | 2 ++
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/cpp/velox/substrait/SubstraitToVeloxExpr.cc
b/cpp/velox/substrait/SubstraitToVeloxExpr.cc
index 798071eff3..5d38aa7961 100755
--- a/cpp/velox/substrait/SubstraitToVeloxExpr.cc
+++ b/cpp/velox/substrait/SubstraitToVeloxExpr.cc
@@ -199,7 +199,7 @@ makeFieldAccessExpr(const std::string& name, const TypePtr&
type, core::FieldAcc
} // namespace
-using facebook::velox::core::variantArrayToVector;
+using facebook::velox::variantToVector;
namespace gluten {
@@ -322,8 +322,8 @@ std::shared_ptr<const core::ConstantTypedExpr>
SubstraitVeloxExprConverter::lite
variants.emplace_back(veloxVariant->value());
}
VELOX_CHECK(literalType.has_value(), "Type expected.");
- auto varArray = variant::array(variants);
- ArrayVectorPtr arrayVector =
variantArrayToVector(ARRAY(literalType.value()), varArray.array(), pool_);
+ auto varArray = Variant::array(variants);
+ VectorPtr arrayVector = variantToVector(ARRAY(literalType.value()),
varArray, pool_);
// Wrap the array vector into constant vector.
auto constantVector = BaseVector::wrapInConstant(1 /*length*/, 0 /*index*/,
arrayVector);
return std::make_shared<const core::ConstantTypedExpr>(constantVector);
diff --git a/ep/build-velox/src/get_velox.sh b/ep/build-velox/src/get_velox.sh
index b03158020f..3412157776 100755
--- a/ep/build-velox/src/get_velox.sh
+++ b/ep/build-velox/src/get_velox.sh
@@ -17,11 +17,11 @@
set -exu
VELOX_REPO=https://github.com/oap-project/velox.git
-VELOX_BRANCH=2025_07_05
+VELOX_BRANCH=2025_07_07
VELOX_HOME=""
RUN_SETUP_SCRIPT=ON
VELOX_ENHANCED_REPO=https://github.com/oap-project/velox.git
-VELOX_ENHANCED_BRANCH=2025_07_01
+VELOX_ENHANCED_BRANCH=2025_07_07
ENABLE_ENHANCED_FEATURES=OFF
# Developer use only for testing Velox PR.
diff --git
a/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
index 77cbd2ad08..6899d7adf4 100644
---
a/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
+++
b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
@@ -426,6 +426,7 @@ class VeloxTestSettings extends BackendTestSettings {
.exclude("SPARK-34562: Bloom filter push down")
.exclude("SPARK-16371 Do not push down filters when inner name and outer
name are the same")
.exclude("filter pushdown - StringPredicate")
+ .exclude("SPARK-38825: in and notIn filters")
enableSuite[GlutenParquetV2FilterSuite]
// Rewrite.
.exclude("SPARK-23852: Broken Parquet push-down for partially-written
stats")
@@ -443,6 +444,7 @@ class VeloxTestSettings extends BackendTestSettings {
.exclude("SPARK-34562: Bloom filter push down")
.exclude("SPARK-16371 Do not push down filters when inner name and outer
name are the same")
.exclude("filter pushdown - StringPredicate")
+ .exclude("SPARK-38825: in and notIn filters")
enableSuite[GlutenParquetInteroperabilitySuite]
.exclude("parquet timestamp conversion")
enableSuite[GlutenParquetIOSuite]
diff --git
a/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
b/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
index 43153a6974..dd6c84867e 100644
---
a/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
+++
b/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
@@ -439,6 +439,7 @@ class VeloxTestSettings extends BackendTestSettings {
.exclude("SPARK-34562: Bloom filter push down")
.exclude("SPARK-16371 Do not push down filters when inner name and outer
name are the same")
.exclude("filter pushdown - StringPredicate")
+ .exclude("SPARK-38825: in and notIn filters")
enableSuite[GlutenParquetV2FilterSuite]
// Rewrite.
.exclude("SPARK-23852: Broken Parquet push-down for partially-written
stats")
@@ -456,6 +457,7 @@ class VeloxTestSettings extends BackendTestSettings {
.exclude("SPARK-34562: Bloom filter push down")
.exclude("SPARK-16371 Do not push down filters when inner name and outer
name are the same")
.exclude("filter pushdown - StringPredicate")
+ .exclude("SPARK-38825: in and notIn filters")
enableSuite[GlutenParquetInteroperabilitySuite]
.exclude("parquet timestamp conversion")
enableSuite[GlutenParquetIOSuite]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
