combine api

apache · Nov 30, 2023 · b37c3db · b37c3db
1 parent 5d1cceb
commit b37c3db
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 24 deletions.
diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/BasicPhysicalOperatorTransformer.scala b/gluten-core/src/main/scala/io/glutenproject/execution/BasicPhysicalOperatorTransformer.scala
@@ -474,7 +474,7 @@ object FilterHandler {
         ScanTransformerFactory.createFileSourceScanTransformer(
           fileSourceScan,
           reuseSubquery,
-          filter)
+          filter = filter)
       case batchScan: BatchScanExec =>
         if (ScanTransformerFactory.supportedBatchScan(batchScan.scan)) {
           ScanTransformerFactory.createBatchScanTransformer(batchScan, reuseSubquery)

diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/ScanTransformerFactory.scala b/gluten-core/src/main/scala/io/glutenproject/execution/ScanTransformerFactory.scala
@@ -36,35 +36,19 @@ object ScanTransformerFactory {
   def createFileSourceScanTransformer(
       scanExec: FileSourceScanExec,
       reuseSubquery: Boolean,
+      filter: FilterExec = null,
       validation: Boolean = false): FileSourceScanExecTransformer = {
-    // TODO: Add delta match here
+    val leftFilters = if (filter != null) {
+      getLeftFilters(scanExec.dataFilters, flattenCondition(filter.condition))
+    } else {
+      Seq.empty
+    }
+    // transform BroadcastExchangeExec to ColumnarBroadcastExchangeExec in partitionFilters
     val newPartitionFilters = if (validation) {
       scanExec.partitionFilters
     } else {
       ExpressionConverter.transformDynamicPruningExpr(scanExec.partitionFilters, reuseSubquery)
     }
-    new FileSourceScanExecTransformer(
-      scanExec.relation,
-      scanExec.output,
-      scanExec.requiredSchema,
-      newPartitionFilters,
-      scanExec.optionalBucketSet,
-      scanExec.optionalNumCoalescedBuckets,
-      scanExec.dataFilters,
-      scanExec.tableIdentifier,
-      scanExec.disableBucketedScan
-    )
-  }
-
-  def createFileSourceScanTransformer(
-      scanExec: FileSourceScanExec,
-      reuseSubquery: Boolean,
-      filter: FilterExec): FileSourceScanExecTransformer = {
-    val leftFilters =
-      getLeftFilters(scanExec.dataFilters, flattenCondition(filter.condition))
-    // transform BroadcastExchangeExec to ColumnarBroadcastExchangeExec in partitionFilters
-    val newPartitionFilters =
-      ExpressionConverter.transformDynamicPruningExpr(scanExec.partitionFilters, reuseSubquery)
     new FileSourceScanExecTransformer(
       scanExec.relation,
       scanExec.output,