[native] Return false for queries with spherical geometry in sidecar enabled clusters

pdabre12 · pdabre12 · commit b553f71021f3 · 2025-08-27T18:18:28.000-07:00
diff --git a/presto-common/src/main/java/com/facebook/presto/common/type/TypeManager.java b/presto-common/src/main/java/com/facebook/presto/common/type/TypeManager.java
@@ -44,4 +44,9 @@ default Collection<ParametricType> getParametricTypes()
     {
         throw new UnsupportedOperationException();
     }
+
+    /**
+     * Checks for the existence of this type.
+     */
+    boolean hasType(TypeSignature signature);
 }
diff --git a/presto-common/src/test/java/com/facebook/presto/common/type/TestingTypeManager.java b/presto-common/src/test/java/com/facebook/presto/common/type/TestingTypeManager.java
@@ -59,4 +59,10 @@ public List<Type> getTypes()
     {
         return ImmutableList.of(BOOLEAN, INTEGER, BIGINT, DOUBLE, VARCHAR, VARBINARY, TIMESTAMP, DATE, ID, HYPER_LOG_LOG);
     }
+
+    @Override
+    public boolean hasType(TypeSignature signature)
+    {
+        return getType(signature) != null;
+    }
 }
diff --git a/presto-hudi/src/test/java/com/facebook/presto/hudi/TestingTypeManager.java b/presto-hudi/src/test/java/com/facebook/presto/hudi/TestingTypeManager.java
@@ -63,4 +63,10 @@ public List<Type> getTypes()
     {
         return ImmutableList.of(BOOLEAN, INTEGER, BIGINT, DOUBLE, VARCHAR, VARBINARY, TIMESTAMP, DATE, HYPER_LOG_LOG);
     }
+
+    @Override
+    public boolean hasType(TypeSignature signature)
+    {
+        return getType(signature) != null;
+    }
 }
diff --git a/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergFileWriter.java b/presto-iceberg/src/test/java/com/facebook/presto/iceberg/TestIcebergFileWriter.java
@@ -189,5 +189,11 @@ public List<Type> getTypes()
         {
             return ImmutableList.of(BooleanType.BOOLEAN, INTEGER, BIGINT, DoubleType.DOUBLE, VARCHAR, VARBINARY, TIMESTAMP, DATE, HYPER_LOG_LOG);
         }
+
+        @Override
+        public boolean hasType(TypeSignature signature)
+        {
+            return getType(signature) != null;
+        }
     }
 }
diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/AddColumnTask.java b/presto-main-base/src/main/java/com/facebook/presto/execution/AddColumnTask.java
@@ -14,7 +14,6 @@
 package com.facebook.presto.execution;
 
 import com.facebook.presto.Session;
-import com.facebook.presto.UnknownTypeException;
 import com.facebook.presto.common.QualifiedObjectName;
 import com.facebook.presto.common.type.Type;
 import com.facebook.presto.metadata.Metadata;
@@ -25,6 +24,7 @@
 import com.facebook.presto.spi.TableHandle;
 import com.facebook.presto.spi.WarningCollector;
 import com.facebook.presto.spi.security.AccessControl;
+import com.facebook.presto.spi.type.UnknownTypeException;
 import com.facebook.presto.sql.analyzer.SemanticException;
 import com.facebook.presto.sql.tree.AddColumn;
 import com.facebook.presto.sql.tree.ColumnDefinition;
diff --git a/presto-main-base/src/main/java/com/facebook/presto/execution/CreateTableTask.java b/presto-main-base/src/main/java/com/facebook/presto/execution/CreateTableTask.java
@@ -14,7 +14,6 @@
 package com.facebook.presto.execution;
 
 import com.facebook.presto.Session;
-import com.facebook.presto.UnknownTypeException;
 import com.facebook.presto.common.QualifiedObjectName;
 import com.facebook.presto.common.type.Type;
 import com.facebook.presto.metadata.Metadata;
@@ -28,6 +27,7 @@
 import com.facebook.presto.spi.constraints.PrimaryKeyConstraint;
 import com.facebook.presto.spi.constraints.TableConstraint;
 import com.facebook.presto.spi.security.AccessControl;
+import com.facebook.presto.spi.type.UnknownTypeException;
 import com.facebook.presto.sql.analyzer.SemanticException;
 import com.facebook.presto.sql.tree.ColumnDefinition;
 import com.facebook.presto.sql.tree.ConstraintSpecification;
diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/BuiltInTypeAndFunctionNamespaceManager.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/BuiltInTypeAndFunctionNamespaceManager.java
@@ -13,7 +13,6 @@
  */
 package com.facebook.presto.metadata;
 
-import com.facebook.presto.UnknownTypeException;
 import com.facebook.presto.common.CatalogSchemaName;
 import com.facebook.presto.common.Page;
 import com.facebook.presto.common.QualifiedObjectName;
@@ -236,6 +235,7 @@
 import com.facebook.presto.spi.function.SqlFunctionVisibility;
 import com.facebook.presto.spi.function.SqlInvokedFunction;
 import com.facebook.presto.spi.function.SqlInvokedScalarFunctionImplementation;
+import com.facebook.presto.spi.type.UnknownTypeException;
 import com.facebook.presto.sql.analyzer.FunctionsConfig;
 import com.facebook.presto.type.BigintOperators;
 import com.facebook.presto.type.BooleanOperators;
@@ -1285,6 +1285,18 @@ public Type getType(TypeSignature typeSignature)
         }
     }
 
+    @Override
+    public boolean hasType(TypeSignature typeSignature)
+    {
+        try {
+            getType(typeSignature);
+            return true;
+        }
+        catch (UnknownTypeException e) {
+            return false;
+        }
+    }
+
     @Override
     public Type getParameterizedType(String baseTypeName, List<TypeSignatureParameter> typeParameters)
     {
diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/FunctionAndTypeManager.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/FunctionAndTypeManager.java
@@ -278,6 +278,12 @@ public Collection<ParametricType> getParametricTypes()
                 return FunctionAndTypeManager.this.getParametricTypes();
             }
 
+            @Override
+            public boolean hasType(TypeSignature signature)
+            {
+                return FunctionAndTypeManager.this.hasType(signature);
+            }
+
             @Override
             public Collection<SqlFunction> listBuiltInFunctions()
             {
@@ -395,6 +401,12 @@ public Type getType(TypeSignature signature)
         return getUserDefinedType(signature);
     }
 
+    @Override
+    public boolean hasType(TypeSignature signature)
+    {
+        return servingTypeManager.get().hasType(signature);
+    }
+
     @Override
     public Type getParameterizedType(String baseTypeName, List<TypeSignatureParameter> typeParameters)
     {
diff --git a/presto-main-base/src/main/java/com/facebook/presto/metadata/SignatureBinder.java b/presto-main-base/src/main/java/com/facebook/presto/metadata/SignatureBinder.java
@@ -13,7 +13,6 @@
  */
 package com.facebook.presto.metadata;
 
-import com.facebook.presto.UnknownTypeException;
 import com.facebook.presto.common.type.FunctionType;
 import com.facebook.presto.common.type.NamedTypeSignature;
 import com.facebook.presto.common.type.ParameterKind;
@@ -25,6 +24,7 @@
 import com.facebook.presto.spi.function.LongVariableConstraint;
 import com.facebook.presto.spi.function.Signature;
 import com.facebook.presto.spi.function.TypeVariableConstraint;
+import com.facebook.presto.spi.type.UnknownTypeException;
 import com.facebook.presto.sql.analyzer.TypeSignatureProvider;
 import com.google.common.base.VerifyException;
 import com.google.common.collect.ImmutableList;
diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ExpressionAnalyzer.java b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ExpressionAnalyzer.java
@@ -14,7 +14,6 @@
 package com.facebook.presto.sql.analyzer;
 
 import com.facebook.presto.Session;
-import com.facebook.presto.UnknownTypeException;
 import com.facebook.presto.common.ErrorCode;
 import com.facebook.presto.common.QualifiedObjectName;
 import com.facebook.presto.common.Subfield;
@@ -47,6 +46,7 @@
 import com.facebook.presto.spi.function.SqlInvokedFunction;
 import com.facebook.presto.spi.security.AccessControl;
 import com.facebook.presto.spi.security.DenyAllAccessControl;
+import com.facebook.presto.spi.type.UnknownTypeException;
 import com.facebook.presto.sql.parser.SqlParser;
 import com.facebook.presto.sql.planner.TypeProvider;
 import com.facebook.presto.sql.relational.FunctionResolution;
diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ExpressionTreeUtils.java b/presto-main-base/src/main/java/com/facebook/presto/sql/analyzer/ExpressionTreeUtils.java
@@ -13,13 +13,13 @@
  */
 package com.facebook.presto.sql.analyzer;
 
-import com.facebook.presto.UnknownTypeException;
 import com.facebook.presto.common.type.EnumType;
 import com.facebook.presto.common.type.Type;
 import com.facebook.presto.common.type.TypeWithName;
 import com.facebook.presto.spi.SourceLocation;
 import com.facebook.presto.spi.function.FunctionHandle;
 import com.facebook.presto.spi.relation.VariableReferenceExpression;
+import com.facebook.presto.spi.type.UnknownTypeException;
 import com.facebook.presto.sql.tree.ArrayConstructor;
 import com.facebook.presto.sql.tree.Cast;
 import com.facebook.presto.sql.tree.ComparisonExpression;
diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/ExtractSpatialJoins.java b/presto-main-base/src/main/java/com/facebook/presto/sql/planner/iterative/rule/ExtractSpatialJoins.java
@@ -469,6 +469,11 @@ else if (alignment < 0) {
 
     private static boolean isSphericalJoin(Metadata metadata, RowExpression firstArgument, RowExpression secondArgument)
     {
+        // In sidecar-enabled clusters, SphericalGeography isn't a supported type.
+        // If SphericalGeography is not supported, it can be assumed that this join isn't a spherical join, hence returning False.
+        if (!metadata.getFunctionAndTypeManager().hasType(SPHERICAL_GEOGRAPHY_TYPE_SIGNATURE)) {
+            return false;
+        }
         Type sphericalGeographyType = metadata.getType(SPHERICAL_GEOGRAPHY_TYPE_SIGNATURE);
         return firstArgument.getType().equals(sphericalGeographyType) || secondArgument.getType().equals(sphericalGeographyType);
     }
diff --git a/presto-main-base/src/main/java/com/facebook/presto/sql/rewrite/NativeExecutionTypeRewrite.java b/presto-main-base/src/main/java/com/facebook/presto/sql/rewrite/NativeExecutionTypeRewrite.java
@@ -16,7 +16,6 @@
 import com.facebook.airlift.log.Logger;
 import com.facebook.presto.Session;
 import com.facebook.presto.SystemSessionProperties;
-import com.facebook.presto.UnknownTypeException;
 import com.facebook.presto.common.type.BigintEnumType;
 import com.facebook.presto.common.type.EnumType;
 import com.facebook.presto.common.type.Type;
@@ -25,6 +24,7 @@
 import com.facebook.presto.metadata.Metadata;
 import com.facebook.presto.spi.WarningCollector;
 import com.facebook.presto.spi.security.AccessControl;
+import com.facebook.presto.spi.type.UnknownTypeException;
 import com.facebook.presto.sql.analyzer.FunctionAndTypeResolver;
 import com.facebook.presto.sql.analyzer.QueryExplainer;
 import com.facebook.presto.sql.analyzer.SemanticException;
diff --git a/presto-main-base/src/test/java/com/facebook/presto/type/TestBuiltInTypeRegistry.java b/presto-main-base/src/test/java/com/facebook/presto/type/TestBuiltInTypeRegistry.java
@@ -13,11 +13,11 @@
  */
 package com.facebook.presto.type;
 
-import com.facebook.presto.UnknownTypeException;
 import com.facebook.presto.common.type.Type;
 import com.facebook.presto.common.type.TypeSignature;
 import com.facebook.presto.metadata.FunctionAndTypeManager;
 import com.facebook.presto.metadata.OperatorNotFoundException;
+import com.facebook.presto.spi.type.UnknownTypeException;
 import com.google.common.collect.ImmutableSet;
 import org.testng.annotations.Test;
 
diff --git a/presto-native-sidecar-plugin/src/main/java/com/facebook/presto/sidecar/typemanager/NativeTypeManager.java b/presto-native-sidecar-plugin/src/main/java/com/facebook/presto/sidecar/typemanager/NativeTypeManager.java
@@ -21,6 +21,7 @@
 import com.facebook.presto.common.type.TypeSignature;
 import com.facebook.presto.common.type.TypeSignatureParameter;
 import com.facebook.presto.common.type.VarcharType;
+import com.facebook.presto.spi.type.UnknownTypeException;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -150,6 +151,18 @@ public Type getType(TypeSignature typeSignature)
         }
     }
 
+    @Override
+    public boolean hasType(TypeSignature typeSignature)
+    {
+        try {
+            getType(typeSignature);
+            return true;
+        }
+        catch (UnknownTypeException e) {
+            return false;
+        }
+    }
+
     @Override
     public Collection<ParametricType> getParametricTypes()
     {
diff --git a/presto-native-sidecar-plugin/src/test/java/com/facebook/presto/sidecar/TestNativeSidecarPlugin.java b/presto-native-sidecar-plugin/src/test/java/com/facebook/presto/sidecar/TestNativeSidecarPlugin.java
@@ -393,6 +393,16 @@ public void testGeometryQueries()
         assertQuery("SELECT " +
                 "ST_DISTANCE(ST_POINT(a.nationkey, a.regionkey), ST_POINT(b.nationkey, b.regionkey)) " +
                 "FROM nation a JOIN nation b ON a.nationkey < b.nationkey");
+        assertQueryFails(
+                "WITH regions(name, geom) AS (VALUES" +
+                        "        ('A', ST_GeometryFromText('POLYGON ((0 0, 0 5, 5 5, 5 0, 0 0))'))," +
+                        "        ('B', ST_GeometryFromText('POLYGON ((5 0, 5 5, 10 5, 10 0, 5 0))')))," +
+                        "points(id, geom) AS (VALUES" +
+                        "        ('P1', ST_Point(1, 1))," +
+                        "        ('P2', ST_Point(6, 1))," +
+                        "        ('P3', ST_Point(8, 4)))" +
+                        "SELECT p.id, r.name FROM points p LEFT JOIN regions r ON ST_Within(p.geom, r.geom)",
+                "Error from native plan checker: .SpatialJoinNode no abstract type PlanNode ");
     }
 
     private String generateRandomTableName()
diff --git a/presto-spi/src/main/java/com/facebook/presto/spi/type/UnknownTypeException.java b/presto-spi/src/main/java/com/facebook/presto/spi/type/UnknownTypeException.java
@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.facebook.presto;
+package com.facebook.presto.spi.type;
 
 import com.facebook.presto.common.type.TypeSignature;
 import com.facebook.presto.spi.PrestoException;

Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,9 @@ default Collection<ParametricType> getParametricTypes()`
`44`	`44`	`{`
`45`	`45`	`throw new UnsupportedOperationException();`
`46`	`46`	`}`
	`47`	`+`
	`48`	`+ /**`
	`49`	`+ * Checks for the existence of this type.`
	`50`	`+ */`
	`51`	`+ boolean hasType(TypeSignature signature);`
`47`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,4 +59,10 @@ public List<Type> getTypes()`
`59`	`59`	`{`
`60`	`60`	`return ImmutableList.of(BOOLEAN, INTEGER, BIGINT, DOUBLE, VARCHAR, VARBINARY, TIMESTAMP, DATE, ID, HYPER_LOG_LOG);`
`61`	`61`	`}`
	`62`	`+`
	`63`	`+ @Override`
	`64`	`+ public boolean hasType(TypeSignature signature)`
	`65`	`+ {`
	`66`	`+ return getType(signature) != null;`
	`67`	`+ }`
`62`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,10 @@ public List<Type> getTypes()`
`63`	`63`	`{`
`64`	`64`	`return ImmutableList.of(BOOLEAN, INTEGER, BIGINT, DOUBLE, VARCHAR, VARBINARY, TIMESTAMP, DATE, HYPER_LOG_LOG);`
`65`	`65`	`}`
	`66`	`+`
	`67`	`+ @Override`
	`68`	`+ public boolean hasType(TypeSignature signature)`
	`69`	`+ {`
	`70`	`+ return getType(signature) != null;`
	`71`	`+ }`
`66`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,5 +189,11 @@ public List<Type> getTypes()`
`189`	`189`	`{`
`190`	`190`	`return ImmutableList.of(BooleanType.BOOLEAN, INTEGER, BIGINT, DoubleType.DOUBLE, VARCHAR, VARBINARY, TIMESTAMP, DATE, HYPER_LOG_LOG);`
`191`	`191`	`}`
	`192`	`+`
	`193`	`+ @Override`
	`194`	`+ public boolean hasType(TypeSignature signature)`
	`195`	`+ {`
	`196`	`+ return getType(signature) != null;`
	`197`	`+ }`
`192`	`198`	`}`
`193`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -278,6 +278,12 @@ public Collection<ParametricType> getParametricTypes()`
`278`	`278`	`return FunctionAndTypeManager.this.getParametricTypes();`
`279`	`279`	`}`
`280`	`280`
	`281`	`+ @Override`
	`282`	`+ public boolean hasType(TypeSignature signature)`
	`283`	`+ {`
	`284`	`+ return FunctionAndTypeManager.this.hasType(signature);`
	`285`	`+ }`
	`286`	`+`
`281`	`287`	`@Override`
`282`	`288`	`public Collection<SqlFunction> listBuiltInFunctions()`
`283`	`289`	`{`
`@@ -395,6 +401,12 @@ public Type getType(TypeSignature signature)`
`395`	`401`	`return getUserDefinedType(signature);`
`396`	`402`	`}`
`397`	`403`
	`404`	`+ @Override`
	`405`	`+ public boolean hasType(TypeSignature signature)`
	`406`	`+ {`
	`407`	`+ return servingTypeManager.get().hasType(signature);`
	`408`	`+ }`
	`409`	`+`
`398`	`410`	`@Override`
`399`	`411`	`public Type getParameterizedType(String baseTypeName, List<TypeSignatureParameter> typeParameters)`
`400`	`412`	`{`