Remove Configuration.getPropsWithPrefix to be compatible with lower…

… versions of Hadoop
apache · Dec 27, 2023 · 4f856f5 · 4f856f5
1 parent 4a9b163
commit 4f856f5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...ain/scala/org/apache/spark/sql/execution/datasources/parquet/GeoParquetWriteSupport.scala b/...ain/scala/org/apache/spark/sql/execution/datasources/parquet/GeoParquetWriteSupport.scala
@@ -139,8 +139,8 @@ class GeoParquetWriteSupport extends WriteSupport[InternalRow] with Logging {
       case version: String => Some(version)
     }
     defaultGeoParquetCrs = Option(configuration.get(GEOPARQUET_CRS_KEY)).map(parse(_))
-    configuration.getPropsWithPrefix(GEOPARQUET_CRS_KEY + ".").asScala.foreach {
-      case (key, value) => geoParquetColumnCrsMap.put(key, parse(value))
+    geometryColumnInfoMap.keys.map(schema(_).name).foreach { name =>
+      Option(configuration.get(GEOPARQUET_CRS_KEY + "." + name)).foreach(crs => geoParquetColumnCrsMap.put(name, parse(crs)))
     }
 
     val messageType = new SparkToParquetSchemaConverter(configuration).convert(schema)

diff --git a/...ain/scala/org/apache/spark/sql/execution/datasources/parquet/GeoParquetWriteSupport.scala b/...ain/scala/org/apache/spark/sql/execution/datasources/parquet/GeoParquetWriteSupport.scala
@@ -139,8 +139,8 @@ class GeoParquetWriteSupport extends WriteSupport[InternalRow] with Logging {
       case version: String => Some(version)
     }
     defaultGeoParquetCrs = Option(configuration.get(GEOPARQUET_CRS_KEY)).map(parse(_))
-    configuration.getPropsWithPrefix(GEOPARQUET_CRS_KEY + ".").asScala.foreach {
-      case (key, value) => geoParquetColumnCrsMap.put(key, parse(value))
+    geometryColumnInfoMap.keys.map(schema(_).name).foreach { name =>
+      Option(configuration.get(GEOPARQUET_CRS_KEY + "." + name)).foreach(crs => geoParquetColumnCrsMap.put(name, parse(crs)))
     }
 
     val messageType = new SparkToParquetSchemaConverter(configuration).convert(schema)

diff --git a/...ain/scala/org/apache/spark/sql/execution/datasources/parquet/GeoParquetWriteSupport.scala b/...ain/scala/org/apache/spark/sql/execution/datasources/parquet/GeoParquetWriteSupport.scala
@@ -139,8 +139,8 @@ class GeoParquetWriteSupport extends WriteSupport[InternalRow] with Logging {
       case version: String => Some(version)
     }
     defaultGeoParquetCrs = Option(configuration.get(GEOPARQUET_CRS_KEY)).map(parse(_))
-    configuration.getPropsWithPrefix(GEOPARQUET_CRS_KEY + ".").asScala.foreach {
-      case (key, value) => geoParquetColumnCrsMap.put(key, parse(value))
+    geometryColumnInfoMap.keys.map(schema(_).name).foreach { name =>
+      Option(configuration.get(GEOPARQUET_CRS_KEY + "." + name)).foreach(crs => geoParquetColumnCrsMap.put(name, parse(crs)))
     }
 
     val messageType = new SparkToParquetSchemaConverter(configuration).convert(schema)