commit 3cc793a574875172af7398596ca9e0fbc21bc867
author Vladimir Sitnikov <sitnikov.vladimir@gmail.com> Thu Sep 03 01:05:25 2020 +0300
committer Vladimir Sitnikov <sitnikov.vladimir@gmail.com> Thu Oct 01 21:53:33 2020 +0300
tree 0d2d739ab996bd388627e289413f8ab977d57f81
parent 7df9bba657924b37c5b55a480b13215ba0326707

[CALCITE-4215] Handle nulls in RelMdCollation#enumerableJoin0

core/src/main/java/org/apache/calcite/rel/metadata/RelMdCollation.java

diff --git a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdCollation.java b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdCollation.java
index 0be433b..8de0275 100644
--- a/core/src/main/java/org/apache/calcite/rel/metadata/RelMdCollation.java
+++ b/core/src/main/java/org/apache/calcite/rel/metadata/RelMdCollation.java
@@ -519,6 +519,9 @@
     // (i) join type is INNER or LEFT;
     // (ii) RelCollation always orders nulls last.
     final ImmutableList<RelCollation> leftCollations = mq.collations(left);
+    if (leftCollations == null) {
+      return null;
+    }
     switch (joinType) {
     case SEMI:
     case ANTI:
@@ -530,12 +533,12 @@
       for (RelCollation collation : leftCollations) {
         for (RelFieldCollation field : collation.getFieldCollations()) {
           if (!(RelFieldCollation.NullDirection.LAST == field.nullDirection)) {
-            return ImmutableList.of();
+            return null;
           }
         }
       }
       return leftCollations;
     }
-    return ImmutableList.of();
+    return null;
   }
 }