[CALCITE-4215] Avoid NPE when getReferentialConstraints() returns null

apache · Oct 1, 2020 · 1f57bd4 · 1f57bd4
1 parent 58adcae
commit 1f57bd4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/core/src/main/java/org/apache/calcite/adapter/java/ReflectiveSchema.java b/core/src/main/java/org/apache/calcite/adapter/java/ReflectiveSchema.java
@@ -129,10 +129,16 @@ private Map<String, Table> createTableMap() {
         FieldTable table =
             (FieldTable) tableMap.get(Util.last(rc.getSourceQualifiedName()));
         assert table != null;
+        List<RelReferentialConstraint> referentialConstraints =
+            table.getStatistic().getReferentialConstraints();
+        if (referentialConstraints == null) {
+          // This enables to keep the same Statistics.of below
+          referentialConstraints = ImmutableList.of();
+        }
         table.statistic = Statistics.of(
             ImmutableList.copyOf(
                 Iterables.concat(
-                    table.getStatistic().getReferentialConstraints(),
+                    referentialConstraints,
                     Collections.singleton(rc))));
       }
     }

diff --git a/core/src/main/java/org/apache/calcite/rel/rules/materialize/MaterializedViewRule.java b/core/src/main/java/org/apache/calcite/rel/rules/materialize/MaterializedViewRule.java
@@ -716,6 +716,9 @@ protected boolean compensatePartial(
       // Add edges between tables
       List<RelReferentialConstraint> constraints =
           tRef.getTable().getReferentialConstraints();
+      if (constraints == null) {
+        constraints = ImmutableList.of();
+      }
       for (RelReferentialConstraint constraint : constraints) {
         Collection<RelTableRef> parentTableRefs =
             tableVNameToTableRefs.get(constraint.getTargetQualifiedName());