[CALCITE-4214] Make org.apache.calcite.rel.type.RelDataType#getSqlTyp…

…eName non-nullable
vlsi · Oct 1, 2020 · 663bbad · 663bbad
1 parent c79f356
commit 663bbad
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeImpl.java b/core/src/main/java/org/apache/calcite/rel/type/RelDataTypeImpl.java
@@ -35,6 +35,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.apache.calcite.linq4j.Nullness.castNonNull;
+
 /**
  * RelDataTypeImpl is an abstract base for implementations of
  * {@link RelDataType}.
@@ -227,7 +229,8 @@ private static void getFieldRecurse(List<Slot> slots, RelDataType type,
    * @return SqlTypeName, never null
    */
   @Override public SqlTypeName getSqlTypeName() {
-    return null;
+    // The implementations must provide non-null value, however, we keep this for compatibility
+    return castNonNull(null);
   }
 
   @Override public SqlIdentifier getSqlIdentifier() {