rename geometry package to geospatial package

zhangfengcdt · zhangfengcdt · commit aec732e35ffa · 2025-05-15T21:22:13.000-07:00
diff --git a/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowGeospatialStatisticsCommand.java b/parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowGeospatialStatisticsCommand.java
@@ -26,7 +26,7 @@
 import java.util.List;
 import org.apache.commons.text.TextStringBuilder;
 import org.apache.parquet.cli.BaseCommand;
-import org.apache.parquet.column.statistics.geometry.GeospatialStatistics;
+import org.apache.parquet.column.statistics.geospatial.GeospatialStatistics;
 import org.apache.parquet.hadoop.ParquetFileReader;
 import org.apache.parquet.hadoop.metadata.BlockMetaData;
 import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData;
diff --git a/parquet-column/src/main/java/org/apache/parquet/column/impl/ColumnValueCollector.java b/parquet-column/src/main/java/org/apache/parquet/column/impl/ColumnValueCollector.java
@@ -26,7 +26,7 @@
 import org.apache.parquet.column.ParquetProperties;
 import org.apache.parquet.column.statistics.SizeStatistics;
 import org.apache.parquet.column.statistics.Statistics;
-import org.apache.parquet.column.statistics.geometry.GeospatialStatistics;
+import org.apache.parquet.column.statistics.geospatial.GeospatialStatistics;
 import org.apache.parquet.column.values.bloomfilter.AdaptiveBlockSplitBloomFilter;
 import org.apache.parquet.column.values.bloomfilter.BlockSplitBloomFilter;
 import org.apache.parquet.column.values.bloomfilter.BloomFilter;
diff --git a/parquet-column/src/main/java/org/apache/parquet/column/impl/ColumnWriterBase.java b/parquet-column/src/main/java/org/apache/parquet/column/impl/ColumnWriterBase.java
@@ -27,7 +27,7 @@
 import org.apache.parquet.column.page.PageWriter;
 import org.apache.parquet.column.statistics.SizeStatistics;
 import org.apache.parquet.column.statistics.Statistics;
-import org.apache.parquet.column.statistics.geometry.GeospatialStatistics;
+import org.apache.parquet.column.statistics.geospatial.GeospatialStatistics;
 import org.apache.parquet.column.values.ValuesWriter;
 import org.apache.parquet.column.values.bloomfilter.BloomFilterWriter;
 import org.apache.parquet.io.ParquetEncodingException;
diff --git a/parquet-column/src/main/java/org/apache/parquet/column/impl/ColumnWriterV1.java b/parquet-column/src/main/java/org/apache/parquet/column/impl/ColumnWriterV1.java
@@ -26,7 +26,7 @@
 import org.apache.parquet.column.page.PageWriter;
 import org.apache.parquet.column.statistics.SizeStatistics;
 import org.apache.parquet.column.statistics.Statistics;
-import org.apache.parquet.column.statistics.geometry.GeospatialStatistics;
+import org.apache.parquet.column.statistics.geospatial.GeospatialStatistics;
 import org.apache.parquet.column.values.ValuesWriter;
 import org.apache.parquet.column.values.bloomfilter.BloomFilterWriter;
 
diff --git a/parquet-column/src/main/java/org/apache/parquet/column/impl/ColumnWriterV2.java b/parquet-column/src/main/java/org/apache/parquet/column/impl/ColumnWriterV2.java
@@ -26,7 +26,7 @@
 import org.apache.parquet.column.page.PageWriter;
 import org.apache.parquet.column.statistics.SizeStatistics;
 import org.apache.parquet.column.statistics.Statistics;
-import org.apache.parquet.column.statistics.geometry.GeospatialStatistics;
+import org.apache.parquet.column.statistics.geospatial.GeospatialStatistics;
 import org.apache.parquet.column.values.ValuesWriter;
 import org.apache.parquet.column.values.bitpacking.DevNullValuesWriter;
 import org.apache.parquet.column.values.bloomfilter.BloomFilterWriter;
diff --git a/parquet-column/src/main/java/org/apache/parquet/column/page/PageWriter.java b/parquet-column/src/main/java/org/apache/parquet/column/page/PageWriter.java
@@ -23,7 +23,7 @@
 import org.apache.parquet.column.Encoding;
 import org.apache.parquet.column.statistics.SizeStatistics;
 import org.apache.parquet.column.statistics.Statistics;
-import org.apache.parquet.column.statistics.geometry.GeospatialStatistics;
+import org.apache.parquet.column.statistics.geospatial.GeospatialStatistics;
 
 /**
  * a writer for all the pages of a given column chunk
diff --git a/parquet-column/src/main/java/org/apache/parquet/column/statistics/geospatial/BoundingBox.java b/parquet-column/src/main/java/org/apache/parquet/column/statistics/geospatial/BoundingBox.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.parquet.column.statistics.geometry;
+package org.apache.parquet.column.statistics.geospatial;
 
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Envelope;
diff --git a/parquet-column/src/main/java/org/apache/parquet/column/statistics/geospatial/GeospatialStatistics.java b/parquet-column/src/main/java/org/apache/parquet/column/statistics/geospatial/GeospatialStatistics.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.parquet.column.statistics.geometry;
+package org.apache.parquet.column.statistics.geospatial;
 
 import org.apache.parquet.io.api.Binary;
 import org.apache.parquet.schema.LogicalTypeAnnotation;
diff --git a/parquet-column/src/main/java/org/apache/parquet/column/statistics/geospatial/GeospatialTypes.java b/parquet-column/src/main/java/org/apache/parquet/column/statistics/geospatial/GeospatialTypes.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.parquet.column.statistics.geometry;
+package org.apache.parquet.column.statistics.geospatial;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/parquet-column/src/test/java/org/apache/parquet/column/page/mem/MemPageWriter.java b/parquet-column/src/test/java/org/apache/parquet/column/page/mem/MemPageWriter.java
@@ -32,7 +32,7 @@
 import org.apache.parquet.column.page.PageWriter;
 import org.apache.parquet.column.statistics.SizeStatistics;
 import org.apache.parquet.column.statistics.Statistics;
-import org.apache.parquet.column.statistics.geometry.GeospatialStatistics;
+import org.apache.parquet.column.statistics.geospatial.GeospatialStatistics;
 import org.apache.parquet.io.ParquetEncodingException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/parquet-column/src/test/java/org/apache/parquet/column/statistics/geospatial/TestBoundingBox.java b/parquet-column/src/test/java/org/apache/parquet/column/statistics/geospatial/TestBoundingBox.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.parquet.column.statistics.geometry;
+package org.apache.parquet.column.statistics.geospatial;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/parquet-column/src/test/java/org/apache/parquet/column/statistics/geospatial/TestGeospatialStatistics.java b/parquet-column/src/test/java/org/apache/parquet/column/statistics/geospatial/TestGeospatialStatistics.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.parquet.column.statistics.geometry;
+package org.apache.parquet.column.statistics.geospatial;
 
 import org.apache.parquet.io.api.Binary;
 import org.apache.parquet.schema.LogicalTypeAnnotation;
diff --git a/parquet-column/src/test/java/org/apache/parquet/column/statistics/geospatial/TestGeospatialTypes.java b/parquet-column/src/test/java/org/apache/parquet/column/statistics/geospatial/TestGeospatialTypes.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.parquet.column.statistics.geometry;
+package org.apache.parquet.column.statistics.geospatial;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java b/parquet-hadoop/src/main/java/org/apache/parquet/format/converter/ParquetMetadataConverter.java
@@ -50,7 +50,7 @@
 import org.apache.parquet.column.EncodingStats;
 import org.apache.parquet.column.ParquetProperties;
 import org.apache.parquet.column.statistics.BinaryStatistics;
-import org.apache.parquet.column.statistics.geometry.GeospatialTypes;
+import org.apache.parquet.column.statistics.geospatial.GeospatialTypes;
 import org.apache.parquet.column.values.bloomfilter.BloomFilter;
 import org.apache.parquet.crypto.AesCipher;
 import org.apache.parquet.crypto.AesGcmEncryptor;
@@ -804,7 +804,7 @@ public static Statistics toParquetStatistics(
     return formatStats;
   }
 
-  private static BoundingBox toParquetBoundingBox(org.apache.parquet.column.statistics.geometry.BoundingBox bbox) {
+  private static BoundingBox toParquetBoundingBox(org.apache.parquet.column.statistics.geospatial.BoundingBox bbox) {
     // Check if any of the required bounding box is valid.
     if (!bbox.isXYValid() || bbox.isXYEmpty()) {
       // According to the Thrift-generated class, these fields are marked as required and must be set explicitly.
@@ -940,7 +940,7 @@ public org.apache.parquet.column.statistics.Statistics fromParquetStatistics(
   }
 
   GeospatialStatistics toParquetGeospatialStatistics(
-      org.apache.parquet.column.statistics.geometry.GeospatialStatistics geospatialStatistics) {
+      org.apache.parquet.column.statistics.geospatial.GeospatialStatistics geospatialStatistics) {
     if (geospatialStatistics == null) {
       return null;
     }
@@ -975,15 +975,15 @@ GeospatialStatistics toParquetGeospatialStatistics(
     return formatStats;
   }
 
-  static org.apache.parquet.column.statistics.geometry.GeospatialStatistics fromParquetStatistics(
+  static org.apache.parquet.column.statistics.geospatial.GeospatialStatistics fromParquetStatistics(
       GeospatialStatistics formatGeomStats, PrimitiveType type) {
-    org.apache.parquet.column.statistics.geometry.BoundingBox bbox = null;
+    org.apache.parquet.column.statistics.geospatial.BoundingBox bbox = null;
     if (formatGeomStats == null) {
       return null;
     }
     if (formatGeomStats.isSetBbox()) {
       BoundingBox formatBbox = formatGeomStats.getBbox();
-      bbox = new org.apache.parquet.column.statistics.geometry.BoundingBox(
+      bbox = new org.apache.parquet.column.statistics.geospatial.BoundingBox(
           formatBbox.isSetXmin() ? formatBbox.getXmin() : Double.NaN,
           formatBbox.isSetXmax() ? formatBbox.getXmax() : Double.NaN,
           formatBbox.isSetYmin() ? formatBbox.getYmin() : Double.NaN,
@@ -1003,9 +1003,9 @@ static org.apache.parquet.column.statistics.geometry.GeospatialStatistics fromPa
     if (logicalType instanceof LogicalTypeAnnotation.GeometryLogicalTypeAnnotation) {
       LogicalTypeAnnotation.GeometryLogicalTypeAnnotation geometryLogicalType =
           (LogicalTypeAnnotation.GeometryLogicalTypeAnnotation) logicalType;
-      return new org.apache.parquet.column.statistics.geometry.GeospatialStatistics(bbox, geospatialTypes);
+      return new org.apache.parquet.column.statistics.geospatial.GeospatialStatistics(bbox, geospatialTypes);
     }
-    return new org.apache.parquet.column.statistics.geometry.GeospatialStatistics(
+    return new org.apache.parquet.column.statistics.geospatial.GeospatialStatistics(
         // this case should not happen in normal cases
         bbox, geospatialTypes);
   }
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnChunkPageWriteStore.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ColumnChunkPageWriteStore.java
@@ -40,7 +40,7 @@
 import org.apache.parquet.column.page.PageWriter;
 import org.apache.parquet.column.statistics.SizeStatistics;
 import org.apache.parquet.column.statistics.Statistics;
-import org.apache.parquet.column.statistics.geometry.GeospatialStatistics;
+import org.apache.parquet.column.statistics.geospatial.GeospatialStatistics;
 import org.apache.parquet.column.values.bloomfilter.BloomFilter;
 import org.apache.parquet.column.values.bloomfilter.BloomFilterWriteStore;
 import org.apache.parquet.column.values.bloomfilter.BloomFilterWriter;
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileWriter.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileWriter.java
@@ -57,7 +57,7 @@
 import org.apache.parquet.column.page.DictionaryPage;
 import org.apache.parquet.column.statistics.SizeStatistics;
 import org.apache.parquet.column.statistics.Statistics;
-import org.apache.parquet.column.statistics.geometry.GeospatialStatistics;
+import org.apache.parquet.column.statistics.geospatial.GeospatialStatistics;
 import org.apache.parquet.column.values.bloomfilter.BloomFilter;
 import org.apache.parquet.crypto.AesCipher;
 import org.apache.parquet.crypto.ColumnEncryptionProperties;
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/metadata/ColumnChunkMetaData.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/metadata/ColumnChunkMetaData.java
@@ -31,7 +31,7 @@
 import org.apache.parquet.column.statistics.BooleanStatistics;
 import org.apache.parquet.column.statistics.SizeStatistics;
 import org.apache.parquet.column.statistics.Statistics;
-import org.apache.parquet.column.statistics.geometry.GeospatialStatistics;
+import org.apache.parquet.column.statistics.geospatial.GeospatialStatistics;
 import org.apache.parquet.crypto.AesCipher;
 import org.apache.parquet.crypto.InternalColumnDecryptionSetup;
 import org.apache.parquet.crypto.InternalFileDecryptor;
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java b/parquet-hadoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java
@@ -89,7 +89,7 @@
 import org.apache.parquet.column.statistics.LongStatistics;
 import org.apache.parquet.column.statistics.SizeStatistics;
 import org.apache.parquet.column.statistics.Statistics;
-import org.apache.parquet.column.statistics.geometry.GeospatialTypes;
+import org.apache.parquet.column.statistics.geospatial.GeospatialTypes;
 import org.apache.parquet.crypto.DecryptionPropertiesFactory;
 import org.apache.parquet.crypto.EncryptionPropertiesFactory;
 import org.apache.parquet.crypto.FileDecryptionProperties;
@@ -1811,8 +1811,8 @@ public void testGeospatialStatisticsConversion() {
     ParquetMetadataConverter converter = new ParquetMetadataConverter();
 
     // Create a valid BoundingBox with all fields set
-    org.apache.parquet.column.statistics.geometry.BoundingBox bbox =
-        new org.apache.parquet.column.statistics.geometry.BoundingBox(
+    org.apache.parquet.column.statistics.geospatial.BoundingBox bbox =
+        new org.apache.parquet.column.statistics.geospatial.BoundingBox(
             1.0, 2.0, // xmin, xmax
             3.0, 4.0, // ymin, ymax
             5.0, 6.0, // zmin, zmax
@@ -1824,8 +1824,8 @@ public void testGeospatialStatisticsConversion() {
     GeospatialTypes geospatialTypes = new GeospatialTypes(types);
 
     // Create GeospatialStatistics with the bbox and types
-    org.apache.parquet.column.statistics.geometry.GeospatialStatistics origStats =
-        new org.apache.parquet.column.statistics.geometry.GeospatialStatistics(bbox, geospatialTypes);
+    org.apache.parquet.column.statistics.geospatial.GeospatialStatistics origStats =
+        new org.apache.parquet.column.statistics.geospatial.GeospatialStatistics(bbox, geospatialTypes);
 
     // Convert to Thrift format
     GeospatialStatistics thriftStats = converter.toParquetGeospatialStatistics(origStats);
@@ -1859,7 +1859,7 @@ public void testGeospatialStatisticsConversion() {
         Types.required(PrimitiveTypeName.BINARY).as(geometryAnnotation).named("geometry");
 
     // Convert back from Thrift format
-    org.apache.parquet.column.statistics.geometry.GeospatialStatistics convertedStats =
+    org.apache.parquet.column.statistics.geospatial.GeospatialStatistics convertedStats =
         ParquetMetadataConverter.fromParquetStatistics(thriftStats, geometryType);
 
     // Verify conversion from Thrift
@@ -1868,7 +1868,7 @@ public void testGeospatialStatisticsConversion() {
     assertNotNull("GeospatialTypes should not be null", convertedStats.getGeospatialTypes());
 
     // Check BoundingBox values
-    org.apache.parquet.column.statistics.geometry.BoundingBox convertedBbox = convertedStats.getBoundingBox();
+    org.apache.parquet.column.statistics.geospatial.BoundingBox convertedBbox = convertedStats.getBoundingBox();
     assertEquals(1.0, convertedBbox.getXMin(), 0.0001);
     assertEquals(2.0, convertedBbox.getXMax(), 0.0001);
     assertEquals(3.0, convertedBbox.getYMin(), 0.0001);
@@ -1893,8 +1893,8 @@ public void testGeospatialStatisticsWithNullBoundingBox() {
     // Create GeospatialStatistics with null bbox but valid types
     Set<Integer> types = new HashSet<>(Arrays.asList(1, 2, 3));
     GeospatialTypes geospatialTypes = new GeospatialTypes(types);
-    org.apache.parquet.column.statistics.geometry.GeospatialStatistics origStats =
-        new org.apache.parquet.column.statistics.geometry.GeospatialStatistics(null, geospatialTypes);
+    org.apache.parquet.column.statistics.geospatial.GeospatialStatistics origStats =
+        new org.apache.parquet.column.statistics.geospatial.GeospatialStatistics(null, geospatialTypes);
 
     // Convert to Thrift format
     GeospatialStatistics thriftStats = converter.toParquetGeospatialStatistics(origStats);
@@ -1910,7 +1910,7 @@ public void testGeospatialStatisticsWithNullBoundingBox() {
         Types.required(PrimitiveTypeName.BINARY).as(geometryAnnotation).named("geometry");
 
     // Convert back from Thrift format
-    org.apache.parquet.column.statistics.geometry.GeospatialStatistics convertedStats =
+    org.apache.parquet.column.statistics.geospatial.GeospatialStatistics convertedStats =
         ParquetMetadataConverter.fromParquetStatistics(thriftStats, geometryType);
 
     // Verify conversion from Thrift
@@ -1924,8 +1924,8 @@ public void testInvalidBoundingBox() {
     ParquetMetadataConverter converter = new ParquetMetadataConverter();
 
     // Create an invalid BoundingBox with NaN values
-    org.apache.parquet.column.statistics.geometry.BoundingBox invalidBbox =
-        new org.apache.parquet.column.statistics.geometry.BoundingBox(
+    org.apache.parquet.column.statistics.geospatial.BoundingBox invalidBbox =
+        new org.apache.parquet.column.statistics.geospatial.BoundingBox(
             Double.NaN,
             2.0, // xmin is NaN (invalid)
             3.0,
@@ -1935,8 +1935,8 @@ public void testInvalidBoundingBox() {
             7.0,
             8.0);
 
-    org.apache.parquet.column.statistics.geometry.GeospatialStatistics origStats =
-        new org.apache.parquet.column.statistics.geometry.GeospatialStatistics(invalidBbox, null);
+    org.apache.parquet.column.statistics.geospatial.GeospatialStatistics origStats =
+        new org.apache.parquet.column.statistics.geospatial.GeospatialStatistics(invalidBbox, null);
 
     // Convert to Thrift format - should return null for invalid bbox
     GeospatialStatistics thriftStats = converter.toParquetGeospatialStatistics(origStats);
diff --git a/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestGeometryTypeRoundTrip.java b/parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestGeometryTypeRoundTrip.java
@@ -27,7 +27,7 @@
 import java.nio.file.Path;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.parquet.Preconditions;
-import org.apache.parquet.column.statistics.geometry.GeospatialStatistics;
+import org.apache.parquet.column.statistics.geospatial.GeospatialStatistics;
 import org.apache.parquet.example.data.Group;
 import org.apache.parquet.example.data.GroupFactory;
 import org.apache.parquet.example.data.simple.SimpleGroupFactory;
