Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CORE][VL] Add OffloadProject to offload project having input_file_name's support considered #6200

Merged
merged 7 commits into from
Jun 28, 2024
Merged

[CORE][VL] Add OffloadProject to offload project having input_file_name's support considered #6200

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4d81d8a
introduce offloadProject function
gaoyangxiaozhu Jun 24, 2024
f6bbb04
address comments
gaoyangxiaozhu Jun 26, 2024
280df5f
Merge branch 'apache:main' into gayangya/offload_project
gaoyangxiaozhu Jun 26, 2024
1c935cc
address comment
gaoyangxiaozhu Jun 27, 2024
d2bd539
Merge branch 'gayangya/offload_project' of https://github.com/gaoyang…
gaoyangxiaozhu Jun 27, 2024
1ca60e2
Merge branch 'apache:main' into gayangya/offload_project
gaoyangxiaozhu Jun 27, 2024
3a63372
Merge branch 'apache:main' into gayangya/offload_project
gaoyangxiaozhu Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxBackend.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,8 @@ object VeloxBackendSettings extends BackendSettingsApi {

override def supportNativeRowIndexColumn(): Boolean = true

override def supportNativeInputFileRelatedExpr(): Boolean = true

override def supportExpandExec(): Boolean = true

override def supportSortExec(): Boolean = true
Expand Down
8 changes: 0 additions & 8 deletions backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxIteratorApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package org.apache.gluten.backendsapi.velox
import org.apache.gluten.GlutenNumaBindingInfo
import org.apache.gluten.backendsapi.IteratorApi
import org.apache.gluten.execution._
import org.apache.gluten.extension.InputFileNameReplaceRule
import org.apache.gluten.metrics.IMetrics
import org.apache.gluten.sql.shims.SparkShimLoader
import org.apache.gluten.substrait.plan.PlanNode
Expand Down Expand Up @@ -134,13 +133,6 @@ class VeloxIteratorApi extends IteratorApi with Logging {
}
val metadataColumn =
SparkShimLoader.getSparkShims.generateMetadataColumns(file, metadataColumnNames)
metadataColumn.put(InputFileNameReplaceRule.replacedInputFileName, file.filePath.toString)
metadataColumn.put(
InputFileNameReplaceRule.replacedInputFileBlockStart,
file.start.toString)
metadataColumn.put(
InputFileNameReplaceRule.replacedInputFileBlockLength,
file.length.toString)
metadataColumns.add(metadataColumn)
val partitionColumn = new JHashMap[String, String]()
for (i <- 0 until file.partitionValues.numFields) {
Expand Down
7 changes: 1 addition & 6 deletions ...ends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -806,12 +806,7 @@ class VeloxSparkPlanExecApi extends SparkPlanExecApi {
* @return
*/
override def genExtendedColumnarValidationRules(): List[SparkSession => Rule[SparkPlan]] = {
val buf: ListBuffer[SparkSession => Rule[SparkPlan]] =
ListBuffer(BloomFilterMightContainJointRewriteRule.apply, ArrowScanReplaceRule.apply)
if (GlutenConfig.getConf.enableInputFileNameReplaceRule) {
buf += InputFileNameReplaceRule.apply
}
buf.result
List(BloomFilterMightContainJointRewriteRule.apply, ArrowScanReplaceRule.apply)
}

/**
Expand Down
155 changes: 0 additions & 155 deletions backends-velox/src/main/scala/org/apache/gluten/extension/InputFileNameReplaceRule.scala
View file
Open in desktop

This file was deleted.

10 changes: 3 additions & 7 deletions backends-velox/src/test/scala/org/apache/gluten/execution/ScalarFunctionsValidateSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,13 +645,9 @@ class ScalarFunctionsValidateSuite extends FunctionsValidateTest {
}

test("Test input_file_name function") {
withSQLConf(
"spark.gluten.sql.enableInputFileNameReplaceRule" -> "true"
) {
runQueryAndCompare("""SELECT input_file_name(), l_orderkey
| from lineitem limit 100""".stripMargin) {
checkGlutenOperatorMatch[ProjectExecTransformer]
}
runQueryAndCompare("""SELECT input_file_name(), l_orderkey
| from lineitem limit 100""".stripMargin) {
checkGlutenOperatorMatch[ProjectExecTransformer]
}
}

Expand Down
1 change: 1 addition & 0 deletions gluten-core/src/main/scala/org/apache/gluten/backendsapi/BackendSettingsApi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ trait BackendSettingsApi {
def supportNativeWrite(fields: Array[StructField]): Boolean = true
def supportNativeMetadataColumns(): Boolean = false
def supportNativeRowIndexColumn(): Boolean = false
def supportNativeInputFileRelatedExpr(): Boolean = false

def supportExpandExec(): Boolean = false
def supportSortExec(): Boolean = false
Expand Down
2 changes: 1 addition & 1 deletion gluten-core/src/main/scala/org/apache/gluten/extension/columnar/MiscColumnarRules.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ object MiscColumnarRules {
object TransformPreOverrides {
def apply(): TransformPreOverrides = {
TransformPreOverrides(
List(OffloadFilter()),
List(OffloadProject(), OffloadFilter()),
List(
OffloadOthers(),
OffloadAggregate(),
Expand Down
Loading
Loading