fix issue after merge main

apache · Dec 6, 2023 · 913d780 · 913d780
1 parent b86896a
commit 913d780
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/gluten-core/src/main/scala/io/glutenproject/execution/BasicScanExecTransformer.scala b/gluten-core/src/main/scala/io/glutenproject/execution/BasicScanExecTransformer.scala
@@ -26,14 +26,15 @@ import io.glutenproject.substrait.rel.{ReadRelNode, RelBuilder, SplitInfo}
 import io.glutenproject.substrait.rel.LocalFilesNode.ReadFileFormat
 
 import org.apache.spark.rdd.RDD
-import org.apache.spark.sql.catalyst.expressions.{And, Attribute, Expression}
+import org.apache.spark.sql.catalyst.expressions.{And, Attribute, AttributeReference, Expression}
 import org.apache.spark.sql.vectorized.ColumnarBatch
 
 import com.google.common.collect.Lists
 
 import scala.collection.JavaConverters._
 
 trait BasicScanExecTransformer extends LeafTransformSupport with BaseDataSource {
+  import org.apache.spark.sql.catalyst.util._
 
   /** Returns the filters that can be pushed down to native file scan */
   def filterExprs(hasMetadataColFilters: Boolean = true): Seq[Expression]
@@ -60,6 +61,7 @@ trait BasicScanExecTransformer extends LeafTransformSupport with BaseDataSource
     getPartitions.map(
       BackendsApiManager.getIteratorApiInstance
         .genSplitInfo(_, getPartitionSchema, fileFormat, getMetadataColumns.map(_.name)))
+  }
 
   def doExecuteColumnarInternal(): RDD[ColumnarBatch] = {
     val numOutputRows = longMetric("outputRows")

diff --git a/gluten-iceberg/src/main/scala/io/glutenproject/execution/IcebergScanTransformer.scala b/gluten-iceberg/src/main/scala/io/glutenproject/execution/IcebergScanTransformer.scala
@@ -41,7 +41,7 @@ class IcebergScanTransformer(
     runtimeFilters = runtimeFilters,
     table = table) {
 
-  override def filterExprs(): Seq[Expression] = Seq.empty
+  override def filterExprs(hasMetataColFilters: Boolean): Seq[Expression] = Seq.empty
 
   override def getPartitionSchema: StructType = new StructType()