From 752832e785cf9ac1956e75046d00756fd50aa940 Mon Sep 17 00:00:00 2001 From: arnavb Date: Fri, 17 Jan 2025 13:50:07 +0000 Subject: [PATCH] update --- .../gluten/backendsapi/velox/VeloxRuleApi.scala | 4 +++- .../gluten/execution/RangeExecBaseTransformer.scala | 11 ----------- .../extension/columnar/validator/Validators.scala | 1 + 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxRuleApi.scala b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxRuleApi.scala index 0cf6ac671309..1a6d95276e3f 100644 --- a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxRuleApi.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxRuleApi.scala @@ -19,6 +19,7 @@ package org.apache.gluten.backendsapi.velox import org.apache.gluten.backendsapi.RuleApi import org.apache.gluten.columnarbatch.VeloxBatch import org.apache.gluten.config.GlutenConfig +import org.apache.gluten.execution.ColumnarRangeExec import org.apache.gluten.extension._ import org.apache.gluten.extension.columnar._ import org.apache.gluten.extension.columnar.MiscColumnarRules.{RemoveGlutenTableCacheColumnarToRow, RemoveTopmostColumnarToRow, RewriteSubqueryBroadcast} @@ -161,7 +162,8 @@ object VeloxRuleApi { RasOffload.from[LimitExec](OffloadOthers()), RasOffload.from[GenerateExec](OffloadOthers()), RasOffload.from[EvalPythonExec](OffloadOthers()), - RasOffload.from[SampleExec](OffloadOthers()) + RasOffload.from[SampleExec](OffloadOthers()), + RasOffload.from[ColumnarRangeExec](OffloadOthers()) ) offloads.foreach( offload => diff --git a/gluten-substrait/src/main/scala/org/apache/gluten/execution/RangeExecBaseTransformer.scala b/gluten-substrait/src/main/scala/org/apache/gluten/execution/RangeExecBaseTransformer.scala index b14653293d2d..b4f10058a131 100644 --- a/gluten-substrait/src/main/scala/org/apache/gluten/execution/RangeExecBaseTransformer.scala +++ b/gluten-substrait/src/main/scala/org/apache/gluten/execution/RangeExecBaseTransformer.scala @@ -42,17 +42,6 @@ abstract class RangeExecBaseTransformer( outputAttributes } - override protected def doValidateInternal(): ValidationResult = { - val isSupported = BackendsApiManager.getSettings.supportRangeExec() - - if (!isSupported) { - return ValidationResult.failed( - s"RangeExec is not supported by the current backend." - ) - } - ValidationResult.succeeded - } - override def rowType0(): Convention.RowType = Convention.RowType.None override protected def doExecute() diff --git a/gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/validator/Validators.scala b/gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/validator/Validators.scala index 509d7c02ae19..0e0f5f444b3c 100644 --- a/gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/validator/Validators.scala +++ b/gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/validator/Validators.scala @@ -136,6 +136,7 @@ object Validators { fail(p) case p: CartesianProductExec if !settings.supportCartesianProductExec() => fail(p) case p: TakeOrderedAndProjectExec if !settings.supportColumnarShuffleExec() => fail(p) + case p: RangeExec if !settings.supportRangeExec() => fail(p) case _ => pass() } }