diff --git a/ep/build-velox/src/get-velox.sh b/ep/build-velox/src/get-velox.sh index 793e1b212c5..a649e57b391 100755 --- a/ep/build-velox/src/get-velox.sh +++ b/ep/build-velox/src/get-velox.sh @@ -25,7 +25,7 @@ RUN_SETUP_SCRIPT=ON ENABLE_ENHANCED_FEATURES=OFF # Developer use only for testing Velox PR. -UPSTREAM_VELOX_PR_ID="" +UPSTREAM_VELOX_PR_ID="17647" OS=`uname -s` 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 fe92e16ce66..8b25e39e6ec 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 @@ -99,7 +99,6 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("cast string to timestamp") .exclude("cast from timestamp II") .exclude("SPARK-36286: invalid string cast to timestamp") - .exclude("SPARK-39749: cast Decimal to string") // See https://github.com/facebookincubator/velox/issues/17593. .exclude("Fast fail for cast string type to decimal type") enableSuite[GlutenTryCastSuite] @@ -117,8 +116,6 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("data type casting") // Revised by setting timezone through config and commented unsupported cases. .exclude("cast string to timestamp") - // TODO: fix after https://github.com/facebookincubator/velox/pull/14910 - .exclude("SPARK-39749: cast Decimal to string") // See https://github.com/facebookincubator/velox/issues/17593. .exclude("Fast fail for cast string type to decimal type in ansi mode") enableSuite[GlutenCollectionExpressionsSuite] 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 904bb5ef94f..a90a858790d 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 @@ -99,7 +99,6 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("cast string to timestamp") .exclude("cast from timestamp II") .exclude("SPARK-36286: invalid string cast to timestamp") - .exclude("SPARK-39749: cast Decimal to string") // See https://github.com/facebookincubator/velox/issues/17593. .exclude("Fast fail for cast string type to decimal type") enableSuite[GlutenTryCastSuite] @@ -117,8 +116,6 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("data type casting") // Revised by setting timezone through config and commented unsupported cases. .exclude("cast string to timestamp") - // TODO: fix after https://github.com/facebookincubator/velox/pull/14910 - .exclude("SPARK-39749: cast Decimal to string") // See https://github.com/facebookincubator/velox/issues/17593. .exclude("Fast fail for cast string type to decimal type in ansi mode") enableSuite[GlutenCollectionExpressionsSuite] diff --git a/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala index f564324b141..68583dc6e27 100644 --- a/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala +++ b/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala @@ -114,7 +114,6 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("cast string to timestamp") .exclude("cast from timestamp II") .exclude("SPARK-36286: invalid string cast to timestamp") - .exclude("SPARK-39749: cast Decimal to string") // See https://github.com/facebookincubator/velox/issues/17593. .exclude("Fast fail for cast string type to decimal type") enableSuite[GlutenTryCastSuite] @@ -132,8 +131,6 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("data type casting") // Revised by setting timezone through config and commented unsupported cases. .exclude("cast string to timestamp") - // TODO: fix after https://github.com/facebookincubator/velox/pull/14910 - .exclude("SPARK-39749: cast Decimal to string") // See https://github.com/facebookincubator/velox/issues/17593. .exclude("Fast fail for cast string type to decimal type in ansi mode") enableSuite[GlutenCollectionExpressionsSuite] diff --git a/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala index d43199709c2..933626318d6 100644 --- a/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala +++ b/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala @@ -119,7 +119,6 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("cast string to timestamp") .exclude("cast from timestamp II") .exclude("SPARK-36286: invalid string cast to timestamp") - .exclude("SPARK-39749: cast Decimal to string") // See https://github.com/facebookincubator/velox/issues/17593. .exclude("Fast fail for cast string type to decimal type") enableSuite[GlutenTryCastSuite] @@ -137,8 +136,6 @@ class VeloxTestSettings extends BackendTestSettings { .exclude("data type casting") // Revised by setting timezone through config and commented unsupported cases. .exclude("cast string to timestamp") - // TODO: fix after https://github.com/facebookincubator/velox/pull/14910 - .exclude("SPARK-39749: cast Decimal to string") // See https://github.com/facebookincubator/velox/issues/17593. .exclude("Fast fail for cast string type to decimal type in ansi mode") enableSuite[GlutenCollectionExpressionsSuite]