split xy into x and y for valid and empty check

Author: zhangfengcdt

parquet-column/src/main/java/org/apache/parquet/column/statistics/geometry/BoundingBox.java

@@ -111,7 +111,27 @@ public boolean isValid() {
    * @return true if the X and Y dimensions are valid, false otherwise.
    */
   public boolean isXYValid() {
-    return !(Double.isNaN(xMin) || Double.isNaN(xMax) || Double.isNaN(yMin) || Double.isNaN(yMax));
+    return isXValid() && isYValid();
+  }
+
+  /**
+   * Checks if the X dimension of the bounding box is valid.
+   * The X dimension is considered valid if neither bound contains NaN.
+   *
+   * @return true if the X dimension is valid, false otherwise.
+   */
+  public boolean isXValid() {
+    return !(Double.isNaN(xMin) || Double.isNaN(xMax));
+  }
+
+  /**
+   * Checks if the Y dimension of the bounding box is valid.
+   * The Y dimension is considered valid if neither bound contains NaN.
+   *
+   * @return true if the Y dimension is valid, false otherwise.
+   */
+  public boolean isYValid() {
+    return !(Double.isNaN(yMin) || Double.isNaN(yMax));
   }
 
   /**
@@ -140,8 +160,25 @@ public boolean isMValid() {
    * @return true if the bounding box is empty, false otherwise.
    */
   public boolean isXYEmpty() {
-    return (Double.isInfinite(xMin) && Double.isInfinite(xMax))
-        || (Double.isInfinite(yMin) && Double.isInfinite(yMax));
+    return isXEmpty() || isYEmpty();
+  }
+
+  /**
+   * Checks if the bounding box is empty in the X dimension.
+   *
+   * @return true if the X dimension is empty, false otherwise.
+   */
+  public boolean isXEmpty() {
+    return Double.isInfinite(xMin) && Double.isInfinite(xMax);
+  }
+
+  /**
+   * Checks if the bounding box is empty in the Y dimension.
+   *
+   * @return true if the Y dimension is empty, false otherwise.
+   */
+  public boolean isYEmpty() {
+    return Double.isInfinite(yMin) && Double.isInfinite(yMax);
   }
 
   /**

parquet-column/src/main/java/org/apache/parquet/column/statistics/geometry/GeospatialTypes.java

@@ -32,7 +32,7 @@ public class GeospatialTypes {
 
   public GeospatialTypes(Set<Integer> types) {
     this.types = types;
-    this.valid = validateTypeValues();
+    this.valid = true;
   }
 
   public GeospatialTypes(Set<Integer> types, boolean valid) {
@@ -95,50 +95,6 @@ public GeospatialTypes copy() {
     return new GeospatialTypes(new HashSet<>(types), valid);
   }
 
-  /**
-   * Validates the geometry type codes in this GeospatialTypes instance.
-   * This method ensures that all type codes represent valid geometry types and dimensions.
-   *
-   * @return true if all type codes are valid, false otherwise.
-   */
-  public boolean validateTypeValues() {
-    if (!isValid()) {
-      return false;
-    }
-
-    // No types is considered valid
-    if (types.isEmpty()) {
-      return true;
-    }
-
-    for (Integer typeId : types) {
-      // Null type code is invalid
-      if (typeId == null) {
-        return false;
-      }
-
-      // Negative type codes (except UNKNOWN_TYPE_ID) are invalid
-      if (typeId < 0 && typeId != UNKNOWN_TYPE_ID) {
-        return false;
-      }
-
-      // Check for valid geometry type base codes (1-7)
-      // After removing dimension prefix: 1=Point, 2=LineString, 3=Polygon, etc.
-      int baseTypeCode = getBaseTypeCode(typeId);
-      if (baseTypeCode < 1 || baseTypeCode > 7) {
-        return false;
-      }
-
-      // Check for valid dimension prefix (0=XY, 1000=XYZ, 2000=XYM, 3000=XYZM)
-      int dimension = getDimensionPrefix(typeId);
-      if (dimension != 0 && dimension != 1000 && dimension != 2000 && dimension != 3000) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
   /**
    * Extracts the base geometry type code from a full type code.
    * For example: 1001 (XYZ Point) -> 1 (Point)

parquet-column/src/test/java/org/apache/parquet/column/statistics/geometry/TestGeospatialTypes.java

@@ -530,34 +530,6 @@ public void testGeometryTypeCodeAssignment() {
     Assert.assertTrue(geospatialTypes.getTypes().contains(7));
   }
 
-  @Test
-  public void testUnsupportedGeometryType() {
-    // Instead of creating a mock geometry, we'll use reflection to test
-    // the GeospatialTypes with invalid geometry type codes
-    GeospatialTypes types = new GeospatialTypes();
-
-    // Add an invalid type code directly to test validation
-    Set<Integer> invalidTypes = new HashSet<>();
-    invalidTypes.add(8); // 8 is not a valid base geometry type (valid ones are 1-7)
-
-    GeospatialTypes invalidTypeInstance = new GeospatialTypes(invalidTypes);
-    Assert.assertFalse(invalidTypeInstance.isValid());
-
-    // Test with out of range dimension prefix
-    Set<Integer> invalidDimensionTypes = new HashSet<>();
-    invalidDimensionTypes.add(4000 + 1); // 4000 is not a valid dimension prefix
-
-    GeospatialTypes invalidDimensionInstance = new GeospatialTypes(invalidDimensionTypes);
-    Assert.assertFalse(invalidDimensionInstance.isValid());
-
-    // Test with negative type code
-    Set<Integer> negativeTypes = new HashSet<>();
-    negativeTypes.add(-5); // Negative type that's not UNKNOWN_TYPE_ID
-
-    GeospatialTypes negativeTypeInstance = new GeospatialTypes(negativeTypes);
-    Assert.assertFalse(negativeTypeInstance.isValid());
-  }
-
   @Test
   public void testGeometryTypeDimensionCodes() {
     GeometryFactory gf = new GeometryFactory();

parquet-hadoop/src/test/java/org/apache/parquet/statistics/TestGeometryTypeRoundTrip.java

@@ -221,8 +221,6 @@ public void testInvalidGeometryPresented() throws Exception {
       Assert.assertNotNull("Bounding box should not be null", geospatialStatistics.getBoundingBox());
       Assert.assertNotNull("Geospatial types should not be null", geospatialStatistics.getGeospatialTypes());
       Assert.assertTrue("Geospatial types should be valid", geospatialStatistics.getGeospatialTypes().isValid());
-      Assert.assertTrue("Geospatial types should contain valid geometry type values",
-          geospatialStatistics.getGeospatialTypes().validateTypeValues());
     }
   }
 }