GEOMESA-3582 Refactored out magic strings in TrinoFilterToSQL

Author: cwdobbins

geomesa-trino/geomesa-trino-datastore/src/main/java/org/locationtech/geomesa/trino/datastore/TrinoFilterToSQL.java

@@ -78,7 +78,7 @@ private static String quoteIdent(String name) {
      *  so this is defense-in-depth — it keeps the geometry literal on the same escaping
      *  discipline as identifiers ({@link #quoteIdent}), feature ids, and the visibility literal. */
     private String geomFromText(Geometry geom) {
-        return "ST_GeometryFromText('" + wkt.write(geom).replace("'", "''") + "')";
+        return ST_GEOMETRY_FROM_TEXT + "('" + wkt.write(geom).replace("'", "''") + "')";
     }
 
     /** Per-instance, NOT static: {@link WKTWriter} is not thread-safe, and a
@@ -104,6 +104,21 @@ private String geomFromText(Geometry geom) {
      *  prefilter never drops matching rows). Also avoids the division-by-zero at exactly ±90°. */
     private static final double NEAR_POLE_LAT = 85.0;
 
+    // Trino spatial SQL function names emitted by this translator.
+    private static final String ST_INTERSECTS         = "ST_Intersects";
+    private static final String ST_WITHIN             = "ST_Within";
+    private static final String ST_CONTAINS           = "ST_Contains";
+    private static final String ST_CROSSES            = "ST_Crosses";
+    private static final String ST_TOUCHES            = "ST_Touches";
+    private static final String ST_OVERLAPS           = "ST_Overlaps";
+    private static final String ST_EQUALS             = "ST_Equals";
+    private static final String ST_DISJOINT           = "ST_Disjoint";
+    private static final String ST_GEOM_FROM_BINARY   = "ST_GeomFromBinary";
+    private static final String ST_GEOMETRY_FROM_TEXT = "ST_GeometryFromText";
+    private static final String ST_DISTANCE           = "ST_Distance";
+    private static final String TO_SPHERICAL_GEOGRAPHY = "to_spherical_geography";
+    private static final String GEOMETRY_NEAREST_POINTS = "geometry_nearest_points";
+
     // ── Spatial ───────────────────────────────────────────────────────────────
     //
     // All binary spatial operators funnel through the base class's dispatcher: the
@@ -126,25 +141,25 @@ protected Object visitBinarySpatialOperator(BinarySpatialOperator filter,
                 "Unsupported spatial filter literal (expected a geometry): " + filter);
         }
         if (filter instanceof Intersects) {                  // symmetric
-            writeSpatial("ST_Intersects", col, geom);
+            writeSpatial(ST_INTERSECTS, col, geom);
         } else if (filter instanceof Within) {
-            writeSpatial(swapped ? "ST_Contains" : "ST_Within", col, geom);
+            writeSpatial(swapped ? ST_CONTAINS : ST_WITHIN, col, geom);
         } else if (filter instanceof Contains) {
-            writeSpatial(swapped ? "ST_Within" : "ST_Contains", col, geom);
+            writeSpatial(swapped ? ST_WITHIN : ST_CONTAINS, col, geom);
         } else if (filter instanceof DWithin d) {            // symmetric
             writeDWithin(col, geom, convertToMeters(d.getDistance(), d.getDistanceUnits()));
         } else if (filter instanceof Beyond b) {             // symmetric
             writeBeyond(col, geom, convertToMeters(b.getDistance(), b.getDistanceUnits()));
         } else if (filter instanceof Crosses) {              // symmetric
-            writeSpatial("ST_Crosses", col, geom);
+            writeSpatial(ST_CROSSES, col, geom);
         } else if (filter instanceof Touches) {              // symmetric
-            writeSpatial("ST_Touches", col, geom);
+            writeSpatial(ST_TOUCHES, col, geom);
         } else if (filter instanceof Overlaps) {             // symmetric
-            writeSpatial("ST_Overlaps", col, geom);
+            writeSpatial(ST_OVERLAPS, col, geom);
         } else if (filter instanceof Equals) {               // symmetric
-            writeSpatial("ST_Equals", col, geom);
+            writeSpatial(ST_EQUALS, col, geom);
         } else if (filter instanceof Disjoint) {             // symmetric
-            writeSpatial("ST_Disjoint", col, geom);
+            writeSpatial(ST_DISJOINT, col, geom);
         } else {
             throw new IllegalArgumentException("Unsupported spatial operator: " + filter);
         }
@@ -176,7 +191,7 @@ public Object visit(BBOX filter, Object extraData) {
             ? pn.getPropertyName() : defaultGeomCol();
         BoundingBox b = filter.getBounds();
         Envelope env = new Envelope(b.getMinX(), b.getMaxX(), b.getMinY(), b.getMaxY());
-        writeSpatial("ST_Intersects", col, GEOMETRY_FACTORY.toGeometry(env));
+        writeSpatial(ST_INTERSECTS, col, GEOMETRY_FACTORY.toGeometry(env));
         return extraData;
     }
 
@@ -185,7 +200,7 @@ public Object visit(BBOX filter, Object extraData) {
      *  {@code extractGeomColumnName}/{@code tryExtractEnvelope} recognize for
      *  bbox/Z2/XZ2 pushdown (ST_Disjoint is deliberately never pushed there). */
     private void writeSpatial(String function, String col, Geometry geom) {
-        write(function + "(ST_GeomFromBinary(" + quoteIdent(col) + "),"
+        write(function + "(" + ST_GEOM_FROM_BINARY + "(" + quoteIdent(col) + "),"
             + " " + geomFromText(geom) + ")");
     }
 
@@ -228,7 +243,7 @@ private void writeDWithin(String col, Geometry refGeom, double distanceMeters) {
         String refWkt = wkt.write(refGeom).replace("'", "''");
         String distanceCheck = String.format(Locale.ROOT, "%s <= %.0f",
             sphericalDistanceSql(col, refGeom, refWkt), distanceMeters);
-        write("ST_Intersects(ST_GeomFromBinary(" + quoteIdent(col) + "),"
+        write(ST_INTERSECTS + "(" + ST_GEOM_FROM_BINARY + "(" + quoteIdent(col) + "),"
             + " " + geomFromText(GEOMETRY_FACTORY.toGeometry(outer)) + ")"
             + " AND " + distanceCheck);
     }
@@ -251,15 +266,15 @@ private void writeBeyond(String col, Geometry refGeom, double distanceMeters) {
      * slightly from the geodesic nearest at mid latitudes).
      */
     private String sphericalDistanceSql(String col, Geometry refGeom, String refWkt) {
-        String geomExpr = "ST_GeomFromBinary(" + quoteIdent(col) + ")";
-        String refExpr = "ST_GeometryFromText('" + refWkt + "')";
+        String geomExpr = ST_GEOM_FROM_BINARY + "(" + quoteIdent(col) + ")";
+        String refExpr = ST_GEOMETRY_FROM_TEXT + "('" + refWkt + "')";
         if (refGeom instanceof Point) {
-            return "ST_Distance(to_spherical_geography(" + geomExpr + "),"
-                + " to_spherical_geography(" + refExpr + "))";
+            return ST_DISTANCE + "(" + TO_SPHERICAL_GEOGRAPHY + "(" + geomExpr + "),"
+                + " " + TO_SPHERICAL_GEOGRAPHY + "(" + refExpr + "))";
         }
-        String np = "geometry_nearest_points(" + geomExpr + ", " + refExpr + ")";
-        return "ST_Distance(to_spherical_geography(" + np + "[1]),"
-            + " to_spherical_geography(" + np + "[2]))";
+        String np = GEOMETRY_NEAREST_POINTS + "(" + geomExpr + ", " + refExpr + ")";
+        return ST_DISTANCE + "(" + TO_SPHERICAL_GEOGRAPHY + "(" + np + "[1]),"
+            + " " + TO_SPHERICAL_GEOGRAPHY + "(" + np + "[2]))";
     }
 
     // ── Temporal ──────────────────────────────────────────────────────────────