Add for other spark versions.

apache · Oct 11, 2024 · f031dfa · f031dfa
1 parent fcbbf59
commit f031dfa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 25 deletions.
diff --git a/...park-3.0/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageScan.scala b/...park-3.0/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageScan.scala
@@ -37,18 +37,13 @@ case class GeoPackageScan(
     readDataSchema: StructType,
     readPartitionSchema: StructType,
     options: CaseInsensitiveStringMap,
-    loadOptions: GeoPackageOptions)
+    loadOptions: GeoPackageOptions,
+    partitionFilters: Seq[Expression] = Seq.empty,
+    dataFilters: Seq[Expression] = Seq.empty)
     extends FileScan {
-  override def partitionFilters: Seq[Expression] = {
-    Seq.empty
-  }
-
-  override def dataFilters: Seq[Expression] = {
-    Seq.empty
-  }
 
   def withFilters(partitionFilters: Seq[Expression], dataFilters: Seq[Expression]): FileScan = {
-    copy()
+    copy(partitionFilters = partitionFilters, dataFilters = dataFilters)
   }
   override def createReaderFactory(): PartitionReaderFactory = {
     val caseSensitiveMap = options.asScala.toMap

diff --git a/...park-3.1/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageScan.scala b/...park-3.1/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageScan.scala
@@ -37,19 +37,13 @@ case class GeoPackageScan(
     readDataSchema: StructType,
     readPartitionSchema: StructType,
     options: CaseInsensitiveStringMap,
-    loadOptions: GeoPackageOptions)
+    loadOptions: GeoPackageOptions,
+    partitionFilters: Seq[Expression] = Seq.empty,
+    dataFilters: Seq[Expression] = Seq.empty)
     extends FileScan {
 
-  override def partitionFilters: Seq[Expression] = {
-    Seq.empty
-  }
-
-  override def dataFilters: Seq[Expression] = {
-    Seq.empty
-  }
-
   def withFilters(partitionFilters: Seq[Expression], dataFilters: Seq[Expression]): FileScan = {
-    copy()
+    copy(partitionFilters = partitionFilters, dataFilters = dataFilters)
   }
 
   override def createReaderFactory(): PartitionReaderFactory = {

diff --git a/...park-3.2/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageScan.scala b/...park-3.2/src/main/scala/org/apache/sedona/sql/datasources/geopackage/GeoPackageScan.scala
@@ -37,15 +37,13 @@ case class GeoPackageScan(
     readDataSchema: StructType,
     readPartitionSchema: StructType,
     options: CaseInsensitiveStringMap,
-    loadOptions: GeoPackageOptions)
+    loadOptions: GeoPackageOptions,
+    partitionFilters: Seq[Expression] = Seq.empty,
+    dataFilters: Seq[Expression] = Seq.empty)
     extends FileScan {
 
-  override def partitionFilters: Seq[Expression] = Seq.empty
-
-  override def dataFilters: Seq[Expression] = Seq.empty
-
   def withFilters(partitionFilters: Seq[Expression], dataFilters: Seq[Expression]): FileScan = {
-    copy()
+    copy(partitionFilters = partitionFilters, dataFilters = dataFilters)
   }
 
   override def createReaderFactory(): PartitionReaderFactory = {