diff --git a/.editorconfig b/.editorconfig
index ea43016b4b70..d7e51acbd562 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -48,3 +48,6 @@ ij_java_ternary_operation_signs_on_next_line = true
 ij_java_use_single_class_imports = true
 ij_java_wrap_long_lines = true
 ij_java_align_multiline_parameters = false
+
+[*.xml]
+indent_size = 2
diff --git a/core/src/test/java/org/apache/calcite/test/DiffRepository.java b/core/src/test/java/org/apache/calcite/test/DiffRepository.java
index 9eaabc3729d7..65c2529477a6 100644
--- a/core/src/test/java/org/apache/calcite/test/DiffRepository.java
+++ b/core/src/test/java/org/apache/calcite/test/DiffRepository.java
@@ -25,6 +25,7 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import com.google.common.collect.ImmutableSortedSet;
 
 import org.junit.jupiter.api.Assertions;
 import org.opentest4j.AssertionFailedError;
@@ -42,11 +43,12 @@
 import java.io.IOException;
 import java.io.Writer;
 import java.net.URL;
+import java.util.AbstractList;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -171,8 +173,10 @@ public class DiffRepository {
 
   private final DiffRepository baseRepository;
   private final int indent;
+  private final ImmutableSortedSet<String> outOfOrderTests;
   private Document doc;
   private final Element root;
+  private final URL refFile;
   private final File logFile;
   private final Filter filter;
 
@@ -183,17 +187,17 @@ public class DiffRepository {
    * @param logFile   Log file
    * @param baseRepository Parent repository or null
    * @param filter    Filter or null
+   * @param indent    Indentation of XML file
    */
-  private DiffRepository(
-      URL refFile,
-      File logFile,
-      DiffRepository baseRepository,
-      Filter filter) {
+  private DiffRepository(URL refFile, File logFile,
+      DiffRepository baseRepository, Filter filter, int indent) {
     this.baseRepository = baseRepository;
     this.filter = filter;
+    this.indent = indent;
     if (refFile == null) {
       throw new IllegalArgumentException("url must not be null");
     }
+    this.refFile = refFile;
     this.logFile = logFile;
 
     // Load the document.
@@ -213,13 +217,10 @@ private DiffRepository(
         flushDoc();
       }
       this.root = doc.getDocumentElement();
-      validate(this.root);
+      outOfOrderTests = validate(this.root);
     } catch (ParserConfigurationException | SAXException e) {
       throw new RuntimeException("error while creating xml parser", e);
     }
-    indent = logFile.getPath().contains("RelOptRulesTest")
-        || logFile.getPath().contains("SqlToRelConverterTest")
-        || logFile.getPath().contains("SqlLimitsTest") ? 4 : 2;
   }
 
   //~ Methods ----------------------------------------------------------------
@@ -373,6 +374,13 @@ private synchronized Element getTestCaseElement(
                 + "test case in the base repository, but does "
                 + "not specify 'overrides=true'");
           }
+          if (outOfOrderTests.contains(testCaseName)) {
+            flushDoc();
+            throw new IllegalArgumentException("TestCase '" + testCaseName
+                + "' is out of order in the reference file: "
+                + Sources.of(refFile).file() + "\n"
+                + "To fix, copy the generated log file: " + logFile + "\n");
+          }
           return testCase;
         }
         if (elements != null) {
@@ -530,26 +538,48 @@ private void flushDoc() {
     }
   }
 
-  /** Validates the root element. */
-  private static void validate(Element root) {
+  /** Validates the root element.
+   *
+   * <p>Returns the set of test names that are out of order in the reference
+   * file (empty if the reference file is fully sorted). */
+  private static ImmutableSortedSet<String> validate(Element root) {
     if (!root.getNodeName().equals(ROOT_TAG)) {
       throw new RuntimeException("expected root element of type '" + ROOT_TAG
           + "', but found '" + root.getNodeName() + "'");
     }
 
-    // Make sure that there are no duplicate test cases.
-    final Set<String> testCases = new HashSet<>();
+    // Make sure that there are no duplicate test cases, and count how many
+    // tests are out of order.
+    final SortedMap<String, Node> testCases = new TreeMap<>();
     final NodeList childNodes = root.getChildNodes();
+    final List<String> outOfOrderNames = new ArrayList<>();
+    String previousName = null;
     for (int i = 0; i < childNodes.getLength(); i++) {
       Node child = childNodes.item(i);
       if (child.getNodeName().equals(TEST_CASE_TAG)) {
         Element testCase = (Element) child;
         final String name = testCase.getAttribute(TEST_CASE_NAME_ATTR);
-        if (!testCases.add(name)) {
+        if (testCases.put(name, testCase) != null) {
           throw new RuntimeException("TestCase '" + name + "' is duplicate");
         }
+        if (previousName != null
+            && previousName.compareTo(name) > 0) {
+          outOfOrderNames.add(name);
+        }
+        previousName = name;
+      }
+    }
+
+    // If any nodes were out of order, rebuild the document in sorted order.
+    if (!outOfOrderNames.isEmpty()) {
+      for (Node testCase : testCases.values()) {
+        root.removeChild(testCase);
+      }
+      for (Node testCase : testCases.values()) {
+        root.appendChild(testCase);
       }
     }
+    return ImmutableSortedSet.copyOf(outOfOrderNames);
   }
 
   /**
@@ -629,9 +659,6 @@ private static void writeNode(Node node, XmlOutput out) {
         Node child = childNodes.item(i);
         writeNode(child, out);
       }
-
-      //            writeNode(((Document) node).getDocumentElement(),
-      // out);
       break;
 
     case Node.ELEMENT_NODE:
@@ -719,20 +746,19 @@ public static DiffRepository lookup(Class<?> clazz) {
     return lookup(clazz, null);
   }
 
-  /**
-   * Finds the repository instance for a given class and inheriting from
-   * a given repository.
-   *
-   * @param clazz     Test case class
-   * @param baseRepository Base class of test class
-   * @return The diff repository shared between test cases in this class.
-   */
+  @Deprecated // to be removed before 1.28
   public static DiffRepository lookup(
       Class<?> clazz,
       DiffRepository baseRepository) {
     return lookup(clazz, baseRepository, null);
   }
 
+  @Deprecated // to be removed before 1.28
+  public static DiffRepository lookup(Class<?> clazz,
+      DiffRepository baseRepository, Filter filter) {
+    return lookup(clazz, baseRepository, filter, 2);
+  }
+
   /**
    * Finds the repository instance for a given class.
    *
@@ -756,12 +782,13 @@ public static DiffRepository lookup(
    * @param clazz     Test case class
    * @param baseRepository Base repository
    * @param filter    Filters each string returned by the repository
-   * @return The diff repository shared between test cases in this class.
+   * @param indent    Indent of the XML file (usually 2)
+   *
+   * @return The diff repository shared between test cases in this class
    */
   public static DiffRepository lookup(Class<?> clazz,
-      DiffRepository baseRepository,
-      Filter filter) {
-    final Key key = new Key(clazz, baseRepository, filter);
+      DiffRepository baseRepository, Filter filter, int indent) {
+    final Key key = new Key(clazz, baseRepository, filter, indent);
     return REPOSITORY_CACHE.getUnchecked(key);
   }
 
@@ -792,11 +819,14 @@ private static class Key {
     private final Class<?> clazz;
     private final DiffRepository baseRepository;
     private final Filter filter;
+    private final int indent;
 
-    Key(Class<?> clazz, DiffRepository baseRepository, Filter filter) {
+    Key(Class<?> clazz, DiffRepository baseRepository, Filter filter,
+        int indent) {
       this.clazz = Objects.requireNonNull(clazz, "clazz");
       this.baseRepository = baseRepository;
       this.filter = filter;
+      this.indent = indent;
     }
 
     @Override public int hashCode() {
@@ -817,7 +847,20 @@ DiffRepository toRepo() {
       final String logFilePath = refFilePath.replace(".xml", "_actual.xml");
       final File logFile = new File(logFilePath);
       assert !refFilePath.equals(logFile.getAbsolutePath());
-      return new DiffRepository(refFile, logFile, baseRepository, filter);
+      return new DiffRepository(refFile, logFile, baseRepository, filter,
+          indent);
     }
   }
+
+  private static Iterable<Node> iterate(NodeList nodeList) {
+    return new AbstractList<Node>() {
+      @Override public Node get(int index) {
+        return nodeList.item(index);
+      }
+
+      @Override public int size() {
+        return nodeList.getLength();
+      }
+    };
+  }
 }
diff --git a/core/src/test/java/org/apache/calcite/util/TestUtil.java b/core/src/test/java/org/apache/calcite/util/TestUtil.java
index 4337ba3c38f3..410619b11385 100644
--- a/core/src/test/java/org/apache/calcite/util/TestUtil.java
+++ b/core/src/test/java/org/apache/calcite/util/TestUtil.java
@@ -18,13 +18,16 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Suppliers;
+import com.google.common.collect.ImmutableSortedSet;
 
 import org.junit.jupiter.api.Assertions;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.reflect.InvocationTargetException;
+import java.util.List;
 import java.util.Objects;
+import java.util.SortedSet;
 import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -298,6 +301,20 @@ private static int computeGuavaMajorVersion() {
         .bestVersion;
   }
 
+  /** Given a list, returns the number of elements that are not between an
+   * element that is less and an element that is greater. */
+  public static <E extends Comparable<E>> SortedSet<E> outOfOrderItems(List<E> list) {
+    E previous = null;
+    final ImmutableSortedSet.Builder<E> b = ImmutableSortedSet.naturalOrder();
+    for (E e : list) {
+      if (previous != null && previous.compareTo(e) > 0) {
+        b.add(e);
+      }
+      previous = e;
+    }
+    return b.build();
+  }
+
   /** Checks if exceptions have give substring. That is handy to prevent logging SQL text twice */
   public static boolean hasMessage(Throwable t, String substring) {
     while (t != null) {
diff --git a/core/src/test/java/org/apache/calcite/util/TestUtilTest.java b/core/src/test/java/org/apache/calcite/util/TestUtilTest.java
index 04b1b7f09440..79056be35d62 100644
--- a/core/src/test/java/org/apache/calcite/util/TestUtilTest.java
+++ b/core/src/test/java/org/apache/calcite/util/TestUtilTest.java
@@ -16,8 +16,18 @@
  */
 package org.apache.calcite.util;
 
+import org.apache.calcite.util.mapping.IntPair;
+
+import com.google.common.collect.ImmutableMap;
+
 import org.junit.jupiter.api.Test;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.SortedSet;
+import java.util.stream.Collectors;
+
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -122,4 +132,33 @@ private void testJavaVersion(int expectedMajorVersion, String versionString) {
     // can't handle nines that start right after the point very well. oh well.
     assertThat(TestUtil.correctRoundedFloat("12.999999"), is("12."));
   }
+
+  /** Tests {@link TestUtil#outOfOrderItems(List)}. */
+  @Test void testOutOfOrderItems() {
+    final List<String> list =
+        new ArrayList<>(Arrays.asList("a", "g", "b", "c", "e", "d"));
+    final SortedSet<String> distance = TestUtil.outOfOrderItems(list);
+    assertThat(distance.toString(), is("[b, d]"));
+
+    list.add("f");
+    final SortedSet<String> distance2 = TestUtil.outOfOrderItems(list);
+    assertThat(distance2.toString(), is("[b, d]"));
+
+    list.add(1, "b");
+    final SortedSet<String> distance3 = TestUtil.outOfOrderItems(list);
+    assertThat(distance3.toString(), is("[b, d]"));
+
+    list.add(1, "c");
+    final SortedSet<String> distance4 = TestUtil.outOfOrderItems(list);
+    assertThat(distance4.toString(), is("[b, d]"));
+
+    list.add(0, "z");
+    final SortedSet<String> distance5 = TestUtil.outOfOrderItems(list);
+    assertThat(distance5.toString(), is("[a, b, d]"));
+  }
+
+  private long totalDistance(ImmutableMap<String, IntPair> map) {
+    return map.entrySet().stream()
+        .collect(Collectors.summarizingInt(e -> e.getValue().target)).getSum();
+  }
 }
diff --git a/core/src/test/resources/org/apache/calcite/sql/test/SqlPrettyWriterTest.xml b/core/src/test/resources/org/apache/calcite/sql/test/SqlPrettyWriterTest.xml
index 84a38b6e6d9b..c9204886214f 100644
--- a/core/src/test/resources/org/apache/calcite/sql/test/SqlPrettyWriterTest.xml
+++ b/core/src/test/resources/org/apache/calcite/sql/test/SqlPrettyWriterTest.xml
@@ -16,28 +16,34 @@
   ~ limitations under the License.
   -->
 <Root>
-  <TestCase name="testBlackSubQueryStyleIndent0">
+  <TestCase name="testBetween">
     <Resource name="formatted">
-      <![CDATA[SELECT `X` AS `A`, `B` AS `B`, `C` AS `C`, `D`, 'mixed-Case string', `UNQUOTEDCAMELCASEID`, `quoted id`
-FROM
-(SELECT *
-FROM `T`
-WHERE `X` = `Y` AND `A` > 5
-GROUP BY `Z`, `ZZ`
-WINDOW `W` AS (PARTITION BY `C`),
-`W1` AS (PARTITION BY `C`, `D` ORDER BY `A`, `B` RANGE BETWEEN INTERVAL '2:2' HOUR TO MINUTE PRECEDING AND INTERVAL '1' DAY FOLLOWING))
-ORDER BY `GG`]]>
+      <![CDATA[`X` NOT BETWEEN SYMMETRIC `Y` AND `Z`]]>
     </Resource>
   </TestCase>
-  <TestCase name="testDefault">
+  <TestCase name="testBlackSubQueryStyle">
     <Resource name="formatted">
       <![CDATA[SELECT `X` AS `A`, `B` AS `B`, `C` AS `C`, `D`, 'mixed-Case string', `UNQUOTEDCAMELCASEID`, `quoted id`
-FROM (SELECT *
+FROM
+(   SELECT *
         FROM `T`
         WHERE `X` = `Y` AND `A` > 5
         GROUP BY `Z`, `ZZ`
         WINDOW `W` AS (PARTITION BY `C`),
             `W1` AS (PARTITION BY `C`, `D` ORDER BY `A`, `B` RANGE BETWEEN INTERVAL '2:2' HOUR TO MINUTE PRECEDING AND INTERVAL '1' DAY FOLLOWING))
+ORDER BY `GG`]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testBlackSubQueryStyleIndent0">
+    <Resource name="formatted">
+      <![CDATA[SELECT `X` AS `A`, `B` AS `B`, `C` AS `C`, `D`, 'mixed-Case string', `UNQUOTEDCAMELCASEID`, `quoted id`
+FROM
+(SELECT *
+FROM `T`
+WHERE `X` = `Y` AND `A` > 5
+GROUP BY `Z`, `ZZ`
+WINDOW `W` AS (PARTITION BY `C`),
+`W1` AS (PARTITION BY `C`, `D` ORDER BY `A`, `B` RANGE BETWEEN INTERVAL '2:2' HOUR TO MINUTE PRECEDING AND INTERVAL '1' DAY FOLLOWING))
 ORDER BY `GG`]]>
     </Resource>
   </TestCase>
@@ -56,6 +62,16 @@ ELSE 7
 END]]>
     </Resource>
   </TestCase>
+  <TestCase name="testCase2">
+    <Resource name="formatted">
+      <![CDATA[CASE WHEN 1 = 2 + 3 THEN 4 WHEN 1 = CASE WHEN `A` = `B` THEN `C` ELSE `D` END THEN 6 ELSE 7 END]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testCast">
+    <Resource name="formatted">
+      <![CDATA[CAST(`X` + `Y` AS DECIMAL(5, 10))]]>
+    </Resource>
+  </TestCase>
   <TestCase name="testChop">
     <Resource name="formatted">
       <![CDATA[SELECT `X` AS `A`,
@@ -155,32 +171,15 @@ ORDER BY
     `GG`]]>
     </Resource>
   </TestCase>
-  <TestCase name="testIndent8">
-    <Resource name="desc">
-      <![CDATA[indentation=8]]>
-    </Resource>
-    <Resource name="formatted">
-      <![CDATA[SELECT `X` AS `A`, `B` AS `B`, `C` AS `C`, `D`, 'mixed-Case string', `UNQUOTEDCAMELCASEID`, `quoted id`
-FROM (SELECT *
-                FROM `T`
-                WHERE `X` = `Y` AND `A` > 5
-                GROUP BY `Z`, `ZZ`
-                WINDOW `W` AS (PARTITION BY `C`),
-                        `W1` AS (PARTITION BY `C`, `D` ORDER BY `A`, `B` RANGE BETWEEN INTERVAL '2:2' HOUR TO MINUTE PRECEDING AND INTERVAL '1' DAY FOLLOWING))
-ORDER BY `GG`]]>
-    </Resource>
-  </TestCase>
   <TestCase name="testClausesNotOnNewLine">
     <Resource name="formatted">
       <![CDATA[SELECT `X` AS `A`, `B` AS `B`, `C` AS `C`, `D`, 'mixed-Case string', `UNQUOTEDCAMELCASEID`, `quoted id` FROM (SELECT *FROM `T` WHERE `X` = `Y` AND `A` > 5 GROUP BY `Z`, `ZZ` WINDOW `W` AS (PARTITION BY `C`), `W1` AS (PARTITION BY `C`, `D` ORDER BY `A`, `B` RANGE BETWEEN INTERVAL '2:2' HOUR TO MINUTE PRECEDING AND INTERVAL '1' DAY FOLLOWING))
 ORDER BY `GG`]]>
     </Resource>
   </TestCase>
-  <TestCase name="testFold">
+  <TestCase name="testDefault">
     <Resource name="formatted">
-      <![CDATA[SELECT `X` AS `A`, `B` AS `B`, `C` AS `C`,
-    `D`, 'mixed-Case string',
-    `UNQUOTEDCAMELCASEID`, `quoted id`
+      <![CDATA[SELECT `X` AS `A`, `B` AS `B`, `C` AS `C`, `D`, 'mixed-Case string', `UNQUOTEDCAMELCASEID`, `quoted id`
 FROM (SELECT *
         FROM `T`
         WHERE `X` = `Y` AND `A` > 5
@@ -190,113 +189,40 @@ FROM (SELECT *
 ORDER BY `GG`]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSelectListItemsOnSeparateLines">
+  <TestCase name="testFold">
     <Resource name="formatted">
-      <![CDATA[SELECT `X` AS `A`,
-    `B` AS `B`,
-    `C` AS `C`,
-    `D`,
-    'mixed-Case string',
-    `UNQUOTEDCAMELCASEID`,
-    `quoted id`
+      <![CDATA[SELECT `X` AS `A`, `B` AS `B`, `C` AS `C`,
+    `D`, 'mixed-Case string',
+    `UNQUOTEDCAMELCASEID`, `quoted id`
 FROM (SELECT *
         FROM `T`
         WHERE `X` = `Y` AND `A` > 5
-        GROUP BY `Z`,
-            `ZZ`
-        WINDOW `W` AS (PARTITION BY `C`),
-            `W1` AS (PARTITION BY `C`, `D` ORDER BY `A`, `B` RANGE BETWEEN INTERVAL '2:2' HOUR TO MINUTE PRECEDING AND INTERVAL '1' DAY FOLLOWING))
-ORDER BY `GG`]]>
-    </Resource>
-  </TestCase>
-  <TestCase name="testSelectListNoExtraIndentFlag">
-    <Resource name="formatted">
-      <![CDATA[SELECT
-    `X` AS `A`,
-    `B` AS `B`,
-    `C` AS `C`,
-    `D`,
-    'mixed-Case string',
-    `UNQUOTEDCAMELCASEID`,
-    `quoted id`
-FROM
-    (SELECT
-            *
-        FROM
-            `T`
-        WHERE `X` = `Y` AND `A` > 5
-        GROUP BY
-            `Z`,
-            `ZZ`
-        WINDOW
-            `W` AS (PARTITION BY `C`),
-            `W1` AS (PARTITION BY `C`, `D` ORDER BY `A`, `B` RANGE BETWEEN INTERVAL '2:2' HOUR TO MINUTE PRECEDING AND INTERVAL '1' DAY FOLLOWING))
-ORDER BY
-    `GG`]]>
-    </Resource>
-  </TestCase>
-  <TestCase name="testKeywordsLowerCase">
-    <Resource name="formatted">
-      <![CDATA[select `X` as `A`, `B` as `B`, `C` as `C`, `D`, 'mixed-Case string', `UNQUOTEDCAMELCASEID`, `quoted id`
-from (select *
-        from `T`
-        where `X` = `Y` and `A` > 5
-        group by `Z`, `ZZ`
-        window `W` as (partition by `C`),
-            `W1` as (partition by `C`, `D` order by `A`, `B` range between interval '2:2' hour to minute preceding and interval '1' day following))
-order by `GG`]]>
-    </Resource>
-  </TestCase>
-  <TestCase name="testParenthesizeAllExprs">
-    <Resource name="formatted">
-      <![CDATA[SELECT `X` AS `A`, `B` AS `B`, `C` AS `C`, `D`, 'mixed-Case string', `UNQUOTEDCAMELCASEID`, `quoted id`
-FROM (SELECT *
-        FROM `T`
-        WHERE ((`X` = `Y`) AND (`A` > 5))
         GROUP BY `Z`, `ZZ`
         WINDOW `W` AS (PARTITION BY `C`),
             `W1` AS (PARTITION BY `C`, `D` ORDER BY `A`, `B` RANGE BETWEEN INTERVAL '2:2' HOUR TO MINUTE PRECEDING AND INTERVAL '1' DAY FOLLOWING))
 ORDER BY `GG`]]>
     </Resource>
   </TestCase>
-  <TestCase name="testOnlyQuoteIdentifiersWhichNeedIt">
-    <Resource name="formatted">
-      <![CDATA[SELECT X AS A, B AS B, C AS C, D, 'mixed-Case string', UNQUOTEDCAMELCASEID, `quoted id`
-FROM (SELECT *
-        FROM T
-        WHERE X = Y AND A > 5
-        GROUP BY Z, ZZ
-        WINDOW W AS (PARTITION BY C),
-            W1 AS (PARTITION BY C, D ORDER BY A, B RANGE BETWEEN INTERVAL '2:2' HOUR TO MINUTE PRECEDING AND INTERVAL '1' DAY FOLLOWING))
-ORDER BY GG]]>
+  <TestCase name="testIndent8">
+    <Resource name="desc">
+      <![CDATA[indentation=8]]>
     </Resource>
-  </TestCase>
-  <TestCase name="testBlackSubQueryStyle">
     <Resource name="formatted">
       <![CDATA[SELECT `X` AS `A`, `B` AS `B`, `C` AS `C`, `D`, 'mixed-Case string', `UNQUOTEDCAMELCASEID`, `quoted id`
-FROM
-(   SELECT *
-        FROM `T`
-        WHERE `X` = `Y` AND `A` > 5
-        GROUP BY `Z`, `ZZ`
-        WINDOW `W` AS (PARTITION BY `C`),
-            `W1` AS (PARTITION BY `C`, `D` ORDER BY `A`, `B` RANGE BETWEEN INTERVAL '2:2' HOUR TO MINUTE PRECEDING AND INTERVAL '1' DAY FOLLOWING))
+FROM (SELECT *
+                FROM `T`
+                WHERE `X` = `Y` AND `A` > 5
+                GROUP BY `Z`, `ZZ`
+                WINDOW `W` AS (PARTITION BY `C`),
+                        `W1` AS (PARTITION BY `C`, `D` ORDER BY `A`, `B` RANGE BETWEEN INTERVAL '2:2' HOUR TO MINUTE PRECEDING AND INTERVAL '1' DAY FOLLOWING))
 ORDER BY `GG`]]>
     </Resource>
   </TestCase>
-  <TestCase name="testCase2">
-    <Resource name="formatted">
-      <![CDATA[CASE WHEN 1 = 2 + 3 THEN 4 WHEN 1 = CASE WHEN `A` = `B` THEN `C` ELSE `D` END THEN 6 ELSE 7 END]]>
-    </Resource>
-  </TestCase>
-  <TestCase name="testBetween">
-    <Resource name="formatted">
-      <![CDATA[`X` NOT BETWEEN SYMMETRIC `Y` AND `Z`]]>
-    </Resource>
-  </TestCase>
-  <TestCase name="testCast">
+  <TestCase name="testInnerJoin">
     <Resource name="formatted">
-      <![CDATA[CAST(`X` + `Y` AS DECIMAL(5, 10))]]>
+      <![CDATA[SELECT *
+FROM `X`
+    INNER JOIN `Y` ON `X`.`K` = `Y`.`K`]]>
     </Resource>
   </TestCase>
   <TestCase name="testJoinComma">
@@ -348,6 +274,18 @@ FROM
     LEFT JOIN `Z` USING (`A`)]]>
     </Resource>
   </TestCase>
+  <TestCase name="testKeywordsLowerCase">
+    <Resource name="formatted">
+      <![CDATA[select `X` as `A`, `B` as `B`, `C` as `C`, `D`, 'mixed-Case string', `UNQUOTEDCAMELCASEID`, `quoted id`
+from (select *
+        from `T`
+        where `X` = `Y` and `A` > 5
+        group by `Z`, `ZZ`
+        window `W` as (partition by `C`),
+            `W1` as (partition by `C`, `D` order by `A`, `B` range between interval '2:2' hour to minute preceding and interval '1' day following))
+order by `GG`]]>
+    </Resource>
+  </TestCase>
   <TestCase name="testLeadingComma">
     <Resource name="formatted">
       <![CDATA[SELECT `X` AS `A`
@@ -401,11 +339,86 @@ ORDER BY
     `GG`]]>
     </Resource>
   </TestCase>
+  <TestCase name="testMultiset">
+    <Resource name="formatted">
+      <![CDATA[VALUES ROW(MULTISET ((SELECT *
+            FROM `T`)))]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testOnlyQuoteIdentifiersWhichNeedIt">
+    <Resource name="formatted">
+      <![CDATA[SELECT X AS A, B AS B, C AS C, D, 'mixed-Case string', UNQUOTEDCAMELCASEID, `quoted id`
+FROM (SELECT *
+        FROM T
+        WHERE X = Y AND A > 5
+        GROUP BY Z, ZZ
+        WINDOW W AS (PARTITION BY C),
+            W1 AS (PARTITION BY C, D ORDER BY A, B RANGE BETWEEN INTERVAL '2:2' HOUR TO MINUTE PRECEDING AND INTERVAL '1' DAY FOLLOWING))
+ORDER BY GG]]>
+    </Resource>
+  </TestCase>
   <TestCase name="testOverlaps">
     <Resource name="formatted">
       <![CDATA[PERIOD (`X`, `XX`) OVERLAPS PERIOD (`Y`, `YY`) OR `X` IS NOT NULL]]>
     </Resource>
   </TestCase>
+  <TestCase name="testParenthesizeAllExprs">
+    <Resource name="formatted">
+      <![CDATA[SELECT `X` AS `A`, `B` AS `B`, `C` AS `C`, `D`, 'mixed-Case string', `UNQUOTEDCAMELCASEID`, `quoted id`
+FROM (SELECT *
+        FROM `T`
+        WHERE ((`X` = `Y`) AND (`A` > 5))
+        GROUP BY `Z`, `ZZ`
+        WINDOW `W` AS (PARTITION BY `C`),
+            `W1` AS (PARTITION BY `C`, `D` ORDER BY `A`, `B` RANGE BETWEEN INTERVAL '2:2' HOUR TO MINUTE PRECEDING AND INTERVAL '1' DAY FOLLOWING))
+ORDER BY `GG`]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectListItemsOnSeparateLines">
+    <Resource name="formatted">
+      <![CDATA[SELECT `X` AS `A`,
+    `B` AS `B`,
+    `C` AS `C`,
+    `D`,
+    'mixed-Case string',
+    `UNQUOTEDCAMELCASEID`,
+    `quoted id`
+FROM (SELECT *
+        FROM `T`
+        WHERE `X` = `Y` AND `A` > 5
+        GROUP BY `Z`,
+            `ZZ`
+        WINDOW `W` AS (PARTITION BY `C`),
+            `W1` AS (PARTITION BY `C`, `D` ORDER BY `A`, `B` RANGE BETWEEN INTERVAL '2:2' HOUR TO MINUTE PRECEDING AND INTERVAL '1' DAY FOLLOWING))
+ORDER BY `GG`]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectListNoExtraIndentFlag">
+    <Resource name="formatted">
+      <![CDATA[SELECT
+    `X` AS `A`,
+    `B` AS `B`,
+    `C` AS `C`,
+    `D`,
+    'mixed-Case string',
+    `UNQUOTEDCAMELCASEID`,
+    `quoted id`
+FROM
+    (SELECT
+            *
+        FROM
+            `T`
+        WHERE `X` = `Y` AND `A` > 5
+        GROUP BY
+            `Z`,
+            `ZZ`
+        WINDOW
+            `W` AS (PARTITION BY `C`),
+            `W1` AS (PARTITION BY `C`, `D` ORDER BY `A`, `B` RANGE BETWEEN INTERVAL '2:2' HOUR TO MINUTE PRECEDING AND INTERVAL '1' DAY FOLLOWING))
+ORDER BY
+    `GG`]]>
+    </Resource>
+  </TestCase>
   <TestCase name="testUnion">
     <Resource name="formatted">
       <![CDATA[SELECT *
@@ -423,19 +436,6 @@ FROM `W`
 ORDER BY `A`, `B`]]>
     </Resource>
   </TestCase>
-  <TestCase name="testMultiset">
-    <Resource name="formatted">
-      <![CDATA[VALUES ROW(MULTISET ((SELECT *
-            FROM `T`)))]]>
-    </Resource>
-  </TestCase>
-  <TestCase name="testInnerJoin">
-    <Resource name="formatted">
-      <![CDATA[SELECT *
-FROM `X`
-    INNER JOIN `Y` ON `X`.`K` = `Y`.`K`]]>
-    </Resource>
-  </TestCase>
   <TestCase name="testUpdate">
     <Resource name="formatted">
       <![CDATA[UPDATE `EMP` SET
@@ -469,15 +469,6 @@ FROM (VALUES ROW(1, 2),
             ROW(3, 4)) AS `T`]]>
     </Resource>
   </TestCase>
-  <TestCase name="testWhereListItemsOnSeparateLinesOr">
-    <Resource name="formatted">
-      <![CDATA[SELECT `X`
-FROM `Y`
-WHERE `H` IS NOT NULL AND `I` < `J`
-    OR (`A` OR `B`) IS TRUE AND `D` NOT IN (`F`, `G`)
-    OR `X` <> `Z`]]>
-    </Resource>
-  </TestCase>
   <TestCase name="testWhereListItemsOnSeparateLinesAnd">
     <Resource name="formatted">
       <![CDATA[SELECT `X`
@@ -499,4 +490,13 @@ WHERE
     AND (`D` NOT IN (`F`, `G`) OR `V` <> (`W` * `X` + `Y`) * `Z`)]]>
     </Resource>
   </TestCase>
+  <TestCase name="testWhereListItemsOnSeparateLinesOr">
+    <Resource name="formatted">
+      <![CDATA[SELECT `X`
+FROM `Y`
+WHERE `H` IS NOT NULL AND `I` < `J`
+    OR (`A` OR `B`) IS TRUE AND `D` NOT IN (`F`, `G`)
+    OR `X` <> `Z`]]>
+    </Resource>
+  </TestCase>
 </Root>
diff --git a/core/src/test/resources/org/apache/calcite/test/HepPlannerTest.xml b/core/src/test/resources/org/apache/calcite/test/HepPlannerTest.xml
index 1e3e4ad29510..4b99cba51a7c 100644
--- a/core/src/test/resources/org/apache/calcite/test/HepPlannerTest.xml
+++ b/core/src/test/resources/org/apache/calcite/test/HepPlannerTest.xml
@@ -16,30 +16,25 @@
   ~ limitations under the License.
   -->
 <Root>
-  <TestCase name="testReplaceCommonSubexpression">
+  <TestCase name="testGroup">
     <Resource name="sql">
-      <![CDATA[select d1.deptno from (select * from dept) d1, (select * from dept) d2]]>
+      <![CDATA[select upper(name) from dept where deptno=20]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(DEPTNO=[$0])
-  LogicalJoin(condition=[true], joinType=[inner])
-    LogicalProject(DEPTNO=[$0], NAME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(DEPTNO=[$0], NAME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+LogicalProject(EXPR$0=[UPPER($1)])
+  LogicalFilter(condition=[=($0, 20)])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-LogicalProject(DEPTNO=[$0])
-  LogicalJoin(condition=[true], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+LogicalCalc(expr#0..1=[{inputs}], expr#2=[UPPER($t1)], expr#3=[20], expr#4=[=($t0, $t3)], EXPR$0=[$t2], $condition=[$t4])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testMatchUntilFixpoint">
+  <TestCase name="testMatchLimitOneBottomUp">
     <Resource name="sql">
       <![CDATA[(select name from dept union select ename from emp) union (select ename from bonus)]]>
     </Resource>
@@ -57,16 +52,15 @@ LogicalUnion(all=[false])
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-LogicalAggregate(group=[{0}])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0}])
-      LogicalUnion(all=[true])
-        LogicalProject(NAME=[$1])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalProject(ENAME=[$1])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(ENAME=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+LogicalUnion(all=[false])
+  LogicalAggregate(group=[{0}])
+    LogicalUnion(all=[true])
+      LogicalProject(NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalProject(ENAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(ENAME=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
@@ -100,7 +94,7 @@ LogicalAggregate(group=[{0}])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testMatchLimitOneBottomUp">
+  <TestCase name="testMatchUntilFixpoint">
     <Resource name="sql">
       <![CDATA[(select name from dept union select ename from emp) union (select ename from bonus)]]>
     </Resource>
@@ -118,21 +112,62 @@ LogicalUnion(all=[false])
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-LogicalUnion(all=[false])
-  LogicalAggregate(group=[{0}])
-    LogicalUnion(all=[true])
-      LogicalProject(NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalProject(ENAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(ENAME=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+LogicalAggregate(group=[{0}])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0}])
+      LogicalUnion(all=[true])
+        LogicalProject(NAME=[$1])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalProject(ENAME=[$1])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(ENAME=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testRelNodeCacheWithDigest">
+    <Resource name="sql">
+      <![CDATA[(select n_nationkey from SALES.CUSTOMER) union all
+(select n_name from CUSTOMER_MODIFIABLEVIEW)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalProject(N_NATIONKEY=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+  LogicalProject(N_NAME=[$1])
+    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testReplaceCommonSubexpression">
+    <Resource name="sql">
+      <![CDATA[select d1.deptno from (select * from dept) d1,
+(select * from dept) d2]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalJoin(condition=[true], joinType=[inner])
+    LogicalProject(DEPTNO=[$0], NAME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(DEPTNO=[$0], NAME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalJoin(condition=[true], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
     </Resource>
   </TestCase>
   <TestCase name="testRuleClass">
     <Resource name="sql">
-      <![CDATA[(select name from dept union select ename from emp) intersect (select fname from customer.contact)]]>
+      <![CDATA[(select name from dept union select ename from emp)
+intersect (select fname from customer.contact)]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
@@ -158,24 +193,6 @@ LogicalIntersect(all=[false])
   LogicalProject(FNAME=[CAST($0):VARCHAR(20) NOT NULL])
     LogicalProject(FNAME=[$1])
       LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT]])
-]]>
-    </Resource>
-  </TestCase>
-  <TestCase name="testSubprogram">
-    <Resource name="sql">
-      <![CDATA[select upper(ename) from (select lower(ename) as ename from emp where empno = 100)]]>
-    </Resource>
-    <Resource name="planBefore">
-      <![CDATA[
-LogicalProject(EXPR$0=[UPPER(LOWER($1))])
-  LogicalFilter(condition=[=($0, 100)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-    </Resource>
-    <Resource name="planAfter">
-      <![CDATA[
-LogicalCalc(expr#0..8=[{inputs}], expr#9=[LOWER($t1)], expr#10=[UPPER($t9)], expr#11=[100], expr#12=[=($t0, $t11)], EXPR$0=[$t10], $condition=[$t12])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
@@ -198,35 +215,22 @@ LogicalProject(NAME=[$1])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testGroup">
+  <TestCase name="testSubprogram">
     <Resource name="sql">
-      <![CDATA[select upper(name) from dept where deptno=20]]>
+      <![CDATA[select upper(ename) from
+(select lower(ename) as ename from emp where empno = 100)]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(EXPR$0=[UPPER($1)])
-  LogicalFilter(condition=[=($0, 20)])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+LogicalProject(EXPR$0=[UPPER(LOWER($1))])
+  LogicalFilter(condition=[=($0, 100)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-LogicalCalc(expr#0..1=[{inputs}], expr#2=[UPPER($t1)], expr#3=[20], expr#4=[=($t0, $t3)], EXPR$0=[$t2], $condition=[$t4])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-    </Resource>
-  </TestCase>
-  <TestCase name="testRelNodeCacheWithDigest">
-    <Resource name="sql">
-      <![CDATA[(select n_nationkey from SALES.CUSTOMER) union all (select n_name from CUSTOMER_MODIFIABLEVIEW)]]>
-    </Resource>
-    <Resource name="planBefore">
-      <![CDATA[
-LogicalUnion(all=[true])
-  LogicalProject(N_NATIONKEY=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
-  LogicalProject(N_NAME=[$1])
-    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+LogicalCalc(expr#0..8=[{inputs}], expr#9=[LOWER($t1)], expr#10=[UPPER($t9)], expr#11=[100], expr#12=[=($t0, $t11)], EXPR$0=[$t10], $condition=[$t12])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
diff --git a/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml b/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml
index 0c113e8c5b0a..0005a68017a2 100644
--- a/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml
+++ b/core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml
@@ -16,9 +16,32 @@
   ~ limitations under the License.
   -->
 <Root>
-    <TestCase name="testAggregateCaseToFilter">
-        <Resource name="sql">
-            <![CDATA[select
+  <TestCase name="testAddRedundantSemiJoinRule">
+    <Resource name="sql">
+      <![CDATA[select 1 from emp inner join dept on emp.deptno = dept.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($7, $9)], joinType=[inner], semiJoinDone=[true])
+    LogicalJoin(condition=[=($7, $9)], joinType=[semi])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateCaseToFilter">
+    <Resource name="sql">
+      <![CDATA[select
  sum(sal) as sum_sal,
  count(distinct case
        when job = 'CLERK'
@@ -33,603 +56,1087 @@
  sum(case when deptno = 70 then null else 1 end) as sum_null_d70,
  count(case when deptno = 20 then 1 end) as count_d20
 from emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalAggregate(group=[{}], SUM_SAL=[SUM($0)], COUNT_DISTINCT_CLERK=[COUNT(DISTINCT $1)], SUM_SAL_D10=[SUM($2)], SUM_SAL_D20=[SUM($3)], COUNT_D30=[SUM($4)], COUNT_D40=[COUNT($5)], COUNT_D45=[SUM($6)], COUNT_D50=[SUM($7)], SUM_NULL_D60=[SUM($8)], SUM_NULL_D70=[SUM($9)], COUNT_D20=[COUNT($10)])
   LogicalProject(SAL=[$5], $f1=[CASE(=($2, 'CLERK'), $7, null:INTEGER)], $f2=[CASE(=($7, 10), $5, null:INTEGER)], $f3=[CASE(=($7, 20), $5, 0)], $f4=[CASE(=($7, 30), 1, 0)], $f5=[CASE(=($7, 40), 'x', null:CHAR(1))], $f6=[CASE(=($7, 45), 1, null:INTEGER)], $f7=[CASE(=($7, 50), 1, null:INTEGER)], $f8=[null:DECIMAL(19, 9)], $f9=[CASE(=($7, 70), null:INTEGER, 1)], $f10=[CASE(=($7, 20), 1, null:INTEGER)])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(SUM_SAL=[$0], COUNT_DISTINCT_CLERK=[$1], SUM_SAL_D10=[$2], SUM_SAL_D20=[$3], COUNT_D30=[CAST($4):INTEGER], COUNT_D40=[$5], COUNT_D45=[$6], COUNT_D50=[$7], SUM_NULL_D60=[$8], SUM_NULL_D70=[$9], COUNT_D20=[$10])
   LogicalAggregate(group=[{}], SUM_SAL=[SUM($0)], COUNT_DISTINCT_CLERK=[COUNT(DISTINCT $2) FILTER $3], SUM_SAL_D10=[SUM($4) FILTER $5], SUM_SAL_D20=[SUM($6) FILTER $7], COUNT_D30=[COUNT() FILTER $8], COUNT_D40=[COUNT() FILTER $9], COUNT_D45=[SUM($10) FILTER $11], COUNT_D50=[SUM($12) FILTER $13], SUM_NULL_D60=[SUM($1)], SUM_NULL_D70=[SUM($14) FILTER $15], COUNT_D20=[COUNT() FILTER $16])
     LogicalProject(SAL=[$5], $f8=[null:DECIMAL(19, 9)], DEPTNO=[$7], $f12=[=($2, 'CLERK')], SAL0=[$5], $f14=[=($7, 10)], SAL1=[$5], $f16=[=($7, 20)], $f17=[=($7, 30)], $f18=[=($7, 40)], $f19=[1], $f20=[=($7, 45)], $f21=[1], $f22=[=($7, 50)], $f23=[1], $f24=[<>($7, 70)], $f25=[=($7, 20)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateExtractProjectRule">
-        <Resource name="sql">
-            <![CDATA[select sum(sal)
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateConstantKeyRule">
+    <Resource name="sql">
+      <![CDATA[select count(*) as c
+from sales.emp
+where deptno = 10
+group by deptno, sal]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(C=[$2])
+  LogicalAggregate(group=[{0, 1}], C=[COUNT()])
+    LogicalProject(DEPTNO=[$7], SAL=[$5])
+      LogicalFilter(condition=[=($7, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(C=[$2])
+  LogicalProject(DEPTNO=[10], SAL=[$0], C=[$1])
+    LogicalAggregate(group=[{0}], C=[COUNT()])
+      LogicalProject(SAL=[$5])
+        LogicalFilter(condition=[=($7, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateConstantKeyRule2">
+    <Resource name="sql">
+      <![CDATA[select count(*) as c
+from sales.emp
+where deptno = 10
+group by deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(C=[$1])
+  LogicalAggregate(group=[{0}], C=[COUNT()])
+    LogicalProject(DEPTNO=[$7])
+      LogicalFilter(condition=[=($7, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(C=[$1])
+  LogicalAggregate(group=[{0}], C=[COUNT()])
+    LogicalProject(DEPTNO=[$7])
+      LogicalFilter(condition=[=($7, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateConstantKeyRule3">
+    <Resource name="sql">
+      <![CDATA[select job
+from sales.emp
+where sal is null and job = 'Clerk'
+group by sal, job
+having count(*) > 3]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(JOB=[$1])
+  LogicalFilter(condition=[>($2, 3)])
+    LogicalAggregate(group=[{0, 1}], agg#0=[COUNT()])
+      LogicalProject(SAL=[$5], JOB=[$2])
+        LogicalFilter(condition=[AND(IS NULL($5), =($2, 'Clerk'))])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(JOB=[$1])
+  LogicalFilter(condition=[>($2, 3)])
+    LogicalProject(SAL=[$0], JOB=['Clerk':VARCHAR(10)], $f2=[$1])
+      LogicalAggregate(group=[{0}], agg#0=[COUNT()])
+        LogicalProject(SAL=[$5])
+          LogicalFilter(condition=[AND(IS NULL($5), =($2, 'Clerk'))])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateDynamicFunction">
+    <Resource name="sql">
+      <![CDATA[select hiredate
+from sales.emp
+where sal is null and hiredate = current_timestamp
+group by sal, hiredate
+having count(*) > 3]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(HIREDATE=[$1])
+  LogicalFilter(condition=[>($2, 3)])
+    LogicalAggregate(group=[{0, 1}], agg#0=[COUNT()])
+      LogicalProject(SAL=[$5], HIREDATE=[$4])
+        LogicalFilter(condition=[AND(IS NULL($5), =($4, CURRENT_TIMESTAMP))])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(HIREDATE=[$1])
+  LogicalFilter(condition=[>($2, 3)])
+    LogicalProject(SAL=[$0], HIREDATE=[CURRENT_TIMESTAMP], $f2=[$1])
+      LogicalAggregate(group=[{0}], agg#0=[COUNT()])
+        LogicalProject(SAL=[$5])
+          LogicalFilter(condition=[AND(IS NULL($5), =($4, CURRENT_TIMESTAMP))])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateExtractProjectRule">
+    <Resource name="sql">
+      <![CDATA[select sum(sal)
 from emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalAggregate(group=[{}], EXPR$0=[SUM($5)])
   LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
   LogicalProject(SAL=[$5])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateExtractProjectRuleWithFilter">
-        <Resource name="sql">
-            <![CDATA[select sum(sal) filter (where empno = 40)
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateExtractProjectRuleWithFilter">
+    <Resource name="sql">
+      <![CDATA[select sum(sal) filter (where empno = 40)
 from emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalAggregate(group=[{}], EXPR$0=[SUM($0) FILTER $1])
   LogicalProject(SAL=[$5], $f1=[=($0, 40)])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateExtractProjectRuleWithGroupingSets">
-        <Resource name="sql">
-            <![CDATA[select empno, deptno, sum(sal)
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateExtractProjectRuleWithGroupingSets">
+    <Resource name="sql">
+      <![CDATA[select empno, deptno, sum(sal)
 from emp
 group by grouping sets ((empno, deptno),(deptno),(empno))]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalAggregate(group=[{0, 7}], groups=[[{0, 7}, {0}, {7}]], EXPR$2=[SUM($5)])
   LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalAggregate(group=[{0, 2}], groups=[[{0, 2}, {0}, {2}]], EXPR$2=[SUM($1)])
   LogicalProject(EMPNO=[$0], SAL=[$5], DEPTNO=[$7])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateExtractProjectRuleWithGroupingSets2">
-        <Resource name="sql">
-            <![CDATA[select empno, deptno, sum(empno)
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateExtractProjectRuleWithGroupingSets2">
+    <Resource name="sql">
+      <![CDATA[select empno, deptno, sum(empno)
 from emp
 group by grouping sets ((empno, deptno),(deptno),(empno))]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalAggregate(group=[{0, 7}], groups=[[{0, 7}, {0}, {7}]], EXPR$2=[SUM($0)])
   LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {1}]], EXPR$2=[SUM($0)])
   LogicalProject(EMPNO=[$0], DEPTNO=[$7])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceNot">
-        <Resource name="sql">
-            <![CDATA[select *
-from (select (case when sal > 1000 then null else false end) as caseCol from emp)
-where NOT(caseCol)]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(CASECOL=[$0])
-  LogicalFilter(condition=[NOT($0)])
-    LogicalProject(CASECOL=[CASE(>($5, 1000), null, false)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateGroupingSetsProjectMerge">
+    <Resource name="sql">
+      <![CDATA[select x, sum(z), y from (
+  select deptno as x, empno as y, sal as z, sal * 2 as zz
+  from emp)
+group by rollup(x, y)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(X=[$0], EXPR$1=[$2], Y=[$1])
+  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$1=[SUM($2)])
+    LogicalProject(X=[$7], Y=[$0], Z=[$5])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(CASECOL=[$0])
-  LogicalFilter(condition=[NOT($0)])
-    LogicalProject(CASECOL=[AND(>($5, 1000), null)])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(X=[$0], EXPR$1=[$2], Y=[$1])
+  LogicalProject(DEPTNO=[$1], EMPNO=[$0], EXPR$1=[$2])
+    LogicalAggregate(group=[{0, 7}], groups=[[{0, 7}, {7}, {}]], EXPR$1=[SUM($5)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceNestedCaseWhen">
-        <Resource name="sql">
-            <![CDATA[select sal
-from emp
-where case when (sal = 1000) then
-(case when sal = 1000 then null else 1 end is null) else
-(case when sal = 2000 then null else 1 end is null) end is true]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalFilter(condition=[SEARCH($5, Sarg[1000, 2000])])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalFilter(condition=[IS TRUE(CASE(=($5, 1000), IS NULL(CASE(=($5, 1000), null:INTEGER, 1)), IS NULL(CASE(=($5, 2000), null:INTEGER, 1))))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDigestOfApproximateDistinctAggregateCall">
-        <Resource name="sql">
-            <![CDATA[select *
-from (
-select deptno, count(distinct empno) from emp group by deptno
-union all
-select deptno, approx_count_distinct(empno) from emp group by deptno)]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EXPR$1=[$1])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{7}], EXPR$1=[COUNT(DISTINCT $0)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{7}], EXPR$1=[COUNT(APPROXIMATE DISTINCT $0)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateJoinRemove1">
+    <Resource name="sql">
+      <![CDATA[select distinct e.deptno from sales.emp e
+left outer join sales.dept d on e.deptno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}])
+  LogicalProject(DEPTNO=[$7])
+    LogicalJoin(condition=[=($7, $9)], joinType=[left])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EXPR$1=[$1])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
-      LogicalProject(DEPTNO=[$7], EMPNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}], EXPR$1=[COUNT(APPROXIMATE DISTINCT $1)])
-      LogicalProject(DEPTNO=[$7], EMPNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceOrCaseWhen">
-        <Resource name="sql">
-            <![CDATA[select sal
-from emp
-where case when sal = 1000 then null else 1 end is null
-OR case when sal = 2000 then null else 1 end is null]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalFilter(condition=[SEARCH($5, Sarg[1000, 2000])])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalFilter(condition=[OR(IS NULL(CASE(=($5, 1000), null:INTEGER, 1)), IS NULL(CASE(=($5, 2000), null:INTEGER, 1)))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{7}])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceNullableCase">
-        <Resource name="sql">
-            <![CDATA[SELECT CASE WHEN 1=2 THEN cast((values(1)) as integer) ELSE 2 end from (values(1))]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[CAST(2):INTEGER])
-  LogicalJoin(condition=[true], joinType=[left])
-    LogicalValues(tuples=[[{ 1 }]])
-    LogicalValues(tuples=[[{ 1 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateJoinRemove10">
+    <Resource name="sql">
+      <![CDATA[SELECT e.deptno, COUNT(DISTINCT d1.name, d2.name)
+FROM sales.emp e
+LEFT JOIN sales.dept d1 ON e.deptno = d1.deptno
+LEFT JOIN sales.dept d2 ON e.deptno = d2.deptno
+GROUP BY e.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1, $2)])
+  LogicalProject(DEPTNO=[$7], NAME=[$10], NAME0=[$12])
+    LogicalJoin(condition=[=($7, $11)], joinType=[left])
+      LogicalJoin(condition=[=($7, $9)], joinType=[left])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[CAST(2):INTEGER])
-  LogicalJoin(condition=[true], joinType=[left])
-    LogicalValues(tuples=[[{ 1 }]])
-    LogicalValues(tuples=[[{ 1 }]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{7}], EXPR$1=[COUNT(DISTINCT $10, $12)])
+  LogicalJoin(condition=[=($7, $11)], joinType=[left])
+    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWindowInParenthesis">
-        <Resource name="sql">
-            <![CDATA[select count(*) over (w), count(*) over w
-from emp
-window w as (partition by empno order by empno)]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$9], EXPR$1=[$9])
-  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [COUNT()])])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateJoinRemove11">
+    <Resource name="sql">
+      <![CDATA[select e.deptno, count(distinct e.slacker)
+from sales.emp e
+left outer join sales.dept d on e.deptno = d.deptno
+group by e.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
+  LogicalProject(DEPTNO=[$7], SLACKER=[$8])
+    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[COUNT() OVER (PARTITION BY $0 ORDER BY $0)], EXPR$1=[COUNT() OVER (PARTITION BY $0 ORDER BY $0)])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{7}], EXPR$1=[COUNT(DISTINCT $8)])
   LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testIsNullPushDown">
-        <Resource name="sql">
-            <![CDATA[select empno, deptno, w_count from (
-  select empno, deptno, count(empno) over (w) w_count
-  from emp
-  window w as (partition by deptno order by empno)
-) sub_query where w_count is null]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], DEPTNO=[$1], W_COUNT=[$2])
-  LogicalValues(tuples=[[]])
-]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], DEPTNO=[$1], W_COUNT=[$2])
-  LogicalFilter(condition=[IS NULL($2)])
-    LogicalProject(EMPNO=[$0], DEPTNO=[$7], $2=[$9])
-      LogicalWindow(window#0=[window(partition {7} order by [0] aggs [COUNT($0)])])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateJoinRemove2">
+    <Resource name="sql">
+      <![CDATA[select e.deptno, count(distinct e.job)
+from sales.emp e
+left outer join sales.dept d on e.deptno = d.deptno
+group by e.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
+  LogicalProject(DEPTNO=[$7], JOB=[$2])
+    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testIsNullPushDown2">
-        <Resource name="sql">
-            <![CDATA[select empno, deptno, w_count from (
-  select empno, deptno, count(empno) over (ROWS BETWEEN 10 PRECEDING AND 1 PRECEDING) w_count
-  from emp
-) sub_query where w_count is null]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], DEPTNO=[$1], W_COUNT=[$2])
-  LogicalValues(tuples=[[]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{7}], EXPR$1=[COUNT(DISTINCT $2)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], DEPTNO=[$1], W_COUNT=[$2])
-  LogicalFilter(condition=[IS NULL($2)])
-    LogicalProject(EMPNO=[$0], DEPTNO=[$7], $2=[$9])
-      LogicalWindow(window#0=[window(aggs [COUNT($0)])])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateJoinRemove3">
+    <Resource name="sql">
+      <![CDATA[select e.deptno, count(distinct d.name)
+from sales.emp e
+left outer join sales.dept d on e.deptno = d.deptno
+group by e.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
+  LogicalProject(DEPTNO=[$7], NAME=[$10])
+    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectToWindowRuleForMultipleWindows">
-        <Resource name="sql">
-            <![CDATA[select
- count(*) over(partition by empno order by sal) as count1,
- count(*) over(partition by deptno order by sal) as count2,
- sum(deptno) over(partition by empno order by sal) as sum1,
- sum(deptno) over(partition by deptno order by sal) as sum2
-from emp]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject($0=[$9], $1=[$11], $2=[$10], $3=[$12])
-  LogicalWindow(window#0=[window(partition {0} order by [5] aggs [COUNT(), SUM($7)])], window#1=[window(partition {7} order by [5] aggs [COUNT(), SUM($7)])])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{7}], EXPR$1=[COUNT(DISTINCT $10)])
+  LogicalJoin(condition=[=($7, $9)], joinType=[left])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(COUNT1=[COUNT() OVER (PARTITION BY $0 ORDER BY $5)], COUNT2=[COUNT() OVER (PARTITION BY $7 ORDER BY $5)], SUM1=[SUM($7) OVER (PARTITION BY $0 ORDER BY $5)], SUM2=[SUM($7) OVER (PARTITION BY $7 ORDER BY $5)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUnionToDistinctRule">
-        <Resource name="sql">
-            <![CDATA[select * from dept union select * from dept]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}])
-  LogicalUnion(all=[true])
-    LogicalProject(DEPTNO=[$0], NAME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(DEPTNO=[$0], NAME=[$1])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateJoinRemove4">
+    <Resource name="sql">
+      <![CDATA[select distinct d.deptno
+from sales.emp e
+right outer join sales.dept d on e.deptno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}])
+  LogicalProject(DEPTNO=[$9])
+    LogicalJoin(condition=[=($7, $9)], joinType=[right])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalUnion(all=[false])
-  LogicalProject(DEPTNO=[$0], NAME=[$1])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-  LogicalProject(DEPTNO=[$0], NAME=[$1])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUnionMergeRule">
-        <Resource name="sql">
-            <![CDATA[select * from (
-select * from (
-  select name, deptno from dept
-  union all
-  select name, deptno from
-  (
-    select name, deptno, count(1) from dept group by name, deptno
-    union all
-    select name, deptno, count(1) from dept group by name, deptno
-  ) subq
-) a
-union all
-select name, deptno from dept
-) aa
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateJoinRemove5">
+    <Resource name="sql">
+      <![CDATA[select d.deptno, count(distinct d.name)
+from sales.emp e
+right outer join sales.dept d on e.deptno = d.deptno
+group by d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
+  LogicalProject(DEPTNO=[$9], NAME=[$10])
+    LogicalJoin(condition=[=($7, $9)], joinType=[right])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalProject(NAME=[$1], DEPTNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-  LogicalProject(NAME=[$0], DEPTNO=[$1])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
-      LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-  LogicalProject(NAME=[$0], DEPTNO=[$1])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
-      LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-  LogicalProject(NAME=[$1], DEPTNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NAME=[$0], DEPTNO=[$1])
-  LogicalUnion(all=[true])
-    LogicalProject(NAME=[$0], DEPTNO=[$1])
-      LogicalUnion(all=[true])
-        LogicalProject(NAME=[$1], DEPTNO=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalProject(NAME=[$0], DEPTNO=[$1])
-          LogicalUnion(all=[true])
-            LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
-              LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
-                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-            LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
-              LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
-                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(NAME=[$1], DEPTNO=[$0])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateJoinRemove6">
+    <Resource name="sql">
+      <![CDATA[select d.deptno, count(distinct e.job)
+from sales.emp e
+right outer join sales.dept d on e.deptno = d.deptno
+group by d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
+  LogicalProject(DEPTNO=[$9], JOB=[$2])
+    LogicalJoin(condition=[=($7, $9)], joinType=[right])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMinusMergeRule">
-        <Resource name="sql">
-            <![CDATA[select * from (
-select * from (
-  select name, deptno from
-  (
-    select name, deptno, count(1) from dept group by name, deptno
-    except all
-    select name, deptno, 1 from dept
-  ) subq
-  except all
-  select name, deptno from
-  (
-    select name, deptno, 1 from dept
-    except all
-    select name, deptno, count(1) from dept group by name, deptno
-  ) subq2
-) a
-except all
-select name, deptno from dept
-) aa
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{9}], EXPR$1=[COUNT(DISTINCT $2)])
+  LogicalJoin(condition=[=($7, $9)], joinType=[right])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalMinus(all=[true])
-  LogicalProject(NAME=[$0], DEPTNO=[$1])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
-      LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateJoinRemove7">
+    <Resource name="sql">
+      <![CDATA[SELECT distinct e.deptno
+FROM sales.emp e
+LEFT JOIN sales.dept d1 ON e.deptno = d1.deptno
+LEFT JOIN sales.dept d2 ON e.deptno = d2.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}])
+  LogicalProject(DEPTNO=[$7])
+    LogicalJoin(condition=[=($7, $11)], joinType=[left])
+      LogicalJoin(condition=[=($7, $9)], joinType=[left])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
         LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-  LogicalProject(NAME=[$0], DEPTNO=[$1])
-    LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-  LogicalMinus(all=[true])
-    LogicalProject(NAME=[$0], DEPTNO=[$1])
-      LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(NAME=[$0], DEPTNO=[$1])
-      LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
-        LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-  LogicalProject(NAME=[$1], DEPTNO=[$0])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{7}])
+  LogicalJoin(condition=[=($7, $9)], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NAME=[$0], DEPTNO=[$1])
-  LogicalMinus(all=[true])
-    LogicalProject(NAME=[$0], DEPTNO=[$1])
-      LogicalMinus(all=[true])
-        LogicalProject(NAME=[$0], DEPTNO=[$1])
-          LogicalMinus(all=[true])
-            LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
-              LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
-                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-            LogicalProject(NAME=[$1], DEPTNO=[$0], EXPR$2=[1])
-              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalProject(NAME=[$0], DEPTNO=[$1])
-          LogicalMinus(all=[true])
-            LogicalProject(NAME=[$1], DEPTNO=[$0], EXPR$2=[1])
-              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-            LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
-              LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
-                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(NAME=[$1], DEPTNO=[$0])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateJoinRemove8">
+    <Resource name="sql">
+      <![CDATA[SELECT e.deptno, COUNT(DISTINCT d2.name)
+FROM sales.emp e
+LEFT JOIN sales.dept d1 ON e.deptno = d1.deptno
+LEFT JOIN sales.dept d2 ON e.deptno = d2.deptno
+GROUP BY e.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
+  LogicalProject(DEPTNO=[$7], NAME0=[$12])
+    LogicalJoin(condition=[=($7, $11)], joinType=[left])
+      LogicalJoin(condition=[=($7, $9)], joinType=[left])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExtractJoinFilterRule">
-        <Resource name="sql">
-            <![CDATA[select 1 from emp inner join dept on emp.deptno=dept.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{7}], EXPR$1=[COUNT(DISTINCT $10)])
+  LogicalJoin(condition=[=($7, $9)], joinType=[left])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalFilter(condition=[=($7, $9)])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateJoinRemove9">
+    <Resource name="sql">
+      <![CDATA[SELECT distinct e.deptno, d2.name
+FROM sales.emp e
+LEFT JOIN sales.dept d1 ON e.deptno = d1.deptno
+LEFT JOIN sales.dept d2 ON e.deptno = d2.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}])
+  LogicalProject(DEPTNO=[$7], NAME=[$12])
+    LogicalJoin(condition=[=($7, $11)], joinType=[left])
+      LogicalJoin(condition=[=($7, $9)], joinType=[left])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNotPushExpression">
-        <Resource name="sql">
-            <![CDATA[select 1 from emp inner join dept
-on emp.deptno=dept.deptno and emp.ename is not null]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[AND(=($7, $9), IS NOT NULL($1))], joinType=[inner])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{7, 10}])
+  LogicalJoin(condition=[=($7, $9)], joinType=[left])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[AND(=($7, $9), IS NOT NULL($1))], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateJoinRemoveRule1">
+    <Resource name="sql">
+      <![CDATA[select count(distinct sal) from sales.emp e
+left outer join sales.dept d1 on e.job = d1.name
+left outer join sales.dept d2 on e.job = d2.name
+group by e.job
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAddRedundantSemiJoinRule">
-        <Resource name="sql">
-            <![CDATA[select 1 from emp inner join dept on emp.deptno = dept.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
+  LogicalProject(JOB=[$2], NAME0=[$12])
+    LogicalJoin(condition=[=($2, $12)], joinType=[left])
+      LogicalJoin(condition=[=($2, $10)], joinType=[left])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{2}], EXPR$1=[COUNT(DISTINCT $10)])
+  LogicalJoin(condition=[=($2, $10)], joinType=[left])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($7, $9)], joinType=[inner], semiJoinDone=[true])
-    LogicalJoin(condition=[=($7, $9)], joinType=[semi])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateJoinRemoveRule2">
+    <Resource name="sql">
+      <![CDATA[select count(distinct sal) from sales.emp e
+left outer join sales.dept d1 on e.job = d1.name
+left outer join sales.dept d2 on e.job = d2.name
+group by e.job
+]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}])
+  LogicalProject(JOB=[$2], NAME=[$12])
+    LogicalJoin(condition=[=($2, $12)], joinType=[left])
+      LogicalJoin(condition=[=($2, $10)], joinType=[left])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{2, 10}])
+  LogicalJoin(condition=[=($2, $10)], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateMergeSum0">
-        <Resource name="sql">
-            <![CDATA[select coalesce(sum(count_comm), 0)
-from (
-  select deptno, count(comm) as count_comm
-  from sales.emp
-  group by deptno, mgr) t]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], agg#0=[$SUM0($2)])
-  LogicalAggregate(group=[{3, 7}], COUNT_COMM=[COUNT()])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateMerge1">
+    <Resource name="sql">
+      <![CDATA[select deptno c, min(y), max(z) z,
+sum(r), sum(m) n, sum(x) sal from (
+   select deptno, ename, sum(sal) x, max(sal) z,
+      min(sal) y, count(hiredate) m, count(mgr) r
+   from sales.emp group by deptno, ename) t
+group by deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{1}], EXPR$1=[MIN($4)], Z=[MAX($3)], EXPR$3=[SUM($6)], N=[SUM($5)], SAL=[SUM($2)])
+  LogicalAggregate(group=[{1, 7}], X=[SUM($5)], Z=[MAX($5)], Y=[MIN($5)], M=[COUNT()], R=[COUNT($3)])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], agg#0=[COUNT()])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{7}], EXPR$1=[MIN($5)], Z=[MAX($5)], EXPR$3=[COUNT($3)], N=[COUNT()], SAL=[SUM($5)])
   LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAll">
-        <Resource name="sql">
-            <![CDATA[select * from emp e1
-  where e1.empno > ALL (select deptno from dept)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[NOT(<= SOME($0, {
-LogicalProject(DEPTNO=[$0])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-}))])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateMerge2">
+    <Resource name="sql">
+      <![CDATA[select deptno, empno, sum(x), sum(y)
+from (
+  select ename, empno, deptno, sum(sal) x, count(mgr) y
+    from sales.emp
+  group by deptno, ename, empno) t
+group by grouping sets(deptno, empno)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$1], EMPNO=[$0], EXPR$2=[$2], EXPR$3=[$3])
+  LogicalAggregate(group=[{0, 2}], groups=[[{0}, {2}]], EXPR$2=[SUM($3)], EXPR$3=[SUM($4)])
+    LogicalAggregate(group=[{0, 1, 7}], X=[SUM($5)], Y=[COUNT($3)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$1], EMPNO=[$0], EXPR$2=[$2], EXPR$3=[$3])
+  LogicalAggregate(group=[{0, 7}], groups=[[{0}, {7}]], EXPR$2=[SUM($5)], EXPR$3=[COUNT($3)])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[NOT(CAST(OR(AND(IS TRUE(<=($0, $9)), <>($10, 0)), AND(>($10, $11), null, <>($10, 0), IS NOT TRUE(<=($0, $9))), AND(<=($0, $9), <>($10, 0), IS NOT TRUE(<=($0, $9)), <=($10, $11)))):BOOLEAN NOT NULL)])
-      LogicalJoin(condition=[true], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(m=[$0], c=[$1], d=[$1])
-          LogicalAggregate(group=[{}], m=[MAX($0)], c=[COUNT()])
-            LogicalProject(DEPTNO=[$0])
-              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateMerge3">
+    <Resource name="sql">
+      <![CDATA[select deptno, sum(x) from (
+ select ename, deptno, sum(sal) x from
+   sales.emp group by cube(deptno, ename)) t
+group by deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{1}], EXPR$1=[SUM($2)])
+  LogicalAggregate(group=[{1, 7}], groups=[[{1, 7}, {1}, {7}, {}]], X=[SUM($5)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[NOT(CAST(OR(AND(IS TRUE(<=($0, $9)), <>($10, 0)), AND(>($10, $11), null, <>($10, 0), IS NOT TRUE(<=($0, $9))), AND(<=($0, $9), <>($10, 0), IS NOT TRUE(<=($0, $9)), <=($10, $11)))):BOOLEAN NOT NULL)])
-      LogicalJoin(condition=[true], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(m=[$0], c=[$1], d=[$1])
-          LogicalAggregate(group=[{}], m=[MAX($0)], c=[COUNT()])
-            LogicalProject(DEPTNO=[$0])
-              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{1}], EXPR$1=[SUM($2)])
+  LogicalAggregate(group=[{1, 7}], groups=[[{1, 7}, {1}, {7}, {}]], X=[SUM($5)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAnyInProjectNonNullable">
-        <Resource name="sql">
-            <![CDATA[select name, deptno > ANY (
-  select deptno from emp)
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateMerge4">
+    <Resource name="sql">
+      <![CDATA[select deptno, sum(x) from (
+  select ename, deptno, count(distinct sal) x
+    from sales.emp group by deptno, ename) t
+group by deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{1}], EXPR$1=[SUM($2)])
+  LogicalAggregate(group=[{1, 7}], X=[COUNT(DISTINCT $5)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{1}], EXPR$1=[SUM($2)])
+  LogicalAggregate(group=[{1, 7}], X=[COUNT(DISTINCT $5)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateMerge5">
+    <Resource name="sql">
+      <![CDATA[select deptno, avg(x) from (
+  select mgr, deptno, avg(sal) x from
+    sales.emp group by deptno, mgr) t
+group by deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{1}], EXPR$1=[AVG($2)])
+  LogicalAggregate(group=[{3, 7}], X=[AVG($5)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{1}], EXPR$1=[AVG($2)])
+  LogicalAggregate(group=[{3, 7}], X=[AVG($5)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateMerge6">
+    <Resource name="sql">
+      <![CDATA[select sum(x) from (
+select mgr, deptno, count(sal) x from
+sales.emp group by deptno, mgr) t]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($2)])
+  LogicalAggregate(group=[{3, 7}], X=[COUNT()])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($2)])
+  LogicalAggregate(group=[{3, 7}], X=[COUNT()])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateMerge7">
+    <Resource name="sql">
+      <![CDATA[select mgr, deptno, sum(x) from (
+  select mgr, deptno, count(sal) x from
+    sales.emp group by deptno, mgr) t
+group by cube(mgr, deptno)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {1}, {}]], EXPR$2=[SUM($2)])
+  LogicalAggregate(group=[{3, 7}], X=[COUNT()])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {1}, {}]], EXPR$2=[SUM($2)])
+  LogicalAggregate(group=[{3, 7}], X=[COUNT()])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateMerge8">
+    <Resource name="sql">
+      <![CDATA[select sum(x) x, min(y) z from (
+  select sum(sal) x, min(sal) y from sales.emp)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], X=[SUM($0)], Z=[MIN($1)])
+  LogicalAggregate(group=[{}], X=[SUM($5)], Y=[MIN($5)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], X=[SUM($5)], Z=[MIN($5)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateMergeSum0">
+    <Resource name="sql">
+      <![CDATA[select coalesce(sum(count_comm), 0)
+from (
+  select deptno, count(comm) as count_comm
+  from sales.emp
+  group by deptno, mgr) t]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], agg#0=[$SUM0($2)])
+  LogicalAggregate(group=[{3, 7}], COUNT_COMM=[COUNT()])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], agg#0=[COUNT()])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateProjectMerge">
+    <Resource name="sql">
+      <![CDATA[select x, sum(z), y from (
+  select deptno as x, empno as y, sal as z, sal * 2 as zz
+  from emp)
+group by x, y]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(X=[$0], EXPR$1=[$2], Y=[$1])
+  LogicalAggregate(group=[{0, 1}], EXPR$1=[SUM($2)])
+    LogicalProject(X=[$7], Y=[$0], Z=[$5])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(X=[$0], EXPR$1=[$2], Y=[$1])
+  LogicalProject(DEPTNO=[$1], EMPNO=[$0], EXPR$1=[$2])
+    LogicalAggregate(group=[{0, 7}], EXPR$1=[SUM($5)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateProjectPullUpConstants">
+    <Resource name="sql">
+      <![CDATA[select job, empno, sal, sum(sal) as s
+from emp where empno = 10
+group by job, empno, sal]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1, 2}], S=[SUM($2)])
+  LogicalProject(JOB=[$2], EMPNO=[$0], SAL=[$5])
+    LogicalFilter(condition=[=($0, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(JOB=[$0], EMPNO=[10], SAL=[$1], S=[$2])
+  LogicalAggregate(group=[{0, 1}], S=[SUM($1)])
+    LogicalProject(JOB=[$2], SAL=[$5])
+      LogicalFilter(condition=[=($0, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateProjectPullUpConstants2">
+    <Resource name="sql">
+      <![CDATA[select ename, sal
+from (select '1', ename, sal from emp where ename = 'John') subq
+group by ename, sal]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{1, 5}])
+  LogicalFilter(condition=[=($1, 'John')])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(ENAME=['John':VARCHAR(20)], SAL=[$0])
+  LogicalAggregate(group=[{5}])
+    LogicalFilter(condition=[=($1, 'John')])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateRemove1">
+    <Resource name="sql">
+      <![CDATA[select empno, sum(sal), min(sal), max(sal), bit_and(distinct sal), bit_or(sal), count(distinct sal) from sales.emp group by empno, deptno
+]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], EXPR$1=[$2], EXPR$2=[$3], EXPR$3=[$4], EXPR$4=[$5], EXPR$5=[$6], EXPR$6=[$7])
+  LogicalAggregate(group=[{0, 1}], EXPR$1=[SUM($2)], EXPR$2=[MIN($2)], EXPR$3=[MAX($2)], EXPR$4=[BIT_AND($2)], EXPR$5=[BIT_OR($2)], EXPR$6=[COUNT(DISTINCT $2)])
+    LogicalProject(EMPNO=[$0], DEPTNO=[$7], SAL=[$5])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], EXPR$1=[$5], EXPR$2=[$5], EXPR$3=[$5], EXPR$4=[$5], EXPR$5=[$5], EXPR$6=[1:BIGINT])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateRemove2">
+    <Resource name="sql">
+      <![CDATA[select distinct empno, deptno from sales.emp
+]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}])
+  LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateRemove3">
+    <Resource name="sql">
+      <![CDATA[select empno, count(mgr) from sales.emp group by empno, deptno
+]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], EXPR$1=[$2])
+  LogicalAggregate(group=[{0, 1}], EXPR$1=[COUNT($2)])
+    LogicalProject(EMPNO=[$0], DEPTNO=[$7], MGR=[$3])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], EXPR$1=[CASE(IS NOT NULL($3), 1:BIGINT, 0:BIGINT)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateRemove4">
+    <Resource name="sql">
+      <![CDATA[select empno, max(sal), avg(sal) from sales.emp group by empno, deptno
+]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], EXPR$1=[$2], EXPR$2=[$3])
+  LogicalAggregate(group=[{0, 1}], EXPR$1=[MAX($2)], EXPR$2=[AVG($2)])
+    LogicalProject(EMPNO=[$0], DEPTNO=[$7], SAL=[$5])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], EXPR$1=[$2], EXPR$2=[$3])
+  LogicalAggregate(group=[{0, 1}], EXPR$1=[MAX($2)], EXPR$2=[AVG($2)])
+    LogicalProject(EMPNO=[$0], DEPTNO=[$7], SAL=[$5])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateRemove5">
+    <Resource name="sql">
+      <![CDATA[select empno, deptno, sum(sal) from sales.emp group by cube(empno, deptno)
+]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {1}, {}]], EXPR$2=[SUM($2)])
+  LogicalProject(EMPNO=[$0], DEPTNO=[$7], SAL=[$5])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {1}, {}]], EXPR$2=[SUM($2)])
+  LogicalProject(EMPNO=[$0], DEPTNO=[$7], SAL=[$5])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateRemove6">
+    <Resource name="sql">
+      <![CDATA[select deptno, max(sal) from sales.emp group by deptno
+]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
+  LogicalProject(DEPTNO=[$7], SAL=[$5])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
+  LogicalProject(DEPTNO=[$7], SAL=[$5])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateRemove7">
+    <Resource name="sql">
+      <![CDATA[select mgr, sum(sum_sal)
+from
+(select mgr, deptno, sum(sal) sum_sal
+ from sales.emp
+ group by mgr, deptno)
+where deptno=100
+group by mgr]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
+  LogicalProject(MGR=[$0], SUM_SAL=[$2])
+    LogicalFilter(condition=[=($1, 100)])
+      LogicalAggregate(group=[{0, 1}], SUM_SAL=[SUM($2)])
+        LogicalProject(MGR=[$3], DEPTNO=[$7], SAL=[$5])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(MGR=[$0], SUM_SAL=[$2])
+  LogicalFilter(condition=[=($1, 100)])
+    LogicalAggregate(group=[{0, 1}], SUM_SAL=[SUM($2)])
+      LogicalProject(MGR=[$3], DEPTNO=[$7], SAL=[$5])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAll">
+    <Resource name="sql">
+      <![CDATA[select * from emp e1
+  where e1.empno > ALL (select deptno from dept)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[NOT(<= SOME($0, {
+LogicalProject(DEPTNO=[$0])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+}))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[NOT(CAST(OR(AND(IS TRUE(<=($0, $9)), <>($10, 0)), AND(>($10, $11), null, <>($10, 0), IS NOT TRUE(<=($0, $9))), AND(<=($0, $9), <>($10, 0), IS NOT TRUE(<=($0, $9)), <=($10, $11)))):BOOLEAN NOT NULL)])
+      LogicalJoin(condition=[true], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(m=[$0], c=[$1], d=[$1])
+          LogicalAggregate(group=[{}], m=[MAX($0)], c=[COUNT()])
+            LogicalProject(DEPTNO=[$0])
+              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[NOT(CAST(OR(AND(IS TRUE(<=($0, $9)), <>($10, 0)), AND(>($10, $11), null, <>($10, 0), IS NOT TRUE(<=($0, $9))), AND(<=($0, $9), <>($10, 0), IS NOT TRUE(<=($0, $9)), <=($10, $11)))):BOOLEAN NOT NULL)])
+      LogicalJoin(condition=[true], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(m=[$0], c=[$1], d=[$1])
+          LogicalAggregate(group=[{}], m=[MAX($0)], c=[COUNT()])
+            LogicalProject(DEPTNO=[$0])
+              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAlreadyFalseEliminatesFilter">
+    <Resource name="sql">
+      <![CDATA[select * from (values (1,2)) where false]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
+  LogicalFilter(condition=[false])
+    LogicalValues(tuples=[[{ 1, 2 }]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
+  LogicalValues(tuples=[[]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAntiJoinProjectTranspose">
+    <Resource name="sql">
+      <![CDATA[select a.name from dept a
+where a.deptno not in (select b.deptno * 2 from dept);
+]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DNAME=[$1])
+  LogicalJoin(condition=[=($0, $3)], joinType=[anti])
+    LogicalTableScan(table=[[scott, DEPT]])
+    LogicalAggregate(group=[{0}])
+      LogicalProject($f0=[*(2, $0)])
+        LogicalTableScan(table=[[scott, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DNAME=[$1])
+  LogicalJoin(condition=[=($0, $2)], joinType=[anti])
+    LogicalProject(DEPTNO=[$0], DNAME=[$1])
+      LogicalTableScan(table=[[scott, DEPT]])
+    LogicalProject($f0=[$0])
+      LogicalAggregate(group=[{0}])
+        LogicalProject($f0=[*(2, $0)])
+          LogicalTableScan(table=[[scott, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAnyInProjectNonNullable">
+    <Resource name="sql">
+      <![CDATA[select name, deptno > ANY (
+  select deptno from emp)
 from dept]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(NAME=[$1], EXPR$1=[> SOME($0, {
 LogicalProject(DEPTNO=[$7])
   LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 })])
   LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
 LogicalProject(NAME=[$1], EXPR$1=[CAST(OR(AND(IS TRUE(>($0, $2)), <>($3, 0)), AND(>($3, $4), null, <>($3, 0), IS NOT TRUE(>($0, $2))), AND(>($0, $2), <>($3, 0), IS NOT TRUE(>($0, $2)), <=($3, $4)))):BOOLEAN NOT NULL])
   LogicalJoin(condition=[true], joinType=[inner])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
@@ -638,9 +1145,9 @@ LogicalProject(NAME=[$1], EXPR$1=[CAST(OR(AND(IS TRUE(>($0, $2)), <>($3, 0)), AN
         LogicalProject(DEPTNO=[$7])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(NAME=[$1], EXPR$1=[CAST(OR(AND(IS TRUE(>($0, $2)), <>($3, 0)), AND(>($3, $4), null, <>($3, 0), IS NOT TRUE(>($0, $2))), AND(>($0, $2), <>($3, 0), IS NOT TRUE(>($0, $2)), <=($3, $4)))):BOOLEAN NOT NULL])
   LogicalJoin(condition=[true], joinType=[inner])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
@@ -649,25 +1156,25 @@ LogicalProject(NAME=[$1], EXPR$1=[CAST(OR(AND(IS TRUE(>($0, $2)), <>($3, 0)), AN
         LogicalProject(DEPTNO=[$7])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAnyInProjectNullable">
-        <Resource name="sql">
-            <![CDATA[select deptno, name = ANY (
+    </Resource>
+  </TestCase>
+  <TestCase name="testAnyInProjectNullable">
+    <Resource name="sql">
+      <![CDATA[select deptno, name = ANY (
   select mgr from emp)
 from dept]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(DEPTNO=[$0], EXPR$1=[IN($1, {
 LogicalProject(MGR=[$3])
   LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 })])
   LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
 LogicalProject(DEPTNO=[$0], EXPR$1=[OR(AND(IS NOT NULL($5), <>($2, 0)), AND(<($3, $2), null, <>($2, 0), IS NULL($5)))])
   LogicalJoin(condition=[=($1, $4)], joinType=[left])
     LogicalJoin(condition=[true], joinType=[inner])
@@ -679,9 +1186,9 @@ LogicalProject(DEPTNO=[$0], EXPR$1=[OR(AND(IS NOT NULL($5), <>($2, 0)), AND(<($3
       LogicalProject(MGR=[$3], i=[true])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(DEPTNO=[$0], EXPR$1=[OR(AND(IS NOT NULL($5), <>($2, 0)), AND(<($3, $2), null, <>($2, 0), IS NULL($5)))])
   LogicalJoin(condition=[=($1, $4)], joinType=[left])
     LogicalJoin(condition=[true], joinType=[inner])
@@ -693,62 +1200,356 @@ LogicalProject(DEPTNO=[$0], EXPR$1=[OR(AND(IS NOT NULL($5), <>($2, 0)), AND(<($3
       LogicalProject(MGR=[$3], i=[true])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCasePushIsAlwaysWorking">
-        <Resource name="sql">
-            <![CDATA[select empno from emp where case when sal > 1000 then empno else sal end = 1]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[=(CASE(>($5, 1000), $0, $5), 1)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testBitAndReuseDistinctAttrWithMixedOptionality">
+    <Resource name="sql">
+      <![CDATA[select sum(distinct deptno), count(distinct deptno), bit_and(deptno) from emp]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM(DISTINCT $0)], EXPR$1=[COUNT(DISTINCT $0)], EXPR$2=[BIT_AND($0)])
+  LogicalProject(DEPTNO=[$7])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[OR(AND(>($5, 1000), =($0, 1)), =($5, 1))])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($0)], EXPR$1=[COUNT($0)], EXPR$2=[BIT_AND($0)])
+  LogicalAggregate(group=[{0}])
+    LogicalProject(DEPTNO=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testBitOrReuseDistinctAttrWithMixedOptionality">
+    <Resource name="sql">
+      <![CDATA[select sum(distinct deptno), count(distinct deptno), bit_or(deptno) from emp]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM(DISTINCT $0)], EXPR$1=[COUNT(DISTINCT $0)], EXPR$2=[BIT_OR($0)])
+  LogicalProject(DEPTNO=[$7])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCastRemove">
-        <Resource name="sql">
-            <![CDATA[select
-case when cast(ename as double) < 5 then 0.0
-     else coalesce(cast(ename as double), 1.0)
-     end as t
- from (
-       select
-          case when ename > 'abc' then ename
-               else null
-               end as ename from emp
- )]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(T=[CASE(<(CAST(CASE(>($1, 'abc'), $1, null:VARCHAR(20))):DOUBLE, 5), 0.0:DOUBLE, CASE(IS NOT NULL(CAST(CASE(>($1, 'abc'), $1, null:VARCHAR(20))):DOUBLE), CAST(CAST(CASE(>($1, 'abc'), $1, null:VARCHAR(20))):DOUBLE):DOUBLE NOT NULL, 1.0:DOUBLE))])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($0)], EXPR$1=[COUNT($0)], EXPR$2=[BIT_OR($0)])
+  LogicalAggregate(group=[{0}])
+    LogicalProject(DEPTNO=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(T=[CASE(<(CAST(CASE(>($1, 'abc'), $1, null:VARCHAR(20))):DOUBLE, 5), 0.0:DOUBLE, CASE(IS NOT NULL(CAST(CASE(>($1, 'abc'), $1, null:VARCHAR(20))):DOUBLE), CAST(CAST(CASE(>($1, 'abc'), $1, null:VARCHAR(20))):DOUBLE):DOUBLE NOT NULL, 1.0:DOUBLE))])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCallOverCorrelationVariableIsNotFlattened">
+    <Resource name="sql">
+      <![CDATA[select * from emp e1 where exists (select * from emp e2 where (e1.deptno+30) = e2.deptno)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[IS NOT NULL($9)])
+    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalFilter(condition=[=(+($cor0.DEPTNO, 30), $7)])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testCanNotPushAntiJoinConditionsToLeft">
+    <Resource name="sql">
+      <![CDATA[select * from emp
+where emp.deptno not in
+(select dept.deptno from dept where emp.deptno > 20)]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalJoin(condition=[AND(IS NOT DISTINCT FROM($7, $8), >($0, 20))], joinType=[anti])
+    LogicalTableScan(table=[[scott, EMP]])
+    LogicalTableScan(table=[[scott, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testCanNotPushAntiJoinConditionsToRight">
+    <Resource name="sql">
+      <![CDATA[select * from emp
+where emp.deptno
+not in (select dept.deptno from dept where dept.dname = 'ddd')]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalJoin(condition=[AND(IS NOT DISTINCT FROM($7, $8), =($9, 'ddd'))], joinType=[anti])
+    LogicalTableScan(table=[[scott, EMP]])
+    LogicalTableScan(table=[[scott, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testCasePushIsAlwaysWorking">
+    <Resource name="sql">
+      <![CDATA[select empno from emp where case when sal > 1000 then empno else sal end = 1]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[=(CASE(>($5, 1000), $0, $5), 1)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[OR(AND(>($5, 1000), =($0, 1)), =($5, 1))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testCastInAggregateExpandDistinctAggregatesRule">
+    <Resource name="sql">
+      <![CDATA[select name, sum(distinct cn), sum(distinct sm)
+from (
+  select name, count(dept.deptno) as cn,sum(dept.deptno) as sm
+  from sales.dept group by name)
+group by name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM(DISTINCT $1)], EXPR$2=[SUM(DISTINCT $2)])
+  LogicalAggregate(group=[{0}], CN=[COUNT()], SM=[SUM($1)])
+    LogicalProject(NAME=[$1], DEPTNO=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$0], EXPR$1=[CAST($1):BIGINT NOT NULL], EXPR$2=[CAST($2):INTEGER NOT NULL])
+  LogicalAggregate(group=[{0}], EXPR$1=[SUM($1) FILTER $3], EXPR$2=[SUM($2) FILTER $4])
+    LogicalProject(NAME=[$0], CN=[$1], SM=[$2], $g_1=[=($3, 1)], $g_2=[=($3, 2)])
+      LogicalAggregate(group=[{0, 1, 2}], groups=[[{0, 1}, {0, 2}]], $g=[GROUPING($0, $1, $2)])
+        LogicalAggregate(group=[{0}], CN=[COUNT()], SM=[SUM($1)])
+          LogicalProject(NAME=[$1], DEPTNO=[$0])
+            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testCastInAggregateReduceFunctions">
+    <Resource name="sql">
+      <![CDATA[select name, stddev_pop(deptno), avg(deptno),
+stddev_samp(deptno),var_pop(deptno), var_samp(deptno)
+from sales.dept group by name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[STDDEV_POP($1)], EXPR$2=[AVG($1)], EXPR$3=[STDDEV_SAMP($1)], EXPR$4=[VAR_POP($1)], EXPR$5=[VAR_SAMP($1)])
+  LogicalProject(NAME=[$1], DEPTNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$0], EXPR$1=[CAST(POWER(/(-($1, /(*($2, $2), $3)), $3), 0.5:DECIMAL(2, 1))):INTEGER NOT NULL], EXPR$2=[CAST(/($2, $3)):INTEGER NOT NULL], EXPR$3=[CAST(POWER(/(-($1, /(*($2, $2), $3)), CASE(=($3, 1), null:BIGINT, -($3, 1))), 0.5:DECIMAL(2, 1))):INTEGER NOT NULL], EXPR$4=[CAST(/(-($1, /(*($2, $2), $3)), $3)):INTEGER NOT NULL], EXPR$5=[CAST(/(-($1, /(*($2, $2), $3)), CASE(=($3, 1), null:BIGINT, -($3, 1)))):INTEGER NOT NULL])
+  LogicalAggregate(group=[{0}], agg#0=[$SUM0($2)], agg#1=[$SUM0($1)], agg#2=[COUNT()])
+    LogicalProject(NAME=[$0], DEPTNO=[$1], $f2=[*($1, $1)])
+      LogicalProject(NAME=[$1], DEPTNO=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testCastRemove">
+    <Resource name="sql">
+      <![CDATA[select
+case when cast(ename as double) < 5 then 0.0
+     else coalesce(cast(ename as double), 1.0)
+     end as t
+ from (
+       select
+          case when ename > 'abc' then ename
+               else null
+               end as ename from emp
+ )]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(T=[CASE(<(CAST(CASE(>($1, 'abc'), $1, null:VARCHAR(20))):DOUBLE, 5), 0.0:DOUBLE, CASE(IS NOT NULL(CAST(CASE(>($1, 'abc'), $1, null:VARCHAR(20))):DOUBLE), CAST(CAST(CASE(>($1, 'abc'), $1, null:VARCHAR(20))):DOUBLE):DOUBLE NOT NULL, 1.0:DOUBLE))])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(T=[CASE(<(CAST(CASE(>($1, 'abc'), $1, null:VARCHAR(20))):DOUBLE, 5), 0.0:DOUBLE, CASE(IS NOT NULL(CAST(CASE(>($1, 'abc'), $1, null:VARCHAR(20))):DOUBLE), CAST(CAST(CASE(>($1, 'abc'), $1, null:VARCHAR(20))):DOUBLE):DOUBLE NOT NULL, 1.0:DOUBLE))])
   LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCorrelationScalarAggAndFilter">
-        <Resource name="sql">
-            <![CDATA[SELECT e1.empno
+    </Resource>
+  </TestCase>
+  <TestCase name="testConvertMultiJoinRule">
+    <Resource name="sql">
+      <![CDATA[select e1.ename from emp e1, dept d, emp e2
+where e1.deptno = d.deptno and d.deptno = e2.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
+  LogicalFilter(condition=[AND(=($7, $9), =($9, $18))])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalJoin(condition=[true], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
+  MultiJoin(joinFilter=[AND(=($9, $18), =($7, $9))], isFullOuterJoin=[false], joinTypes=[[INNER, INNER, INNER]], outerJoinConditions=[[NULL, NULL, NULL]], projFields=[[ALL, ALL, ALL]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testConvertMultiJoinRuleOuterJoins">
+    <Resource name="sql">
+      <![CDATA[select * from     (select * from         (select * from             (select * from A right outer join B on a = b)             left outer join             (select * from C full outer join D on c = d)            on a = c and b = d)         right outer join         (select * from             (select * from E full outer join F on e = f)             right outer join             (select * from G left outer join H on g = h)             on e = g and f = h)         on a = e and b = f and c = g and d = h)     inner join     (select * from I inner join J on i = j)     on a = i and h = j]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(A=[$0], B=[$1], C=[$2], D=[$3], E=[$4], F=[$5], G=[$6], H=[$7], I=[$8], J=[$9])
+  LogicalJoin(condition=[AND(=($0, $8), =($7, $9))], joinType=[inner])
+    LogicalProject(A=[$0], B=[$1], C=[$2], D=[$3], E=[$4], F=[$5], G=[$6], H=[$7])
+      LogicalJoin(condition=[AND(=($0, $4), =($1, $5), =($2, $6), =($3, $7))], joinType=[right])
+        LogicalProject(A=[$0], B=[$1], C=[$2], D=[$3])
+          LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[left])
+            LogicalProject(A=[$0], B=[$1])
+              LogicalJoin(condition=[=($0, $1)], joinType=[right])
+                LogicalTableScan(table=[[CATALOG, SALES, A]])
+                LogicalTableScan(table=[[CATALOG, SALES, B]])
+            LogicalProject(C=[$0], D=[$1])
+              LogicalJoin(condition=[=($0, $1)], joinType=[full])
+                LogicalTableScan(table=[[CATALOG, SALES, C]])
+                LogicalTableScan(table=[[CATALOG, SALES, D]])
+        LogicalProject(E=[$0], F=[$1], G=[$2], H=[$3])
+          LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[right])
+            LogicalProject(E=[$0], F=[$1])
+              LogicalJoin(condition=[=($0, $1)], joinType=[full])
+                LogicalTableScan(table=[[CATALOG, SALES, E]])
+                LogicalTableScan(table=[[CATALOG, SALES, F]])
+            LogicalProject(G=[$0], H=[$1])
+              LogicalJoin(condition=[=($0, $1)], joinType=[left])
+                LogicalTableScan(table=[[CATALOG, SALES, G]])
+                LogicalTableScan(table=[[CATALOG, SALES, H]])
+    LogicalProject(I=[$0], J=[$1])
+      LogicalJoin(condition=[=($0, $1)], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, I]])
+        LogicalTableScan(table=[[CATALOG, SALES, J]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+MultiJoin(joinFilter=[AND(=($0, $8), =($7, $9), =($8, $9))], isFullOuterJoin=[false], joinTypes=[[INNER, INNER, INNER]], outerJoinConditions=[[NULL, NULL, NULL]], projFields=[[ALL, ALL, ALL]])
+  MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[RIGHT, INNER]], outerJoinConditions=[[AND(=($0, $4), =($1, $5), =($2, $6), =($3, $7)), NULL]], projFields=[[ALL, ALL]])
+    MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[INNER, LEFT]], outerJoinConditions=[[NULL, AND(=($0, $2), =($1, $3))]], projFields=[[ALL, ALL]])
+      MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[RIGHT, INNER]], outerJoinConditions=[[=($0, $1), NULL]], projFields=[[ALL, ALL]])
+        LogicalTableScan(table=[[CATALOG, SALES, A]])
+        LogicalTableScan(table=[[CATALOG, SALES, B]])
+      MultiJoin(joinFilter=[=($0, $1)], isFullOuterJoin=[true], joinTypes=[[INNER, INNER]], outerJoinConditions=[[NULL, NULL]], projFields=[[ALL, ALL]])
+        LogicalTableScan(table=[[CATALOG, SALES, C]])
+        LogicalTableScan(table=[[CATALOG, SALES, D]])
+    MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[RIGHT, INNER]], outerJoinConditions=[[AND(=($0, $2), =($1, $3)), NULL]], projFields=[[ALL, ALL]])
+      MultiJoin(joinFilter=[=($0, $1)], isFullOuterJoin=[true], joinTypes=[[INNER, INNER]], outerJoinConditions=[[NULL, NULL]], projFields=[[ALL, ALL]])
+        LogicalTableScan(table=[[CATALOG, SALES, E]])
+        LogicalTableScan(table=[[CATALOG, SALES, F]])
+      MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[INNER, LEFT]], outerJoinConditions=[[NULL, =($0, $1)]], projFields=[[ALL, ALL]])
+        LogicalTableScan(table=[[CATALOG, SALES, G]])
+        LogicalTableScan(table=[[CATALOG, SALES, H]])
+  LogicalTableScan(table=[[CATALOG, SALES, I]])
+  LogicalTableScan(table=[[CATALOG, SALES, J]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testConvertMultiJoinRuleOuterJoins2">
+    <Resource name="sql">
+      <![CDATA[select * from A right join B on a = b join C on b = c]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(A=[$0], B=[$1], C=[$2])
+  LogicalJoin(condition=[=($1, $2)], joinType=[inner])
+    LogicalJoin(condition=[=($0, $1)], joinType=[right])
+      LogicalTableScan(table=[[CATALOG, SALES, A]])
+      LogicalTableScan(table=[[CATALOG, SALES, B]])
+    LogicalTableScan(table=[[CATALOG, SALES, C]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+MultiJoin(joinFilter=[=($1, $2)], isFullOuterJoin=[false], joinTypes=[[INNER, INNER]], outerJoinConditions=[[NULL, NULL]], projFields=[[ALL, ALL]])
+  MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[RIGHT, INNER]], outerJoinConditions=[[=($0, $1), NULL]], projFields=[[ALL, ALL]])
+    LogicalTableScan(table=[[CATALOG, SALES, A]])
+    LogicalTableScan(table=[[CATALOG, SALES, B]])
+  LogicalTableScan(table=[[CATALOG, SALES, C]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testConvertMultiJoinRuleOuterJoins3">
+    <Resource name="sql">
+      <![CDATA[select * from A join B on a = b left join C on b = c]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(A=[$0], B=[$1], C=[$2])
+  LogicalJoin(condition=[=($1, $2)], joinType=[left])
+    LogicalJoin(condition=[=($0, $1)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, A]])
+      LogicalTableScan(table=[[CATALOG, SALES, B]])
+    LogicalTableScan(table=[[CATALOG, SALES, C]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+MultiJoin(joinFilter=[=($0, $1)], isFullOuterJoin=[false], joinTypes=[[INNER, INNER, LEFT]], outerJoinConditions=[[NULL, NULL, =($1, $2)]], projFields=[[ALL, ALL, ALL]])
+  LogicalTableScan(table=[[CATALOG, SALES, A]])
+  LogicalTableScan(table=[[CATALOG, SALES, B]])
+  LogicalTableScan(table=[[CATALOG, SALES, C]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testConvertMultiJoinRuleOuterJoins4">
+    <Resource name="sql">
+      <![CDATA[select * from A join B on a = b right join C on b = c]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(A=[$0], B=[$1], C=[$2])
+  LogicalJoin(condition=[=($1, $2)], joinType=[right])
+    LogicalJoin(condition=[=($0, $1)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, A]])
+      LogicalTableScan(table=[[CATALOG, SALES, B]])
+    LogicalTableScan(table=[[CATALOG, SALES, C]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[RIGHT, INNER]], outerJoinConditions=[[=($1, $2), NULL]], projFields=[[ALL, ALL]])
+  MultiJoin(joinFilter=[=($0, $1)], isFullOuterJoin=[false], joinTypes=[[INNER, INNER]], outerJoinConditions=[[NULL, NULL]], projFields=[[ALL, ALL]])
+    LogicalTableScan(table=[[CATALOG, SALES, A]])
+    LogicalTableScan(table=[[CATALOG, SALES, B]])
+  LogicalTableScan(table=[[CATALOG, SALES, C]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testCorrelationScalarAggAndFilter">
+    <Resource name="sql">
+      <![CDATA[SELECT e1.empno
 FROM emp e1, dept d1 where e1.deptno = d1.deptno
 and e1.deptno < 10 and d1.deptno < 15
 and e1.sal > (select avg(sal) from emp e2 where e1.empno = e2.empno)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0])
   LogicalJoin(condition=[AND(=($0, $4), >($1, $5))], joinType=[inner])
     LogicalJoin(condition=[=($2, $3)], joinType=[inner])
@@ -762,11 +1563,105 @@ LogicalProject(EMPNO=[$0])
       LogicalProject(EMPNO=[$0], SAL=[$5])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCustomDecorrelate">
-        <Resource name="Comparing Plans from LogicalCorrelate and CustomCorrelate">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testCustomColumnResolvingInCorrelatedSubQuery">
+    <Resource name="sql">
+      <![CDATA[select *
+from struct.t t1
+where c0 = (
+  select max(f1.c0) from struct.t t2 where t1.k0 = t2.k0)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
+  LogicalFilter(condition=[=($4, $SCALAR_QUERY({
+LogicalAggregate(group=[{}], EXPR$0=[MAX($0)])
+  LogicalProject("F1"."C0"=[$5])
+    LogicalFilter(condition=[=($cor0."K0", $0)])
+      LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+}))], variablesSet=[[$cor0]])
+    LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
+  LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
+    LogicalFilter(condition=[=($4, $9)])
+      LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0}])
+        LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+        LogicalAggregate(group=[{}], EXPR$0=[MAX($0)])
+          LogicalProject("F1"."C0"=[$5])
+            LogicalFilter(condition=[=($cor0."K0", $0)])
+              LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testCustomColumnResolvingInCorrelatedSubQuery2">
+    <Resource name="sql">
+      <![CDATA[select *
+from struct.t t1
+where c0 in (
+  select f1.c0 from struct.t t2 where t1.c2 = t2.c2)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
+  LogicalFilter(condition=[IN($4, {
+LogicalProject(C0=[$5])
+  LogicalFilter(condition=[=($cor0."F1"."C2", $7)])
+    LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+})], variablesSet=[[$cor0]])
+    LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
+  LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
+    LogicalFilter(condition=[=($4, $9)])
+      LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{7}])
+        LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+        LogicalAggregate(group=[{0}])
+          LogicalProject(C0=[$5])
+            LogicalFilter(condition=[=($cor0."F1"."C2", $7)])
+              LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testCustomColumnResolvingInNonCorrelatedSubQuery">
+    <Resource name="sql">
+      <![CDATA[select *
+from struct.t t1
+where c0 in (
+  select f1.c0 from struct.t t2)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
+  LogicalFilter(condition=[IN($4, {
+LogicalProject(C0=[$5])
+  LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+})])
+    LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
+  LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
+    LogicalJoin(condition=[=($4, $9)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+      LogicalAggregate(group=[{0}])
+        LogicalProject(C0=[$5])
+          LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testCustomDecorrelate">
+    <Resource name="Comparing Plans from LogicalCorrelate and CustomCorrelate">
+      <![CDATA[
 LogicalProject(EMPNO=[$0])
   LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], EMPNO0=[CAST($11):INTEGER], EXPR$0=[CAST($12):INTEGER])
     LogicalJoin(condition=[AND(=($0, $11), >($5, $12))], joinType=[inner])
@@ -779,37 +1674,137 @@ LogicalProject(EMPNO=[$0])
         LogicalProject(EMPNO=[$0], SAL=[$5])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDecorrelateExists">
-        <Resource name="sql">
-            <![CDATA[select * from sales.emp
-where EXISTS (
-  select * from emp e where emp.deptno = e.deptno)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testDecorrelateAggWithConstantGroupKey">
+    <Resource name="sql">
+      <![CDATA[SELECT * FROM emp A where sal in
+(SELECT max(sal) FROM emp B where A.mgr = B.empno group by deptno, 'abc')]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[EXISTS({
-LogicalFilter(condition=[=($cor0.DEPTNO, $7)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})], variablesSet=[[$cor0]])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{3, 5}])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[=($cor0.SAL, $0)])
+      LogicalAggregate(group=[{0}])
+        LogicalProject(EXPR$0=[$2])
+          LogicalAggregate(group=[{0, 1}], EXPR$0=[MAX($2)])
+            LogicalProject(DEPTNO=[$7], $f1=['abc'], SAL=[$5])
+              LogicalFilter(condition=[=($cor0.MGR, $0)])
+                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{3, 5}])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], $f1=[true])
+    LogicalFilter(condition=[=($cor0.SAL, $0)])
       LogicalAggregate(group=[{0}])
-        LogicalProject(DEPTNO=[$7])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(EXPR$0=[$2])
+          LogicalAggregate(group=[{0, 1}], EXPR$0=[MAX($2)])
+            LogicalProject(DEPTNO=[$7], $f1=['abc'], SAL=[$5])
+              LogicalFilter(condition=[=($cor0.MGR, $0)])
+                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalJoin(condition=[AND(=($3, $10), =($5, $9))], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0, 1}])
+      LogicalProject(EXPR$0=[$2], EMPNO=[$1])
+        LogicalAggregate(group=[{0, 1}], EXPR$0=[MAX($2)])
+          LogicalProject(DEPTNO=[$7], EMPNO=[$0], SAL=[$5])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDecorrelateAggWithMultiParamsAggCall">
+    <Resource name="sql">
+      <![CDATA[SELECT * FROM (SELECT MYAGG(sal, 1) AS c FROM emp) as m,
+ LATERAL TABLE(ramp(m.c)) AS T(s)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(C=[$0], S=[$1])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
+    LogicalAggregate(group=[{}], C=[MYAGG($0, $1)])
+      LogicalProject(SAL=[$5], $f1=[1])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableFunctionScan(invocation=[RAMP($cor0.C)], rowType=[RecordType(INTEGER I)])
+]]>
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
+LogicalProject(C=[$0], S=[$1])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
+    LogicalAggregate(group=[{}], C=[MYAGG($0, $1)])
+      LogicalProject(SAL=[$5], $f1=[1])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableFunctionScan(invocation=[RAMP($cor0.C)], rowType=[RecordType(INTEGER I)])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDecorrelateAggWithMultiParamsAggCall2">
+    <Resource name="sql">
+      <![CDATA[SELECT * FROM (SELECT MYAGG(sal, 1) AS c FROM emp group by empno, 'abc') as m,
+ LATERAL TABLE(ramp(m.c)) AS T(s)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(C=[$0], S=[$1])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
+    LogicalProject(C=[$2])
+      LogicalAggregate(group=[{0, 1}], C=[MYAGG($2, $3)])
+        LogicalProject(EMPNO=[$0], $f1=['abc'], SAL=[$5], $f3=[1])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableFunctionScan(invocation=[RAMP($cor0.C)], rowType=[RecordType(INTEGER I)])
+]]>
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
+LogicalProject(C=[$0], S=[$1])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
+    LogicalProject(C=[$2])
+      LogicalAggregate(group=[{0, 1}], C=[MYAGG($2, $3)])
+        LogicalProject(EMPNO=[$0], $f1=['abc'], SAL=[$5], $f3=[1])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableFunctionScan(invocation=[RAMP($cor0.C)], rowType=[RecordType(INTEGER I)])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDecorrelateExists">
+    <Resource name="sql">
+      <![CDATA[select * from sales.emp
+where EXISTS (
+  select * from emp e where emp.deptno = e.deptno)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[EXISTS({
+LogicalFilter(condition=[=($cor0.DEPTNO, $7)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+})], variablesSet=[[$cor0]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$0], $f1=[true])
+      LogicalAggregate(group=[{0}])
+        LogicalProject(DEPTNO=[$7])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
   LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
     LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{7}])
@@ -819,18 +1814,18 @@ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$
           LogicalFilter(condition=[=($cor0.DEPTNO, $7)])
             LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDecorrelateTwoExists">
-        <Resource name="sql">
-            <![CDATA[select * from sales.emp
+    </Resource>
+  </TestCase>
+  <TestCase name="testDecorrelateTwoExists">
+    <Resource name="sql">
+      <![CDATA[select * from sales.emp
 where EXISTS (
   select * from emp e where emp.deptno = e.deptno)
 AND NOT EXISTS (
   select * from emp ee where ee.job = emp.job AND ee.sal=34)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
   LogicalFilter(condition=[AND(EXISTS({
 LogicalFilter(condition=[=($cor0.DEPTNO, $7)])
@@ -841,9 +1836,9 @@ LogicalFilter(condition=[AND(=($2, $cor0.JOB), =($5, 34))])
 })))], variablesSet=[[$cor0]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
   LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
     LogicalFilter(condition=[IS NULL($10)])
@@ -859,9 +1854,9 @@ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$
             LogicalFilter(condition=[AND(=($2, $cor0.JOB), =($5, 34))])
               LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
   LogicalFilter(condition=[IS NULL($12)])
     LogicalJoin(condition=[=($2, $11)], joinType=[left])
@@ -877,75 +1872,19 @@ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$
             LogicalFilter(condition=[=($5, 34)])
               LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDecorrelateUncorrelatedInAndCorrelatedExists">
-        <Resource name="sql">
-            <![CDATA[select * from sales.emp
-WHERE job in (
-  select job from emp ee where ee.sal=34)AND EXISTS (
-  select * from emp e where emp.deptno = e.deptno)
-]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[AND(IN($2, {
-LogicalProject(JOB=[$2])
-  LogicalFilter(condition=[=($5, 34)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}), EXISTS({
-LogicalFilter(condition=[=($cor0.DEPTNO, $7)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}))], variablesSet=[[$cor0]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{7}])
-      LogicalJoin(condition=[=($2, $9)], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{0}])
-          LogicalProject(JOB=[$2])
-            LogicalFilter(condition=[=($5, 34)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{0}])
-        LogicalProject(i=[true])
-          LogicalFilter(condition=[=($cor0.DEPTNO, $7)])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalJoin(condition=[=($7, $10)], joinType=[inner])
-    LogicalJoin(condition=[=($2, $9)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{0}])
-        LogicalProject(JOB=[$2])
-          LogicalFilter(condition=[=($5, 34)])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], $f1=[true])
-      LogicalAggregate(group=[{0}])
-        LogicalProject(DEPTNO=[$7])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDecorrelateTwoIn">
-        <Resource name="sql">
-            <![CDATA[select sal
+    </Resource>
+  </TestCase>
+  <TestCase name="testDecorrelateTwoIn">
+    <Resource name="sql">
+      <![CDATA[select sal
 from sales.emp
 where empno IN (
   select deptno from dept where emp.job = dept.name)
 AND empno IN (
   select empno from emp e where emp.ename = e.ename)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(SAL=[$5])
   LogicalFilter(condition=[AND(IN($0, {
 LogicalProject(DEPTNO=[$0])
@@ -958,9 +1897,9 @@ LogicalProject(EMPNO=[$0])
 }))], variablesSet=[[$cor0]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
 LogicalProject(SAL=[$5])
   LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
     LogicalFilter(condition=[=($0, $10)])
@@ -975,9 +1914,9 @@ LogicalProject(SAL=[$5])
           LogicalFilter(condition=[=($cor0.ENAME, $1)])
             LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(SAL=[$5])
   LogicalJoin(condition=[AND(=($1, $12), =($0, $11))], joinType=[inner])
     LogicalJoin(condition=[AND(=($2, $10), =($0, $9))], joinType=[inner])
@@ -987,18 +1926,18 @@ LogicalProject(SAL=[$5])
     LogicalProject(EMPNO=[$0], ENAME=[$1])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDecorrelateTwoScalar">
-        <Resource name="sql">
-            <![CDATA[select deptno,
+    </Resource>
+  </TestCase>
+  <TestCase name="testDecorrelateTwoScalar">
+    <Resource name="sql">
+      <![CDATA[select deptno,
   (select min(1) from emp where empno > d.deptno) as i0,
   (select min(0) from emp
     where deptno = d.deptno and ename = 'SMITH') as i1
 from dept as d]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(DEPTNO=[$0], I0=[$SCALAR_QUERY({
 LogicalAggregate(group=[{}], EXPR$0=[MIN($0)])
   LogicalProject($f0=[1])
@@ -1012,9 +1951,9 @@ LogicalAggregate(group=[{}], EXPR$0=[MIN($0)])
 })])
   LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
 LogicalProject(DEPTNO=[$0], I0=[$2], I1=[$3])
   LogicalJoin(condition=[true], joinType=[left])
     LogicalJoin(condition=[true], joinType=[left])
@@ -1028,22 +1967,193 @@ LogicalProject(DEPTNO=[$0], I0=[$2], I1=[$3])
         LogicalFilter(condition=[AND(=($7, $cor1.DEPTNO), =($1, 'SMITH'))])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctCount3">
-        <Resource name="sql">
-            <![CDATA[select count(distinct deptno), sum(sal) from sales.emp group by deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testDecorrelateUncorrelatedInAndCorrelatedExists">
+    <Resource name="sql">
+      <![CDATA[select * from sales.emp
+WHERE job in (
+  select job from emp ee where ee.sal=34)AND EXISTS (
+  select * from emp e where emp.deptno = e.deptno)
+]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[AND(IN($2, {
+LogicalProject(JOB=[$2])
+  LogicalFilter(condition=[=($5, 34)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}), EXISTS({
+LogicalFilter(condition=[=($cor0.DEPTNO, $7)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}))], variablesSet=[[$cor0]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{7}])
+      LogicalJoin(condition=[=($2, $9)], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalAggregate(group=[{0}])
+          LogicalProject(JOB=[$2])
+            LogicalFilter(condition=[=($5, 34)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{0}])
+        LogicalProject(i=[true])
+          LogicalFilter(condition=[=($cor0.DEPTNO, $7)])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalJoin(condition=[=($7, $10)], joinType=[inner])
+    LogicalJoin(condition=[=($2, $9)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{0}])
+        LogicalProject(JOB=[$2])
+          LogicalFilter(condition=[=($5, 34)])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$0], $f1=[true])
+      LogicalAggregate(group=[{0}])
+        LogicalProject(DEPTNO=[$7])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDecorrelationWithSort">
+    <Resource name="sql">
+      <![CDATA[SELECT e1.empno
+FROM emp e1, dept d1 where e1.deptno = d1.deptno
+and e1.deptno < 10 and d1.deptno < 15
+and e1.sal > (select avg(sal) from emp e2 where e1.empno = e2.empno)
+order by e1.empno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[ASC])
+  LogicalProject(EMPNO=[$0])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], EMPNO0=[CAST($11):INTEGER], EXPR$0=[CAST($12):INTEGER])
+      LogicalJoin(condition=[AND(=($0, $11), >($5, $12))], joinType=[inner])
+        LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+          LogicalFilter(condition=[<($7, 10)])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+          LogicalFilter(condition=[<($0, 15)])
+            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalAggregate(group=[{0}], EXPR$0=[AVG($1)])
+          LogicalProject(EMPNO=[$0], SAL=[$5])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[ASC])
+  LogicalProject(EMPNO=[$0])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], EMPNO0=[CAST($11):INTEGER], EXPR$0=[CAST($12):INTEGER])
+      LogicalJoin(condition=[AND(=($0, $11), >($5, $12))], joinType=[inner])
+        LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+          LogicalFilter(condition=[<($7, 10)])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+          LogicalFilter(condition=[<($0, 15)])
+            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalAggregate(group=[{0}], EXPR$0=[AVG($1)])
+          LogicalProject(EMPNO=[$0], SAL=[$5])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDigestOfApproximateDistinctAggregateCall">
+    <Resource name="sql">
+      <![CDATA[select *
+from (
+select deptno, count(distinct empno) from emp group by deptno
+union all
+select deptno, approx_count_distinct(empno) from emp group by deptno)]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EXPR$1=[$1])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{7}], EXPR$1=[COUNT(DISTINCT $0)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{7}], EXPR$1=[COUNT(APPROXIMATE DISTINCT $0)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EXPR$1=[$1])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
+      LogicalProject(DEPTNO=[$7], EMPNO=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}], EXPR$1=[COUNT(APPROXIMATE DISTINCT $1)])
+      LogicalProject(DEPTNO=[$7], EMPNO=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctCount1">
+    <Resource name="sql">
+      <![CDATA[select deptno, count(distinct ename)
+from sales.emp group by deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
+  LogicalProject(DEPTNO=[$7], ENAME=[$1])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{1}], EXPR$1=[COUNT($0)])
+  LogicalAggregate(group=[{1, 7}])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctCount2">
+    <Resource name="sql">
+      <![CDATA[select deptno, count(distinct ename), sum(sal)
+from sales.emp group by deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)], EXPR$2=[SUM($2)])
+  LogicalProject(DEPTNO=[$7], ENAME=[$1], SAL=[$5])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EXPR$1=[$1], EXPR$2=[CAST($2):INTEGER NOT NULL])
+  LogicalAggregate(group=[{0}], EXPR$1=[COUNT($1) FILTER $3], EXPR$2=[MIN($2) FILTER $4])
+    LogicalProject(DEPTNO=[$0], ENAME=[$1], EXPR$2=[$2], $g_0=[=($3, 0)], $g_1=[=($3, 1)])
+      LogicalProject(DEPTNO=[$1], ENAME=[$0], EXPR$2=[$2], $g=[$3])
+        LogicalAggregate(group=[{1, 7}], groups=[[{1, 7}, {7}]], EXPR$2=[SUM($5)], $g=[GROUPING($7, $1)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctCount3">
+    <Resource name="sql">
+      <![CDATA[select count(distinct deptno), sum(sal) from sales.emp group by deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EXPR$0=[$1], EXPR$1=[$2])
   LogicalAggregate(group=[{0}], EXPR$0=[COUNT(DISTINCT $0)], EXPR$1=[SUM($1)])
     LogicalProject(DEPTNO=[$7], SAL=[$5])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EXPR$0=[$1], EXPR$1=[$2])
   LogicalProject(DEPTNO=[$0], EXPR$0=[$1], EXPR$1=[CAST($2):INTEGER NOT NULL])
     LogicalAggregate(group=[{0}], EXPR$0=[COUNT($0) FILTER $2], EXPR$1=[MIN($1) FILTER $2])
@@ -1052,254 +2162,366 @@ LogicalProject(EXPR$0=[$1], EXPR$1=[$2])
           LogicalProject(DEPTNO=[$7], SAL=[$5])
             LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctNonDistinctAggregatesWithGrouping1">
-        <Resource name="sql">
-            <![CDATA[SELECT deptno,
-  SUM(deptno), SUM(DISTINCT sal), MAX(deptno), MAX(comm)
-FROM emp
-GROUP BY deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($0)], EXPR$2=[SUM(DISTINCT $1)], EXPR$3=[MAX($0)], EXPR$4=[MAX($2)])
-  LogicalProject(DEPTNO=[$7], SAL=[$5], COMM=[$6])
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctCountGroupingSets1">
+    <Resource name="sql">
+      <![CDATA[select deptno, job, count(distinct ename)
+from sales.emp group by rollup(deptno,job)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[COUNT(DISTINCT $2)])
+  LogicalProject(DEPTNO=[$7], JOB=[$2], ENAME=[$1])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($2)], EXPR$2=[SUM($1)], EXPR$3=[MAX($3)], EXPR$4=[MAX($4)])
-  LogicalAggregate(group=[{0, 1}], EXPR$1=[SUM($0)], EXPR$3=[MAX($0)], EXPR$4=[MAX($2)])
-    LogicalProject(DEPTNO=[$7], SAL=[$5], COMM=[$6])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[COUNT($2) FILTER $3])
+  LogicalProject(DEPTNO=[$0], JOB=[$1], ENAME=[$2], $g_0=[=($3, 0)])
+    LogicalAggregate(group=[{0, 1, 2}], $g=[GROUPING($0, $1, $2)])
+      LogicalProject(DEPTNO=[$7], JOB=[$2], ENAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctNonDistinctAggregatesWithGrouping2">
-        <Resource name="sql">
-            <![CDATA[SELECT deptno, COUNT(deptno), SUM(DISTINCT sal)
-FROM emp
-GROUP BY deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT()], EXPR$2=[SUM(DISTINCT $1)])
-  LogicalProject(DEPTNO=[$7], SAL=[$5])
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctCountGroupingSets2">
+    <Resource name="sql">
+      <![CDATA[select deptno, job, count(distinct ename), sum(sal)
+from sales.emp group by rollup(deptno,job)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[COUNT(DISTINCT $2)], EXPR$3=[SUM($3)])
+  LogicalProject(DEPTNO=[$7], JOB=[$2], ENAME=[$1], SAL=[$5])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[$SUM0($2)], EXPR$2=[SUM($1)])
-  LogicalAggregate(group=[{0, 1}], EXPR$1=[COUNT()])
-    LogicalProject(DEPTNO=[$7], SAL=[$5])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], JOB=[$1], EXPR$2=[$2], EXPR$3=[CAST($3):INTEGER NOT NULL])
+  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[COUNT($2) FILTER $4], EXPR$3=[MIN($3) FILTER $5])
+    LogicalProject(DEPTNO=[$0], JOB=[$1], ENAME=[$2], EXPR$3=[$3], $g_0=[=($4, 0)], $g_1=[=($4, 1)])
+      LogicalAggregate(group=[{0, 1, 2}], groups=[[{0, 1, 2}, {0, 1}]], EXPR$3=[SUM($3)], $g=[GROUPING($0, $1, $2)])
+        LogicalProject(DEPTNO=[$7], JOB=[$2], ENAME=[$1], SAL=[$5])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctNonDistinctTwoAggregatesWithGrouping">
-        <Resource name="sql">
-            <![CDATA[SELECT deptno, SUM(comm), MIN(comm), SUM(DISTINCT sal)
-FROM emp
-GROUP BY deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[MIN($1)], EXPR$3=[SUM(DISTINCT $2)])
-  LogicalProject(DEPTNO=[$7], COMM=[$6], SAL=[$5])
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctCountMixed">
+    <Resource name="sql">
+      <![CDATA[select deptno, count(distinct deptno, job) as cddj,
+  sum(sal) as s
+from sales.emp group by deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], CDDJ=[COUNT(DISTINCT $0, $1)], S=[SUM($2)])
+  LogicalProject(DEPTNO=[$7], JOB=[$2], SAL=[$5])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($2)], EXPR$2=[MIN($3)], EXPR$3=[SUM($1)])
-  LogicalAggregate(group=[{0, 2}], EXPR$1=[SUM($1)], EXPR$2=[MIN($1)])
-    LogicalProject(DEPTNO=[$7], COMM=[$6], SAL=[$5])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], CDDJ=[$1], S=[CAST($2):INTEGER NOT NULL])
+  LogicalAggregate(group=[{0}], CDDJ=[COUNT($0, $1) FILTER $3], S=[MIN($2) FILTER $4])
+    LogicalProject(DEPTNO=[$0], JOB=[$1], S=[$2], $g_0=[=($3, 0)], $g_1=[=($3, 1)])
+      LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}]], S=[SUM($2)], $g=[GROUPING($0, $1)])
+        LogicalProject(DEPTNO=[$7], JOB=[$2], SAL=[$5])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctWithGrouping">
-        <Resource name="sql">
-            <![CDATA[SELECT sal, SUM(comm), MIN(comm), SUM(DISTINCT sal)
-FROM emp
-GROUP BY sal]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[MIN($1)], EXPR$3=[SUM(DISTINCT $0)])
-  LogicalProject(SAL=[$5], COMM=[$6])
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctCountMixed2">
+    <Resource name="sql">
+      <![CDATA[select deptno, count(distinct ename) as cde,
+count(distinct job, ename) as cdje,
+count(distinct deptno, job) as cddj,
+sum(sal) as s
+from sales.emp group by deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], CDE=[COUNT(DISTINCT $1)], CDJE=[COUNT(DISTINCT $2, $1)], CDDJ=[COUNT(DISTINCT $0, $2)], S=[SUM($3)])
+  LogicalProject(DEPTNO=[$7], ENAME=[$1], JOB=[$2], SAL=[$5])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[MIN($2)], EXPR$3=[SUM($0)])
-  LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[MIN($1)])
-    LogicalProject(SAL=[$5], COMM=[$6])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], CDE=[$1], CDJE=[$2], CDDJ=[$3], S=[CAST($4):INTEGER NOT NULL])
+  LogicalAggregate(group=[{0}], CDE=[COUNT($1) FILTER $5], CDJE=[COUNT($2, $1) FILTER $4], CDDJ=[COUNT($0, $2) FILTER $6], S=[MIN($3) FILTER $7])
+    LogicalProject(DEPTNO=[$2], ENAME=[$0], JOB=[$1], S=[$3], $g_0=[=($4, 0)], $g_1=[=($4, 1)], $g_2=[=($4, 2)], $g_3=[=($4, 3)])
+      LogicalAggregate(group=[{1, 2, 7}], groups=[[{1, 2, 7}, {1, 7}, {2, 7}, {7}]], S=[SUM($5)], $g=[GROUPING($7, $1, $2)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testRemoveDistinctOnAgg">
-        <Resource name="sql">
-            <![CDATA[SELECT empno, SUM(distinct sal), MIN(sal), MIN(distinct sal), MAX(distinct sal), bit_and(distinct sal), bit_or(sal), count(distinct sal) from sales.emp group by empno, deptno
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctCountMixedJoin">
+    <Resource name="sql">
+      <![CDATA[select deptno, count(distinct ename), count(distinct job, ename),
+count(distinct deptno, job), sum(sal)
+from sales.emp group by deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)], EXPR$2=[COUNT(DISTINCT $2, $1)], EXPR$3=[COUNT(DISTINCT $0, $2)], EXPR$4=[SUM($3)])
+  LogicalProject(DEPTNO=[$7], ENAME=[$1], JOB=[$2], SAL=[$5])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], EXPR$1=[$2], EXPR$2=[$3], EXPR$3=[$3], EXPR$4=[$4], EXPR$5=[$5], EXPR$6=[$6], EXPR$7=[$7])
-  LogicalAggregate(group=[{0, 1}], EXPR$1=[SUM(DISTINCT $2)], EXPR$2=[MIN($2)], EXPR$4=[MAX($2)], EXPR$5=[BIT_AND($2)], EXPR$6=[BIT_OR($2)], EXPR$7=[COUNT(DISTINCT $2)])
-    LogicalProject(EMPNO=[$0], DEPTNO=[$7], SAL=[$5])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EXPR$1=[$3], EXPR$2=[$5], EXPR$3=[$7], EXPR$4=[$1])
+  LogicalJoin(condition=[IS NOT DISTINCT FROM($0, $6)], joinType=[inner])
+    LogicalJoin(condition=[IS NOT DISTINCT FROM($0, $4)], joinType=[inner])
+      LogicalJoin(condition=[IS NOT DISTINCT FROM($0, $2)], joinType=[inner])
+        LogicalAggregate(group=[{7}], EXPR$4=[SUM($5)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalAggregate(group=[{1}], EXPR$1=[COUNT($0)])
+          LogicalAggregate(group=[{1, 7}])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{2}], EXPR$2=[COUNT($1, $0)])
+        LogicalAggregate(group=[{1, 2, 7}])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{1}], EXPR$3=[COUNT($1, $0)])
+      LogicalAggregate(group=[{2, 7}])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], EXPR$1=[$5], EXPR$2=[$5], EXPR$3=[$5], EXPR$4=[$5], EXPR$5=[$5], EXPR$6=[$5], EXPR$7=[1:BIGINT])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctCountMultiple">
+    <Resource name="sql">
+      <![CDATA[select deptno, count(distinct ename),
+  count(distinct job)
+from sales.emp group by deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)], EXPR$2=[COUNT(DISTINCT $2)])
+  LogicalProject(DEPTNO=[$7], ENAME=[$1], JOB=[$2])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMultipleDistinctWithGrouping">
-        <Resource name="sql">
-            <![CDATA[SELECT sal, SUM(comm), AVG(DISTINCT comm), SUM(DISTINCT sal)
-FROM emp
-GROUP BY sal]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[AVG(DISTINCT $1)], EXPR$3=[SUM(DISTINCT $0)])
-  LogicalProject(SAL=[$5], COMM=[$6])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT($1) FILTER $3], EXPR$2=[COUNT($2) FILTER $4])
+  LogicalProject(DEPTNO=[$0], ENAME=[$1], JOB=[$2], $g_1=[=($3, 1)], $g_2=[=($3, 2)])
+    LogicalProject(DEPTNO=[$2], ENAME=[$0], JOB=[$1], $g=[$3])
+      LogicalAggregate(group=[{1, 2, 7}], groups=[[{1, 7}, {2, 7}]], $g=[GROUPING($7, $1, $2)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctCountMultipleNoGroup">
+    <Resource name="sql">
+      <![CDATA[select count(distinct ename), count(distinct job)
+from sales.emp]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[COUNT(DISTINCT $0)], EXPR$1=[COUNT(DISTINCT $1)])
+  LogicalProject(ENAME=[$1], JOB=[$2])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(SAL=[$0], EXPR$1=[$1], EXPR$2=[$3], EXPR$3=[$5])
-  LogicalJoin(condition=[IS NOT DISTINCT FROM($0, $4)], joinType=[inner])
-    LogicalJoin(condition=[IS NOT DISTINCT FROM($0, $2)], joinType=[inner])
-      LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
-        LogicalProject(SAL=[$5], COMM=[$6])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[COUNT($0) FILTER $2], EXPR$1=[COUNT($1) FILTER $3])
+  LogicalProject(ENAME=[$0], JOB=[$1], $g_1=[=($2, 1)], $g_2=[=($2, 2)])
+    LogicalAggregate(group=[{1, 2}], groups=[[{1}, {2}]], $g=[GROUPING($1, $2)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctCountMultipleViaJoin">
+    <Resource name="sql">
+      <![CDATA[select deptno, count(distinct ename),
+  count(distinct job, ename),
+  count(distinct deptno, job), sum(sal)
+from sales.emp group by deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)], EXPR$2=[COUNT(DISTINCT $2, $1)], EXPR$3=[COUNT(DISTINCT $0, $2)], EXPR$4=[SUM($3)])
+  LogicalProject(DEPTNO=[$7], ENAME=[$1], JOB=[$2], SAL=[$5])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EXPR$1=[$3], EXPR$2=[$5], EXPR$3=[$7], EXPR$4=[$1])
+  LogicalJoin(condition=[IS NOT DISTINCT FROM($0, $6)], joinType=[inner])
+    LogicalJoin(condition=[IS NOT DISTINCT FROM($0, $4)], joinType=[inner])
+      LogicalJoin(condition=[IS NOT DISTINCT FROM($0, $2)], joinType=[inner])
+        LogicalAggregate(group=[{7}], EXPR$4=[SUM($5)])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{0}], EXPR$2=[AVG($1)])
-        LogicalAggregate(group=[{0, 1}])
-          LogicalProject(SAL=[$5], COMM=[$6])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}], EXPR$3=[SUM($0)])
-      LogicalAggregate(group=[{0}])
-        LogicalProject(SAL=[$0])
-          LogicalProject(SAL=[$5], COMM=[$6])
+        LogicalAggregate(group=[{1}], EXPR$1=[COUNT($0)])
+          LogicalAggregate(group=[{1, 7}])
             LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{2}], EXPR$2=[COUNT($1, $0)])
+        LogicalAggregate(group=[{1, 2, 7}])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{1}], EXPR$3=[COUNT($1, $0)])
+      LogicalAggregate(group=[{2, 7}])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctCountWithoutGroupBy">
+    <Resource name="sql">
+      <![CDATA[select max(deptno), count(distinct ename)
+from sales.emp]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[MAX($0)], EXPR$1=[COUNT(DISTINCT $1)])
+  LogicalProject(DEPTNO=[$7], ENAME=[$1])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[MIN($1) FILTER $3], EXPR$1=[COUNT($0) FILTER $2])
+  LogicalProject(ENAME=[$0], EXPR$0=[$1], $g_0=[=($2, 0)], $g_1=[=($2, 1)])
+    LogicalAggregate(group=[{1}], groups=[[{1}, {}]], EXPR$0=[MAX($7)], $g=[GROUPING($1)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctNonDistinctAggregates">
+    <Resource name="sql">
+      <![CDATA[select emp.empno, count(*), avg(distinct dept.deptno)
+from sales.emp emp inner join sales.dept dept
+on emp.deptno = dept.deptno
+group by emp.empno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT()], EXPR$2=[AVG(DISTINCT $1)])
+  LogicalProject(EMPNO=[$0], DEPTNO0=[$9])
+    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[$SUM0($2)], EXPR$2=[AVG($1)])
+  LogicalAggregate(group=[{0, 1}], EXPR$1=[COUNT()])
+    LogicalProject(EMPNO=[$0], DEPTNO0=[$9])
+      LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctWithMultipleInputs">
-        <Resource name="sql">
-            <![CDATA[SELECT deptno, SUM(comm), MIN(comm), COUNT(DISTINCT sal, comm)
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctNonDistinctAggregatesWithGrouping1">
+    <Resource name="sql">
+      <![CDATA[SELECT deptno,
+  SUM(deptno), SUM(DISTINCT sal), MAX(deptno), MAX(comm)
 FROM emp
 GROUP BY deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[MIN($1)], EXPR$3=[COUNT(DISTINCT $2, $1)])
-  LogicalProject(DEPTNO=[$7], COMM=[$6], SAL=[$5])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($0)], EXPR$2=[SUM(DISTINCT $1)], EXPR$3=[MAX($0)], EXPR$4=[MAX($2)])
+  LogicalProject(DEPTNO=[$7], SAL=[$5], COMM=[$6])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($3)], EXPR$2=[MIN($4)], EXPR$3=[COUNT($2, $1)])
-  LogicalAggregate(group=[{0, 1, 2}], EXPR$1=[SUM($1)], EXPR$2=[MIN($1)])
-    LogicalProject(DEPTNO=[$7], COMM=[$6], SAL=[$5])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($2)], EXPR$2=[SUM($1)], EXPR$3=[MAX($3)], EXPR$4=[MAX($4)])
+  LogicalAggregate(group=[{0, 1}], EXPR$1=[SUM($0)], EXPR$3=[MAX($0)], EXPR$4=[MAX($2)])
+    LogicalProject(DEPTNO=[$7], SAL=[$5], COMM=[$6])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctWithMultipleInputsAndGroupby">
-        <Resource name="sql">
-            <![CDATA[SELECT deptno, SUM(comm), MIN(comm), COUNT(DISTINCT sal, deptno, comm)
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctNonDistinctAggregatesWithGrouping2">
+    <Resource name="sql">
+      <![CDATA[SELECT deptno, COUNT(deptno), SUM(DISTINCT sal)
 FROM emp
 GROUP BY deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[MIN($1)], EXPR$3=[COUNT(DISTINCT $2, $0, $1)])
-  LogicalProject(DEPTNO=[$7], COMM=[$6], SAL=[$5])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT()], EXPR$2=[SUM(DISTINCT $1)])
+  LogicalProject(DEPTNO=[$7], SAL=[$5])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($3)], EXPR$2=[MIN($4)], EXPR$3=[COUNT($2, $0, $1)])
-  LogicalAggregate(group=[{0, 1, 2}], EXPR$1=[SUM($1)], EXPR$2=[MIN($1)])
-    LogicalProject(DEPTNO=[$7], COMM=[$6], SAL=[$5])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[$SUM0($2)], EXPR$2=[SUM($1)])
+  LogicalAggregate(group=[{0, 1}], EXPR$1=[COUNT()])
+    LogicalProject(DEPTNO=[$7], SAL=[$5])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctWithFilterWithoutGroupBy">
-        <Resource name="sql">
-            <![CDATA[SELECT SUM(comm), COUNT(DISTINCT sal) FILTER (WHERE sal > 1000)
-FROM emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)], EXPR$1=[COUNT(DISTINCT $1) FILTER $2])
-  LogicalProject(COMM=[$6], SAL=[$5], $f2=[>($5, 1000)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctNonDistinctTwoAggregatesWithGrouping">
+    <Resource name="sql">
+      <![CDATA[SELECT deptno, SUM(comm), MIN(comm), SUM(DISTINCT sal)
+FROM emp
+GROUP BY deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[MIN($1)], EXPR$3=[SUM(DISTINCT $2)])
+  LogicalProject(DEPTNO=[$7], COMM=[$6], SAL=[$5])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[MIN($1) FILTER $3], EXPR$1=[COUNT($0) FILTER $2])
-  LogicalProject(SAL=[$0], EXPR$0=[$2], $g_0_f_1=[AND(=($3, 0), IS TRUE($1))], $g_3=[=($3, 3)])
-    LogicalAggregate(group=[{1, 2}], groups=[[{1, 2}, {}]], EXPR$0=[SUM($0)], $g=[GROUPING($1, $2)])
-      LogicalProject(COMM=[$6], SAL=[$5], $f2=[>($5, 1000)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($2)], EXPR$2=[MIN($3)], EXPR$3=[SUM($1)])
+  LogicalAggregate(group=[{0, 2}], EXPR$1=[SUM($1)], EXPR$2=[MIN($1)])
+    LogicalProject(DEPTNO=[$7], COMM=[$6], SAL=[$5])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctWithDiffFiltersAndSameGroupSet">
-        <Resource name="sql">
-            <![CDATA[SELECT COUNT(DISTINCT c) FILTER (WHERE d),
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctWithDiffFiltersAndSameGroupSet">
+    <Resource name="sql">
+      <![CDATA[SELECT COUNT(DISTINCT c) FILTER (WHERE d),
 COUNT(DISTINCT d) FILTER (WHERE c)
 FROM (select sal > 1000 is true as c, sal < 500 is true as d, comm from emp)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalAggregate(group=[{}], EXPR$0=[COUNT(DISTINCT $0) FILTER $1], EXPR$1=[COUNT(DISTINCT $1) FILTER $0])
   LogicalProject(C=[>($5, 1000)], D=[<($5, 500)])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalAggregate(group=[{}], EXPR$0=[COUNT($0) FILTER $3], EXPR$1=[COUNT($1) FILTER $2])
   LogicalProject(C=[$0], D=[$1], $g_0_f_0=[AND(=($2, 0), $0)], $g_0_f_1=[AND(=($2, 0), $1)])
     LogicalAggregate(group=[{0, 1}], $g=[GROUPING($0, $1)])
       LogicalProject(C=[>($5, 1000)], D=[<($5, 500)])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctWithFilterAndGroupBy">
-        <Resource name="sql">
-            <![CDATA[SELECT deptno, SUM(comm), COUNT(DISTINCT sal) FILTER (WHERE sal > 1000)
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctWithFilterAndGroupBy">
+    <Resource name="sql">
+      <![CDATA[SELECT deptno, SUM(comm), COUNT(DISTINCT sal) FILTER (WHERE sal > 1000)
 FROM emp
 GROUP BY deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[COUNT(DISTINCT $2) FILTER $3])
   LogicalProject(DEPTNO=[$7], COMM=[$6], SAL=[$5], $f3=[>($5, 1000)])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(DEPTNO=[$0], EXPR$1=[CAST($1):INTEGER NOT NULL], EXPR$2=[$2])
   LogicalAggregate(group=[{0}], EXPR$1=[MIN($2) FILTER $4], EXPR$2=[COUNT($1) FILTER $3])
     LogicalProject(DEPTNO=[$0], SAL=[$1], EXPR$1=[$3], $g_0_f_2=[AND(=($4, 0), IS TRUE($2))], $g_3=[=($4, 3)])
@@ -1307,68 +2529,206 @@ LogicalProject(DEPTNO=[$0], EXPR$1=[CAST($1):INTEGER NOT NULL], EXPR$2=[$2])
         LogicalProject(DEPTNO=[$7], COMM=[$6], SAL=[$5], $f3=[>($5, 1000)])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testEmptyAggregate">
-        <Resource name="sql">
-            <![CDATA[select sum(empno) from emp where false group by deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctWithFilterWithoutGroupBy">
+    <Resource name="sql">
+      <![CDATA[SELECT SUM(comm), COUNT(DISTINCT sal) FILTER (WHERE sal > 1000)
+FROM emp]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($0)], EXPR$1=[COUNT(DISTINCT $1) FILTER $2])
+  LogicalProject(COMM=[$6], SAL=[$5], $f2=[>($5, 1000)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[MIN($1) FILTER $3], EXPR$1=[COUNT($0) FILTER $2])
+  LogicalProject(SAL=[$0], EXPR$0=[$2], $g_0_f_1=[AND(=($3, 0), IS TRUE($1))], $g_3=[=($3, 3)])
+    LogicalAggregate(group=[{1, 2}], groups=[[{1, 2}, {}]], EXPR$0=[SUM($0)], $g=[GROUPING($1, $2)])
+      LogicalProject(COMM=[$6], SAL=[$5], $f2=[>($5, 1000)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctWithGrouping">
+    <Resource name="sql">
+      <![CDATA[SELECT sal, SUM(comm), MIN(comm), SUM(DISTINCT sal)
+FROM emp
+GROUP BY sal]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[MIN($1)], EXPR$3=[SUM(DISTINCT $0)])
+  LogicalProject(SAL=[$5], COMM=[$6])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[MIN($2)], EXPR$3=[SUM($0)])
+  LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[MIN($1)])
+    LogicalProject(SAL=[$5], COMM=[$6])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctWithMultipleInputs">
+    <Resource name="sql">
+      <![CDATA[SELECT deptno, SUM(comm), MIN(comm), COUNT(DISTINCT sal, comm)
+FROM emp
+GROUP BY deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[MIN($1)], EXPR$3=[COUNT(DISTINCT $2, $1)])
+  LogicalProject(DEPTNO=[$7], COMM=[$6], SAL=[$5])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($3)], EXPR$2=[MIN($4)], EXPR$3=[COUNT($2, $1)])
+  LogicalAggregate(group=[{0, 1, 2}], EXPR$1=[SUM($1)], EXPR$2=[MIN($1)])
+    LogicalProject(DEPTNO=[$7], COMM=[$6], SAL=[$5])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDistinctWithMultipleInputsAndGroupby">
+    <Resource name="sql">
+      <![CDATA[SELECT deptno, SUM(comm), MIN(comm), COUNT(DISTINCT sal, deptno, comm)
+FROM emp
+GROUP BY deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[MIN($1)], EXPR$3=[COUNT(DISTINCT $2, $0, $1)])
+  LogicalProject(DEPTNO=[$7], COMM=[$6], SAL=[$5])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($3)], EXPR$2=[MIN($4)], EXPR$3=[COUNT($2, $0, $1)])
+  LogicalAggregate(group=[{0, 1, 2}], EXPR$1=[SUM($1)], EXPR$2=[MIN($1)])
+    LogicalProject(DEPTNO=[$7], COMM=[$6], SAL=[$5])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDynamicStarWithUnion">
+    <Resource name="sql">
+      <![CDATA[(select n_nationkey from SALES.CUSTOMER) union all (select n_name from CUSTOMER_MODIFIABLEVIEW)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalProject(N_NATIONKEY=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+  LogicalProject(N_NAME=[$1])
+    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+EnumerableUnion(all=[true])
+  EnumerableProject(N_NATIONKEY=[$0])
+    EnumerableTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+  EnumerableProject(N_NAME=[$1])
+    EnumerableTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testEmptyAggregate">
+    <Resource name="sql">
+      <![CDATA[select sum(empno) from emp where false group by deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EXPR$0=[$1])
   LogicalAggregate(group=[{0}], EXPR$0=[SUM($1)])
     LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testEmptyAggregateEmptyKey">
-        <Resource name="sql">
-            <![CDATA[select sum(empno) from emp where false]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testEmptyAggregateEmptyKey">
+    <Resource name="sql">
+      <![CDATA[select sum(empno) from emp where false]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
   LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
   LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testEmptyAggregateEmptyKeyWithAggregateValuesRule">
-        <Resource name="sql">
-            <![CDATA[select count(*), sum(empno) from emp where false]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testEmptyAggregateEmptyKeyWithAggregateValuesRule">
+    <Resource name="sql">
+      <![CDATA[select count(*), sum(empno) from emp where false]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalAggregate(group=[{}], EXPR$0=[COUNT()], EXPR$1=[SUM($0)])
   LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalValues(tuples=[[{ 0, null }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testEmptyIntersect">
-        <Resource name="sql">
-            <![CDATA[select * from (values (30, 3))intersect
+    </Resource>
+  </TestCase>
+  <TestCase name="testEmptyFilterProjectUnion">
+    <Resource name="sql">
+      <![CDATA[select * from (
+select * from (values (10, 1), (30, 3)) as t (x, y)
+union all
+select * from (values (20, 2))
+)
+where x + y > 30]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(X=[$0], Y=[$1])
+  LogicalFilter(condition=[>(+($0, $1), 30)])
+    LogicalUnion(all=[true])
+      LogicalProject(X=[$0], Y=[$1])
+        LogicalValues(tuples=[[{ 10, 1 }, { 30, 3 }]])
+      LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
+        LogicalValues(tuples=[[{ 20, 2 }]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(X=[$0], Y=[$1])
+  LogicalValues(tuples=[[{ 30, 3 }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testEmptyIntersect">
+    <Resource name="sql">
+      <![CDATA[select * from (values (30, 3))intersect
 select *
 from (values (10, 1), (30, 3)) as t (x, y) where x > 50
 intersect
 select * from (values (30, 3))]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalIntersect(all=[false])
   LogicalIntersect(all=[false])
     LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
@@ -1379,2269 +2739,2357 @@ LogicalIntersect(all=[false])
   LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
     LogicalValues(tuples=[[{ 30, 3 }]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushFilterThroughOuterJoin">
-        <Resource name="sql">
-            <![CDATA[select 1 from sales.dept d left outer join sales.emp e on d.deptno = e.deptno where d.name = 'Charlie']]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-ProjectRel(EXPR$0=[1])
-  FilterRel(condition=[=($1, 'Charlie')])
-    JoinRel(condition=[=($0, $9)], joinType=[left])
-      TableAccessRel(table=[[CATALOG, SALES, DEPT]])
-      TableAccessRel(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-ProjectRel(EXPR$0=[1])
-  JoinRel(condition=[=($0, $9)], joinType=[left])
-    FilterRel(condition=[=($1, 'Charlie')])
-      TableAccessRel(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testEmptyLimitZero">
+    <Resource name="sql">
+      <![CDATA[select * from emp order by deptno limit 0]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+SortRel(sort0=[$7], dir0=[Ascending], fetch=[0])
+  ProjectRel(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
     TableAccessRel(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSemiJoinReduceConstants">
-        <Resource name="sql">
-            <![CDATA[select e1.sal
-from (select * from emp where deptno = 200) as e1
-where e1.deptno in (
-  select e2.deptno from emp e2 where e2.sal = 100)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(SAL=[$0])
-  LogicalJoin(condition=[=($1, $2)], joinType=[semi])
-    LogicalFilter(condition=[=($1, 200)])
-      LogicalProject(SAL=[$5], DEPTNO=[$7])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$1])
-      LogicalFilter(condition=[=($0, 100)])
-        LogicalProject(SAL=[$5], DEPTNO=[$7])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(SAL=[$0])
-  LogicalJoin(condition=[=(200, $2)], joinType=[semi])
-    LogicalFilter(condition=[=($1, 200)])
-      LogicalProject(SAL=[$5], DEPTNO=[$7])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$1])
-      LogicalFilter(condition=[=($0, 100)])
-        LogicalProject(SAL=[$5], DEPTNO=[$7])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+EmptyRel
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testFullOuterJoinSimplificationToLeftOuter">
-        <Resource name="sql">
-            <![CDATA[select 1 from sales.dept d full outer join sales.emp e
-on d.deptno = e.deptno
-where d.name = 'Charlie']]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalFilter(condition=[=($1, 'Charlie')])
-    LogicalJoin(condition=[=($0, $9)], joinType=[full])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testEmptyMinus">
+    <Resource name="sql">
+      <![CDATA[select * from (values (30, 3)) as t (x, y)
+where x > 30
+except
+select * from (values (20, 2))
+except
+select * from (values (40, 4))]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalMinus(all=[false])
+  LogicalMinus(all=[false])
+    LogicalProject(X=[$0], Y=[$1])
+      LogicalFilter(condition=[>($0, 30)])
+        LogicalValues(tuples=[[{ 30, 3 }]])
+    LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
+      LogicalValues(tuples=[[{ 20, 2 }]])
+  LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
+    LogicalValues(tuples=[[{ 40, 4 }]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalProject(DEPTNO=[CAST($0):INTEGER], NAME=[CAST($1):VARCHAR(10)], EMPNO=[$2], ENAME=[$3], JOB=[$4], MGR=[$5], HIREDATE=[$6], SAL=[$7], COMM=[$8], DEPTNO0=[$9], SLACKER=[$10])
-    LogicalJoin(condition=[=($0, $9)], joinType=[left])
-      LogicalFilter(condition=[=($1, 'Charlie')])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testFullOuterJoinSimplificationToRightOuter">
-        <Resource name="sql">
-            <![CDATA[select 1 from sales.dept d full outer join sales.emp e
-on d.deptno = e.deptno
-where e.sal > 100]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalFilter(condition=[>($7, 100)])
-    LogicalJoin(condition=[=($0, $9)], joinType=[full])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testEmptyMinus2">
+    <Resource name="sql">
+      <![CDATA[select * from (values (30, 3)) as t (x, y)
+except
+select * from (values (20, 2)) as t (x, y) where x > 30
+except
+select * from (values (40, 4))
+except
+select * from (values (50, 5)) as t (x, y) where x > 50]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalMinus(all=[false])
+  LogicalMinus(all=[false])
+    LogicalMinus(all=[false])
+      LogicalProject(X=[$0], Y=[$1])
+        LogicalValues(tuples=[[{ 30, 3 }]])
+      LogicalProject(X=[$0], Y=[$1])
+        LogicalFilter(condition=[>($0, 30)])
+          LogicalValues(tuples=[[{ 20, 2 }]])
+    LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
+      LogicalValues(tuples=[[{ 40, 4 }]])
+  LogicalProject(X=[$0], Y=[$1])
+    LogicalFilter(condition=[>($0, 50)])
+      LogicalValues(tuples=[[{ 50, 5 }]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[CAST($2):INTEGER], ENAME=[CAST($3):VARCHAR(20)], JOB=[CAST($4):VARCHAR(10)], MGR=[$5], HIREDATE=[CAST($6):TIMESTAMP(0)], SAL=[CAST($7):INTEGER], COMM=[CAST($8):INTEGER], DEPTNO0=[CAST($9):INTEGER], SLACKER=[CAST($10):BOOLEAN])
-    LogicalJoin(condition=[=($0, $9)], joinType=[right])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalFilter(condition=[>($5, 100)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalMinus(all=[false])
+  LogicalProject(X=[$0], Y=[$1])
+    LogicalValues(tuples=[[{ 30, 3 }]])
+  LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
+    LogicalValues(tuples=[[{ 40, 4 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testFullOuterJoinSimplificationToInner">
-        <Resource name="sql">
-            <![CDATA[select 1 from sales.dept d full outer join sales.emp e
-on d.deptno = e.deptno
-where d.name = 'Charlie' and e.sal > 100]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalFilter(condition=[AND(=($1, 'Charlie'), >($7, 100))])
-    LogicalJoin(condition=[=($0, $9)], joinType=[full])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testEmptyProject">
+    <Resource name="sql">
+      <![CDATA[select z + x from (
+  select x + y as z, x from (
+    select * from (values (10, 1), (30, 3)) as t (x, y)
+    where x + y > 50))]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[+(+($0, $1), $0)])
+  LogicalFilter(condition=[>(+($0, $1), 50)])
+    LogicalValues(tuples=[[{ 10, 1 }, { 30, 3 }]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalProject(DEPTNO=[CAST($0):INTEGER], NAME=[CAST($1):VARCHAR(10)], EMPNO=[CAST($2):INTEGER], ENAME=[CAST($3):VARCHAR(20)], JOB=[CAST($4):VARCHAR(10)], MGR=[$5], HIREDATE=[CAST($6):TIMESTAMP(0)], SAL=[CAST($7):INTEGER], COMM=[CAST($8):INTEGER], DEPTNO0=[CAST($9):INTEGER], SLACKER=[CAST($10):BOOLEAN])
-    LogicalJoin(condition=[=($0, $9)], joinType=[inner])
-      LogicalFilter(condition=[=($1, 'Charlie')])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalFilter(condition=[>($5, 100)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testLeftOuterJoinSimplificationToInner">
-        <Resource name="sql">
-            <![CDATA[select 1 from sales.dept d left outer join sales.emp e
-on d.deptno = e.deptno
-where e.sal > 100]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalFilter(condition=[>($7, 100)])
-    LogicalJoin(condition=[=($0, $9)], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testEmptyProject2">
+    <Resource name="sql">
+      <![CDATA[select z + x from (
+  select x + y as z, x from (
+    select * from (values (10, 1), (30, 3)) as t (x, y)
+    where x + y > 50))]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[+(+($0, $1), $0)])
+  LogicalFilter(condition=[>(+($0, $1), 50)])
+    LogicalValues(tuples=[[{ 10, 1 }, { 30, 3 }]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[CAST($2):INTEGER], ENAME=[CAST($3):VARCHAR(20)], JOB=[CAST($4):VARCHAR(10)], MGR=[$5], HIREDATE=[CAST($6):TIMESTAMP(0)], SAL=[CAST($7):INTEGER], COMM=[CAST($8):INTEGER], DEPTNO0=[CAST($9):INTEGER], SLACKER=[CAST($10):BOOLEAN])
-    LogicalJoin(condition=[=($0, $9)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalFilter(condition=[>($5, 100)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testRightOuterJoinSimplificationToInner">
-        <Resource name="sql">
-            <![CDATA[select 1 from sales.dept d right outer join sales.emp e
-on d.deptno = e.deptno
-where d.name = 'Charlie']]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalFilter(condition=[=($1, 'Charlie')])
-    LogicalJoin(condition=[=($0, $9)], joinType=[right])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testEmptySort">
+    <Resource name="sql">
+      <![CDATA[select * from emp where false order by deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalSort(sort0=[$7], dir0=[ASC])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[false])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalProject(DEPTNO=[CAST($0):INTEGER], NAME=[CAST($1):VARCHAR(10)], EMPNO=[$2], ENAME=[$3], JOB=[$4], MGR=[$5], HIREDATE=[$6], SAL=[$7], COMM=[$8], DEPTNO0=[$9], SLACKER=[$10])
-    LogicalJoin(condition=[=($0, $9)], joinType=[inner])
-      LogicalFilter(condition=[=($1, 'Charlie')])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAboveFiltersIntoInnerJoinCondition">
-        <Resource name="sql">
-            <![CDATA[select * from sales.dept d inner join sales.emp e
-on d.deptno = e.deptno and d.deptno > e.mgr
-where d.deptno > e.mgr]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[$2], ENAME=[$3], JOB=[$4], MGR=[$5], HIREDATE=[$6], SAL=[$7], COMM=[$8], DEPTNO0=[$9], SLACKER=[$10])
-  LogicalFilter(condition=[>($0, $5)])
-    LogicalJoin(condition=[AND(=($0, $9), >($0, $5))], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testEmptySort2">
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
+  LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[$2], ENAME=[$3], JOB=[$4], MGR=[$5], HIREDATE=[$6], SAL=[$7], COMM=[$8], DEPTNO0=[$9], SLACKER=[$10])
-  LogicalJoin(condition=[AND(=($0, $9), >($0, $5))], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushFilterThroughSemiJoin">
-        <Resource name="sql">
-            <![CDATA[select * from (
-  select * from dept where dept.deptno in (
-    select emp.deptno from emp))R
-where R.deptno <=10]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1])
-  LogicalFilter(condition=[<=($0, 10)])
-    LogicalJoin(condition=[=($0, $2)], joinType=[semi])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalProject(DEPTNO=[$7])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testEmptySortLimitZero">
+    <Resource name="sql">
+      <![CDATA[select * from emp order by deptno limit 0]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalSort(sort0=[$7], dir0=[ASC], fetch=[0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1])
-  LogicalJoin(condition=[=($0, $2)], joinType=[semi])
-    LogicalFilter(condition=[<=($0, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(DEPTNO=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushFilterPastAgg">
-        <Resource name="sql">
-            <![CDATA[select dname, c from
-(select name dname, count(*) as c from dept group by name) t
- where dname = 'Charlie']]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DNAME=[$0], C=[$1])
-  LogicalFilter(condition=[=($0, 'Charlie')])
-    LogicalAggregate(group=[{0}], C=[COUNT()])
-      LogicalProject(DNAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testEnumerableCalcRule">
+    <Resource name="sql">
+      <![CDATA[select ename from emp where sal > 10.0]]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(FNAME=[$1], LNAME=[$2])
+  LogicalFilter(condition=[>($0, 10)])
+    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DNAME=[$0], C=[$1])
-  LogicalAggregate(group=[{0}], C=[COUNT()])
-    LogicalFilter(condition=[=($0, 'Charlie')])
-      LogicalProject(DNAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+EnumerableProject(FNAME=[$1], LNAME=[$2])
+  EnumerableCalc(expr#0..2=[{inputs}], expr#3=[10], expr#4=[>($t0, $t3)], proj#0..2=[{exprs}], $condition=[$t4])
+    EnumerableTableScan(table=[[CATALOG, SALES, CUSTOMER]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushFilterPastAggWithGroupingSets1">
-        <Resource name="sql">
-            <![CDATA[select ddeptno, dname, c from
-             (select deptno ddeptno, name dname, count(*) as c
-             from dept group by rollup(deptno,name)) t
-              where dname = 'Charlie']]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DDEPTNO=[$0], DNAME=[$1], C=[$2])
-  LogicalProject(DDEPTNO=[$0], DNAME=[$1], C=[$2])
-    LogicalFilter(condition=[=($1, 'Charlie')])
-      LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], C=[COUNT()])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExchangeRemoveConstantKeysRule">
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalSortExchange(distribution=[hash[0, 1]], collation=[[0, 1]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1])
+    LogicalExchange(distribution=[hash[0]])
+      LogicalFilter(condition=[=($0, 10)])
+        LogicalTableScan(table=[[scott, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DDEPTNO=[$0], DNAME=[$1], C=[$2])
-  LogicalProject(DDEPTNO=[CASE($2, null, $0)], DNAME=[CASE($3, null, $1)], C=[$4])
-    LogicalFilter(condition=[=(CASE($3, null, $1), 'Charlie')])
-      LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], indicator=[true], C=[COUNT()])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalSortExchange(distribution=[hash[1]], collation=[[1]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1])
+    LogicalExchange(distribution=[single])
+      LogicalFilter(condition=[=($0, 10)])
+        LogicalTableScan(table=[[scott, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushFilterPastAggWithGroupingSets2">
-        <Resource name="sql">
-            <![CDATA[select dname, ddeptno, c from
-             (select name dname, deptno ddeptno, count(*) as c
-             from dept group by grouping sets ((name,deptno),(name))) t
-              where dname = 'Charlie']]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DNAME=[$0], DDEPTNO=[$1], C=[$2])
-  LogicalFilter(condition=[=($0, 'Charlie')])
-    LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}]], C=[COUNT()])
-      LogicalProject(DNAME=[$1], DDEPTNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpandFilterExists">
+    <Resource name="sql">
+      <![CDATA[select empno
+from sales.emp
+where exists (select deptno from sales.emp where empno < 20)
+or emp.sal < 100]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[OR(EXISTS({
+LogicalFilter(condition=[<($0, 20)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}), <($5, 100))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DNAME=[$0], DDEPTNO=[$1], C=[$2])
-  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}]], C=[COUNT()])
-    LogicalFilter(condition=[=($0, 'Charlie')])
-      LogicalProject(DNAME=[$1], DDEPTNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[OR(IS NOT NULL($9), <($5, 100))])
+      LogicalJoin(condition=[true], joinType=[left])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalAggregate(group=[{0}])
+          LogicalProject(i=[true])
+            LogicalFilter(condition=[<($0, 20)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceAverage">
-        <Resource name="sql">
-            <![CDATA[select name, max(name), avg(deptno), min(name)
-from sales.dept group by name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[MAX($0)], EXPR$2=[AVG($1)], EXPR$3=[MIN($0)])
-  LogicalProject(NAME=[$1], DEPTNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpandFilterExists3Value">
+    <Resource name="sql">
+      <![CDATA[select empno
+from sales.emp
+where empno
+  < case exists (select deptno from sales.emp where empno < 20)
+    when true then 10 when false then 20 else 30 end]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[<($0, CASE(=(IN($7, {
+LogicalProject(EXPR$0=[CASE(true, CAST($7):INTEGER, null)])
+  LogicalFilter(condition=[<($0, 20)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}), true), 10, =(IN($7, {
+LogicalProject(EXPR$0=[CASE(true, CAST($7):INTEGER, null)])
+  LogicalFilter(condition=[<($0, 20)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}), false), 20, 30))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$0], EXPR$1=[$1], EXPR$2=[CAST(/($2, $3)):INTEGER NOT NULL], EXPR$3=[$4])
-  LogicalAggregate(group=[{0}], EXPR$1=[MAX($0)], agg#1=[$SUM0($1)], agg#2=[COUNT()], EXPR$3=[MIN($0)])
-    LogicalProject(NAME=[$1], DEPTNO=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[<($0, CASE(=(CASE(=($9, 0), false, IS NOT NULL($12), true, <($10, $9), null, false), true), 10, =(CASE(=($9, 0), false, IS NOT NULL($12), true, <($10, $9), null, false), false), 20, 30))])
+      LogicalJoin(condition=[=($7, $11)], joinType=[left])
+        LogicalJoin(condition=[true], joinType=[inner])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+          LogicalAggregate(group=[{}], c=[COUNT()], ck=[COUNT($0)])
+            LogicalProject(EXPR$0=[CASE(true, CAST($7):INTEGER, null)])
+              LogicalFilter(condition=[<($0, 20)])
+                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalAggregate(group=[{0, 1}])
+          LogicalProject(EXPR$0=[$0], i=[true])
+            LogicalProject(EXPR$0=[CASE(true, CAST($7):INTEGER, null)])
+              LogicalFilter(condition=[<($0, 20)])
+                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastFilter">
-        <Resource name="sql">
-            <![CDATA[select empno + deptno from emp where sal = 10 * comm
-and upper(ename) = 'FOO']]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($0, $7)])
-  LogicalFilter(condition=[AND(=($5, *(10, $6)), =(UPPER($1), 'FOO'))])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpandFilterExistsSimple">
+    <Resource name="sql">
+      <![CDATA[select empno
+from sales.emp
+where exists (select deptno from sales.emp where empno < 20)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[EXISTS({
+LogicalFilter(condition=[<($0, 20)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+})])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($0, $4)])
-  LogicalFilter(condition=[AND(=($2, *(10, $3)), =(UPPER($1), 'FOO'))])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], SAL=[$5], COMM=[$6], DEPTNO=[$7])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalJoin(condition=[true], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{0}])
+        LogicalProject(i=[true])
+          LogicalFilter(condition=[<($0, 20)])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastJoin">
-        <Resource name="sql">
-            <![CDATA[select e.sal + b.comm from emp e inner join bonus b
-on e.ename = b.ename and e.deptno = 10]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($5, $12)])
-  LogicalJoin(condition=[AND(=($1, $9), =($7, 10))], joinType=[inner])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpandFilterExistsSimpleAnd">
+    <Resource name="sql">
+      <![CDATA[select empno
+from sales.emp
+where exists (select deptno from sales.emp where empno < 20)
+and emp.sal < 100]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[AND(EXISTS({
+LogicalFilter(condition=[<($0, 20)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}), <($5, 100))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($1, $4)])
-  LogicalJoin(condition=[AND(=($0, $3), $2)], joinType=[inner])
-    LogicalProject(ENAME=[$1], SAL=[$5], ==[=($7, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(ENAME=[$0], COMM=[$3])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastInnerJoinStrong">
-        <Resource name="sql">
-            <![CDATA[select count(*), case when e.sal < 11 then -1 * e.sal else e.sal end
-from emp e inner join bonus b on e.ename = b.ename
-group by case when e.sal < 11 then -1 * e.sal else e.sal end]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[CASE(<($5, 11), *(-1, $5), $5)])
-      LogicalJoin(condition=[=($1, $9)], joinType=[inner])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[<($5, 100)])
+      LogicalJoin(condition=[true], joinType=[inner])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+        LogicalAggregate(group=[{0}])
+          LogicalProject(i=[true])
+            LogicalFilter(condition=[<($0, 20)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[$1])
-      LogicalJoin(condition=[=($0, $2)], joinType=[inner])
-        LogicalProject(ENAME=[$1], CASE=[CASE(<($5, 11), *(-1, $5), $5)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(ENAME=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpandFilterIn">
+    <Resource name="sql">
+      <![CDATA[select empno
+from sales.emp
+where deptno in (select deptno from sales.emp where empno < 20)
+or emp.sal < 100]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[OR(IN($7, {
+LogicalProject(DEPTNO=[$7])
+  LogicalFilter(condition=[<($0, 20)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}), <($5, 100))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastInnerJoin">
-        <Resource name="sql">
-            <![CDATA[select count(*), case when e.sal < 11 then 11 else -1 * e.sal end
-from emp e inner join bonus b on e.ename = b.ename
-group by case when e.sal < 11 then 11 else -1 * e.sal end]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[CASE(<($5, 11), 11, *(-1, $5))])
-      LogicalJoin(condition=[=($1, $9)], joinType=[inner])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[OR(IS NOT NULL($10), <($5, 100))])
+      LogicalJoin(condition=[=($7, $9)], joinType=[left])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[$1])
-      LogicalJoin(condition=[=($0, $2)], joinType=[inner])
-        LogicalProject(ENAME=[$1], CASE=[CASE(<($5, 11), 11, *(-1, $5))])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(ENAME=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+        LogicalAggregate(group=[{0, 1}])
+          LogicalProject(DEPTNO=[$7], i=[true])
+            LogicalFilter(condition=[<($0, 20)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastLeftJoin">
-        <Resource name="sql">
-            <![CDATA[select count(*), case when e.sal < 11 then 11 else -1 * e.sal end
-from emp e left outer join bonus b on e.ename = b.ename
-group by case when e.sal < 11 then 11 else -1 * e.sal end]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[CASE(<($5, 11), 11, *(-1, $5))])
-      LogicalJoin(condition=[=($1, $9)], joinType=[left])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpandFilterIn3Value">
+    <Resource name="sql">
+      <![CDATA[select empno
+from sales.emp
+where empno
+ < case deptno in (select case when true then deptno else null end
+                   from sales.emp where empno < 20)
+   when true then 10
+   when false then 20
+   else 30
+   end]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[<($0, CASE(=(IN($7, {
+LogicalProject(EXPR$0=[CASE(true, CAST($7):INTEGER, null:INTEGER)])
+  LogicalFilter(condition=[<($0, 20)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}), true), 10, =(IN($7, {
+LogicalProject(EXPR$0=[CASE(true, CAST($7):INTEGER, null:INTEGER)])
+  LogicalFilter(condition=[<($0, 20)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}), false), 20, 30))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[$1])
-      LogicalJoin(condition=[=($0, $2)], joinType=[left])
-        LogicalProject(ENAME=[$1], CASE=[CASE(<($5, 11), 11, *(-1, $5))])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[<($0, CASE(=(CASE(=($9, 0), false, IS NOT NULL($12), true, <($10, $9), null:BOOLEAN, false), true), 10, =(CASE(=($9, 0), false, IS NOT NULL($12), true, <($10, $9), null:BOOLEAN, false), false), 20, 30))])
+      LogicalJoin(condition=[=($7, $11)], joinType=[left])
+        LogicalJoin(condition=[true], joinType=[inner])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(ENAME=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastLeftJoinSwap">
-        <Resource name="sql">
-            <![CDATA[select count(*), case when e.sal < 11 then 11 else -1 * e.sal end
-from bonus b left outer join emp e on e.ename = b.ename
-group by case when e.sal < 11 then 11 else -1 * e.sal end]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[CASE(<($9, 11), 11, *(-1, $9))])
-      LogicalJoin(condition=[=($5, $0)], joinType=[left])
-        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+          LogicalAggregate(group=[{}], c=[COUNT()], ck=[COUNT($0)])
+            LogicalProject(EXPR$0=[CASE(true, CAST($7):INTEGER, null:INTEGER)])
+              LogicalFilter(condition=[<($0, 20)])
+                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalAggregate(group=[{0, 1}])
+          LogicalProject(EXPR$0=[CASE(true, CAST($7):INTEGER, null:INTEGER)], i=[true])
+            LogicalFilter(condition=[<($0, 20)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[CASE($2, 11, $3)])
-      LogicalJoin(condition=[=($1, $0)], joinType=[left])
-        LogicalProject(ENAME=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-        LogicalProject(ENAME=[$1], <=[<($5, 11)], *=[*(-1, $5)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpandFilterInComposite">
+    <Resource name="sql">
+      <![CDATA[select empno
+from sales.emp
+where (empno, deptno) in (
+  select empno, deptno from sales.emp where empno < 20)
+or emp.sal < 100]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[OR(IN($0, $7, {
+LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+  LogicalFilter(condition=[<($0, 20)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}), <($5, 100))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastLeftJoinSwapStrong">
-        <Resource name="sql">
-            <![CDATA[select count(*), case when e.sal < 11 then -1 * e.sal else e.sal end
-from bonus b left outer join emp e on e.ename = b.ename
-group by case when e.sal < 11 then -1 * e.sal else e.sal end]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[CASE(<($9, 11), *(-1, $9), $9)])
-      LogicalJoin(condition=[=($5, $0)], joinType=[left])
-        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[OR(IS NOT NULL($11), <($5, 100))])
+      LogicalJoin(condition=[AND(=($0, $9), =($7, $10))], joinType=[left])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(EMPNO=[$0], DEPTNO=[$7], i=[true])
+          LogicalFilter(condition=[<($0, 20)])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[$2])
-      LogicalJoin(condition=[=($1, $0)], joinType=[left])
-        LogicalProject(ENAME=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-        LogicalProject(ENAME=[$1], CASE=[CASE(<($5, 11), *(-1, $5), $5)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastLeftJoinStrong">
-        <Resource name="sql">
-            <![CDATA[select count(*), case when e.sal < 11 then -1 * e.sal else e.sal end
-            from bonus b left outer join emp e on e.ename = b.ename group by
-            case when e.sal < 11 then -1 * e.sal else e.sal end]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[CASE(<($9, 11), *(-1, $9), $9)])
-      LogicalJoin(condition=[=($5, $0)], joinType=[left])
-        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpandFilterScalar">
+    <Resource name="sql">
+      <![CDATA[select empno
+from sales.emp
+where (select deptno from sales.emp where empno < 20)
+ < (select deptno from sales.emp where empno > 100)
+or emp.sal < 100]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[OR(<($SCALAR_QUERY({
+LogicalProject(DEPTNO=[$7])
+  LogicalFilter(condition=[<($0, 20)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}), $SCALAR_QUERY({
+LogicalProject(DEPTNO=[$7])
+  LogicalFilter(condition=[>($0, 100)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+})), <($5, 100))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[$2])
-      LogicalJoin(condition=[=($1, $0)], joinType=[left])
-        LogicalProject(ENAME=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-        LogicalProject(ENAME=[$1], CASE=[CASE(<($5, 11), *(-1, $5), $5)])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[OR(<($9, $10), <($5, 100))])
+      LogicalJoin(condition=[true], joinType=[left])
+        LogicalJoin(condition=[true], joinType=[left])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+          LogicalAggregate(group=[{}], agg#0=[SINGLE_VALUE($0)])
+            LogicalProject(DEPTNO=[$7])
+              LogicalFilter(condition=[<($0, 20)])
+                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalAggregate(group=[{}], agg#0=[SINGLE_VALUE($0)])
+          LogicalProject(DEPTNO=[$7])
+            LogicalFilter(condition=[>($0, 100)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastRightJoin">
-        <Resource name="sql">
-            <![CDATA[select count(*), case when e.sal < 11 then 11 else -1 * e.sal end
-from emp e right outer join bonus b on e.ename = b.ename
-group by case when e.sal < 11 then 11 else -1 * e.sal end]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[CASE(<($5, 11), 11, *(-1, $5))])
-      LogicalJoin(condition=[=($1, $9)], joinType=[right])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[CASE($1, 11, $2)])
-      LogicalJoin(condition=[=($0, $3)], joinType=[right])
-        LogicalProject(ENAME=[$1], <=[<($5, 11)], *=[*(-1, $5)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(ENAME=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpandJoinExists">
+    <Resource name="sql">
+      <![CDATA[select empno
+from sales.emp left join sales.dept
+on exists (select deptno from sales.emp where empno < 20)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalJoin(condition=[EXISTS({
+LogicalFilter(condition=[<($0, 20)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+})], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastRightJoinStrong">
-        <Resource name="sql">
-            <![CDATA[select count(*),
- case when e.sal < 11 then -1 * e.sal else e.sal end
-from emp e right outer join bonus b on e.ename = b.ename
-group by case when e.sal < 11 then -1 * e.sal else e.sal end]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[CASE(<($5, 11), *(-1, $5), $5)])
-      LogicalJoin(condition=[=($1, $9)], joinType=[right])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+    LogicalJoin(condition=[true], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalJoin(condition=[true], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalAggregate(group=[{0}])
+          LogicalProject(i=[true])
+            LogicalFilter(condition=[<($0, 20)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[$1])
-      LogicalJoin(condition=[=($0, $2)], joinType=[right])
-        LogicalProject(ENAME=[$1], CASE=[CASE(<($5, 11), *(-1, $5), $5)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(ENAME=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpandJoinIn">
+    <Resource name="sql">
+      <![CDATA[select empno
+from sales.emp left join sales.dept
+on emp.deptno in (select deptno from sales.emp where empno < 20)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalJoin(condition=[IN($7, {
+LogicalProject(DEPTNO=[$7])
+  LogicalFilter(condition=[<($0, 20)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+})], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastRightJoinSwap">
-        <Resource name="sql">
-            <![CDATA[select count(*), case when e.sal < 11 then 11 else -1 * e.sal end
-from bonus b right outer join emp e on e.ename = b.ename
-group by case when e.sal < 11 then 11 else -1 * e.sal end]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[CASE(<($9, 11), 11, *(-1, $9))])
-      LogicalJoin(condition=[=($5, $0)], joinType=[right])
-        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+    LogicalJoin(condition=[true], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalJoin(condition=[=($7, $11)], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalAggregate(group=[{0}])
+          LogicalProject(DEPTNO=[$7])
+            LogicalFilter(condition=[<($0, 20)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[$2])
-      LogicalJoin(condition=[=($1, $0)], joinType=[right])
-        LogicalProject(ENAME=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-        LogicalProject(ENAME=[$1], CASE=[CASE(<($5, 11), 11, *(-1, $5))])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpandJoinInComposite">
+    <Resource name="sql">
+      <![CDATA[select empno
+from sales.emp left join sales.dept
+on (emp.empno, dept.deptno) in (
+  select empno, deptno from sales.emp where empno < 20)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalJoin(condition=[IN($0, $9, {
+LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+  LogicalFilter(condition=[<($0, 20)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+})], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastRightJoinSwapStrong">
-        <Resource name="sql">
-            <![CDATA[select count(*), case when e.sal < 11 then -1 * e.sal else e.sal end
-from bonus b right outer join emp e on e.ename = b.ename
-group by case when e.sal < 11 then -1 * e.sal else e.sal end]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[CASE(<($9, 11), *(-1, $9), $9)])
-      LogicalJoin(condition=[=($5, $0)], joinType=[right])
-        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+    LogicalJoin(condition=[true], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalJoin(condition=[AND(=($0, $11), =($9, $12))], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalAggregate(group=[{0, 1}])
+          LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+            LogicalFilter(condition=[<($0, 20)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[$2])
-      LogicalJoin(condition=[=($1, $0)], joinType=[right])
-        LogicalProject(ENAME=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-        LogicalProject(ENAME=[$1], CASE=[CASE(<($5, 11), *(-1, $5), $5)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpandJoinScalar">
+    <Resource name="sql">
+      <![CDATA[select empno
+from sales.emp left join sales.dept
+on (select deptno from sales.emp where empno < 20)
+ < (select deptno from sales.emp where empno > 100)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalJoin(condition=[<($SCALAR_QUERY({
+LogicalProject(DEPTNO=[$7])
+  LogicalFilter(condition=[<($0, 20)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}), $SCALAR_QUERY({
+LogicalProject(DEPTNO=[$7])
+  LogicalFilter(condition=[>($0, 100)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}))], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastFullJoin">
-        <Resource name="sql">
-            <![CDATA[select count(*), case when e.sal < 11 then 11 else -1 * e.sal end
-from emp e full outer join bonus b on e.ename = b.ename
-group by case when e.sal < 11 then 11 else -1 * e.sal end]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[CASE(<($5, 11), 11, *(-1, $5))])
-      LogicalJoin(condition=[=($1, $9)], joinType=[full])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], $f0=[$11])
+      LogicalJoin(condition=[<($11, $12)], joinType=[left])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[CASE($1, 11, $2)])
-      LogicalJoin(condition=[=($0, $3)], joinType=[full])
-        LogicalProject(ENAME=[$1], <=[<($5, 11)], *=[*(-1, $5)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(ENAME=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+        LogicalJoin(condition=[true], joinType=[left])
+          LogicalJoin(condition=[true], joinType=[left])
+            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+            LogicalAggregate(group=[{}], agg#0=[SINGLE_VALUE($0)])
+              LogicalProject(DEPTNO=[$7])
+                LogicalFilter(condition=[<($0, 20)])
+                  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+          LogicalAggregate(group=[{}], agg#0=[SINGLE_VALUE($0)])
+            LogicalProject(DEPTNO=[$7])
+              LogicalFilter(condition=[>($0, 100)])
+                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastFullJoinStrong">
-        <Resource name="sql">
-            <![CDATA[select count(*), case when e.sal < 11 then -1 * e.sal else e.sal end
-from emp e full outer join bonus b on e.ename = b.ename
-group by case when e.sal < 11 then -1 * e.sal else e.sal end]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[CASE(<($5, 11), *(-1, $5), $5)])
-      LogicalJoin(condition=[=($1, $9)], joinType=[full])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpandProjectExists">
+    <Resource name="sql">
+      <![CDATA[select empno,
+  exists (select deptno from sales.emp where empno < 20) as d
+from sales.emp]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], D=[EXISTS({
+LogicalFilter(condition=[<($0, 20)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+})])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject(EXPR$1=[$1])
-      LogicalJoin(condition=[=($0, $2)], joinType=[full])
-        LogicalProject(ENAME=[$1], CASE=[CASE(<($5, 11), *(-1, $5), $5)])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], D=[IS NOT NULL($9)])
+  LogicalJoin(condition=[true], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}])
+      LogicalProject(i=[true])
+        LogicalFilter(condition=[<($0, 20)])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(ENAME=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectWithOverPastJoin1">
-        <Resource name="sql">
-            <![CDATA[select e.sal + b.comm,
-count(e.empno) over (partition by e.deptno)
-from emp e join bonus b
-on e.ename = b.ename and e.deptno = 10]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($5, $12)], EXPR$1=[COUNT($0) OVER (PARTITION BY $7)])
-  LogicalJoin(condition=[AND(=($1, $9), =($7, 10))], joinType=[inner])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpandProjectIn">
+    <Resource name="sql">
+      <![CDATA[select empno,
+  deptno in (select deptno from sales.emp where empno < 20) as d
+from sales.emp]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], D=[IN($7, {
+LogicalProject(DEPTNO=[$7])
+  LogicalFilter(condition=[<($0, 20)])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($2, $6)], EXPR$1=[COUNT($0) OVER (PARTITION BY $3)])
-  LogicalJoin(condition=[AND(=($1, $5), $4)], joinType=[inner])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], SAL=[$5], DEPTNO=[$7], ==[=($7, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(ENAME=[$0], COMM=[$3])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+})])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectWithOverPastJoin2">
-        <Resource name="sql">
-            <![CDATA[select e.sal + b.comm,
-count(b.sal) over (partition by b.job)
-from emp e join bonus b
-on e.ename = b.ename and e.deptno = 10]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($5, $12)], EXPR$1=[COUNT($11) OVER (PARTITION BY $10)])
-  LogicalJoin(condition=[AND(=($1, $9), =($7, 10))], joinType=[inner])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], D=[CASE(IS NOT NULL($10), true, false)])
+  LogicalJoin(condition=[=($7, $9)], joinType=[left])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+    LogicalAggregate(group=[{0, 1}])
+      LogicalProject(DEPTNO=[$7], i=[true])
+        LogicalFilter(condition=[<($0, 20)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($1, $6)], EXPR$1=[COUNT($5) OVER (PARTITION BY $4)])
-  LogicalJoin(condition=[AND(=($0, $3), $2)], joinType=[inner])
-    LogicalProject(ENAME=[$1], SAL=[$5], ==[=($7, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpandProjectInComposite">
+    <Resource name="sql">
+      <![CDATA[select empno, (empno, deptno) in (
+    select empno, deptno from sales.emp where empno < 20) as d
+from sales.emp]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], D=[IN($0, $7, {
+LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+  LogicalFilter(condition=[<($0, 20)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+})])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectWithOverPastJoin3">
-        <Resource name="sql">
-            <![CDATA[select e.sal + b.comm,
-sum(b.sal + b.sal + 100) over (partition by b.job)
-from emp e join bonus b
-on e.ename = b.ename and e.deptno = 10]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($5, $12)], EXPR$1=[SUM(+(+($11, $11), 100)) OVER (PARTITION BY $10)])
-  LogicalJoin(condition=[AND(=($1, $9), =($7, 10))], joinType=[inner])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], D=[CASE(IS NOT NULL($11), true, false)])
+  LogicalJoin(condition=[AND(=($0, $9), =($7, $10))], joinType=[left])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+    LogicalProject(EMPNO=[$0], DEPTNO=[$7], i=[true])
+      LogicalFilter(condition=[<($0, 20)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($1, $5)], EXPR$1=[SUM($6) OVER (PARTITION BY $4)])
-  LogicalJoin(condition=[AND(=($0, $3), $2)], joinType=[inner])
-    LogicalProject(ENAME=[$1], SAL=[$5], ==[=($7, 10)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpandProjectInNullable">
+    <Resource name="sql">
+      <![CDATA[with e2 as (
+  select empno, case when true then deptno else null end as deptno
+  from sales.emp)
+select empno,
+  deptno in (select deptno from e2 where empno < 20) as d
+from e2]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], D=[IN(CASE(true, CAST($7):INTEGER, null:INTEGER), {
+LogicalProject(DEPTNO=[$1])
+  LogicalFilter(condition=[<($0, 20)])
+    LogicalProject(EMPNO=[$0], DEPTNO=[CASE(true, CAST($7):INTEGER, null:INTEGER)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(ENAME=[$0], JOB=[$1], COMM=[$3], +=[+(+($2, $2), 100)])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+})])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastSetOp">
-        <Resource name="sql">
-            <![CDATA[select sal from
-(select * from emp e1 union all select * from emp e2)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalUnion(all=[true])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], D=[CASE(=($9, 0), false, IS NULL(CASE(true, CAST($7):INTEGER, null:INTEGER)), null:BOOLEAN, IS NOT NULL($12), true, <($10, $9), null:BOOLEAN, false)])
+  LogicalJoin(condition=[=(CASE(true, CAST($7):INTEGER, null:INTEGER), $11)], joinType=[left])
+    LogicalJoin(condition=[true], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], c=[COUNT()], ck=[COUNT($0)])
+        LogicalProject(DEPTNO=[$1])
+          LogicalFilter(condition=[<($0, 20)])
+            LogicalProject(EMPNO=[$0], DEPTNO=[CASE(true, CAST($7):INTEGER, null:INTEGER)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0, 1}])
+      LogicalProject(DEPTNO=[$1], i=[true])
+        LogicalFilter(condition=[<($0, 20)])
+          LogicalProject(EMPNO=[$0], DEPTNO=[CASE(true, CAST($7):INTEGER, null:INTEGER)])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalProject(SAL=[$5])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(SAL=[$5])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpandProjectScalar">
+    <Resource name="sql">
+      <![CDATA[select empno,
+  (select deptno from sales.emp where empno < 20) as d
+from sales.emp]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], D=[$SCALAR_QUERY({
+LogicalProject(DEPTNO=[$7])
+  LogicalFilter(condition=[<($0, 20)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+})])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushJoinThroughUnionOnLeft">
-        <Resource name="sql">
-            <![CDATA[select r1.sal from
-(select * from emp e1 union all select * from emp e2) r1,
-emp r2]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalJoin(condition=[true], joinType=[inner])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], D=[$9])
+  LogicalJoin(condition=[true], joinType=[left])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{}], agg#0=[SINGLE_VALUE($0)])
+      LogicalProject(DEPTNO=[$7])
+        LogicalFilter(condition=[<($0, 20)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalUnion(all=[true])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpandWhereComparisonCorrelated">
+    <Resource name="sql">
+      <![CDATA[select empno
+from sales.emp as e
+where sal = (
+  select max(sal) from sales.emp e2 where e2.empno = e.empno)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[=($5, $SCALAR_QUERY({
+LogicalAggregate(group=[{}], EXPR$0=[MAX($0)])
+  LogicalProject(SAL=[$5])
+    LogicalFilter(condition=[=($0, $cor0.EMPNO)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushJoinThroughUnionOnRight">
-        <Resource name="sql">
-            <![CDATA[select r1.sal from
-emp r1,
-(select * from emp e1 union all select * from emp e2) r2]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalJoin(condition=[true], joinType=[inner])
+}))], variablesSet=[[$cor0]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalUnion(all=[true])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($5, $9)])
+      LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0}])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalAggregate(group=[{}], EXPR$0=[MAX($0)])
+          LogicalProject(SAL=[$5])
+            LogicalFilter(condition=[=($0, $cor0.EMPNO)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushJoinThroughUnionOnRightDoesNotMatchSemiJoin">
-        <Resource name="sql">
-            <![CDATA[select r1.sal from emp r1 where r1.deptno in (select deptno from dept d1 where deptno > 100 union all select deptno from dept d2 where deptno > 20)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalJoin(condition=[=($7, $8)], joinType=[semi])
-    LogicalTableScan(table=[[scott, EMP]])
-    LogicalUnion(all=[true])
-      LogicalProject(DEPTNO=[$0])
-        LogicalFilter(condition=[>($0, 100)])
-          LogicalTableScan(table=[[scott, DEPT]])
-      LogicalProject(DEPTNO=[$0])
-        LogicalFilter(condition=[>($0, 20)])
-          LogicalTableScan(table=[[scott, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExpressionInWindowFunction">
+    <Resource name="sql">
+      <![CDATA[select
+ sum(deptno) over(partition by deptno order by sal) as sum1,
+sum(deptno + sal) over(partition by deptno order by sal) as sum2
+from emp]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject($0=[$3], $1=[$4])
+  LogicalWindow(window#0=[window(partition {1} order by [0] aggs [SUM($1), SUM($2)])])
+    LogicalProject(SAL=[$5], DEPTNO=[$7], $2=[+($7, $5)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalJoin(condition=[=($7, $8)], joinType=[semi])
-    LogicalTableScan(table=[[scott, EMP]])
-    LogicalUnion(all=[true])
-      LogicalProject(DEPTNO=[$0])
-        LogicalFilter(condition=[>($0, 100)])
-          LogicalTableScan(table=[[scott, DEPT]])
-      LogicalProject(DEPTNO=[$0])
-        LogicalFilter(condition=[>($0, 20)])
-          LogicalTableScan(table=[[scott, DEPT]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(SUM1=[SUM($7) OVER (PARTITION BY $7 ORDER BY $5)], SUM2=[SUM(+($7, $5)) OVER (PARTITION BY $7 ORDER BY $5)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushJoinThroughUnionOnRightDoesNotMatchAntiJoin">
-        <Resource name="sql">
-            <![CDATA[select r1.sal from emp r1 where r1.deptno not in (select deptno from dept d1 where deptno < 10 union all select deptno from dept d2 where deptno > 20)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalJoin(condition=[=($7, $8)], joinType=[anti])
-    LogicalTableScan(table=[[scott, EMP]])
-    LogicalUnion(all=[true])
-      LogicalProject(DEPTNO=[$0])
-        LogicalFilter(condition=[<($0, 10)])
-          LogicalTableScan(table=[[scott, DEPT]])
-      LogicalProject(DEPTNO=[$0])
-        LogicalFilter(condition=[>($0, 20)])
-          LogicalTableScan(table=[[scott, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExtractJoinFilterRule">
+    <Resource name="sql">
+      <![CDATA[select 1 from emp inner join dept on emp.deptno=dept.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalJoin(condition=[=($7, $8)], joinType=[anti])
-    LogicalTableScan(table=[[scott, EMP]])
-    LogicalUnion(all=[true])
-      LogicalProject(DEPTNO=[$0])
-        LogicalFilter(condition=[<($0, 10)])
-          LogicalTableScan(table=[[scott, DEPT]])
-      LogicalProject(DEPTNO=[$0])
-        LogicalFilter(condition=[>($0, 20)])
-          LogicalTableScan(table=[[scott, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalFilter(condition=[=($7, $9)])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstants">
-        <Resource name="sql">
-            <![CDATA[select 1+2, d.deptno+(3+4), (5+6)+d.deptno, cast(null as integer), coalesce(2,null), row(7+8) from dept d inner join emp e on d.deptno = e.deptno + (5-5) where d.deptno=(7+8) and d.deptno=(8+7) and d.deptno=coalesce(2,null)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[+(1, 2)], EXPR$1=[+($0, +(3, 4))], EXPR$2=[+(+(5, 6), $0)], EXPR$3=[null:INTEGER], EXPR$4=[CASE(IS NOT NULL(2), 2, null:INTEGER)], EXPR$5=[ROW(+(7, 8))])
-  LogicalFilter(condition=[AND(=($0, +(7, 8)), =($0, +(8, 7)), =($0, CASE(IS NOT NULL(2), 2, null:INTEGER)))])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[$2], ENAME=[$3], JOB=[$4], MGR=[$5], HIREDATE=[$6], SAL=[$7], COMM=[$8], DEPTNO0=[$9], SLACKER=[$10])
-      LogicalJoin(condition=[=($0, $11)], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, -(5, 5))])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExtractYearMonthToRange">
+    <Resource name="sql">
+      <![CDATA[select *
+from sales.emp_b as e
+where extract(year from birthdate) = 2014and extract(month from birthdate) = 4]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], BIRTHDATE=[$9])
+  LogicalFilter(condition=[AND(=(EXTRACT(FLAG(YEAR), $9), 2014), =(EXTRACT(FLAG(MONTH), $9), 4))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP_B]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[3], EXPR$1=[22], EXPR$2=[26], EXPR$3=[null:INTEGER], EXPR$4=[CAST(2):INTEGER], EXPR$5=[ROW(15)])
-  LogicalValues(tuples=[[]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], BIRTHDATE=[$9])
+  LogicalFilter(condition=[SEARCH($9, Sarg[[2014-04-01..2014-05-01)])])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP_B]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsDup">
-        <Resource name="sql">
-            <![CDATA[select d.deptno from dept d where d.deptno=7 and d.deptno=8]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0])
-  LogicalFilter(condition=[AND(=($0, 7), =($0, 8))])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExtractYearToRange">
+    <Resource name="sql">
+      <![CDATA[select *
+from sales.emp_b as e
+where extract(year from birthdate) = 2014]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], BIRTHDATE=[$9])
+  LogicalFilter(condition=[=(EXTRACT(FLAG(YEAR), $9), 2014)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP_B]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0])
-  LogicalValues(tuples=[[]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], BIRTHDATE=[$9])
+  LogicalFilter(condition=[SEARCH($9, Sarg[[2014-01-01..2015-01-01)])])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP_B]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsDup3">
-        <Resource name="sql">
-            <![CDATA[select d.deptno from dept d where d.deptno<>7 or d.deptno<>8]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0])
-  LogicalFilter(condition=[OR(<>($0, 7), <>($0, 8))])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testFilterAndProjectWithMultiJoin">
+    <Resource name="sql">
+      <![CDATA[select * from emp e1 left outer join dept d on e1.deptno = d.deptno where d.deptno > 3]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+MyProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  MyFilter(condition=[>($9, 3)])
+    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[INNER, LEFT]], outerJoinConditions=[[NULL, =($7, $9)]], projFields=[[{0, 1, 2, 3, 4, 5, 6, 7, 8}, {0, 1}]], postJoinFilter=[>($9, 3)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
   LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsDup3Null">
-        <Resource name="sql">
-            <![CDATA[select e.empno from emp e where e.mgr<>7 or e.mgr<>8]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testFilterProjectTranspose">
+    <Resource name="sql">
+      <![CDATA[SELECT e.empno
+FROM emp as e
+WHERE exists (
+  SELECT *
+  FROM (
+    SELECT deptno * 2 AS twiceDeptno
+    FROM dept) AS d
+  WHERE e.deptno = d.twiceDeptno)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[OR(<>($3, 7), <>($3, 8))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalFilter(condition=[IS NOT NULL($9)])
+    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
+            LogicalProject(TWICEDEPTNO=[*($0, 2)])
+              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[IS NOT NULL($3)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalFilter(condition=[IS NOT NULL($9)])
+    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalProject(TWICEDEPTNO=[*($0, 2)])
+            LogicalFilter(condition=[=($cor0.DEPTNO, *($0, 2))])
+              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsDupNot">
-        <Resource name="sql">
-            <![CDATA[select d.deptno from dept d where not(d.deptno=7 and d.deptno=8)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0])
-  LogicalFilter(condition=[NOT(AND(=($0, 7), =($0, 8)))])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsDupNotNull">
-        <Resource name="sql">
-            <![CDATA[select e.empno from emp e where not(e.mgr=7 and e.mgr=8)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[NOT(AND(=($3, 7), =($3, 8)))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testFilterProjectTransposePreventedByCorrelation">
+    <Resource name="sql">
+      <![CDATA[SELECT e.empno
+FROM emp as e
+WHERE exists (
+  SELECT *
+  FROM (
+    SELECT deptno * 2 AS twiceDeptno
+    FROM dept) AS d
+  WHERE e.deptno = d.twiceDeptno)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[IS NOT NULL($3)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsDupNot2">
-        <Resource name="sql">
-            <![CDATA[select d.deptno from dept d where not(d.deptno=7 and d.name='foo' and d.deptno=8)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0])
-  LogicalFilter(condition=[NOT(AND(=($0, 7), =($1, 'foo'), =($0, 8)))])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+  LogicalFilter(condition=[IS NOT NULL($9)])
+    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
+            LogicalProject(TWICEDEPTNO=[*($0, 2)])
+              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsDupNot2Null">
-        <Resource name="sql">
-            <![CDATA[select e.empno from emp e where not(e.mgr=7 and e.deptno=8 and e.mgr=8)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[NOT(AND(=($3, 7), =($7, 8), =($3, 8)))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testFilterRemoveIsNotDistinctFromRule">
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalFilter(condition=[IS NOT DISTINCT FROM($7, 20)])
+  LogicalTableScan(table=[[scott, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[OR(IS NOT NULL($3), <>($7, 8))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalFilter(condition=[=($7, 20)])
+  LogicalTableScan(table=[[scott, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsEliminatesFilter">
-        <Resource name="sql">
-            <![CDATA[select * from (values (1,2)) where 1 + 2 > 3 + CAST(NULL AS INTEGER)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
-  LogicalFilter(condition=[>(+(1, 2), +(3, null))])
-    LogicalValues(tuples=[[{ 1, 2 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testFlattenUncorrelatedCallBelowEquals">
+    <Resource name="sql">
+      <![CDATA[select * from emp e1 where exists (select * from emp e2 where e1.deptno = (e2.deptno+30))]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[IS NOT NULL($9)])
+    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalFilter(condition=[=($cor0.DEPTNO, +($7, 30))])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
-  LogicalValues(tuples=[[]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[IS NOT NULL($9)])
+    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+            LogicalFilter(condition=[=($cor0.DEPTNO, $9)])
+              LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, 30)])
+                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAlreadyFalseEliminatesFilter">
-        <Resource name="sql">
-            <![CDATA[select * from (values (1,2)) where false]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
-  LogicalFilter(condition=[false])
-    LogicalValues(tuples=[[{ 1, 2 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testFlattenUncorrelatedTwoLevelCallBelowEqualsSucceeds">
+    <Resource name="sql">
+      <![CDATA[select * from emp e1 where exists (select * from emp e2 where e1.deptno = (2 * e2.deptno+30))]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[IS NOT NULL($9)])
+    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalFilter(condition=[=($cor0.DEPTNO, +(*(2, $7), 30))])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
-  LogicalValues(tuples=[[]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[IS NOT NULL($9)])
+    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+            LogicalFilter(condition=[=($cor0.DEPTNO, $9)])
+              LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+(*(2, $7), 30)])
+                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testEmptyMinus">
-        <Resource name="sql">
-            <![CDATA[select * from (values (30, 3)) as t (x, y)
-where x > 30
-except
-select * from (values (20, 2))
-except
-select * from (values (40, 4))]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalMinus(all=[false])
-  LogicalMinus(all=[false])
-    LogicalProject(X=[$0], Y=[$1])
-      LogicalFilter(condition=[>($0, 30)])
-        LogicalValues(tuples=[[{ 30, 3 }]])
-    LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
-      LogicalValues(tuples=[[{ 20, 2 }]])
-  LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
-    LogicalValues(tuples=[[{ 40, 4 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testFullOuterJoinSimplificationToInner">
+    <Resource name="sql">
+      <![CDATA[select 1 from sales.dept d full outer join sales.emp e
+on d.deptno = e.deptno
+where d.name = 'Charlie' and e.sal > 100]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalFilter(condition=[AND(=($1, 'Charlie'), >($7, 100))])
+    LogicalJoin(condition=[=($0, $9)], joinType=[full])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalValues(tuples=[[]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalProject(DEPTNO=[CAST($0):INTEGER], NAME=[CAST($1):VARCHAR(10)], EMPNO=[CAST($2):INTEGER], ENAME=[CAST($3):VARCHAR(20)], JOB=[CAST($4):VARCHAR(10)], MGR=[$5], HIREDATE=[CAST($6):TIMESTAMP(0)], SAL=[CAST($7):INTEGER], COMM=[CAST($8):INTEGER], DEPTNO0=[CAST($9):INTEGER], SLACKER=[CAST($10):BOOLEAN])
+    LogicalJoin(condition=[=($0, $9)], joinType=[inner])
+      LogicalFilter(condition=[=($1, 'Charlie')])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalFilter(condition=[>($5, 100)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testEmptyMinus2">
-        <Resource name="sql">
-            <![CDATA[select * from (values (30, 3)) as t (x, y)
-except
-select * from (values (20, 2)) as t (x, y) where x > 30
-except
-select * from (values (40, 4))
-except
-select * from (values (50, 5)) as t (x, y) where x > 50]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalMinus(all=[false])
-  LogicalMinus(all=[false])
-    LogicalMinus(all=[false])
-      LogicalProject(X=[$0], Y=[$1])
-        LogicalValues(tuples=[[{ 30, 3 }]])
-      LogicalProject(X=[$0], Y=[$1])
-        LogicalFilter(condition=[>($0, 30)])
-          LogicalValues(tuples=[[{ 20, 2 }]])
-    LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
-      LogicalValues(tuples=[[{ 40, 4 }]])
-  LogicalProject(X=[$0], Y=[$1])
-    LogicalFilter(condition=[>($0, 50)])
-      LogicalValues(tuples=[[{ 50, 5 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testFullOuterJoinSimplificationToLeftOuter">
+    <Resource name="sql">
+      <![CDATA[select 1 from sales.dept d full outer join sales.emp e
+on d.deptno = e.deptno
+where d.name = 'Charlie']]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalFilter(condition=[=($1, 'Charlie')])
+    LogicalJoin(condition=[=($0, $9)], joinType=[full])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalMinus(all=[false])
-  LogicalProject(X=[$0], Y=[$1])
-    LogicalValues(tuples=[[{ 30, 3 }]])
-  LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
-    LogicalValues(tuples=[[{ 40, 4 }]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalProject(DEPTNO=[CAST($0):INTEGER], NAME=[CAST($1):VARCHAR(10)], EMPNO=[$2], ENAME=[$3], JOB=[$4], MGR=[$5], HIREDATE=[$6], SAL=[$7], COMM=[$8], DEPTNO0=[$9], SLACKER=[$10])
+    LogicalJoin(condition=[=($0, $9)], joinType=[left])
+      LogicalFilter(condition=[=($1, 'Charlie')])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testEmptyProject">
-        <Resource name="sql">
-            <![CDATA[select z + x from (
-  select x + y as z, x from (
-    select * from (values (10, 1), (30, 3)) as t (x, y)
-    where x + y > 50))]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[+(+($0, $1), $0)])
-  LogicalFilter(condition=[>(+($0, $1), 50)])
-    LogicalValues(tuples=[[{ 10, 1 }, { 30, 3 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testFullOuterJoinSimplificationToRightOuter">
+    <Resource name="sql">
+      <![CDATA[select 1 from sales.dept d full outer join sales.emp e
+on d.deptno = e.deptno
+where e.sal > 100]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalFilter(condition=[>($7, 100)])
+    LogicalJoin(condition=[=($0, $9)], joinType=[full])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalValues(tuples=[[]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[CAST($2):INTEGER], ENAME=[CAST($3):VARCHAR(20)], JOB=[CAST($4):VARCHAR(10)], MGR=[$5], HIREDATE=[CAST($6):TIMESTAMP(0)], SAL=[CAST($7):INTEGER], COMM=[CAST($8):INTEGER], DEPTNO0=[CAST($9):INTEGER], SLACKER=[CAST($10):BOOLEAN])
+    LogicalJoin(condition=[=($0, $9)], joinType=[right])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalFilter(condition=[>($5, 100)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testEmptyProject2">
-        <Resource name="sql">
-            <![CDATA[select z + x from (
-  select x + y as z, x from (
-    select * from (values (10, 1), (30, 3)) as t (x, y)
-    where x + y > 50))]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[+(+($0, $1), $0)])
-  LogicalFilter(condition=[>(+($0, $1), 50)])
-    LogicalValues(tuples=[[{ 10, 1 }, { 30, 3 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testHeterogeneousConversion">
+    <Resource name="sql">
+      <![CDATA[select upper(ename) from emp union all
+select lower(ename) from emp]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalProject(EXPR$0=[UPPER($1)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EXPR$0=[LOWER($1)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalValues(tuples=[[]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalCalc(expr#0..8=[{inputs}], expr#9=[UPPER($t1)], EXPR$0=[$t9])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EXPR$0=[LOWER($1)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceValuesUnderFilter">
-        <Resource name="sql">
-            <![CDATA[select a, b from (values (10, 'x'), (20, 'y')) as t(a, b) where a < 15]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(A=[$0], B=[$1])
-  LogicalFilter(condition=[<($0, 15)])
-    LogicalValues(tuples=[[{ 10, 'x' }, { 20, 'y' }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInferringPredicatesWithNotOperatorInJoinCondition">
+    <Resource name="sql">
+      <![CDATA[select * from sales.emp d
+join sales.emp e on e.deptno = d.deptno and d.deptno not in (4, 6)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EMPNO0=[$9], ENAME0=[$10], JOB0=[$11], MGR0=[$12], HIREDATE0=[$13], SAL0=[$14], COMM0=[$15], DEPTNO0=[$16], SLACKER0=[$17])
+  LogicalJoin(condition=[AND(=($16, $7), NOT(OR(=($7, 4), =($7, 6))))], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(A=[$0], B=[$1])
-  LogicalValues(tuples=[[{ 10, 'x' }]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EMPNO0=[$9], ENAME0=[$10], JOB0=[$11], MGR0=[$12], HIREDATE0=[$13], SAL0=[$14], COMM0=[$15], DEPTNO0=[$16], SLACKER0=[$17])
+  LogicalJoin(condition=[=($16, $7)], joinType=[inner])
+    LogicalFilter(condition=[SEARCH($7, Sarg[(-∞..4), (4..6), (6..+∞)])])
+      LogicalFilter(condition=[NOT(OR(=($7, 4), =($7, 6)))])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[SEARCH($7, Sarg[(-∞..4), (4..6), (6..+∞)])])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceValuesUnderProject">
-        <Resource name="sql">
-            <![CDATA[select a + b from (values (10, 1), (20, 3)) as t(a, b)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($0, $1)])
-  LogicalValues(tuples=[[{ 10, 1 }, { 20, 3 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testIntersectToDistinct">
+    <Resource name="sql">
+      <![CDATA[select * from emp where deptno = 10
+intersect
+select * from emp where deptno = 20
+intersect
+select * from emp where deptno = 30
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalValues(tuples=[[{ 11 }, { 23 }]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalIntersect(all=[false])
+  LogicalIntersect(all=[false])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($7, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($7, 20)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 30)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceValuesUnderProjectFilter">
-        <Resource name="sql">
-            <![CDATA[select a + b as x, b, a
-from (values (10, 1), (30, 7), (20, 3)) as t(a, b)
-where a - b < 21]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(X=[+($0, $1)], B=[$1], A=[$0])
-  LogicalFilter(condition=[<(-($0, $1), 21)])
-    LogicalValues(tuples=[[{ 10, 1 }, { 30, 7 }, { 20, 3 }]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[=($9, 3)])
+    LogicalAggregate(group=[{0, 1, 2, 3, 4, 5, 6, 7, 8}], agg#0=[COUNT()])
+      LogicalUnion(all=[true])
+        LogicalAggregate(group=[{0, 1, 2, 3, 4, 5, 6, 7, 8}], agg#0=[COUNT()])
+          LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+            LogicalFilter(condition=[=($7, 10)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalAggregate(group=[{0, 1, 2, 3, 4, 5, 6, 7, 8}], agg#0=[COUNT()])
+          LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+            LogicalFilter(condition=[=($7, 20)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalAggregate(group=[{0, 1, 2, 3, 4, 5, 6, 7, 8}], agg#0=[COUNT()])
+          LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+            LogicalFilter(condition=[=($7, 30)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalValues(tuples=[[{ 11, 1, 10 }, { 23, 3, 20 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testIntersectToDistinctAll">
+    <Resource name="sql">
+      <![CDATA[select * from emp where deptno = 10
+intersect
+select * from emp where deptno = 20
+intersect all
+select * from emp where deptno = 30
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceValuesNull">
-        <Resource name="sql">
-            <![CDATA[insert into EMPNULLABLES(EMPNO, ENAME, JOB) (select 0, 'null', NULL)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[false])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[null:INTEGER], COMM=[null:INTEGER], DEPTNO=[null:INTEGER], SLACKER=[null:BOOLEAN])
-    LogicalValues(tuples=[[{ 0, 'null', null }]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[false])
-  LogicalValues(tuples=[[{ 0, 'null', null, null, null, null, null, null, null }]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceValuesToEmpty">
-        <Resource name="sql">
-            <![CDATA[select a + b as x, b, a from (values (10, 1), (30, 7)) as t(a, b)
-where a - b < 0]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(X=[+($0, $1)], B=[$1], A=[$0])
-  LogicalFilter(condition=[<(-($0, $1), 0)])
-    LogicalValues(tuples=[[{ 10, 1 }, { 30, 7 }]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalValues(tuples=[[]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testEmptyFilterProjectUnion">
-        <Resource name="sql">
-            <![CDATA[select * from (
-select * from (values (10, 1), (30, 3)) as t (x, y)
-union all
-select * from (values (20, 2))
-)
-where x + y > 30]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(X=[$0], Y=[$1])
-  LogicalFilter(condition=[>(+($0, $1), 30)])
-    LogicalUnion(all=[true])
-      LogicalProject(X=[$0], Y=[$1])
-        LogicalValues(tuples=[[{ 10, 1 }, { 30, 3 }]])
-      LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
-        LogicalValues(tuples=[[{ 20, 2 }]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalIntersect(all=[true])
+  LogicalIntersect(all=[false])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($7, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($7, 20)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 30)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(X=[$0], Y=[$1])
-  LogicalValues(tuples=[[{ 30, 3 }]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalIntersect(all=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($9, 2)])
+      LogicalAggregate(group=[{0, 1, 2, 3, 4, 5, 6, 7, 8}], agg#0=[COUNT()])
+        LogicalUnion(all=[true])
+          LogicalAggregate(group=[{0, 1, 2, 3, 4, 5, 6, 7, 8}], agg#0=[COUNT()])
+            LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+              LogicalFilter(condition=[=($7, 10)])
+                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+          LogicalAggregate(group=[{0, 1, 2, 3, 4, 5, 6, 7, 8}], agg#0=[COUNT()])
+            LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+              LogicalFilter(condition=[=($7, 20)])
+                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 30)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceCasts">
-        <Resource name="sql">
-            <![CDATA[select cast(d.name as varchar(128)), cast(e.empno as integer)
-from dept as d inner join emp as e
-on cast(d.deptno as integer) = cast(e.deptno as integer)
-where cast(e.job as varchar(1)) = 'Manager']]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[CAST($1):VARCHAR(128) NOT NULL], EXPR$1=[CAST($2):INTEGER NOT NULL])
-  LogicalFilter(condition=[=(CAST(CAST($4):VARCHAR(1) NOT NULL):VARCHAR(7) NOT NULL, 'Manager')])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[$3], ENAME=[$4], JOB=[$5], MGR=[$6], HIREDATE=[$7], SAL=[$8], COMM=[$9], DEPTNO1=[$10], SLACKER=[$11])
-      LogicalJoin(condition=[=($2, $12)], joinType=[inner])
-        LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO0=[CAST($0):INTEGER NOT NULL])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[CAST($7):INTEGER NOT NULL])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testIsNullPushDown">
+    <Resource name="sql">
+      <![CDATA[select empno, deptno, w_count from (
+  select empno, deptno, count(empno) over (w) w_count
+  from emp
+  window w as (partition by deptno order by empno)
+) sub_query where w_count is null]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], DEPTNO=[$1], W_COUNT=[$2])
+  LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[CAST($1):VARCHAR(128) NOT NULL], EXPR$1=[$2])
-  LogicalFilter(condition=[=(CAST(CAST($4):VARCHAR(1) NOT NULL):VARCHAR(7) NOT NULL, 'Manager')])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[$3], ENAME=[$4], JOB=[$5], MGR=[$6], HIREDATE=[$7], SAL=[$8], COMM=[$9], DEPTNO1=[$10], SLACKER=[$11])
-      LogicalJoin(condition=[=($2, $12)], joinType=[inner])
-        LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO0=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$7])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], DEPTNO=[$1], W_COUNT=[$2])
+  LogicalFilter(condition=[IS NULL($2)])
+    LogicalProject(EMPNO=[$0], DEPTNO=[$7], $2=[$9])
+      LogicalWindow(window#0=[window(partition {7} order by [0] aggs [COUNT($0)])])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select ename,sum(empno),count(*) from (select * from emp as e1 union all select * from emp as e2) group by ename]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-AggregateRel(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[COUNT()])
-  ProjectRel(ENAME=[$1], EMPNO=[$0])
-    UnionRel(all=[true])
-      ProjectRel(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        TableAccessRel(table=[[CATALOG, SALES, EMP]])
-      ProjectRel(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        TableAccessRel(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testIsNullPushDown2">
+    <Resource name="sql">
+      <![CDATA[select empno, deptno, w_count from (
+  select empno, deptno, count(empno) over (ROWS BETWEEN 10 PRECEDING AND 1 PRECEDING) w_count
+  from emp
+) sub_query where w_count is null]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], DEPTNO=[$1], W_COUNT=[$2])
+  LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-ProjectRel(ENAME=[$0], EXPR$1=[$1], EXPR$2=[CAST($2):BIGINT NOT NULL])
-  AggregateRel(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[SUM($2)])
-    UnionRel(all=[true])
-      AggregateRel(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[COUNT()])
-        ProjectRel(ENAME=[$1], EMPNO=[$0])
-          ProjectRel(EMPNO=[$0], ENAME=[$1])
-            ProjectRel(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-              TableAccessRel(table=[[CATALOG, SALES, EMP]])
-      AggregateRel(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[COUNT()])
-        ProjectRel(ENAME=[$1], EMPNO=[$0])
-          ProjectRel(EMPNO=[$0], ENAME=[$1])
-            ProjectRel(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-              TableAccessRel(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], DEPTNO=[$1], W_COUNT=[$2])
+  LogicalFilter(condition=[IS NULL($2)])
+    LogicalProject(EMPNO=[$0], DEPTNO=[$7], $2=[$9])
+      LogicalWindow(window#0=[window(aggs [COUNT($0)])])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceCastAndConsts">
-        <Resource name="sql">
-            <![CDATA[select * from emp
-where cast((empno + (10/2)) as int) = 13]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[=(CAST(+($0, /(10, 2))):INTEGER NOT NULL, 13)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinAssociateRuleWithBottomAlwaysTrueConditionAllowed">
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalJoin(condition=[AND(=($2, $12), =($7, $8))], joinType=[inner])
+  LogicalTableScan(table=[[scott, EMP]])
+  LogicalJoin(condition=[true], joinType=[inner])
+    LogicalTableScan(table=[[scott, DEPT]])
+    LogicalTableScan(table=[[scott, BONUS]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[=(+($0, 5), 13)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinAssociateRuleWithBottomAlwaysTrueConditionDisallowed">
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalJoin(condition=[=($2, $12)], joinType=[inner])
+  LogicalJoin(condition=[=($7, $8)], joinType=[inner])
+    LogicalTableScan(table=[[scott, EMP]])
+    LogicalTableScan(table=[[scott, DEPT]])
+  LogicalTableScan(table=[[scott, BONUS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsCalc">
-        <Resource name="sql">
-            <![CDATA[select * from (
-  select upper(substring(x FROM 1 FOR 2) || substring(x FROM 3)) as u,
-      substring(x FROM 1 FOR 1) as s
-  from (
-    select 'table' as x from (values (true))
-    union
-    select 'view' from (values (true))
-    union
-    select 'foreign table' from (values (true))
-  )
-) where u = 'TABLE']]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(U=[$0], S=[$1])
-  LogicalFilter(condition=[=($0, 'TABLE')])
-    LogicalProject(U=[UPPER(||(SUBSTRING($0, 1, 2), SUBSTRING($0, 3)))], S=[SUBSTRING($0, 1, 1)])
-      LogicalUnion(all=[false])
-        LogicalUnion(all=[false])
-          LogicalProject(X=['table'])
-            LogicalValues(tuples=[[{ true }]])
-          LogicalProject(EXPR$0=['view'])
-            LogicalValues(tuples=[[{ true }]])
-        LogicalProject(EXPR$0=['foreign table'])
-          LogicalValues(tuples=[[{ true }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinAssociateRuleWithTopAlwaysTrueConditionAllowed">
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalJoin(condition=[=($7, $12)], joinType=[inner])
+  LogicalTableScan(table=[[scott, EMP]])
+  LogicalJoin(condition=[true], joinType=[inner])
+    LogicalTableScan(table=[[scott, BONUS]])
+    LogicalTableScan(table=[[scott, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalCalc(expr#0=[{inputs}], expr#1=['TABLE        ':VARCHAR(26)], expr#2=['t':VARCHAR(13)], U=[$t1], S=[$t2])
-  LogicalValues(tuples=[[{ true }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinAssociateRuleWithTopAlwaysTrueConditionDisallowed">
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalJoin(condition=[=($7, $12)], joinType=[inner])
+  LogicalJoin(condition=[true], joinType=[inner])
+    LogicalTableScan(table=[[scott, EMP]])
+    LogicalTableScan(table=[[scott, BONUS]])
+  LogicalTableScan(table=[[scott, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstants2">
-        <Resource name="sql">
-            <![CDATA[select p1 is not distinct from p0
-from (values (2, cast(null as integer))) as t(p0, p1)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[false])
-  LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinCommuteRuleWithAlwaysTrueConditionAllowed">
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$3], ENAME=[$4], JOB=[$5], MGR=[$6], HIREDATE=[$7], SAL=[$8], COMM=[$9], DEPTNO=[$10], DEPTNO0=[$0], DNAME=[$1], LOC=[$2])
+  LogicalJoin(condition=[true], joinType=[inner])
+    LogicalTableScan(table=[[scott, DEPT]])
+    LogicalTableScan(table=[[scott, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[false])
-  LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinCommuteRuleWithAlwaysTrueConditionDisallowed">
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalJoin(condition=[true], joinType=[inner])
+  LogicalTableScan(table=[[scott, EMP]])
+  LogicalTableScan(table=[[scott, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsProjectNullable">
-        <Resource name="sql">
-            <![CDATA[select mgr from emp where mgr=10]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(MGR=[$3])
-  LogicalFilter(condition=[=($3, 10)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinProjectTranspose1">
+    <Resource name="sql">
+      <![CDATA[select a.name
+from dept a
+left join dept b on b.deptno > 10
+right join dept c on b.deptno > 10
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(MGR=[CAST(10):INTEGER])
-  LogicalFilter(condition=[=($3, 10)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NAME=[$0])
+  LogicalJoin(condition=[$1], joinType=[right])
+    LogicalProject(NAME=[$1], $f4=[$5])
+      LogicalJoin(condition=[$4], joinType=[left])
+        LogicalProject(DEPTNO=[$0], NAME=[$1])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[>($0, 10)], >=[>($0, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(DEPTNO=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testLeftEmptyInnerJoin">
-        <Resource name="sql">
-            <![CDATA[select * from (
-select * from emp where false) as e
-join dept as d on e.deptno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[false])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$1])
+  LogicalJoin(condition=[>($2, 10)], joinType=[right])
+    LogicalJoin(condition=[>($2, 10)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalValues(tuples=[[]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testLeftEmptyLeftJoin">
-        <Resource name="sql">
-            <![CDATA[select * from (
-  select * from emp where false) e
-left join dept d on e.deptno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[=($7, $9)], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[false])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinProjectTranspose2">
+    <Resource name="sql">
+      <![CDATA[select *
+from dept a
+left join (select name, 1 from dept) as b
+on a.name = b.name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2], EXPR$1=[$3])
+  LogicalJoin(condition=[=($1, $2)], joinType=[left])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(NAME=[$1], EXPR$1=[1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalValues(tuples=[[]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2], EXPR$1=[$3])
+  LogicalJoin(condition=[=($1, $2)], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(NAME=[$1], EXPR$1=[1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testLeftEmptyRightJoin">
-        <Resource name="sql">
-            <![CDATA[select * from (
-  select * from emp where false) e
-right join dept d on e.deptno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[=($7, $9)], joinType=[right])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[false])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinProjectTranspose3">
+    <Resource name="sql">
+      <![CDATA[select *
+from (select name, 1 from dept) as a
+right join dept b
+on a.name = b.name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NAME=[$0], EXPR$1=[$1], DEPTNO=[$2], NAME0=[$3])
+  LogicalJoin(condition=[=($0, $3)], joinType=[right])
+    LogicalProject(NAME=[$1], EXPR$1=[1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[=($7, $9)], joinType=[right])
-    LogicalValues(tuples=[[]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$0], EXPR$1=[$1], DEPTNO=[$2], NAME0=[$3])
+  LogicalJoin(condition=[=($0, $3)], joinType=[right])
+    LogicalProject(NAME=[$1], EXPR$1=[1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testLeftEmptyFullJoin">
-        <Resource name="sql">
-            <![CDATA[select * from (
-  select * from emp where false) e
-full join dept d on e.deptno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[=($7, $9)], joinType=[full])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[false])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinProjectTranspose4">
+    <Resource name="sql">
+      <![CDATA[select *
+from dept a
+left join (select x name, y is not null from
+(values (2, cast(null as integer)), (2, 1)) as t(x, y)) b
+on a.name = b.name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$3], EXPR$1=[$4])
+  LogicalJoin(condition=[=($2, $3)], joinType=[left])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[CAST($1):INTEGER NOT NULL])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(NAME=[$0], EXPR$1=[IS NOT NULL($1)])
+      LogicalValues(tuples=[[{ 2, null }, { 2, 1 }]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2], EXPR$1=[$3])
+  LogicalJoin(condition=[=($1, $2)], joinType=[left])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(NAME=[$0], EXPR$1=[IS NOT NULL($1)])
+      LogicalUnion(all=[true])
+        LogicalProject(EXPR$0=[2], EXPR$1=[null:INTEGER])
+          LogicalValues(tuples=[[{ 0 }]])
+        LogicalProject(EXPR$0=[2], EXPR$1=[1])
+          LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[=($7, $9)], joinType=[full])
-    LogicalValues(tuples=[[]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinProjectTranspose5">
+    <Resource name="sql">
+      <![CDATA[select *
+from dept a
+left join (select name, 1 + 1 from dept) as b
+on a.name = b.name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2], EXPR$1=[$3])
+  LogicalJoin(condition=[=($1, $2)], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(NAME=[$1], EXPR$1=[+(1, 1)])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2], EXPR$1=[$3])
+  LogicalJoin(condition=[=($1, $2)], joinType=[left])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(NAME=[$1], EXPR$1=[+(1, 1)])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testLeftEmptySemiJoin">
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalJoin(condition=[=($7, $8)], joinType=[semi])
-    LogicalValues(tuples=[[]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinProjectTranspose6">
+    <Resource name="sql">
+      <![CDATA[select *
+from (select name, 1 from dept) a
+full join (select name, 1 from dept) as b
+on a.name = b.name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NAME=[$0], EXPR$1=[$1], NAME0=[$2], EXPR$10=[$3])
+  LogicalJoin(condition=[=($0, $2)], joinType=[full])
+    LogicalProject(NAME=[$1], EXPR$1=[1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(NAME=[$1], EXPR$1=[1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$0], EXPR$1=[$1], NAME0=[$2], EXPR$10=[$3])
+  LogicalJoin(condition=[=($0, $2)], joinType=[full])
+    LogicalProject(NAME=[$1], EXPR$1=[1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(NAME=[$1], EXPR$1=[1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinProjectTranspose7">
+    <Resource name="sql">
+      <![CDATA[select *
+from dept a
+left join (select name from dept) as b
+ on a.name = b.name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2])
+  LogicalJoin(condition=[=($1, $2)], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(NAME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2])
+  LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$3])
+    LogicalJoin(condition=[=($1, $3)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinProjectTranspose8">
+    <Resource name="sql">
+      <![CDATA[select *
+from dept a
+left join (
+  select name, deptno > 10 and cast(null as boolean)
+  from dept) as b
+on a.name = b.name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2], EXPR$1=[$3])
+  LogicalJoin(condition=[=($1, $2)], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(NAME=[$1], EXPR$1=[AND(>($0, 10), null)])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2], EXPR$1=[$3])
+  LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$3], EXPR$1=[AND(>($2, 10), null)])
+    LogicalJoin(condition=[=($1, $3)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinProjectTransposeWindow">
+    <Resource name="sql">
+      <![CDATA[select *
+from dept a
+join (select rank() over (order by name) as r, 1 + 1 from dept) as b
+on a.name = b.r]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], R=[$3], EXPR$1=[$4])
+  LogicalJoin(condition=[=($2, $3)], joinType=[inner])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[CAST($1):BIGINT NOT NULL])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(R=[RANK() OVER (ORDER BY $1)], EXPR$1=[+(1, 1)])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], R=[$3], EXPR$1=[$4])
+  LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[CAST($1):BIGINT NOT NULL], R=[$2], EXPR$1=[$3])
+    LogicalJoin(condition=[=(CAST($1):BIGINT NOT NULL, $2)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalProject(R=[RANK() OVER (ORDER BY $1)], EXPR$1=[+(1, 1)])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinPushTransitivePredicatesRule">
+    <Resource name="sql">
+      <![CDATA[select d.deptno from sales.emp d where d.deptno
+IN (select e.deptno from sales.emp e where e.deptno = d.deptno or e.deptno = 4)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{7}])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
+      LogicalAggregate(group=[{0}])
+        LogicalProject(DEPTNO=[$7])
+          LogicalFilter(condition=[OR(=($7, $cor0.DEPTNO), =($7, 4))])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinPushTransitivePredicatesRule2">
+    <Resource name="sql">
+      <![CDATA[select n1.SAL
+from EMPNULLABLES_20 n1
+where n1.SAL IN (
+  select n2.SAL
+  from EMPNULLABLES_20 n2
+  where n1.SAL = n2.SAL or n1.SAL = 4)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalJoin(condition=[AND(=($5, $11), =($9, $12))], joinType=[inner])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8], SAL0=[$5], $f9=[=($5, 4)])
+      LogicalFilter(condition=[AND(=($7, 20), >($5, 1000))])
+        LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
+    LogicalFilter(condition=[=($1, $0)])
+      LogicalAggregate(group=[{0, 1, 2}])
+        LogicalProject(SAL=[$5], SAL0=[$8], $f9=[$9])
+          LogicalJoin(condition=[OR(=($8, $5), $9)], joinType=[inner])
+            LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
+              LogicalFilter(condition=[AND(=($7, 20), >($5, 1000))])
+                LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
+            LogicalAggregate(group=[{0, 1}])
+              LogicalProject(SAL=[$5], $f9=[=($5, 4)])
+                LogicalFilter(condition=[AND(=($7, 20), >($5, 1000))])
+                  LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalJoin(condition=[AND(=($5, $11), =($9, $12))], joinType=[inner])
+    LogicalFilter(condition=[>($5, 1000)])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8], SAL0=[$5], $f9=[=($5, 4)])
+        LogicalFilter(condition=[AND(=($7, 20), >($5, 1000))])
+          LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
+    LogicalFilter(condition=[=($1, $0)])
+      LogicalAggregate(group=[{0, 1, 2}])
+        LogicalProject(SAL=[$5], SAL0=[$8], $f9=[$9])
+          LogicalJoin(condition=[OR(=($8, $5), $9)], joinType=[inner])
+            LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
+              LogicalFilter(condition=[AND(=($7, 20), >($5, 1000))])
+                LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
+            LogicalAggregate(group=[{0, 1}])
+              LogicalProject(SAL=[$5], $f9=[=($5, 4)])
+                LogicalFilter(condition=[AND(=($7, 20), >($5, 1000))])
+                  LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinToMultiJoinDoesNotMatchAntiJoin">
+    <Resource name="sql">
+      <![CDATA[select * from
+(select * from emp join dept ON emp.deptno = emp.deptno) t
+where not exists (select job from bonus where emp.job = bonus.job)]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalJoin(condition=[=($2, $12)], joinType=[anti])
+  MultiJoin(joinFilter=[=($7, $8)], isFullOuterJoin=[false], joinTypes=[[INNER, INNER]], outerJoinConditions=[[NULL, NULL]], projFields=[[ALL, ALL]])
+    LogicalTableScan(table=[[scott, EMP]])
     LogicalTableScan(table=[[scott, DEPT]])
+  LogicalTableScan(table=[[scott, BONUS]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalValues(tuples=[[]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinToMultiJoinDoesNotMatchSemiJoin">
+    <Resource name="sql">
+      <![CDATA[select * from
+(select * from emp join dept ON emp.deptno = emp.deptno) t
+where emp.job in (select job from bonus))]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalJoin(condition=[=($2, $12)], joinType=[semi])
+  MultiJoin(joinFilter=[=($7, $8)], isFullOuterJoin=[false], joinTypes=[[INNER, INNER]], outerJoinConditions=[[NULL, NULL]], projFields=[[ALL, ALL]])
+    LogicalTableScan(table=[[scott, EMP]])
+    LogicalTableScan(table=[[scott, DEPT]])
+  LogicalTableScan(table=[[scott, BONUS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testLeftEmptyAntiJoin">
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testLeftEmptyAntiJoin">
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0])
   LogicalJoin(condition=[=($7, $8)], joinType=[anti])
     LogicalValues(tuples=[[]])
     LogicalTableScan(table=[[scott, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EMPNO=[$0])
   LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testRightEmptyInnerJoin">
-        <Resource name="sql">
-            <![CDATA[select * from emp e
-join (select * from dept where false) as d
-on e.deptno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testLeftEmptyFullJoin">
+    <Resource name="sql">
+      <![CDATA[select * from (
+  select * from emp where false) e
+full join dept d on e.deptno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], NAME=[$1])
+  LogicalJoin(condition=[=($7, $9)], joinType=[full])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
       LogicalFilter(condition=[false])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalValues(tuples=[[]])
+  LogicalJoin(condition=[=($7, $9)], joinType=[full])
+    LogicalValues(tuples=[[]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testRightEmptyLeftJoin">
-        <Resource name="sql">
-            <![CDATA[select * from emp e
-left join (select * from dept where false) as d
-on e.deptno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testLeftEmptyInnerJoin">
+    <Resource name="sql">
+      <![CDATA[select * from (
+select * from emp where false) as e
+join dept as d on e.deptno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[=($7, $9)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], NAME=[$1])
+  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
       LogicalFilter(condition=[false])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[=($7, $9)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalValues(tuples=[[]])
+  LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testRightEmptyRightJoin">
-        <Resource name="sql">
-            <![CDATA[select * from emp e
-right join (select * from dept where false) as d
-on e.deptno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testLeftEmptyLeftJoin">
+    <Resource name="sql">
+      <![CDATA[select * from (
+  select * from emp where false) e
+left join dept d on e.deptno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[=($7, $9)], joinType=[right])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], NAME=[$1])
+  LogicalJoin(condition=[=($7, $9)], joinType=[left])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
       LogicalFilter(condition=[false])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
   LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testRightEmptyFullJoin">
-        <Resource name="sql">
-            <![CDATA[select * from emp e
-full join (select * from dept where false) as d
-on e.deptno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testLeftEmptyRightJoin">
+    <Resource name="sql">
+      <![CDATA[select * from (
+  select * from emp where false) e
+right join dept d on e.deptno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[=($7, $9)], joinType=[full])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], NAME=[$1])
+  LogicalJoin(condition=[=($7, $9)], joinType=[right])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
       LogicalFilter(condition=[false])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[=($7, $9)], joinType=[full])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalJoin(condition=[=($7, $9)], joinType=[right])
     LogicalValues(tuples=[[]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testRightEmptySemiJoin">
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testLeftEmptySemiJoin">
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0])
   LogicalJoin(condition=[=($7, $8)], joinType=[semi])
-    LogicalTableScan(table=[[scott, EMP]])
     LogicalValues(tuples=[[]])
+    LogicalTableScan(table=[[scott, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EMPNO=[$0])
   LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testRightEmptyAntiJoin">
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalJoin(condition=[=($7, $8)], joinType=[anti])
-    LogicalTableScan(table=[[scott, EMP]])
-    LogicalValues(tuples=[[]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testLeftOuterJoinSimplificationToInner">
+    <Resource name="sql">
+      <![CDATA[select 1 from sales.dept d left outer join sales.emp e
+on d.deptno = e.deptno
+where e.sal > 100]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalFilter(condition=[>($7, 100)])
+    LogicalJoin(condition=[=($0, $9)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalTableScan(table=[[scott, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[CAST($2):INTEGER], ENAME=[CAST($3):VARCHAR(20)], JOB=[CAST($4):VARCHAR(10)], MGR=[$5], HIREDATE=[CAST($6):TIMESTAMP(0)], SAL=[CAST($7):INTEGER], COMM=[CAST($8):INTEGER], DEPTNO0=[CAST($9):INTEGER], SLACKER=[CAST($10):BOOLEAN])
+    LogicalJoin(condition=[=($0, $9)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalFilter(condition=[>($5, 100)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testRightEmptyAntiJoinNonEqui">
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalJoin(condition=[AND(=($7, $8), =($5, 2000))], joinType=[anti])
-    LogicalTableScan(table=[[scott, EMP]])
-    LogicalValues(tuples=[[]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testLimitSort">
+    <Resource name="sql">
+      <![CDATA[select mgr from sales.emp
+union select mgr from sales.emp
+order by mgr limit 10 offset 5]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[ASC], offset=[5], fetch=[10])
+  LogicalProject(MGR=[$0])
+    LogicalUnion(all=[false])
+      LogicalProject(MGR=[$3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(MGR=[$3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalTableScan(table=[[scott, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+EnumerableLimitSort(sort0=[$0], dir0=[ASC], offset=[5], fetch=[10])
+  EnumerableProject(MGR=[$0])
+    EnumerableUnion(all=[false])
+      EnumerableProject(MGR=[$3])
+        EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+      EnumerableProject(MGR=[$3])
+        EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testEmptyLimitZero">
-        <Resource name="sql">
-            <![CDATA[select * from emp order by deptno limit 0]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-SortRel(sort0=[$7], dir0=[Ascending], fetch=[0])
-  ProjectRel(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    TableAccessRel(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testManyFiltersOnTopOfMultiJoinShouldCollapse">
+    <Resource name="sql">
+      <![CDATA[select * from (select * from emp e1 left outer join dept d
+on e1.deptno = d.deptno
+where d.deptno > 3) where ename LIKE 'bar']]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalFilter(condition=[LIKE($1, 'bar')])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+      LogicalFilter(condition=[>($9, 3)])
+        LogicalJoin(condition=[=($7, $9)], joinType=[left])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-EmptyRel
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[INNER, LEFT]], outerJoinConditions=[[NULL, =($7, $9)]], projFields=[[{0, 1, 2, 3, 4, 5, 6, 7, 8}, {0, 1}]], postJoinFilter=[AND(LIKE($1, 'bar'), >($9, 3))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testEmptySort">
-        <Resource name="sql">
-            <![CDATA[select * from emp where false order by deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$7], dir0=[ASC])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[false])
+    </Resource>
+  </TestCase>
+  <TestCase name="testMaxReuseDistinctAttrWithMixedOptionality">
+    <Resource name="sql">
+      <![CDATA[select sum(distinct deptno), count(distinct deptno), max(deptno) from emp]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM(DISTINCT $0)], EXPR$1=[COUNT(DISTINCT $0)], EXPR$2=[MAX($0)])
+  LogicalProject(DEPTNO=[$7])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($0)], EXPR$1=[COUNT($0)], EXPR$2=[MAX($0)])
+  LogicalAggregate(group=[{0}])
+    LogicalProject(DEPTNO=[$7])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalValues(tuples=[[]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testMergeFilter">
+    <Resource name="sql">
+      <![CDATA[select name from (
+  select *
+  from dept
+  where deptno = 10)
+where deptno = 10
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testEmptySort2">
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
-  LogicalValues(tuples=[[]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NAME=[$1])
+  LogicalFilter(condition=[=($0, 10)])
+    LogicalProject(DEPTNO=[$0], NAME=[$1])
+      LogicalFilter(condition=[=($0, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalValues(tuples=[[]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$1])
+  LogicalProject(DEPTNO=[$0], NAME=[$1])
+    LogicalFilter(condition=[=($0, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testEmptySortLimitZero">
-        <Resource name="sql">
-            <![CDATA[select * from emp order by deptno limit 0]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$7], dir0=[ASC], fetch=[0])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    </Resource>
+  </TestCase>
+  <TestCase name="testMergeFilterWithJoinCondition">
+    <Resource name="sql">
+      <![CDATA[select d.name as dname,e.ename as ename
+ from emp e inner join dept d
+ on e.deptno=d.deptno
+ where d.name='Propane']]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DNAME=[$10], ENAME=[$1])
+  LogicalFilter(condition=[=($10, 'Propane')])
+    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalCalc(expr#0..10=[{inputs}], expr#11=[=($t7, $t9)], expr#12=['Propane':VARCHAR(10)], expr#13=[=($t10, $t12)], expr#14=[AND($t11, $t13)], DNAME=[$t10], ENAME=[$t1], $condition=[$t14])
+  LogicalJoin(condition=[true], joinType=[inner])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalValues(tuples=[[]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testMergeIntersect">
+    <Resource name="sql">
+      <![CDATA[select * from emp where deptno = 10
+intersect
+select * from emp where deptno = 20
+intersect
+select * from emp where deptno = 30
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpandWhereComparisonCorrelated">
-        <Resource name="sql">
-            <![CDATA[select empno
-from sales.emp as e
-where sal = (
-  select max(sal) from sales.emp e2 where e2.empno = e.empno)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[=($5, $SCALAR_QUERY({
-LogicalAggregate(group=[{}], EXPR$0=[MAX($0)])
-  LogicalProject(SAL=[$5])
-    LogicalFilter(condition=[=($0, $cor0.EMPNO)])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalIntersect(all=[false])
+  LogicalIntersect(all=[false])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($7, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($7, 20)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 30)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}))], variablesSet=[[$cor0]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalIntersect(all=[false])
   LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($5, $9)])
-      LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0}])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{}], EXPR$0=[MAX($0)])
-          LogicalProject(SAL=[$5])
-            LogicalFilter(condition=[=($0, $cor0.EMPNO)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCustomColumnResolvingInNonCorrelatedSubQuery">
-        <Resource name="sql">
-            <![CDATA[select *
-from struct.t t1
-where c0 in (
-  select f1.c0 from struct.t t2)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
-  LogicalFilter(condition=[IN($4, {
-LogicalProject(C0=[$5])
-  LogicalTableScan(table=[[CATALOG, STRUCT, T]])
-})])
-    LogicalTableScan(table=[[CATALOG, STRUCT, T]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
-  LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
-    LogicalJoin(condition=[=($4, $9)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, STRUCT, T]])
-      LogicalAggregate(group=[{0}])
-        LogicalProject(C0=[$5])
-          LogicalTableScan(table=[[CATALOG, STRUCT, T]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCustomColumnResolvingInCorrelatedSubQuery">
-        <Resource name="sql">
-            <![CDATA[select *
-from struct.t t1
-where c0 = (
-  select max(f1.c0) from struct.t t2 where t1.k0 = t2.k0)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
-  LogicalFilter(condition=[=($4, $SCALAR_QUERY({
-LogicalAggregate(group=[{}], EXPR$0=[MAX($0)])
-  LogicalProject("F1"."C0"=[$5])
-    LogicalFilter(condition=[=($cor0."K0", $0)])
-      LogicalTableScan(table=[[CATALOG, STRUCT, T]])
-}))], variablesSet=[[$cor0]])
-    LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+    LogicalFilter(condition=[=($7, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 20)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 30)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
-  LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
-    LogicalFilter(condition=[=($4, $9)])
-      LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0}])
-        LogicalTableScan(table=[[CATALOG, STRUCT, T]])
-        LogicalAggregate(group=[{}], EXPR$0=[MAX($0)])
-          LogicalProject("F1"."C0"=[$5])
-            LogicalFilter(condition=[=($cor0."K0", $0)])
-              LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testMergeJoinCollation">
+    <Resource name="sql">
+      <![CDATA[select r.ename, s.sal from
+sales.emp r join sales.bonus s
+on r.ename=s.ename where r.sal+1=s.sal]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(ENAME=[$1], SAL=[$11])
+  LogicalFilter(condition=[=(+($5, 1), $11)])
+    LogicalJoin(condition=[=($1, $9)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCustomColumnResolvingInCorrelatedSubQuery2">
-        <Resource name="sql">
-            <![CDATA[select *
-from struct.t t1
-where c0 in (
-  select f1.c0 from struct.t t2 where t1.c2 = t2.c2)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
-  LogicalFilter(condition=[IN($4, {
-LogicalProject(C0=[$5])
-  LogicalFilter(condition=[=($cor0."F1"."C2", $7)])
-    LogicalTableScan(table=[[CATALOG, STRUCT, T]])
-})], variablesSet=[[$cor0]])
-    LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+EnumerableProject(ENAME=[$5], SAL=[$2])
+  EnumerableHashJoin(condition=[AND(=($0, $5), =(+($9, 1), $2))], joinType=[inner])
+    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
-  LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
-    LogicalFilter(condition=[=($4, $9)])
-      LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{7}])
-        LogicalTableScan(table=[[CATALOG, STRUCT, T]])
-        LogicalAggregate(group=[{0}])
-          LogicalProject(C0=[$5])
-            LogicalFilter(condition=[=($cor0."F1"."C2", $7)])
-              LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testMergeJoinFilter">
+    <Resource name="sql">
+      <![CDATA[select * from (
+  select d.deptno, e.ename
+  from emp as e
+  join dept as d
+  on e.deptno = d.deptno
+  and d.deptno = 10)
+where deptno = 10
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDecorrelateAggWithConstantGroupKey">
-        <Resource name="sql">
-            <![CDATA[SELECT * FROM emp A where sal in
-(SELECT max(sal) FROM emp B where A.mgr = B.empno group by deptno, 'abc')]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{3, 5}])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[=($cor0.SAL, $0)])
-      LogicalAggregate(group=[{0}])
-        LogicalProject(EXPR$0=[$2])
-          LogicalAggregate(group=[{0, 1}], EXPR$0=[MAX($2)])
-            LogicalProject(DEPTNO=[$7], $f1=['abc'], SAL=[$5])
-              LogicalFilter(condition=[=($cor0.MGR, $0)])
-                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], ENAME=[$1])
+  LogicalFilter(condition=[=($0, 10)])
+    LogicalProject(DEPTNO=[$9], ENAME=[$1])
+      LogicalJoin(condition=[AND(=($7, $9), =($9, 10))], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{3, 5}])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[=($cor0.SAL, $0)])
-      LogicalAggregate(group=[{0}])
-        LogicalProject(EXPR$0=[$2])
-          LogicalAggregate(group=[{0, 1}], EXPR$0=[MAX($2)])
-            LogicalProject(DEPTNO=[$7], $f1=['abc'], SAL=[$5])
-              LogicalFilter(condition=[=($cor0.MGR, $0)])
-                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], ENAME=[$1])
+  LogicalProject(DEPTNO=[$9], ENAME=[$1])
+    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalFilter(condition=[=($0, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalJoin(condition=[AND(=($3, $10), =($5, $9))], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0, 1}])
-      LogicalProject(EXPR$0=[$2], EMPNO=[$1])
-        LogicalAggregate(group=[{0, 1}], EXPR$0=[MAX($2)])
-          LogicalProject(DEPTNO=[$7], EMPNO=[$0], SAL=[$5])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testMergeMinus">
+    <Resource name="sql">
+      <![CDATA[select * from emp where deptno = 10
+except
+select * from emp where deptno = 20
+except
+select * from emp where deptno = 30
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDecorrelateAggWithMultiParamsAggCall">
-        <Resource name="sql">
-            <![CDATA[SELECT * FROM (SELECT MYAGG(sal, 1) AS c FROM emp) as m,
- LATERAL TABLE(ramp(m.c)) AS T(s)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(C=[$0], S=[$1])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
-    LogicalAggregate(group=[{}], C=[MYAGG($0, $1)])
-      LogicalProject(SAL=[$5], $f1=[1])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalMinus(all=[false])
+  LogicalMinus(all=[false])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($7, 10)])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableFunctionScan(invocation=[RAMP($cor0.C)], rowType=[RecordType(INTEGER I)])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($7, 20)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 30)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
-LogicalProject(C=[$0], S=[$1])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
-    LogicalAggregate(group=[{}], C=[MYAGG($0, $1)])
-      LogicalProject(SAL=[$5], $f1=[1])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableFunctionScan(invocation=[RAMP($cor0.C)], rowType=[RecordType(INTEGER I)])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalMinus(all=[false])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 20)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 30)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDecorrelateAggWithMultiParamsAggCall2">
-        <Resource name="sql">
-            <![CDATA[SELECT * FROM (SELECT MYAGG(sal, 1) AS c FROM emp group by empno, 'abc') as m,
- LATERAL TABLE(ramp(m.c)) AS T(s)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(C=[$0], S=[$1])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
-    LogicalProject(C=[$2])
-      LogicalAggregate(group=[{0, 1}], C=[MYAGG($2, $3)])
-        LogicalProject(EMPNO=[$0], $f1=['abc'], SAL=[$5], $f3=[1])
+    </Resource>
+  </TestCase>
+  <TestCase name="testMergeMinusRightDeep">
+    <Resource name="sql">
+      <![CDATA[select * from emp where deptno = 10
+except
+select * from (
+  select * from emp where deptno = 20
+  except
+  select * from emp where deptno = 30)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalMinus(all=[false])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalMinus(all=[false])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalFilter(condition=[=($7, 20)])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableFunctionScan(invocation=[RAMP($cor0.C)], rowType=[RecordType(INTEGER I)])
-]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
-LogicalProject(C=[$0], S=[$1])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
-    LogicalProject(C=[$2])
-      LogicalAggregate(group=[{0, 1}], C=[MYAGG($2, $3)])
-        LogicalProject(EMPNO=[$0], $f1=['abc'], SAL=[$5], $f3=[1])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalFilter(condition=[=($7, 30)])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableFunctionScan(invocation=[RAMP($cor0.C)], rowType=[RecordType(INTEGER I)])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExtractYearMonthToRange">
-        <Resource name="sql">
-            <![CDATA[select *
-from sales.emp_b as e
-where extract(year from birthdate) = 2014and extract(month from birthdate) = 4]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], BIRTHDATE=[$9])
-  LogicalFilter(condition=[AND(=(EXTRACT(FLAG(YEAR), $9), 2014), =(EXTRACT(FLAG(MONTH), $9), 4))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP_B]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], BIRTHDATE=[$9])
-  LogicalFilter(condition=[SEARCH($9, Sarg[[2014-04-01..2014-05-01)])])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP_B]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testMergeSetOpMixed">
+    <Resource name="sql">
+      <![CDATA[select * from emp where deptno = 10
+union
+select * from emp where deptno = 20
+intersect
+select * from emp where deptno = 30
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExtractYearToRange">
-        <Resource name="sql">
-            <![CDATA[select *
-from sales.emp_b as e
-where extract(year from birthdate) = 2014]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], BIRTHDATE=[$9])
-  LogicalFilter(condition=[=(EXTRACT(FLAG(YEAR), $9), 2014)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP_B]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalUnion(all=[false])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalIntersect(all=[false])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($7, 20)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($7, 30)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], BIRTHDATE=[$9])
-  LogicalFilter(condition=[SEARCH($9, Sarg[[2014-01-01..2015-01-01)])])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP_B]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testMergeUnion">
+    <Resource name="sql">
+      <![CDATA[select * from emp where deptno = 10
+union all
+select * from emp where deptno = 20
+union all
+select * from emp where deptno = 30
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testFilterProjectTranspose">
-        <Resource name="sql">
-            <![CDATA[SELECT e.empno
-FROM emp as e
-WHERE exists (
-  SELECT *
-  FROM (
-    SELECT deptno * 2 AS twiceDeptno
-    FROM dept) AS d
-  WHERE e.deptno = d.twiceDeptno)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[IS NOT NULL($9)])
-    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalUnion(all=[true])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($7, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($7, 20)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 30)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
-            LogicalProject(TWICEDEPTNO=[*($0, 2)])
-              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[IS NOT NULL($9)])
-    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 10)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalProject(TWICEDEPTNO=[*($0, 2)])
-            LogicalFilter(condition=[=($cor0.DEPTNO, *($0, 2))])
-              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testFilterProjectTransposePreventedByCorrelation">
-        <Resource name="sql">
-            <![CDATA[SELECT e.empno
-FROM emp as e
-WHERE exists (
-  SELECT *
-  FROM (
-    SELECT deptno * 2 AS twiceDeptno
-    FROM dept) AS d
-  WHERE e.deptno = d.twiceDeptno)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[IS NOT NULL($9)])
-    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 20)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 30)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
-            LogicalProject(TWICEDEPTNO=[*($0, 2)])
-              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testFilterRemoveIsNotDistinctFromRule">
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalFilter(condition=[IS NOT DISTINCT FROM($7, 20)])
-  LogicalTableScan(table=[[scott, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testMergeUnionAll">
+    <Resource name="sql">
+      <![CDATA[select * from emp where deptno = 10
+union all
+select * from emp where deptno = 20
+union all
+select * from emp where deptno = 30
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalFilter(condition=[=($7, 20)])
-  LogicalTableScan(table=[[scott, EMP]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalUnion(all=[true])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($7, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($7, 20)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 30)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInferringPredicatesWithNotOperatorInJoinCondition">
-        <Resource name="sql">
-            <![CDATA[select * from sales.emp d
-join sales.emp e on e.deptno = d.deptno and d.deptno not in (4, 6)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EMPNO0=[$9], ENAME0=[$10], JOB0=[$11], MGR0=[$12], HIREDATE0=[$13], SAL0=[$14], COMM0=[$15], DEPTNO0=[$16], SLACKER0=[$17])
-  LogicalJoin(condition=[AND(=($16, $7), NOT(OR(=($7, 4), =($7, 6))))], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 20)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 30)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EMPNO0=[$9], ENAME0=[$10], JOB0=[$11], MGR0=[$12], HIREDATE0=[$13], SAL0=[$14], COMM0=[$15], DEPTNO0=[$16], SLACKER0=[$17])
-  LogicalJoin(condition=[=($16, $7)], joinType=[inner])
-    LogicalFilter(condition=[SEARCH($7, Sarg[(-∞..4), (4..6), (6..+∞)])])
-      LogicalFilter(condition=[NOT(OR(=($7, 4), =($7, 6)))])
+    </Resource>
+  </TestCase>
+  <TestCase name="testMergeUnionDistinct">
+    <Resource name="sql">
+      <![CDATA[select * from emp where deptno = 10
+union distinct
+select * from emp where deptno = 20
+union
+select * from emp where deptno = 30
+]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalUnion(all=[false])
+  LogicalUnion(all=[false])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($7, 10)])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[SEARCH($7, Sarg[(-∞..4), (4..6), (6..+∞)])])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($7, 20)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 30)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testIntersectToDistinct">
-        <Resource name="sql">
-            <![CDATA[select * from emp where deptno = 10
-intersect
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalUnion(all=[false])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 20)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 30)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testMergeUnionMixed">
+    <Resource name="sql">
+      <![CDATA[select * from emp where deptno = 10
+union
 select * from emp where deptno = 20
-intersect
+union all
 select * from emp where deptno = 30
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalIntersect(all=[false])
-  LogicalIntersect(all=[false])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalUnion(all=[false])
     LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
       LogicalFilter(condition=[=($7, 10)])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
@@ -3652,41 +5100,21 @@ LogicalIntersect(all=[false])
     LogicalFilter(condition=[=($7, 30)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[=($9, 3)])
-    LogicalAggregate(group=[{0, 1, 2, 3, 4, 5, 6, 7, 8}], agg#0=[COUNT()])
-      LogicalUnion(all=[true])
-        LogicalAggregate(group=[{0, 1, 2, 3, 4, 5, 6, 7, 8}], agg#0=[COUNT()])
-          LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-            LogicalFilter(condition=[=($7, 10)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{0, 1, 2, 3, 4, 5, 6, 7, 8}], agg#0=[COUNT()])
-          LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-            LogicalFilter(condition=[=($7, 20)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{0, 1, 2, 3, 4, 5, 6, 7, 8}], agg#0=[COUNT()])
-          LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-            LogicalFilter(condition=[=($7, 30)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testIntersectToDistinctAll">
-        <Resource name="sql">
-            <![CDATA[select * from emp where deptno = 10
-intersect
+    </Resource>
+  </TestCase>
+  <TestCase name="testMergeUnionMixed2">
+    <Resource name="sql">
+      <![CDATA[select * from emp where deptno = 10
+union all
 select * from emp where deptno = 20
-intersect all
+union
 select * from emp where deptno = 30
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalIntersect(all=[true])
-  LogicalIntersect(all=[false])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalUnion(all=[false])
+  LogicalUnion(all=[true])
     LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
       LogicalFilter(condition=[=($7, 10)])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
@@ -3697,3540 +5125,1006 @@ LogicalIntersect(all=[true])
     LogicalFilter(condition=[=($7, 30)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalIntersect(all=[true])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalUnion(all=[false])
   LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($9, 2)])
-      LogicalAggregate(group=[{0, 1, 2, 3, 4, 5, 6, 7, 8}], agg#0=[COUNT()])
-        LogicalUnion(all=[true])
-          LogicalAggregate(group=[{0, 1, 2, 3, 4, 5, 6, 7, 8}], agg#0=[COUNT()])
-            LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-              LogicalFilter(condition=[=($7, 10)])
-                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-          LogicalAggregate(group=[{0, 1, 2, 3, 4, 5, 6, 7, 8}], agg#0=[COUNT()])
-            LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-              LogicalFilter(condition=[=($7, 20)])
-                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[=($7, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 20)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
   LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
     LogicalFilter(condition=[=($7, 30)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinAssociateRuleWithBottomAlwaysTrueConditionAllowed">
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalJoin(condition=[AND(=($2, $12), =($7, $8))], joinType=[inner])
-  LogicalTableScan(table=[[scott, EMP]])
-  LogicalJoin(condition=[true], joinType=[inner])
-    LogicalTableScan(table=[[scott, DEPT]])
-    LogicalTableScan(table=[[scott, BONUS]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinAssociateRuleWithBottomAlwaysTrueConditionDisallowed">
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalJoin(condition=[=($2, $12)], joinType=[inner])
-  LogicalJoin(condition=[=($7, $8)], joinType=[inner])
-    LogicalTableScan(table=[[scott, EMP]])
-    LogicalTableScan(table=[[scott, DEPT]])
-  LogicalTableScan(table=[[scott, BONUS]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinAssociateRuleWithTopAlwaysTrueConditionAllowed">
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalJoin(condition=[=($7, $12)], joinType=[inner])
-  LogicalTableScan(table=[[scott, EMP]])
-  LogicalJoin(condition=[true], joinType=[inner])
-    LogicalTableScan(table=[[scott, BONUS]])
-    LogicalTableScan(table=[[scott, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinAssociateRuleWithTopAlwaysTrueConditionDisallowed">
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalJoin(condition=[=($7, $12)], joinType=[inner])
-  LogicalJoin(condition=[true], joinType=[inner])
-    LogicalTableScan(table=[[scott, EMP]])
-    LogicalTableScan(table=[[scott, BONUS]])
-  LogicalTableScan(table=[[scott, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testMinReuseDistinctAttrWithMixedOptionality">
+    <Resource name="sql">
+      <![CDATA[select sum(distinct deptno), count(distinct deptno), min(deptno) from emp]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM(DISTINCT $0)], EXPR$1=[COUNT(DISTINCT $0)], EXPR$2=[MIN($0)])
+  LogicalProject(DEPTNO=[$7])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinCommuteRuleWithAlwaysTrueConditionAllowed">
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$3], ENAME=[$4], JOB=[$5], MGR=[$6], HIREDATE=[$7], SAL=[$8], COMM=[$9], DEPTNO=[$10], DEPTNO0=[$0], DNAME=[$1], LOC=[$2])
-  LogicalJoin(condition=[true], joinType=[inner])
-    LogicalTableScan(table=[[scott, DEPT]])
-    LogicalTableScan(table=[[scott, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($0)], EXPR$1=[COUNT($0)], EXPR$2=[MIN($0)])
+  LogicalAggregate(group=[{0}])
+    LogicalProject(DEPTNO=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinCommuteRuleWithAlwaysTrueConditionDisallowed">
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalJoin(condition=[true], joinType=[inner])
-  LogicalTableScan(table=[[scott, EMP]])
-  LogicalTableScan(table=[[scott, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testMinusMergeRule">
+    <Resource name="sql">
+      <![CDATA[select * from (
+select * from (
+  select name, deptno from
+  (
+    select name, deptno, count(1) from dept group by name, deptno
+    except all
+    select name, deptno, 1 from dept
+  ) subq
+  except all
+  select name, deptno from
+  (
+    select name, deptno, 1 from dept
+    except all
+    select name, deptno, count(1) from dept group by name, deptno
+  ) subq2
+) a
+except all
+select name, deptno from dept
+) aa
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinProjectTransposeWindow">
-        <Resource name="sql">
-            <![CDATA[select *
-from dept a
-join (select rank() over (order by name) as r, 1 + 1 from dept) as b
-on a.name = b.r]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], R=[$3], EXPR$1=[$4])
-  LogicalJoin(condition=[=($2, $3)], joinType=[inner])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[CAST($1):BIGINT NOT NULL])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(R=[RANK() OVER (ORDER BY $1)], EXPR$1=[+(1, 1)])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalMinus(all=[true])
+  LogicalProject(NAME=[$0], DEPTNO=[$1])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
+      LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+  LogicalProject(NAME=[$0], DEPTNO=[$1])
+    LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+  LogicalMinus(all=[true])
+    LogicalProject(NAME=[$0], DEPTNO=[$1])
+      LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(NAME=[$0], DEPTNO=[$1])
+      LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
+        LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+  LogicalProject(NAME=[$1], DEPTNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], R=[$3], EXPR$1=[$4])
-  LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[CAST($1):BIGINT NOT NULL], R=[$2], EXPR$1=[$3])
-    LogicalJoin(condition=[=(CAST($1):BIGINT NOT NULL, $2)], joinType=[inner])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NAME=[$0], DEPTNO=[$1])
+  LogicalMinus(all=[true])
+    LogicalProject(NAME=[$0], DEPTNO=[$1])
+      LogicalMinus(all=[true])
+        LogicalProject(NAME=[$0], DEPTNO=[$1])
+          LogicalMinus(all=[true])
+            LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
+              LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
+                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+            LogicalProject(NAME=[$1], DEPTNO=[$0], EXPR$2=[1])
+              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalProject(NAME=[$0], DEPTNO=[$1])
+          LogicalMinus(all=[true])
+            LogicalProject(NAME=[$1], DEPTNO=[$0], EXPR$2=[1])
+              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+            LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
+              LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
+                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(NAME=[$1], DEPTNO=[$0])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalProject(R=[RANK() OVER (ORDER BY $1)], EXPR$1=[+(1, 1)])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinPushTransitivePredicatesRule">
-        <Resource name="sql">
-            <![CDATA[select d.deptno from sales.emp d where d.deptno
-IN (select e.deptno from sales.emp e where e.deptno = d.deptno or e.deptno = 4)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{7}])
+    </Resource>
+  </TestCase>
+  <TestCase name="testMultipleDistinctWithGrouping">
+    <Resource name="sql">
+      <![CDATA[SELECT sal, SUM(comm), AVG(DISTINCT comm), SUM(DISTINCT sal)
+FROM emp
+GROUP BY sal]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[AVG(DISTINCT $1)], EXPR$3=[SUM(DISTINCT $0)])
+  LogicalProject(SAL=[$5], COMM=[$6])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(SAL=[$0], EXPR$1=[$1], EXPR$2=[$3], EXPR$3=[$5])
+  LogicalJoin(condition=[IS NOT DISTINCT FROM($0, $4)], joinType=[inner])
+    LogicalJoin(condition=[IS NOT DISTINCT FROM($0, $2)], joinType=[inner])
+      LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
+        LogicalProject(SAL=[$5], COMM=[$6])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{0}], EXPR$2=[AVG($1)])
+        LogicalAggregate(group=[{0, 1}])
+          LogicalProject(SAL=[$5], COMM=[$6])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}], EXPR$3=[SUM($0)])
       LogicalAggregate(group=[{0}])
-        LogicalProject(DEPTNO=[$7])
-          LogicalFilter(condition=[OR(=($7, $cor0.DEPTNO), =($7, 4))])
+        LogicalProject(SAL=[$0])
+          LogicalProject(SAL=[$5], COMM=[$6])
             LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinPushTransitivePredicatesRule2">
-        <Resource name="sql">
-            <![CDATA[select n1.SAL
-from EMPNULLABLES_20 n1
-where n1.SAL IN (
-  select n2.SAL
-  from EMPNULLABLES_20 n2
-  where n1.SAL = n2.SAL or n1.SAL = 4)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalJoin(condition=[AND(=($5, $11), =($9, $12))], joinType=[inner])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8], SAL0=[$5], $f9=[=($5, 4)])
-      LogicalFilter(condition=[AND(=($7, 20), >($5, 1000))])
-        LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
-    LogicalFilter(condition=[=($1, $0)])
-      LogicalAggregate(group=[{0, 1, 2}])
-        LogicalProject(SAL=[$5], SAL0=[$8], $f9=[$9])
-          LogicalJoin(condition=[OR(=($8, $5), $9)], joinType=[inner])
-            LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
-              LogicalFilter(condition=[AND(=($7, 20), >($5, 1000))])
-                LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
-            LogicalAggregate(group=[{0, 1}])
-              LogicalProject(SAL=[$5], $f9=[=($5, 4)])
-                LogicalFilter(condition=[AND(=($7, 20), >($5, 1000))])
-                  LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testNestedAggregates">
+    <Resource name="sql">
+      <![CDATA[SELECT
+  avg(sum(sal) + 2 * min(empno) + 3 * avg(empno))
+  over (partition by deptno)
+from emp
+group by deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[CAST(/(SUM(+(+($1, *(2, $2)), *(3, $3))) OVER (PARTITION BY $0), COUNT(+(+($1, *(2, $2)), *(3, $3))) OVER (PARTITION BY $0))):INTEGER NOT NULL])
+  LogicalAggregate(group=[{0}], agg#0=[SUM($1)], agg#1=[MIN($2)], agg#2=[AVG($2)])
+    LogicalProject(DEPTNO=[$7], SAL=[$5], EMPNO=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalJoin(condition=[AND(=($5, $11), =($9, $12))], joinType=[inner])
-    LogicalFilter(condition=[>($5, 1000)])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8], SAL0=[$5], $f9=[=($5, 4)])
-        LogicalFilter(condition=[AND(=($7, 20), >($5, 1000))])
-          LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
-    LogicalFilter(condition=[=($1, $0)])
-      LogicalAggregate(group=[{0, 1, 2}])
-        LogicalProject(SAL=[$5], SAL0=[$8], $f9=[$9])
-          LogicalJoin(condition=[OR(=($8, $5), $9)], joinType=[inner])
-            LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
-              LogicalFilter(condition=[AND(=($7, 20), >($5, 1000))])
-                LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
-            LogicalAggregate(group=[{0, 1}])
-              LogicalProject(SAL=[$5], $f9=[=($5, 4)])
-                LogicalFilter(condition=[AND(=($7, 20), >($5, 1000))])
-                  LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[CAST(/($2, $3)):INTEGER NOT NULL])
+  LogicalWindow(window#0=[window(partition {0} aggs [SUM($1), COUNT($1)])])
+    LogicalProject(DEPTNO=[$0], $1=[+(+($1, *(2, $2)), *(3, $3))])
+      LogicalAggregate(group=[{0}], agg#0=[SUM($1)], agg#1=[MIN($2)], agg#2=[AVG($2)])
+        LogicalProject(DEPTNO=[$7], SAL=[$5], EMPNO=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testLimitSort">
-        <Resource name="sql">
-            <![CDATA[select mgr from sales.emp
-union select mgr from sales.emp
-order by mgr limit 10 offset 5]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[ASC], offset=[5], fetch=[10])
-  LogicalProject(MGR=[$0])
-    LogicalUnion(all=[false])
-      LogicalProject(MGR=[$3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(MGR=[$3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testNoOversimplificationBelowIsNull">
+    <Resource name="sql">
+      <![CDATA[select *
+from emp
+where ( (empno=1 and mgr=1) or (empno=null and mgr=1) ) is null]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[IS NULL(OR(AND(=($0, 1), =($3, 1)), AND(=($0, null), =($3, 1))))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-EnumerableLimitSort(sort0=[$0], dir0=[ASC], offset=[5], fetch=[10])
-  EnumerableProject(MGR=[$0])
-    EnumerableUnion(all=[false])
-      EnumerableProject(MGR=[$3])
-        EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-      EnumerableProject(MGR=[$3])
-        EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[IS NULL(OR(AND(=($0, 1), =($3, 1)), AND(null, =($3, 1))))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMergeIntersect">
-        <Resource name="sql">
-            <![CDATA[select * from emp where deptno = 10
-intersect
-select * from emp where deptno = 20
-intersect
-select * from emp where deptno = 30
+    </Resource>
+  </TestCase>
+  <TestCase name="testNoReduceAverage">
+    <Resource name="sql">
+      <![CDATA[select name, max(name), avg(deptno), min(name) from sales.dept group by name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[MAX($0)], EXPR$2=[AVG($1)], EXPR$3=[MIN($0)])
+  LogicalProject(NAME=[$1], DEPTNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalIntersect(all=[false])
-  LogicalIntersect(all=[false])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($7, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($7, 20)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 30)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[MAX($0)], EXPR$2=[AVG($1)], EXPR$3=[MIN($0)])
+  LogicalProject(NAME=[$1], DEPTNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalIntersect(all=[false])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 20)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 30)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testNoReduceSum">
+    <Resource name="sql">
+      <![CDATA[select name, sum(deptno) from sales.dept group by name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
+  LogicalProject(NAME=[$1], DEPTNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMergeJoinCollation">
-        <Resource name="sql">
-            <![CDATA[select r.ename, s.sal from
-sales.emp r join sales.bonus s
-on r.ename=s.ename where r.sal+1=s.sal]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(ENAME=[$1], SAL=[$11])
-  LogicalFilter(condition=[=(+($5, 1), $11)])
-    LogicalJoin(condition=[=($1, $9)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
+  LogicalProject(NAME=[$1], DEPTNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-EnumerableProject(ENAME=[$5], SAL=[$2])
-  EnumerableHashJoin(condition=[AND(=($0, $5), =(+($9, 1), $2))], joinType=[inner])
-    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
-    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testNotPushExpression">
+    <Resource name="sql">
+      <![CDATA[select 1 from emp inner join dept
+on emp.deptno=dept.deptno and emp.ename is not null]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[AND(=($7, $9), IS NOT NULL($1))], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMergeMinus">
-        <Resource name="sql">
-            <![CDATA[select * from emp where deptno = 10
-except
-select * from emp where deptno = 20
-except
-select * from emp where deptno = 30
-]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalMinus(all=[false])
-  LogicalMinus(all=[false])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($7, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($7, 20)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 30)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalMinus(all=[false])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 20)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 30)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMergeMinusRightDeep">
-        <Resource name="sql">
-            <![CDATA[select * from emp where deptno = 10
-except
-select * from (
-  select * from emp where deptno = 20
-  except
-  select * from emp where deptno = 30)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalMinus(all=[false])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalMinus(all=[false])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalFilter(condition=[=($7, 20)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalFilter(condition=[=($7, 30)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMergeSetOpMixed">
-        <Resource name="sql">
-            <![CDATA[select * from emp where deptno = 10
-union
-select * from emp where deptno = 20
-intersect
-select * from emp where deptno = 30
-]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalUnion(all=[false])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalIntersect(all=[false])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($7, 20)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($7, 30)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMergeUnion">
-        <Resource name="sql">
-            <![CDATA[select * from emp where deptno = 10
-union all
-select * from emp where deptno = 20
-union all
-select * from emp where deptno = 30
-]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalUnion(all=[true])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($7, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($7, 20)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 30)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 20)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 30)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMergeUnionAll">
-        <Resource name="sql">
-            <![CDATA[select * from emp where deptno = 10
-union all
-select * from emp where deptno = 20
-union all
-select * from emp where deptno = 30
-]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalUnion(all=[true])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($7, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($7, 20)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 30)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 20)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 30)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMergeUnionDistinct">
-        <Resource name="sql">
-            <![CDATA[select * from emp where deptno = 10
-union distinct
-select * from emp where deptno = 20
-union
-select * from emp where deptno = 30
-]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalUnion(all=[false])
-  LogicalUnion(all=[false])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($7, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($7, 20)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 30)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalUnion(all=[false])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 20)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 30)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMergeUnionMixed">
-        <Resource name="sql">
-            <![CDATA[select * from emp where deptno = 10
-union
-select * from emp where deptno = 20
-union all
-select * from emp where deptno = 30
-]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalUnion(all=[false])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($7, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($7, 20)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 30)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMergeUnionMixed2">
-        <Resource name="sql">
-            <![CDATA[select * from emp where deptno = 10
-union all
-select * from emp where deptno = 20
-union
-select * from emp where deptno = 30
-]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalUnion(all=[false])
-  LogicalUnion(all=[true])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($7, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($7, 20)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 30)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalUnion(all=[false])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 20)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 30)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNestedAggregates">
-        <Resource name="sql">
-            <![CDATA[SELECT
-  avg(sum(sal) + 2 * min(empno) + 3 * avg(empno))
-  over (partition by deptno)
-from emp
-group by deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[CAST(/(SUM(+(+($1, *(2, $2)), *(3, $3))) OVER (PARTITION BY $0), COUNT(+(+($1, *(2, $2)), *(3, $3))) OVER (PARTITION BY $0))):INTEGER NOT NULL])
-  LogicalAggregate(group=[{0}], agg#0=[SUM($1)], agg#1=[MIN($2)], agg#2=[AVG($2)])
-    LogicalProject(DEPTNO=[$7], SAL=[$5], EMPNO=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[CAST(/($2, $3)):INTEGER NOT NULL])
-  LogicalWindow(window#0=[window(partition {0} aggs [SUM($1), COUNT($1)])])
-    LogicalProject(DEPTNO=[$0], $1=[+(+($1, *(2, $2)), *(3, $3))])
-      LogicalAggregate(group=[{0}], agg#0=[SUM($1)], agg#1=[MIN($2)], agg#2=[AVG($2)])
-        LogicalProject(DEPTNO=[$7], SAL=[$5], EMPNO=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNoOversimplificationBelowIsNull">
-        <Resource name="sql">
-            <![CDATA[select *
-from emp
-where ( (empno=1 and mgr=1) or (empno=null and mgr=1) ) is null]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[IS NULL(OR(AND(=($0, 1), =($3, 1)), AND(=($0, null), =($3, 1))))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[IS NULL(OR(AND(=($0, 1), =($3, 1)), AND(null, =($3, 1))))])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[AND(=($7, $9), IS NOT NULL($1))], joinType=[inner])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrAlwaysTrue">
-        <Resource name="sql">
-            <![CDATA[select * from EMPNULLABLES_20
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrAlwaysTrue">
+    <Resource name="sql">
+      <![CDATA[select * from EMPNULLABLES_20
 where sal is null or sal is not null]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$7])
   LogicalFilter(condition=[OR(IS NULL($5), IS NOT NULL($5))])
     LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
       LogicalFilter(condition=[AND(=($7, 20), >($5, 1000))])
         LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$7])
   LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
     LogicalFilter(condition=[AND(=($7, 20), >($5, 1000))])
       LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrAlwaysTrue2">
-        <Resource name="sql">
-            <![CDATA[select * from EMPNULLABLES_20
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrAlwaysTrue2">
+    <Resource name="sql">
+      <![CDATA[select * from EMPNULLABLES_20
 where sal is not null or sal is null]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$7])
   LogicalFilter(condition=[OR(IS NOT NULL($5), IS NULL($5))])
     LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
       LogicalFilter(condition=[AND(=($7, 20), >($5, 1000))])
         LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$7])
   LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
     LogicalFilter(condition=[AND(=($7, 20), >($5, 1000))])
       LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWindowFunctionOnAggregations">
-        <Resource name="sql">
-            <![CDATA[SELECT
-  min(empno),
-  sum(sal),
-  sum(sum(sal))
-    over (partition by min(empno) order by sum(sal))
-from emp
-group by deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$2], EXPR$2=[SUM($2) OVER (PARTITION BY $1 ORDER BY $2)])
-  LogicalAggregate(group=[{0}], EXPR$0=[MIN($1)], EXPR$1=[SUM($2)])
-    LogicalProject(DEPTNO=[$7], EMPNO=[$0], SAL=[$5])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOversimplifiedCaseStatement">
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[AND(>($3, 0), >(CASE(>($3, 0), /($7, $3), null:INTEGER), 1))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$2], $2=[$3])
-  LogicalWindow(window#0=[window(partition {1} order by [2] aggs [SUM($2)])])
-    LogicalAggregate(group=[{0}], EXPR$0=[MIN($1)], EXPR$1=[SUM($2)])
-      LogicalProject(DEPTNO=[$7], EMPNO=[$0], SAL=[$5])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[AND(>($3, 0), CASE(>($3, 0), >(/($7, $3), 1), false))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushSumConstantThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select ename, sum(u) from
-(select *, 2 u from emp as e1 union all
- select *, 3 u from emp as e2)
-group by ename]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
-  LogicalProject(ENAME=[$1], U=[$9])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], U=[2])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], U=[3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select * from emp where MGR > 0 and case when MGR > 0 then deptno / MGR else null end > 1]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectAggregateMerge">
+    <Resource name="sql">
+      <![CDATA[select deptno + ss
+from (
+  select job, deptno, min(sal) as ms, sum(sal) as ss
+  from sales.emp
+  group by job, deptno)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($1, $3)])
+  LogicalAggregate(group=[{0, 1}], MS=[MIN($2)], SS=[SUM($2)])
+    LogicalProject(JOB=[$2], DEPTNO=[$7], SAL=[$5])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
-      LogicalProject(ENAME=[$1], U=[2])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
-      LogicalProject(ENAME=[$1], U=[3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushSumNullConstantThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select ename, sum(u) from
-(select *, cast(null as integer) u from emp as e1 union all
- select *, cast(null as integer) u from emp as e2)
-group by ename]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
-  LogicalProject(ENAME=[$1], U=[$9])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], U=[null:INTEGER])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], U=[null:INTEGER])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
-      LogicalProject(ENAME=[$1], U=[null:INTEGER])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
-      LogicalProject(ENAME=[$1], U=[null:INTEGER])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushSumNullableThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select ename, sum(mgr) from
-(select * from emp as e1 union all
- select * from emp as e2)
-group by ename
-]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
-  LogicalProject(ENAME=[$1], MGR=[$3])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
-      LogicalProject(ENAME=[$1], MGR=[$3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
-      LogicalProject(ENAME=[$1], MGR=[$3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushSumNullableNOGBYThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select sum(mgr) from
-(select * from emp as e1 union all
- select * from emp as e2)
-]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
-  LogicalProject(MGR=[$3])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
-      LogicalProject(MGR=[$3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
-      LogicalProject(MGR=[$3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushCountStarThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select ename,count(*) from
-(select * from emp as e1 union all
- select * from emp as e2)
-group by ename]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT()])
-  LogicalProject(ENAME=[$1])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[$SUM0($1)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0}], EXPR$1=[COUNT()])
-      LogicalProject(ENAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}], EXPR$1=[COUNT()])
-      LogicalProject(ENAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushCountNullableThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select ename,count(mgr) from
-(select * from emp as e1 union all
- select * from emp as e2)
-group by ename]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT($1)])
-  LogicalProject(ENAME=[$1], MGR=[$3])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[$SUM0($1)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0}], EXPR$1=[COUNT($1)])
-      LogicalProject(ENAME=[$1], MGR=[$3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}], EXPR$1=[COUNT($1)])
-      LogicalProject(ENAME=[$1], MGR=[$3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushMaxNullableThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select ename,max(mgr) from
-(select * from emp as e1 union all
- select * from emp as e2)
-group by ename]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
-  LogicalProject(ENAME=[$1], MGR=[$3])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
-      LogicalProject(ENAME=[$1], MGR=[$3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
-      LogicalProject(ENAME=[$1], MGR=[$3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushMinThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select ename,min(empno) from
-            (select * from emp as e1 union all
-            select * from emp as e2)
-            group by ename]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[MIN($1)])
-  LogicalProject(ENAME=[$1], EMPNO=[$0])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[MIN($1)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0}], EXPR$1=[MIN($1)])
-      LogicalProject(ENAME=[$1], EMPNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}], EXPR$1=[MIN($1)])
-      LogicalProject(ENAME=[$1], EMPNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAvgThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select ename,avg(empno) from
-(select * from emp as e1 union all
- select * from emp as e2)
-group by ename]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[AVG($1)])
-  LogicalProject(ENAME=[$1], EMPNO=[$0])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[AVG($1)])
-  LogicalUnion(all=[true])
-    LogicalProject(ENAME=[$1], EMPNO=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(ENAME=[$1], EMPNO=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushSumCountStarThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select ename,sum(empno),count(*),min(deptno),max(empno) from
-(select * from emp as e1 union all
- select * from emp as e2)
-group by ename]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[COUNT()], EXPR$3=[MIN($2)], EXPR$4=[MAX($1)])
-  LogicalProject(ENAME=[$1], EMPNO=[$0], DEPTNO=[$7])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[$SUM0($2)], EXPR$3=[MIN($3)], EXPR$4=[MAX($4)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[COUNT()], EXPR$3=[MIN($2)], EXPR$4=[MAX($1)])
-      LogicalProject(ENAME=[$1], EMPNO=[$0], DEPTNO=[$7])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[COUNT()], EXPR$3=[MIN($2)], EXPR$4=[MAX($1)])
-      LogicalProject(ENAME=[$1], EMPNO=[$0], DEPTNO=[$7])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushSumConstantGroupingSetsThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select deptno, job, sum(u) from
-(select *, 2 u from emp as e1 union all
- select *, 3 u from emp as e2)
-group by rollup(deptno,job)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[SUM($2)])
-  LogicalProject(DEPTNO=[$7], JOB=[$2], U=[$9])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], U=[2])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], U=[3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[SUM($2)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[SUM($2)])
-      LogicalProject(DEPTNO=[$7], JOB=[$2], U=[2])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[SUM($2)])
-      LogicalProject(DEPTNO=[$7], JOB=[$2], U=[3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushSumNullConstantGroupingSetsThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select deptno, job, sum(u) from
-(select *, cast(null as integer) u from emp as e1 union all
- select *, cast(null as integer) u from emp as e2)
-group by rollup(deptno,job)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[SUM($2)])
-  LogicalProject(DEPTNO=[$7], JOB=[$2], U=[$9])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], U=[null:INTEGER])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], U=[null:INTEGER])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[SUM($2)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[SUM($2)])
-      LogicalProject(DEPTNO=[$7], JOB=[$2], U=[null:INTEGER])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[SUM($2)])
-      LogicalProject(DEPTNO=[$7], JOB=[$2], U=[null:INTEGER])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushSumNullableGroupingSetsThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select deptno, job, sum(mgr) from
-(select * from emp as e1 union all
- select * from emp as e2)
-group by rollup(deptno, job)
-]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[SUM($2)])
-  LogicalProject(DEPTNO=[$7], JOB=[$2], MGR=[$3])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[SUM($2)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[SUM($2)])
-      LogicalProject(DEPTNO=[$7], JOB=[$2], MGR=[$3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[SUM($2)])
-      LogicalProject(DEPTNO=[$7], JOB=[$2], MGR=[$3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushCountStarGroupingSetsThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select deptno, job, count(*) from
-(select * from emp as e1 union all
- select * from emp as e2)
-group by rollup(deptno, job)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[COUNT()])
-  LogicalProject(DEPTNO=[$7], JOB=[$2])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[$SUM0($2)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
-      LogicalProject(DEPTNO=[$7], JOB=[$2])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
-      LogicalProject(DEPTNO=[$7], JOB=[$2])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushCountNullableGroupingSetsThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select deptno, job, count(mgr) from
-(select * from emp as e1 union all
- select * from emp as e2)
-group by rollup(deptno, job)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[COUNT($2)])
-  LogicalProject(DEPTNO=[$7], JOB=[$2], MGR=[$3])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[$SUM0($2)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT($2)])
-      LogicalProject(DEPTNO=[$7], JOB=[$2], MGR=[$3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT($2)])
-      LogicalProject(DEPTNO=[$7], JOB=[$2], MGR=[$3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushMaxNullableGroupingSetsThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select deptno, job, max(mgr) from
-(select * from emp as e1 union all
- select * from emp as e2)
-group by rollup(deptno, job)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[MAX($2)])
-  LogicalProject(DEPTNO=[$7], JOB=[$2], MGR=[$3])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[MAX($2)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[MAX($2)])
-      LogicalProject(DEPTNO=[$7], JOB=[$2], MGR=[$3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[MAX($2)])
-      LogicalProject(DEPTNO=[$7], JOB=[$2], MGR=[$3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushMinGroupingSetsThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select deptno, job, min(empno) from
-            (select * from emp as e1 union all
-            select * from emp as e2)
-            group by rollup(deptno, job)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[MIN($2)])
-  LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[MIN($2)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[MIN($2)])
-      LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[MIN($2)])
-      LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAvgGroupingSetsThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select deptno, job, avg(empno) from
-(select * from emp as e1 union all
- select * from emp as e2)
-group by rollup(deptno, job)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[AVG($2)])
-  LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[AVG($2)])
-  LogicalUnion(all=[true])
-    LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushSumCountStarGroupingSetsThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select deptno,job,sum(empno),count(*),min(deptno),max(empno) from
-(select * from emp as e1 union all
- select * from emp as e2)
-group by rollup(deptno,job)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[SUM($2)], EXPR$3=[COUNT()], EXPR$4=[MIN($0)], EXPR$5=[MAX($2)])
-  LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[SUM($2)], EXPR$3=[$SUM0($3)], EXPR$4=[MIN($4)], EXPR$5=[MAX($5)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[SUM($2)], EXPR$3=[COUNT()], EXPR$4=[MIN($0)], EXPR$5=[MAX($2)])
-      LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[SUM($2)], EXPR$3=[COUNT()], EXPR$4=[MIN($0)], EXPR$5=[MAX($2)])
-      LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushCountFilterThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select deptno, count(*) filter (where job = 'CLERK')
-from (
-  select * from emp where deptno = 10
-  union all
-  select * from emp where deptno > 20)
-group by deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT() FILTER $1])
-  LogicalProject(DEPTNO=[$7], $f1=[=($2, 'CLERK')])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalFilter(condition=[=($7, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalFilter(condition=[>($7, 20)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[$SUM0($1)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0}], EXPR$1=[COUNT() FILTER $1])
-      LogicalProject(DEPTNO=[$7], $f1=[=($2, 'CLERK')])
-        LogicalFilter(condition=[=($7, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}], EXPR$1=[COUNT() FILTER $1])
-      LogicalProject(DEPTNO=[$7], $f1=[=($2, 'CLERK')])
-        LogicalFilter(condition=[>($7, 20)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushBoolAndBoolOrThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select ename, bool_and(empbol), bool_or(empbol) from
-(select ename, case when mod(empno, 2) = 1 then true else false end as empbol from emp as e1 union all
- select ename, case when mod(empno, 2) = 1 then true else false end as empbol from emp as e2)
-group by ename]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[BOOL_AND($1)], EXPR$2=[BOOL_OR($1)])
-  LogicalUnion(all=[true])
-    LogicalProject(ENAME=[$1], EMPBOL=[=(MOD($0, 2), 1)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(ENAME=[$1], EMPBOL=[=(MOD($0, 2), 1)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[BOOL_AND($1)], EXPR$2=[BOOL_OR($2)])
-  LogicalUnion(all=[true])
-    LogicalAggregate(group=[{0}], EXPR$1=[BOOL_AND($1)], EXPR$2=[BOOL_OR($1)])
-      LogicalProject(ENAME=[$1], EMPBOL=[=(MOD($0, 2), 1)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}], EXPR$1=[BOOL_AND($1)], EXPR$2=[BOOL_OR($1)])
-      LogicalProject(ENAME=[$1], EMPBOL=[=(MOD($0, 2), 1)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullFilterThroughAggregate">
-        <Resource name="sql">
-            <![CDATA[select ename, sal, deptno from (  select ename, sal, deptno  from emp  where sal > 5000)group by ename, sal, deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1, 2}])
-  LogicalFilter(condition=[>($1, 5000)])
-    LogicalProject(ENAME=[$1], SAL=[$5], DEPTNO=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalFilter(condition=[>($1, 5000)])
-  LogicalAggregate(group=[{0, 1, 2}])
-    LogicalProject(ENAME=[$1], SAL=[$5], DEPTNO=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullFilterThroughAggregateGroupingSets">
-        <Resource name="sql">
-            <![CDATA[select ename, sal, deptno from (  select ename, sal, deptno  from emp  where sal > 5000)group by rollup(ename, sal, deptno)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1, 2}], groups=[[{0, 1, 2}, {0, 1}, {0}, {}]])
-  LogicalFilter(condition=[>($1, 5000)])
-    LogicalProject(ENAME=[$1], SAL=[$5], DEPTNO=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1, 2}], groups=[[{0, 1, 2}, {0, 1}, {0}, {}]])
-  LogicalFilter(condition=[>($1, 5000)])
-    LogicalAggregate(group=[{0, 1, 2}])
-      LogicalProject(ENAME=[$1], SAL=[$5], DEPTNO=[$7])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullConstantThroughConstLast">
-        <Resource name="sql">
-            <![CDATA[select deptno, max(mgr) from (
-  select *, 4 as four, 2+3 as two_plus_three, deptno+42 as deptno42 from emp
-) group by deptno, four]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EXPR$1=[$2])
-  LogicalAggregate(group=[{0, 1}], EXPR$1=[MAX($2)])
-    LogicalProject(DEPTNO=[$7], FOUR=[4], MGR=[$3])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
-  LogicalProject(DEPTNO=[$7], MGR=[$3])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullConstantThroughAggregateSimpleNonNullable">
-        <Resource name="sql">
-            <![CDATA[select deptno, max(ename) from (
-  select *, 4 as four, 2+3 as two_plus_three, deptno+42 as deptno42 from emp
-) group by deptno, four]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EXPR$1=[$2])
-  LogicalAggregate(group=[{0, 1}], EXPR$1=[MAX($2)])
-    LogicalProject(DEPTNO=[$7], FOUR=[4], ENAME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
-  LogicalProject(DEPTNO=[$7], ENAME=[$1])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullConstantThroughAggregatePermuted">
-        <Resource name="sql">
-            <![CDATA[select deptno, max(mgr) from (
-  select *, 4 as four, 2+3 as two_plus_three, deptno+42 as deptno42 from emp
-) group by deptno, four, two_plus_three, deptno42]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EXPR$1=[$4])
-  LogicalAggregate(group=[{0, 1, 2, 3}], EXPR$1=[MAX($4)])
-    LogicalProject(DEPTNO=[$7], FOUR=[4], TWO_PLUS_THREE=[+(2, 3)], DEPTNO42=[+($7, 42)], MGR=[$3])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EXPR$1=[$2])
-  LogicalAggregate(group=[{0, 1}], EXPR$1=[MAX($2)])
-    LogicalProject(DEPTNO=[$7], DEPTNO42=[+($7, 42)], MGR=[$3])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullConstantThroughAggregatePermutedConstFirst">
-        <Resource name="sql">
-            <![CDATA[select deptno, max(mgr) from (
-  select *, 4 as four, 2+3 as two_plus_three, deptno+42 as deptno42 from emp
-) group by four, deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$1], EXPR$1=[$2])
-  LogicalAggregate(group=[{0, 1}], EXPR$1=[MAX($2)])
-    LogicalProject(FOUR=[4], DEPTNO=[$7], MGR=[$3])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
-  LogicalProject(DEPTNO=[$7], MGR=[$3])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullConstantThroughAggregatePermutedConstGroupBy">
-        <Resource name="sql">
-            <![CDATA[select deptno, max(mgr) from (
-  select *, 4 as four, 2+3 as two_plus_three, deptno+42 as deptno42 from emp
-) group by 42+24, deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$1], EXPR$1=[$2])
-  LogicalAggregate(group=[{0, 1}], EXPR$1=[MAX($2)])
-    LogicalProject($f0=[+(42, 24)], DEPTNO=[$7], MGR=[$3])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
-  LogicalProject(DEPTNO=[$7], MGR=[$3])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullConstantThroughAggregateConstGroupBy">
-        <Resource name="sql">
-            <![CDATA[select 4, 2+3, max(mgr) from (
-  select *, 4 as four, 2+3 as two_plus_three, deptno+42 as deptno42 from emp
-) group by 4, 2+3]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], EXPR$2=[MAX($2)])
-  LogicalProject(EXPR$0=[4], EXPR$1=[+(2, 3)], MGR=[$3])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$0], EXPR$1=[+(2, 3)], EXPR$2=[$1])
-  LogicalAggregate(group=[{0}], EXPR$2=[MAX($1)])
-    LogicalProject(EXPR$0=[4], MGR=[$3])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullConstantThroughAggregateAllConst">
-        <Resource name="sql">
-            <![CDATA[select 4, 2+3, max(five) from (
-  select *, 4 as four, 2+3 as two_plus_three, 5 as five, deptno+42 as deptno42 from emp
-) group by 4, 2+3]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], EXPR$2=[MAX($2)])
-  LogicalProject(EXPR$0=[4], EXPR$1=[+(2, 3)], FIVE=[5])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$0], EXPR$1=[+(2, 3)], EXPR$2=[$1])
-  LogicalAggregate(group=[{0}], EXPR$2=[MAX($1)])
-    LogicalProject(EXPR$0=[4], FIVE=[5])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullConstantThroughAggregateAllLiterals">
-        <Resource name="sql">
-            <![CDATA[select 4, 2+3, max(5) from (
-  select *, 4 as four, 2+3 as two_plus_three, 5 as five, deptno+42 as deptno42 from emp
-) group by 4, 2+3]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], EXPR$2=[MAX($2)])
-  LogicalProject(EXPR$0=[4], EXPR$1=[+(2, 3)], $f2=[5])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$0], EXPR$1=[+(2, 3)], EXPR$2=[$1])
-  LogicalAggregate(group=[{0}], EXPR$2=[MAX($1)])
-    LogicalProject(EXPR$0=[4], $f2=[5])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullConstantThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select 2, deptno, job from emp as e1
-union all
-select 2, deptno, job from emp as e2]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalProject(EXPR$0=[2], DEPTNO=[$7], JOB=[$2])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EXPR$0=[2], DEPTNO=[$7], JOB=[$2])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[2], DEPTNO=[$0], JOB=[$1])
-  LogicalUnion(all=[true])
-    LogicalProject(DEPTNO=[$7], JOB=[$2])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$7], JOB=[$2])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullConstantThroughUnion2">
-        <Resource name="sql">
-            <![CDATA[select 2, deptno, job from emp as e1
-union all
-select 1, deptno, job from emp as e2]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalProject(EXPR$0=[2], DEPTNO=[$7], JOB=[$2])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EXPR$0=[1], DEPTNO=[$7], JOB=[$2])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullConstantThroughUnion3">
-        <Resource name="sql">
-            <![CDATA[select 2, 3 from emp as e1
-union all
-select 2, 3 from emp as e2]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalProject(EXPR$0=[2], EXPR$1=[3])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EXPR$0=[2], EXPR$1=[3])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[2], EXPR$1=[3])
-  LogicalUnion(all=[true])
-    LogicalProject(EXPR$0=[2])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(EXPR$0=[2])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testConvertMultiJoinRule">
-        <Resource name="sql">
-            <![CDATA[select e1.ename from emp e1, dept d, emp e2
-where e1.deptno = d.deptno and d.deptno = e2.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  LogicalFilter(condition=[AND(=($7, $9), =($9, $18))])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalJoin(condition=[true], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  MultiJoin(joinFilter=[AND(=($9, $18), =($7, $9))], isFullOuterJoin=[false], joinTypes=[[INNER, INNER, INNER]], outerJoinConditions=[[NULL, NULL, NULL]], projFields=[[ALL, ALL, ALL]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testManyFiltersOnTopOfMultiJoinShouldCollapse">
-        <Resource name="sql">
-            <![CDATA[select * from (select * from emp e1 left outer join dept d
-on e1.deptno = d.deptno
-where d.deptno > 3) where ename LIKE 'bar']]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalFilter(condition=[LIKE($1, 'bar')])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-      LogicalFilter(condition=[>($9, 3)])
-        LogicalJoin(condition=[=($7, $9)], joinType=[left])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[INNER, LEFT]], outerJoinConditions=[[NULL, =($7, $9)]], projFields=[[{0, 1, 2, 3, 4, 5, 6, 7, 8}, {0, 1}]], postJoinFilter=[AND(LIKE($1, 'bar'), >($9, 3))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectAggregateMerge">
-        <Resource name="sql">
-            <![CDATA[select deptno + ss
-from (
-  select job, deptno, min(sal) as ms, sum(sal) as ss
-  from sales.emp
-  group by job, deptno)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($1, $3)])
-  LogicalAggregate(group=[{0, 1}], MS=[MIN($2)], SS=[SUM($2)])
-    LogicalProject(JOB=[$2], DEPTNO=[$7], SAL=[$5])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject($f0=[+($1, $2)])
-  LogicalAggregate(group=[{0, 1}], SS=[SUM($2)])
-    LogicalProject(JOB=[$2], DEPTNO=[$7], SAL=[$5])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectAggregateMergeNoOp">
-        <Resource name="sql">
-            <![CDATA[select deptno + ss + ms
-from (
-  select job, deptno, min(sal) as ms, sum(sal) as ss
-  from sales.emp
-  group by job, deptno)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[+(+($1, $3), $2)])
-  LogicalAggregate(group=[{0, 1}], MS=[MIN($2)], SS=[SUM($2)])
-    LogicalProject(JOB=[$2], DEPTNO=[$7], SAL=[$5])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectAggregateMergeSum0">
-        <Resource name="sql">
-            <![CDATA[select coalesce(sum_sal, 0) as ss0
-from (
-  select sum(sal) as sum_sal
-  from sales.emp)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(SS0=[CASE(IS NOT NULL($0), CAST($0):INTEGER NOT NULL, 0)])
-  LogicalAggregate(group=[{}], SUM_SAL=[SUM($0)])
-    LogicalProject(SAL=[$5])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], agg#0=[$SUM0($0)])
-  LogicalProject(SAL=[$5])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectAggregateMergeSum0AndSum">
-        <Resource name="sql">
-            <![CDATA[select sum_sal * 2, coalesce(sum_sal, 0) as ss0
-from (
-  select sum(sal) as sum_sal
-  from sales.emp)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[*($0, 2)], SS0=[CASE(IS NOT NULL($0), CAST($0):INTEGER NOT NULL, 0)])
-  LogicalAggregate(group=[{}], SUM_SAL=[SUM($0)])
-    LogicalProject(SAL=[$5])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject($f0=[*($0, 2)], $f1=[$1])
-  LogicalAggregate(group=[{}], SUM_SAL=[SUM($0)], agg#1=[$SUM0($0)])
-    LogicalProject(SAL=[$5])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testRemoveSemiJoinWithFilter">
-        <Resource name="sql">
-            <![CDATA[select e.ename from emp e, dept d
-where e.deptno = d.deptno and e.ename = 'foo']]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  LogicalFilter(condition=[AND(=($7, $9), =($1, 'foo'))])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  LogicalJoin(condition=[=($7, $9)], joinType=[inner], semiJoinDone=[true])
-    LogicalFilter(condition=[=($1, 'foo')])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testRemoveSemiJoinRight">
-        <Resource name="sql">
-            <![CDATA[select e1.ename from emp e1, dept d, emp e2
-where e1.deptno = d.deptno and d.deptno = e2.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  LogicalFilter(condition=[AND(=($7, $9), =($9, $18))])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalJoin(condition=[true], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  LogicalJoin(condition=[=($9, $18)], joinType=[inner], semiJoinDone=[true])
-    LogicalJoin(condition=[=($7, $9)], joinType=[inner], semiJoinDone=[true])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMergeFilterWithJoinCondition">
-        <Resource name="sql">
-            <![CDATA[select d.name as dname,e.ename as ename
- from emp e inner join dept d
- on e.deptno=d.deptno
- where d.name='Propane']]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DNAME=[$10], ENAME=[$1])
-  LogicalFilter(condition=[=($10, 'Propane')])
-    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalCalc(expr#0..10=[{inputs}], expr#11=[=($t7, $t9)], expr#12=['Propane':VARCHAR(10)], expr#13=[=($t10, $t12)], expr#14=[AND($t11, $t13)], DNAME=[$t10], ENAME=[$t1], $condition=[$t14])
-  LogicalJoin(condition=[true], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testConvertMultiJoinRuleOuterJoins">
-        <Resource name="sql">
-            <![CDATA[select * from     (select * from         (select * from             (select * from A right outer join B on a = b)             left outer join             (select * from C full outer join D on c = d)            on a = c and b = d)         right outer join         (select * from             (select * from E full outer join F on e = f)             right outer join             (select * from G left outer join H on g = h)             on e = g and f = h)         on a = e and b = f and c = g and d = h)     inner join     (select * from I inner join J on i = j)     on a = i and h = j]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(A=[$0], B=[$1], C=[$2], D=[$3], E=[$4], F=[$5], G=[$6], H=[$7], I=[$8], J=[$9])
-  LogicalJoin(condition=[AND(=($0, $8), =($7, $9))], joinType=[inner])
-    LogicalProject(A=[$0], B=[$1], C=[$2], D=[$3], E=[$4], F=[$5], G=[$6], H=[$7])
-      LogicalJoin(condition=[AND(=($0, $4), =($1, $5), =($2, $6), =($3, $7))], joinType=[right])
-        LogicalProject(A=[$0], B=[$1], C=[$2], D=[$3])
-          LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[left])
-            LogicalProject(A=[$0], B=[$1])
-              LogicalJoin(condition=[=($0, $1)], joinType=[right])
-                LogicalTableScan(table=[[CATALOG, SALES, A]])
-                LogicalTableScan(table=[[CATALOG, SALES, B]])
-            LogicalProject(C=[$0], D=[$1])
-              LogicalJoin(condition=[=($0, $1)], joinType=[full])
-                LogicalTableScan(table=[[CATALOG, SALES, C]])
-                LogicalTableScan(table=[[CATALOG, SALES, D]])
-        LogicalProject(E=[$0], F=[$1], G=[$2], H=[$3])
-          LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[right])
-            LogicalProject(E=[$0], F=[$1])
-              LogicalJoin(condition=[=($0, $1)], joinType=[full])
-                LogicalTableScan(table=[[CATALOG, SALES, E]])
-                LogicalTableScan(table=[[CATALOG, SALES, F]])
-            LogicalProject(G=[$0], H=[$1])
-              LogicalJoin(condition=[=($0, $1)], joinType=[left])
-                LogicalTableScan(table=[[CATALOG, SALES, G]])
-                LogicalTableScan(table=[[CATALOG, SALES, H]])
-    LogicalProject(I=[$0], J=[$1])
-      LogicalJoin(condition=[=($0, $1)], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, I]])
-        LogicalTableScan(table=[[CATALOG, SALES, J]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-MultiJoin(joinFilter=[AND(=($0, $8), =($7, $9), =($8, $9))], isFullOuterJoin=[false], joinTypes=[[INNER, INNER, INNER]], outerJoinConditions=[[NULL, NULL, NULL]], projFields=[[ALL, ALL, ALL]])
-  MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[RIGHT, INNER]], outerJoinConditions=[[AND(=($0, $4), =($1, $5), =($2, $6), =($3, $7)), NULL]], projFields=[[ALL, ALL]])
-    MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[INNER, LEFT]], outerJoinConditions=[[NULL, AND(=($0, $2), =($1, $3))]], projFields=[[ALL, ALL]])
-      MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[RIGHT, INNER]], outerJoinConditions=[[=($0, $1), NULL]], projFields=[[ALL, ALL]])
-        LogicalTableScan(table=[[CATALOG, SALES, A]])
-        LogicalTableScan(table=[[CATALOG, SALES, B]])
-      MultiJoin(joinFilter=[=($0, $1)], isFullOuterJoin=[true], joinTypes=[[INNER, INNER]], outerJoinConditions=[[NULL, NULL]], projFields=[[ALL, ALL]])
-        LogicalTableScan(table=[[CATALOG, SALES, C]])
-        LogicalTableScan(table=[[CATALOG, SALES, D]])
-    MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[RIGHT, INNER]], outerJoinConditions=[[AND(=($0, $2), =($1, $3)), NULL]], projFields=[[ALL, ALL]])
-      MultiJoin(joinFilter=[=($0, $1)], isFullOuterJoin=[true], joinTypes=[[INNER, INNER]], outerJoinConditions=[[NULL, NULL]], projFields=[[ALL, ALL]])
-        LogicalTableScan(table=[[CATALOG, SALES, E]])
-        LogicalTableScan(table=[[CATALOG, SALES, F]])
-      MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[INNER, LEFT]], outerJoinConditions=[[NULL, =($0, $1)]], projFields=[[ALL, ALL]])
-        LogicalTableScan(table=[[CATALOG, SALES, G]])
-        LogicalTableScan(table=[[CATALOG, SALES, H]])
-  LogicalTableScan(table=[[CATALOG, SALES, I]])
-  LogicalTableScan(table=[[CATALOG, SALES, J]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushSemiJoinPastJoinRuleLeft">
-        <Resource name="sql">
-            <![CDATA[select e1.ename from emp e1, dept d, emp e2
-where e1.deptno = d.deptno and e1.empno = e2.empno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  LogicalFilter(condition=[AND(=($7, $9), =($0, $11))])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalJoin(condition=[true], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  LogicalJoin(condition=[=($0, $11)], joinType=[inner], semiJoinDone=[true])
-    LogicalJoin(condition=[=($7, $9)], joinType=[inner], semiJoinDone=[true])
-      LogicalJoin(condition=[=($0, $9)], joinType=[semi])
-        LogicalJoin(condition=[=($7, $9)], joinType=[semi])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushSemiJoinPastJoinRuleRight">
-        <Resource name="sql">
-            <![CDATA[select e1.ename from emp e1, dept d, emp e2
-where e1.deptno = d.deptno and d.deptno = e2.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  LogicalFilter(condition=[AND(=($7, $9), =($9, $18))])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalJoin(condition=[true], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  LogicalJoin(condition=[=($9, $18)], joinType=[inner], semiJoinDone=[true])
-    LogicalJoin(condition=[=($7, $9)], joinType=[inner], semiJoinDone=[true])
-      LogicalJoin(condition=[=($7, $9)], joinType=[semi])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalJoin(condition=[=($0, $9)], joinType=[semi])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testRemoveSemiJoin">
-        <Resource name="sql">
-            <![CDATA[select e.ename from emp e, dept d
-where e.deptno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  LogicalFilter(condition=[=($7, $9)])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  LogicalJoin(condition=[=($7, $9)], joinType=[inner], semiJoinDone=[true])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushSemiJoinPastProject">
-        <Resource name="sql">
-            <![CDATA[select e.* from
-(select ename, trim(job), sal * 2, deptno from emp) e, dept d
-where e.deptno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(ENAME=[$0], EXPR$1=[$1], EXPR$2=[$2], DEPTNO=[$3])
-  LogicalFilter(condition=[=($3, $4)])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalProject(ENAME=[$1], EXPR$1=[TRIM(FLAG(BOTH), ' ', $2)], EXPR$2=[*($5, 2)], DEPTNO=[$7])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(ENAME=[$0], EXPR$1=[$1], EXPR$2=[$2], DEPTNO=[$3])
-  LogicalJoin(condition=[=($3, $4)], joinType=[inner], semiJoinDone=[true])
-    LogicalProject(ENAME=[$1], EXPR$1=[TRIM(FLAG(BOTH), ' ', $2)], EXPR$2=[*($5, 2)], DEPTNO=[$7])
-      LogicalJoin(condition=[=($7, $9)], joinType=[semi])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushSemiJoinPastFilter">
-        <Resource name="sql">
-            <![CDATA[select e.ename from emp e, dept d
-where e.deptno = d.deptno and e.ename = 'foo']]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  LogicalFilter(condition=[AND(=($7, $9), =($1, 'foo'))])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  LogicalJoin(condition=[=($7, $9)], joinType=[inner], semiJoinDone=[true])
-    LogicalFilter(condition=[=($1, 'foo')])
-      LogicalJoin(condition=[=($7, $9)], joinType=[semi])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testRemoveSemiJoinRightWithFilter">
-        <Resource name="sql">
-            <![CDATA[select e1.ename from emp e1, dept d, emp e2
-where e1.deptno = d.deptno and d.deptno = e2.deptno
-and d.name = 'foo']]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  LogicalFilter(condition=[AND(=($7, $9), =($9, $18), =($10, 'foo'))])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalJoin(condition=[true], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  LogicalJoin(condition=[=($9, $18)], joinType=[inner], semiJoinDone=[true])
-    LogicalJoin(condition=[=($7, $9)], joinType=[inner], semiJoinDone=[true])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalFilter(condition=[=($1, 'foo')])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testHeterogeneousConversion">
-        <Resource name="sql">
-            <![CDATA[select upper(ename) from emp union all
-select lower(ename) from emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalProject(EXPR$0=[UPPER($1)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EXPR$0=[LOWER($1)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalCalc(expr#0..8=[{inputs}], expr#9=[UPPER($t1)], EXPR$0=[$t9])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(EXPR$0=[LOWER($1)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectMergeShouldIgnoreOver">
-        <Resource name="sql">
-            <![CDATA[select row_number() over (order by deptno), col1
-from (
-  select deptno,
-    sum(100) over (partition by  deptno order by sal) as col1
-  from emp)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[ROW_NUMBER() OVER (ORDER BY $0)], COL1=[$1])
-  LogicalProject(DEPTNO=[$7], COL1=[SUM(100) OVER (PARTITION BY $7 ORDER BY $5)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushFilterPastAggFour">
-        <Resource name="sql">
-            <![CDATA[select emp.deptno, count(*) from emp where emp.sal > '12'
-group by emp.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{1}], EXPR$1=[$SUM0($2)])
-  LogicalFilter(condition=[>($0, CAST('12'):INTEGER NOT NULL)])
-    LogicalAggregate(group=[{5, 7}], EXPR$1=[COUNT()])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{1}], EXPR$1=[$SUM0($2)])
-  LogicalAggregate(group=[{5, 7}], EXPR$1=[COUNT()])
-    LogicalFilter(condition=[>($5, 12)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastFilter2">
-        <Resource name="sql">
-            <![CDATA[select count(*)
-from emp
-where case when mgr < 10 then true else false end]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
-  LogicalProject($f0=[0])
-    LogicalFilter(condition=[CASE(<($3, 10), true, false)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
-  LogicalProject($f0=[0])
-    LogicalFilter(condition=[<($0, 10)])
-      LogicalProject(MGR=[$3])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferenceJoin">
-        <Resource name="sql">
-            <![CDATA[select 1 from sales.emp d
-inner join sales.emp e on d.deptno = e.deptno where e.deptno > 7]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[>($7, 7)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
-    LogicalFilter(condition=[>($7, 7)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[>($7, 7)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferenceProject">
-        <Resource name="sql">
-            <![CDATA[select 1 from (select * from sales.emp where deptno > 7) d
-inner join sales.emp e on d.deptno = e.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[>($7, 7)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[>($7, 7)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[>($7, 7)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferenceAggregate">
-        <Resource name="sql">
-            <![CDATA[select 1 from (select deptno, count(*) from sales.emp where deptno > 7
-group by deptno) d inner join sales.emp e on d.deptno = e.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($0, $9)], joinType=[inner])
-    LogicalAggregate(group=[{0}], EXPR$1=[COUNT()])
-      LogicalProject(DEPTNO=[$7])
-        LogicalFilter(condition=[>($7, 7)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($0, $9)], joinType=[inner])
-    LogicalAggregate(group=[{0}], EXPR$1=[COUNT()])
-      LogicalProject(DEPTNO=[$7])
-        LogicalFilter(condition=[>($7, 7)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[>($7, 7)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferenceUnion">
-        <Resource name="sql">
-            <![CDATA[select 1 from
-(select deptno from sales.emp where deptno > 7
-union all select deptno from sales.emp where deptno > 10) d
-inner join sales.emp e on d.deptno = e.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($0, $8)], joinType=[inner])
-    LogicalUnion(all=[true])
-      LogicalProject(DEPTNO=[$7])
-        LogicalFilter(condition=[>($7, 7)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(DEPTNO=[$7])
-        LogicalFilter(condition=[>($7, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($0, $8)], joinType=[inner])
-    LogicalUnion(all=[true])
-      LogicalProject(DEPTNO=[$7])
-        LogicalFilter(condition=[>($7, 7)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(DEPTNO=[$7])
-        LogicalFilter(condition=[>($7, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[>($7, 7)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferenceJoin3way">
-        <Resource name="sql">
-            <![CDATA[select 1 from sales.emp d
-inner join sales.emp e on d.deptno = e.deptno
-inner join sales.emp f on e.deptno = f.deptno
-where d.deptno > 7]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($16, $25)], joinType=[inner])
-    LogicalJoin(condition=[=($7, $16)], joinType=[inner])
-      LogicalFilter(condition=[>($7, 7)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($16, $25)], joinType=[inner])
-    LogicalJoin(condition=[=($7, $16)], joinType=[inner])
-      LogicalFilter(condition=[>($7, 7)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalFilter(condition=[>($7, 7)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[>($7, 7)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferenceUnionAlwaysTrue">
-        <Resource name="sql">
-            <![CDATA[select d.deptno, e.deptno from
-(select deptno from sales.emp where deptno < 4) d
-inner join
-(select deptno from sales.emp where deptno > 7
-union all select deptno from sales.emp) e
-on d.deptno = e.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], DEPTNO0=[$1])
-  LogicalJoin(condition=[=($0, $1)], joinType=[inner])
-    LogicalProject(DEPTNO=[$7])
-      LogicalFilter(condition=[<($7, 4)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalUnion(all=[true])
-      LogicalProject(DEPTNO=[$7])
-        LogicalFilter(condition=[>($7, 7)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(DEPTNO=[$7])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], DEPTNO0=[$1])
-  LogicalJoin(condition=[=($0, $1)], joinType=[inner])
-    LogicalProject(DEPTNO=[$7])
-      LogicalFilter(condition=[<($7, 4)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[<($0, 4)])
-      LogicalUnion(all=[true])
-        LogicalProject(DEPTNO=[$7])
-          LogicalFilter(condition=[>($7, 7)])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(DEPTNO=[$7])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferenceJoin3wayAgg">
-        <Resource name="sql">
-            <![CDATA[select 1 from
-(select deptno, count(*) from sales.emp where deptno > 7 group by deptno) d
-inner join sales.emp e on d.deptno = e.deptno
-inner join sales.emp f on e.deptno = f.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($9, $18)], joinType=[inner])
-    LogicalJoin(condition=[=($0, $9)], joinType=[inner])
-      LogicalAggregate(group=[{0}], EXPR$1=[COUNT()])
-        LogicalProject(DEPTNO=[$7])
-          LogicalFilter(condition=[>($7, 7)])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($9, $18)], joinType=[inner])
-    LogicalJoin(condition=[=($0, $9)], joinType=[inner])
-      LogicalAggregate(group=[{0}], EXPR$1=[COUNT()])
-        LogicalProject(DEPTNO=[$7])
-          LogicalFilter(condition=[>($7, 7)])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalFilter(condition=[>($7, 7)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[>($7, 7)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferenceLeftOuterJoin">
-        <Resource name="sql">
-            <![CDATA[select 1 from sales.emp d
-left outer join sales.emp e on d.deptno = e.deptno
-where d.deptno > 7 and e.deptno > 9]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalFilter(condition=[>($16, 9)])
-    LogicalJoin(condition=[=($7, $16)], joinType=[left])
-      LogicalFilter(condition=[>($7, 7)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalFilter(condition=[>($16, 9)])
-    LogicalJoin(condition=[=($7, $16)], joinType=[left])
-      LogicalFilter(condition=[>($7, 7)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalFilter(condition=[>($7, 7)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferenceRightOuterJoin">
-        <Resource name="sql">
-            <![CDATA[select 1 from sales.emp d
-right outer join sales.emp e on d.deptno = e.deptno
-where d.deptno > 7 and e.deptno > 9]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalFilter(condition=[>($7, 7)])
-    LogicalJoin(condition=[=($7, $16)], joinType=[right])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalFilter(condition=[>($7, 9)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalFilter(condition=[>($7, 7)])
-    LogicalJoin(condition=[=($7, $16)], joinType=[right])
-      LogicalFilter(condition=[>($7, 9)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalFilter(condition=[>($7, 9)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferenceFullOuterJoin">
-        <Resource name="sql">
-            <![CDATA[select 1 from sales.emp d full outer join sales.emp e
-on d.deptno = e.deptno  where d.deptno > 7 and e.deptno > 9]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalFilter(condition=[AND(>($7, 7), >($16, 9))])
-    LogicalJoin(condition=[=($7, $16)], joinType=[full])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalFilter(condition=[AND(>($7, 7), >($16, 9))])
-    LogicalJoin(condition=[=($7, $16)], joinType=[full])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferencePreventProjectPullUp">
-        <Resource name="sql">
-            <![CDATA[select 1 from (select comm as deptno from sales.emp where deptno > 7) d
-inner join sales.emp e on d.deptno = e.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($0, $8)], joinType=[inner])
-    LogicalProject(DEPTNO=[$6])
-      LogicalFilter(condition=[>($7, 7)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($0, $8)], joinType=[inner])
-    LogicalProject(DEPTNO=[$6])
-      LogicalFilter(condition=[>($7, 7)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferencePullUpThruAlias">
-        <Resource name="sql">
-            <![CDATA[select 1 from (select comm as deptno from sales.emp where comm > 7) d
-inner join sales.emp e on d.deptno = e.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($0, $8)], joinType=[inner])
-    LogicalProject(DEPTNO=[$6])
-      LogicalFilter(condition=[>($6, 7)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($0, $8)], joinType=[inner])
-    LogicalProject(DEPTNO=[$6])
-      LogicalFilter(condition=[>($6, 7)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[>($7, 7)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferenceConjunctInPullUp">
-        <Resource name="sql">
-            <![CDATA[select 1 from sales.emp d
-inner join sales.emp e on d.deptno = e.deptno
-where d.deptno in (7, 9) or d.deptno > 10]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
-    LogicalFilter(condition=[SEARCH($7, Sarg[7, 9, (10..+∞)])])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
-    LogicalFilter(condition=[SEARCH($7, Sarg[7, 9, (10..+∞)])])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[SEARCH($7, Sarg[7, 9, (10..+∞)])])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferenceNoPullUpExprs">
-        <Resource name="sql">
-            <![CDATA[select 1 from sales.emp d
-inner join sales.emp e on d.deptno = e.deptno
-where d.deptno in (7, 9) or d.comm > 10]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
-    LogicalFilter(condition=[OR(SEARCH($7, Sarg[7, 9]), >($6, 10))])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
-    LogicalFilter(condition=[OR(SEARCH($7, Sarg[7, 9]), >($6, 10))])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferenceUnion3way">
-        <Resource name="sql">
-            <![CDATA[select 1 from
-(select deptno from sales.emp where deptno > 7
-union all
-select deptno from sales.emp where deptno > 10
-union all
-select deptno from sales.emp where deptno > 1) d
-inner join sales.emp e on d.deptno = e.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($0, $8)], joinType=[inner])
-    LogicalUnion(all=[true])
-      LogicalUnion(all=[true])
-        LogicalProject(DEPTNO=[$7])
-          LogicalFilter(condition=[>($7, 7)])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(DEPTNO=[$7])
-          LogicalFilter(condition=[>($7, 10)])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(DEPTNO=[$7])
-        LogicalFilter(condition=[>($7, 1)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($0, $8)], joinType=[inner])
-    LogicalUnion(all=[true])
-      LogicalUnion(all=[true])
-        LogicalProject(DEPTNO=[$7])
-          LogicalFilter(condition=[>($7, 7)])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(DEPTNO=[$7])
-          LogicalFilter(condition=[>($7, 10)])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(DEPTNO=[$7])
-        LogicalFilter(condition=[>($7, 1)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[>($7, 1)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferenceUnion3wayOr">
-        <Resource name="sql">
-            <![CDATA[select 1 from
-(select empno, deptno from sales.emp where deptno > 7 or empno < 10
-union all
-select empno, deptno from sales.emp where deptno > 10 or empno < deptno
-union all
-select empno, deptno from sales.emp where deptno > 1) d
-inner join sales.emp e on d.deptno = e.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($1, $9)], joinType=[inner])
-    LogicalUnion(all=[true])
-      LogicalUnion(all=[true])
-        LogicalProject(EMPNO=[$0], DEPTNO=[$7])
-          LogicalFilter(condition=[OR(>($7, 7), <($0, 10))])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(EMPNO=[$0], DEPTNO=[$7])
-          LogicalFilter(condition=[OR(>($7, 10), <($0, $7))])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], DEPTNO=[$7])
-        LogicalFilter(condition=[>($7, 1)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($1, $9)], joinType=[inner])
-    LogicalUnion(all=[true])
-      LogicalUnion(all=[true])
-        LogicalProject(EMPNO=[$0], DEPTNO=[$7])
-          LogicalFilter(condition=[OR(>($7, 7), <($0, 10))])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(EMPNO=[$0], DEPTNO=[$7])
-          LogicalFilter(condition=[OR(>($7, 10), <($0, $7))])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$0], DEPTNO=[$7])
-        LogicalFilter(condition=[>($7, 1)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferenceConstantEquiPredicate">
-        <Resource name="sql">
-            <![CDATA[select 1 from sales.emp d
-inner join sales.emp e on d.deptno = e.deptno  where 1 = 1]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferenceConstantPredicate">
-        <Resource name="sql">
-            <![CDATA[select 1 from sales.emp d inner join sales.emp e on d.deptno = e.deptno  where 2 > 1]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-ProjectRel(EXPR$0=[1])
-  JoinRel(condition=[=($7, $16)], joinType=[inner])
-    FilterRel(condition=[>(2, 1)])
-      TableAccessRel(table=[[CATALOG, SALES, EMP]])
-    TableAccessRel(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-ProjectRel(EXPR$0=[1])
-  JoinRel(condition=[=($7, $16)], joinType=[inner])
-    FilterRel(condition=[>(2, 1)])
-      TableAccessRel(table=[[CATALOG, SALES, EMP]])
-    TableAccessRel(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTransitiveInferenceComplexPredicate">
-        <Resource name="sql">
-            <![CDATA[select 1 from sales.emp d
-inner join sales.emp e on d.deptno = e.deptno
-where d.deptno > 7 and e.sal = e.deptno and d.comm = d.deptno
-and d.comm + d.deptno > d.comm/2]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
-    LogicalFilter(condition=[AND(>($7, 7), =($6, $7), >(+($6, $7), /($6, 2)))])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[=($5, $7)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
-    LogicalFilter(condition=[AND(>($7, 7), =($6, $7), >(+($6, $7), /($6, 2)))])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[>($7, 7)])
-      LogicalFilter(condition=[=($5, $7)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullConstantIntoProject">
-        <Resource name="sql">
-            <![CDATA[select deptno, deptno + 1, empno + deptno
-from sales.emp where deptno = 10]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7], EXPR$1=[+($7, 1)], EXPR$2=[+($0, $7)])
-  LogicalFilter(condition=[=($7, 10)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[10], EXPR$1=[11], EXPR$2=[+($0, 10)])
-  LogicalFilter(condition=[=($7, 10)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullConstantIntoFilter">
-        <Resource name="sql">
-            <![CDATA[select * from (select * from sales.emp where deptno = 10)
-where deptno + 5 > empno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[>(+($7, 5), $0)])
-      LogicalFilter(condition=[=($7, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[>(15, $0)])
-      LogicalFilter(condition=[=($7, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughOuterJoin1">
-        <Resource name="sql">
-            <![CDATA[select e.ename
-from (select * from sales.emp where ename = 'A') as e
-left outer join sales.dept as d on e.job = d.name
-group by e.ename]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{1}])
-  LogicalJoin(condition=[=($2, $10)], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($1, 'A')])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}])
-  LogicalJoin(condition=[=($1, $2)], joinType=[left])
-    LogicalAggregate(group=[{1, 2}])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalFilter(condition=[=($1, 'A')])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{1}])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughOuterJoin10">
-        <Resource name="sql">
-            <![CDATA[select count(e.ename)
-from (select * from sales.emp where empno = 10) as e
-left outer join sales.emp as d on e.job = d.job
-group by e.ename,d.mgr]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[$2])
-  LogicalAggregate(group=[{1, 12}], EXPR$0=[COUNT()])
-    LogicalJoin(condition=[=($2, $11)], joinType=[left])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalFilter(condition=[=($0, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject($f0=[+($1, $2)])
+  LogicalAggregate(group=[{0, 1}], SS=[SUM($2)])
+    LogicalProject(JOB=[$2], DEPTNO=[$7], SAL=[$5])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughOuterJoin11">
-        <Resource name="sql">
-            <![CDATA[select e.empno,d.deptno
-from (select * from sales.emp where empno = 10) as e
-left outer join sales.dept as d on e.empno < d.deptno
-group by e.empno,d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 9}])
-  LogicalJoin(condition=[<($0, $9)], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($0, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughOuterJoin12">
-        <Resource name="sql">
-            <![CDATA[select e.job
-from (select * from sales.emp where ename = 'A') as e
-right outer join sales.dept as d on e.job = d.name
-group by e.job]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{2}])
-  LogicalJoin(condition=[=($2, $10)], joinType=[right])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($1, 'A')])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}])
-  LogicalJoin(condition=[=($0, $1)], joinType=[right])
-    LogicalAggregate(group=[{2}])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalFilter(condition=[=($1, 'A')])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{1}])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughOuterJoin13">
-        <Resource name="sql">
-            <![CDATA[select e.job
-from (select * from sales.emp where ename = 'A') as e
-full outer join sales.dept as d on e.job = d.name
-group by e.job]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{2}])
-  LogicalJoin(condition=[=($2, $10)], joinType=[full])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($1, 'A')])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}])
-  LogicalJoin(condition=[=($0, $1)], joinType=[full])
-    LogicalAggregate(group=[{2}])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalFilter(condition=[=($1, 'A')])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{1}])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughOuterJoin14">
-        <Resource name="sql">
-            <![CDATA[select e.mgr, d.mgr
-from sales.emp as e
-full outer join sales.emp as d on e.mgr = d.mgr
-group by d.mgr, e.mgr]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(MGR=[$1], MGR0=[$0])
-  LogicalProject(MGR0=[$1], MGR=[$0])
-    LogicalAggregate(group=[{3, 12}])
-      LogicalJoin(condition=[=($3, $12)], joinType=[full])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(MGR=[$1], MGR0=[$0])
-  LogicalProject(MGR0=[$1], MGR=[$0])
-    LogicalAggregate(group=[{0, 1}])
-      LogicalJoin(condition=[=($0, $1)], joinType=[full])
-        LogicalAggregate(group=[{3}])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{3}])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughOuterJoin15">
-        <Resource name="sql">
-            <![CDATA[select e.ename, d.mgr
-from (select * from sales.emp where ename = 'A') as e
-full outer join sales.emp as d on e.job = d.job
-group by e.ename,d.mgr]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{1, 12}])
-  LogicalJoin(condition=[=($2, $11)], joinType=[full])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($1, 'A')])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 3}])
-  LogicalJoin(condition=[=($1, $2)], joinType=[full])
-    LogicalAggregate(group=[{1, 2}])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalFilter(condition=[=($1, 'A')])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{2, 3}])
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectAggregateMergeNoOp">
+    <Resource name="sql">
+      <![CDATA[select deptno + ss + ms
+from (
+  select job, deptno, min(sal) as ms, sum(sal) as ss
+  from sales.emp
+  group by job, deptno)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[+(+($1, $3), $2)])
+  LogicalAggregate(group=[{0, 1}], MS=[MIN($2)], SS=[SUM($2)])
+    LogicalProject(JOB=[$2], DEPTNO=[$7], SAL=[$5])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughOuterJoin16">
-        <Resource name="sql">
-            <![CDATA[select e.job
-from (select * from sales.emp where ename = 'A') as e
-full outer join sales.dept as d on e.job = d.name
-and e.deptno + e.empno = d.deptno + 5
-group by e.job]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{2}])
-  LogicalJoin(condition=[AND(=($2, $11), =($9, $12))], joinType=[full])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
-      LogicalFilter(condition=[=($1, 'A')])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}])
-  LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[full])
-    LogicalAggregate(group=[{2, 9}])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
-        LogicalFilter(condition=[=($1, 'A')])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{1, 2}])
-      LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughOuterJoin2">
-        <Resource name="sql">
-            <![CDATA[select d.ename
-from (select * from sales.emp where ename = 'A') as e
-left outer join sales.emp as d on e.job = d.job
-group by d.ename]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{10}])
-  LogicalJoin(condition=[=($2, $11)], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($1, 'A')])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{1}])
-  LogicalJoin(condition=[=($0, $2)], joinType=[left])
-    LogicalAggregate(group=[{2}])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalFilter(condition=[=($1, 'A')])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{1, 2}])
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectAggregateMergeSum0">
+    <Resource name="sql">
+      <![CDATA[select coalesce(sum_sal, 0) as ss0
+from (
+  select sum(sal) as sum_sal
+  from sales.emp)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(SS0=[CASE(IS NOT NULL($0), CAST($0):INTEGER NOT NULL, 0)])
+  LogicalAggregate(group=[{}], SUM_SAL=[SUM($0)])
+    LogicalProject(SAL=[$5])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughOuterJoin3">
-        <Resource name="sql">
-            <![CDATA[select e.ename, d.mgr
-from (select * from sales.emp where ename = 'A') as e
-left outer join sales.emp as d on e.job = d.job
-group by e.ename,d.mgr]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{1, 12}])
-  LogicalJoin(condition=[=($2, $11)], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($1, 'A')])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], agg#0=[$SUM0($0)])
+  LogicalProject(SAL=[$5])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 3}])
-  LogicalJoin(condition=[=($1, $2)], joinType=[left])
-    LogicalAggregate(group=[{1, 2}])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalFilter(condition=[=($1, 'A')])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{2, 3}])
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectAggregateMergeSum0AndSum">
+    <Resource name="sql">
+      <![CDATA[select sum_sal * 2, coalesce(sum_sal, 0) as ss0
+from (
+  select sum(sal) as sum_sal
+  from sales.emp)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[*($0, 2)], SS0=[CASE(IS NOT NULL($0), CAST($0):INTEGER NOT NULL, 0)])
+  LogicalAggregate(group=[{}], SUM_SAL=[SUM($0)])
+    LogicalProject(SAL=[$5])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughOuterJoin4">
-        <Resource name="sql">
-            <![CDATA[select e.job
-from (select * from sales.emp where ename = 'A') as e
-left outer join sales.dept as d on e.job = d.name
-group by e.job]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{2}])
-  LogicalJoin(condition=[=($2, $10)], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($1, 'A')])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject($f0=[*($0, 2)], $f1=[$1])
+  LogicalAggregate(group=[{}], SUM_SAL=[SUM($0)], agg#1=[$SUM0($0)])
+    LogicalProject(SAL=[$5])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(JOB=[$0])
-  LogicalJoin(condition=[=($0, $1)], joinType=[left])
-    LogicalAggregate(group=[{2}])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalFilter(condition=[=($1, 'A')])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{1}])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectCorrelateTranspose">
+    <Resource name="sql">
+      <![CDATA[select t1.name, t2.ename
+from DEPT_NESTED as t1,
+unnest(t1.employees) as t2]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NAME=[$1], ENAME=[$5])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{3}])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
+    Uncollect
+      LogicalProject(EMPLOYEES=[$cor0.EMPLOYEES])
+        LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughOuterJoin5">
-        <Resource name="sql">
-            <![CDATA[select d.name
-from (select * from sales.emp where ename = 'A') as e
-left outer join sales.dept as d on e.job = d.name
-group by d.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{10}])
-  LogicalJoin(condition=[=($2, $10)], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($1, 'A')])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$0], ENAME=[$2])
+  LogicalCorrelate(correlation=[$cor1], joinType=[inner], requiredColumns=[{1}])
+    LogicalProject(NAME=[$1], EMPLOYEES=[$3])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
+    LogicalProject(ENAME=[$1])
+      Uncollect
+        LogicalProject(EMPLOYEES=[$cor1.EMPLOYEES])
+          LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{1}])
-  LogicalJoin(condition=[=($0, $1)], joinType=[left])
-    LogicalAggregate(group=[{2}])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalFilter(condition=[=($1, 'A')])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{1}])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectCorrelateTransposeDynamic">
+    <Resource name="sql">
+      <![CDATA[select t1.c_nationkey, t2.a as fake_col2 from SALES.CUSTOMER as t1, unnest(t1.fake_col) as t2(a)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(C_NATIONKEY=[$1], FAKE_COL2=[$2])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
+    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+    LogicalProject(A=[$0])
+      Uncollect
+        LogicalProject(FAKE_COL=[$cor0.FAKE_COL])
+          LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughOuterJoin6">
-        <Resource name="sql">
-            <![CDATA[select e.job,d.name
-from (select * from sales.emp where ename = 'A') as e
-left outer join sales.dept as d on e.job = d.name
-group by e.job,d.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{2, 10}])
-  LogicalJoin(condition=[=($2, $10)], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($1, 'A')])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(C_NATIONKEY=[$1], FAKE_COL2=[$2])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
+    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+    LogicalProject(A=[$0])
+      Uncollect
+        LogicalProject(FAKE_COL=[$cor0.FAKE_COL])
+          LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalJoin(condition=[=($0, $1)], joinType=[left])
-  LogicalAggregate(group=[{2}])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($1, 'A')])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalAggregate(group=[{1}])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectCorrelateTransposeRuleAntiCorrelate">
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalCorrelate(correlation=[$cor0], joinType=[anti], requiredColumns=[{0}])
+  LogicalProject(f=[$0])
+    LogicalValues(tuples=[[{ '1', '2' }]])
+  LogicalProject
+    LogicalProject(f3=[$0], $f1=[$cor0.f])
+      LogicalValues(tuples=[[{ '1', '2' }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughOuterJoin7">
-        <Resource name="sql">
-            <![CDATA[select e.job
-from (select * from sales.emp where ename = 'A') as e
-left outer join sales.dept as d on e.job = d.name
-and e.deptno + e.empno = d.deptno + 5
-group by e.job]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{2}])
-  LogicalJoin(condition=[AND(=($2, $11), =($9, $12))], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
-      LogicalFilter(condition=[=($1, 'A')])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectCorrelateTransposeRuleLeftCorrelate">
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[IS NOT NULL($9)])
+    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
+            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}])
-  LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[left])
-    LogicalAggregate(group=[{2, 9}])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
-        LogicalFilter(condition=[=($1, 'A')])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[IS NOT NULL($1)])
+    LogicalProject(EMPNO=[$0], $f0=[$2])
+      LogicalCorrelate(correlation=[$cor2], joinType=[left], requiredColumns=[{1}])
+        LogicalProject(EMPNO=[$0], DEPTNO=[$7])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{1, 2}])
-      LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalProject($f0=[$0])
+          LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+            LogicalProject($f0=[true])
+              LogicalFilter(condition=[=($cor2.DEPTNO, $0)])
+                LogicalProject(DEPTNO=[$0])
+                  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughOuterJoin8">
-        <Resource name="sql">
-            <![CDATA[select d.name
-from (select * from sales.emp where ename = 'A') as e
-left outer join sales.dept as d on e.job = d.name
-and e.deptno + e.empno = d.deptno + 5
-group by d.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{11}])
-  LogicalJoin(condition=[AND(=($2, $11), =($9, $12))], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
-      LogicalFilter(condition=[=($1, 'A')])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[SELECT e1.empno
+FROM emp e1 where exists (select empno, deptno from dept d2 where e1.deptno = d2.deptno)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectCorrelateTransposeRuleSemiCorrelate">
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalCorrelate(correlation=[$cor0], joinType=[semi], requiredColumns=[{0}])
+  LogicalProject(f=[$0])
+    LogicalValues(tuples=[[{ '1', '2' }]])
+  LogicalProject
+    LogicalProject(f3=[$0], $f1=[$cor0.f])
+      LogicalValues(tuples=[[{ '1', '2' }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectCorrelateTransposeWithExprCond">
+    <Resource name="sql">
+      <![CDATA[select t1.name, t2.ename
+from DEPT_NESTED as t1,
+unnest(t1.employees) as t2]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NAME=[$1], ENAME=[$5])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{3}])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
+    Uncollect
+      LogicalProject(EMPLOYEES=[$cor0.EMPLOYEES])
+        LogicalValues(tuples=[[{ 0 }]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$0], ENAME=[$2])
+  LogicalCorrelate(correlation=[$cor1], joinType=[inner], requiredColumns=[{1}])
+    LogicalProject(NAME=[$1], EMPLOYEES=[$3])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
+    LogicalProject(ENAME=[$1])
+      Uncollect
+        LogicalProject(EMPLOYEES=[$cor1.EMPLOYEES])
+          LogicalValues(tuples=[[{ 0 }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectCorrelateTransposeWithOver">
+    <Resource name="sql">
+      <![CDATA[select sum(t1.deptno + 1) over (partition by t1.name),
+count(t2.empno) over ()
+from DEPT_NESTED as t1,
+unnest(t1.employees) as t2]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[SUM(+($0, 1)) OVER (PARTITION BY $1)], EXPR$1=[COUNT($4) OVER ()])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{3}])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
+    Uncollect
+      LogicalProject(EMPLOYEES=[$cor0.EMPLOYEES])
+        LogicalValues(tuples=[[{ 0 }]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[SUM($2) OVER (PARTITION BY $0)], EXPR$1=[COUNT($3) OVER ()])
+  LogicalCorrelate(correlation=[$cor1], joinType=[inner], requiredColumns=[{1}])
+    LogicalProject(NAME=[$1], EMPLOYEES=[$3], +=[+($0, 1)])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
+    LogicalProject(EMPNO=[$0])
+      Uncollect
+        LogicalProject(EMPLOYEES=[$cor1.EMPLOYEES])
+          LogicalValues(tuples=[[{ 0 }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectFilterTransposeRuleOnEmptyRowType">
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject
+  LogicalFilter(condition=[=($0, 20)])
+    LogicalProject(DEPTNO=[$7])
+      LogicalTableScan(table=[[scott, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectJoinRemove1">
+    <Resource name="sql">
+      <![CDATA[SELECT e.deptno, d2.deptno
+FROM sales.emp e
+LEFT JOIN sales.dept d1 ON e.deptno = d1.deptno
+LEFT JOIN sales.dept d2 ON e.deptno = d2.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7], DEPTNO0=[$11])
+  LogicalJoin(condition=[=($7, $11)], joinType=[left])
+    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{2}])
-  LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[left])
-    LogicalAggregate(group=[{2, 9}])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
-        LogicalFilter(condition=[=($1, 'A')])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{1, 2}])
-      LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7], DEPTNO0=[$9])
+  LogicalJoin(condition=[=($7, $9)], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughOuterJoin9">
-        <Resource name="sql">
-            <![CDATA[select e.job, d.name
-from (select * from sales.emp where ename = 'A') as e
-left outer join sales.dept as d on e.job = d.name
-and e.deptno + e.empno = d.deptno + 5
-group by e.job, d.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{2, 11}])
-  LogicalJoin(condition=[AND(=($2, $11), =($9, $12))], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
-      LogicalFilter(condition=[=($1, 'A')])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectJoinRemove10">
+    <Resource name="sql">
+      <![CDATA[SELECT e.deptno, e.slacker
+FROM sales.emp e
+LEFT JOIN sales.dept d ON e.deptno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7], SLACKER=[$8])
+  LogicalJoin(condition=[=($7, $9)], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7], SLACKER=[$8])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectJoinRemove2">
+    <Resource name="sql">
+      <![CDATA[SELECT e.deptno, d1.deptno
+FROM sales.emp e
+LEFT JOIN sales.dept d1 ON e.deptno = d1.deptno
+LEFT JOIN sales.dept d2 ON e.deptno = d2.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7], DEPTNO0=[$9])
+  LogicalJoin(condition=[=($7, $11)], joinType=[left])
+    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 2}])
-  LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[left])
-    LogicalAggregate(group=[{2, 9}])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
-        LogicalFilter(condition=[=($1, 'A')])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{1, 2}])
-      LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7], DEPTNO0=[$9])
+  LogicalJoin(condition=[=($7, $11)], joinType=[left])
+    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSimplifyFilter">
-        <Resource name="sql">
-            <![CDATA[select * from (select * from sales.emp where deptno > 10)
-where empno > 3 and deptno > 5]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[AND(>($0, 3), >($7, 5))])
-      LogicalFilter(condition=[>($7, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectJoinRemove3">
+    <Resource name="sql">
+      <![CDATA[SELECT e1.deptno, d.deptno
+FROM sales.emp e1
+LEFT JOIN sales.emp e2 ON e1.deptno = e2.deptno
+LEFT JOIN sales.dept d ON e1.deptno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7], DEPTNO0=[$18])
+  LogicalJoin(condition=[=($7, $18)], joinType=[left])
+    LogicalJoin(condition=[=($7, $16)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[>($0, 3)])
-      LogicalFilter(condition=[>($7, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7], DEPTNO0=[$18])
+  LogicalJoin(condition=[=($7, $18)], joinType=[left])
+    LogicalJoin(condition=[=($7, $16)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullConstantIntoJoin">
-        <Resource name="sql">
-            <![CDATA[select * from (select * from sales.emp where empno = 10) as e
-left join sales.dept as d on e.empno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[=($0, $9)], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($0, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectJoinRemove4">
+    <Resource name="sql">
+      <![CDATA[SELECT e.deptno
+FROM sales.emp e
+LEFT JOIN sales.dept d ON e.deptno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7])
+  LogicalJoin(condition=[=($7, $9)], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[true], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($0, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[=($0, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullConstantIntoJoin2">
-        <Resource name="sql">
-            <![CDATA[select * from (select * from sales.emp where empno = 10) as e
-join sales.dept as d on e.empno = d.deptno and e.deptno + e.empno = d.deptno + 5]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$10], NAME=[$11])
-  LogicalJoin(condition=[AND(=($0, $10), =($9, $12))], joinType=[inner])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
-      LogicalFilter(condition=[=($0, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectJoinRemove5">
+    <Resource name="sql">
+      <![CDATA[SELECT e1.deptno
+FROM sales.emp e1
+LEFT JOIN sales.emp e2 ON e1.deptno = e2.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7])
+  LogicalJoin(condition=[=($7, $16)], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[10], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[10], NAME=[$11])
-  LogicalJoin(condition=[=($9, 15)], joinType=[inner])
-    LogicalProject(EMPNO=[10], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, 10)])
-      LogicalFilter(condition=[=($0, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[10], NAME=[$1], $f2=[15])
-      LogicalFilter(condition=[=($0, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7])
+  LogicalJoin(condition=[=($7, $16)], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testStrengthenJoinType">
-        <Resource name="sql">
-            <![CDATA[select *
-from dept left join emp on dept.deptno = emp.deptno
-where emp.deptno is not null and emp.sal > 100]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[$2], ENAME=[$3], JOB=[$4], MGR=[$5], HIREDATE=[$6], SAL=[$7], COMM=[$8], DEPTNO0=[$9], SLACKER=[$10])
-  LogicalFilter(condition=[AND(IS NOT NULL($9), >($7, 100))])
-    LogicalJoin(condition=[=($0, $9)], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectJoinRemove6">
+    <Resource name="sql">
+      <![CDATA[SELECT e.deptno, d.name
+FROM sales.emp e
+LEFT JOIN sales.dept d ON e.deptno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7], NAME=[$10])
+  LogicalJoin(condition=[=($7, $9)], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[$2], ENAME=[$3], JOB=[$4], MGR=[$5], HIREDATE=[$6], SAL=[$7], COMM=[$8], DEPTNO0=[$9], SLACKER=[$10])
-  LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[CAST($2):INTEGER], ENAME=[CAST($3):VARCHAR(20)], JOB=[CAST($4):VARCHAR(10)], MGR=[$5], HIREDATE=[CAST($6):TIMESTAMP(0)], SAL=[CAST($7):INTEGER], COMM=[CAST($8):INTEGER], DEPTNO0=[CAST($9):INTEGER], SLACKER=[CAST($10):BOOLEAN])
-    LogicalJoin(condition=[=($0, $9)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalFilter(condition=[>($5, 100)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7], NAME=[$10])
+  LogicalJoin(condition=[=($7, $9)], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCanNotPushAntiJoinConditionsToLeft">
-        <Resource name="sql">
-            <![CDATA[select * from emp
-where emp.deptno not in
-(select dept.deptno from dept where emp.deptno > 20)]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalJoin(condition=[AND(IS NOT DISTINCT FROM($7, $8), >($0, 20))], joinType=[anti])
-    LogicalTableScan(table=[[scott, EMP]])
-    LogicalTableScan(table=[[scott, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectJoinRemove7">
+    <Resource name="sql">
+      <![CDATA[SELECT e.deptno
+FROM sales.dept d
+RIGHT JOIN sales.emp e ON e.deptno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$9])
+  LogicalJoin(condition=[=($9, $0)], joinType=[right])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCanNotPushAntiJoinConditionsToRight">
-        <Resource name="sql">
-            <![CDATA[select * from emp
-where emp.deptno
-not in (select dept.deptno from dept where dept.dname = 'ddd')]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalJoin(condition=[AND(IS NOT DISTINCT FROM($7, $8), =($9, 'ddd'))], joinType=[anti])
-    LogicalTableScan(table=[[scott, EMP]])
-    LogicalTableScan(table=[[scott, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushSemiJoinConditionsToLeft">
-        <Resource name="sql">
-            <![CDATA[select * from emp
-where emp.deptno
-in (select dept.deptno from dept where emp.empno > 20)]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalJoin(condition=[AND(IS NOT DISTINCT FROM($7, $8), >($0, 20))], joinType=[semi])
-    LogicalTableScan(table=[[scott, EMP]])
-    LogicalTableScan(table=[[scott, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectJoinRemove8">
+    <Resource name="sql">
+      <![CDATA[SELECT e2.deptno
+FROM sales.emp e1
+RIGHT JOIN sales.emp e2 ON e1.deptno = e2.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$16])
+  LogicalJoin(condition=[=($7, $16)], joinType=[right])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushSemiJoinConditions">
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0])
-  LogicalProject(DEPTNO=[$7], ENAME=[$1])
-    LogicalJoin(condition=[AND(IS NOT DISTINCT FROM($7, $8), IS NOT DISTINCT FROM($1, $9))], joinType=[semi])
-      LogicalTableScan(table=[[scott, EMP]])
-      LogicalProject(DEPTNO=[$0], DNAME=[$1])
-        LogicalTableScan(table=[[scott, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$16])
+  LogicalJoin(condition=[=($7, $16)], joinType=[right])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSemiJoinRuleExists">
-        <Resource name="sql">
-            <![CDATA[select * from dept where exists (
-  select * from emp
-  where emp.deptno = dept.deptno
-  and emp.sal > 100)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1])
-  LogicalJoin(condition=[=($0, $2)], joinType=[inner])
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectJoinRemove9">
+    <Resource name="sql">
+      <![CDATA[SELECT e.deptno, d.name
+FROM sales.dept d
+RIGHT JOIN sales.emp e ON e.deptno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$9], NAME=[$1])
+  LogicalJoin(condition=[=($9, $0)], joinType=[right])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalAggregate(group=[{0}])
-      LogicalProject(DEPTNO=[$7])
-        LogicalFilter(condition=[>($5, 100)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalJoin(condition=[=($0, $2)], joinType=[semi])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-  LogicalProject(DEPTNO=[$7])
-    LogicalFilter(condition=[>($5, 100)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$9], NAME=[$1])
+  LogicalJoin(condition=[=($9, $0)], joinType=[right])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSemiJoinTrim">
-        <Resource name="sql">
-            <![CDATA[select s.deptno from (select * from dept where exists (
-  select * from emp
-  where emp.deptno = dept.deptno
-  and emp.sal > 100)) s join customer.account on s.deptno = account.acctno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectJoinTransposeItem">
+    <Resource name="sql">
+      <![CDATA[select t1.c_nationkey[0], t2.c_nationkey[0]
+from sales.customer as t1
+left outer join sales.customer as t2
+on t1.c_nationkey[0] = t2.c_nationkey[0]]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[ITEM($0, 0)], EXPR$1=[ITEM($2, 0)])
+  LogicalJoin(condition=[=($1, $3)], joinType=[left])
+    LogicalProject(C_NATIONKEY=[$0], $f1=[ITEM($0, 0)])
+      LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+    LogicalProject(C_NATIONKEY=[$0], $f1=[ITEM($0, 0)])
+      LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$3])
+  LogicalJoin(condition=[=($0, $2)], joinType=[left])
+    LogicalProject($f1=[$1], ITEM=[ITEM($0, 0)])
+      LogicalProject(C_NATIONKEY=[$0], $f1=[ITEM($0, 0)])
+        LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+    LogicalProject($f1=[$1], ITEM=[ITEM($0, 0)])
+      LogicalProject(C_NATIONKEY=[$0], $f1=[ITEM($0, 0)])
+        LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectJoinTransposeRuleOnAggWithNoFieldsWithTrimmer">
+    <Resource name="planBeforeTrimming">
+      <![CDATA[
 LogicalProject(DEPTNO=[$0])
-  LogicalJoin(condition=[=($0, $2)], joinType=[inner])
-    LogicalJoin(condition=[=($0, $2)], joinType=[semi])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalProject(DEPTNO=[$7], $f0=[true])
-        LogicalFilter(condition=[>($5, 100)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+  LogicalJoin(condition=[true], joinType=[inner])
+    LogicalTableScan(table=[[scott, DEPT]])
+    LogicalAggregate(group=[{}], DUMMY_COUNT=[COUNT()])
+      LogicalTableScan(table=[[scott, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfterTrimming">
+      <![CDATA[
 LogicalProject(DEPTNO=[$0])
-  LogicalJoin(condition=[=($0, $1)], joinType=[inner])
-    LogicalJoin(condition=[=($0, $1)], joinType=[semi])
-      LogicalProject(DEPTNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalProject(DEPTNO=[$1])
-        LogicalFilter(condition=[>($0, 100)])
-          LogicalProject(SAL=[$5], DEPTNO=[$7])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(ACCTNO=[$0])
-      LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+  LogicalJoin(condition=[true], joinType=[inner])
+    LogicalProject(DEPTNO=[$0])
+      LogicalTableScan(table=[[scott, DEPT]])
+    LogicalAggregate(group=[{}], DUMMY=[COUNT()])
+      LogicalProject(EMPNO=[$0])
+        LogicalTableScan(table=[[scott, EMP]])
+]]>
+    </Resource>
+    <Resource name="finalPlan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalJoin(condition=[true], joinType=[inner])
+    LogicalProject(DEPTNO=[$0])
+      LogicalTableScan(table=[[scott, DEPT]])
+    LogicalAggregate(group=[{}], DUMMY=[COUNT()])
+      LogicalProject(EMPNO=[$0])
+        LogicalTableScan(table=[[scott, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectMergeShouldIgnoreOver">
+    <Resource name="sql">
+      <![CDATA[select row_number() over (order by deptno), col1
+from (
+  select deptno,
+    sum(100) over (partition by  deptno order by sal) as col1
+  from emp)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[ROW_NUMBER() OVER (ORDER BY $0)], COL1=[$1])
+  LogicalProject(DEPTNO=[$7], COL1=[SUM(100) OVER (PARTITION BY $7 ORDER BY $5)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectSetOpTranspose">
+    <Resource name="sql">
+      <![CDATA[select job, sum(sal + 100) over (partition by deptno) from
+(select * from emp e1 union all select * from emp e2)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(JOB=[$2], EXPR$1=[SUM(+($5, 100)) OVER (PARTITION BY $7)])
+  LogicalUnion(all=[true])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(JOB=[$0], EXPR$1=[SUM($2) OVER (PARTITION BY $1)])
+  LogicalUnion(all=[true])
+    LogicalProject(JOB=[$2], DEPTNO=[$7], +=[+($5, 100)])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(JOB=[$2], DEPTNO=[$7], +=[+($5, 100)])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCastInAggregateReduceFunctions">
-        <Resource name="sql">
-            <![CDATA[select name, stddev_pop(deptno), avg(deptno),
-stddev_samp(deptno),var_pop(deptno), var_samp(deptno)
-from sales.dept group by name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[STDDEV_POP($1)], EXPR$2=[AVG($1)], EXPR$3=[STDDEV_SAMP($1)], EXPR$4=[VAR_POP($1)], EXPR$5=[VAR_SAMP($1)])
-  LogicalProject(NAME=[$1], DEPTNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectToWindowRuleForMultipleWindows">
+    <Resource name="sql">
+      <![CDATA[select
+ count(*) over(partition by empno order by sal) as count1,
+ count(*) over(partition by deptno order by sal) as count2,
+ sum(deptno) over(partition by empno order by sal) as sum1,
+ sum(deptno) over(partition by deptno order by sal) as sum2
+from emp]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject($0=[$9], $1=[$11], $2=[$10], $3=[$12])
+  LogicalWindow(window#0=[window(partition {0} order by [5] aggs [COUNT(), SUM($7)])], window#1=[window(partition {7} order by [5] aggs [COUNT(), SUM($7)])])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$0], EXPR$1=[CAST(POWER(/(-($1, /(*($2, $2), $3)), $3), 0.5:DECIMAL(2, 1))):INTEGER NOT NULL], EXPR$2=[CAST(/($2, $3)):INTEGER NOT NULL], EXPR$3=[CAST(POWER(/(-($1, /(*($2, $2), $3)), CASE(=($3, 1), null:BIGINT, -($3, 1))), 0.5:DECIMAL(2, 1))):INTEGER NOT NULL], EXPR$4=[CAST(/(-($1, /(*($2, $2), $3)), $3)):INTEGER NOT NULL], EXPR$5=[CAST(/(-($1, /(*($2, $2), $3)), CASE(=($3, 1), null:BIGINT, -($3, 1)))):INTEGER NOT NULL])
-  LogicalAggregate(group=[{0}], agg#0=[$SUM0($2)], agg#1=[$SUM0($1)], agg#2=[COUNT()])
-    LogicalProject(NAME=[$0], DEPTNO=[$1], $f2=[*($1, $1)])
-      LogicalProject(NAME=[$1], DEPTNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(COUNT1=[COUNT() OVER (PARTITION BY $0 ORDER BY $5)], COUNT2=[COUNT() OVER (PARTITION BY $7 ORDER BY $5)], SUM1=[SUM($7) OVER (PARTITION BY $0 ORDER BY $5)], SUM2=[SUM($7) OVER (PARTITION BY $7 ORDER BY $5)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateProjectMerge">
-        <Resource name="sql">
-            <![CDATA[select x, sum(z), y from (
-  select deptno as x, empno as y, sal as z, sal * 2 as zz
-  from emp)
-group by x, y]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(X=[$0], EXPR$1=[$2], Y=[$1])
-  LogicalAggregate(group=[{0, 1}], EXPR$1=[SUM($2)])
-    LogicalProject(X=[$7], Y=[$0], Z=[$5])
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectWindowTransposeRule">
+    <Resource name="sql">
+      <![CDATA[select count(empno) over(), deptno from emp]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$2], DEPTNO=[$1])
+  LogicalWindow(window#0=[window(aggs [COUNT($0)])])
+    LogicalProject(EMPNO=[$0], DEPTNO=[$7])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(X=[$0], EXPR$1=[$2], Y=[$1])
-  LogicalProject(DEPTNO=[$1], EMPNO=[$0], EXPR$1=[$2])
-    LogicalAggregate(group=[{0, 7}], EXPR$1=[SUM($5)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[COUNT($0) OVER ()], DEPTNO=[$7])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateGroupingSetsProjectMerge">
-        <Resource name="sql">
-            <![CDATA[select x, sum(z), y from (
-  select deptno as x, empno as y, sal as z, sal * 2 as zz
-  from emp)
-group by rollup(x, y)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(X=[$0], EXPR$1=[$2], Y=[$1])
-  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$1=[SUM($2)])
-    LogicalProject(X=[$7], Y=[$0], Z=[$5])
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectWindowTransposeRuleWithConstants">
+    <Resource name="sql">
+      <![CDATA[select col1, col2
+from (
+  select empno,
+    sum(100) over (partition by  deptno order by sal) as col1,
+  sum(1000) over(partition by deptno order by sal) as col2
+  from emp)]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject($0=[$2], $1=[$3])
+  LogicalWindow(window#0=[window(partition {1} order by [0] aggs [SUM($2), SUM($3)])])
+    LogicalProject(SAL=[$5], DEPTNO=[$7])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(X=[$0], EXPR$1=[$2], Y=[$1])
-  LogicalProject(DEPTNO=[$1], EMPNO=[$0], EXPR$1=[$2])
-    LogicalAggregate(group=[{0, 7}], groups=[[{0, 7}, {7}, {}]], EXPR$1=[SUM($5)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(COL1=[SUM(100) OVER (PARTITION BY $7 ORDER BY $5)], COL2=[SUM(1000) OVER (PARTITION BY $7 ORDER BY $5)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullAggregateThroughUnion">
-        <Resource name="sql">
-            <![CDATA[select deptno, job from (select deptno, job from emp as e1 group by deptno,job  union all select deptno, job from emp as e2 group by deptno,job) group by deptno,job]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullAggregateThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select deptno, job from (select deptno, job from emp as e1 group by deptno,job  union all select deptno, job from emp as e2 group by deptno,job) group by deptno,job]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalAggregate(group=[{0, 1}])
   LogicalUnion(all=[true])
     LogicalAggregate(group=[{0, 1}])
@@ -7240,9 +6134,9 @@ LogicalAggregate(group=[{0, 1}])
       LogicalProject(DEPTNO=[$7], JOB=[$2])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalAggregate(group=[{0, 1}])
   LogicalUnion(all=[true])
     LogicalProject(DEPTNO=[$7], JOB=[$2])
@@ -7250,14 +6144,14 @@ LogicalAggregate(group=[{0, 1}])
     LogicalProject(DEPTNO=[$7], JOB=[$2])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullAggregateThroughUnion2">
-        <Resource name="sql">
-            <![CDATA[select deptno, job from (select deptno, job from emp as e1 group by deptno,job  union all select deptno, job from emp as e2 group by deptno,job) group by deptno,job]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullAggregateThroughUnion2">
+    <Resource name="sql">
+      <![CDATA[select deptno, job from (select deptno, job from emp as e1 group by deptno,job  union all select deptno, job from emp as e2 group by deptno,job) group by deptno,job]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalAggregate(group=[{0, 1}])
   LogicalUnion(all=[true])
     LogicalAggregate(group=[{0, 1}])
@@ -7267,9 +6161,9 @@ LogicalAggregate(group=[{0, 1}])
       LogicalProject(DEPTNO=[$7], JOB=[$2])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalAggregate(group=[{0, 1}])
   LogicalUnion(all=[true])
     LogicalProject(DEPTNO=[$7], JOB=[$2])
@@ -7277,14 +6171,14 @@ LogicalAggregate(group=[{0, 1}])
     LogicalProject(DEPTNO=[$7], JOB=[$2])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullAggregateThroughUnionAndAddProjects">
-        <Resource name="sql">
-            <![CDATA[select job, deptno from (select job, deptno from emp as e1 group by job, deptno  union all select job, deptno from emp as e2 group by job, deptno) group by job, deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullAggregateThroughUnionAndAddProjects">
+    <Resource name="sql">
+      <![CDATA[select job, deptno from (select job, deptno from emp as e1 group by job, deptno  union all select job, deptno from emp as e2 group by job, deptno) group by job, deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalAggregate(group=[{0, 1}])
   LogicalUnion(all=[true])
     LogicalAggregate(group=[{0, 1}])
@@ -7294,9 +6188,9 @@ LogicalAggregate(group=[{0, 1}])
       LogicalProject(JOB=[$2], DEPTNO=[$7])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalAggregate(group=[{0, 1}])
   LogicalUnion(all=[true])
     LogicalProject(JOB=[$2], DEPTNO=[$7])
@@ -7304,14 +6198,14 @@ LogicalAggregate(group=[{0, 1}])
     LogicalProject(JOB=[$2], DEPTNO=[$7])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullAggregateThroughUnionWithAlias">
-        <Resource name="sql">
-            <![CDATA[select job, c from (select job, deptno c from emp as e1 group by job, deptno  union all select job, deptno from emp as e2 group by job, deptno) group by job, c]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullAggregateThroughUnionWithAlias">
+    <Resource name="sql">
+      <![CDATA[select job, c from (select job, deptno c from emp as e1 group by job, deptno  union all select job, deptno from emp as e2 group by job, deptno) group by job, c]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalAggregate(group=[{0, 1}])
   LogicalUnion(all=[true])
     LogicalAggregate(group=[{0, 1}])
@@ -7321,9 +6215,9 @@ LogicalAggregate(group=[{0, 1}])
       LogicalProject(JOB=[$2], DEPTNO=[$7])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalAggregate(group=[{0, 1}])
   LogicalProject(JOB=[$0], C=[$1])
     LogicalUnion(all=[true])
@@ -7332,814 +6226,1300 @@ LogicalAggregate(group=[{0, 1}])
       LogicalProject(JOB=[$2], DEPTNO=[$7])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectWindowTransposeRule">
-        <Resource name="sql">
-            <![CDATA[select count(empno) over(), deptno from emp]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$2], DEPTNO=[$1])
-  LogicalWindow(window#0=[window(aggs [COUNT($0)])])
-    LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullConstantIntoFilter">
+    <Resource name="sql">
+      <![CDATA[select * from (select * from sales.emp where deptno = 10)
+where deptno + 5 > empno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[>(+($7, 5), $0)])
+      LogicalFilter(condition=[=($7, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[>(15, $0)])
+      LogicalFilter(condition=[=($7, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullConstantIntoJoin">
+    <Resource name="sql">
+      <![CDATA[select * from (select * from sales.emp where empno = 10) as e
+left join sales.dept as d on e.empno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalJoin(condition=[=($0, $9)], joinType=[left])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($0, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalJoin(condition=[true], joinType=[left])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($0, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[=($0, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullConstantIntoJoin2">
+    <Resource name="sql">
+      <![CDATA[select * from (select * from sales.emp where empno = 10) as e
+join sales.dept as d on e.empno = d.deptno and e.deptno + e.empno = d.deptno + 5]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$10], NAME=[$11])
+  LogicalJoin(condition=[AND(=($0, $10), =($9, $12))], joinType=[inner])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
+      LogicalFilter(condition=[=($0, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[10], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[10], NAME=[$11])
+  LogicalJoin(condition=[=($9, 15)], joinType=[inner])
+    LogicalProject(EMPNO=[10], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, 10)])
+      LogicalFilter(condition=[=($0, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[10], NAME=[$1], $f2=[15])
+      LogicalFilter(condition=[=($0, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullConstantIntoProject">
+    <Resource name="sql">
+      <![CDATA[select deptno, deptno + 1, empno + deptno
+from sales.emp where deptno = 10]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7], EXPR$1=[+($7, 1)], EXPR$2=[+($0, $7)])
+  LogicalFilter(condition=[=($7, 10)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[10], EXPR$1=[11], EXPR$2=[+($0, 10)])
+  LogicalFilter(condition=[=($7, 10)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullConstantThroughAggregateAllConst">
+    <Resource name="sql">
+      <![CDATA[select 4, 2+3, max(five) from (
+  select *, 4 as four, 2+3 as two_plus_three, 5 as five, deptno+42 as deptno42 from emp
+) group by 4, 2+3]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], EXPR$2=[MAX($2)])
+  LogicalProject(EXPR$0=[4], EXPR$1=[+(2, 3)], FIVE=[5])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$0], EXPR$1=[+(2, 3)], EXPR$2=[$1])
+  LogicalAggregate(group=[{0}], EXPR$2=[MAX($1)])
+    LogicalProject(EXPR$0=[4], FIVE=[5])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[COUNT($0) OVER ()], DEPTNO=[$7])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullConstantThroughAggregateAllLiterals">
+    <Resource name="sql">
+      <![CDATA[select 4, 2+3, max(5) from (
+  select *, 4 as four, 2+3 as two_plus_three, 5 as five, deptno+42 as deptno42 from emp
+) group by 4, 2+3]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], EXPR$2=[MAX($2)])
+  LogicalProject(EXPR$0=[4], EXPR$1=[+(2, 3)], $f2=[5])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectWindowTransposeRuleWithConstants">
-        <Resource name="sql">
-            <![CDATA[select col1, col2
-from (
-  select empno,
-    sum(100) over (partition by  deptno order by sal) as col1,
-  sum(1000) over(partition by deptno order by sal) as col2
-  from emp)]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject($0=[$2], $1=[$3])
-  LogicalWindow(window#0=[window(partition {1} order by [0] aggs [SUM($2), SUM($3)])])
-    LogicalProject(SAL=[$5], DEPTNO=[$7])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$0], EXPR$1=[+(2, 3)], EXPR$2=[$1])
+  LogicalAggregate(group=[{0}], EXPR$2=[MAX($1)])
+    LogicalProject(EXPR$0=[4], $f2=[5])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(COL1=[SUM(100) OVER (PARTITION BY $7 ORDER BY $5)], COL2=[SUM(1000) OVER (PARTITION BY $7 ORDER BY $5)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullConstantThroughAggregateConstGroupBy">
+    <Resource name="sql">
+      <![CDATA[select 4, 2+3, max(mgr) from (
+  select *, 4 as four, 2+3 as two_plus_three, deptno+42 as deptno42 from emp
+) group by 4, 2+3]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], EXPR$2=[MAX($2)])
+  LogicalProject(EXPR$0=[4], EXPR$1=[+(2, 3)], MGR=[$3])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushFilterWithRank">
-        <Resource name="sql">
-            <![CDATA[select e1.ename, r
-from (
-  select ename,   rank() over(partition by  deptno order by sal) as r   from emp) e1
-where r < 2]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(ENAME=[$0], R=[$1])
-  LogicalFilter(condition=[<($1, 2)])
-    LogicalProject(ENAME=[$1], R=[RANK() OVER (PARTITION BY $7 ORDER BY $5)])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$0], EXPR$1=[+(2, 3)], EXPR$2=[$1])
+  LogicalAggregate(group=[{0}], EXPR$2=[MAX($1)])
+    LogicalProject(EXPR$0=[4], MGR=[$3])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(ENAME=[$0], R=[$1])
-  LogicalFilter(condition=[<($1, 2)])
-    LogicalProject(ENAME=[$1], R=[RANK() OVER (PARTITION BY $7 ORDER BY $5 RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullConstantThroughAggregatePermuted">
+    <Resource name="sql">
+      <![CDATA[select deptno, max(mgr) from (
+  select *, 4 as four, 2+3 as two_plus_three, deptno+42 as deptno42 from emp
+) group by deptno, four, two_plus_three, deptno42]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EXPR$1=[$4])
+  LogicalAggregate(group=[{0, 1, 2, 3}], EXPR$1=[MAX($4)])
+    LogicalProject(DEPTNO=[$7], FOUR=[4], TWO_PLUS_THREE=[+(2, 3)], DEPTNO42=[+($7, 42)], MGR=[$3])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EXPR$1=[$2])
+  LogicalAggregate(group=[{0, 1}], EXPR$1=[MAX($2)])
+    LogicalProject(DEPTNO=[$7], DEPTNO42=[+($7, 42)], MGR=[$3])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullConstantThroughAggregatePermutedConstFirst">
+    <Resource name="sql">
+      <![CDATA[select deptno, max(mgr) from (
+  select *, 4 as four, 2+3 as two_plus_three, deptno+42 as deptno42 from emp
+) group by four, deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$1], EXPR$1=[$2])
+  LogicalAggregate(group=[{0, 1}], EXPR$1=[MAX($2)])
+    LogicalProject(FOUR=[4], DEPTNO=[$7], MGR=[$3])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
+  LogicalProject(DEPTNO=[$7], MGR=[$3])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullConstantThroughAggregatePermutedConstGroupBy">
+    <Resource name="sql">
+      <![CDATA[select deptno, max(mgr) from (
+  select *, 4 as four, 2+3 as two_plus_three, deptno+42 as deptno42 from emp
+) group by 42+24, deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$1], EXPR$1=[$2])
+  LogicalAggregate(group=[{0, 1}], EXPR$1=[MAX($2)])
+    LogicalProject($f0=[+(42, 24)], DEPTNO=[$7], MGR=[$3])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
+  LogicalProject(DEPTNO=[$7], MGR=[$3])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullConstantThroughAggregateSimpleNonNullable">
+    <Resource name="sql">
+      <![CDATA[select deptno, max(ename) from (
+  select *, 4 as four, 2+3 as two_plus_three, deptno+42 as deptno42 from emp
+) group by deptno, four]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EXPR$1=[$2])
+  LogicalAggregate(group=[{0, 1}], EXPR$1=[MAX($2)])
+    LogicalProject(DEPTNO=[$7], FOUR=[4], ENAME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
+  LogicalProject(DEPTNO=[$7], ENAME=[$1])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullConstantThroughConstLast">
+    <Resource name="sql">
+      <![CDATA[select deptno, max(mgr) from (
+  select *, 4 as four, 2+3 as two_plus_three, deptno+42 as deptno42 from emp
+) group by deptno, four]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EXPR$1=[$2])
+  LogicalAggregate(group=[{0, 1}], EXPR$1=[MAX($2)])
+    LogicalProject(DEPTNO=[$7], FOUR=[4], MGR=[$3])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
+  LogicalProject(DEPTNO=[$7], MGR=[$3])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullConstantThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select 2, deptno, job from emp as e1
+union all
+select 2, deptno, job from emp as e2]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalProject(EXPR$0=[2], DEPTNO=[$7], JOB=[$2])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EXPR$0=[2], DEPTNO=[$7], JOB=[$2])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[2], DEPTNO=[$0], JOB=[$1])
+  LogicalUnion(all=[true])
+    LogicalProject(DEPTNO=[$7], JOB=[$2])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$7], JOB=[$2])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullConstantThroughUnion2">
+    <Resource name="sql">
+      <![CDATA[select 2, deptno, job from emp as e1
+union all
+select 1, deptno, job from emp as e2]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalProject(EXPR$0=[2], DEPTNO=[$7], JOB=[$2])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EXPR$0=[1], DEPTNO=[$7], JOB=[$2])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullConstantThroughUnion3">
+    <Resource name="sql">
+      <![CDATA[select 2, 3 from emp as e1
+union all
+select 2, 3 from emp as e2]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalProject(EXPR$0=[2], EXPR$1=[3])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EXPR$0=[2], EXPR$1=[3])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[2], EXPR$1=[3])
+  LogicalUnion(all=[true])
+    LogicalProject(EXPR$0=[2])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushFilterWithRankExpr">
-        <Resource name="sql">
-            <![CDATA[select e1.ename, r
-from (
-  select ename,
-  rank() over(partition by  deptno order by sal) + 1 as r   from emp) e1
-where r < 2]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(ENAME=[$0], R=[$1])
-  LogicalFilter(condition=[<($1, 2)])
-    LogicalProject(ENAME=[$1], R=[+(RANK() OVER (PARTITION BY $7 ORDER BY $5), 1)])
+    LogicalProject(EXPR$0=[2])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(ENAME=[$0], R=[$1])
-  LogicalFilter(condition=[<($1, 2)])
-    LogicalProject(ENAME=[$1], R=[+(RANK() OVER (PARTITION BY $7 ORDER BY $5 RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW), 1)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullFilterThroughAggregate">
+    <Resource name="sql">
+      <![CDATA[select ename, sal, deptno from (  select ename, sal, deptno  from emp  where sal > 5000)group by ename, sal, deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1, 2}])
+  LogicalFilter(condition=[>($1, 5000)])
+    LogicalProject(ENAME=[$1], SAL=[$5], DEPTNO=[$7])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctCountWithoutGroupBy">
-        <Resource name="sql">
-            <![CDATA[select max(deptno), count(distinct ename)
-from sales.emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[MAX($0)], EXPR$1=[COUNT(DISTINCT $1)])
-  LogicalProject(DEPTNO=[$7], ENAME=[$1])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalFilter(condition=[>($1, 5000)])
+  LogicalAggregate(group=[{0, 1, 2}])
+    LogicalProject(ENAME=[$1], SAL=[$5], DEPTNO=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[MIN($1) FILTER $3], EXPR$1=[COUNT($0) FILTER $2])
-  LogicalProject(ENAME=[$0], EXPR$0=[$1], $g_0=[=($2, 0)], $g_1=[=($2, 1)])
-    LogicalAggregate(group=[{1}], groups=[[{1}, {}]], EXPR$0=[MAX($7)], $g=[GROUPING($1)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullFilterThroughAggregateGroupingSets">
+    <Resource name="sql">
+      <![CDATA[select ename, sal, deptno from (  select ename, sal, deptno  from emp  where sal > 5000)group by rollup(ename, sal, deptno)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1, 2}], groups=[[{0, 1, 2}, {0, 1}, {0}, {}]])
+  LogicalFilter(condition=[>($1, 5000)])
+    LogicalProject(ENAME=[$1], SAL=[$5], DEPTNO=[$7])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctCount1">
-        <Resource name="sql">
-            <![CDATA[select deptno, count(distinct ename)
-from sales.emp group by deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
-  LogicalProject(DEPTNO=[$7], ENAME=[$1])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1, 2}], groups=[[{0, 1, 2}, {0, 1}, {0}, {}]])
+  LogicalFilter(condition=[>($1, 5000)])
+    LogicalAggregate(group=[{0, 1, 2}])
+      LogicalProject(ENAME=[$1], SAL=[$5], DEPTNO=[$7])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{1}], EXPR$1=[COUNT($0)])
-  LogicalAggregate(group=[{1, 7}])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPullNull">
+    <Resource name="sql">
+      <![CDATA[select *
+from emp
+where deptno=7
+and empno = 10 and mgr is null and empno = 10]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[AND(=($7, 7), =($0, 10), IS NULL($3), =($0, 10))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctCount2">
-        <Resource name="sql">
-            <![CDATA[select deptno, count(distinct ename), sum(sal)
-from sales.emp group by deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)], EXPR$2=[SUM($2)])
-  LogicalProject(DEPTNO=[$7], ENAME=[$1], SAL=[$5])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[10], ENAME=[$1], JOB=[$2], MGR=[null:INTEGER], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[7], SLACKER=[$8])
+  LogicalFilter(condition=[AND(=($7, 7), =($0, 10), IS NULL($3))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EXPR$1=[$1], EXPR$2=[CAST($2):INTEGER NOT NULL])
-  LogicalAggregate(group=[{0}], EXPR$1=[COUNT($1) FILTER $3], EXPR$2=[MIN($2) FILTER $4])
-    LogicalProject(DEPTNO=[$0], ENAME=[$1], EXPR$2=[$2], $g_0=[=($3, 0)], $g_1=[=($3, 1)])
-      LogicalProject(DEPTNO=[$1], ENAME=[$0], EXPR$2=[$2], $g=[$3])
-        LogicalAggregate(group=[{1, 7}], groups=[[{1, 7}, {7}]], EXPR$2=[SUM($5)], $g=[GROUPING($7, $1)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAboveFiltersIntoInnerJoinCondition">
+    <Resource name="sql">
+      <![CDATA[select * from sales.dept d inner join sales.emp e
+on d.deptno = e.deptno and d.deptno > e.mgr
+where d.deptno > e.mgr]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[$2], ENAME=[$3], JOB=[$4], MGR=[$5], HIREDATE=[$6], SAL=[$7], COMM=[$8], DEPTNO0=[$9], SLACKER=[$10])
+  LogicalFilter(condition=[>($0, $5)])
+    LogicalJoin(condition=[AND(=($0, $9), >($0, $5))], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctCountGroupingSets1">
-        <Resource name="sql">
-            <![CDATA[select deptno, job, count(distinct ename)
-from sales.emp group by rollup(deptno,job)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[COUNT(DISTINCT $2)])
-  LogicalProject(DEPTNO=[$7], JOB=[$2], ENAME=[$1])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[$2], ENAME=[$3], JOB=[$4], MGR=[$5], HIREDATE=[$6], SAL=[$7], COMM=[$8], DEPTNO0=[$9], SLACKER=[$10])
+  LogicalJoin(condition=[AND(=($0, $9), >($0, $5))], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[COUNT($2) FILTER $3])
-  LogicalProject(DEPTNO=[$0], JOB=[$1], ENAME=[$2], $g_0=[=($3, 0)])
-    LogicalAggregate(group=[{0, 1, 2}], $g=[GROUPING($0, $1, $2)])
-      LogicalProject(DEPTNO=[$7], JOB=[$2], ENAME=[$1])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select ename,sum(empno),count(*) from (select * from emp as e1 union all select * from emp as e2) group by ename]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+AggregateRel(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[COUNT()])
+  ProjectRel(ENAME=[$1], EMPNO=[$0])
+    UnionRel(all=[true])
+      ProjectRel(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        TableAccessRel(table=[[CATALOG, SALES, EMP]])
+      ProjectRel(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        TableAccessRel(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+ProjectRel(ENAME=[$0], EXPR$1=[$1], EXPR$2=[CAST($2):BIGINT NOT NULL])
+  AggregateRel(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[SUM($2)])
+    UnionRel(all=[true])
+      AggregateRel(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[COUNT()])
+        ProjectRel(ENAME=[$1], EMPNO=[$0])
+          ProjectRel(EMPNO=[$0], ENAME=[$1])
+            ProjectRel(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+              TableAccessRel(table=[[CATALOG, SALES, EMP]])
+      AggregateRel(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[COUNT()])
+        ProjectRel(ENAME=[$1], EMPNO=[$0])
+          ProjectRel(EMPNO=[$0], ENAME=[$1])
+            ProjectRel(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+              TableAccessRel(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateFunctionsThroughJoin">
+    <Resource name="sql">
+      <![CDATA[select e.job,
+  min(sal) as min_sal, min(e.deptno) as min_deptno,
+  sum(sal) + 1 as sum_sal_plus, max(sal) as max_sal,
+  sum(sal) as sum_sal_2, count(sal) as count_sal,
+  count(mgr) as count_mgr
+from sales.emp as e
+join sales.dept as d on e.job = d.name
+group by e.job,d.name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(JOB=[$0], MIN_SAL=[$2], MIN_DEPTNO=[$3], SUM_SAL_PLUS=[+($4, 1)], MAX_SAL=[$5], SUM_SAL_2=[$4], COUNT_SAL=[$6], COUNT_MGR=[$7])
+  LogicalAggregate(group=[{2, 10}], MIN_SAL=[MIN($5)], MIN_DEPTNO=[MIN($7)], SUM_SAL_2=[SUM($5)], MAX_SAL=[MAX($5)], COUNT_SAL=[COUNT()], COUNT_MGR=[COUNT($3)])
+    LogicalJoin(condition=[=($2, $10)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(JOB=[$0], MIN_SAL=[$2], MIN_DEPTNO=[$3], SUM_SAL_PLUS=[+($4, 1)], MAX_SAL=[$5], SUM_SAL_2=[$4], COUNT_SAL=[$6], COUNT_MGR=[$7])
+  LogicalProject(JOB=[$0], NAME=[$7], MIN_SAL=[$1], MIN_DEPTNO=[$2], $f9=[CAST(*($3, $8)):INTEGER NOT NULL], MAX_SAL=[$4], $f10=[*($5, $8)], $f11=[*($6, $8)])
+    LogicalJoin(condition=[=($0, $7)], joinType=[inner])
+      LogicalAggregate(group=[{2}], MIN_SAL=[MIN($5)], MIN_DEPTNO=[MIN($7)], SUM_SAL_2=[SUM($5)], MAX_SAL=[MAX($5)], COUNT_SAL=[COUNT()], COUNT_MGR=[COUNT($3)])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{1}], agg#0=[COUNT()])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctCountGroupingSets2">
-        <Resource name="sql">
-            <![CDATA[select deptno, job, count(distinct ename), sum(sal)
-from sales.emp group by rollup(deptno,job)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[COUNT(DISTINCT $2)], EXPR$3=[SUM($3)])
-  LogicalProject(DEPTNO=[$7], JOB=[$2], ENAME=[$1], SAL=[$5])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateSumNoGroup">
+    <Resource name="sql">
+      <![CDATA[select count(*) from sales.emp join sales.dept on job = name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
+  LogicalJoin(condition=[=($2, $10)], joinType=[inner])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], JOB=[$1], EXPR$2=[$2], EXPR$3=[CAST($3):INTEGER NOT NULL])
-  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[COUNT($2) FILTER $4], EXPR$3=[MIN($3) FILTER $5])
-    LogicalProject(DEPTNO=[$0], JOB=[$1], ENAME=[$2], EXPR$3=[$3], $g_0=[=($4, 0)], $g_1=[=($4, 1)])
-      LogicalAggregate(group=[{0, 1, 2}], groups=[[{0, 1, 2}, {0, 1}]], EXPR$3=[SUM($3)], $g=[GROUPING($0, $1, $2)])
-        LogicalProject(DEPTNO=[$7], JOB=[$2], ENAME=[$1], SAL=[$5])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[$SUM0($0)])
+  LogicalProject($f4=[*($1, $3)])
+    LogicalJoin(condition=[=($0, $2)], joinType=[inner])
+      LogicalAggregate(group=[{2}], EXPR$0=[COUNT()])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{1}], EXPR$0=[COUNT()])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testConvertMultiJoinRuleOuterJoins2">
-        <Resource name="sql">
-            <![CDATA[select * from A right join B on a = b join C on b = c]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(A=[$0], B=[$1], C=[$2])
-  LogicalJoin(condition=[=($1, $2)], joinType=[inner])
-    LogicalJoin(condition=[=($0, $1)], joinType=[right])
-      LogicalTableScan(table=[[CATALOG, SALES, A]])
-      LogicalTableScan(table=[[CATALOG, SALES, B]])
-    LogicalTableScan(table=[[CATALOG, SALES, C]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateSumThroughJoin">
+    <Resource name="sql">
+      <![CDATA[select e.job,sum(sal)
+from (select * from sales.emp where ename = 'A') as e
+join sales.dept as d on e.job = d.name
+group by e.job,d.name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(JOB=[$0], EXPR$1=[$2])
+  LogicalAggregate(group=[{2, 10}], EXPR$1=[SUM($5)])
+    LogicalJoin(condition=[=($2, $10)], joinType=[inner])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalFilter(condition=[=($1, 'A')])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-MultiJoin(joinFilter=[=($1, $2)], isFullOuterJoin=[false], joinTypes=[[INNER, INNER]], outerJoinConditions=[[NULL, NULL]], projFields=[[ALL, ALL]])
-  MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[RIGHT, INNER]], outerJoinConditions=[[=($0, $1), NULL]], projFields=[[ALL, ALL]])
-    LogicalTableScan(table=[[CATALOG, SALES, A]])
-    LogicalTableScan(table=[[CATALOG, SALES, B]])
-  LogicalTableScan(table=[[CATALOG, SALES, C]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(JOB=[$0], EXPR$1=[$2])
+  LogicalProject(JOB=[$0], NAME=[$2], $f4=[CAST(*($1, $3)):INTEGER NOT NULL])
+    LogicalJoin(condition=[=($0, $2)], joinType=[inner])
+      LogicalAggregate(group=[{2}], EXPR$1=[SUM($5)])
+        LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+          LogicalFilter(condition=[=($1, 'A')])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{1}], agg#0=[COUNT()])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testConvertMultiJoinRuleOuterJoins3">
-        <Resource name="sql">
-            <![CDATA[select * from A join B on a = b left join C on b = c]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(A=[$0], B=[$1], C=[$2])
-  LogicalJoin(condition=[=($1, $2)], joinType=[left])
-    LogicalJoin(condition=[=($0, $1)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, A]])
-      LogicalTableScan(table=[[CATALOG, SALES, B]])
-    LogicalTableScan(table=[[CATALOG, SALES, C]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateSumThroughJoinAfterAggregateReduce">
+    <Resource name="sql">
+      <![CDATA[select sum(sal)
+from (select * from sales.emp where ename = 'A') as e
+join sales.dept as d on e.job = d.name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($5)])
+  LogicalJoin(condition=[=($2, $10)], joinType=[inner])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($1, 'A')])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-MultiJoin(joinFilter=[=($0, $1)], isFullOuterJoin=[false], joinTypes=[[INNER, INNER, LEFT]], outerJoinConditions=[[NULL, NULL, =($1, $2)]], projFields=[[ALL, ALL, ALL]])
-  LogicalTableScan(table=[[CATALOG, SALES, A]])
-  LogicalTableScan(table=[[CATALOG, SALES, B]])
-  LogicalTableScan(table=[[CATALOG, SALES, C]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[CASE(=($1, 0), null:INTEGER, $0)])
+  LogicalAggregate(group=[{}], EXPR$0=[$SUM0($0)], agg#1=[$SUM0($1)])
+    LogicalProject($f5=[CAST(*($1, $4)):INTEGER NOT NULL], $f6=[*($2, $4)])
+      LogicalJoin(condition=[=($0, $3)], joinType=[inner])
+        LogicalAggregate(group=[{2}], EXPR$0=[$SUM0($5)], agg#1=[COUNT()])
+          LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+            LogicalFilter(condition=[=($1, 'A')])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalAggregate(group=[{1}], agg#0=[COUNT()])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testConvertMultiJoinRuleOuterJoins4">
-        <Resource name="sql">
-            <![CDATA[select * from A join B on a = b right join C on b = c]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(A=[$0], B=[$1], C=[$2])
-  LogicalJoin(condition=[=($1, $2)], joinType=[right])
-    LogicalJoin(condition=[=($0, $1)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, A]])
-      LogicalTableScan(table=[[CATALOG, SALES, B]])
-    LogicalTableScan(table=[[CATALOG, SALES, C]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateSumWithoutGroupKeyThroughJoin">
+    <Resource name="sql">
+      <![CDATA[select sum(sal)
+from (select * from sales.emp where ename = 'A') as e
+join sales.dept as d on e.job = d.name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($5)])
+  LogicalJoin(condition=[=($2, $10)], joinType=[inner])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($1, 'A')])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[RIGHT, INNER]], outerJoinConditions=[[=($1, $2), NULL]], projFields=[[ALL, ALL]])
-  MultiJoin(joinFilter=[=($0, $1)], isFullOuterJoin=[false], joinTypes=[[INNER, INNER]], outerJoinConditions=[[NULL, NULL]], projFields=[[ALL, ALL]])
-    LogicalTableScan(table=[[CATALOG, SALES, A]])
-    LogicalTableScan(table=[[CATALOG, SALES, B]])
-  LogicalTableScan(table=[[CATALOG, SALES, C]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
+  LogicalProject($f4=[CAST(*($1, $3)):INTEGER])
+    LogicalJoin(condition=[=($0, $2)], joinType=[inner])
+      LogicalAggregate(group=[{2}], EXPR$0=[SUM($5)])
+        LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+          LogicalFilter(condition=[=($1, 'A')])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{1}], agg#0=[COUNT()])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushFilterPastAggTwo">
-        <Resource name="sql">
-            <![CDATA[select dept1.c1 from (
-select dept.name as c1, count(*) as c2
-from dept where dept.name > 'b' group by dept.name) dept1
-where dept1.c1 > 'c' and (dept1.c2 > 30 or dept1.c1 < 'z')]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(C1=[$0])
-  LogicalFilter(condition=[AND(>($0, 'c'), OR(>($1, 30), <($0, 'z')))])
-    LogicalAggregate(group=[{0}], C2=[COUNT()])
-      LogicalProject(C1=[$1])
-        LogicalFilter(condition=[>($1, 'b')])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughJoin1">
+    <Resource name="sql">
+      <![CDATA[select e.job,d.name
+from (select * from sales.emp where ename = 'A') as e
+join sales.dept as d on e.job = d.name
+group by e.job,d.name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{2, 10}])
+  LogicalJoin(condition=[=($2, $10)], joinType=[inner])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($1, 'A')])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(C1=[$0])
-  LogicalFilter(condition=[OR(>($1, 30), <($0, 'z'))])
-    LogicalAggregate(group=[{0}], C2=[COUNT()])
-      LogicalFilter(condition=[>($0, 'c')])
-        LogicalProject(C1=[$1])
-          LogicalFilter(condition=[>($1, 'b')])
-            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalJoin(condition=[=($0, $1)], joinType=[inner])
+  LogicalAggregate(group=[{2}])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($1, 'A')])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalAggregate(group=[{1}])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushFilterPastProject">
-        <Resource name="sql">
-            <![CDATA[select a.name
-from dept a
-left join dept b on b.deptno > 10
-right join dept c on b.deptno > 10
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughJoin2">
+    <Resource name="sql">
+      <![CDATA[select e.job,d.name
+from (select * from sales.emp where ename = 'A') as e
+join sales.dept as d on e.job = d.name
+and e.deptno + e.empno = d.deptno + 5
+group by e.job,d.name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{2, 11}])
+  LogicalJoin(condition=[AND(=($2, $11), =($9, $12))], joinType=[inner])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
+      LogicalFilter(condition=[=($1, 'A')])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NAME=[$1])
-  LogicalJoin(condition=[$4], joinType=[right])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO0=[$2], NAME0=[$3], $f4=[>($2, 10)])
-      LogicalJoin(condition=[$4], joinType=[left])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 2}])
+  LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[inner])
+    LogicalAggregate(group=[{2, 9}])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
+        LogicalFilter(condition=[=($1, 'A')])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{1, 2}])
+      LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
         LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[>($0, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughJoin3">
+    <Resource name="sql">
+      <![CDATA[select e.empno,d.deptno
+from (select * from sales.emp where empno = 10) as e
+join sales.dept as d on e.empno < d.deptno
+group by e.empno,d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 9}])
+  LogicalJoin(condition=[<($0, $9)], joinType=[inner])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($0, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$1])
-  LogicalJoin(condition=[true], joinType=[right])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO0=[$2], NAME0=[$3], $f4=[>($2, 10)])
-      LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO0=[CAST($2):INTEGER], NAME0=[CAST($3):VARCHAR(10)], $f2=[CAST($4):BOOLEAN])
-        LogicalJoin(condition=[true], joinType=[inner])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-          LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[>($0, 10)])
-            LogicalFilter(condition=[>($0, 10)])
-              LogicalFilter(condition=[>($0, 10)])
-                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 9}])
+  LogicalJoin(condition=[<($0, $9)], joinType=[inner])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($0, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSemiJoinProjectTranspose">
-        <Resource name="sql">
-            <![CDATA[select a.name from dept a
-where a.deptno in (select b.deptno * 2 from dept);
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughJoin4">
+    <Resource name="sql">
+      <![CDATA[select e.deptno
+from sales.emp as e join sales.dept as d on e.deptno = d.deptno
+group by e.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{7}])
+  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DNAME=[$1])
-  LogicalJoin(condition=[=($0, $3)], joinType=[semi])
-    LogicalTableScan(table=[[scott, DEPT]])
-    LogicalAggregate(group=[{0}])
-      LogicalProject($f0=[*(2, $0)])
-        LogicalTableScan(table=[[scott, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalJoin(condition=[=($0, $1)], joinType=[inner])
+    LogicalAggregate(group=[{7}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DNAME=[$1])
-  LogicalJoin(condition=[=($0, $2)], joinType=[semi])
-    LogicalProject(DEPTNO=[$0], DNAME=[$1])
-      LogicalTableScan(table=[[scott, DEPT]])
-    LogicalProject($f0=[$0])
-      LogicalAggregate(group=[{0}])
-        LogicalProject($f0=[*(2, $0)])
-          LogicalTableScan(table=[[scott, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughJoin5">
+    <Resource name="sql">
+      <![CDATA[select e.deptno, d.deptno
+from sales.emp as e join sales.dept as d on e.deptno = d.deptno
+group by e.deptno, d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], DEPTNO0=[$1])
+  LogicalAggregate(group=[{7, 9}])
+    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAntiJoinProjectTranspose">
-        <Resource name="sql">
-            <![CDATA[select a.name from dept a
-where a.deptno not in (select b.deptno * 2 from dept);
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], DEPTNO0=[$1])
+  LogicalJoin(condition=[=($0, $1)], joinType=[inner])
+    LogicalAggregate(group=[{7}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DNAME=[$1])
-  LogicalJoin(condition=[=($0, $3)], joinType=[anti])
-    LogicalTableScan(table=[[scott, DEPT]])
-    LogicalAggregate(group=[{0}])
-      LogicalProject($f0=[*(2, $0)])
-        LogicalTableScan(table=[[scott, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughJoin6">
+    <Resource name="sql">
+      <![CDATA[select sum(B.sal)
+from sales.emp as A
+join (select distinct sal from sales.emp) as B
+on A.sal=B.sal
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DNAME=[$1])
-  LogicalJoin(condition=[=($0, $2)], joinType=[anti])
-    LogicalProject(DEPTNO=[$0], DNAME=[$1])
-      LogicalTableScan(table=[[scott, DEPT]])
-    LogicalProject($f0=[$0])
-      LogicalAggregate(group=[{0}])
-        LogicalProject($f0=[*(2, $0)])
-          LogicalTableScan(table=[[scott, DEPT]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($9)])
+  LogicalJoin(condition=[=($5, $9)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{5}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinProjectTranspose1">
-        <Resource name="sql">
-            <![CDATA[select a.name
-from dept a
-left join dept b on b.deptno > 10
-right join dept c on b.deptno > 10
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
+  LogicalProject($f3=[CAST(*($1, $2)):INTEGER])
+    LogicalJoin(condition=[=($0, $2)], joinType=[inner])
+      LogicalAggregate(group=[{5}], agg#0=[COUNT()])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{5}])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NAME=[$0])
-  LogicalJoin(condition=[$1], joinType=[right])
-    LogicalProject(NAME=[$1], $f4=[$5])
-      LogicalJoin(condition=[$4], joinType=[left])
-        LogicalProject(DEPTNO=[$0], NAME=[$1])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[>($0, 10)], >=[>($0, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(DEPTNO=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughJoin7">
+    <Resource name="sql">
+      <![CDATA[select any_value(distinct B.sal)
+from sales.emp as A
+join (select distinct sal from sales.emp) as B
+on A.sal=B.sal
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$1])
-  LogicalJoin(condition=[>($2, 10)], joinType=[right])
-    LogicalJoin(condition=[>($2, 10)], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[ANY_VALUE($9)])
+  LogicalJoin(condition=[=($5, $9)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{5}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinProjectTranspose2">
-        <Resource name="sql">
-            <![CDATA[select *
-from dept a
-left join (select name, 1 from dept) as b
-on a.name = b.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2], EXPR$1=[$3])
-  LogicalJoin(condition=[=($1, $2)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(NAME=[$1], EXPR$1=[1])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[ANY_VALUE($1)])
+  LogicalJoin(condition=[=($0, $1)], joinType=[inner])
+    LogicalAggregate(group=[{5}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{5}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2], EXPR$1=[$3])
-  LogicalJoin(condition=[=($1, $2)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(NAME=[$1], EXPR$1=[1])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughJoin8">
+    <Resource name="sql">
+      <![CDATA[select single_value(distinct B.sal)
+from sales.emp as A
+join (select distinct sal from sales.emp) as B
+on A.sal=B.sal
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinProjectTranspose3">
-        <Resource name="sql">
-            <![CDATA[select *
-from (select name, 1 from dept) as a
-right join dept b
-on a.name = b.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NAME=[$0], EXPR$1=[$1], DEPTNO=[$2], NAME0=[$3])
-  LogicalJoin(condition=[=($0, $3)], joinType=[right])
-    LogicalProject(NAME=[$1], EXPR$1=[1])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SINGLE_VALUE($9)])
+  LogicalJoin(condition=[=($5, $9)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{5}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$0], EXPR$1=[$1], DEPTNO=[$2], NAME0=[$3])
-  LogicalJoin(condition=[=($0, $3)], joinType=[right])
-    LogicalProject(NAME=[$1], EXPR$1=[1])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SINGLE_VALUE($1)])
+  LogicalJoin(condition=[=($0, $1)], joinType=[inner])
+    LogicalAggregate(group=[{5}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{5}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughJoinDistinct">
+    <Resource name="sql">
+      <![CDATA[select d.name,
+  sum(sal) as sum_sal, count(*) as c
+from sales.emp as e
+join (select distinct name from sales.dept) as d
+  on e.job = d.name
+group by d.name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{9}], SUM_SAL=[SUM($5)], C=[COUNT()])
+  LogicalJoin(condition=[=($2, $9)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{1}])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinProjectTranspose4">
-        <Resource name="sql">
-            <![CDATA[select *
-from dept a
-left join (select x name, y is not null from
-(values (2, cast(null as integer)), (2, 1)) as t(x, y)) b
-on a.name = b.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$3], EXPR$1=[$4])
-  LogicalJoin(condition=[=($2, $3)], joinType=[left])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[CAST($1):INTEGER NOT NULL])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$3], SUM_SAL=[$1], C=[$2])
+  LogicalJoin(condition=[=($0, $3)], joinType=[inner])
+    LogicalAggregate(group=[{2}], SUM_SAL=[SUM($5)], C=[COUNT()])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{1}])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(NAME=[$0], EXPR$1=[IS NOT NULL($1)])
-      LogicalValues(tuples=[[{ 2, null }, { 2, 1 }]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2], EXPR$1=[$3])
-  LogicalJoin(condition=[=($1, $2)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(NAME=[$0], EXPR$1=[IS NOT NULL($1)])
-      LogicalUnion(all=[true])
-        LogicalProject(EXPR$0=[2], EXPR$1=[null:INTEGER])
-          LogicalValues(tuples=[[{ 0 }]])
-        LogicalProject(EXPR$0=[2], EXPR$1=[1])
-          LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughJoinOnEmptyLogicalValues">
+    <Resource name="sql">
+      <![CDATA[select count(*) volume, sum(C1.sal) C1_sum_sal from (select sal, ename from sales.emp where 1=2) C1 inner join (select ename from sales.emp) C2   on C1.ename = C2.ename ]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], VOLUME=[COUNT()], C1_SUM_SAL=[SUM($0)])
+  LogicalJoin(condition=[=($1, $2)], joinType=[inner])
+    LogicalProject(SAL=[$5], ENAME=[$1])
+      LogicalValues(tuples=[[]])
+    LogicalProject(ENAME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], VOLUME=[$SUM0($0)], C1_SUM_SAL=[SUM($1)])
+  LogicalProject(VOLUME=[$3], $f4=[CAST(*($1, $3)):INTEGER])
+    LogicalJoin(condition=[=($0, $2)], joinType=[inner])
+      LogicalProject(ENAME=[$1], SAL=[$0])
+        LogicalProject(SAL=[$5], ENAME=[$1])
+          LogicalValues(tuples=[[]])
+      LogicalAggregate(group=[{0}], VOLUME=[COUNT()])
+        LogicalProject(ENAME=[$1])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughJoinWithUniqueInput">
+    <Resource name="sql">
+      <![CDATA[select A.job, B.mgr, A.deptno,
+max(B.hiredate1) as hiredate1, sum(B.comm1) as comm1
+from sales.emp as A
+join (select mgr, sal, max(hiredate) as hiredate1,
+    sum(comm) as comm1 from sales.emp group by mgr, sal) as B
+on A.sal=B.sal
+group by A.job, B.mgr, A.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(JOB=[$0], MGR0=[$2], DEPTNO=[$1], HIREDATE1=[$3], COMM1=[$4])
+  LogicalAggregate(group=[{2, 7, 9}], HIREDATE1=[MAX($11)], COMM1=[SUM($12)])
+    LogicalJoin(condition=[=($5, $10)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{3, 5}], HIREDATE1=[MAX($4)], COMM1=[SUM($6)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(JOB=[$0], MGR0=[$2], DEPTNO=[$1], HIREDATE1=[$3], COMM1=[$4])
+  LogicalAggregate(group=[{0, 1, 2}], HIREDATE1=[MAX($3)], COMM1=[SUM($4)])
+    LogicalProject(JOB=[$0], DEPTNO=[$2], MGR=[$4], HIREDATE1=[$6], $f8=[CAST(*($3, $7)):INTEGER NOT NULL])
+      LogicalJoin(condition=[=($1, $5)], joinType=[inner])
+        LogicalAggregate(group=[{2, 5, 7}], agg#0=[COUNT()])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalAggregate(group=[{3, 5}], HIREDATE1=[MAX($4)], COMM1=[SUM($6)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinProjectTranspose5">
-        <Resource name="sql">
-            <![CDATA[select *
-from dept a
-left join (select name, 1 + 1 from dept) as b
-on a.name = b.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2], EXPR$1=[$3])
-  LogicalJoin(condition=[=($1, $2)], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughOuterJoin1">
+    <Resource name="sql">
+      <![CDATA[select e.ename
+from (select * from sales.emp where ename = 'A') as e
+left outer join sales.dept as d on e.job = d.name
+group by e.ename]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{1}])
+  LogicalJoin(condition=[=($2, $10)], joinType=[left])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($1, 'A')])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(NAME=[$1], EXPR$1=[+(1, 1)])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2], EXPR$1=[$3])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}])
   LogicalJoin(condition=[=($1, $2)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(NAME=[$1], EXPR$1=[+(1, 1)])
+    LogicalAggregate(group=[{1, 2}])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalFilter(condition=[=($1, 'A')])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{1}])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinProjectTranspose6">
-        <Resource name="sql">
-            <![CDATA[select *
-from (select name, 1 from dept) a
-full join (select name, 1 from dept) as b
-on a.name = b.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NAME=[$0], EXPR$1=[$1], NAME0=[$2], EXPR$10=[$3])
-  LogicalJoin(condition=[=($0, $2)], joinType=[full])
-    LogicalProject(NAME=[$1], EXPR$1=[1])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(NAME=[$1], EXPR$1=[1])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughOuterJoin10">
+    <Resource name="sql">
+      <![CDATA[select count(e.ename)
+from (select * from sales.emp where empno = 10) as e
+left outer join sales.emp as d on e.job = d.job
+group by e.ename,d.mgr]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[$2])
+  LogicalAggregate(group=[{1, 12}], EXPR$0=[COUNT()])
+    LogicalJoin(condition=[=($2, $11)], joinType=[left])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalFilter(condition=[=($0, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$0], EXPR$1=[$1], NAME0=[$2], EXPR$10=[$3])
-  LogicalJoin(condition=[=($0, $2)], joinType=[full])
-    LogicalProject(NAME=[$1], EXPR$1=[1])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(NAME=[$1], EXPR$1=[1])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughOuterJoin11">
+    <Resource name="sql">
+      <![CDATA[select e.empno,d.deptno
+from (select * from sales.emp where empno = 10) as e
+left outer join sales.dept as d on e.empno < d.deptno
+group by e.empno,d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 9}])
+  LogicalJoin(condition=[<($0, $9)], joinType=[left])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($0, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinProjectTranspose7">
-        <Resource name="sql">
-            <![CDATA[select *
-from dept a
-left join (select name from dept) as b
- on a.name = b.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2])
-  LogicalJoin(condition=[=($1, $2)], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughOuterJoin12">
+    <Resource name="sql">
+      <![CDATA[select e.job
+from (select * from sales.emp where ename = 'A') as e
+right outer join sales.dept as d on e.job = d.name
+group by e.job]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{2}])
+  LogicalJoin(condition=[=($2, $10)], joinType=[right])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($1, 'A')])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(NAME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2])
-  LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$3])
-    LogicalJoin(condition=[=($1, $3)], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}])
+  LogicalJoin(condition=[=($0, $1)], joinType=[right])
+    LogicalAggregate(group=[{2}])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalFilter(condition=[=($1, 'A')])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{1}])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinProjectTranspose8">
-        <Resource name="sql">
-            <![CDATA[select *
-from dept a
-left join (
-  select name, deptno > 10 and cast(null as boolean)
-  from dept) as b
-on a.name = b.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2], EXPR$1=[$3])
-  LogicalJoin(condition=[=($1, $2)], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughOuterJoin13">
+    <Resource name="sql">
+      <![CDATA[select e.job
+from (select * from sales.emp where ename = 'A') as e
+full outer join sales.dept as d on e.job = d.name
+group by e.job]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{2}])
+  LogicalJoin(condition=[=($2, $10)], joinType=[full])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($1, 'A')])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(NAME=[$1], EXPR$1=[AND(>($0, 10), null)])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2], EXPR$1=[$3])
-  LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$3], EXPR$1=[AND(>($2, 10), null)])
-    LogicalJoin(condition=[=($1, $3)], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}])
+  LogicalJoin(condition=[=($0, $1)], joinType=[full])
+    LogicalAggregate(group=[{2}])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalFilter(condition=[=($1, 'A')])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{1}])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMergeFilter">
-        <Resource name="sql">
-            <![CDATA[select name from (
-  select *
-  from dept
-  where deptno = 10)
-where deptno = 10
-]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NAME=[$1])
-  LogicalFilter(condition=[=($0, 10)])
-    LogicalProject(DEPTNO=[$0], NAME=[$1])
-      LogicalFilter(condition=[=($0, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$1])
-  LogicalProject(DEPTNO=[$0], NAME=[$1])
-    LogicalFilter(condition=[=($0, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughOuterJoin14">
+    <Resource name="sql">
+      <![CDATA[select e.mgr, d.mgr
+from sales.emp as e
+full outer join sales.emp as d on e.mgr = d.mgr
+group by d.mgr, e.mgr]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(MGR=[$1], MGR0=[$0])
+  LogicalProject(MGR0=[$1], MGR=[$0])
+    LogicalAggregate(group=[{3, 12}])
+      LogicalJoin(condition=[=($3, $12)], joinType=[full])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMergeJoinFilter">
-        <Resource name="sql">
-            <![CDATA[select * from (
-  select d.deptno, e.ename
-  from emp as e
-  join dept as d
-  on e.deptno = d.deptno
-  and d.deptno = 10)
-where deptno = 10
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(MGR=[$1], MGR0=[$0])
+  LogicalProject(MGR0=[$1], MGR=[$0])
+    LogicalAggregate(group=[{0, 1}])
+      LogicalJoin(condition=[=($0, $1)], joinType=[full])
+        LogicalAggregate(group=[{3}])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalAggregate(group=[{3}])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], ENAME=[$1])
-  LogicalFilter(condition=[=($0, 10)])
-    LogicalProject(DEPTNO=[$9], ENAME=[$1])
-      LogicalJoin(condition=[AND(=($7, $9), =($9, 10))], joinType=[inner])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughOuterJoin15">
+    <Resource name="sql">
+      <![CDATA[select e.ename, d.mgr
+from (select * from sales.emp where ename = 'A') as e
+full outer join sales.emp as d on e.job = d.job
+group by e.ename,d.mgr]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{1, 12}])
+  LogicalJoin(condition=[=($2, $11)], joinType=[full])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($1, 'A')])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], ENAME=[$1])
-  LogicalProject(DEPTNO=[$9], ENAME=[$1])
-    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 3}])
+  LogicalJoin(condition=[=($1, $2)], joinType=[full])
+    LogicalAggregate(group=[{1, 2}])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalFilter(condition=[=($1, 'A')])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{2, 3}])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalFilter(condition=[=($0, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceCase">
-        <Resource name="sql">
-            <![CDATA[select
-  case when false then cast(2.1 as float)
-   else cast(1 as integer) end as newcol
-from emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NEWCOL=[CASE(false, 2.1:FLOAT, 1:FLOAT)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughOuterJoin16">
+    <Resource name="sql">
+      <![CDATA[select e.job
+from (select * from sales.emp where ename = 'A') as e
+full outer join sales.dept as d on e.job = d.name
+and e.deptno + e.empno = d.deptno + 5
+group by e.job]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{2}])
+  LogicalJoin(condition=[AND(=($2, $11), =($9, $12))], joinType=[full])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
+      LogicalFilter(condition=[=($1, 'A')])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NEWCOL=[1E0:FLOAT])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}])
+  LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[full])
+    LogicalAggregate(group=[{2, 9}])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
+        LogicalFilter(condition=[=($1, 'A')])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{1, 2}])
+      LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceCastTimeUnchanged">
-        <Resource name="sql">
-            <![CDATA[select cast(time '12:34:56' as timestamp) from emp as e]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[CAST(12:34:56):TIMESTAMP(0) NOT NULL])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughOuterJoin2">
+    <Resource name="sql">
+      <![CDATA[select d.ename
+from (select * from sales.emp where ename = 'A') as e
+left outer join sales.emp as d on e.job = d.job
+group by d.ename]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{10}])
+  LogicalJoin(condition=[=($2, $11)], joinType=[left])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($1, 'A')])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceCompositeInSubQuery">
-        <Resource name="sql">
-            <![CDATA[select *
-from emp
-where (empno, deptno) in (
-  select empno, deptno from (
-    select empno, deptno
-    from emp
-    group by empno, deptno))
-or deptno < 40 + 60]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[OR(IN($0, $7, {
-LogicalProject(EMPNO=[$0], DEPTNO=[$1])
-  LogicalAggregate(group=[{0, 1}])
-    LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{1}])
+  LogicalJoin(condition=[=($0, $2)], joinType=[left])
+    LogicalAggregate(group=[{2}])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalFilter(condition=[=($1, 'A')])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{1, 2}])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}), <($7, +(40, 60)))])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughOuterJoin3">
+    <Resource name="sql">
+      <![CDATA[select e.ename, d.mgr
+from (select * from sales.emp where ename = 'A') as e
+left outer join sales.emp as d on e.job = d.job
+group by e.ename,d.mgr]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{1, 12}])
+  LogicalJoin(condition=[=($2, $11)], joinType=[left])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($1, 'A')])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[OR(IN($0, $7, {
-LogicalProject(EMPNO=[$0], DEPTNO=[$1])
-  LogicalAggregate(group=[{0, 1}])
-    LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 3}])
+  LogicalJoin(condition=[=($1, $2)], joinType=[left])
+    LogicalAggregate(group=[{1, 2}])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalFilter(condition=[=($1, 'A')])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{2, 3}])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}), <($7, 100))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsRequiresExecutor">
-        <Resource name="sql">
-            <![CDATA[select * from (values (1,2)) where 1 + 2 > 3 + CAST(NULL AS INTEGER)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
-  LogicalFilter(condition=[>(+(1, 2), +(3, null))])
-    LogicalValues(tuples=[[{ 1, 2 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughOuterJoin4">
+    <Resource name="sql">
+      <![CDATA[select e.job
+from (select * from sales.emp where ename = 'A') as e
+left outer join sales.dept as d on e.job = d.name
+group by e.job]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{2}])
+  LogicalJoin(condition=[=($2, $10)], joinType=[left])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($1, 'A')])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
-  LogicalValues(tuples=[[]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(JOB=[$0])
+  LogicalJoin(condition=[=($0, $1)], joinType=[left])
+    LogicalAggregate(group=[{2}])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalFilter(condition=[=($1, 'A')])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{1}])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpressionInWindowFunction">
-        <Resource name="sql">
-            <![CDATA[select
- sum(deptno) over(partition by deptno order by sal) as sum1,
-sum(deptno + sal) over(partition by deptno order by sal) as sum2
-from emp]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject($0=[$3], $1=[$4])
-  LogicalWindow(window#0=[window(partition {1} order by [0] aggs [SUM($1), SUM($2)])])
-    LogicalProject(SAL=[$5], DEPTNO=[$7], $2=[+($7, $5)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughOuterJoin5">
+    <Resource name="sql">
+      <![CDATA[select d.name
+from (select * from sales.emp where ename = 'A') as e
+left outer join sales.dept as d on e.job = d.name
+group by d.name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{10}])
+  LogicalJoin(condition=[=($2, $10)], joinType=[left])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[=($1, 'A')])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(SUM1=[SUM($7) OVER (PARTITION BY $7 ORDER BY $5)], SUM2=[SUM(+($7, $5)) OVER (PARTITION BY $7 ORDER BY $5)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{1}])
+  LogicalJoin(condition=[=($0, $1)], joinType=[left])
+    LogicalAggregate(group=[{2}])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalFilter(condition=[=($1, 'A')])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{1}])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughJoin1">
-        <Resource name="sql">
-            <![CDATA[select e.job,d.name
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughOuterJoin6">
+    <Resource name="sql">
+      <![CDATA[select e.job,d.name
 from (select * from sales.emp where ename = 'A') as e
-join sales.dept as d on e.job = d.name
+left outer join sales.dept as d on e.job = d.name
 group by e.job,d.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalAggregate(group=[{2, 10}])
-  LogicalJoin(condition=[=($2, $10)], joinType=[inner])
+  LogicalJoin(condition=[=($2, $10)], joinType=[left])
     LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
       LogicalFilter(condition=[=($1, 'A')])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalJoin(condition=[=($0, $1)], joinType=[inner])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalJoin(condition=[=($0, $1)], joinType=[left])
   LogicalAggregate(group=[{2}])
     LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
       LogicalFilter(condition=[=($1, 'A')])
@@ -8147,31 +7527,31 @@ LogicalJoin(condition=[=($0, $1)], joinType=[inner])
   LogicalAggregate(group=[{1}])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughJoin2">
-        <Resource name="sql">
-            <![CDATA[select e.job,d.name
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughOuterJoin7">
+    <Resource name="sql">
+      <![CDATA[select e.job
 from (select * from sales.emp where ename = 'A') as e
-join sales.dept as d on e.job = d.name
+left outer join sales.dept as d on e.job = d.name
 and e.deptno + e.empno = d.deptno + 5
-group by e.job,d.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{2, 11}])
-  LogicalJoin(condition=[AND(=($2, $11), =($9, $12))], joinType=[inner])
+group by e.job]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{2}])
+  LogicalJoin(condition=[AND(=($2, $11), =($9, $12))], joinType=[left])
     LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
       LogicalFilter(condition=[=($1, 'A')])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 2}])
-  LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[inner])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}])
+  LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[left])
     LogicalAggregate(group=[{2, 9}])
       LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
         LogicalFilter(condition=[=($1, 'A')])
@@ -8180,2921 +7560,3414 @@ LogicalAggregate(group=[{0, 2}])
       LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
         LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughJoin3">
-        <Resource name="sql">
-            <![CDATA[select e.empno,d.deptno
-from (select * from sales.emp where empno = 10) as e
-join sales.dept as d on e.empno < d.deptno
-group by e.empno,d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 9}])
-  LogicalJoin(condition=[<($0, $9)], joinType=[inner])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($0, 10)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughOuterJoin8">
+    <Resource name="sql">
+      <![CDATA[select d.name
+from (select * from sales.emp where ename = 'A') as e
+left outer join sales.dept as d on e.job = d.name
+and e.deptno + e.empno = d.deptno + 5
+group by d.name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{11}])
+  LogicalJoin(condition=[AND(=($2, $11), =($9, $12))], joinType=[left])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
+      LogicalFilter(condition=[=($1, 'A')])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 9}])
-  LogicalJoin(condition=[<($0, $9)], joinType=[inner])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($0, 10)])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{2}])
+  LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[left])
+    LogicalAggregate(group=[{2, 9}])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
+        LogicalFilter(condition=[=($1, 'A')])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{1, 2}])
+      LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAggregateThroughOuterJoin9">
+    <Resource name="sql">
+      <![CDATA[select e.job, d.name
+from (select * from sales.emp where ename = 'A') as e
+left outer join sales.dept as d on e.job = d.name
+and e.deptno + e.empno = d.deptno + 5
+group by e.job, d.name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{2, 11}])
+  LogicalJoin(condition=[AND(=($2, $11), =($9, $12))], joinType=[left])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
+      LogicalFilter(condition=[=($1, 'A')])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughJoin4">
-        <Resource name="sql">
-            <![CDATA[select e.deptno
-from sales.emp as e join sales.dept as d on e.deptno = d.deptno
-group by e.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{7}])
-  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 2}])
+  LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[left])
+    LogicalAggregate(group=[{2, 9}])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, $0)])
+        LogicalFilter(condition=[=($1, 'A')])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{1, 2}])
+      LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 5)])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0])
-  LogicalJoin(condition=[=($0, $1)], joinType=[inner])
-    LogicalAggregate(group=[{7}])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAvgGroupingSetsThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select deptno, job, avg(empno) from
+(select * from emp as e1 union all
+ select * from emp as e2)
+group by rollup(deptno, job)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[AVG($2)])
+  LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[AVG($2)])
+  LogicalUnion(all=[true])
+    LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughJoin5">
-        <Resource name="sql">
-            <![CDATA[select e.deptno, d.deptno
-from sales.emp as e join sales.dept as d on e.deptno = d.deptno
-group by e.deptno, d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], DEPTNO0=[$1])
-  LogicalAggregate(group=[{7, 9}])
-    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushAvgThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select ename,avg(empno) from
+(select * from emp as e1 union all
+ select * from emp as e2)
+group by ename]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[AVG($1)])
+  LogicalProject(ENAME=[$1], EMPNO=[$0])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[AVG($1)])
+  LogicalUnion(all=[true])
+    LogicalProject(ENAME=[$1], EMPNO=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(ENAME=[$1], EMPNO=[$0])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], DEPTNO0=[$1])
-  LogicalJoin(condition=[=($0, $1)], joinType=[inner])
-    LogicalAggregate(group=[{7}])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushBoolAndBoolOrThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select ename, bool_and(empbol), bool_or(empbol) from
+(select ename, case when mod(empno, 2) = 1 then true else false end as empbol from emp as e1 union all
+ select ename, case when mod(empno, 2) = 1 then true else false end as empbol from emp as e2)
+group by ename]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[BOOL_AND($1)], EXPR$2=[BOOL_OR($1)])
+  LogicalUnion(all=[true])
+    LogicalProject(ENAME=[$1], EMPBOL=[=(MOD($0, 2), 1)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(ENAME=[$1], EMPBOL=[=(MOD($0, 2), 1)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[BOOL_AND($1)], EXPR$2=[BOOL_OR($2)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0}], EXPR$1=[BOOL_AND($1)], EXPR$2=[BOOL_OR($1)])
+      LogicalProject(ENAME=[$1], EMPBOL=[=(MOD($0, 2), 1)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}], EXPR$1=[BOOL_AND($1)], EXPR$2=[BOOL_OR($1)])
+      LogicalProject(ENAME=[$1], EMPBOL=[=(MOD($0, 2), 1)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushCountFilterThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select deptno, count(*) filter (where job = 'CLERK')
+from (
+  select * from emp where deptno = 10
+  union all
+  select * from emp where deptno > 20)
+group by deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT() FILTER $1])
+  LogicalProject(DEPTNO=[$7], $f1=[=($2, 'CLERK')])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalFilter(condition=[=($7, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalFilter(condition=[>($7, 20)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[$SUM0($1)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0}], EXPR$1=[COUNT() FILTER $1])
+      LogicalProject(DEPTNO=[$7], $f1=[=($2, 'CLERK')])
+        LogicalFilter(condition=[=($7, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}], EXPR$1=[COUNT() FILTER $1])
+      LogicalProject(DEPTNO=[$7], $f1=[=($2, 'CLERK')])
+        LogicalFilter(condition=[>($7, 20)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushCountNullableGroupingSetsThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select deptno, job, count(mgr) from
+(select * from emp as e1 union all
+ select * from emp as e2)
+group by rollup(deptno, job)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[COUNT($2)])
+  LogicalProject(DEPTNO=[$7], JOB=[$2], MGR=[$3])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[$SUM0($2)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT($2)])
+      LogicalProject(DEPTNO=[$7], JOB=[$2], MGR=[$3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT($2)])
+      LogicalProject(DEPTNO=[$7], JOB=[$2], MGR=[$3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushCountNullableThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select ename,count(mgr) from
+(select * from emp as e1 union all
+ select * from emp as e2)
+group by ename]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT($1)])
+  LogicalProject(ENAME=[$1], MGR=[$3])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[$SUM0($1)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0}], EXPR$1=[COUNT($1)])
+      LogicalProject(ENAME=[$1], MGR=[$3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}], EXPR$1=[COUNT($1)])
+      LogicalProject(ENAME=[$1], MGR=[$3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughJoin6">
-        <Resource name="sql">
-            <![CDATA[select sum(B.sal)
-from sales.emp as A
-join (select distinct sal from sales.emp) as B
-on A.sal=B.sal
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushCountStarGroupingSetsThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select deptno, job, count(*) from
+(select * from emp as e1 union all
+ select * from emp as e2)
+group by rollup(deptno, job)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[COUNT()])
+  LogicalProject(DEPTNO=[$7], JOB=[$2])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($9)])
-  LogicalJoin(condition=[=($5, $9)], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{5}])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[$SUM0($2)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
+      LogicalProject(DEPTNO=[$7], JOB=[$2])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
+      LogicalProject(DEPTNO=[$7], JOB=[$2])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
-  LogicalProject($f3=[CAST(*($1, $2)):INTEGER])
-    LogicalJoin(condition=[=($0, $2)], joinType=[inner])
-      LogicalAggregate(group=[{5}], agg#0=[COUNT()])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushCountStarThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select ename,count(*) from
+(select * from emp as e1 union all
+ select * from emp as e2)
+group by ename]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT()])
+  LogicalProject(ENAME=[$1])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{5}])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughJoin7">
-        <Resource name="sql">
-            <![CDATA[select any_value(distinct B.sal)
-from sales.emp as A
-join (select distinct sal from sales.emp) as B
-on A.sal=B.sal
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[$SUM0($1)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0}], EXPR$1=[COUNT()])
+      LogicalProject(ENAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}], EXPR$1=[COUNT()])
+      LogicalProject(ENAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[ANY_VALUE($9)])
-  LogicalJoin(condition=[=($5, $9)], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{5}])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushDistinctAggregateIntoJoin">
+    <Resource name="sql">
+      <![CDATA[select count(distinct sal) from sales.emp
+ join sales.dept on job = name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[COUNT(DISTINCT $0)])
+  LogicalProject(SAL=[$5])
+    LogicalJoin(condition=[=($2, $10)], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[ANY_VALUE($1)])
-  LogicalJoin(condition=[=($0, $1)], joinType=[inner])
-    LogicalAggregate(group=[{5}])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{5}])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[COUNT(DISTINCT $5)])
+  LogicalJoin(condition=[=($2, $10)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughJoin8">
-        <Resource name="sql">
-            <![CDATA[select single_value(distinct B.sal)
-from sales.emp as A
-join (select distinct sal from sales.emp) as B
-on A.sal=B.sal
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushFilterPastAgg">
+    <Resource name="sql">
+      <![CDATA[select dname, c from
+(select name dname, count(*) as c from dept group by name) t
+ where dname = 'Charlie']]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DNAME=[$0], C=[$1])
+  LogicalFilter(condition=[=($0, 'Charlie')])
+    LogicalAggregate(group=[{0}], C=[COUNT()])
+      LogicalProject(DNAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SINGLE_VALUE($9)])
-  LogicalJoin(condition=[=($5, $9)], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{5}])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DNAME=[$0], C=[$1])
+  LogicalAggregate(group=[{0}], C=[COUNT()])
+    LogicalFilter(condition=[=($0, 'Charlie')])
+      LogicalProject(DNAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SINGLE_VALUE($1)])
-  LogicalJoin(condition=[=($0, $1)], joinType=[inner])
-    LogicalAggregate(group=[{5}])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{5}])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushFilterPastAggFour">
+    <Resource name="sql">
+      <![CDATA[select emp.deptno, count(*) from emp where emp.sal > '12'
+group by emp.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{1}], EXPR$1=[$SUM0($2)])
+  LogicalFilter(condition=[>($0, CAST('12'):INTEGER NOT NULL)])
+    LogicalAggregate(group=[{5, 7}], EXPR$1=[COUNT()])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughJoinWithUniqueInput">
-        <Resource name="sql">
-            <![CDATA[select A.job, B.mgr, A.deptno,
-max(B.hiredate1) as hiredate1, sum(B.comm1) as comm1
-from sales.emp as A
-join (select mgr, sal, max(hiredate) as hiredate1,
-    sum(comm) as comm1 from sales.emp group by mgr, sal) as B
-on A.sal=B.sal
-group by A.job, B.mgr, A.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(JOB=[$0], MGR0=[$2], DEPTNO=[$1], HIREDATE1=[$3], COMM1=[$4])
-  LogicalAggregate(group=[{2, 7, 9}], HIREDATE1=[MAX($11)], COMM1=[SUM($12)])
-    LogicalJoin(condition=[=($5, $10)], joinType=[inner])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{1}], EXPR$1=[$SUM0($2)])
+  LogicalAggregate(group=[{5, 7}], EXPR$1=[COUNT()])
+    LogicalFilter(condition=[>($5, 12)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{3, 5}], HIREDATE1=[MAX($4)], COMM1=[SUM($6)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(JOB=[$0], MGR0=[$2], DEPTNO=[$1], HIREDATE1=[$3], COMM1=[$4])
-  LogicalAggregate(group=[{0, 1, 2}], HIREDATE1=[MAX($3)], COMM1=[SUM($4)])
-    LogicalProject(JOB=[$0], DEPTNO=[$2], MGR=[$4], HIREDATE1=[$6], $f8=[CAST(*($3, $7)):INTEGER NOT NULL])
-      LogicalJoin(condition=[=($1, $5)], joinType=[inner])
-        LogicalAggregate(group=[{2, 5, 7}], agg#0=[COUNT()])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{3, 5}], HIREDATE1=[MAX($4)], COMM1=[SUM($6)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateSumThroughJoin">
-        <Resource name="sql">
-            <![CDATA[select e.job,sum(sal)
-from (select * from sales.emp where ename = 'A') as e
-join sales.dept as d on e.job = d.name
-group by e.job,d.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(JOB=[$0], EXPR$1=[$2])
-  LogicalAggregate(group=[{2, 10}], EXPR$1=[SUM($5)])
-    LogicalJoin(condition=[=($2, $10)], joinType=[inner])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalFilter(condition=[=($1, 'A')])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(JOB=[$0], EXPR$1=[$2])
-  LogicalProject(JOB=[$0], NAME=[$2], $f4=[CAST(*($1, $3)):INTEGER NOT NULL])
-    LogicalJoin(condition=[=($0, $2)], joinType=[inner])
-      LogicalAggregate(group=[{2}], EXPR$1=[SUM($5)])
-        LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-          LogicalFilter(condition=[=($1, 'A')])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{1}], agg#0=[COUNT()])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateSumWithoutGroupKeyThroughJoin">
-        <Resource name="sql">
-            <![CDATA[select sum(sal)
-from (select * from sales.emp where ename = 'A') as e
-join sales.dept as d on e.job = d.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($5)])
-  LogicalJoin(condition=[=($2, $10)], joinType=[inner])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($1, 'A')])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushFilterPastAggThree">
+    <Resource name="sql">
+      <![CDATA[select deptno from emp
+group by deptno having count(*) > 1]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalFilter(condition=[>($1, 1)])
+    LogicalAggregate(group=[{0}], agg#0=[COUNT()])
+      LogicalProject(DEPTNO=[$7])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
-  LogicalProject($f4=[CAST(*($1, $3)):INTEGER])
-    LogicalJoin(condition=[=($0, $2)], joinType=[inner])
-      LogicalAggregate(group=[{2}], EXPR$0=[SUM($5)])
-        LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-          LogicalFilter(condition=[=($1, 'A')])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{1}], agg#0=[COUNT()])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateSumThroughJoinAfterAggregateReduce">
-        <Resource name="sql">
-            <![CDATA[select sum(sal)
-from (select * from sales.emp where ename = 'A') as e
-join sales.dept as d on e.job = d.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($5)])
-  LogicalJoin(condition=[=($2, $10)], joinType=[inner])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalFilter(condition=[=($1, 'A')])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalFilter(condition=[>($1, 1)])
+    LogicalAggregate(group=[{0}], agg#0=[COUNT()])
+      LogicalProject(DEPTNO=[$7])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[CASE(=($1, 0), null:INTEGER, $0)])
-  LogicalAggregate(group=[{}], EXPR$0=[$SUM0($0)], agg#1=[$SUM0($1)])
-    LogicalProject($f5=[CAST(*($1, $4)):INTEGER NOT NULL], $f6=[*($2, $4)])
-      LogicalJoin(condition=[=($0, $3)], joinType=[inner])
-        LogicalAggregate(group=[{2}], EXPR$0=[$SUM0($5)], agg#1=[COUNT()])
-          LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-            LogicalFilter(condition=[=($1, 'A')])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{1}], agg#0=[COUNT()])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushFilterPastAggTwo">
+    <Resource name="sql">
+      <![CDATA[select dept1.c1 from (
+select dept.name as c1, count(*) as c2
+from dept where dept.name > 'b' group by dept.name) dept1
+where dept1.c1 > 'c' and (dept1.c2 > 30 or dept1.c1 < 'z')]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(C1=[$0])
+  LogicalFilter(condition=[AND(>($0, 'c'), OR(>($1, 30), <($0, 'z')))])
+    LogicalAggregate(group=[{0}], C2=[COUNT()])
+      LogicalProject(C1=[$1])
+        LogicalFilter(condition=[>($1, 'b')])
           LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastFilter3">
-        <Resource name="sql">
-            <![CDATA[select empno + deptno as x, ename, job, mgr,
-  hiredate, sal, comm, slacker
-from emp
-where sal = 10 * comm
-and upper(ename) = 'FOO']]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(X=[+($0, $7)], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
-  LogicalFilter(condition=[AND(=($5, *(10, $6)), =(UPPER($1), 'FOO'))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($0, $7)], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
-  LogicalFilter(condition=[AND(=($5, *(10, $6)), =(UPPER($1), 'FOO'))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(C1=[$0])
+  LogicalFilter(condition=[OR(>($1, 30), <($0, 'z'))])
+    LogicalAggregate(group=[{0}], C2=[COUNT()])
+      LogicalFilter(condition=[>($0, 'c')])
+        LogicalProject(C1=[$1])
+          LogicalFilter(condition=[>($1, 'b')])
+            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastFilter3b">
-        <Resource name="sql">
-            <![CDATA[select empno + deptno as x, ename, job, mgr,
-  hiredate, sal, comm, slacker
-from emp
-where sal = 10 * comm
-and upper(ename) = 'FOO']]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(X=[+($0, $7)], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
-  LogicalFilter(condition=[AND(=($5, *(10, $6)), =(UPPER($1), 'FOO'))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushFilterPastAggWithGroupingSets1">
+    <Resource name="sql">
+      <![CDATA[select ddeptno, dname, c from
+             (select deptno ddeptno, name dname, count(*) as c
+             from dept group by rollup(deptno,name)) t
+              where dname = 'Charlie']]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DDEPTNO=[$0], DNAME=[$1], C=[$2])
+  LogicalProject(DDEPTNO=[$0], DNAME=[$1], C=[$2])
+    LogicalFilter(condition=[=($1, 'Charlie')])
+      LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], C=[COUNT()])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(X=[$8], ENAME=[$0], JOB=[$1], MGR=[$2], HIREDATE=[$3], SAL=[$4], COMM=[$5], SLACKER=[$6])
-  LogicalFilter(condition=[$7])
-    LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8], $f7=[AND(=($5, *(10, $6)), =(UPPER($1), 'FOO'))], $f8=[+($0, $7)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DDEPTNO=[$0], DNAME=[$1], C=[$2])
+  LogicalProject(DDEPTNO=[CASE($2, null, $0)], DNAME=[CASE($3, null, $1)], C=[$4])
+    LogicalFilter(condition=[=(CASE($3, null, $1), 'Charlie')])
+      LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], indicator=[true], C=[COUNT()])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectPastFilter3c">
-        <Resource name="sql">
-            <![CDATA[select empno + deptno as x, ename, job, mgr,
-  hiredate, sal, comm, slacker
-from emp
-where sal = 10 * comm
-and upper(ename) = 'FOO']]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(X=[+($0, $7)], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
-  LogicalFilter(condition=[AND(=($5, *(10, $6)), =(UPPER($1), 'FOO'))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushFilterPastAggWithGroupingSets2">
+    <Resource name="sql">
+      <![CDATA[select dname, ddeptno, c from
+             (select name dname, deptno ddeptno, count(*) as c
+             from dept group by grouping sets ((name,deptno),(name))) t
+              where dname = 'Charlie']]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DNAME=[$0], DDEPTNO=[$1], C=[$2])
+  LogicalFilter(condition=[=($0, 'Charlie')])
+    LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}]], C=[COUNT()])
+      LogicalProject(DNAME=[$1], DDEPTNO=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(X=[$7], ENAME=[$0], JOB=[$1], MGR=[$2], HIREDATE=[$3], SAL=[$4], COMM=[$5], SLACKER=[$6])
-  LogicalFilter(condition=[AND(=($4, *(10, $5)), =(UPPER($0), 'FOO'))])
-    LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8], $f7=[+($0, $7)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DNAME=[$0], DDEPTNO=[$1], C=[$2])
+  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}]], C=[COUNT()])
+    LogicalFilter(condition=[=($0, 'Charlie')])
+      LogicalProject(DNAME=[$1], DDEPTNO=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceCaseNullabilityChange">
-        <Resource name="sql">
-            <![CDATA[select case when empno = 1 then 1
-when 1 IS NOT NULL then 2
-else null end as qx from emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(QX=[CASE(=($0, 1), 1, IS NOT NULL(1), 2, null:INTEGER)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushFilterPastProject">
+    <Resource name="sql">
+      <![CDATA[select a.name
+from dept a
+left join dept b on b.deptno > 10
+right join dept c on b.deptno > 10
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(QX=[CAST(CASE(=($0, 1), 1, 2)):INTEGER])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NAME=[$1])
+  LogicalJoin(condition=[$4], joinType=[right])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO0=[$2], NAME0=[$3], $f4=[>($2, 10)])
+      LogicalJoin(condition=[$4], joinType=[left])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[>($0, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceCastsNullable">
-        <Resource name="sql">
-            <![CDATA[insert into sales.dept(deptno, name)
-select empno, cast(job as varchar(128)) from sales.empnullables]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, DEPT]], operation=[INSERT], flattened=[false])
-  LogicalProject(DEPTNO=[$0], NAME=[CAST($2):VARCHAR(128)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$1])
+  LogicalJoin(condition=[true], joinType=[right])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO0=[$2], NAME0=[$3], $f4=[>($2, 10)])
+      LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO0=[CAST($2):INTEGER], NAME0=[CAST($3):VARCHAR(10)], $f2=[CAST($4):BOOLEAN])
+        LogicalJoin(condition=[true], joinType=[inner])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+          LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[>($0, 10)])
+            LogicalFilter(condition=[>($0, 10)])
+              LogicalFilter(condition=[>($0, 10)])
+                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, DEPT]], operation=[INSERT], flattened=[false])
-  LogicalCalc(expr#0..8=[{inputs}], expr#9=[CAST($t2):VARCHAR(10) NOT NULL], DEPTNO=[$t0], NAME=[$t9])
-    LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushFilterThroughOuterJoin">
+    <Resource name="sql">
+      <![CDATA[select 1 from sales.dept d left outer join sales.emp e on d.deptno = e.deptno where d.name = 'Charlie']]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+ProjectRel(EXPR$0=[1])
+  FilterRel(condition=[=($1, 'Charlie')])
+    JoinRel(condition=[=($0, $9)], joinType=[left])
+      TableAccessRel(table=[[CATALOG, SALES, DEPT]])
+      TableAccessRel(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceCaseWhenWithCast">
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject($f0=[CAST(CASE(=(MOD($0, 2:BIGINT), 1), <($0, 2:BIGINT), =(MOD($0, 3:BIGINT), 2), <($0, 1:BIGINT), <($0, 3:BIGINT))):BOOLEAN])
-  LogicalValues(tuples=[[{ 1, 2 }]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+ProjectRel(EXPR$0=[1])
+  JoinRel(condition=[=($0, $9)], joinType=[left])
+    FilterRel(condition=[=($1, 'Charlie')])
+      TableAccessRel(table=[[CATALOG, SALES, DEPT]])
+    TableAccessRel(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject($f0=[CAST(CASE(=(MOD($0, 2:BIGINT), 1), <($0, 2:BIGINT), =(MOD($0, 3:BIGINT), 2), <($0, 1:BIGINT), <($0, 3:BIGINT))):BOOLEAN])
-  LogicalValues(tuples=[[{ 1, 2 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushFilterThroughSemiJoin">
+    <Resource name="sql">
+      <![CDATA[select * from (
+  select * from dept where dept.deptno in (
+    select emp.deptno from emp))R
+where R.deptno <=10]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1])
+  LogicalFilter(condition=[<=($0, 10)])
+    LogicalJoin(condition=[=($0, $2)], joinType=[semi])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalProject(DEPTNO=[$7])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstants3">
-        <Resource name="sql">
-            <![CDATA[select e.mgr is not distinct from f.mgr from emp e join emp f on (e.mgr=f.mgr) where e.mgr is null]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[OR(AND(IS NULL($3), IS NULL($12)), IS TRUE(=($3, $12)))])
-  LogicalFilter(condition=[IS NULL($3)])
-    LogicalJoin(condition=[=($3, $12)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1])
+  LogicalJoin(condition=[=($0, $2)], joinType=[semi])
+    LogicalFilter(condition=[<=($0, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(DEPTNO=[$7])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[IS NULL($12)])
-  LogicalFilter(condition=[IS NULL($3)])
-    LogicalJoin(condition=[=($3, $12)], joinType=[inner])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushFilterWithIsNotDistinctFromPastJoin">
+    <Resource name="sql">
+      <![CDATA[SELECT * FROM emp t1 INNER JOIN emp t2 ON t1.deptno = t2.deptno WHERE t1.ename is not distinct from t2.ename]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EMPNO0=[$9], ENAME0=[$10], JOB0=[$11], MGR0=[$12], HIREDATE0=[$13], SAL0=[$14], COMM0=[$15], DEPTNO0=[$16], SLACKER0=[$17])
+  LogicalFilter(condition=[OR(AND(IS NULL($1), IS NULL($10)), IS TRUE(=($1, $10)))])
+    LogicalJoin(condition=[=($7, $16)], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsDynamicFunction">
-        <Resource name="sql">
-            <![CDATA[select sal, t
-from (select sal, current_timestamp t from emp)
-where t > TIMESTAMP '2018-01-01 00:00:00']]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(SAL=[$0], T=[$1])
-  LogicalFilter(condition=[>($1, 2018-01-01 00:00:00)])
-    LogicalProject(SAL=[$5], T=[CURRENT_TIMESTAMP])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EMPNO0=[$9], ENAME0=[$10], JOB0=[$11], MGR0=[$12], HIREDATE0=[$13], SAL0=[$14], COMM0=[$15], DEPTNO0=[$16], SLACKER0=[$17])
+  LogicalJoin(condition=[AND(=($7, $16), IS NOT DISTINCT FROM($1, $10))], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushFilterWithRank">
+    <Resource name="sql">
+      <![CDATA[select e1.ename, r
+from (
+  select ename,   rank() over(partition by  deptno order by sal) as r   from emp) e1
+where r < 2]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(ENAME=[$0], R=[$1])
+  LogicalFilter(condition=[<($1, 2)])
+    LogicalProject(ENAME=[$1], R=[RANK() OVER (PARTITION BY $7 ORDER BY $5)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(SAL=[$0], T=[$1])
-  LogicalFilter(condition=[>($1, 2018-01-01 00:00:00)])
-    LogicalProject(SAL=[$5], T=[CURRENT_TIMESTAMP])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(ENAME=[$0], R=[$1])
+  LogicalFilter(condition=[<($1, 2)])
+    LogicalProject(ENAME=[$1], R=[RANK() OVER (PARTITION BY $7 ORDER BY $5 RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsIsNotNull">
-        <Resource name="sql">
-            <![CDATA[select empno from emp
-where empno=10 and empno is not null]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[AND(=($0, 10), IS NOT NULL($0))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushFilterWithRankExpr">
+    <Resource name="sql">
+      <![CDATA[select e1.ename, r
+from (
+  select ename,
+  rank() over(partition by  deptno order by sal) + 1 as r   from emp) e1
+where r < 2]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(ENAME=[$0], R=[$1])
+  LogicalFilter(condition=[<($1, 2)])
+    LogicalProject(ENAME=[$1], R=[+(RANK() OVER (PARTITION BY $7 ORDER BY $5), 1)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[=($0, 10)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(ENAME=[$0], R=[$1])
+  LogicalFilter(condition=[<($1, 2)])
+    LogicalProject(ENAME=[$1], R=[+(RANK() OVER (PARTITION BY $7 ORDER BY $5 RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW), 1)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsIsNull">
-        <Resource name="sql">
-            <![CDATA[select empno from emp where empno=10 and empno is null]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[AND(=($0, 10), IS NULL($0))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushJoinCondDownToProject">
+    <Resource name="sql">
+      <![CDATA[select d.deptno, e.deptno from sales.dept d, sales.emp e
+ where d.deptno + 10 = e.deptno * 2]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], DEPTNO0=[$9])
+  LogicalFilter(condition=[=(+($0, 10), *($9, 2))])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalValues(tuples=[[]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], DEPTNO0=[$9])
+  LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[$3], ENAME=[$4], JOB=[$5], MGR=[$6], HIREDATE=[$7], SAL=[$8], COMM=[$9], DEPTNO0=[$10], SLACKER=[$11])
+    LogicalJoin(condition=[=($2, $12)], joinType=[inner])
+      LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[*($7, 2)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsNegated">
-        <Resource name="sql">
-            <![CDATA[select empno from emp
-where empno=10 and not(empno=10)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[AND(=($0, 10), NOT(=($0, 10)))])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushJoinThroughUnionOnLeft">
+    <Resource name="sql">
+      <![CDATA[select r1.sal from
+(select * from emp e1 union all select * from emp e2) r1,
+emp r2]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalJoin(condition=[true], joinType=[inner])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalValues(tuples=[[]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalUnion(all=[true])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsNegatedInverted">
-        <Resource name="sql">
-            <![CDATA[select empno from emp where empno>10 and empno<=10]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[AND(>($0, 10), <=($0, 10))])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushJoinThroughUnionOnRight">
+    <Resource name="sql">
+      <![CDATA[select r1.sal from
+emp r1,
+(select * from emp e1 union all select * from emp e2) r2]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalJoin(condition=[true], joinType=[inner])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalValues(tuples=[[]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalUnion(all=[true])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsNull">
-        <Resource name="sql">
-            <![CDATA[select * from (
-  select *
-  from (
-    select cast(null as integer) as n
-    from emp)
-  where n is null and n is null)
-where n is null]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(N=[$0])
-  LogicalFilter(condition=[IS NULL($0)])
-    LogicalProject(N=[$0])
-      LogicalFilter(condition=[AND(IS NULL($0), IS NULL($0))])
-        LogicalProject(N=[null:INTEGER])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushJoinThroughUnionOnRightDoesNotMatchAntiJoin">
+    <Resource name="sql">
+      <![CDATA[select r1.sal from emp r1 where r1.deptno not in (select deptno from dept d1 where deptno < 10 union all select deptno from dept d2 where deptno > 20)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalJoin(condition=[=($7, $8)], joinType=[anti])
+    LogicalTableScan(table=[[scott, EMP]])
+    LogicalUnion(all=[true])
+      LogicalProject(DEPTNO=[$0])
+        LogicalFilter(condition=[<($0, 10)])
+          LogicalTableScan(table=[[scott, DEPT]])
+      LogicalProject(DEPTNO=[$0])
+        LogicalFilter(condition=[>($0, 20)])
+          LogicalTableScan(table=[[scott, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(N=[$0])
-  LogicalProject(N=[$0])
-    LogicalProject(N=[null:INTEGER])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalJoin(condition=[=($7, $8)], joinType=[anti])
+    LogicalTableScan(table=[[scott, EMP]])
+    LogicalUnion(all=[true])
+      LogicalProject(DEPTNO=[$0])
+        LogicalFilter(condition=[<($0, 10)])
+          LogicalTableScan(table=[[scott, DEPT]])
+      LogicalProject(DEPTNO=[$0])
+        LogicalFilter(condition=[>($0, 20)])
+          LogicalTableScan(table=[[scott, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSpatialDWithinToHilbert">
-        <Resource name="sql">
-            <![CDATA[select *
-from GEO.Restaurants as r
-where ST_DWithin(ST_Point(10.0, 20.0),
-                 ST_Point(r.longitude, r.latitude), 10)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
-  LogicalFilter(condition=[ST_DWITHIN(ST_POINT(10.0:DECIMAL(3, 1), 20.0:DECIMAL(3, 1)), ST_POINT($2, $1), 10)])
-    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushJoinThroughUnionOnRightDoesNotMatchSemiJoin">
+    <Resource name="sql">
+      <![CDATA[select r1.sal from emp r1 where r1.deptno in (select deptno from dept d1 where deptno > 100 union all select deptno from dept d2 where deptno > 20)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalJoin(condition=[=($7, $8)], joinType=[semi])
+    LogicalTableScan(table=[[scott, EMP]])
+    LogicalUnion(all=[true])
+      LogicalProject(DEPTNO=[$0])
+        LogicalFilter(condition=[>($0, 100)])
+          LogicalTableScan(table=[[scott, DEPT]])
+      LogicalProject(DEPTNO=[$0])
+        LogicalFilter(condition=[>($0, 20)])
+          LogicalTableScan(table=[[scott, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
-  LogicalFilter(condition=[AND(SEARCH($4, Sarg[[28988..28989], [28991..28994], [29006..29009], [29011..29014], [32426..32429], [32431..32434], [32446..32449], [32451..32454], [32506..32509], [32511..32514], [32526..32527], [32929..32930], [32942..32949], [32951..32953], [32955..32970], [32973..32975], [33009..33011], [33014..33185], [33187..33190], [33205..33207], [33209..33211], [33226..33229], [33231..33265], [33267..33270], [36392..36401], [36403..36404], [36421..36423], [36425..36427], [36442..36445], [36447..36548], [36556..36568]]), ST_DWITHIN(POINT (10 20):GEOMETRY, ST_POINT($2, $1), 10))])
-    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalJoin(condition=[=($7, $8)], joinType=[semi])
+    LogicalTableScan(table=[[scott, EMP]])
+    LogicalUnion(all=[true])
+      LogicalProject(DEPTNO=[$0])
+        LogicalFilter(condition=[>($0, 100)])
+          LogicalTableScan(table=[[scott, DEPT]])
+      LogicalProject(DEPTNO=[$0])
+        LogicalFilter(condition=[>($0, 20)])
+          LogicalTableScan(table=[[scott, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSwapOuterJoin">
-        <Resource name="sql">
-            <![CDATA[select 1 from sales.dept d left outer join sales.emp e
- on d.deptno = e.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalJoin(condition=[=($0, $9)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushMaxNullableGroupingSetsThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select deptno, job, max(mgr) from
+(select * from emp as e1 union all
+ select * from emp as e2)
+group by rollup(deptno, job)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[MAX($2)])
+  LogicalProject(DEPTNO=[$7], JOB=[$2], MGR=[$3])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalProject(DEPTNO=[$9], NAME=[$10], EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO0=[$7], SLACKER=[$8])
-    LogicalJoin(condition=[=($9, $7)], joinType=[right])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[MAX($2)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[MAX($2)])
+      LogicalProject(DEPTNO=[$7], JOB=[$2], MGR=[$3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[MAX($2)])
+      LogicalProject(DEPTNO=[$7], JOB=[$2], MGR=[$3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSwapOuterJoinFieldAccess">
-        <Resource name="sql">
-            <![CDATA[select t1.name, e.ename
-from DEPT_NESTED as t1 left outer join sales.emp e
- on t1.skill.type = e.job]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NAME=[$1], ENAME=[$5])
-  LogicalJoin(condition=[=($2.TYPE, $6)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushMaxNullableThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select ename,max(mgr) from
+(select * from emp as e1 union all
+ select * from emp as e2)
+group by ename]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
+  LogicalProject(ENAME=[$1], MGR=[$3])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$10], ENAME=[$1])
-  LogicalJoin(condition=[=($11.TYPE, $2)], joinType=[right])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
+      LogicalProject(ENAME=[$1], MGR=[$3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
+      LogicalProject(ENAME=[$1], MGR=[$3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctCountMultipleViaJoin">
-        <Resource name="sql">
-            <![CDATA[select deptno, count(distinct ename),
-  count(distinct job, ename),
-  count(distinct deptno, job), sum(sal)
-from sales.emp group by deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)], EXPR$2=[COUNT(DISTINCT $2, $1)], EXPR$3=[COUNT(DISTINCT $0, $2)], EXPR$4=[SUM($3)])
-  LogicalProject(DEPTNO=[$7], ENAME=[$1], JOB=[$2], SAL=[$5])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushMinGroupingSetsThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select deptno, job, min(empno) from
+            (select * from emp as e1 union all
+            select * from emp as e2)
+            group by rollup(deptno, job)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[MIN($2)])
+  LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EXPR$1=[$3], EXPR$2=[$5], EXPR$3=[$7], EXPR$4=[$1])
-  LogicalJoin(condition=[IS NOT DISTINCT FROM($0, $6)], joinType=[inner])
-    LogicalJoin(condition=[IS NOT DISTINCT FROM($0, $4)], joinType=[inner])
-      LogicalJoin(condition=[IS NOT DISTINCT FROM($0, $2)], joinType=[inner])
-        LogicalAggregate(group=[{7}], EXPR$4=[SUM($5)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{1}], EXPR$1=[COUNT($0)])
-          LogicalAggregate(group=[{1, 7}])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{2}], EXPR$2=[COUNT($1, $0)])
-        LogicalAggregate(group=[{1, 2, 7}])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{1}], EXPR$3=[COUNT($1, $0)])
-      LogicalAggregate(group=[{2, 7}])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[MIN($2)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[MIN($2)])
+      LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[MIN($2)])
+      LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctCountMultiple">
-        <Resource name="sql">
-            <![CDATA[select deptno, count(distinct ename),
-  count(distinct job)
-from sales.emp group by deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)], EXPR$2=[COUNT(DISTINCT $2)])
-  LogicalProject(DEPTNO=[$7], ENAME=[$1], JOB=[$2])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushMinThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select ename,min(empno) from
+            (select * from emp as e1 union all
+            select * from emp as e2)
+            group by ename]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[MIN($1)])
+  LogicalProject(ENAME=[$1], EMPNO=[$0])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT($1) FILTER $3], EXPR$2=[COUNT($2) FILTER $4])
-  LogicalProject(DEPTNO=[$0], ENAME=[$1], JOB=[$2], $g_1=[=($3, 1)], $g_2=[=($3, 2)])
-    LogicalProject(DEPTNO=[$2], ENAME=[$0], JOB=[$1], $g=[$3])
-      LogicalAggregate(group=[{1, 2, 7}], groups=[[{1, 7}, {2, 7}]], $g=[GROUPING($7, $1, $2)])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[MIN($1)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0}], EXPR$1=[MIN($1)])
+      LogicalProject(ENAME=[$1], EMPNO=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}], EXPR$1=[MIN($1)])
+      LogicalProject(ENAME=[$1], EMPNO=[$0])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctCountMultipleNoGroup">
-        <Resource name="sql">
-            <![CDATA[select count(distinct ename), count(distinct job)
-from sales.emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[COUNT(DISTINCT $0)], EXPR$1=[COUNT(DISTINCT $1)])
-  LogicalProject(ENAME=[$1], JOB=[$2])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastFilter">
+    <Resource name="sql">
+      <![CDATA[select empno + deptno from emp where sal = 10 * comm
+and upper(ename) = 'FOO']]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($0, $7)])
+  LogicalFilter(condition=[AND(=($5, *(10, $6)), =(UPPER($1), 'FOO'))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[COUNT($0) FILTER $2], EXPR$1=[COUNT($1) FILTER $3])
-  LogicalProject(ENAME=[$0], JOB=[$1], $g_1=[=($2, 1)], $g_2=[=($2, 2)])
-    LogicalAggregate(group=[{1, 2}], groups=[[{1}, {2}]], $g=[GROUPING($1, $2)])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($0, $4)])
+  LogicalFilter(condition=[AND(=($2, *(10, $3)), =(UPPER($1), 'FOO'))])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], SAL=[$5], COMM=[$6], DEPTNO=[$7])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctCountMixed">
-        <Resource name="sql">
-            <![CDATA[select deptno, count(distinct deptno, job) as cddj,
-  sum(sal) as s
-from sales.emp group by deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], CDDJ=[COUNT(DISTINCT $0, $1)], S=[SUM($2)])
-  LogicalProject(DEPTNO=[$7], JOB=[$2], SAL=[$5])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastFilter2">
+    <Resource name="sql">
+      <![CDATA[select count(*)
+from emp
+where case when mgr < 10 then true else false end]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
+  LogicalProject($f0=[0])
+    LogicalFilter(condition=[CASE(<($3, 10), true, false)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], CDDJ=[$1], S=[CAST($2):INTEGER NOT NULL])
-  LogicalAggregate(group=[{0}], CDDJ=[COUNT($0, $1) FILTER $3], S=[MIN($2) FILTER $4])
-    LogicalProject(DEPTNO=[$0], JOB=[$1], S=[$2], $g_0=[=($3, 0)], $g_1=[=($3, 1)])
-      LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}]], S=[SUM($2)], $g=[GROUPING($0, $1)])
-        LogicalProject(DEPTNO=[$7], JOB=[$2], SAL=[$5])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
+  LogicalProject($f0=[0])
+    LogicalFilter(condition=[<($0, 10)])
+      LogicalProject(MGR=[$3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctCountMixedJoin">
-        <Resource name="sql">
-            <![CDATA[select deptno, count(distinct ename), count(distinct job, ename),
-count(distinct deptno, job), sum(sal)
-from sales.emp group by deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)], EXPR$2=[COUNT(DISTINCT $2, $1)], EXPR$3=[COUNT(DISTINCT $0, $2)], EXPR$4=[SUM($3)])
-  LogicalProject(DEPTNO=[$7], ENAME=[$1], JOB=[$2], SAL=[$5])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastFilter3">
+    <Resource name="sql">
+      <![CDATA[select empno + deptno as x, ename, job, mgr,
+  hiredate, sal, comm, slacker
+from emp
+where sal = 10 * comm
+and upper(ename) = 'FOO']]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(X=[+($0, $7)], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
+  LogicalFilter(condition=[AND(=($5, *(10, $6)), =(UPPER($1), 'FOO'))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EXPR$1=[$3], EXPR$2=[$5], EXPR$3=[$7], EXPR$4=[$1])
-  LogicalJoin(condition=[IS NOT DISTINCT FROM($0, $6)], joinType=[inner])
-    LogicalJoin(condition=[IS NOT DISTINCT FROM($0, $4)], joinType=[inner])
-      LogicalJoin(condition=[IS NOT DISTINCT FROM($0, $2)], joinType=[inner])
-        LogicalAggregate(group=[{7}], EXPR$4=[SUM($5)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{1}], EXPR$1=[COUNT($0)])
-          LogicalAggregate(group=[{1, 7}])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{2}], EXPR$2=[COUNT($1, $0)])
-        LogicalAggregate(group=[{1, 2, 7}])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{1}], EXPR$3=[COUNT($1, $0)])
-      LogicalAggregate(group=[{2, 7}])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($0, $7)], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
+  LogicalFilter(condition=[AND(=($5, *(10, $6)), =(UPPER($1), 'FOO'))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctCountMixed2">
-        <Resource name="sql">
-            <![CDATA[select deptno, count(distinct ename) as cde,
-count(distinct job, ename) as cdje,
-count(distinct deptno, job) as cddj,
-sum(sal) as s
-from sales.emp group by deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], CDE=[COUNT(DISTINCT $1)], CDJE=[COUNT(DISTINCT $2, $1)], CDDJ=[COUNT(DISTINCT $0, $2)], S=[SUM($3)])
-  LogicalProject(DEPTNO=[$7], ENAME=[$1], JOB=[$2], SAL=[$5])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastFilter3b">
+    <Resource name="sql">
+      <![CDATA[select empno + deptno as x, ename, job, mgr,
+  hiredate, sal, comm, slacker
+from emp
+where sal = 10 * comm
+and upper(ename) = 'FOO']]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(X=[+($0, $7)], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
+  LogicalFilter(condition=[AND(=($5, *(10, $6)), =(UPPER($1), 'FOO'))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], CDE=[$1], CDJE=[$2], CDDJ=[$3], S=[CAST($4):INTEGER NOT NULL])
-  LogicalAggregate(group=[{0}], CDE=[COUNT($1) FILTER $5], CDJE=[COUNT($2, $1) FILTER $4], CDDJ=[COUNT($0, $2) FILTER $6], S=[MIN($3) FILTER $7])
-    LogicalProject(DEPTNO=[$2], ENAME=[$0], JOB=[$1], S=[$3], $g_0=[=($4, 0)], $g_1=[=($4, 1)], $g_2=[=($4, 2)], $g_3=[=($4, 3)])
-      LogicalAggregate(group=[{1, 2, 7}], groups=[[{1, 2, 7}, {1, 7}, {2, 7}, {7}]], S=[SUM($5)], $g=[GROUPING($7, $1, $2)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(X=[$8], ENAME=[$0], JOB=[$1], MGR=[$2], HIREDATE=[$3], SAL=[$4], COMM=[$5], SLACKER=[$6])
+  LogicalFilter(condition=[$7])
+    LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8], $f7=[AND(=($5, *(10, $6)), =(UPPER($1), 'FOO'))], $f8=[+($0, $7)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushJoinCondDownToProject">
-        <Resource name="sql">
-            <![CDATA[select d.deptno, e.deptno from sales.dept d, sales.emp e
- where d.deptno + 10 = e.deptno * 2]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], DEPTNO0=[$9])
-  LogicalFilter(condition=[=(+($0, 10), *($9, 2))])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastFilter3c">
+    <Resource name="sql">
+      <![CDATA[select empno + deptno as x, ename, job, mgr,
+  hiredate, sal, comm, slacker
+from emp
+where sal = 10 * comm
+and upper(ename) = 'FOO']]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(X=[+($0, $7)], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
+  LogicalFilter(condition=[AND(=($5, *(10, $6)), =(UPPER($1), 'FOO'))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(X=[$7], ENAME=[$0], JOB=[$1], MGR=[$2], HIREDATE=[$3], SAL=[$4], COMM=[$5], SLACKER=[$6])
+  LogicalFilter(condition=[AND(=($4, *(10, $5)), =(UPPER($0), 'FOO'))])
+    LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8], $f7=[+($0, $7)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], DEPTNO0=[$9])
-  LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[$3], ENAME=[$4], JOB=[$5], MGR=[$6], HIREDATE=[$7], SAL=[$8], COMM=[$9], DEPTNO0=[$10], SLACKER=[$11])
-    LogicalJoin(condition=[=($2, $12)], joinType=[inner])
-      LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[+($0, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[*($7, 2)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastFullJoin">
+    <Resource name="sql">
+      <![CDATA[select count(*), case when e.sal < 11 then 11 else -1 * e.sal end
+from emp e full outer join bonus b on e.ename = b.ename
+group by case when e.sal < 11 then 11 else -1 * e.sal end]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[CASE(<($5, 11), 11, *(-1, $5))])
+      LogicalJoin(condition=[=($1, $9)], joinType=[full])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsNonDeterministicFunction">
-        <Resource name="sql">
-            <![CDATA[select sal, r
-from (select sal, rand() as r from emp)
-where r > 0.5]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalFilter(condition=[>($1, 10)])
-  LogicalProject(SAL=[$5], N=[NDC()])
-    LogicalTableScan(table=[[scott, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalFilter(condition=[>($1, 10)])
-  LogicalProject(SAL=[$5], N=[NDC()])
-    LogicalTableScan(table=[[scott, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[CASE($1, 11, $2)])
+      LogicalJoin(condition=[=($0, $3)], joinType=[full])
+        LogicalProject(ENAME=[$1], <=[<($5, 11)], *=[*(-1, $5)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(ENAME=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsNullEqualsOne">
-        <Resource name="sql">
-            <![CDATA[select count(1) from emp where cast(null as integer) = 1]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
-  LogicalProject($f0=[1])
-    LogicalFilter(condition=[=(null, 1)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastFullJoinStrong">
+    <Resource name="sql">
+      <![CDATA[select count(*), case when e.sal < 11 then -1 * e.sal else e.sal end
+from emp e full outer join bonus b on e.ename = b.ename
+group by case when e.sal < 11 then -1 * e.sal else e.sal end]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[CASE(<($5, 11), *(-1, $5), $5)])
+      LogicalJoin(condition=[=($1, $9)], joinType=[full])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
-  LogicalProject($f0=[1])
-    LogicalValues(tuples=[[]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[$1])
+      LogicalJoin(condition=[=($0, $2)], joinType=[full])
+        LogicalProject(ENAME=[$1], CASE=[CASE(<($5, 11), *(-1, $5), $5)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(ENAME=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsCaseEquals">
-        <Resource name="sql">
-            <![CDATA[select count(1) from emp
-where case deptno
-  when 20 then 2
-  when 10 then 1
-  else 3 end = 1]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
-  LogicalProject($f0=[1])
-    LogicalFilter(condition=[=(CASE(=($7, 20), 2, =($7, 10), 1, 3), 1)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastInnerJoin">
+    <Resource name="sql">
+      <![CDATA[select count(*), case when e.sal < 11 then 11 else -1 * e.sal end
+from emp e inner join bonus b on e.ename = b.ename
+group by case when e.sal < 11 then 11 else -1 * e.sal end]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[CASE(<($5, 11), 11, *(-1, $5))])
+      LogicalJoin(condition=[=($1, $9)], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
-  LogicalProject($f0=[1])
-    LogicalFilter(condition=[=($7, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[$1])
+      LogicalJoin(condition=[=($0, $2)], joinType=[inner])
+        LogicalProject(ENAME=[$1], CASE=[CASE(<($5, 11), 11, *(-1, $5))])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(ENAME=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsCaseEquals2">
-        <Resource name="sql">
-            <![CDATA[select count(1) from emp
-where case deptno
-  when 20 then 2
-  when 10 then 1
-  else cast(null as integer) end = 1]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
-  LogicalProject($f0=[1])
-    LogicalFilter(condition=[=(CASE(=($7, 20), 2, =($7, 10), 1, null:INTEGER), 1)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastInnerJoinStrong">
+    <Resource name="sql">
+      <![CDATA[select count(*), case when e.sal < 11 then -1 * e.sal else e.sal end
+from emp e inner join bonus b on e.ename = b.ename
+group by case when e.sal < 11 then -1 * e.sal else e.sal end]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[CASE(<($5, 11), *(-1, $5), $5)])
+      LogicalJoin(condition=[=($1, $9)], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
-  LogicalProject($f0=[1])
-    LogicalFilter(condition=[=($7, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[$1])
+      LogicalJoin(condition=[=($0, $2)], joinType=[inner])
+        LogicalProject(ENAME=[$1], CASE=[CASE(<($5, 11), *(-1, $5), $5)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(ENAME=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsCaseEquals3">
-        <Resource name="sql">
-            <![CDATA[select count(1) from emp
-where case deptno
-  when 30 then 1
-  when 20 then 2
-  when 10 then 1
-  when 30 then 111
-  else 0 end = 1]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
-  LogicalProject($f0=[1])
-    LogicalFilter(condition=[=(CASE(=($7, 30), 1, =($7, 20), 2, =($7, 10), 1, =($7, 30), 111, 0), 1)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastJoin">
+    <Resource name="sql">
+      <![CDATA[select e.sal + b.comm from emp e inner join bonus b
+on e.ename = b.ename and e.deptno = 10]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($5, $12)])
+  LogicalJoin(condition=[AND(=($1, $9), =($7, 10))], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
-  LogicalProject($f0=[1])
-    LogicalFilter(condition=[SEARCH($7, Sarg[10, 30])])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($1, $4)])
+  LogicalJoin(condition=[AND(=($0, $3), $2)], joinType=[inner])
+    LogicalProject(ENAME=[$1], SAL=[$5], ==[=($7, 10)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(ENAME=[$0], COMM=[$3])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSkipReduceConstantsCaseEquals">
-        <Resource name="sql">
-            <![CDATA[select * from emp e1, emp e2
-where coalesce(e1.mgr, -1) = coalesce(e2.mgr, -1)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EMPNO0=[$9], ENAME0=[$10], JOB0=[$11], MGR0=[$12], HIREDATE0=[$13], SAL0=[$14], COMM0=[$15], DEPTNO0=[$16], SLACKER0=[$17])
-  LogicalFilter(condition=[=(CASE(IS NOT NULL($3), CAST($3):INTEGER NOT NULL, -1), CASE(IS NOT NULL($12), CAST($12):INTEGER NOT NULL, -1))])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastLeftJoin">
+    <Resource name="sql">
+      <![CDATA[select count(*), case when e.sal < 11 then 11 else -1 * e.sal end
+from emp e left outer join bonus b on e.ename = b.ename
+group by case when e.sal < 11 then 11 else -1 * e.sal end]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[CASE(<($5, 11), 11, *(-1, $5))])
+      LogicalJoin(condition=[=($1, $9)], joinType=[left])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EMPNO0=[$9], ENAME0=[$10], JOB0=[$11], MGR0=[$12], HIREDATE0=[$13], SAL0=[$14], COMM0=[$15], DEPTNO0=[$16], SLACKER0=[$17])
-  LogicalJoin(condition=[=(CASE(IS NOT NULL($3), CAST($3):INTEGER NOT NULL, -1), CASE(IS NOT NULL($12), CAST($12):INTEGER NOT NULL, -1))], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[$1])
+      LogicalJoin(condition=[=($0, $2)], joinType=[left])
+        LogicalProject(ENAME=[$1], CASE=[CASE(<($5, 11), 11, *(-1, $5))])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(ENAME=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushFilterPastAggThree">
-        <Resource name="sql">
-            <![CDATA[select deptno from emp
-group by deptno having count(*) > 1]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0])
-  LogicalFilter(condition=[>($1, 1)])
-    LogicalAggregate(group=[{0}], agg#0=[COUNT()])
-      LogicalProject(DEPTNO=[$7])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastLeftJoinStrong">
+    <Resource name="sql">
+      <![CDATA[select count(*), case when e.sal < 11 then -1 * e.sal else e.sal end
+            from bonus b left outer join emp e on e.ename = b.ename group by
+            case when e.sal < 11 then -1 * e.sal else e.sal end]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[CASE(<($9, 11), *(-1, $9), $9)])
+      LogicalJoin(condition=[=($5, $0)], joinType=[left])
+        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0])
-  LogicalFilter(condition=[>($1, 1)])
-    LogicalAggregate(group=[{0}], agg#0=[COUNT()])
-      LogicalProject(DEPTNO=[$7])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[$2])
+      LogicalJoin(condition=[=($1, $0)], joinType=[left])
+        LogicalProject(ENAME=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+        LogicalProject(ENAME=[$1], CASE=[CASE(<($5, 11), *(-1, $5), $5)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastLeftJoinSwap">
+    <Resource name="sql">
+      <![CDATA[select count(*), case when e.sal < 11 then 11 else -1 * e.sal end
+from bonus b left outer join emp e on e.ename = b.ename
+group by case when e.sal < 11 then 11 else -1 * e.sal end]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[CASE(<($9, 11), 11, *(-1, $9))])
+      LogicalJoin(condition=[=($5, $0)], joinType=[left])
+        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateFunctionsThroughJoin">
-        <Resource name="sql">
-            <![CDATA[select e.job,
-  min(sal) as min_sal, min(e.deptno) as min_deptno,
-  sum(sal) + 1 as sum_sal_plus, max(sal) as max_sal,
-  sum(sal) as sum_sal_2, count(sal) as count_sal,
-  count(mgr) as count_mgr
-from sales.emp as e
-join sales.dept as d on e.job = d.name
-group by e.job,d.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(JOB=[$0], MIN_SAL=[$2], MIN_DEPTNO=[$3], SUM_SAL_PLUS=[+($4, 1)], MAX_SAL=[$5], SUM_SAL_2=[$4], COUNT_SAL=[$6], COUNT_MGR=[$7])
-  LogicalAggregate(group=[{2, 10}], MIN_SAL=[MIN($5)], MIN_DEPTNO=[MIN($7)], SUM_SAL_2=[SUM($5)], MAX_SAL=[MAX($5)], COUNT_SAL=[COUNT()], COUNT_MGR=[COUNT($3)])
-    LogicalJoin(condition=[=($2, $10)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[CASE($2, 11, $3)])
+      LogicalJoin(condition=[=($1, $0)], joinType=[left])
+        LogicalProject(ENAME=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+        LogicalProject(ENAME=[$1], <=[<($5, 11)], *=[*(-1, $5)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(JOB=[$0], MIN_SAL=[$2], MIN_DEPTNO=[$3], SUM_SAL_PLUS=[+($4, 1)], MAX_SAL=[$5], SUM_SAL_2=[$4], COUNT_SAL=[$6], COUNT_MGR=[$7])
-  LogicalProject(JOB=[$0], NAME=[$7], MIN_SAL=[$1], MIN_DEPTNO=[$2], $f9=[CAST(*($3, $8)):INTEGER NOT NULL], MAX_SAL=[$4], $f10=[*($5, $8)], $f11=[*($6, $8)])
-    LogicalJoin(condition=[=($0, $7)], joinType=[inner])
-      LogicalAggregate(group=[{2}], MIN_SAL=[MIN($5)], MIN_DEPTNO=[MIN($7)], SUM_SAL_2=[SUM($5)], MAX_SAL=[MAX($5)], COUNT_SAL=[COUNT()], COUNT_MGR=[COUNT($3)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastLeftJoinSwapStrong">
+    <Resource name="sql">
+      <![CDATA[select count(*), case when e.sal < 11 then -1 * e.sal else e.sal end
+from bonus b left outer join emp e on e.ename = b.ename
+group by case when e.sal < 11 then -1 * e.sal else e.sal end]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[CASE(<($9, 11), *(-1, $9), $9)])
+      LogicalJoin(condition=[=($5, $0)], joinType=[left])
+        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{1}], agg#0=[COUNT()])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateSumNoGroup">
-        <Resource name="sql">
-            <![CDATA[select count(*) from sales.emp join sales.dept on job = name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
-  LogicalJoin(condition=[=($2, $10)], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[$2])
+      LogicalJoin(condition=[=($1, $0)], joinType=[left])
+        LogicalProject(ENAME=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+        LogicalProject(ENAME=[$1], CASE=[CASE(<($5, 11), *(-1, $5), $5)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[$SUM0($0)])
-  LogicalProject($f4=[*($1, $3)])
-    LogicalJoin(condition=[=($0, $2)], joinType=[inner])
-      LogicalAggregate(group=[{2}], EXPR$0=[COUNT()])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastRightJoin">
+    <Resource name="sql">
+      <![CDATA[select count(*), case when e.sal < 11 then 11 else -1 * e.sal end
+from emp e right outer join bonus b on e.ename = b.ename
+group by case when e.sal < 11 then 11 else -1 * e.sal end]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[CASE(<($5, 11), 11, *(-1, $5))])
+      LogicalJoin(condition=[=($1, $9)], joinType=[right])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{1}], EXPR$0=[COUNT()])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughJoinOnEmptyLogicalValues">
-        <Resource name="sql">
-            <![CDATA[select count(*) volume, sum(C1.sal) C1_sum_sal from (select sal, ename from sales.emp where 1=2) C1 inner join (select ename from sales.emp) C2   on C1.ename = C2.ename ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], VOLUME=[COUNT()], C1_SUM_SAL=[SUM($0)])
-  LogicalJoin(condition=[=($1, $2)], joinType=[inner])
-    LogicalProject(SAL=[$5], ENAME=[$1])
-      LogicalValues(tuples=[[]])
-    LogicalProject(ENAME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], VOLUME=[$SUM0($0)], C1_SUM_SAL=[SUM($1)])
-  LogicalProject(VOLUME=[$3], $f4=[CAST(*($1, $3)):INTEGER])
-    LogicalJoin(condition=[=($0, $2)], joinType=[inner])
-      LogicalProject(ENAME=[$1], SAL=[$0])
-        LogicalProject(SAL=[$5], ENAME=[$1])
-          LogicalValues(tuples=[[]])
-      LogicalAggregate(group=[{0}], VOLUME=[COUNT()])
-        LogicalProject(ENAME=[$1])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[CASE($1, 11, $2)])
+      LogicalJoin(condition=[=($0, $3)], joinType=[right])
+        LogicalProject(ENAME=[$1], <=[<($5, 11)], *=[*(-1, $5)])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(ENAME=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushDistinctAggregateIntoJoin">
-        <Resource name="sql">
-            <![CDATA[select count(distinct sal) from sales.emp
- join sales.dept on job = name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[COUNT(DISTINCT $0)])
-  LogicalProject(SAL=[$5])
-    LogicalJoin(condition=[=($2, $10)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[COUNT(DISTINCT $5)])
-  LogicalJoin(condition=[=($2, $10)], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastRightJoinStrong">
+    <Resource name="sql">
+      <![CDATA[select count(*),
+ case when e.sal < 11 then -1 * e.sal else e.sal end
+from emp e right outer join bonus b on e.ename = b.ename
+group by case when e.sal < 11 then -1 * e.sal else e.sal end]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[CASE(<($5, 11), *(-1, $5), $5)])
+      LogicalJoin(condition=[=($1, $9)], joinType=[right])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateJoinRemoveRule1">
-        <Resource name="sql">
-            <![CDATA[select count(distinct sal) from sales.emp e
-left outer join sales.dept d1 on e.job = d1.name
-left outer join sales.dept d2 on e.job = d2.name
-group by e.job
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[$1])
+      LogicalJoin(condition=[=($0, $2)], joinType=[right])
+        LogicalProject(ENAME=[$1], CASE=[CASE(<($5, 11), *(-1, $5), $5)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(ENAME=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
-  LogicalProject(JOB=[$2], NAME0=[$12])
-    LogicalJoin(condition=[=($2, $12)], joinType=[left])
-      LogicalJoin(condition=[=($2, $10)], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastRightJoinSwap">
+    <Resource name="sql">
+      <![CDATA[select count(*), case when e.sal < 11 then 11 else -1 * e.sal end
+from bonus b right outer join emp e on e.ename = b.ename
+group by case when e.sal < 11 then 11 else -1 * e.sal end]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[CASE(<($9, 11), 11, *(-1, $9))])
+      LogicalJoin(condition=[=($5, $0)], joinType=[right])
+        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{2}], EXPR$1=[COUNT(DISTINCT $10)])
-  LogicalJoin(condition=[=($2, $10)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateJoinRemoveRule2">
-        <Resource name="sql">
-            <![CDATA[select count(distinct sal) from sales.emp e
-left outer join sales.dept d1 on e.job = d1.name
-left outer join sales.dept d2 on e.job = d2.name
-group by e.job
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[$2])
+      LogicalJoin(condition=[=($1, $0)], joinType=[right])
+        LogicalProject(ENAME=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+        LogicalProject(ENAME=[$1], CASE=[CASE(<($5, 11), 11, *(-1, $5))])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}])
-  LogicalProject(JOB=[$2], NAME=[$12])
-    LogicalJoin(condition=[=($2, $12)], joinType=[left])
-      LogicalJoin(condition=[=($2, $10)], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastRightJoinSwapStrong">
+    <Resource name="sql">
+      <![CDATA[select count(*), case when e.sal < 11 then -1 * e.sal else e.sal end
+from bonus b right outer join emp e on e.ename = b.ename
+group by case when e.sal < 11 then -1 * e.sal else e.sal end]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[CASE(<($9, 11), *(-1, $9), $9)])
+      LogicalJoin(condition=[=($5, $0)], joinType=[right])
+        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{2, 10}])
-  LogicalJoin(condition=[=($2, $10)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$0])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject(EXPR$1=[$2])
+      LogicalJoin(condition=[=($1, $0)], joinType=[right])
+        LogicalProject(ENAME=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+        LogicalProject(ENAME=[$1], CASE=[CASE(<($5, 11), *(-1, $5), $5)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushAggregateThroughJoinDistinct">
-        <Resource name="sql">
-            <![CDATA[select d.name,
-  sum(sal) as sum_sal, count(*) as c
-from sales.emp as e
-join (select distinct name from sales.dept) as d
-  on e.job = d.name
-group by d.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{9}], SUM_SAL=[SUM($5)], C=[COUNT()])
-  LogicalJoin(condition=[=($2, $9)], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{1}])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectPastSetOp">
+    <Resource name="sql">
+      <![CDATA[select sal from
+(select * from emp e1 union all select * from emp e2)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalUnion(all=[true])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$3], SUM_SAL=[$1], C=[$2])
-  LogicalJoin(condition=[=($0, $3)], joinType=[inner])
-    LogicalAggregate(group=[{2}], SUM_SAL=[SUM($5)], C=[COUNT()])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalProject(SAL=[$5])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(SAL=[$5])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{1}])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateMerge1">
-        <Resource name="sql">
-            <![CDATA[select deptno c, min(y), max(z) z,
-sum(r), sum(m) n, sum(x) sal from (
-   select deptno, ename, sum(sal) x, max(sal) z,
-      min(sal) y, count(hiredate) m, count(mgr) r
-   from sales.emp group by deptno, ename) t
-group by deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{1}], EXPR$1=[MIN($4)], Z=[MAX($3)], EXPR$3=[SUM($6)], N=[SUM($5)], SAL=[SUM($2)])
-  LogicalAggregate(group=[{1, 7}], X=[SUM($5)], Z=[MAX($5)], Y=[MIN($5)], M=[COUNT()], R=[COUNT($3)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectWithIsNotDistinctFromPastJoin">
+    <Resource name="sql">
+      <![CDATA[select e.sal + b.comm from emp e inner join bonus b
+on (e.ename || e.job) IS NOT DISTINCT FROM (b.ename || b.job) and e.deptno = 10]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($5, $13)])
+  LogicalJoin(condition=[AND(IS NOT DISTINCT FROM($9, $14), =($7, 10))], joinType=[inner])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[||($1, $2)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], $f4=[||($0, $1)])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{7}], EXPR$1=[MIN($5)], Z=[MAX($5)], EXPR$3=[COUNT($3)], N=[COUNT()], SAL=[SUM($5)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($0, $3)])
+  LogicalJoin(condition=[AND(IS NOT DISTINCT FROM($1, $4), $2)], joinType=[inner])
+    LogicalProject(SAL=[$5], $f9=[$9], ==[=($7, 10)])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[||($1, $2)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(COMM=[$3], $f4=[$4])
+      LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], $f4=[||($0, $1)])
+        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateMerge2">
-        <Resource name="sql">
-            <![CDATA[select deptno, empno, sum(x), sum(y)
-from (
-  select ename, empno, deptno, sum(sal) x, count(mgr) y
-    from sales.emp
-  group by deptno, ename, empno) t
-group by grouping sets(deptno, empno)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$1], EMPNO=[$0], EXPR$2=[$2], EXPR$3=[$3])
-  LogicalAggregate(group=[{0, 2}], groups=[[{0}, {2}]], EXPR$2=[SUM($3)], EXPR$3=[SUM($4)])
-    LogicalAggregate(group=[{0, 1, 7}], X=[SUM($5)], Y=[COUNT($3)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectWithOverPastJoin1">
+    <Resource name="sql">
+      <![CDATA[select e.sal + b.comm,
+count(e.empno) over (partition by e.deptno)
+from emp e join bonus b
+on e.ename = b.ename and e.deptno = 10]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($5, $12)], EXPR$1=[COUNT($0) OVER (PARTITION BY $7)])
+  LogicalJoin(condition=[AND(=($1, $9), =($7, 10))], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($2, $6)], EXPR$1=[COUNT($0) OVER (PARTITION BY $3)])
+  LogicalJoin(condition=[AND(=($1, $5), $4)], joinType=[inner])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], SAL=[$5], DEPTNO=[$7], ==[=($7, 10)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(ENAME=[$0], COMM=[$3])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$1], EMPNO=[$0], EXPR$2=[$2], EXPR$3=[$3])
-  LogicalAggregate(group=[{0, 7}], groups=[[{0}, {7}]], EXPR$2=[SUM($5)], EXPR$3=[COUNT($3)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectWithOverPastJoin2">
+    <Resource name="sql">
+      <![CDATA[select e.sal + b.comm,
+count(b.sal) over (partition by b.job)
+from emp e join bonus b
+on e.ename = b.ename and e.deptno = 10]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($5, $12)], EXPR$1=[COUNT($11) OVER (PARTITION BY $10)])
+  LogicalJoin(condition=[AND(=($1, $9), =($7, 10))], joinType=[inner])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateMerge3">
-        <Resource name="sql">
-            <![CDATA[select deptno, sum(x) from (
- select ename, deptno, sum(sal) x from
-   sales.emp group by cube(deptno, ename)) t
-group by deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{1}], EXPR$1=[SUM($2)])
-  LogicalAggregate(group=[{1, 7}], groups=[[{1, 7}, {1}, {7}, {}]], X=[SUM($5)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($1, $6)], EXPR$1=[COUNT($5) OVER (PARTITION BY $4)])
+  LogicalJoin(condition=[AND(=($0, $3), $2)], joinType=[inner])
+    LogicalProject(ENAME=[$1], SAL=[$5], ==[=($7, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{1}], EXPR$1=[SUM($2)])
-  LogicalAggregate(group=[{1, 7}], groups=[[{1, 7}, {1}, {7}, {}]], X=[SUM($5)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushProjectWithOverPastJoin3">
+    <Resource name="sql">
+      <![CDATA[select e.sal + b.comm,
+sum(b.sal + b.sal + 100) over (partition by b.job)
+from emp e join bonus b
+on e.ename = b.ename and e.deptno = 10]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($5, $12)], EXPR$1=[SUM(+(+($11, $11), 100)) OVER (PARTITION BY $10)])
+  LogicalJoin(condition=[AND(=($1, $9), =($7, 10))], joinType=[inner])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateMerge4">
-        <Resource name="sql">
-            <![CDATA[select deptno, sum(x) from (
-  select ename, deptno, count(distinct sal) x
-    from sales.emp group by deptno, ename) t
-group by deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{1}], EXPR$1=[SUM($2)])
-  LogicalAggregate(group=[{1, 7}], X=[COUNT(DISTINCT $5)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($1, $5)], EXPR$1=[SUM($6) OVER (PARTITION BY $4)])
+  LogicalJoin(condition=[AND(=($0, $3), $2)], joinType=[inner])
+    LogicalProject(ENAME=[$1], SAL=[$5], ==[=($7, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(ENAME=[$0], JOB=[$1], COMM=[$3], +=[+(+($2, $2), 100)])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{1}], EXPR$1=[SUM($2)])
-  LogicalAggregate(group=[{1, 7}], X=[COUNT(DISTINCT $5)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushSemiJoinConditions">
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalProject(DEPTNO=[$7], ENAME=[$1])
+    LogicalJoin(condition=[AND(IS NOT DISTINCT FROM($7, $8), IS NOT DISTINCT FROM($1, $9))], joinType=[semi])
+      LogicalTableScan(table=[[scott, EMP]])
+      LogicalProject(DEPTNO=[$0], DNAME=[$1])
+        LogicalTableScan(table=[[scott, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateMerge5">
-        <Resource name="sql">
-            <![CDATA[select deptno, avg(x) from (
-  select mgr, deptno, avg(sal) x from
-    sales.emp group by deptno, mgr) t
-group by deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{1}], EXPR$1=[AVG($2)])
-  LogicalAggregate(group=[{3, 7}], X=[AVG($5)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushSemiJoinConditionsToLeft">
+    <Resource name="sql">
+      <![CDATA[select * from emp
+where emp.deptno
+in (select dept.deptno from dept where emp.empno > 20)]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalJoin(condition=[AND(IS NOT DISTINCT FROM($7, $8), >($0, 20))], joinType=[semi])
+    LogicalTableScan(table=[[scott, EMP]])
+    LogicalTableScan(table=[[scott, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{1}], EXPR$1=[AVG($2)])
-  LogicalAggregate(group=[{3, 7}], X=[AVG($5)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushSemiJoinPastFilter">
+    <Resource name="sql">
+      <![CDATA[select e.ename from emp e, dept d
+where e.deptno = d.deptno and e.ename = 'foo']]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
+  LogicalFilter(condition=[AND(=($7, $9), =($1, 'foo'))])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateMerge6">
-        <Resource name="sql">
-            <![CDATA[select sum(x) from (
-select mgr, deptno, count(sal) x from
-sales.emp group by deptno, mgr) t]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($2)])
-  LogicalAggregate(group=[{3, 7}], X=[COUNT()])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
+  LogicalJoin(condition=[=($7, $9)], joinType=[inner], semiJoinDone=[true])
+    LogicalFilter(condition=[=($1, 'foo')])
+      LogicalJoin(condition=[=($7, $9)], joinType=[semi])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($2)])
-  LogicalAggregate(group=[{3, 7}], X=[COUNT()])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushSemiJoinPastJoinRuleLeft">
+    <Resource name="sql">
+      <![CDATA[select e1.ename from emp e1, dept d, emp e2
+where e1.deptno = d.deptno and e1.empno = e2.empno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
+  LogicalFilter(condition=[AND(=($7, $9), =($0, $11))])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalJoin(condition=[true], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateMerge7">
-        <Resource name="sql">
-            <![CDATA[select mgr, deptno, sum(x) from (
-  select mgr, deptno, count(sal) x from
-    sales.emp group by deptno, mgr) t
-group by cube(mgr, deptno)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {1}, {}]], EXPR$2=[SUM($2)])
-  LogicalAggregate(group=[{3, 7}], X=[COUNT()])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
+  LogicalJoin(condition=[=($0, $11)], joinType=[inner], semiJoinDone=[true])
+    LogicalJoin(condition=[=($7, $9)], joinType=[inner], semiJoinDone=[true])
+      LogicalJoin(condition=[=($0, $9)], joinType=[semi])
+        LogicalJoin(condition=[=($7, $9)], joinType=[semi])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {1}, {}]], EXPR$2=[SUM($2)])
-  LogicalAggregate(group=[{3, 7}], X=[COUNT()])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushSemiJoinPastJoinRuleRight">
+    <Resource name="sql">
+      <![CDATA[select e1.ename from emp e1, dept d, emp e2
+where e1.deptno = d.deptno and d.deptno = e2.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
+  LogicalFilter(condition=[AND(=($7, $9), =($9, $18))])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalJoin(condition=[true], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateMerge8">
-        <Resource name="sql">
-            <![CDATA[select sum(x) x, min(y) z from (
-  select sum(sal) x, min(sal) y from sales.emp)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], X=[SUM($0)], Z=[MIN($1)])
-  LogicalAggregate(group=[{}], X=[SUM($5)], Y=[MIN($5)])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
+  LogicalJoin(condition=[=($9, $18)], joinType=[inner], semiJoinDone=[true])
+    LogicalJoin(condition=[=($7, $9)], joinType=[inner], semiJoinDone=[true])
+      LogicalJoin(condition=[=($7, $9)], joinType=[semi])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalJoin(condition=[=($0, $9)], joinType=[semi])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], X=[SUM($5)], Z=[MIN($5)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateRemove1">
-        <Resource name="sql">
-            <![CDATA[select empno, sum(sal), min(sal), max(sal), bit_and(distinct sal), bit_or(sal), count(distinct sal) from sales.emp group by empno, deptno
-]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], EXPR$1=[$2], EXPR$2=[$3], EXPR$3=[$4], EXPR$4=[$5], EXPR$5=[$6], EXPR$6=[$7])
-  LogicalAggregate(group=[{0, 1}], EXPR$1=[SUM($2)], EXPR$2=[MIN($2)], EXPR$3=[MAX($2)], EXPR$4=[BIT_AND($2)], EXPR$5=[BIT_OR($2)], EXPR$6=[COUNT(DISTINCT $2)])
-    LogicalProject(EMPNO=[$0], DEPTNO=[$7], SAL=[$5])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushSemiJoinPastProject">
+    <Resource name="sql">
+      <![CDATA[select e.* from
+(select ename, trim(job), sal * 2, deptno from emp) e, dept d
+where e.deptno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(ENAME=[$0], EXPR$1=[$1], EXPR$2=[$2], DEPTNO=[$3])
+  LogicalFilter(condition=[=($3, $4)])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalProject(ENAME=[$1], EXPR$1=[TRIM(FLAG(BOTH), ' ', $2)], EXPR$2=[*($5, 2)], DEPTNO=[$7])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], EXPR$1=[$5], EXPR$2=[$5], EXPR$3=[$5], EXPR$4=[$5], EXPR$5=[$5], EXPR$6=[1:BIGINT])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(ENAME=[$0], EXPR$1=[$1], EXPR$2=[$2], DEPTNO=[$3])
+  LogicalJoin(condition=[=($3, $4)], joinType=[inner], semiJoinDone=[true])
+    LogicalProject(ENAME=[$1], EXPR$1=[TRIM(FLAG(BOTH), ' ', $2)], EXPR$2=[*($5, 2)], DEPTNO=[$7])
+      LogicalJoin(condition=[=($7, $9)], joinType=[semi])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateRemove2">
-        <Resource name="sql">
-            <![CDATA[select distinct empno, deptno from sales.emp
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushSumConstantGroupingSetsThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select deptno, job, sum(u) from
+(select *, 2 u from emp as e1 union all
+ select *, 3 u from emp as e2)
+group by rollup(deptno,job)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[SUM($2)])
+  LogicalProject(DEPTNO=[$7], JOB=[$2], U=[$9])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], U=[2])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], U=[3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}])
-  LogicalProject(EMPNO=[$0], DEPTNO=[$7])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[SUM($2)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[SUM($2)])
+      LogicalProject(DEPTNO=[$7], JOB=[$2], U=[2])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[SUM($2)])
+      LogicalProject(DEPTNO=[$7], JOB=[$2], U=[3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], DEPTNO=[$7])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushSumConstantThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select ename, sum(u) from
+(select *, 2 u from emp as e1 union all
+ select *, 3 u from emp as e2)
+group by ename]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
+  LogicalProject(ENAME=[$1], U=[$9])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], U=[2])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], U=[3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateRemove3">
-        <Resource name="sql">
-            <![CDATA[select empno, count(mgr) from sales.emp group by empno, deptno
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
+      LogicalProject(ENAME=[$1], U=[2])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
+      LogicalProject(ENAME=[$1], U=[3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], EXPR$1=[$2])
-  LogicalAggregate(group=[{0, 1}], EXPR$1=[COUNT($2)])
-    LogicalProject(EMPNO=[$0], DEPTNO=[$7], MGR=[$3])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushSumCountStarGroupingSetsThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select deptno,job,sum(empno),count(*),min(deptno),max(empno) from
+(select * from emp as e1 union all
+ select * from emp as e2)
+group by rollup(deptno,job)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[SUM($2)], EXPR$3=[COUNT()], EXPR$4=[MIN($0)], EXPR$5=[MAX($2)])
+  LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], EXPR$1=[CASE(IS NOT NULL($3), 1:BIGINT, 0:BIGINT)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[SUM($2)], EXPR$3=[$SUM0($3)], EXPR$4=[MIN($4)], EXPR$5=[MAX($5)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[SUM($2)], EXPR$3=[COUNT()], EXPR$4=[MIN($0)], EXPR$5=[MAX($2)])
+      LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[SUM($2)], EXPR$3=[COUNT()], EXPR$4=[MIN($0)], EXPR$5=[MAX($2)])
+      LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateRemove4">
-        <Resource name="sql">
-            <![CDATA[select empno, max(sal), avg(sal) from sales.emp group by empno, deptno
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushSumCountStarThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select ename,sum(empno),count(*),min(deptno),max(empno) from
+(select * from emp as e1 union all
+ select * from emp as e2)
+group by ename]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[COUNT()], EXPR$3=[MIN($2)], EXPR$4=[MAX($1)])
+  LogicalProject(ENAME=[$1], EMPNO=[$0], DEPTNO=[$7])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], EXPR$1=[$2], EXPR$2=[$3])
-  LogicalAggregate(group=[{0, 1}], EXPR$1=[MAX($2)], EXPR$2=[AVG($2)])
-    LogicalProject(EMPNO=[$0], DEPTNO=[$7], SAL=[$5])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[$SUM0($2)], EXPR$3=[MIN($3)], EXPR$4=[MAX($4)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[COUNT()], EXPR$3=[MIN($2)], EXPR$4=[MAX($1)])
+      LogicalProject(ENAME=[$1], EMPNO=[$0], DEPTNO=[$7])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[COUNT()], EXPR$3=[MIN($2)], EXPR$4=[MAX($1)])
+      LogicalProject(ENAME=[$1], EMPNO=[$0], DEPTNO=[$7])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], EXPR$1=[$2], EXPR$2=[$3])
-  LogicalAggregate(group=[{0, 1}], EXPR$1=[MAX($2)], EXPR$2=[AVG($2)])
-    LogicalProject(EMPNO=[$0], DEPTNO=[$7], SAL=[$5])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushSumNullConstantGroupingSetsThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select deptno, job, sum(u) from
+(select *, cast(null as integer) u from emp as e1 union all
+ select *, cast(null as integer) u from emp as e2)
+group by rollup(deptno,job)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[SUM($2)])
+  LogicalProject(DEPTNO=[$7], JOB=[$2], U=[$9])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], U=[null:INTEGER])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], U=[null:INTEGER])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateRemove5">
-        <Resource name="sql">
-            <![CDATA[select empno, deptno, sum(sal) from sales.emp group by cube(empno, deptno)
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[SUM($2)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[SUM($2)])
+      LogicalProject(DEPTNO=[$7], JOB=[$2], U=[null:INTEGER])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[SUM($2)])
+      LogicalProject(DEPTNO=[$7], JOB=[$2], U=[null:INTEGER])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {1}, {}]], EXPR$2=[SUM($2)])
-  LogicalProject(EMPNO=[$0], DEPTNO=[$7], SAL=[$5])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushSumNullConstantThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select ename, sum(u) from
+(select *, cast(null as integer) u from emp as e1 union all
+ select *, cast(null as integer) u from emp as e2)
+group by ename]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
+  LogicalProject(ENAME=[$1], U=[$9])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], U=[null:INTEGER])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], U=[null:INTEGER])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {1}, {}]], EXPR$2=[SUM($2)])
-  LogicalProject(EMPNO=[$0], DEPTNO=[$7], SAL=[$5])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
+      LogicalProject(ENAME=[$1], U=[null:INTEGER])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
+      LogicalProject(ENAME=[$1], U=[null:INTEGER])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSpatialContainsPoint">
-        <Resource name="sql">
-            <![CDATA[select *
-from GEO.Restaurants as r
-where ST_Contains(
-  ST_Buffer(ST_Point(10.0, 20.0), 6),
-  ST_Point(r.longitude, r.latitude))]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
-  LogicalFilter(condition=[ST_CONTAINS(ST_BUFFER(ST_POINT(10.0:DECIMAL(3, 1), 20.0:DECIMAL(3, 1)), 6), ST_POINT($2, $1))])
-    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushSumNullableGroupingSetsThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select deptno, job, sum(mgr) from
+(select * from emp as e1 union all
+ select * from emp as e2)
+group by rollup(deptno, job)
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
-  LogicalFilter(condition=[AND(SEARCH($4, Sarg[[33033..33035], [33050..33053], [33055..33080], [33092..33100], [33112..33156], [33164..33176], [33236..33244], [33252..33254], [36456..36464], [36496..36520]]), ST_CONTAINS(MULTIPOLYGON (((16 20, 15.987153539431617 20.39241877538086, 15.948669168242859 20.78315715332031, 15.884711682419379 21.17054193209677, 15.795554957734407 21.552914270615126, 15.68158077697063 21.92863679181897, 15.543277195067716 22.296100594190538, 15.381236449196127 22.65373214131401, 15.196152422706628 23, 14.98881767381527 23.333421398117615, 14.76012004174741 23.652568574052324, 14.511038844873863 23.956074890600412, 14.242640687119284 24.242640687119284, 13.956074890600412 24.511038844873866, 13.652568574052323 24.760120041747413, 13.333421398117613 24.988817673815273, 13 25.196152422706632, 12.653732141314007 25.38123644919613, 12.296100594190538 25.54327719506772, 11.928636791818969 25.681580776970634, 11.552914270615124 25.79555495773441, 11.17054193209677 25.884711682419383, 10.78315715332031 25.948669168242862, 10.392418775380857 25.98715353943162, 10 26, 9.60758122461914 25.987153539431617, 9.21684284667969 25.94866916824286, 8.82945806790323 25.88471168241938, 8.447085729384876 25.795554957734407, 8.07136320818103 25.68158077697063, 7.703899405809461 25.543277195067716, 7.346267858685993 25.381236449196127, 7 25.19615242270663, 6.666578601882387 24.98881767381527, 6.347431425947676 24.76012004174741, 6.043925109399586 24.511038844873863, 5.757359312880714 24.242640687119284, 5.488961155126135 23.956074890600412, 5.239879958252589 23.652568574052324, 5.011182326184728 23.33342139811761, 4.803847577293368 23, 4.6187635508038705 22.653732141314006, 4.45672280493228 22.296100594190538, 4.318419223029367 21.92863679181897, 4.204445042265591 21.552914270615123, 4.115288317580618 21.170541932096768, 4.051330831757139 20.78315715332031, 4.01284646056838 20.392418775380857, 4 20, 4.012846460568384 19.60758122461914, 4.051330831757142 19.21684284667969, 4.115288317580622 18.82945806790323, 4.204445042265594 18.447085729384874, 4.31841922302937 18.07136320818103, 4.456722804932283 17.703899405809462, 4.618763550803873 17.34626785868599, 4.803847577293371 17, 5.011182326184731 16.666578601882385, 5.239879958252591 16.347431425947676, 5.4889611551261375 16.043925109399588, 5.757359312880716 15.757359312880714, 6.043925109399588 15.488961155126134, 6.347431425947677 15.239879958252589, 6.666578601882387 15.011182326184727, 7.000000000000001 14.803847577293368, 7.346267858685993 14.61876355080387, 7.703899405809462 14.45672280493228, 8.071363208181031 14.318419223029366, 8.447085729384876 14.20444504226559, 8.82945806790323 14.115288317580617, 9.21684284667969 14.051330831757138, 9.607581224619143 14.01284646056838, 10 14, 10.39241877538086 14.012846460568383, 10.78315715332031 14.051330831757141, 11.17054193209677 14.115288317580621, 11.552914270615124 14.204445042265593, 11.92863679181897 14.31841922302937, 12.296100594190538 14.456722804932284, 12.653732141314007 14.618763550803873, 13 14.803847577293372, 13.333421398117613 15.01118232618473, 13.652568574052324 15.23987995825259, 13.956074890600414 15.488961155126137, 14.242640687119286 15.757359312880716, 14.511038844873866 16.043925109399588, 14.760120041747411 16.347431425947676, 14.988817673815273 16.66657860188239, 15.196152422706632 17, 15.38123644919613 17.346267858685994, 15.54327719506772 17.703899405809462, 15.681580776970634 18.07136320818103, 15.79555495773441 18.447085729384877, 15.884711682419383 18.829458067903232, 15.948669168242862 19.21684284667969, 15.98715353943162 19.607581224619143, 16 20))):GEOMETRY, ST_POINT($2, $1)))])
-    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[SUM($2)])
+  LogicalProject(DEPTNO=[$7], JOB=[$2], MGR=[$3])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSpatialDWithinLine">
-        <Resource name="sql">
-            <![CDATA[select *
-from GEO.Restaurants as r
-where ST_DWithin(
-  ST_MakeLine(ST_Point(8.0, 20.0), ST_Point(12.0, 20.0)),
-  ST_Point(r.longitude, r.latitude), 4)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
-  LogicalFilter(condition=[ST_DWITHIN(ST_MAKELINE(ST_POINT(8.0:DECIMAL(2, 1), 20.0:DECIMAL(3, 1)), ST_POINT(12.0:DECIMAL(3, 1), 20.0:DECIMAL(3, 1))), ST_POINT($2, $1), 4)])
-    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[SUM($2)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[SUM($2)])
+      LogicalProject(DEPTNO=[$7], JOB=[$2], MGR=[$3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[SUM($2)])
+      LogicalProject(DEPTNO=[$7], JOB=[$2], MGR=[$3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
-  LogicalFilter(condition=[AND(SEARCH($4, Sarg[[33064..33076], [33092..33100], [33112..33156], [33164..33176], [33236..33240], [36457..36459], [36501..36503], [36505..36507], [36517..36519]]), ST_DWITHIN(MULTILINESTRING ((8 20, 12 20)):GEOMETRY, ST_POINT($2, $1), 4))])
-    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushSumNullableNOGBYThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select sum(mgr) from
+(select * from emp as e1 union all
+ select * from emp as e2)
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSpatialDWithinReversed">
-        <Resource name="sql">
-            <![CDATA[select *
-from GEO.Restaurants as r
-where ST_DWithin(ST_Point(r.longitude, r.latitude),
-                 ST_Point(10.0, 20.0), 6)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
-  LogicalFilter(condition=[ST_DWITHIN(ST_POINT($2, $1), ST_POINT(10.0:DECIMAL(3, 1), 20.0:DECIMAL(3, 1)), 6)])
-    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
+  LogicalProject(MGR=[$3])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
-  LogicalFilter(condition=[AND(SEARCH($4, Sarg[[33033..33035], [33050..33053], [33055..33080], [33092..33100], [33112..33156], [33164..33176], [33236..33244], [33252..33254], [36456..36464], [36496..36520]]), ST_DWITHIN(ST_POINT($2, $1), POINT (10 20):GEOMETRY, 6))])
-    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
+      LogicalProject(MGR=[$3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
+      LogicalProject(MGR=[$3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSpatialDWithinToHilbertNegative">
-        <Resource name="sql">
-            <![CDATA[select *
-from GEO.Restaurants as r
-where ST_DWithin(ST_Point(10.0, 20.0),
-                 ST_Point(r.longitude, r.latitude), -2)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
-  LogicalFilter(condition=[ST_DWITHIN(ST_POINT(10.0:DECIMAL(3, 1), 20.0:DECIMAL(3, 1)), ST_POINT($2, $1), -2)])
-    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushSumNullableThroughUnion">
+    <Resource name="sql">
+      <![CDATA[select ename, sum(mgr) from
+(select * from emp as e1 union all
+ select * from emp as e2)
+group by ename
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
-  LogicalValues(tuples=[[]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
+  LogicalProject(ENAME=[$1], MGR=[$3])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSpatialDWithinToHilbertZero">
-        <Resource name="sql">
-            <![CDATA[select *
-from GEO.Restaurants as r
-where ST_DWithin(ST_Point(10.0, 20.0),
-                 ST_Point(r.longitude, r.latitude), 0)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
-  LogicalFilter(condition=[ST_DWITHIN(ST_POINT(10.0:DECIMAL(3, 1), 20.0:DECIMAL(3, 1)), ST_POINT($2, $1), 0)])
-    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
+  LogicalUnion(all=[true])
+    LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
+      LogicalProject(ENAME=[$1], MGR=[$3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
+      LogicalProject(ENAME=[$1], MGR=[$3])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
-  LogicalFilter(condition=[AND(=($4, 33139), =(POINT (10 20), ST_POINT($2, $1)))])
-    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceAllAggregateFunctions">
+    <Resource name="sql">
+      <![CDATA[select name, stddev_pop(deptno), avg(deptno), stddev_samp(deptno), var_pop(deptno), var_samp(deptno)
+from sales.dept group by name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[STDDEV_POP($1)], EXPR$2=[AVG($1)], EXPR$3=[STDDEV_SAMP($1)], EXPR$4=[VAR_POP($1)], EXPR$5=[VAR_SAMP($1)])
+  LogicalProject(NAME=[$1], DEPTNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSpatialReduce">
-        <Resource name="sql">
-            <![CDATA[select
-  ST_Buffer(ST_Point(0.0, 1.0), 2) as b
-from GEO.Restaurants as r]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(B=[ST_BUFFER(ST_POINT(0.0:DECIMAL(2, 1), 1.0:DECIMAL(2, 1)), 2)])
-  LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$0], EXPR$1=[CAST(POWER(/(-($1, /(*($2, $2), $3)), $3), 0.5:DECIMAL(2, 1))):INTEGER NOT NULL], EXPR$2=[CAST(/($2, $3)):INTEGER NOT NULL], EXPR$3=[CAST(POWER(/(-($1, /(*($2, $2), $3)), CASE(=($3, 1), null:BIGINT, -($3, 1))), 0.5:DECIMAL(2, 1))):INTEGER NOT NULL], EXPR$4=[CAST(/(-($1, /(*($2, $2), $3)), $3)):INTEGER NOT NULL], EXPR$5=[CAST(/(-($1, /(*($2, $2), $3)), CASE(=($3, 1), null:BIGINT, -($3, 1)))):INTEGER NOT NULL])
+  LogicalAggregate(group=[{0}], agg#0=[$SUM0($2)], agg#1=[$SUM0($1)], agg#2=[COUNT()])
+    LogicalProject(NAME=[$0], DEPTNO=[$1], $f2=[*($1, $1)])
+      LogicalProject(NAME=[$1], DEPTNO=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(B=[CAST(MULTIPOLYGON (((2 1, 1.9957178464772056 1.1308062584602858, 1.9828897227476194 1.2610523844401027, 1.9615705608064595 1.3901806440322562, 1.9318516525781353 1.517638090205041, 1.8938602589902103 1.6428789306063227, 1.8477590650225726 1.7653668647301788, 1.7937454830653756 1.8845773804380017, 1.7320508075688765 1.9999999999999991, 1.6629392246050898 2.1111404660392035, 1.5867066805824699 2.217522858017441, 1.5036796149579543 2.318691630200137, 1.4142135623730947 2.4142135623730945, 1.3186916302001375 2.5036796149579543, 1.217522858017441 2.58670668058247, 1.1111404660392044 2.66293922460509, 0.9999999999999999 2.7320508075688767, 0.8845773804380025 2.7937454830653765, 0.7653668647301795 2.847759065022573, 0.6428789306063231 2.893860258990211, 0.5176380902050415 2.9318516525781364, 0.3901806440322565 2.961570560806461, 0.26105238444010315 2.982889722747621, 0.13080625846028612 2.995717846477207, 0 3, -0.13080625846028585 2.9957178464772056, -0.2610523844401028 2.982889722747619, -0.3901806440322561 2.9615705608064595, -0.517638090205041 2.9318516525781355, -0.6428789306063226 2.8938602589902103, -0.7653668647301789 2.8477590650225726, -0.8845773804380018 2.7937454830653756, -0.9999999999999992 2.7320508075688767, -1.1111404660392037 2.66293922460509, -1.2175228580174406 2.58670668058247, -1.318691630200137 2.5036796149579543, -1.4142135623730945 2.414213562373095, -1.5036796149579543 2.3186916302001377, -1.5867066805824699 2.217522858017441, -1.66293922460509 2.1111404660392044, -1.732050807568877 2, -1.7937454830653763 1.8845773804380026, -1.8477590650225733 1.7653668647301795, -1.8938602589902112 1.6428789306063232, -1.9318516525781366 1.5176380902050415, -1.9615705608064609 1.3901806440322564, -1.9828897227476208 1.2610523844401031, -1.995717846477207 1.130806258460286, -2 1, -1.9957178464772056 0.8691937415397142, -1.9828897227476194 0.7389476155598972, -1.9615705608064595 0.6098193559677438, -1.9318516525781353 0.48236190979495897, -1.8938602589902103 0.3571210693936774, -1.8477590650225726 0.2346331352698211, -1.7937454830653756 0.11542261956199817, -1.7320508075688765 7.7715611723760960e-16, -1.6629392246050898 -0.11114046603920369, -1.5867066805824699 -0.21752285801744065, -1.5036796149579543 -0.318691630200137, -1.4142135623730947 -0.4142135623730945, -1.3186916302001375 -0.5036796149579543, -1.217522858017441 -0.5867066805824699, -1.1111404660392044 -0.66293922460509, -0.9999999999999999 -0.732050807568877, -0.8845773804380025 -0.7937454830653763, -0.7653668647301795 -0.8477590650225733, -0.6428789306063231 -0.8938602589902112, -0.5176380902050415 -0.9318516525781366, -0.3901806440322565 -0.9615705608064609, -0.26105238444010315 -0.9828897227476208, -0.13080625846028612 -0.995717846477207, 0 -1, 0.13080625846028585 -0.9957178464772056, 0.2610523844401028 -0.9828897227476194, 0.3901806440322561 -0.9615705608064595, 0.517638090205041 -0.9318516525781353, 0.6428789306063226 -0.8938602589902103, 0.7653668647301789 -0.8477590650225726, 0.8845773804380018 -0.7937454830653756, 0.9999999999999992 -0.7320508075688765, 1.1111404660392037 -0.6629392246050898, 1.2175228580174406 -0.5867066805824699, 1.318691630200137 -0.5036796149579543, 1.4142135623730945 -0.4142135623730947, 1.5036796149579543 -0.31869163020013747, 1.5867066805824699 -0.2175228580174411, 1.66293922460509 -0.11114046603920436, 1.732050807568877 1.1102230246251565e-16, 1.7937454830653763 0.11542261956199751, 1.8477590650225733 0.23463313526982055, 1.8938602589902112 0.35712106939367694, 1.9318516525781366 0.4823619097949585, 1.9615705608064609 0.6098193559677435, 1.9828897227476208 0.7389476155598969, 1.995717846477207 0.8691937415397138, 2 1))):GEOMETRY):GEOMETRY])
-  LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceAverage">
+    <Resource name="sql">
+      <![CDATA[select name, max(name), avg(deptno), min(name)
+from sales.dept group by name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[MAX($0)], EXPR$2=[AVG($1)], EXPR$3=[MIN($0)])
+  LogicalProject(NAME=[$1], DEPTNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateRemove6">
-        <Resource name="sql">
-            <![CDATA[select deptno, max(sal) from sales.emp group by deptno
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$0], EXPR$1=[$1], EXPR$2=[CAST(/($2, $3)):INTEGER NOT NULL], EXPR$3=[$4])
+  LogicalAggregate(group=[{0}], EXPR$1=[MAX($0)], agg#1=[$SUM0($1)], agg#2=[COUNT()], EXPR$3=[MIN($0)])
+    LogicalProject(NAME=[$1], DEPTNO=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
-  LogicalProject(DEPTNO=[$7], SAL=[$5])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceAverageAndSumWithNoReduceStddevAndVar">
+    <Resource name="sql">
+      <![CDATA[select name, stddev_pop(deptno), avg(deptno), var_pop(deptno)
+from sales.dept group by name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[STDDEV_POP($1)], EXPR$2=[AVG($1)], EXPR$3=[VAR_POP($1)])
+  LogicalProject(NAME=[$1], DEPTNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)])
-  LogicalProject(DEPTNO=[$7], SAL=[$5])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$0], EXPR$1=[$1], EXPR$2=[CAST(/($2, $3)):INTEGER NOT NULL], EXPR$3=[$4])
+  LogicalAggregate(group=[{0}], EXPR$1=[STDDEV_POP($1)], agg#1=[$SUM0($1)], agg#2=[COUNT()], EXPR$3=[VAR_POP($1)])
+    LogicalProject(NAME=[$1], DEPTNO=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateRemove7">
-        <Resource name="sql">
-            <![CDATA[select mgr, sum(sum_sal)
-from
-(select mgr, deptno, sum(sal) sum_sal
- from sales.emp
- group by mgr, deptno)
-where deptno=100
-group by mgr]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
-  LogicalProject(MGR=[$0], SUM_SAL=[$2])
-    LogicalFilter(condition=[=($1, 100)])
-      LogicalAggregate(group=[{0, 1}], SUM_SAL=[SUM($2)])
-        LogicalProject(MGR=[$3], DEPTNO=[$7], SAL=[$5])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceAverageAndVarWithNoReduceStddev">
+    <Resource name="sql">
+      <![CDATA[select name, stddev_pop(deptno), avg(deptno), var_pop(deptno)
+from sales.dept group by name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[STDDEV_POP($1)], EXPR$2=[AVG($1)], EXPR$3=[VAR_POP($1)])
+  LogicalProject(NAME=[$1], DEPTNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(MGR=[$0], SUM_SAL=[$2])
-  LogicalFilter(condition=[=($1, 100)])
-    LogicalAggregate(group=[{0, 1}], SUM_SAL=[SUM($2)])
-      LogicalProject(MGR=[$3], DEPTNO=[$7], SAL=[$5])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$0], EXPR$1=[$1], EXPR$2=[CAST(/($2, $3)):INTEGER NOT NULL], EXPR$3=[CAST(/(-($4, /(*($2, $2), $3)), $3)):INTEGER NOT NULL])
+  LogicalAggregate(group=[{0}], EXPR$1=[STDDEV_POP($1)], agg#1=[SUM($1)], agg#2=[COUNT()], agg#3=[SUM($2)])
+    LogicalProject(NAME=[$0], DEPTNO=[$1], $f2=[*($1, $1)])
+      LogicalProject(NAME=[$1], DEPTNO=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateJoinRemove1">
-        <Resource name="sql">
-            <![CDATA[select distinct e.deptno from sales.emp e
-left outer join sales.dept d on e.deptno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}])
-  LogicalProject(DEPTNO=[$7])
-    LogicalJoin(condition=[=($7, $9)], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceAverageWithNoReduceSum">
+    <Resource name="sql">
+      <![CDATA[select name, max(name), avg(deptno), min(name)
+from sales.dept group by name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[MAX($0)], EXPR$2=[AVG($1)], EXPR$3=[MIN($0)])
+  LogicalProject(NAME=[$1], DEPTNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$0], EXPR$1=[$1], EXPR$2=[CAST(/($2, $3)):INTEGER NOT NULL], EXPR$3=[$4])
+  LogicalAggregate(group=[{0}], EXPR$1=[MAX($0)], agg#1=[SUM($1)], agg#2=[COUNT()], EXPR$3=[MIN($0)])
+    LogicalProject(NAME=[$1], DEPTNO=[$0])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{7}])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceCase">
+    <Resource name="sql">
+      <![CDATA[select
+  case when false then cast(2.1 as float)
+   else cast(1 as integer) end as newcol
+from emp]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NEWCOL=[CASE(false, 2.1:FLOAT, 1:FLOAT)])
   LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateJoinRemove2">
-        <Resource name="sql">
-            <![CDATA[select e.deptno, count(distinct e.job)
-from sales.emp e
-left outer join sales.dept d on e.deptno = d.deptno
-group by e.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
-  LogicalProject(DEPTNO=[$7], JOB=[$2])
-    LogicalJoin(condition=[=($7, $9)], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{7}], EXPR$1=[COUNT(DISTINCT $2)])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NEWCOL=[1E0:FLOAT])
   LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateJoinRemove3">
-        <Resource name="sql">
-            <![CDATA[select e.deptno, count(distinct d.name)
-from sales.emp e
-left outer join sales.dept d on e.deptno = d.deptno
-group by e.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
-  LogicalProject(DEPTNO=[$7], NAME=[$10])
-    LogicalJoin(condition=[=($7, $9)], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceCaseNullabilityChange">
+    <Resource name="sql">
+      <![CDATA[select case when empno = 1 then 1
+when 1 IS NOT NULL then 2
+else null end as qx from emp]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(QX=[CASE(=($0, 1), 1, IS NOT NULL(1), 2, null:INTEGER)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{7}], EXPR$1=[COUNT(DISTINCT $10)])
-  LogicalJoin(condition=[=($7, $9)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(QX=[CAST(CASE(=($0, 1), 1, 2)):INTEGER])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateJoinRemove4">
-        <Resource name="sql">
-            <![CDATA[select distinct d.deptno
-from sales.emp e
-right outer join sales.dept d on e.deptno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}])
-  LogicalProject(DEPTNO=[$9])
-    LogicalJoin(condition=[=($7, $9)], joinType=[right])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceCaseWhenWithCast">
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject($f0=[CAST(CASE(=(MOD($0, 2:BIGINT), 1), <($0, 2:BIGINT), =(MOD($0, 3:BIGINT), 2), <($0, 1:BIGINT), <($0, 3:BIGINT))):BOOLEAN])
+  LogicalValues(tuples=[[{ 1, 2 }]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject($f0=[CAST(CASE(=(MOD($0, 2:BIGINT), 1), <($0, 2:BIGINT), =(MOD($0, 3:BIGINT), 2), <($0, 1:BIGINT), <($0, 3:BIGINT))):BOOLEAN])
+  LogicalValues(tuples=[[{ 1, 2 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateJoinRemove5">
-        <Resource name="sql">
-            <![CDATA[select d.deptno, count(distinct d.name)
-from sales.emp e
-right outer join sales.dept d on e.deptno = d.deptno
-group by d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
-  LogicalProject(DEPTNO=[$9], NAME=[$10])
-    LogicalJoin(condition=[=($7, $9)], joinType=[right])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceCastAndConsts">
+    <Resource name="sql">
+      <![CDATA[select * from emp
+where cast((empno + (10/2)) as int) = 13]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[=(CAST(+($0, /(10, 2))):INTEGER NOT NULL, 13)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[=(+($0, 5), 13)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateJoinRemove6">
-        <Resource name="sql">
-            <![CDATA[select d.deptno, count(distinct e.job)
-from sales.emp e
-right outer join sales.dept d on e.deptno = d.deptno
-group by d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
-  LogicalProject(DEPTNO=[$9], JOB=[$2])
-    LogicalJoin(condition=[=($7, $9)], joinType=[right])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceCastTimeUnchanged">
+    <Resource name="sql">
+      <![CDATA[select cast(time '12:34:56' as timestamp) from emp as e]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[CAST(12:34:56):TIMESTAMP(0) NOT NULL])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{9}], EXPR$1=[COUNT(DISTINCT $2)])
-  LogicalJoin(condition=[=($7, $9)], joinType=[right])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceCasts">
+    <Resource name="sql">
+      <![CDATA[select cast(d.name as varchar(128)), cast(e.empno as integer)
+from dept as d inner join emp as e
+on cast(d.deptno as integer) = cast(e.deptno as integer)
+where cast(e.job as varchar(1)) = 'Manager']]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[CAST($1):VARCHAR(128) NOT NULL], EXPR$1=[CAST($2):INTEGER NOT NULL])
+  LogicalFilter(condition=[=(CAST(CAST($4):VARCHAR(1) NOT NULL):VARCHAR(7) NOT NULL, 'Manager')])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[$3], ENAME=[$4], JOB=[$5], MGR=[$6], HIREDATE=[$7], SAL=[$8], COMM=[$9], DEPTNO1=[$10], SLACKER=[$11])
+      LogicalJoin(condition=[=($2, $12)], joinType=[inner])
+        LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO0=[CAST($0):INTEGER NOT NULL])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[CAST($7):INTEGER NOT NULL])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateJoinRemove7">
-        <Resource name="sql">
-            <![CDATA[SELECT distinct e.deptno
-FROM sales.emp e
-LEFT JOIN sales.dept d1 ON e.deptno = d1.deptno
-LEFT JOIN sales.dept d2 ON e.deptno = d2.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}])
-  LogicalProject(DEPTNO=[$7])
-    LogicalJoin(condition=[=($7, $11)], joinType=[left])
-      LogicalJoin(condition=[=($7, $9)], joinType=[left])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[CAST($1):VARCHAR(128) NOT NULL], EXPR$1=[$2])
+  LogicalFilter(condition=[=(CAST(CAST($4):VARCHAR(1) NOT NULL):VARCHAR(7) NOT NULL, 'Manager')])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[$3], ENAME=[$4], JOB=[$5], MGR=[$6], HIREDATE=[$7], SAL=[$8], COMM=[$9], DEPTNO1=[$10], SLACKER=[$11])
+      LogicalJoin(condition=[=($2, $12)], joinType=[inner])
+        LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO0=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$7])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{7}])
-  LogicalJoin(condition=[=($7, $9)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceCastsNullable">
+    <Resource name="sql">
+      <![CDATA[insert into sales.dept(deptno, name)
+select empno, cast(job as varchar(128)) from sales.empnullables]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, DEPT]], operation=[INSERT], flattened=[false])
+  LogicalProject(DEPTNO=[$0], NAME=[CAST($2):VARCHAR(128)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateJoinRemove8">
-        <Resource name="sql">
-            <![CDATA[SELECT e.deptno, COUNT(DISTINCT d2.name)
-FROM sales.emp e
-LEFT JOIN sales.dept d1 ON e.deptno = d1.deptno
-LEFT JOIN sales.dept d2 ON e.deptno = d2.deptno
-GROUP BY e.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
-  LogicalProject(DEPTNO=[$7], NAME0=[$12])
-    LogicalJoin(condition=[=($7, $11)], joinType=[left])
-      LogicalJoin(condition=[=($7, $9)], joinType=[left])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, DEPT]], operation=[INSERT], flattened=[false])
+  LogicalCalc(expr#0..8=[{inputs}], expr#9=[CAST($t2):VARCHAR(10) NOT NULL], DEPTNO=[$t0], NAME=[$t9])
+    LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{7}], EXPR$1=[COUNT(DISTINCT $10)])
-  LogicalJoin(condition=[=($7, $9)], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceCompositeInSubQuery">
+    <Resource name="sql">
+      <![CDATA[select *
+from emp
+where (empno, deptno) in (
+  select empno, deptno from (
+    select empno, deptno
+    from emp
+    group by empno, deptno))
+or deptno < 40 + 60]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[OR(IN($0, $7, {
+LogicalProject(EMPNO=[$0], DEPTNO=[$1])
+  LogicalAggregate(group=[{0, 1}])
+    LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}), <($7, +(40, 60)))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateJoinRemove9">
-        <Resource name="sql">
-            <![CDATA[SELECT distinct e.deptno, d2.name
-FROM sales.emp e
-LEFT JOIN sales.dept d1 ON e.deptno = d1.deptno
-LEFT JOIN sales.dept d2 ON e.deptno = d2.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}])
-  LogicalProject(DEPTNO=[$7], NAME=[$12])
-    LogicalJoin(condition=[=($7, $11)], joinType=[left])
-      LogicalJoin(condition=[=($7, $9)], joinType=[left])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{7, 10}])
-  LogicalJoin(condition=[=($7, $9)], joinType=[left])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[OR(IN($0, $7, {
+LogicalProject(EMPNO=[$0], DEPTNO=[$1])
+  LogicalAggregate(group=[{0, 1}])
+    LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}), <($7, 100))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateJoinRemove10">
-        <Resource name="sql">
-            <![CDATA[SELECT e.deptno, COUNT(DISTINCT d1.name, d2.name)
-FROM sales.emp e
-LEFT JOIN sales.dept d1 ON e.deptno = d1.deptno
-LEFT JOIN sales.dept d2 ON e.deptno = d2.deptno
-GROUP BY e.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1, $2)])
-  LogicalProject(DEPTNO=[$7], NAME=[$10], NAME0=[$12])
-    LogicalJoin(condition=[=($7, $11)], joinType=[left])
-      LogicalJoin(condition=[=($7, $9)], joinType=[left])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstants">
+    <Resource name="sql">
+      <![CDATA[select 1+2, d.deptno+(3+4), (5+6)+d.deptno, cast(null as integer), coalesce(2,null), row(7+8) from dept d inner join emp e on d.deptno = e.deptno + (5-5) where d.deptno=(7+8) and d.deptno=(8+7) and d.deptno=coalesce(2,null)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[+(1, 2)], EXPR$1=[+($0, +(3, 4))], EXPR$2=[+(+(5, 6), $0)], EXPR$3=[null:INTEGER], EXPR$4=[CASE(IS NOT NULL(2), 2, null:INTEGER)], EXPR$5=[ROW(+(7, 8))])
+  LogicalFilter(condition=[AND(=($0, +(7, 8)), =($0, +(8, 7)), =($0, CASE(IS NOT NULL(2), 2, null:INTEGER)))])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[$2], ENAME=[$3], JOB=[$4], MGR=[$5], HIREDATE=[$6], SAL=[$7], COMM=[$8], DEPTNO0=[$9], SLACKER=[$10])
+      LogicalJoin(condition=[=($0, $11)], joinType=[inner])
         LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, -(5, 5))])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{7}], EXPR$1=[COUNT(DISTINCT $10, $12)])
-  LogicalJoin(condition=[=($7, $11)], joinType=[left])
-    LogicalJoin(condition=[=($7, $9)], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[3], EXPR$1=[22], EXPR$2=[26], EXPR$3=[null:INTEGER], EXPR$4=[CAST(2):INTEGER], EXPR$5=[ROW(15)])
+  LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateJoinRemove11">
-        <Resource name="sql">
-            <![CDATA[select e.deptno, count(distinct e.slacker)
-from sales.emp e
-left outer join sales.dept d on e.deptno = d.deptno
-group by e.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
-  LogicalProject(DEPTNO=[$7], SLACKER=[$8])
-    LogicalJoin(condition=[=($7, $9)], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstants2">
+    <Resource name="sql">
+      <![CDATA[select p1 is not distinct from p0
+from (values (2, cast(null as integer))) as t(p0, p1)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[false])
+  LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{7}], EXPR$1=[COUNT(DISTINCT $8)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[false])
+  LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectJoinRemove1">
-        <Resource name="sql">
-            <![CDATA[SELECT e.deptno, d2.deptno
-FROM sales.emp e
-LEFT JOIN sales.dept d1 ON e.deptno = d1.deptno
-LEFT JOIN sales.dept d2 ON e.deptno = d2.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7], DEPTNO0=[$11])
-  LogicalJoin(condition=[=($7, $11)], joinType=[left])
-    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstants3">
+    <Resource name="sql">
+      <![CDATA[select e.mgr is not distinct from f.mgr from emp e join emp f on (e.mgr=f.mgr) where e.mgr is null]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[OR(AND(IS NULL($3), IS NULL($12)), IS TRUE(=($3, $12)))])
+  LogicalFilter(condition=[IS NULL($3)])
+    LogicalJoin(condition=[=($3, $12)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7], DEPTNO0=[$9])
-  LogicalJoin(condition=[=($7, $9)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[IS NULL($12)])
+  LogicalFilter(condition=[IS NULL($3)])
+    LogicalJoin(condition=[=($3, $12)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectJoinRemove2">
-        <Resource name="sql">
-            <![CDATA[SELECT e.deptno, d1.deptno
-FROM sales.emp e
-LEFT JOIN sales.dept d1 ON e.deptno = d1.deptno
-LEFT JOIN sales.dept d2 ON e.deptno = d2.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7], DEPTNO0=[$9])
-  LogicalJoin(condition=[=($7, $11)], joinType=[left])
-    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsCalc">
+    <Resource name="sql">
+      <![CDATA[select * from (
+  select upper(substring(x FROM 1 FOR 2) || substring(x FROM 3)) as u,
+      substring(x FROM 1 FOR 1) as s
+  from (
+    select 'table' as x from (values (true))
+    union
+    select 'view' from (values (true))
+    union
+    select 'foreign table' from (values (true))
+  )
+) where u = 'TABLE']]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(U=[$0], S=[$1])
+  LogicalFilter(condition=[=($0, 'TABLE')])
+    LogicalProject(U=[UPPER(||(SUBSTRING($0, 1, 2), SUBSTRING($0, 3)))], S=[SUBSTRING($0, 1, 1)])
+      LogicalUnion(all=[false])
+        LogicalUnion(all=[false])
+          LogicalProject(X=['table'])
+            LogicalValues(tuples=[[{ true }]])
+          LogicalProject(EXPR$0=['view'])
+            LogicalValues(tuples=[[{ true }]])
+        LogicalProject(EXPR$0=['foreign table'])
+          LogicalValues(tuples=[[{ true }]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalCalc(expr#0=[{inputs}], expr#1=['TABLE        ':VARCHAR(26)], expr#2=['t':VARCHAR(13)], U=[$t1], S=[$t2])
+  LogicalValues(tuples=[[{ true }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsCaseEquals">
+    <Resource name="sql">
+      <![CDATA[select count(1) from emp
+where case deptno
+  when 20 then 2
+  when 10 then 1
+  else 3 end = 1]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
+  LogicalProject($f0=[1])
+    LogicalFilter(condition=[=(CASE(=($7, 20), 2, =($7, 10), 1, 3), 1)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7], DEPTNO0=[$9])
-  LogicalJoin(condition=[=($7, $11)], joinType=[left])
-    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
+  LogicalProject($f0=[1])
+    LogicalFilter(condition=[=($7, 10)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectJoinRemove3">
-        <Resource name="sql">
-            <![CDATA[SELECT e1.deptno, d.deptno
-FROM sales.emp e1
-LEFT JOIN sales.emp e2 ON e1.deptno = e2.deptno
-LEFT JOIN sales.dept d ON e1.deptno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7], DEPTNO0=[$18])
-  LogicalJoin(condition=[=($7, $18)], joinType=[left])
-    LogicalJoin(condition=[=($7, $16)], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsCaseEquals2">
+    <Resource name="sql">
+      <![CDATA[select count(1) from emp
+where case deptno
+  when 20 then 2
+  when 10 then 1
+  else cast(null as integer) end = 1]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
+  LogicalProject($f0=[1])
+    LogicalFilter(condition=[=(CASE(=($7, 20), 2, =($7, 10), 1, null:INTEGER), 1)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
+  LogicalProject($f0=[1])
+    LogicalFilter(condition=[=($7, 10)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7], DEPTNO0=[$18])
-  LogicalJoin(condition=[=($7, $18)], joinType=[left])
-    LogicalJoin(condition=[=($7, $16)], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsCaseEquals3">
+    <Resource name="sql">
+      <![CDATA[select count(1) from emp
+where case deptno
+  when 30 then 1
+  when 20 then 2
+  when 10 then 1
+  when 30 then 111
+  else 0 end = 1]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
+  LogicalProject($f0=[1])
+    LogicalFilter(condition=[=(CASE(=($7, 30), 1, =($7, 20), 2, =($7, 10), 1, =($7, 30), 111, 0), 1)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
+  LogicalProject($f0=[1])
+    LogicalFilter(condition=[SEARCH($7, Sarg[10, 30])])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsDup">
+    <Resource name="sql">
+      <![CDATA[select d.deptno from dept d where d.deptno=7 and d.deptno=8]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalFilter(condition=[AND(=($0, 7), =($0, 8))])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectJoinRemove4">
-        <Resource name="sql">
-            <![CDATA[SELECT e.deptno
-FROM sales.emp e
-LEFT JOIN sales.dept d ON e.deptno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7])
-  LogicalJoin(condition=[=($7, $9)], joinType=[left])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalValues(tuples=[[]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsDup2">
+    <Resource name="sql">
+      <![CDATA[select *
+from emp
+where deptno=7 and deptno=8
+and empno = 10 and mgr is null and empno = 10]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[AND(=($7, 7), =($7, 8), =($0, 10), IS NULL($3), =($0, 10))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[10], ENAME=[$1], JOB=[$2], MGR=[null:INTEGER], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalValues(tuples=[[]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsDup3">
+    <Resource name="sql">
+      <![CDATA[select d.deptno from dept d where d.deptno<>7 or d.deptno<>8]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalFilter(condition=[OR(<>($0, 7), <>($0, 8))])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectJoinRemove5">
-        <Resource name="sql">
-            <![CDATA[SELECT e1.deptno
-FROM sales.emp e1
-LEFT JOIN sales.emp e2 ON e1.deptno = e2.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7])
-  LogicalJoin(condition=[=($7, $16)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsDup3Null">
+    <Resource name="sql">
+      <![CDATA[select e.empno from emp e where e.mgr<>7 or e.mgr<>8]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[OR(<>($3, 7), <>($3, 8))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7])
-  LogicalJoin(condition=[=($7, $16)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[IS NOT NULL($3)])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectJoinRemove6">
-        <Resource name="sql">
-            <![CDATA[SELECT e.deptno, d.name
-FROM sales.emp e
-LEFT JOIN sales.dept d ON e.deptno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7], NAME=[$10])
-  LogicalJoin(condition=[=($7, $9)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsDupNot">
+    <Resource name="sql">
+      <![CDATA[select d.deptno from dept d where not(d.deptno=7 and d.deptno=8)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalFilter(condition=[NOT(AND(=($0, 7), =($0, 8)))])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7], NAME=[$10])
-  LogicalJoin(condition=[=($7, $9)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectJoinRemove7">
-        <Resource name="sql">
-            <![CDATA[SELECT e.deptno
-FROM sales.dept d
-RIGHT JOIN sales.emp e ON e.deptno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$9])
-  LogicalJoin(condition=[=($9, $0)], joinType=[right])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsDupNot2">
+    <Resource name="sql">
+      <![CDATA[select d.deptno from dept d where not(d.deptno=7 and d.name='foo' and d.deptno=8)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalFilter(condition=[NOT(AND(=($0, 7), =($1, 'foo'), =($0, 8)))])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectJoinRemove8">
-        <Resource name="sql">
-            <![CDATA[SELECT e2.deptno
-FROM sales.emp e1
-RIGHT JOIN sales.emp e2 ON e1.deptno = e2.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$16])
-  LogicalJoin(condition=[=($7, $16)], joinType=[right])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsDupNot2Null">
+    <Resource name="sql">
+      <![CDATA[select e.empno from emp e where not(e.mgr=7 and e.deptno=8 and e.mgr=8)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[NOT(AND(=($3, 7), =($7, 8), =($3, 8)))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$16])
-  LogicalJoin(condition=[=($7, $16)], joinType=[right])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[OR(IS NOT NULL($3), <>($7, 8))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectJoinRemove9">
-        <Resource name="sql">
-            <![CDATA[SELECT e.deptno, d.name
-FROM sales.dept d
-RIGHT JOIN sales.emp e ON e.deptno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$9], NAME=[$1])
-  LogicalJoin(condition=[=($9, $0)], joinType=[right])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsDupNotNull">
+    <Resource name="sql">
+      <![CDATA[select e.empno from emp e where not(e.mgr=7 and e.mgr=8)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[NOT(AND(=($3, 7), =($3, 8)))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$9], NAME=[$1])
-  LogicalJoin(condition=[=($9, $0)], joinType=[right])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[IS NOT NULL($3)])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectJoinRemove10">
-        <Resource name="sql">
-            <![CDATA[SELECT e.deptno, e.slacker
-FROM sales.emp e
-LEFT JOIN sales.dept d ON e.deptno = d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7], SLACKER=[$8])
-  LogicalJoin(condition=[=($7, $9)], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsDynamicFunction">
+    <Resource name="sql">
+      <![CDATA[select sal, t
+from (select sal, current_timestamp t from emp)
+where t > TIMESTAMP '2018-01-01 00:00:00']]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(SAL=[$0], T=[$1])
+  LogicalFilter(condition=[>($1, 2018-01-01 00:00:00)])
+    LogicalProject(SAL=[$5], T=[CURRENT_TIMESTAMP])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(SAL=[$0], T=[$1])
+  LogicalFilter(condition=[>($1, 2018-01-01 00:00:00)])
+    LogicalProject(SAL=[$5], T=[CURRENT_TIMESTAMP])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsEliminatesFilter">
+    <Resource name="sql">
+      <![CDATA[select * from (values (1,2)) where 1 + 2 > 3 + CAST(NULL AS INTEGER)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
+  LogicalFilter(condition=[>(+(1, 2), +(3, null))])
+    LogicalValues(tuples=[[{ 1, 2 }]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
+  LogicalValues(tuples=[[]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsIsNotNull">
+    <Resource name="sql">
+      <![CDATA[select empno from emp
+where empno=10 and empno is not null]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[AND(=($0, 10), IS NOT NULL($0))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7], SLACKER=[$8])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[=($0, 10)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceNullableCase2">
-        <Resource name="sql">
-            <![CDATA[SELECT deptno, ename, CASE WHEN 1=2 THEN substring(ename, 1, cast(2 as int)) ELSE NULL end from emp group by deptno, ename, case when 1=2 then substring(ename,1, cast(2 as int))  else null end]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1, 2}])
-  LogicalProject(DEPTNO=[$7], ENAME=[$1], EXPR$2=[null:VARCHAR(20)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsIsNull">
+    <Resource name="sql">
+      <![CDATA[select empno from emp where empno=10 and empno is null]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[AND(=($0, 10), IS NULL($0))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1, 2}])
-  LogicalProject(DEPTNO=[$7], ENAME=[$1], EXPR$2=[null])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalValues(tuples=[[]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsNegated">
+    <Resource name="sql">
+      <![CDATA[select empno from emp
+where empno=10 and not(empno=10)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[AND(=($0, 10), NOT(=($0, 10)))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceNullableToNotNull">
-        <Resource name="sql">
-            <![CDATA[select
-  empno + case when 'a' = 'a' then 1 else null end as newcol
-from emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NEWCOL=[+($0, CASE(=('a', 'a'), 1, null:INTEGER))])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NEWCOL=[+($0, 1)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsNegatedInverted">
+    <Resource name="sql">
+      <![CDATA[select empno from emp where empno>10 and empno<=10]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[AND(>($0, 10), <=($0, 10))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceNullableToNotNull2">
-        <Resource name="sql">
-            <![CDATA[select
-  empno + case when 'a' = 'a' then 1 else null end as newcol
-from emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NEWCOL=[+($0, CASE(=('a', 'a'), 1, null:INTEGER))])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NEWCOL=[+($0, 1)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsNonDeterministicFunction">
+    <Resource name="sql">
+      <![CDATA[select sal, r
+from (select sal, rand() as r from emp)
+where r > 0.5]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalFilter(condition=[>($1, 10)])
+  LogicalProject(SAL=[$5], N=[NDC()])
+    LogicalTableScan(table=[[scott, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSemiJoinRule">
-        <Resource name="sql">
-            <![CDATA[select dept.* from dept join (
-  select distinct deptno from emp
-  where sal > 100) using (deptno)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1])
-  LogicalJoin(condition=[=($0, $2)], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalAggregate(group=[{0}])
-      LogicalProject(DEPTNO=[$7])
-        LogicalFilter(condition=[>($5, 100)])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalFilter(condition=[>($1, 10)])
+  LogicalProject(SAL=[$5], N=[NDC()])
+    LogicalTableScan(table=[[scott, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsNull">
+    <Resource name="sql">
+      <![CDATA[select * from (
+  select *
+  from (
+    select cast(null as integer) as n
+    from emp)
+  where n is null and n is null)
+where n is null]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(N=[$0])
+  LogicalFilter(condition=[IS NULL($0)])
+    LogicalProject(N=[$0])
+      LogicalFilter(condition=[AND(IS NULL($0), IS NULL($0))])
+        LogicalProject(N=[null:INTEGER])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalJoin(condition=[=($0, $2)], joinType=[semi])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-  LogicalProject(DEPTNO=[$7])
-    LogicalFilter(condition=[>($5, 100)])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(N=[$0])
+  LogicalProject(N=[$0])
+    LogicalProject(N=[null:INTEGER])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSemiJoinRuleFull">
-        <Resource name="sql">
-            <![CDATA[select dept.* from dept full join (
-  select distinct deptno from emp
-  where sal > 100) using (deptno)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1])
-  LogicalJoin(condition=[=($0, $2)], joinType=[full])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalAggregate(group=[{0}])
-      LogicalProject(DEPTNO=[$7])
-        LogicalFilter(condition=[>($5, 100)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsNullEqualsOne">
+    <Resource name="sql">
+      <![CDATA[select count(1) from emp where cast(null as integer) = 1]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
+  LogicalProject($f0=[1])
+    LogicalFilter(condition=[=(null, 1)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSemiJoinRuleLeft">
-        <Resource name="sql">
-            <![CDATA[select name from dept left join (
-  select distinct deptno from emp
-  where sal > 100) using (deptno)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NAME=[$1])
-  LogicalJoin(condition=[=($0, $2)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalAggregate(group=[{0}])
-      LogicalProject(DEPTNO=[$7])
-        LogicalFilter(condition=[>($5, 100)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
+  LogicalProject($f0=[1])
+    LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$1])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsProjectNullable">
+    <Resource name="sql">
+      <![CDATA[select mgr from emp where mgr=10]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(MGR=[$3])
+  LogicalFilter(condition=[=($3, 10)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSemiJoinRuleRight">
-        <Resource name="sql">
-            <![CDATA[select dept.* from dept right join (
-  select distinct deptno from emp
-  where sal > 100) using (deptno)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1])
-  LogicalJoin(condition=[=($0, $2)], joinType=[right])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalAggregate(group=[{0}])
-      LogicalProject(DEPTNO=[$7])
-        LogicalFilter(condition=[>($5, 100)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(MGR=[CAST(10):INTEGER])
+  LogicalFilter(condition=[=($3, 10)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortJoinTranspose1">
-        <Resource name="sql">
-            <![CDATA[select * from sales.emp e left join (
-  select * from sales.dept d) d on e.deptno = d.deptno
-order by sal limit 10]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalSort(sort0=[$5], dir0=[ASC], fetch=[10])
-    LogicalJoin(condition=[=($7, $9)], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(DEPTNO=[$0], NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsRequiresExecutor">
+    <Resource name="sql">
+      <![CDATA[select * from (values (1,2)) where 1 + 2 > 3 + CAST(NULL AS INTEGER)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
+  LogicalFilter(condition=[>(+(1, 2), +(3, null))])
+    LogicalValues(tuples=[[{ 1, 2 }]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalSort(sort0=[$5], dir0=[ASC], fetch=[10])
-    LogicalJoin(condition=[=($7, $9)], joinType=[left])
-      LogicalSort(sort0=[$5], dir0=[ASC], fetch=[10])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
+  LogicalValues(tuples=[[]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstantsWindow">
+    <Resource name="sql">
+      <![CDATA[select col1, col2, col3
+from (
+  select empno,
+    sum(100) over (partition by deptno, sal order by sal) as col1,
+    sum(100) over (partition by sal order by deptno) as col2,
+    sum(sal) over (partition by deptno order by sal) as col3
+  from emp where sal = 5000)]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject($0=[$2], $1=[$3], $2=[$4])
+  LogicalWindow(window#0=[window(partition {1} range between UNBOUNDED PRECEDING and CURRENT ROW aggs [SUM($2)])], window#1=[window(order by [1] aggs [SUM($2)])], window#2=[window(partition {1} range between UNBOUNDED PRECEDING and CURRENT ROW aggs [SUM(5000)])])
+    LogicalProject(SAL=[$5], DEPTNO=[$7])
+      LogicalFilter(condition=[=($5, 5000)])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(DEPTNO=[$0], NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpandProjectScalar">
-        <Resource name="sql">
-            <![CDATA[select empno,
-  (select deptno from sales.emp where empno < 20) as d
-from sales.emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], D=[$SCALAR_QUERY({
-LogicalProject(DEPTNO=[$7])
-  LogicalFilter(condition=[<($0, 20)])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(COL1=[SUM(100) OVER (PARTITION BY $7, $5 ORDER BY $5)], COL2=[SUM(100) OVER (PARTITION BY $5 ORDER BY $7)], COL3=[SUM($5) OVER (PARTITION BY $7 ORDER BY $5)])
+  LogicalFilter(condition=[=($5, 5000)])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], D=[$9])
-  LogicalJoin(condition=[true], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceDecimal">
+    <Resource name="sql">
+      <![CDATA[select ename from emp where sal > cast (100.0 as decimal(4, 1))]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
+  LogicalFilter(condition=[>($5, 100.0:DECIMAL(4, 1))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{}], agg#0=[SINGLE_VALUE($0)])
-      LogicalProject(DEPTNO=[$7])
-        LogicalFilter(condition=[<($0, 20)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectNotInCorrelated">
-        <Resource name="sql">
-            <![CDATA[select sal,
- empno NOT IN (
- select deptno from dept
-   where emp.job=dept.name)
- from emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(SAL=[$5], EXPR$1=[NOT(IN($0, {
-LogicalProject(DEPTNO=[$0])
-  LogicalFilter(condition=[=($cor0.JOB, $1)])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-}))])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
-LogicalProject(SAL=[$5], EXPR$1=[IS NULL($10)])
-  LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0, 2}])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
+  LogicalCalc(expr#0..8=[{inputs}], expr#9=[10:BIGINT], expr#10=[*($t5, $t9)], expr#11=[100.0:DECIMAL(4, 1)], expr#12=[Reinterpret($t11)], expr#13=[>($t10, $t12)], proj#0..8=[{exprs}], $condition=[$t13])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalFilter(condition=[=($cor0.EMPNO, $0)])
-      LogicalProject(DEPTNO=[$0], i=[true])
-        LogicalFilter(condition=[=($cor0.JOB, $1)])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(SAL=[$5], EXPR$1=[IS NULL($10)])
-  LogicalJoin(condition=[AND(=($0, $9), =($2, $11))], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], i=[true], NAME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceExpressionsNot">
+    <Resource name="sql">
+      <![CDATA[select * from (values (false),(true)) as q (col1) where not(col1)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(COL1=[$0])
+  LogicalFilter(condition=[NOT($0)])
+    LogicalValues(tuples=[[{ false }, { true }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSome">
-        <Resource name="sql">
-            <![CDATA[select * from emp e1
-  where e1.empno > SOME (select deptno from dept)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[> SOME($0, {
-LogicalProject(DEPTNO=[$0])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-})])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(COL1=[$0])
+  LogicalFilter(condition=[NOT($0)])
+    LogicalValues(tuples=[[{ false }, { true }]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[OR(AND(IS TRUE(>($0, $9)), <>($10, 0)), AND(>($10, $11), null, <>($10, 0), IS NOT TRUE(>($0, $9))), AND(>($0, $9), <>($10, 0), IS NOT TRUE(>($0, $9)), <=($10, $11)))])
-      LogicalJoin(condition=[true], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(m=[$0], c=[$1], d=[$1])
-          LogicalAggregate(group=[{}], m=[MIN($0)], c=[COUNT()])
-            LogicalProject(DEPTNO=[$0])
-              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceNestedCaseWhen">
+    <Resource name="sql">
+      <![CDATA[select sal
+from emp
+where case when (sal = 1000) then
+(case when sal = 1000 then null else 1 end is null) else
+(case when sal = 2000 then null else 1 end is null) end is true]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalFilter(condition=[SEARCH($5, Sarg[1000, 2000])])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[OR(AND(IS TRUE(>($0, $9)), <>($10, 0)), AND(>($10, $11), null, <>($10, 0), IS NOT TRUE(>($0, $9))), AND(>($0, $9), <>($10, 0), IS NOT TRUE(>($0, $9)), <=($10, $11)))])
-      LogicalJoin(condition=[true], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(m=[$0], c=[$1], d=[$1])
-          LogicalAggregate(group=[{}], m=[MIN($0)], c=[COUNT()])
-            LogicalProject(DEPTNO=[$0])
-              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalFilter(condition=[IS TRUE(CASE(=($5, 1000), IS NULL(CASE(=($5, 1000), null:INTEGER, 1)), IS NULL(CASE(=($5, 2000), null:INTEGER, 1))))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortJoinTranspose2">
-        <Resource name="sql">
-            <![CDATA[select * from sales.emp e right join (
-  select * from sales.dept d) d on e.deptno = d.deptno
-order by name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalSort(sort0=[$10], dir0=[ASC])
-    LogicalJoin(condition=[=($7, $9)], joinType=[right])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceNot">
+    <Resource name="sql">
+      <![CDATA[select *
+from (select (case when sal > 1000 then null else false end) as caseCol from emp)
+where NOT(caseCol)]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(CASECOL=[$0])
+  LogicalFilter(condition=[NOT($0)])
+    LogicalProject(CASECOL=[CASE(>($5, 1000), null, false)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(DEPTNO=[$0], NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalSort(sort0=[$10], dir0=[ASC])
-    LogicalJoin(condition=[=($7, $9)], joinType=[right])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(CASECOL=[$0])
+  LogicalFilter(condition=[NOT($0)])
+    LogicalProject(CASECOL=[AND(>($5, 1000), null)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalSort(sort0=[$1], dir0=[ASC])
-        LogicalProject(DEPTNO=[$0], NAME=[$1])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortJoinTranspose3">
-        <Resource name="sql">
-            <![CDATA[select * from sales.emp e left join (
-  select * from sales.dept) d on e.deptno = d.deptno
-order by sal, name limit 10]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalSort(sort0=[$5], sort1=[$10], dir0=[ASC], dir1=[ASC], fetch=[10])
-    LogicalJoin(condition=[=($7, $9)], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(DEPTNO=[$0], NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceNullableCase">
+    <Resource name="sql">
+      <![CDATA[SELECT CASE WHEN 1=2 THEN cast((values(1)) as integer) ELSE 2 end from (values(1))]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[CAST(2):INTEGER])
+  LogicalJoin(condition=[true], joinType=[left])
+    LogicalValues(tuples=[[{ 1 }]])
+    LogicalValues(tuples=[[{ 1 }]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[CAST(2):INTEGER])
+  LogicalJoin(condition=[true], joinType=[left])
+    LogicalValues(tuples=[[{ 1 }]])
+    LogicalValues(tuples=[[{ 1 }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceNullableCase2">
+    <Resource name="sql">
+      <![CDATA[SELECT deptno, ename, CASE WHEN 1=2 THEN substring(ename, 1, cast(2 as int)) ELSE NULL end from emp group by deptno, ename, case when 1=2 then substring(ename,1, cast(2 as int))  else null end]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1, 2}])
+  LogicalProject(DEPTNO=[$7], ENAME=[$1], EXPR$2=[null:VARCHAR(20)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1, 2}])
+  LogicalProject(DEPTNO=[$7], ENAME=[$1], EXPR$2=[null])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalSort(sort0=[$5], sort1=[$10], dir0=[ASC], dir1=[ASC], fetch=[10])
-    LogicalJoin(condition=[=($7, $9)], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(DEPTNO=[$0], NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceNullableToNotNull">
+    <Resource name="sql">
+      <![CDATA[select
+  empno + case when 'a' = 'a' then 1 else null end as newcol
+from emp]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NEWCOL=[+($0, CASE(=('a', 'a'), 1, null:INTEGER))])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortJoinTranspose4">
-        <Resource name="sql">
-            <![CDATA[select * from sales.emp e right join (
-  select * from sales.dept d) d on e.deptno = d.deptno
-order by name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalSort(sort0=[$10], dir0=[ASC])
-    LogicalJoin(condition=[=($7, $9)], joinType=[right])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(DEPTNO=[$0], NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NEWCOL=[+($0, 1)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalSort(sort0=[$10], dir0=[ASC])
-    LogicalJoin(condition=[=($7, $9)], joinType=[right])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalSort(sort0=[$1], dir0=[ASC])
-        LogicalProject(DEPTNO=[$0], NAME=[$1])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceNullableToNotNull2">
+    <Resource name="sql">
+      <![CDATA[select
+  empno + case when 'a' = 'a' then 1 else null end as newcol
+from emp]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NEWCOL=[+($0, CASE(=('a', 'a'), 1, null:INTEGER))])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortJoinTranspose5">
-        <Resource name="sql">
-            <![CDATA[select * from sales.emp e right join (
-  select * from sales.dept d) d on e.deptno = d.deptno
-limit 10]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalSort(fetch=[10])
-    LogicalJoin(condition=[=($7, $9)], joinType=[right])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(DEPTNO=[$0], NAME=[$1])
-        LogicalSort(fetch=[10])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NEWCOL=[+($0, 1)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalSort(fetch=[10])
-    LogicalJoin(condition=[=($7, $9)], joinType=[right])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(DEPTNO=[$0], NAME=[$1])
-        LogicalSort(fetch=[10])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceOrCaseWhen">
+    <Resource name="sql">
+      <![CDATA[select sal
+from emp
+where case when sal = 1000 then null else 1 end is null
+OR case when sal = 2000 then null else 1 end is null]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalFilter(condition=[SEARCH($5, Sarg[1000, 2000])])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortJoinTranspose6">
-        <Resource name="sql">
-            <![CDATA[select d.deptno, empno from sales.dept d
-right join sales.emp e using (deptno) limit 10 offset 2]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EMPNO=[$2])
-  LogicalSort(offset=[2], fetch=[10])
-    LogicalJoin(condition=[=($0, $9)], joinType=[right])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalFilter(condition=[OR(IS NULL(CASE(=($5, 1000), null:INTEGER, 1)), IS NULL(CASE(=($5, 2000), null:INTEGER, 1)))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EMPNO=[$2])
-  LogicalSort(offset=[2], fetch=[10])
-    LogicalJoin(condition=[=($0, $9)], joinType=[right])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalSort(offset=[2], fetch=[10])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceValuesNull">
+    <Resource name="sql">
+      <![CDATA[insert into EMPNULLABLES(EMPNO, ENAME, JOB) (select 0, 'null', NULL)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[false])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[null:INTEGER], COMM=[null:INTEGER], DEPTNO=[null:INTEGER], SLACKER=[null:BOOLEAN])
+    LogicalValues(tuples=[[{ 0, 'null', null }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortJoinTranspose7">
-        <Resource name="sql">
-            <![CDATA[select d.deptno, empno from sales.dept d
-left join sales.emp e using (deptno) order by d.deptno offset 1]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EMPNO=[$2])
-  LogicalSort(sort0=[$0], dir0=[ASC], offset=[1])
-    LogicalJoin(condition=[=($0, $9)], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[false])
+  LogicalValues(tuples=[[{ 0, 'null', null, null, null, null, null, null, null }]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EMPNO=[$2])
-  LogicalSort(sort0=[$0], dir0=[ASC], offset=[1])
-    LogicalJoin(condition=[=($0, $9)], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceValuesToEmpty">
+    <Resource name="sql">
+      <![CDATA[select a + b as x, b, a from (values (10, 1), (30, 7)) as t(a, b)
+where a - b < 0]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(X=[+($0, $1)], B=[$1], A=[$0])
+  LogicalFilter(condition=[<(-($0, $1), 0)])
+    LogicalValues(tuples=[[{ 10, 1 }, { 30, 7 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortProjectTranspose1">
-        <Resource name="sql">
-            <![CDATA[select d.deptno from sales.dept d
-order by cast(d.deptno as integer) offset 1]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$1], dir0=[ASC], offset=[1])
-  LogicalProject(DEPTNO=[$0], EXPR$1=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EXPR$1=[$0])
-  LogicalSort(sort0=[$0], dir0=[ASC], offset=[1])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceValuesUnderFilter">
+    <Resource name="sql">
+      <![CDATA[select a, b from (values (10, 'x'), (20, 'y')) as t(a, b) where a < 15]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(A=[$0], B=[$1])
+  LogicalFilter(condition=[<($0, 15)])
+    LogicalValues(tuples=[[{ 10, 'x' }, { 20, 'y' }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortProjectTranspose2">
-        <Resource name="sql">
-            <![CDATA[select d.deptno from sales.dept d
-order by cast(d.deptno as double) offset 1]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$1], dir0=[ASC], offset=[1])
-  LogicalProject(DEPTNO=[$0], EXPR$1=[CAST($0):DOUBLE NOT NULL])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(A=[$0], B=[$1])
+  LogicalValues(tuples=[[{ 10, 'x' }]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EXPR$1=[CAST($0):DOUBLE NOT NULL])
-  LogicalSort(sort0=[$0], dir0=[ASC], offset=[1])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceValuesUnderProject">
+    <Resource name="sql">
+      <![CDATA[select a + b from (values (10, 1), (20, 3)) as t(a, b)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($0, $1)])
+  LogicalValues(tuples=[[{ 10, 1 }, { 20, 3 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortProjectTranspose3">
-        <Resource name="sql">
-            <![CDATA[select d.deptno from sales.dept d
-order by cast(d.deptno as varchar(10)) offset 1]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$1], dir0=[ASC], offset=[1])
-  LogicalProject(DEPTNO=[$0], EXPR$1=[CAST($0):VARCHAR(10) NOT NULL])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalValues(tuples=[[{ 11 }, { 23 }]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalSort(sort0=[$1], dir0=[ASC], offset=[1])
-  LogicalProject(DEPTNO=[$0], EXPR$1=[CAST($0):VARCHAR(10) NOT NULL])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceValuesUnderProjectFilter">
+    <Resource name="sql">
+      <![CDATA[select a + b as x, b, a
+from (values (10, 1), (30, 7), (20, 3)) as t(a, b)
+where a - b < 21]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(X=[+($0, $1)], B=[$1], A=[$0])
+  LogicalFilter(condition=[<(-($0, $1), 21)])
+    LogicalValues(tuples=[[{ 10, 1 }, { 30, 7 }, { 20, 3 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortUnionTranspose">
-        <Resource name="sql">
-            <![CDATA[select a.name from dept a
-union all
-select b.name from dept b
-order by name limit 10]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[ASC], fetch=[10])
-  LogicalProject(NAME=[$0])
-    LogicalUnion(all=[true])
-      LogicalProject(NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalProject(NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalValues(tuples=[[{ 11, 1, 10 }, { 23, 3, 20 }]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[ASC], fetch=[10])
-  LogicalUnion(all=[true])
-    LogicalSort(sort0=[$0], dir0=[ASC], fetch=[10])
-      LogicalProject(NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalSort(sort0=[$0], dir0=[ASC], fetch=[10])
-      LogicalProject(NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testRemoveDistinctOnAgg">
+    <Resource name="sql">
+      <![CDATA[SELECT empno, SUM(distinct sal), MIN(sal), MIN(distinct sal), MAX(distinct sal), bit_and(distinct sal), bit_or(sal), count(distinct sal) from sales.emp group by empno, deptno
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpandProjectIn">
-        <Resource name="sql">
-            <![CDATA[select empno,
-  deptno in (select deptno from sales.emp where empno < 20) as d
-from sales.emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], D=[IN($7, {
-LogicalProject(DEPTNO=[$7])
-  LogicalFilter(condition=[<($0, 20)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], EXPR$1=[$2], EXPR$2=[$3], EXPR$3=[$3], EXPR$4=[$4], EXPR$5=[$5], EXPR$6=[$6], EXPR$7=[$7])
+  LogicalAggregate(group=[{0, 1}], EXPR$1=[SUM(DISTINCT $2)], EXPR$2=[MIN($2)], EXPR$4=[MAX($2)], EXPR$5=[BIT_AND($2)], EXPR$6=[BIT_OR($2)], EXPR$7=[COUNT(DISTINCT $2)])
+    LogicalProject(EMPNO=[$0], DEPTNO=[$7], SAL=[$5])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], EXPR$1=[$5], EXPR$2=[$5], EXPR$3=[$5], EXPR$4=[$5], EXPR$5=[$5], EXPR$6=[$5], EXPR$7=[1:BIGINT])
   LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], D=[CASE(IS NOT NULL($10), true, false)])
-  LogicalJoin(condition=[=($7, $9)], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0, 1}])
-      LogicalProject(DEPTNO=[$7], i=[true])
-        LogicalFilter(condition=[<($0, 20)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testRemoveSemiJoin">
+    <Resource name="sql">
+      <![CDATA[select e.ename from emp e, dept d
+where e.deptno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
+  LogicalFilter(condition=[=($7, $9)])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpandFilterInComposite">
-        <Resource name="sql">
-            <![CDATA[select empno
-from sales.emp
-where (empno, deptno) in (
-  select empno, deptno from sales.emp where empno < 20)
-or emp.sal < 100]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[OR(IN($0, $7, {
-LogicalProject(EMPNO=[$0], DEPTNO=[$7])
-  LogicalFilter(condition=[<($0, 20)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}), <($5, 100))])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
+  LogicalJoin(condition=[=($7, $9)], joinType=[inner], semiJoinDone=[true])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[OR(IS NOT NULL($11), <($5, 100))])
-      LogicalJoin(condition=[AND(=($0, $9), =($7, $10))], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testRemoveSemiJoinRight">
+    <Resource name="sql">
+      <![CDATA[select e1.ename from emp e1, dept d, emp e2
+where e1.deptno = d.deptno and d.deptno = e2.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
+  LogicalFilter(condition=[AND(=($7, $9), =($9, $18))])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalJoin(condition=[true], joinType=[inner])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(EMPNO=[$0], DEPTNO=[$7], i=[true])
-          LogicalFilter(condition=[<($0, 20)])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpandJoinIn">
-        <Resource name="sql">
-            <![CDATA[select empno
-from sales.emp left join sales.dept
-on emp.deptno in (select deptno from sales.emp where empno < 20)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalJoin(condition=[IN($7, {
-LogicalProject(DEPTNO=[$7])
-  LogicalFilter(condition=[<($0, 20)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})], joinType=[left])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
+  LogicalJoin(condition=[=($9, $18)], joinType=[inner], semiJoinDone=[true])
+    LogicalJoin(condition=[=($7, $9)], joinType=[inner], semiJoinDone=[true])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-    LogicalJoin(condition=[true], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalJoin(condition=[=($7, $11)], joinType=[inner])
+    </Resource>
+  </TestCase>
+  <TestCase name="testRemoveSemiJoinRightWithFilter">
+    <Resource name="sql">
+      <![CDATA[select e1.ename from emp e1, dept d, emp e2
+where e1.deptno = d.deptno and d.deptno = e2.deptno
+and d.name = 'foo']]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
+  LogicalFilter(condition=[AND(=($7, $9), =($9, $18), =($10, 'foo'))])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalJoin(condition=[true], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
         LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalAggregate(group=[{0}])
-          LogicalProject(DEPTNO=[$7])
-            LogicalFilter(condition=[<($0, 20)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpandFilterIn">
-        <Resource name="sql">
-            <![CDATA[select empno
-from sales.emp
-where deptno in (select deptno from sales.emp where empno < 20)
-or emp.sal < 100]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[OR(IN($7, {
-LogicalProject(DEPTNO=[$7])
-  LogicalFilter(condition=[<($0, 20)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}), <($5, 100))])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
+  LogicalJoin(condition=[=($9, $18)], joinType=[inner], semiJoinDone=[true])
+    LogicalJoin(condition=[=($7, $9)], joinType=[inner], semiJoinDone=[true])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalFilter(condition=[=($1, 'foo')])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testRemoveSemiJoinWithFilter">
+    <Resource name="sql">
+      <![CDATA[select e.ename from emp e, dept d
+where e.deptno = d.deptno and e.ename = 'foo']]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
+  LogicalFilter(condition=[AND(=($7, $9), =($1, 'foo'))])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
+  LogicalJoin(condition=[=($7, $9)], joinType=[inner], semiJoinDone=[true])
+    LogicalFilter(condition=[=($1, 'foo')])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testRightEmptyAntiJoin">
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[OR(IS NOT NULL($10), <($5, 100))])
-      LogicalJoin(condition=[=($7, $9)], joinType=[left])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{0, 1}])
-          LogicalProject(DEPTNO=[$7], i=[true])
-            LogicalFilter(condition=[<($0, 20)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalJoin(condition=[=($7, $8)], joinType=[anti])
+    LogicalTableScan(table=[[scott, EMP]])
+    LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpandJoinExists">
-        <Resource name="sql">
-            <![CDATA[select empno
-from sales.emp left join sales.dept
-on exists (select deptno from sales.emp where empno < 20)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EMPNO=[$0])
-  LogicalJoin(condition=[EXISTS({
-LogicalFilter(condition=[<($0, 20)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+  LogicalTableScan(table=[[scott, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testRightEmptyAntiJoinNonEqui">
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-    LogicalJoin(condition=[true], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalJoin(condition=[true], joinType=[inner])
+  LogicalJoin(condition=[AND(=($7, $8), =($5, 2000))], joinType=[anti])
+    LogicalTableScan(table=[[scott, EMP]])
+    LogicalValues(tuples=[[]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalTableScan(table=[[scott, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testRightEmptyFullJoin">
+    <Resource name="sql">
+      <![CDATA[select * from emp e
+full join (select * from dept where false) as d
+on e.deptno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalJoin(condition=[=($7, $9)], joinType=[full])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$0], NAME=[$1])
+      LogicalFilter(condition=[false])
         LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalAggregate(group=[{0}])
-          LogicalProject(i=[true])
-            LogicalFilter(condition=[<($0, 20)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpandProjectExists">
-        <Resource name="sql">
-            <![CDATA[select empno,
-  exists (select deptno from sales.emp where empno < 20) as d
-from sales.emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], D=[EXISTS({
-LogicalFilter(condition=[<($0, 20)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalJoin(condition=[=($7, $9)], joinType=[full])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], D=[IS NOT NULL($9)])
-  LogicalJoin(condition=[true], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testRightEmptyInnerJoin">
+    <Resource name="sql">
+      <![CDATA[select * from emp e
+join (select * from dept where false) as d
+on e.deptno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}])
-      LogicalProject(i=[true])
-        LogicalFilter(condition=[<($0, 20)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$0], NAME=[$1])
+      LogicalFilter(condition=[false])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpandJoinScalar">
-        <Resource name="sql">
-            <![CDATA[select empno
-from sales.emp left join sales.dept
-on (select deptno from sales.emp where empno < 20)
- < (select deptno from sales.emp where empno > 100)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalJoin(condition=[<($SCALAR_QUERY({
-LogicalProject(DEPTNO=[$7])
-  LogicalFilter(condition=[<($0, 20)])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalValues(tuples=[[]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testRightEmptyLeftJoin">
+    <Resource name="sql">
+      <![CDATA[select * from emp e
+left join (select * from dept where false) as d
+on e.deptno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalJoin(condition=[=($7, $9)], joinType=[left])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}), $SCALAR_QUERY({
-LogicalProject(DEPTNO=[$7])
-  LogicalFilter(condition=[>($0, 100)])
+    LogicalProject(DEPTNO=[$0], NAME=[$1])
+      LogicalFilter(condition=[false])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalJoin(condition=[=($7, $9)], joinType=[left])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}))], joinType=[left])
+    LogicalValues(tuples=[[]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testRightEmptyRightJoin">
+    <Resource name="sql">
+      <![CDATA[select * from emp e
+right join (select * from dept where false) as d
+on e.deptno = d.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalJoin(condition=[=($7, $9)], joinType=[right])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(DEPTNO=[$0], NAME=[$1])
+      LogicalFilter(condition=[false])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testRightEmptySemiJoin">
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], $f0=[$11])
-      LogicalJoin(condition=[<($11, $12)], joinType=[left])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalJoin(condition=[true], joinType=[left])
-          LogicalJoin(condition=[true], joinType=[left])
-            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-            LogicalAggregate(group=[{}], agg#0=[SINGLE_VALUE($0)])
-              LogicalProject(DEPTNO=[$7])
-                LogicalFilter(condition=[<($0, 20)])
-                  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-          LogicalAggregate(group=[{}], agg#0=[SINGLE_VALUE($0)])
-            LogicalProject(DEPTNO=[$7])
-              LogicalFilter(condition=[>($0, 100)])
-                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalJoin(condition=[=($7, $8)], joinType=[semi])
+    LogicalTableScan(table=[[scott, EMP]])
+    LogicalValues(tuples=[[]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalValues(tuples=[[]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testRightOuterJoinSimplificationToInner">
+    <Resource name="sql">
+      <![CDATA[select 1 from sales.dept d right outer join sales.emp e
+on d.deptno = e.deptno
+where d.name = 'Charlie']]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalFilter(condition=[=($1, 'Charlie')])
+    LogicalJoin(condition=[=($0, $9)], joinType=[right])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalProject(DEPTNO=[CAST($0):INTEGER], NAME=[CAST($1):VARCHAR(10)], EMPNO=[$2], ENAME=[$3], JOB=[$4], MGR=[$5], HIREDATE=[$6], SAL=[$7], COMM=[$8], DEPTNO0=[$9], SLACKER=[$10])
+    LogicalJoin(condition=[=($0, $9)], joinType=[inner])
+      LogicalFilter(condition=[=($1, 'Charlie')])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectAnyCorrelated">
-        <Resource name="sql">
-            <![CDATA[select empno > ANY (
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectAnyCorrelated">
+    <Resource name="sql">
+      <![CDATA[select empno > ANY (
   select deptno from dept where emp.job = dept.name)
 from emp
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EXPR$0=[> SOME($0, {
 LogicalProject(DEPTNO=[$0])
   LogicalFilter(condition=[=($cor0.JOB, $1)])
@@ -11102,9 +10975,9 @@ LogicalProject(DEPTNO=[$0])
 })])
   LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
 LogicalProject(EXPR$0=[CAST(OR(AND(IS TRUE(>($0, $9)), IS NOT TRUE(OR(IS NULL($12), =($10, 0)))), AND(IS TRUE(>($10, $11)), null, IS NOT TRUE(OR(IS NULL($12), =($10, 0))), IS NOT TRUE(>($0, $9))), AND(>($0, $9), IS NOT TRUE(OR(IS NULL($12), =($10, 0))), IS NOT TRUE(>($0, $9)), IS NOT TRUE(>($10, $11))))):BOOLEAN NOT NULL])
   LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{2}])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
@@ -11114,9 +10987,9 @@ LogicalProject(EXPR$0=[CAST(OR(AND(IS TRUE(>($0, $9)), IS NOT TRUE(OR(IS NULL($1
           LogicalFilter(condition=[=($cor0.JOB, $1)])
             LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EXPR$0=[CAST(OR(AND(IS TRUE(>($0, $9)), IS NOT TRUE(OR(IS NULL($12), =($10, 0)))), AND(IS TRUE(>($10, $11)), null, IS NOT TRUE(OR(IS NULL($12), =($10, 0))), IS NOT TRUE(>($0, $9))), AND(>($0, $9), IS NOT TRUE(OR(IS NULL($12), =($10, 0))), IS NOT TRUE(>($0, $9)), IS NOT TRUE(>($10, $11))))):BOOLEAN NOT NULL])
   LogicalJoin(condition=[=($2, $13)], joinType=[left])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
@@ -11125,223 +10998,382 @@ LogicalProject(EXPR$0=[CAST(OR(AND(IS TRUE(>($0, $9)), IS NOT TRUE(OR(IS NULL($1
         LogicalProject(NAME=[$1], DEPTNO=[$0])
           LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSubQueryWithDynamicStarHang">
-        <Resource name="sql">
-            <![CDATA[select n.n_regionkey from (select * from
-(select * from sales.customer) t) n where n.n_nationkey >1]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(N_REGIONKEY=[ITEM($0, 'N_REGIONKEY')])
-  LogicalFilter(condition=[>(ITEM($0, 'N_NATIONKEY'), 1)])
-    LogicalProject(**=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectNotInCorrelated">
+    <Resource name="sql">
+      <![CDATA[select sal,
+ empno NOT IN (
+ select deptno from dept
+   where emp.job=dept.name)
+ from emp]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(SAL=[$5], EXPR$1=[NOT(IN($0, {
+LogicalProject(DEPTNO=[$0])
+  LogicalFilter(condition=[=($cor0.JOB, $1)])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+}))])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
+LogicalProject(SAL=[$5], EXPR$1=[IS NULL($10)])
+  LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0, 2}])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[=($cor0.EMPNO, $0)])
+      LogicalProject(DEPTNO=[$0], i=[true])
+        LogicalFilter(condition=[=($cor0.JOB, $1)])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(SAL=[$5], EXPR$1=[IS NULL($10)])
+  LogicalJoin(condition=[AND(=($0, $9), =($2, $11))], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$0], i=[true], NAME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSemiJoinProjectTranspose">
+    <Resource name="sql">
+      <![CDATA[select a.name from dept a
+where a.deptno in (select b.deptno * 2 from dept);
+]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DNAME=[$1])
+  LogicalJoin(condition=[=($0, $3)], joinType=[semi])
+    LogicalTableScan(table=[[scott, DEPT]])
+    LogicalAggregate(group=[{0}])
+      LogicalProject($f0=[*(2, $0)])
+        LogicalTableScan(table=[[scott, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DNAME=[$1])
+  LogicalJoin(condition=[=($0, $2)], joinType=[semi])
+    LogicalProject(DEPTNO=[$0], DNAME=[$1])
+      LogicalTableScan(table=[[scott, DEPT]])
+    LogicalProject($f0=[$0])
+      LogicalAggregate(group=[{0}])
+        LogicalProject($f0=[*(2, $0)])
+          LogicalTableScan(table=[[scott, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSemiJoinReduceConstants">
+    <Resource name="sql">
+      <![CDATA[select e1.sal
+from (select * from emp where deptno = 200) as e1
+where e1.deptno in (
+  select e2.deptno from emp e2 where e2.sal = 100)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(SAL=[$0])
+  LogicalJoin(condition=[=($1, $2)], joinType=[semi])
+    LogicalFilter(condition=[=($1, 200)])
+      LogicalProject(SAL=[$5], DEPTNO=[$7])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$1])
+      LogicalFilter(condition=[=($0, 100)])
+        LogicalProject(SAL=[$5], DEPTNO=[$7])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(SAL=[$0])
+  LogicalJoin(condition=[=(200, $2)], joinType=[semi])
+    LogicalFilter(condition=[=($1, 200)])
+      LogicalProject(SAL=[$5], DEPTNO=[$7])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$1])
+      LogicalFilter(condition=[=($0, 100)])
+        LogicalProject(SAL=[$5], DEPTNO=[$7])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSemiJoinRule">
+    <Resource name="sql">
+      <![CDATA[select dept.* from dept join (
+  select distinct deptno from emp
+  where sal > 100) using (deptno)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1])
+  LogicalJoin(condition=[=($0, $2)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalAggregate(group=[{0}])
+      LogicalProject(DEPTNO=[$7])
+        LogicalFilter(condition=[>($5, 100)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalJoin(condition=[=($0, $2)], joinType=[semi])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+  LogicalProject(DEPTNO=[$7])
+    LogicalFilter(condition=[>($5, 100)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSemiJoinRuleExists">
+    <Resource name="sql">
+      <![CDATA[select * from dept where exists (
+  select * from emp
+  where emp.deptno = dept.deptno
+  and emp.sal > 100)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1])
+  LogicalJoin(condition=[=($0, $2)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalAggregate(group=[{0}])
+      LogicalProject(DEPTNO=[$7])
+        LogicalFilter(condition=[>($5, 100)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalJoin(condition=[=($0, $2)], joinType=[semi])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+  LogicalProject(DEPTNO=[$7])
+    LogicalFilter(condition=[>($5, 100)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSemiJoinRuleFull">
+    <Resource name="sql">
+      <![CDATA[select dept.* from dept full join (
+  select distinct deptno from emp
+  where sal > 100) using (deptno)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1])
+  LogicalJoin(condition=[=($0, $2)], joinType=[full])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalAggregate(group=[{0}])
+      LogicalProject(DEPTNO=[$7])
+        LogicalFilter(condition=[>($5, 100)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSemiJoinRuleLeft">
+    <Resource name="sql">
+      <![CDATA[select name from dept left join (
+  select distinct deptno from emp
+  where sal > 100) using (deptno)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NAME=[$1])
+  LogicalJoin(condition=[=($0, $2)], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalAggregate(group=[{0}])
+      LogicalProject(DEPTNO=[$7])
+        LogicalFilter(condition=[>($5, 100)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$1])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-EnumerableProject(N_REGIONKEY=[ITEM($0, 'N_REGIONKEY')])
-  EnumerableFilter(condition=[>(ITEM($0, 'N_NATIONKEY'), 1)])
-    EnumerableTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSemiJoinRuleRight">
+    <Resource name="sql">
+      <![CDATA[select dept.* from dept right join (
+  select distinct deptno from emp
+  where sal > 100) using (deptno)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1])
+  LogicalJoin(condition=[=($0, $2)], joinType=[right])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalAggregate(group=[{0}])
+      LogicalProject(DEPTNO=[$7])
+        LogicalFilter(condition=[>($5, 100)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectFilterTransposeRuleOnEmptyRowType">
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject
-  LogicalFilter(condition=[=($0, 20)])
-    LogicalProject(DEPTNO=[$7])
-      LogicalTableScan(table=[[scott, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSemiJoinTrim">
+    <Resource name="sql">
+      <![CDATA[select s.deptno from (select * from dept where exists (
+  select * from emp
+  where emp.deptno = dept.deptno
+  and emp.sal > 100)) s join customer.account on s.deptno = account.acctno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalJoin(condition=[=($0, $2)], joinType=[inner])
+    LogicalJoin(condition=[=($0, $2)], joinType=[semi])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalProject(DEPTNO=[$7], $f0=[true])
+        LogicalFilter(condition=[>($5, 100)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpandFilterExists">
-        <Resource name="sql">
-            <![CDATA[select empno
-from sales.emp
-where exists (select deptno from sales.emp where empno < 20)
-or emp.sal < 100]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[OR(EXISTS({
-LogicalFilter(condition=[<($0, 20)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}), <($5, 100))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalJoin(condition=[=($0, $1)], joinType=[inner])
+    LogicalJoin(condition=[=($0, $1)], joinType=[semi])
+      LogicalProject(DEPTNO=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalProject(DEPTNO=[$1])
+        LogicalFilter(condition=[>($0, 100)])
+          LogicalProject(SAL=[$5], DEPTNO=[$7])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(ACCTNO=[$0])
+      LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSimplifyFilter">
+    <Resource name="sql">
+      <![CDATA[select * from (select * from sales.emp where deptno > 10)
+where empno > 3 and deptno > 5]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
   LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[OR(IS NOT NULL($9), <($5, 100))])
-      LogicalJoin(condition=[true], joinType=[left])
+    LogicalFilter(condition=[AND(>($0, 3), >($7, 5))])
+      LogicalFilter(condition=[>($7, 10)])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{0}])
-          LogicalProject(i=[true])
-            LogicalFilter(condition=[<($0, 20)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpandProjectInComposite">
-        <Resource name="sql">
-            <![CDATA[select empno, (empno, deptno) in (
-    select empno, deptno from sales.emp where empno < 20) as d
-from sales.emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], D=[IN($0, $7, {
-LogicalProject(EMPNO=[$0], DEPTNO=[$7])
-  LogicalFilter(condition=[<($0, 20)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], D=[CASE(IS NOT NULL($11), true, false)])
-  LogicalJoin(condition=[AND(=($0, $9), =($7, $10))], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(EMPNO=[$0], DEPTNO=[$7], i=[true])
-      LogicalFilter(condition=[<($0, 20)])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[>($0, 3)])
+      LogicalFilter(condition=[>($7, 10)])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpandJoinInComposite">
-        <Resource name="sql">
-            <![CDATA[select empno
-from sales.emp left join sales.dept
-on (emp.empno, dept.deptno) in (
-  select empno, deptno from sales.emp where empno < 20)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalJoin(condition=[IN($0, $9, {
-LogicalProject(EMPNO=[$0], DEPTNO=[$7])
-  LogicalFilter(condition=[<($0, 20)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSimplifyItemIsNotNull">
+    <Resource name="sql">
+      <![CDATA[select *
+from sales.customer as t1
+where t1.c_nationkey[0] is not null]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(**=[$1])
+  LogicalFilter(condition=[IS NOT NULL(ITEM($0, 0))])
+    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-    LogicalJoin(condition=[true], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSimplifyItemIsNull">
+    <Resource name="sql">
+      <![CDATA[select * from sales.customer as t1 where t1.c_nationkey[0] is null]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(**=[$1])
+  LogicalFilter(condition=[IS NULL(ITEM($0, 0))])
+    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSkipReduceConstantsCaseEquals">
+    <Resource name="sql">
+      <![CDATA[select * from emp e1, emp e2
+where coalesce(e1.mgr, -1) = coalesce(e2.mgr, -1)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EMPNO0=[$9], ENAME0=[$10], JOB0=[$11], MGR0=[$12], HIREDATE0=[$13], SAL0=[$14], COMM0=[$15], DEPTNO0=[$16], SLACKER0=[$17])
+  LogicalFilter(condition=[=(CASE(IS NOT NULL($3), CAST($3):INTEGER NOT NULL, -1), CASE(IS NOT NULL($12), CAST($12):INTEGER NOT NULL, -1))])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalJoin(condition=[AND(=($0, $11), =($9, $12))], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalAggregate(group=[{0, 1}])
-          LogicalProject(EMPNO=[$0], DEPTNO=[$7])
-            LogicalFilter(condition=[<($0, 20)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpandFilterScalar">
-        <Resource name="sql">
-            <![CDATA[select empno
-from sales.emp
-where (select deptno from sales.emp where empno < 20)
- < (select deptno from sales.emp where empno > 100)
-or emp.sal < 100]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[OR(<($SCALAR_QUERY({
-LogicalProject(DEPTNO=[$7])
-  LogicalFilter(condition=[<($0, 20)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}), $SCALAR_QUERY({
-LogicalProject(DEPTNO=[$7])
-  LogicalFilter(condition=[>($0, 100)])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EMPNO0=[$9], ENAME0=[$10], JOB0=[$11], MGR0=[$12], HIREDATE0=[$13], SAL0=[$14], COMM0=[$15], DEPTNO0=[$16], SLACKER0=[$17])
+  LogicalJoin(condition=[=(CASE(IS NOT NULL($3), CAST($3):INTEGER NOT NULL, -1), CASE(IS NOT NULL($12), CAST($12):INTEGER NOT NULL, -1))], joinType=[inner])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})), <($5, 100))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[OR(<($9, $10), <($5, 100))])
-      LogicalJoin(condition=[true], joinType=[left])
-        LogicalJoin(condition=[true], joinType=[left])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-          LogicalAggregate(group=[{}], agg#0=[SINGLE_VALUE($0)])
-            LogicalProject(DEPTNO=[$7])
-              LogicalFilter(condition=[<($0, 20)])
-                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{}], agg#0=[SINGLE_VALUE($0)])
-          LogicalProject(DEPTNO=[$7])
-            LogicalFilter(condition=[>($0, 100)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsDup2">
-        <Resource name="sql">
-            <![CDATA[select *
-from emp
-where deptno=7 and deptno=8
-and empno = 10 and mgr is null and empno = 10]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testSome">
+    <Resource name="sql">
+      <![CDATA[select * from emp e1
+  where e1.empno > SOME (select deptno from dept)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[AND(=($7, 7), =($7, 8), =($0, 10), IS NULL($3), =($0, 10))])
+  LogicalFilter(condition=[> SOME($0, {
+LogicalProject(DEPTNO=[$0])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+})])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[10], ENAME=[$1], JOB=[$2], MGR=[null:INTEGER], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalValues(tuples=[[]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPullNull">
-        <Resource name="sql">
-            <![CDATA[select *
-from emp
-where deptno=7
-and empno = 10 and mgr is null and empno = 10]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[AND(=($7, 7), =($0, 10), IS NULL($3), =($0, 10))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[OR(AND(IS TRUE(>($0, $9)), <>($10, 0)), AND(>($10, $11), null, <>($10, 0), IS NOT TRUE(>($0, $9))), AND(>($0, $9), <>($10, 0), IS NOT TRUE(>($0, $9)), <=($10, $11)))])
+      LogicalJoin(condition=[true], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(m=[$0], c=[$1], d=[$1])
+          LogicalAggregate(group=[{}], m=[MIN($0)], c=[COUNT()])
+            LogicalProject(DEPTNO=[$0])
+              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[10], ENAME=[$1], JOB=[$2], MGR=[null:INTEGER], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[7], SLACKER=[$8])
-  LogicalFilter(condition=[AND(=($7, 7), =($0, 10), IS NULL($3))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[OR(AND(IS TRUE(>($0, $9)), <>($10, 0)), AND(>($10, $11), null, <>($10, 0), IS NOT TRUE(>($0, $9))), AND(>($0, $9), <>($10, 0), IS NOT TRUE(>($0, $9)), <=($10, $11)))])
+      LogicalJoin(condition=[true], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(m=[$0], c=[$1], d=[$1])
+          LogicalAggregate(group=[{}], m=[MIN($0)], c=[COUNT()])
+            LogicalProject(DEPTNO=[$0])
+              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSomeWithEquality">
-        <Resource name="sql">
-            <![CDATA[select * from emp e1
+    </Resource>
+  </TestCase>
+  <TestCase name="testSomeWithEquality">
+    <Resource name="sql">
+      <![CDATA[select * from emp e1
   where e1.deptno = SOME (select deptno from dept)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
   LogicalFilter(condition=[IN($7, {
 LogicalProject(DEPTNO=[$0])
@@ -11349,9 +11381,9 @@ LogicalProject(DEPTNO=[$0])
 })])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
   LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
     LogicalJoin(condition=[=($7, $9)], joinType=[inner])
@@ -11359,9 +11391,9 @@ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$
       LogicalProject(DEPTNO=[$0])
         LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
   LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
     LogicalJoin(condition=[=($7, $9)], joinType=[inner])
@@ -11369,15 +11401,15 @@ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$
       LogicalProject(DEPTNO=[$0])
         LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSomeWithEquality2">
-        <Resource name="sql">
-            <![CDATA[select * from emp e1
+    </Resource>
+  </TestCase>
+  <TestCase name="testSomeWithEquality2">
+    <Resource name="sql">
+      <![CDATA[select * from emp e1
   where e1.ename= SOME (select name from dept)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
   LogicalFilter(condition=[IN($1, {
 LogicalProject(NAME=[$1])
@@ -11385,9 +11417,9 @@ LogicalProject(NAME=[$1])
 })])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
   LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
     LogicalJoin(condition=[=($1, $9)], joinType=[inner])
@@ -11396,9 +11428,9 @@ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$
         LogicalProject(NAME=[$1])
           LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
   LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
     LogicalJoin(condition=[=($1, $9)], joinType=[inner])
@@ -11407,24 +11439,24 @@ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$
         LogicalProject(NAME=[$1])
           LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortJoinCopyInnerJoinOrderBy">
-        <Resource name="sql">
-            <![CDATA[select * from sales.emp join sales.dept on
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortJoinCopyInnerJoinOrderBy">
+    <Resource name="sql">
+      <![CDATA[select * from sales.emp join sales.dept on
 sales.emp.deptno = sales.dept.deptno order by sal]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
   LogicalSort(sort0=[$5], dir0=[ASC])
     LogicalJoin(condition=[=($7, $9)], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
   LogicalSort(sort0=[$5], dir0=[ASC])
     LogicalJoin(condition=[=($7, $9)], joinType=[inner])
@@ -11432,16 +11464,16 @@ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortJoinCopyInnerJoinOrderByLimit">
-        <Resource name="sql">
-            <![CDATA[select * from sales.emp e join (
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortJoinCopyInnerJoinOrderByLimit">
+    <Resource name="sql">
+      <![CDATA[select * from sales.emp e join (
   select * from sales.dept d) d on e.deptno = d.deptno
 order by sal limit 10]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
   LogicalSort(sort0=[$5], dir0=[ASC], fetch=[10])
     LogicalJoin(condition=[=($7, $9)], joinType=[inner])
@@ -11449,9 +11481,9 @@ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$
       LogicalProject(DEPTNO=[$0], NAME=[$1])
         LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
   LogicalSort(sort0=[$5], dir0=[ASC], fetch=[10])
     LogicalJoin(condition=[=($7, $9)], joinType=[inner])
@@ -11460,24 +11492,24 @@ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$
       LogicalProject(DEPTNO=[$0], NAME=[$1])
         LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortJoinCopyInnerJoinOrderByTwoFields">
-        <Resource name="sql">
-            <![CDATA[select * from sales.emp e join  sales.dept d on
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortJoinCopyInnerJoinOrderByTwoFields">
+    <Resource name="sql">
+      <![CDATA[select * from sales.emp e join  sales.dept d on
  e.deptno = d.deptno order by e.sal,d.name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
   LogicalSort(sort0=[$5], sort1=[$10], dir0=[ASC], dir1=[ASC])
     LogicalJoin(condition=[=($7, $9)], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
   LogicalSort(sort0=[$5], sort1=[$10], dir0=[ASC], dir1=[ASC])
     LogicalJoin(condition=[=($7, $9)], joinType=[inner])
@@ -11486,24 +11518,24 @@ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$
       LogicalSort(sort0=[$1], dir0=[ASC])
         LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortJoinCopySemiJoinOrderBy">
-        <Resource name="sql">
-            <![CDATA[select * from sales.dept d where d.deptno in
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortJoinCopySemiJoinOrderBy">
+    <Resource name="sql">
+      <![CDATA[select * from sales.dept d where d.deptno in
  (select e.deptno from sales.emp e) order by d.deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalSort(sort0=[$0], dir0=[ASC])
   LogicalJoin(condition=[=($0, $2)], joinType=[semi])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
     LogicalProject(DEPTNO=[$7])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalSort(sort0=[$0], dir0=[ASC])
   LogicalJoin(condition=[=($0, $2)], joinType=[semi])
     LogicalSort(sort0=[$0], dir0=[ASC])
@@ -11511,1519 +11543,1417 @@ LogicalSort(sort0=[$0], dir0=[ASC])
     LogicalProject(DEPTNO=[$7])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortJoinCopySemiJoinOrderByLimitOffset">
-        <Resource name="sql">
-            <![CDATA[select * from sales.dept d where d.deptno in
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortJoinCopySemiJoinOrderByLimitOffset">
+    <Resource name="sql">
+      <![CDATA[select * from sales.dept d where d.deptno in
  (select e.deptno from sales.emp e) order by d.deptno limit 10 offset 2]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[ASC], offset=[2], fetch=[10])
-  LogicalJoin(condition=[=($0, $2)], joinType=[semi])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(DEPTNO=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalSort(sort0=[$0], dir0=[ASC], offset=[2], fetch=[10])
-  LogicalJoin(condition=[=($0, $2)], joinType=[semi])
-    LogicalSort(sort0=[$0], dir0=[ASC])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(DEPTNO=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortJoinCopySemiJoinOrderByOffset">
-        <Resource name="sql">
-            <![CDATA[select * from sales.dept d where d.deptno in (select e.deptno from sales.emp e) order by d.deptno offset 2]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[ASC], offset=[2])
   LogicalJoin(condition=[=($0, $2)], joinType=[semi])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
     LogicalProject(DEPTNO=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[ASC], offset=[2])
-  LogicalJoin(condition=[=($0, $2)], joinType=[semi])
-    LogicalSort(sort0=[$0], dir0=[ASC])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(DEPTNO=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortRemovalAllKeysConstant">
-        <Resource name="sql">
-            <![CDATA[select count(*) as c
-from sales.emp
-where deptno = 10
-group by deptno, sal
-order by deptno desc nulls last]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$1], dir0=[DESC-nulls-last])
-  LogicalProject(C=[$2], DEPTNO=[$0])
-    LogicalAggregate(group=[{0, 1}], C=[COUNT()])
-      LogicalProject(DEPTNO=[$7], SAL=[$5])
-        LogicalFilter(condition=[=($7, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(C=[$2], DEPTNO=[$0])
-  LogicalAggregate(group=[{0, 1}], C=[COUNT()])
-    LogicalProject(DEPTNO=[$7], SAL=[$5])
-      LogicalFilter(condition=[=($7, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortRemovalOneKeyConstant">
-        <Resource name="sql">
-            <![CDATA[select count(*) as c
-from sales.emp
-where deptno = 10
-group by deptno, sal
-order by deptno, sal desc nulls first]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$1], sort1=[$2], dir0=[ASC], dir1=[DESC])
-  LogicalProject(C=[$2], DEPTNO=[$0], SAL=[$1])
-    LogicalAggregate(group=[{0, 1}], C=[COUNT()])
-      LogicalProject(DEPTNO=[$7], SAL=[$5])
-        LogicalFilter(condition=[=($7, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalSort(sort0=[$2], dir0=[DESC])
-  LogicalProject(C=[$2], DEPTNO=[$0], SAL=[$1])
-    LogicalAggregate(group=[{0, 1}], C=[COUNT()])
-      LogicalProject(DEPTNO=[$7], SAL=[$5])
-        LogicalFilter(condition=[=($7, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortUnionTranspose2">
-        <Resource name="sql">
-            <![CDATA[select a.name from dept a
-union all
-select b.name from dept b
-order by name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[ASC])
-  LogicalProject(NAME=[$0])
-    LogicalUnion(all=[true])
-      LogicalProject(NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalProject(NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[ASC])
-  LogicalUnion(all=[true])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[ASC], offset=[2], fetch=[10])
+  LogicalJoin(condition=[=($0, $2)], joinType=[semi])
     LogicalSort(sort0=[$0], dir0=[ASC])
-      LogicalProject(NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(DEPTNO=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortJoinCopySemiJoinOrderByOffset">
+    <Resource name="sql">
+      <![CDATA[select * from sales.dept d where d.deptno in (select e.deptno from sales.emp e) order by d.deptno offset 2]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[ASC], offset=[2])
+  LogicalJoin(condition=[=($0, $2)], joinType=[semi])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(DEPTNO=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[ASC], offset=[2])
+  LogicalJoin(condition=[=($0, $2)], joinType=[semi])
     LogicalSort(sort0=[$0], dir0=[ASC])
-      LogicalProject(NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(DEPTNO=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortUnionTranspose3">
-        <Resource name="sql">
-            <![CDATA[select a.name from dept a
-union all
-select b.name from dept b
-order by name limit 0]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[ASC], fetch=[0])
-  LogicalProject(NAME=[$0])
-    LogicalUnion(all=[true])
-      LogicalProject(NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalProject(NAME=[$1])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortJoinTranspose1">
+    <Resource name="sql">
+      <![CDATA[select * from sales.emp e left join (
+  select * from sales.dept d) d on e.deptno = d.deptno
+order by sal limit 10]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalSort(sort0=[$5], dir0=[ASC], fetch=[10])
+    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(DEPTNO=[$0], NAME=[$1])
         LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[ASC], fetch=[0])
-  LogicalUnion(all=[true])
-    LogicalSort(sort0=[$0], dir0=[ASC], fetch=[0])
-      LogicalProject(NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalSort(sort0=[$0], dir0=[ASC], fetch=[0])
-      LogicalProject(NAME=[$1])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalSort(sort0=[$5], dir0=[ASC], fetch=[10])
+    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+      LogicalSort(sort0=[$5], dir0=[ASC], fetch=[10])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(DEPTNO=[$0], NAME=[$1])
         LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateConstantKeyRule">
-        <Resource name="sql">
-            <![CDATA[select count(*) as c
-from sales.emp
-where deptno = 10
-group by deptno, sal]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(C=[$2])
-  LogicalAggregate(group=[{0, 1}], C=[COUNT()])
-    LogicalProject(DEPTNO=[$7], SAL=[$5])
-      LogicalFilter(condition=[=($7, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortJoinTranspose2">
+    <Resource name="sql">
+      <![CDATA[select * from sales.emp e right join (
+  select * from sales.dept d) d on e.deptno = d.deptno
+order by name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalSort(sort0=[$10], dir0=[ASC])
+    LogicalJoin(condition=[=($7, $9)], joinType=[right])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(DEPTNO=[$0], NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(C=[$2])
-  LogicalProject(DEPTNO=[10], SAL=[$0], C=[$1])
-    LogicalAggregate(group=[{0}], C=[COUNT()])
-      LogicalProject(SAL=[$5])
-        LogicalFilter(condition=[=($7, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalSort(sort0=[$10], dir0=[ASC])
+    LogicalJoin(condition=[=($7, $9)], joinType=[right])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalSort(sort0=[$1], dir0=[ASC])
+        LogicalProject(DEPTNO=[$0], NAME=[$1])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateConstantKeyRule2">
-        <Resource name="sql">
-            <![CDATA[select count(*) as c
-from sales.emp
-where deptno = 10
-group by deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(C=[$1])
-  LogicalAggregate(group=[{0}], C=[COUNT()])
-    LogicalProject(DEPTNO=[$7])
-      LogicalFilter(condition=[=($7, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortJoinTranspose3">
+    <Resource name="sql">
+      <![CDATA[select * from sales.emp e left join (
+  select * from sales.dept) d on e.deptno = d.deptno
+order by sal, name limit 10]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalSort(sort0=[$5], sort1=[$10], dir0=[ASC], dir1=[ASC], fetch=[10])
+    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(DEPTNO=[$0], NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(C=[$1])
-  LogicalAggregate(group=[{0}], C=[COUNT()])
-    LogicalProject(DEPTNO=[$7])
-      LogicalFilter(condition=[=($7, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalSort(sort0=[$5], sort1=[$10], dir0=[ASC], dir1=[ASC], fetch=[10])
+    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(DEPTNO=[$0], NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateConstantKeyRule3">
-        <Resource name="sql">
-            <![CDATA[select job
-from sales.emp
-where sal is null and job = 'Clerk'
-group by sal, job
-having count(*) > 3]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(JOB=[$1])
-  LogicalFilter(condition=[>($2, 3)])
-    LogicalAggregate(group=[{0, 1}], agg#0=[COUNT()])
-      LogicalProject(SAL=[$5], JOB=[$2])
-        LogicalFilter(condition=[AND(IS NULL($5), =($2, 'Clerk'))])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortJoinTranspose4">
+    <Resource name="sql">
+      <![CDATA[select * from sales.emp e right join (
+  select * from sales.dept d) d on e.deptno = d.deptno
+order by name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalSort(sort0=[$10], dir0=[ASC])
+    LogicalJoin(condition=[=($7, $9)], joinType=[right])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(DEPTNO=[$0], NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(JOB=[$1])
-  LogicalFilter(condition=[>($2, 3)])
-    LogicalProject(SAL=[$0], JOB=['Clerk':VARCHAR(10)], $f2=[$1])
-      LogicalAggregate(group=[{0}], agg#0=[COUNT()])
-        LogicalProject(SAL=[$5])
-          LogicalFilter(condition=[AND(IS NULL($5), =($2, 'Clerk'))])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalSort(sort0=[$10], dir0=[ASC])
+    LogicalJoin(condition=[=($7, $9)], joinType=[right])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalSort(sort0=[$1], dir0=[ASC])
+        LogicalProject(DEPTNO=[$0], NAME=[$1])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateDynamicFunction">
-        <Resource name="sql">
-            <![CDATA[select hiredate
-from sales.emp
-where sal is null and hiredate = current_timestamp
-group by sal, hiredate
-having count(*) > 3]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(HIREDATE=[$1])
-  LogicalFilter(condition=[>($2, 3)])
-    LogicalAggregate(group=[{0, 1}], agg#0=[COUNT()])
-      LogicalProject(SAL=[$5], HIREDATE=[$4])
-        LogicalFilter(condition=[AND(IS NULL($5), =($4, CURRENT_TIMESTAMP))])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortJoinTranspose5">
+    <Resource name="sql">
+      <![CDATA[select * from sales.emp e right join (
+  select * from sales.dept d) d on e.deptno = d.deptno
+limit 10]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalSort(fetch=[10])
+    LogicalJoin(condition=[=($7, $9)], joinType=[right])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(DEPTNO=[$0], NAME=[$1])
+        LogicalSort(fetch=[10])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(HIREDATE=[$1])
-  LogicalFilter(condition=[>($2, 3)])
-    LogicalProject(SAL=[$0], HIREDATE=[CURRENT_TIMESTAMP], $f2=[$1])
-      LogicalAggregate(group=[{0}], agg#0=[COUNT()])
-        LogicalProject(SAL=[$5])
-          LogicalFilter(condition=[AND(IS NULL($5), =($4, CURRENT_TIMESTAMP))])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalSort(fetch=[10])
+    LogicalJoin(condition=[=($7, $9)], joinType=[right])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(DEPTNO=[$0], NAME=[$1])
+        LogicalSort(fetch=[10])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpandProjectInNullable">
-        <Resource name="sql">
-            <![CDATA[with e2 as (
-  select empno, case when true then deptno else null end as deptno
-  from sales.emp)
-select empno,
-  deptno in (select deptno from e2 where empno < 20) as d
-from e2]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], D=[IN(CASE(true, CAST($7):INTEGER, null:INTEGER), {
-LogicalProject(DEPTNO=[$1])
-  LogicalFilter(condition=[<($0, 20)])
-    LogicalProject(EMPNO=[$0], DEPTNO=[CASE(true, CAST($7):INTEGER, null:INTEGER)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortJoinTranspose6">
+    <Resource name="sql">
+      <![CDATA[select d.deptno, empno from sales.dept d
+right join sales.emp e using (deptno) limit 10 offset 2]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EMPNO=[$2])
+  LogicalSort(offset=[2], fetch=[10])
+    LogicalJoin(condition=[=($0, $9)], joinType=[right])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], D=[CASE(=($9, 0), false, IS NULL(CASE(true, CAST($7):INTEGER, null:INTEGER)), null:BOOLEAN, IS NOT NULL($12), true, <($10, $9), null:BOOLEAN, false)])
-  LogicalJoin(condition=[=(CASE(true, CAST($7):INTEGER, null:INTEGER), $11)], joinType=[left])
-    LogicalJoin(condition=[true], joinType=[inner])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EMPNO=[$2])
+  LogicalSort(offset=[2], fetch=[10])
+    LogicalJoin(condition=[=($0, $9)], joinType=[right])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalSort(offset=[2], fetch=[10])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortJoinTranspose7">
+    <Resource name="sql">
+      <![CDATA[select d.deptno, empno from sales.dept d
+left join sales.emp e using (deptno) order by d.deptno offset 1]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EMPNO=[$2])
+  LogicalSort(sort0=[$0], dir0=[ASC], offset=[1])
+    LogicalJoin(condition=[=($0, $9)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], c=[COUNT()], ck=[COUNT($0)])
-        LogicalProject(DEPTNO=[$1])
-          LogicalFilter(condition=[<($0, 20)])
-            LogicalProject(EMPNO=[$0], DEPTNO=[CASE(true, CAST($7):INTEGER, null:INTEGER)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0, 1}])
-      LogicalProject(DEPTNO=[$1], i=[true])
-        LogicalFilter(condition=[<($0, 20)])
-          LogicalProject(EMPNO=[$0], DEPTNO=[CASE(true, CAST($7):INTEGER, null:INTEGER)])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpandFilterIn3Value">
-        <Resource name="sql">
-            <![CDATA[select empno
-from sales.emp
-where empno
- < case deptno in (select case when true then deptno else null end
-                   from sales.emp where empno < 20)
-   when true then 10
-   when false then 20
-   else 30
-   end]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[<($0, CASE(=(IN($7, {
-LogicalProject(EXPR$0=[CASE(true, CAST($7):INTEGER, null:INTEGER)])
-  LogicalFilter(condition=[<($0, 20)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}), true), 10, =(IN($7, {
-LogicalProject(EXPR$0=[CASE(true, CAST($7):INTEGER, null:INTEGER)])
-  LogicalFilter(condition=[<($0, 20)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}), false), 20, 30))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EMPNO=[$2])
+  LogicalSort(sort0=[$0], dir0=[ASC], offset=[1])
+    LogicalJoin(condition=[=($0, $9)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[<($0, CASE(=(CASE(=($9, 0), false, IS NOT NULL($12), true, <($10, $9), null:BOOLEAN, false), true), 10, =(CASE(=($9, 0), false, IS NOT NULL($12), true, <($10, $9), null:BOOLEAN, false), false), 20, 30))])
-      LogicalJoin(condition=[=($7, $11)], joinType=[left])
-        LogicalJoin(condition=[true], joinType=[inner])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-          LogicalAggregate(group=[{}], c=[COUNT()], ck=[COUNT($0)])
-            LogicalProject(EXPR$0=[CASE(true, CAST($7):INTEGER, null:INTEGER)])
-              LogicalFilter(condition=[<($0, 20)])
-                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{0, 1}])
-          LogicalProject(EXPR$0=[CASE(true, CAST($7):INTEGER, null:INTEGER)], i=[true])
-            LogicalFilter(condition=[<($0, 20)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortProjectTranspose1">
+    <Resource name="sql">
+      <![CDATA[select d.deptno from sales.dept d
+order by cast(d.deptno as integer) offset 1]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalSort(sort0=[$1], dir0=[ASC], offset=[1])
+  LogicalProject(DEPTNO=[$0], EXPR$1=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpandFilterExists3Value">
-        <Resource name="sql">
-            <![CDATA[select empno
-from sales.emp
-where empno
-  < case exists (select deptno from sales.emp where empno < 20)
-    when true then 10 when false then 20 else 30 end]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[<($0, CASE(=(IN($7, {
-LogicalProject(EXPR$0=[CASE(true, CAST($7):INTEGER, null)])
-  LogicalFilter(condition=[<($0, 20)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}), true), 10, =(IN($7, {
-LogicalProject(EXPR$0=[CASE(true, CAST($7):INTEGER, null)])
-  LogicalFilter(condition=[<($0, 20)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}), false), 20, 30))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EXPR$1=[$0])
+  LogicalSort(sort0=[$0], dir0=[ASC], offset=[1])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[<($0, CASE(=(CASE(=($9, 0), false, IS NOT NULL($12), true, <($10, $9), null, false), true), 10, =(CASE(=($9, 0), false, IS NOT NULL($12), true, <($10, $9), null, false), false), 20, 30))])
-      LogicalJoin(condition=[=($7, $11)], joinType=[left])
-        LogicalJoin(condition=[true], joinType=[inner])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-          LogicalAggregate(group=[{}], c=[COUNT()], ck=[COUNT($0)])
-            LogicalProject(EXPR$0=[CASE(true, CAST($7):INTEGER, null)])
-              LogicalFilter(condition=[<($0, 20)])
-                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{0, 1}])
-          LogicalProject(EXPR$0=[$0], i=[true])
-            LogicalProject(EXPR$0=[CASE(true, CAST($7):INTEGER, null)])
-              LogicalFilter(condition=[<($0, 20)])
-                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortProjectTranspose2">
+    <Resource name="sql">
+      <![CDATA[select d.deptno from sales.dept d
+order by cast(d.deptno as double) offset 1]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalSort(sort0=[$1], dir0=[ASC], offset=[1])
+  LogicalProject(DEPTNO=[$0], EXPR$1=[CAST($0):DOUBLE NOT NULL])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpandFilterExistsSimple">
-        <Resource name="sql">
-            <![CDATA[select empno
-from sales.emp
-where exists (select deptno from sales.emp where empno < 20)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[EXISTS({
-LogicalFilter(condition=[<($0, 20)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EXPR$1=[CAST($0):DOUBLE NOT NULL])
+  LogicalSort(sort0=[$0], dir0=[ASC], offset=[1])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{0}])
-        LogicalProject(i=[true])
-          LogicalFilter(condition=[<($0, 20)])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortProjectTranspose3">
+    <Resource name="sql">
+      <![CDATA[select d.deptno from sales.dept d
+order by cast(d.deptno as varchar(10)) offset 1]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalSort(sort0=[$1], dir0=[ASC], offset=[1])
+  LogicalProject(DEPTNO=[$0], EXPR$1=[CAST($0):VARCHAR(10) NOT NULL])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalSort(sort0=[$1], dir0=[ASC], offset=[1])
+  LogicalProject(DEPTNO=[$0], EXPR$1=[CAST($0):VARCHAR(10) NOT NULL])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExpandFilterExistsSimpleAnd">
-        <Resource name="sql">
-            <![CDATA[select empno
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortRemovalAllKeysConstant">
+    <Resource name="sql">
+      <![CDATA[select count(*) as c
 from sales.emp
-where exists (select deptno from sales.emp where empno < 20)
-and emp.sal < 100]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[AND(EXISTS({
-LogicalFilter(condition=[<($0, 20)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}), <($5, 100))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+where deptno = 10
+group by deptno, sal
+order by deptno desc nulls last]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalSort(sort0=[$1], dir0=[DESC-nulls-last])
+  LogicalProject(C=[$2], DEPTNO=[$0])
+    LogicalAggregate(group=[{0, 1}], C=[COUNT()])
+      LogicalProject(DEPTNO=[$7], SAL=[$5])
+        LogicalFilter(condition=[=($7, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[<($5, 100)])
-      LogicalJoin(condition=[true], joinType=[inner])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(C=[$2], DEPTNO=[$0])
+  LogicalAggregate(group=[{0, 1}], C=[COUNT()])
+    LogicalProject(DEPTNO=[$7], SAL=[$5])
+      LogicalFilter(condition=[=($7, 10)])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{0}])
-          LogicalProject(i=[true])
-            LogicalFilter(condition=[<($0, 20)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWhereInCorrelated">
-        <Resource name="sql">
-            <![CDATA[select sal from emp where empno IN (
-  select deptno from dept where emp.job = dept.name)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalFilter(condition=[IN($0, {
-LogicalProject(DEPTNO=[$0])
-  LogicalFilter(condition=[=($cor0.JOB, $1)])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-})], variablesSet=[[$cor0]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortRemovalOneKeyConstant">
+    <Resource name="sql">
+      <![CDATA[select count(*) as c
+from sales.emp
+where deptno = 10
+group by deptno, sal
+order by deptno, sal desc nulls first]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalSort(sort0=[$1], sort1=[$2], dir0=[ASC], dir1=[DESC])
+  LogicalProject(C=[$2], DEPTNO=[$0], SAL=[$1])
+    LogicalAggregate(group=[{0, 1}], C=[COUNT()])
+      LogicalProject(DEPTNO=[$7], SAL=[$5])
+        LogicalFilter(condition=[=($7, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($0, $9)])
-      LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{2}])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(DEPTNO=[$0])
-          LogicalFilter(condition=[=($cor0.JOB, $1)])
-            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalSort(sort0=[$2], dir0=[DESC])
+  LogicalProject(C=[$2], DEPTNO=[$0], SAL=[$1])
+    LogicalAggregate(group=[{0, 1}], C=[COUNT()])
+      LogicalProject(DEPTNO=[$7], SAL=[$5])
+        LogicalFilter(condition=[=($7, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalJoin(condition=[AND(=($2, $10), =($0, $9))], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], NAME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortUnionTranspose">
+    <Resource name="sql">
+      <![CDATA[select a.name from dept a
+union all
+select b.name from dept b
+order by name limit 10]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[ASC], fetch=[10])
+  LogicalProject(NAME=[$0])
+    LogicalUnion(all=[true])
+      LogicalProject(NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalProject(NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWhereInJoinCorrelated">
-        <Resource name="sql">
-            <![CDATA[select empno from emp as e
-join dept as d using (deptno)
-where e.sal in (
-  select e2.sal from emp as e2 where e2.deptno > e.deptno)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[IN($5, {
-LogicalProject(SAL=[$5])
-  LogicalFilter(condition=[>($7, $cor0.DEPTNO)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})], variablesSet=[[$cor0]])
-    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[ASC], fetch=[10])
+  LogicalUnion(all=[true])
+    LogicalSort(sort0=[$0], dir0=[ASC], fetch=[10])
+      LogicalProject(NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalSort(sort0=[$0], dir0=[ASC], fetch=[10])
+      LogicalProject(NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-    LogicalFilter(condition=[=($5, $11)])
-      LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{7}])
-        LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalAggregate(group=[{0}])
-          LogicalProject(SAL=[$5])
-            LogicalFilter(condition=[>($7, $cor0.DEPTNO)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortUnionTranspose2">
+    <Resource name="sql">
+      <![CDATA[select a.name from dept a
+union all
+select b.name from dept b
+order by name]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[ASC])
+  LogicalProject(NAME=[$0])
+    LogicalUnion(all=[true])
+      LogicalProject(NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalProject(NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDistinctNonDistinctAggregates">
-        <Resource name="sql">
-            <![CDATA[select emp.empno, count(*), avg(distinct dept.deptno)
-from sales.emp emp inner join sales.dept dept
-on emp.deptno = dept.deptno
-group by emp.empno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT()], EXPR$2=[AVG(DISTINCT $1)])
-  LogicalProject(EMPNO=[$0], DEPTNO0=[$9])
-    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[ASC])
+  LogicalUnion(all=[true])
+    LogicalSort(sort0=[$0], dir0=[ASC])
+      LogicalProject(NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalSort(sort0=[$0], dir0=[ASC])
+      LogicalProject(NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[$SUM0($2)], EXPR$2=[AVG($1)])
-  LogicalAggregate(group=[{0, 1}], EXPR$1=[COUNT()])
-    LogicalProject(EMPNO=[$0], DEPTNO0=[$9])
-      LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortUnionTranspose3">
+    <Resource name="sql">
+      <![CDATA[select a.name from dept a
+union all
+select b.name from dept b
+order by name limit 0]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[ASC], fetch=[0])
+  LogicalProject(NAME=[$0])
+    LogicalUnion(all=[true])
+      LogicalProject(NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalProject(NAME=[$1])
         LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCastInAggregateExpandDistinctAggregatesRule">
-        <Resource name="sql">
-            <![CDATA[select name, sum(distinct cn), sum(distinct sm)
-from (
-  select name, count(dept.deptno) as cn,sum(dept.deptno) as sm
-  from sales.dept group by name)
-group by name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM(DISTINCT $1)], EXPR$2=[SUM(DISTINCT $2)])
-  LogicalAggregate(group=[{0}], CN=[COUNT()], SM=[SUM($1)])
-    LogicalProject(NAME=[$1], DEPTNO=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[ASC], fetch=[0])
+  LogicalUnion(all=[true])
+    LogicalSort(sort0=[$0], dir0=[ASC], fetch=[0])
+      LogicalProject(NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalSort(sort0=[$0], dir0=[ASC], fetch=[0])
+      LogicalProject(NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSpatialContainsPoint">
+    <Resource name="sql">
+      <![CDATA[select *
+from GEO.Restaurants as r
+where ST_Contains(
+  ST_Buffer(ST_Point(10.0, 20.0), 6),
+  ST_Point(r.longitude, r.latitude))]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
+  LogicalFilter(condition=[ST_CONTAINS(ST_BUFFER(ST_POINT(10.0:DECIMAL(3, 1), 20.0:DECIMAL(3, 1)), 6), ST_POINT($2, $1))])
+    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
+  LogicalFilter(condition=[AND(SEARCH($4, Sarg[[33033..33035], [33050..33053], [33055..33080], [33092..33100], [33112..33156], [33164..33176], [33236..33244], [33252..33254], [36456..36464], [36496..36520]]), ST_CONTAINS(MULTIPOLYGON (((16 20, 15.987153539431617 20.39241877538086, 15.948669168242859 20.78315715332031, 15.884711682419379 21.17054193209677, 15.795554957734407 21.552914270615126, 15.68158077697063 21.92863679181897, 15.543277195067716 22.296100594190538, 15.381236449196127 22.65373214131401, 15.196152422706628 23, 14.98881767381527 23.333421398117615, 14.76012004174741 23.652568574052324, 14.511038844873863 23.956074890600412, 14.242640687119284 24.242640687119284, 13.956074890600412 24.511038844873866, 13.652568574052323 24.760120041747413, 13.333421398117613 24.988817673815273, 13 25.196152422706632, 12.653732141314007 25.38123644919613, 12.296100594190538 25.54327719506772, 11.928636791818969 25.681580776970634, 11.552914270615124 25.79555495773441, 11.17054193209677 25.884711682419383, 10.78315715332031 25.948669168242862, 10.392418775380857 25.98715353943162, 10 26, 9.60758122461914 25.987153539431617, 9.21684284667969 25.94866916824286, 8.82945806790323 25.88471168241938, 8.447085729384876 25.795554957734407, 8.07136320818103 25.68158077697063, 7.703899405809461 25.543277195067716, 7.346267858685993 25.381236449196127, 7 25.19615242270663, 6.666578601882387 24.98881767381527, 6.347431425947676 24.76012004174741, 6.043925109399586 24.511038844873863, 5.757359312880714 24.242640687119284, 5.488961155126135 23.956074890600412, 5.239879958252589 23.652568574052324, 5.011182326184728 23.33342139811761, 4.803847577293368 23, 4.6187635508038705 22.653732141314006, 4.45672280493228 22.296100594190538, 4.318419223029367 21.92863679181897, 4.204445042265591 21.552914270615123, 4.115288317580618 21.170541932096768, 4.051330831757139 20.78315715332031, 4.01284646056838 20.392418775380857, 4 20, 4.012846460568384 19.60758122461914, 4.051330831757142 19.21684284667969, 4.115288317580622 18.82945806790323, 4.204445042265594 18.447085729384874, 4.31841922302937 18.07136320818103, 4.456722804932283 17.703899405809462, 4.618763550803873 17.34626785868599, 4.803847577293371 17, 5.011182326184731 16.666578601882385, 5.239879958252591 16.347431425947676, 5.4889611551261375 16.043925109399588, 5.757359312880716 15.757359312880714, 6.043925109399588 15.488961155126134, 6.347431425947677 15.239879958252589, 6.666578601882387 15.011182326184727, 7.000000000000001 14.803847577293368, 7.346267858685993 14.61876355080387, 7.703899405809462 14.45672280493228, 8.071363208181031 14.318419223029366, 8.447085729384876 14.20444504226559, 8.82945806790323 14.115288317580617, 9.21684284667969 14.051330831757138, 9.607581224619143 14.01284646056838, 10 14, 10.39241877538086 14.012846460568383, 10.78315715332031 14.051330831757141, 11.17054193209677 14.115288317580621, 11.552914270615124 14.204445042265593, 11.92863679181897 14.31841922302937, 12.296100594190538 14.456722804932284, 12.653732141314007 14.618763550803873, 13 14.803847577293372, 13.333421398117613 15.01118232618473, 13.652568574052324 15.23987995825259, 13.956074890600414 15.488961155126137, 14.242640687119286 15.757359312880716, 14.511038844873866 16.043925109399588, 14.760120041747411 16.347431425947676, 14.988817673815273 16.66657860188239, 15.196152422706632 17, 15.38123644919613 17.346267858685994, 15.54327719506772 17.703899405809462, 15.681580776970634 18.07136320818103, 15.79555495773441 18.447085729384877, 15.884711682419383 18.829458067903232, 15.948669168242862 19.21684284667969, 15.98715353943162 19.607581224619143, 16 20))):GEOMETRY, ST_POINT($2, $1)))])
+    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSpatialDWithinLine">
+    <Resource name="sql">
+      <![CDATA[select *
+from GEO.Restaurants as r
+where ST_DWithin(
+  ST_MakeLine(ST_Point(8.0, 20.0), ST_Point(12.0, 20.0)),
+  ST_Point(r.longitude, r.latitude), 4)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
+  LogicalFilter(condition=[ST_DWITHIN(ST_MAKELINE(ST_POINT(8.0:DECIMAL(2, 1), 20.0:DECIMAL(3, 1)), ST_POINT(12.0:DECIMAL(3, 1), 20.0:DECIMAL(3, 1))), ST_POINT($2, $1), 4)])
+    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
+  LogicalFilter(condition=[AND(SEARCH($4, Sarg[[33064..33076], [33092..33100], [33112..33156], [33164..33176], [33236..33240], [36457..36459], [36501..36503], [36505..36507], [36517..36519]]), ST_DWITHIN(MULTILINESTRING ((8 20, 12 20)):GEOMETRY, ST_POINT($2, $1), 4))])
+    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSpatialDWithinReversed">
+    <Resource name="sql">
+      <![CDATA[select *
+from GEO.Restaurants as r
+where ST_DWithin(ST_Point(r.longitude, r.latitude),
+                 ST_Point(10.0, 20.0), 6)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
+  LogicalFilter(condition=[ST_DWITHIN(ST_POINT($2, $1), ST_POINT(10.0:DECIMAL(3, 1), 20.0:DECIMAL(3, 1)), 6)])
+    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$0], EXPR$1=[CAST($1):BIGINT NOT NULL], EXPR$2=[CAST($2):INTEGER NOT NULL])
-  LogicalAggregate(group=[{0}], EXPR$1=[SUM($1) FILTER $3], EXPR$2=[SUM($2) FILTER $4])
-    LogicalProject(NAME=[$0], CN=[$1], SM=[$2], $g_1=[=($3, 1)], $g_2=[=($3, 2)])
-      LogicalAggregate(group=[{0, 1, 2}], groups=[[{0, 1}, {0, 2}]], $g=[GROUPING($0, $1, $2)])
-        LogicalAggregate(group=[{0}], CN=[COUNT()], SM=[SUM($1)])
-          LogicalProject(NAME=[$1], DEPTNO=[$0])
-            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
+  LogicalFilter(condition=[AND(SEARCH($4, Sarg[[33033..33035], [33050..33053], [33055..33080], [33092..33100], [33112..33156], [33164..33176], [33236..33244], [33252..33254], [36456..36464], [36496..36520]]), ST_DWITHIN(ST_POINT($2, $1), POINT (10 20):GEOMETRY, 6))])
+    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceExpressionsNot">
-        <Resource name="sql">
-            <![CDATA[select * from (values (false),(true)) as q (col1) where not(col1)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(COL1=[$0])
-  LogicalFilter(condition=[NOT($0)])
-    LogicalValues(tuples=[[{ false }, { true }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSpatialDWithinToHilbert">
+    <Resource name="sql">
+      <![CDATA[select *
+from GEO.Restaurants as r
+where ST_DWithin(ST_Point(10.0, 20.0),
+                 ST_Point(r.longitude, r.latitude), 10)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
+  LogicalFilter(condition=[ST_DWITHIN(ST_POINT(10.0:DECIMAL(3, 1), 20.0:DECIMAL(3, 1)), ST_POINT($2, $1), 10)])
+    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(COL1=[$0])
-  LogicalFilter(condition=[NOT($0)])
-    LogicalValues(tuples=[[{ false }, { true }]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
+  LogicalFilter(condition=[AND(SEARCH($4, Sarg[[28988..28989], [28991..28994], [29006..29009], [29011..29014], [32426..32429], [32431..32434], [32446..32449], [32451..32454], [32506..32509], [32511..32514], [32526..32527], [32929..32930], [32942..32949], [32951..32953], [32955..32970], [32973..32975], [33009..33011], [33014..33185], [33187..33190], [33205..33207], [33209..33211], [33226..33229], [33231..33265], [33267..33270], [36392..36401], [36403..36404], [36421..36423], [36425..36427], [36442..36445], [36447..36548], [36556..36568]]), ST_DWITHIN(POINT (10 20):GEOMETRY, ST_POINT($2, $1), 10))])
+    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateProjectPullUpConstants">
-        <Resource name="sql">
-            <![CDATA[select job, empno, sal, sum(sal) as s
-from emp where empno = 10
-group by job, empno, sal]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1, 2}], S=[SUM($2)])
-  LogicalProject(JOB=[$2], EMPNO=[$0], SAL=[$5])
-    LogicalFilter(condition=[=($0, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSpatialDWithinToHilbertNegative">
+    <Resource name="sql">
+      <![CDATA[select *
+from GEO.Restaurants as r
+where ST_DWithin(ST_Point(10.0, 20.0),
+                 ST_Point(r.longitude, r.latitude), -2)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
+  LogicalFilter(condition=[ST_DWITHIN(ST_POINT(10.0:DECIMAL(3, 1), 20.0:DECIMAL(3, 1)), ST_POINT($2, $1), -2)])
+    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(JOB=[$0], EMPNO=[10], SAL=[$1], S=[$2])
-  LogicalAggregate(group=[{0, 1}], S=[SUM($1)])
-    LogicalProject(JOB=[$2], SAL=[$5])
-      LogicalFilter(condition=[=($0, 10)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
+  LogicalValues(tuples=[[]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateProjectPullUpConstants2">
-        <Resource name="sql">
-            <![CDATA[select ename, sal
-from (select '1', ename, sal from emp where ename = 'John') subq
-group by ename, sal]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{1, 5}])
-  LogicalFilter(condition=[=($1, 'John')])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSpatialDWithinToHilbertZero">
+    <Resource name="sql">
+      <![CDATA[select *
+from GEO.Restaurants as r
+where ST_DWithin(ST_Point(10.0, 20.0),
+                 ST_Point(r.longitude, r.latitude), 0)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
+  LogicalFilter(condition=[ST_DWITHIN(ST_POINT(10.0:DECIMAL(3, 1), 20.0:DECIMAL(3, 1)), ST_POINT($2, $1), 0)])
+    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(ENAME=['John':VARCHAR(20)], SAL=[$0])
-  LogicalAggregate(group=[{5}])
-    LogicalFilter(condition=[=($1, 'John')])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$0], LATITUDE=[$1], LONGITUDE=[$2], CUISINE=[$3], HILBERT=[$4])
+  LogicalFilter(condition=[AND(=($4, 33139), =(POINT (10 20), ST_POINT($2, $1)))])
+    LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWhereExpressionInCorrelated">
-        <Resource name="sql">
-            <![CDATA[select ename from (
-  select ename, deptno, sal + 1 as salPlus from emp) as e
-where deptno in (
-  select deptno from emp where sal + 1 = e.salPlus)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(ENAME=[$0])
-  LogicalFilter(condition=[IN($1, {
-LogicalProject(DEPTNO=[$7])
-  LogicalFilter(condition=[=(+($5, 1), $cor0.SALPLUS)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})], variablesSet=[[$cor0]])
-    LogicalProject(ENAME=[$1], DEPTNO=[$7], SALPLUS=[+($5, 1)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSpatialReduce">
+    <Resource name="sql">
+      <![CDATA[select
+  ST_Buffer(ST_Point(0.0, 1.0), 2) as b
+from GEO.Restaurants as r]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(B=[ST_BUFFER(ST_POINT(0.0:DECIMAL(2, 1), 1.0:DECIMAL(2, 1)), 2)])
+  LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
-LogicalProject(ENAME=[$0])
-  LogicalProject(ENAME=[$0], DEPTNO=[$1], SALPLUS=[$2])
-    LogicalFilter(condition=[=($1, $3)])
-      LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{2}])
-        LogicalProject(ENAME=[$1], DEPTNO=[$7], SALPLUS=[+($5, 1)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{0}])
-          LogicalProject(DEPTNO=[$7])
-            LogicalFilter(condition=[=(+($5, 1), $cor0.SALPLUS)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(B=[CAST(MULTIPOLYGON (((2 1, 1.9957178464772056 1.1308062584602858, 1.9828897227476194 1.2610523844401027, 1.9615705608064595 1.3901806440322562, 1.9318516525781353 1.517638090205041, 1.8938602589902103 1.6428789306063227, 1.8477590650225726 1.7653668647301788, 1.7937454830653756 1.8845773804380017, 1.7320508075688765 1.9999999999999991, 1.6629392246050898 2.1111404660392035, 1.5867066805824699 2.217522858017441, 1.5036796149579543 2.318691630200137, 1.4142135623730947 2.4142135623730945, 1.3186916302001375 2.5036796149579543, 1.217522858017441 2.58670668058247, 1.1111404660392044 2.66293922460509, 0.9999999999999999 2.7320508075688767, 0.8845773804380025 2.7937454830653765, 0.7653668647301795 2.847759065022573, 0.6428789306063231 2.893860258990211, 0.5176380902050415 2.9318516525781364, 0.3901806440322565 2.961570560806461, 0.26105238444010315 2.982889722747621, 0.13080625846028612 2.995717846477207, 0 3, -0.13080625846028585 2.9957178464772056, -0.2610523844401028 2.982889722747619, -0.3901806440322561 2.9615705608064595, -0.517638090205041 2.9318516525781355, -0.6428789306063226 2.8938602589902103, -0.7653668647301789 2.8477590650225726, -0.8845773804380018 2.7937454830653756, -0.9999999999999992 2.7320508075688767, -1.1111404660392037 2.66293922460509, -1.2175228580174406 2.58670668058247, -1.318691630200137 2.5036796149579543, -1.4142135623730945 2.414213562373095, -1.5036796149579543 2.3186916302001377, -1.5867066805824699 2.217522858017441, -1.66293922460509 2.1111404660392044, -1.732050807568877 2, -1.7937454830653763 1.8845773804380026, -1.8477590650225733 1.7653668647301795, -1.8938602589902112 1.6428789306063232, -1.9318516525781366 1.5176380902050415, -1.9615705608064609 1.3901806440322564, -1.9828897227476208 1.2610523844401031, -1.995717846477207 1.130806258460286, -2 1, -1.9957178464772056 0.8691937415397142, -1.9828897227476194 0.7389476155598972, -1.9615705608064595 0.6098193559677438, -1.9318516525781353 0.48236190979495897, -1.8938602589902103 0.3571210693936774, -1.8477590650225726 0.2346331352698211, -1.7937454830653756 0.11542261956199817, -1.7320508075688765 7.7715611723760960e-16, -1.6629392246050898 -0.11114046603920369, -1.5867066805824699 -0.21752285801744065, -1.5036796149579543 -0.318691630200137, -1.4142135623730947 -0.4142135623730945, -1.3186916302001375 -0.5036796149579543, -1.217522858017441 -0.5867066805824699, -1.1111404660392044 -0.66293922460509, -0.9999999999999999 -0.732050807568877, -0.8845773804380025 -0.7937454830653763, -0.7653668647301795 -0.8477590650225733, -0.6428789306063231 -0.8938602589902112, -0.5176380902050415 -0.9318516525781366, -0.3901806440322565 -0.9615705608064609, -0.26105238444010315 -0.9828897227476208, -0.13080625846028612 -0.995717846477207, 0 -1, 0.13080625846028585 -0.9957178464772056, 0.2610523844401028 -0.9828897227476194, 0.3901806440322561 -0.9615705608064595, 0.517638090205041 -0.9318516525781353, 0.6428789306063226 -0.8938602589902103, 0.7653668647301789 -0.8477590650225726, 0.8845773804380018 -0.7937454830653756, 0.9999999999999992 -0.7320508075688765, 1.1111404660392037 -0.6629392246050898, 1.2175228580174406 -0.5867066805824699, 1.318691630200137 -0.5036796149579543, 1.4142135623730945 -0.4142135623730947, 1.5036796149579543 -0.31869163020013747, 1.5867066805824699 -0.2175228580174411, 1.66293922460509 -0.11114046603920436, 1.732050807568877 1.1102230246251565e-16, 1.7937454830653763 0.11542261956199751, 1.8477590650225733 0.23463313526982055, 1.8938602589902112 0.35712106939367694, 1.9318516525781366 0.4823619097949585, 1.9615705608064609 0.6098193559677435, 1.9828897227476208 0.7389476155598969, 1.995717846477207 0.8691937415397138, 2 1))):GEOMETRY):GEOMETRY])
+  LogicalTableScan(table=[[CATALOG, GEO, RESTAURANTS]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(ENAME=[$0])
-  LogicalJoin(condition=[AND(=($2, $4), =($1, $3))], joinType=[inner])
-    LogicalProject(ENAME=[$1], DEPTNO=[$7], SALPLUS=[+($5, 1)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testStrengthenJoinType">
+    <Resource name="sql">
+      <![CDATA[select *
+from dept left join emp on dept.deptno = emp.deptno
+where emp.deptno is not null and emp.sal > 100]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[$2], ENAME=[$3], JOB=[$4], MGR=[$5], HIREDATE=[$6], SAL=[$7], COMM=[$8], DEPTNO0=[$9], SLACKER=[$10])
+  LogicalFilter(condition=[AND(IS NOT NULL($9), >($7, 100))])
+    LogicalJoin(condition=[=($0, $9)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0, 1}])
-      LogicalProject(DEPTNO=[$7], $f9=[+($5, 1)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWhereExpressionInCorrelated2">
-        <Resource name="sql">
-            <![CDATA[select name from (
-  select name, deptno, deptno - 10 as deptnoMinus from dept) as d
-where deptno in (
-  select deptno from emp where sal + 1 = d.deptnoMinus)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NAME=[$0])
-  LogicalFilter(condition=[IN($1, {
-LogicalProject(DEPTNO=[$7])
-  LogicalFilter(condition=[=(+($5, 1), $cor0.DEPTNOMINUS)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})], variablesSet=[[$cor0]])
-    LogicalProject(NAME=[$1], DEPTNO=[$0], DEPTNOMINUS=[-($0, 10)])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[$2], ENAME=[$3], JOB=[$4], MGR=[$5], HIREDATE=[$6], SAL=[$7], COMM=[$8], DEPTNO0=[$9], SLACKER=[$10])
+  LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[CAST($2):INTEGER], ENAME=[CAST($3):VARCHAR(20)], JOB=[CAST($4):VARCHAR(10)], MGR=[$5], HIREDATE=[CAST($6):TIMESTAMP(0)], SAL=[CAST($7):INTEGER], COMM=[CAST($8):INTEGER], DEPTNO0=[CAST($9):INTEGER], SLACKER=[CAST($10):BOOLEAN])
+    LogicalJoin(condition=[=($0, $9)], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalFilter(condition=[>($5, 100)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
-LogicalProject(NAME=[$0])
-  LogicalProject(NAME=[$0], DEPTNO=[$1], DEPTNOMINUS=[$2])
-    LogicalFilter(condition=[=($1, $3)])
-      LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{2}])
-        LogicalProject(NAME=[$1], DEPTNO=[$0], DEPTNOMINUS=[-($0, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalAggregate(group=[{0}])
-          LogicalProject(DEPTNO=[$7])
-            LogicalFilter(condition=[=(+($5, 1), $cor0.DEPTNOMINUS)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSubQueryWithDynamicStarHang">
+    <Resource name="sql">
+      <![CDATA[select n.n_regionkey from (select * from
+(select * from sales.customer) t) n where n.n_nationkey >1]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(N_REGIONKEY=[ITEM($0, 'N_REGIONKEY')])
+  LogicalFilter(condition=[>(ITEM($0, 'N_NATIONKEY'), 1)])
+    LogicalProject(**=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$0])
-  LogicalJoin(condition=[AND(=($2, $4), =($1, $3))], joinType=[inner])
-    LogicalProject(NAME=[$1], DEPTNO=[$0], DEPTNOMINUS=[-($0, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalAggregate(group=[{0, 1}])
-      LogicalProject(DEPTNO=[$7], $f9=[+($5, 1)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+EnumerableProject(N_REGIONKEY=[ITEM($0, 'N_REGIONKEY')])
+  EnumerableFilter(condition=[>(ITEM($0, 'N_NATIONKEY'), 1)])
+    EnumerableTableScan(table=[[CATALOG, SALES, CUSTOMER]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWhereNotInCorrelated">
-        <Resource name="sql">
-            <![CDATA[select sal from emp
-where empno NOT IN (
-  select deptno from dept
-  where emp.job = dept.name)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalFilter(condition=[NOT(IN($0, {
-LogicalProject(DEPTNO=[$0])
-  LogicalFilter(condition=[=($cor0.JOB, $1)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSwapOuterJoin">
+    <Resource name="sql">
+      <![CDATA[select 1 from sales.dept d left outer join sales.emp e
+ on d.deptno = e.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($0, $9)], joinType=[left])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-}))], variablesSet=[[$cor0]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalFilter(condition=[OR(=($9, 0), IS NOT TRUE(OR(IS NOT NULL($13), <($10, $9))))])
-    LogicalJoin(condition=[AND(=($0, $12), =($2, $14))], joinType=[left])
-      LogicalJoin(condition=[=($2, $11)], joinType=[left])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(c=[$1], ck=[$1], NAME=[$0])
-          LogicalAggregate(group=[{0}], c=[COUNT()])
-            LogicalProject(NAME=[$1])
-              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalProject(DEPTNO=[$0], i=[true], NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalProject(DEPTNO=[$9], NAME=[$10], EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO0=[$7], SLACKER=[$8])
+    LogicalJoin(condition=[=($9, $7)], joinType=[right])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
-LogicalProject(SAL=[$5])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[OR(=($9, 0), IS NOT TRUE(OR(IS NOT NULL($12), <($10, $9))))])
-      LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0, 2}])
-        LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{2}])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-          LogicalProject(c=[$0], ck=[$0])
-            LogicalAggregate(group=[{}], c=[COUNT()])
-              LogicalFilter(condition=[=($cor0.JOB, $1)])
-                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalFilter(condition=[=($cor0.EMPNO, $0)])
-          LogicalProject(DEPTNO=[$0], i=[true])
-            LogicalFilter(condition=[=($cor0.JOB, $1)])
-              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSwapOuterJoinFieldAccess">
+    <Resource name="sql">
+      <![CDATA[select t1.name, e.ename
+from DEPT_NESTED as t1 left outer join sales.emp e
+ on t1.skill.type = e.job]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NAME=[$1], ENAME=[$5])
+  LogicalJoin(condition=[=($2.TYPE, $6)], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWhereOrSubQuery">
-        <Resource name="sql">
-            <![CDATA[select * from emp
-where sal = 4
-or empno NOT IN (select deptno from dept)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[OR(=($5, 4), NOT(IN($0, {
-LogicalProject(DEPTNO=[$0])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-})))])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$10], ENAME=[$1])
+  LogicalJoin(condition=[=($11.TYPE, $2)], joinType=[right])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[OR(=($5, 4), IS NULL($10))])
-      LogicalJoin(condition=[=($0, $9)], joinType=[left])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(DEPTNO=[$0], i=[true])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferenceAggregate">
+    <Resource name="sql">
+      <![CDATA[select 1 from (select deptno, count(*) from sales.emp where deptno > 7
+group by deptno) d inner join sales.emp e on d.deptno = e.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($0, $9)], joinType=[inner])
+    LogicalAggregate(group=[{0}], EXPR$1=[COUNT()])
+      LogicalProject(DEPTNO=[$7])
+        LogicalFilter(condition=[>($7, 7)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[OR(=($5, 4), IS NULL($10))])
-      LogicalJoin(condition=[=($0, $9)], joinType=[left])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(DEPTNO=[$0], i=[true])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($0, $9)], joinType=[inner])
+    LogicalAggregate(group=[{0}], EXPR$1=[COUNT()])
+      LogicalProject(DEPTNO=[$7])
+        LogicalFilter(condition=[>($7, 7)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[>($7, 7)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferenceComplexPredicate">
+    <Resource name="sql">
+      <![CDATA[select 1 from sales.emp d
+inner join sales.emp e on d.deptno = e.deptno
+where d.deptno > 7 and e.sal = e.deptno and d.comm = d.deptno
+and d.comm + d.deptno > d.comm/2]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
+    LogicalFilter(condition=[AND(>($7, 7), =($6, $7), >(+($6, $7), /($6, 2)))])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[=($5, $7)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testFlattenUncorrelatedCallBelowEquals">
-        <Resource name="sql">
-            <![CDATA[select * from sales.emp
-where EXISTS (select * from emp e where emp.deptno = coalesce(e.deptno,30))
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
+    LogicalFilter(condition=[AND(>($7, 7), =($6, $7), >(+($6, $7), /($6, 2)))])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[>($7, 7)])
+      LogicalFilter(condition=[=($5, $7)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[IS NOT NULL($9)])
-    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferenceConjunctInPullUp">
+    <Resource name="sql">
+      <![CDATA[select 1 from sales.emp d
+inner join sales.emp e on d.deptno = e.deptno
+where d.deptno in (7, 9) or d.deptno > 10]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
+    LogicalFilter(condition=[SEARCH($7, Sarg[7, 9, (10..+∞)])])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalFilter(condition=[=($cor0.DEPTNO, +($7, 30))])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[IS NOT NULL($9)])
-    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
+    LogicalFilter(condition=[SEARCH($7, Sarg[7, 9, (10..+∞)])])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[SEARCH($7, Sarg[7, 9, (10..+∞)])])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-            LogicalFilter(condition=[=($cor0.DEPTNO, $9)])
-              LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, 30)])
-                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCallOverCorrelationVariableIsNotFlattened">
-        <Resource name="sql">
-            <![CDATA[select * from emp e1 where exists (
-select * from emp e2 where (e1.deptno+30) = e2.deptno)
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferenceConstantEquiPredicate">
+    <Resource name="sql">
+      <![CDATA[select 1 from sales.emp d
+inner join sales.emp e on d.deptno = e.deptno  where 1 = 1]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[IS NOT NULL($9)])
-    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalFilter(condition=[=(+($cor0.DEPTNO, 30), $7)])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testFlattenUncorrelatedTwoLevelCallBelowEqualsSucceeds">
-        <Resource name="sql">
-            <![CDATA[select * from emp e1 where exists (
-select * from emp e2 where e1.deptno = (2 * e2.deptno+30))
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferenceConstantPredicate">
+    <Resource name="sql">
+      <![CDATA[select 1 from sales.emp d inner join sales.emp e on d.deptno = e.deptno  where 2 > 1]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+ProjectRel(EXPR$0=[1])
+  JoinRel(condition=[=($7, $16)], joinType=[inner])
+    FilterRel(condition=[>(2, 1)])
+      TableAccessRel(table=[[CATALOG, SALES, EMP]])
+    TableAccessRel(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[IS NOT NULL($9)])
-    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+ProjectRel(EXPR$0=[1])
+  JoinRel(condition=[=($7, $16)], joinType=[inner])
+    FilterRel(condition=[>(2, 1)])
+      TableAccessRel(table=[[CATALOG, SALES, EMP]])
+    TableAccessRel(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferenceFullOuterJoin">
+    <Resource name="sql">
+      <![CDATA[select 1 from sales.emp d full outer join sales.emp e
+on d.deptno = e.deptno  where d.deptno > 7 and e.deptno > 9]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalFilter(condition=[AND(>($7, 7), >($16, 9))])
+    LogicalJoin(condition=[=($7, $16)], joinType=[full])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalFilter(condition=[=($cor0.DEPTNO, +(*(2, $7), 30))])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[IS NOT NULL($9)])
-    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalFilter(condition=[AND(>($7, 7), >($16, 9))])
+    LogicalJoin(condition=[=($7, $16)], joinType=[full])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-            LogicalFilter(condition=[=($cor0.DEPTNO, $9)])
-              LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+(*(2, $7), 30)])
-                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUncorrelatedCallBelowNonComparisonOpIsNotFlattened">
-        <Resource name="sql">
-            <![CDATA[select * from emp e1 where exists (
-select * from emp e2 where (e1.deptno + (e2.deptno+30)) > 0)
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferenceJoin">
+    <Resource name="sql">
+      <![CDATA[select 1 from sales.emp d
+inner join sales.emp e on d.deptno = e.deptno where e.deptno > 7]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[>($7, 7)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[IS NOT NULL($9)])
-    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
+    LogicalFilter(condition=[>($7, 7)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[>($7, 7)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalFilter(condition=[>(+($cor0.DEPTNO, +($7, 30)), 0)])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUncorrelatedCallInConjunctionIsFlattenedOnlyIfSiblingOfCorrelation">
-        <Resource name="sql">
-            <![CDATA[select * from emp e1 where exists (
-select * from emp e2 where (e2.empno+50) < 20 and e1.deptno >= (30+e2.deptno))
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferenceJoin3way">
+    <Resource name="sql">
+      <![CDATA[select 1 from sales.emp d
+inner join sales.emp e on d.deptno = e.deptno
+inner join sales.emp f on e.deptno = f.deptno
+where d.deptno > 7]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($16, $25)], joinType=[inner])
+    LogicalJoin(condition=[=($7, $16)], joinType=[inner])
+      LogicalFilter(condition=[>($7, 7)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[IS NOT NULL($9)])
-    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($16, $25)], joinType=[inner])
+    LogicalJoin(condition=[=($7, $16)], joinType=[inner])
+      LogicalFilter(condition=[>($7, 7)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalFilter(condition=[>($7, 7)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[>($7, 7)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalFilter(condition=[AND(<(+($0, 50), 20), >=($cor0.DEPTNO, +(30, $7)))])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferenceJoin3wayAgg">
+    <Resource name="sql">
+      <![CDATA[select 1 from
+(select deptno, count(*) from sales.emp where deptno > 7 group by deptno) d
+inner join sales.emp e on d.deptno = e.deptno
+inner join sales.emp f on e.deptno = f.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($9, $18)], joinType=[inner])
+    LogicalJoin(condition=[=($0, $9)], joinType=[inner])
+      LogicalAggregate(group=[{0}], EXPR$1=[COUNT()])
+        LogicalProject(DEPTNO=[$7])
+          LogicalFilter(condition=[>($7, 7)])
             LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[IS NOT NULL($9)])
-    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($9, $18)], joinType=[inner])
+    LogicalJoin(condition=[=($0, $9)], joinType=[inner])
+      LogicalAggregate(group=[{0}], EXPR$1=[COUNT()])
+        LogicalProject(DEPTNO=[$7])
+          LogicalFilter(condition=[>($7, 7)])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalFilter(condition=[>($7, 7)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[>($7, 7)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-            LogicalFilter(condition=[AND(<(+($0, 50), 20), >=($cor0.DEPTNO, $9))])
-              LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+(30, $7)])
-                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWhereNotInCorrelated2">
-        <Resource name="sql">
-            <![CDATA[select * from emp e1
-  where e1.empno NOT IN
-   (select empno from (select ename, empno, sal as r from emp) e2
-    where r > 2 and e1.ename= e2.ename)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[NOT(IN($0, {
-LogicalProject(EMPNO=[$1])
-  LogicalFilter(condition=[AND(>($2, 2), =($cor0.ENAME, $0))])
-    LogicalProject(ENAME=[$1], EMPNO=[$0], R=[$5])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferenceLeftOuterJoin">
+    <Resource name="sql">
+      <![CDATA[select 1 from sales.emp d
+left outer join sales.emp e on d.deptno = e.deptno
+where d.deptno > 7 and e.deptno > 9]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalFilter(condition=[>($16, 9)])
+    LogicalJoin(condition=[=($7, $16)], joinType=[left])
+      LogicalFilter(condition=[>($7, 7)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalFilter(condition=[>($16, 9)])
+    LogicalJoin(condition=[=($7, $16)], joinType=[left])
+      LogicalFilter(condition=[>($7, 7)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalFilter(condition=[>($7, 7)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferenceNoPullUpExprs">
+    <Resource name="sql">
+      <![CDATA[select 1 from sales.emp d
+inner join sales.emp e on d.deptno = e.deptno
+where d.deptno in (7, 9) or d.comm > 10]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
+    LogicalFilter(condition=[OR(SEARCH($7, Sarg[7, 9]), >($6, 10))])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}))], variablesSet=[[$cor0]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[OR(=($9, 0), IS NOT TRUE(OR(IS NOT NULL($12), <($10, $9))))])
-      LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0, 1}])
-        LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{1}])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-          LogicalProject(c=[$0], ck=[$0])
-            LogicalAggregate(group=[{}], c=[COUNT()])
-              LogicalFilter(condition=[AND(>($2, 2), =($cor0.ENAME, $0))])
-                LogicalProject(ENAME=[$1], EMPNO=[$0], R=[$5])
-                  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalFilter(condition=[=($cor0.EMPNO, $0)])
-          LogicalProject(EMPNO=[$1], i=[true])
-            LogicalFilter(condition=[AND(>($2, 2), =($cor0.ENAME, $0))])
-              LogicalProject(ENAME=[$1], EMPNO=[$0], R=[$5])
-                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
+    LogicalFilter(condition=[OR(SEARCH($7, Sarg[7, 9]), >($6, 10))])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[OR(=($9, 0), IS NOT TRUE(OR(IS NOT NULL($13), <($10, $9))))])
-    LogicalJoin(condition=[AND(=($0, $12), =($1, $14))], joinType=[left])
-      LogicalJoin(condition=[=($1, $11)], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferencePreventProjectPullUp">
+    <Resource name="sql">
+      <![CDATA[select 1 from (select comm as deptno from sales.emp where deptno > 7) d
+inner join sales.emp e on d.deptno = e.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($0, $8)], joinType=[inner])
+    LogicalProject(DEPTNO=[$6])
+      LogicalFilter(condition=[>($7, 7)])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(c=[$1], ck=[$1], ENAME=[$0])
-          LogicalAggregate(group=[{0}], c=[COUNT()])
-            LogicalProject(ENAME=[$0])
-              LogicalFilter(condition=[>($2, 2)])
-                LogicalProject(ENAME=[$1], EMPNO=[$0], R=[$5])
-                  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EMPNO=[$1], i=[true], ENAME=[$0])
-        LogicalFilter(condition=[>($2, 2)])
-          LogicalProject(ENAME=[$1], EMPNO=[$0], R=[$5])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectCorrelateTransposeWithExprCond">
-        <Resource name="sql">
-            <![CDATA[select t1.name, t2.ename
-from DEPT_NESTED as t1,
-unnest(t1.employees) as t2]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NAME=[$1], ENAME=[$5])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{3}])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
-    Uncollect
-      LogicalProject(EMPLOYEES=[$cor0.EMPLOYEES])
-        LogicalValues(tuples=[[{ 0 }]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$0], ENAME=[$2])
-  LogicalCorrelate(correlation=[$cor1], joinType=[inner], requiredColumns=[{1}])
-    LogicalProject(NAME=[$1], EMPLOYEES=[$3])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
-    LogicalProject(ENAME=[$1])
-      Uncollect
-        LogicalProject(EMPLOYEES=[$cor1.EMPLOYEES])
-          LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($0, $8)], joinType=[inner])
+    LogicalProject(DEPTNO=[$6])
+      LogicalFilter(condition=[>($7, 7)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectSetOpTranspose">
-        <Resource name="sql">
-            <![CDATA[select job, sum(sal + 100) over (partition by deptno) from
-(select * from emp e1 union all select * from emp e2)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(JOB=[$2], EXPR$1=[SUM(+($5, 100)) OVER (PARTITION BY $7)])
-  LogicalUnion(all=[true])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferenceProject">
+    <Resource name="sql">
+      <![CDATA[select 1 from (select * from sales.emp where deptno > 7) d
+inner join sales.emp e on d.deptno = e.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
     LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalFilter(condition=[>($7, 7)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($7, $16)], joinType=[inner])
     LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+      LogicalFilter(condition=[>($7, 7)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[>($7, 7)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(JOB=[$0], EXPR$1=[SUM($2) OVER (PARTITION BY $1)])
-  LogicalUnion(all=[true])
-    LogicalProject(JOB=[$2], DEPTNO=[$7], +=[+($5, 100)])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(JOB=[$2], DEPTNO=[$7], +=[+($5, 100)])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferencePullUpThruAlias">
+    <Resource name="sql">
+      <![CDATA[select 1 from (select comm as deptno from sales.emp where comm > 7) d
+inner join sales.emp e on d.deptno = e.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($0, $8)], joinType=[inner])
+    LogicalProject(DEPTNO=[$6])
+      LogicalFilter(condition=[>($6, 7)])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectCorrelateTransposeDynamic">
-        <Resource name="sql">
-            <![CDATA[select t1.c_nationkey, t2.a as fake_col2 from SALES.CUSTOMER as t1, unnest(t1.fake_col) as t2(a)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(C_NATIONKEY=[$1], FAKE_COL2=[$2])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
-    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
-    LogicalProject(A=[$0])
-      Uncollect
-        LogicalProject(FAKE_COL=[$cor0.FAKE_COL])
-          LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($0, $8)], joinType=[inner])
+    LogicalProject(DEPTNO=[$6])
+      LogicalFilter(condition=[>($6, 7)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[>($7, 7)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(C_NATIONKEY=[$1], FAKE_COL2=[$2])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
-    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
-    LogicalProject(A=[$0])
-      Uncollect
-        LogicalProject(FAKE_COL=[$cor0.FAKE_COL])
-          LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferenceRightOuterJoin">
+    <Resource name="sql">
+      <![CDATA[select 1 from sales.emp d
+right outer join sales.emp e on d.deptno = e.deptno
+where d.deptno > 7 and e.deptno > 9]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalFilter(condition=[>($7, 7)])
+    LogicalJoin(condition=[=($7, $16)], joinType=[right])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalFilter(condition=[>($7, 9)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectCorrelateTranspose">
-        <Resource name="sql">
-            <![CDATA[select t1.name, t2.ename
-from DEPT_NESTED as t1,
-unnest(t1.employees) as t2]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(NAME=[$1], ENAME=[$5])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{3}])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
-    Uncollect
-      LogicalProject(EMPLOYEES=[$cor0.EMPLOYEES])
-        LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalFilter(condition=[>($7, 7)])
+    LogicalJoin(condition=[=($7, $16)], joinType=[right])
+      LogicalFilter(condition=[>($7, 9)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalFilter(condition=[>($7, 9)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$0], ENAME=[$2])
-  LogicalCorrelate(correlation=[$cor1], joinType=[inner], requiredColumns=[{1}])
-    LogicalProject(NAME=[$1], EMPLOYEES=[$3])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
-    LogicalProject(ENAME=[$1])
-      Uncollect
-        LogicalProject(EMPLOYEES=[$cor1.EMPLOYEES])
-          LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferenceUnion">
+    <Resource name="sql">
+      <![CDATA[select 1 from
+(select deptno from sales.emp where deptno > 7
+union all select deptno from sales.emp where deptno > 10) d
+inner join sales.emp e on d.deptno = e.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($0, $8)], joinType=[inner])
+    LogicalUnion(all=[true])
+      LogicalProject(DEPTNO=[$7])
+        LogicalFilter(condition=[>($7, 7)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(DEPTNO=[$7])
+        LogicalFilter(condition=[>($7, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectCorrelateTransposeWithOver">
-        <Resource name="sql">
-            <![CDATA[select sum(t1.deptno + 1) over (partition by t1.name),
-count(t2.empno) over ()
-from DEPT_NESTED as t1,
-unnest(t1.employees) as t2]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[SUM(+($0, 1)) OVER (PARTITION BY $1)], EXPR$1=[COUNT($4) OVER ()])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{3}])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
-    Uncollect
-      LogicalProject(EMPLOYEES=[$cor0.EMPLOYEES])
-        LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($0, $8)], joinType=[inner])
+    LogicalUnion(all=[true])
+      LogicalProject(DEPTNO=[$7])
+        LogicalFilter(condition=[>($7, 7)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(DEPTNO=[$7])
+        LogicalFilter(condition=[>($7, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[>($7, 7)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[SUM($2) OVER (PARTITION BY $0)], EXPR$1=[COUNT($3) OVER ()])
-  LogicalCorrelate(correlation=[$cor1], joinType=[inner], requiredColumns=[{1}])
-    LogicalProject(NAME=[$1], EMPLOYEES=[$3], +=[+($0, 1)])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
-    LogicalProject(EMPNO=[$0])
-      Uncollect
-        LogicalProject(EMPLOYEES=[$cor1.EMPLOYEES])
-          LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferenceUnion3way">
+    <Resource name="sql">
+      <![CDATA[select 1 from
+(select deptno from sales.emp where deptno > 7
+union all
+select deptno from sales.emp where deptno > 10
+union all
+select deptno from sales.emp where deptno > 1) d
+inner join sales.emp e on d.deptno = e.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($0, $8)], joinType=[inner])
+    LogicalUnion(all=[true])
+      LogicalUnion(all=[true])
+        LogicalProject(DEPTNO=[$7])
+          LogicalFilter(condition=[>($7, 7)])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(DEPTNO=[$7])
+          LogicalFilter(condition=[>($7, 10)])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(DEPTNO=[$7])
+        LogicalFilter(condition=[>($7, 1)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectCorrelateTransposeRuleLeftCorrelate">
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[IS NOT NULL($9)])
-    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($0, $8)], joinType=[inner])
+    LogicalUnion(all=[true])
+      LogicalUnion(all=[true])
+        LogicalProject(DEPTNO=[$7])
+          LogicalFilter(condition=[>($7, 7)])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(DEPTNO=[$7])
+          LogicalFilter(condition=[>($7, 10)])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(DEPTNO=[$7])
+        LogicalFilter(condition=[>($7, 1)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[>($7, 1)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
-            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[IS NOT NULL($1)])
-    LogicalProject(EMPNO=[$0], $f0=[$2])
-      LogicalCorrelate(correlation=[$cor2], joinType=[left], requiredColumns=[{1}])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferenceUnion3wayOr">
+    <Resource name="sql">
+      <![CDATA[select 1 from
+(select empno, deptno from sales.emp where deptno > 7 or empno < 10
+union all
+select empno, deptno from sales.emp where deptno > 10 or empno < deptno
+union all
+select empno, deptno from sales.emp where deptno > 1) d
+inner join sales.emp e on d.deptno = e.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($1, $9)], joinType=[inner])
+    LogicalUnion(all=[true])
+      LogicalUnion(all=[true])
+        LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+          LogicalFilter(condition=[OR(>($7, 7), <($0, 10))])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
         LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+          LogicalFilter(condition=[OR(>($7, 10), <($0, $7))])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+        LogicalFilter(condition=[>($7, 1)])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject($f0=[$0])
-          LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-            LogicalProject($f0=[true])
-              LogicalFilter(condition=[=($cor2.DEPTNO, $0)])
-                LogicalProject(DEPTNO=[$0])
-                  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[SELECT e1.empno
-FROM emp e1 where exists (select empno, deptno from dept d2 where e1.deptno = d2.deptno)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectCorrelateTransposeRuleSemiCorrelate">
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalCorrelate(correlation=[$cor0], joinType=[semi], requiredColumns=[{0}])
-  LogicalProject(f=[$0])
-    LogicalValues(tuples=[[{ '1', '2' }]])
-  LogicalProject
-    LogicalProject(f3=[$0], $f1=[$cor0.f])
-      LogicalValues(tuples=[[{ '1', '2' }]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectCorrelateTransposeRuleAntiCorrelate">
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalCorrelate(correlation=[$cor0], joinType=[anti], requiredColumns=[{0}])
-  LogicalProject(f=[$0])
-    LogicalValues(tuples=[[{ '1', '2' }]])
-  LogicalProject
-    LogicalProject(f3=[$0], $f1=[$cor0.f])
-      LogicalValues(tuples=[[{ '1', '2' }]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOversimplifiedCaseStatement">
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[AND(>($3, 0), >(CASE(>($3, 0), /($7, $3), null:INTEGER), 1))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[AND(>($3, 0), CASE(>($3, 0), >(/($7, $3), 1), false))])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalJoin(condition=[=($1, $9)], joinType=[inner])
+    LogicalUnion(all=[true])
+      LogicalUnion(all=[true])
+        LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+          LogicalFilter(condition=[OR(>($7, 7), <($0, 10))])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+          LogicalFilter(condition=[OR(>($7, 10), <($0, $7))])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+        LogicalFilter(condition=[>($7, 1)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select * from emp where MGR > 0 and case when MGR > 0 then deptno / MGR else null end > 1]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstantsWindow">
-        <Resource name="sql">
-            <![CDATA[select col1, col2, col3
-from (
-  select empno,
-    sum(100) over (partition by deptno, sal order by sal) as col1,
-    sum(100) over (partition by sal order by deptno) as col2,
-    sum(sal) over (partition by deptno order by sal) as col3
-  from emp where sal = 5000)]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject($0=[$2], $1=[$3], $2=[$4])
-  LogicalWindow(window#0=[window(partition {1} range between UNBOUNDED PRECEDING and CURRENT ROW aggs [SUM($2)])], window#1=[window(order by [1] aggs [SUM($2)])], window#2=[window(partition {1} range between UNBOUNDED PRECEDING and CURRENT ROW aggs [SUM(5000)])])
-    LogicalProject(SAL=[$5], DEPTNO=[$7])
-      LogicalFilter(condition=[=($5, 5000)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTransitiveInferenceUnionAlwaysTrue">
+    <Resource name="sql">
+      <![CDATA[select d.deptno, e.deptno from
+(select deptno from sales.emp where deptno < 4) d
+inner join
+(select deptno from sales.emp where deptno > 7
+union all select deptno from sales.emp) e
+on d.deptno = e.deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], DEPTNO0=[$1])
+  LogicalJoin(condition=[=($0, $1)], joinType=[inner])
+    LogicalProject(DEPTNO=[$7])
+      LogicalFilter(condition=[<($7, 4)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalUnion(all=[true])
+      LogicalProject(DEPTNO=[$7])
+        LogicalFilter(condition=[>($7, 7)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(DEPTNO=[$7])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(COL1=[SUM(100) OVER (PARTITION BY $7, $5 ORDER BY $5)], COL2=[SUM(100) OVER (PARTITION BY $5 ORDER BY $7)], COL3=[SUM($5) OVER (PARTITION BY $7 ORDER BY $5)])
-  LogicalFilter(condition=[=($5, 5000)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExchangeRemoveConstantKeysRule">
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSortExchange(distribution=[hash[0, 1]], collation=[[0, 1]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1])
-    LogicalExchange(distribution=[hash[0]])
-      LogicalFilter(condition=[=($0, 10)])
-        LogicalTableScan(table=[[scott, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalSortExchange(distribution=[hash[1]], collation=[[1]])
-  LogicalProject(EMPNO=[$0], ENAME=[$1])
-    LogicalExchange(distribution=[single])
-      LogicalFilter(condition=[=($0, 10)])
-        LogicalTableScan(table=[[scott, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceAverageWithNoReduceSum">
-        <Resource name="sql">
-            <![CDATA[select name, max(name), avg(deptno), min(name)
-from sales.dept group by name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[MAX($0)], EXPR$2=[AVG($1)], EXPR$3=[MIN($0)])
-  LogicalProject(NAME=[$1], DEPTNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$0], EXPR$1=[$1], EXPR$2=[CAST(/($2, $3)):INTEGER NOT NULL], EXPR$3=[$4])
-  LogicalAggregate(group=[{0}], EXPR$1=[MAX($0)], agg#1=[SUM($1)], agg#2=[COUNT()], EXPR$3=[MIN($0)])
-    LogicalProject(NAME=[$1], DEPTNO=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNoReduceAverage">
-        <Resource name="sql">
-            <![CDATA[select name, max(name), avg(deptno), min(name) from sales.dept group by name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[MAX($0)], EXPR$2=[AVG($1)], EXPR$3=[MIN($0)])
-  LogicalProject(NAME=[$1], DEPTNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], DEPTNO0=[$1])
+  LogicalJoin(condition=[=($0, $1)], joinType=[inner])
+    LogicalProject(DEPTNO=[$7])
+      LogicalFilter(condition=[<($7, 4)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalFilter(condition=[<($0, 4)])
+      LogicalUnion(all=[true])
+        LogicalProject(DEPTNO=[$7])
+          LogicalFilter(condition=[>($7, 7)])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(DEPTNO=[$7])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[MAX($0)], EXPR$2=[AVG($1)], EXPR$3=[MIN($0)])
-  LogicalProject(NAME=[$1], DEPTNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUncorrelatedCallBelowNonComparisonOpIsNotFlattened">
+    <Resource name="sql">
+      <![CDATA[select * from emp e1 where exists (select * from emp e2 where (e1.deptno + (e2.deptno+30)) > 0)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[IS NOT NULL($9)])
+    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalFilter(condition=[>(+($cor0.DEPTNO, +($7, 30)), 0)])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNoReduceSum">
-        <Resource name="sql">
-            <![CDATA[select name, sum(deptno) from sales.dept group by name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
-  LogicalProject(NAME=[$1], DEPTNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUncorrelatedCallInConjunctionIsFlattenedOnlyIfSiblingOfCorrelation">
+    <Resource name="sql">
+      <![CDATA[select * from emp e1 where exists (select * from emp e2 where (e2.empno+50) < 20 and e1.deptno >= (30+e2.deptno))]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[IS NOT NULL($9)])
+    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalFilter(condition=[AND(<(+($0, 50), 20), >=($cor0.DEPTNO, +(30, $7)))])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)])
-  LogicalProject(NAME=[$1], DEPTNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[IS NOT NULL($9)])
+    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+            LogicalFilter(condition=[AND(<(+($0, 50), 20), >=($cor0.DEPTNO, $9))])
+              LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+(30, $7)])
+                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceAverageAndVarWithNoReduceStddev">
-        <Resource name="sql">
-            <![CDATA[select name, stddev_pop(deptno), avg(deptno), var_pop(deptno)
-from sales.dept group by name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[STDDEV_POP($1)], EXPR$2=[AVG($1)], EXPR$3=[VAR_POP($1)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUnionMergeRule">
+    <Resource name="sql">
+      <![CDATA[select * from (
+select * from (
+  select name, deptno from dept
+  union all
+  select name, deptno from
+  (
+    select name, deptno, count(1) from dept group by name, deptno
+    union all
+    select name, deptno, count(1) from dept group by name, deptno
+  ) subq
+) a
+union all
+select name, deptno from dept
+) aa
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalUnion(all=[true])
   LogicalProject(NAME=[$1], DEPTNO=[$0])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$0], EXPR$1=[$1], EXPR$2=[CAST(/($2, $3)):INTEGER NOT NULL], EXPR$3=[CAST(/(-($4, /(*($2, $2), $3)), $3)):INTEGER NOT NULL])
-  LogicalAggregate(group=[{0}], EXPR$1=[STDDEV_POP($1)], agg#1=[SUM($1)], agg#2=[COUNT()], agg#3=[SUM($2)])
-    LogicalProject(NAME=[$0], DEPTNO=[$1], $f2=[*($1, $1)])
-      LogicalProject(NAME=[$1], DEPTNO=[$0])
+  LogicalProject(NAME=[$0], DEPTNO=[$1])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
+      LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+  LogicalProject(NAME=[$0], DEPTNO=[$1])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
+      LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
         LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceAverageAndSumWithNoReduceStddevAndVar">
-        <Resource name="sql">
-            <![CDATA[select name, stddev_pop(deptno), avg(deptno), var_pop(deptno)
-from sales.dept group by name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[STDDEV_POP($1)], EXPR$2=[AVG($1)], EXPR$3=[VAR_POP($1)])
   LogicalProject(NAME=[$1], DEPTNO=[$0])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$0], EXPR$1=[$1], EXPR$2=[CAST(/($2, $3)):INTEGER NOT NULL], EXPR$3=[$4])
-  LogicalAggregate(group=[{0}], EXPR$1=[STDDEV_POP($1)], agg#1=[$SUM0($1)], agg#2=[COUNT()], EXPR$3=[VAR_POP($1)])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NAME=[$0], DEPTNO=[$1])
+  LogicalUnion(all=[true])
+    LogicalProject(NAME=[$0], DEPTNO=[$1])
+      LogicalUnion(all=[true])
+        LogicalProject(NAME=[$1], DEPTNO=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalProject(NAME=[$0], DEPTNO=[$1])
+          LogicalUnion(all=[true])
+            LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
+              LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
+                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+            LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
+              LogicalProject(NAME=[$1], DEPTNO=[$0], $f2=[1])
+                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
     LogicalProject(NAME=[$1], DEPTNO=[$0])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceAllAggregateFunctions">
-        <Resource name="sql">
-            <![CDATA[select name, stddev_pop(deptno), avg(deptno), stddev_samp(deptno), var_pop(deptno), var_samp(deptno)
-from sales.dept group by name]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[STDDEV_POP($1)], EXPR$2=[AVG($1)], EXPR$3=[STDDEV_SAMP($1)], EXPR$4=[VAR_POP($1)], EXPR$5=[VAR_SAMP($1)])
-  LogicalProject(NAME=[$1], DEPTNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(NAME=[$0], EXPR$1=[CAST(POWER(/(-($1, /(*($2, $2), $3)), $3), 0.5:DECIMAL(2, 1))):INTEGER NOT NULL], EXPR$2=[CAST(/($2, $3)):INTEGER NOT NULL], EXPR$3=[CAST(POWER(/(-($1, /(*($2, $2), $3)), CASE(=($3, 1), null:BIGINT, -($3, 1))), 0.5:DECIMAL(2, 1))):INTEGER NOT NULL], EXPR$4=[CAST(/(-($1, /(*($2, $2), $3)), $3)):INTEGER NOT NULL], EXPR$5=[CAST(/(-($1, /(*($2, $2), $3)), CASE(=($3, 1), null:BIGINT, -($3, 1)))):INTEGER NOT NULL])
-  LogicalAggregate(group=[{0}], agg#0=[$SUM0($2)], agg#1=[$SUM0($1)], agg#2=[COUNT()])
-    LogicalProject(NAME=[$0], DEPTNO=[$1], $f2=[*($1, $1)])
-      LogicalProject(NAME=[$1], DEPTNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushProjectWithIsNotDistinctFromPastJoin">
-        <Resource name="sql">
-            <![CDATA[select e.sal + b.comm from emp e inner join bonus b
-on (e.ename || e.job) IS NOT DISTINCT FROM (b.ename || b.job) and e.deptno = 10]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($5, $13)])
-  LogicalJoin(condition=[AND(IS NOT DISTINCT FROM($9, $14), =($7, 10))], joinType=[inner])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[||($1, $2)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], $f4=[||($0, $1)])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($0, $3)])
-  LogicalJoin(condition=[AND(IS NOT DISTINCT FROM($1, $4), $2)], joinType=[inner])
-    LogicalProject(SAL=[$5], $f9=[$9], ==[=($7, 10)])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[||($1, $2)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(COMM=[$3], $f4=[$4])
-      LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], $f4=[||($0, $1)])
-        LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDynamicStarWithUnion">
-        <Resource name="sql">
-            <![CDATA[(select n_nationkey from SALES.CUSTOMER) union all (select n_name from CUSTOMER_MODIFIABLEVIEW)]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalProject(N_NATIONKEY=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
-  LogicalProject(N_NAME=[$1])
-    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-EnumerableUnion(all=[true])
-  EnumerableProject(N_NATIONKEY=[$0])
-    EnumerableTableScan(table=[[CATALOG, SALES, CUSTOMER]])
-  EnumerableProject(N_NAME=[$1])
-    EnumerableTableScan(table=[[CATALOG, SALES, CUSTOMER]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testFilterAndProjectWithMultiJoin">
-        <Resource name="sql">
-            <![CDATA[select * from emp e1 left outer join dept d on e1.deptno = d.deptno where d.deptno > 3]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-MyProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  MyFilter(condition=[>($9, 3)])
-    LogicalJoin(condition=[=($7, $9)], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUnionToDistinctRule">
+    <Resource name="sql">
+      <![CDATA[select * from dept union select * from dept]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}])
+  LogicalUnion(all=[true])
+    LogicalProject(DEPTNO=[$0], NAME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(DEPTNO=[$0], NAME=[$1])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-MultiJoin(joinFilter=[true], isFullOuterJoin=[false], joinTypes=[[INNER, LEFT]], outerJoinConditions=[[NULL, =($7, $9)]], projFields=[[{0, 1, 2, 3, 4, 5, 6, 7, 8}, {0, 1}]], postJoinFilter=[>($9, 3)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalUnion(all=[false])
+  LogicalProject(DEPTNO=[$0], NAME=[$1])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+  LogicalProject(DEPTNO=[$0], NAME=[$1])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWhereAnyCorrelatedInSelect">
-        <Resource name="sql">
-            <![CDATA[select * from emp where empno > ANY (
+    </Resource>
+  </TestCase>
+  <TestCase name="testWhereAnyCorrelatedInSelect">
+    <Resource name="sql">
+      <![CDATA[select * from emp where empno > ANY (
   select deptno from dept where emp.job = dept.name)
 ]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
   LogicalFilter(condition=[> SOME($0, {
 LogicalProject(DEPTNO=[$0])
@@ -13032,9 +12962,9 @@ LogicalProject(DEPTNO=[$0])
 })], variablesSet=[[$cor0]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planMid">
-            <![CDATA[
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
   LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
     LogicalFilter(condition=[OR(AND(IS TRUE(>($0, $9)), IS NOT TRUE(OR(IS NULL($12), =($10, 0)))), AND(IS TRUE(>($10, $11)), null, IS NOT TRUE(OR(IS NULL($12), =($10, 0))), IS NOT TRUE(>($0, $9))), AND(>($0, $9), IS NOT TRUE(OR(IS NULL($12), =($10, 0))), IS NOT TRUE(>($0, $9)), IS NOT TRUE(>($10, $11))))])
@@ -13046,9 +12976,9 @@ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$
               LogicalFilter(condition=[=($cor0.JOB, $1)])
                 LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
   LogicalFilter(condition=[OR(AND(>($0, $9), IS NOT TRUE(OR(IS NULL($12), =($10, 0)))), AND(>($0, $9), IS NOT TRUE(OR(IS NULL($12), =($10, 0))), IS NOT TRUE(>($0, $9)), IS NOT TRUE(>($10, $11))))])
     LogicalJoin(condition=[=($2, $13)], joinType=[left])
@@ -13058,353 +12988,413 @@ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$
           LogicalProject(NAME=[$1], DEPTNO=[$0])
             LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushFilterWithIsNotDistinctFromPastJoin">
-        <Resource name="sql">
-            <![CDATA[SELECT * FROM emp t1 INNER JOIN emp t2 ON t1.deptno = t2.deptno WHERE t1.ename is not distinct from t2.ename]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EMPNO0=[$9], ENAME0=[$10], JOB0=[$11], MGR0=[$12], HIREDATE0=[$13], SAL0=[$14], COMM0=[$15], DEPTNO0=[$16], SLACKER0=[$17])
-  LogicalFilter(condition=[OR(AND(IS NULL($1), IS NULL($10)), IS TRUE(=($1, $10)))])
-    LogicalJoin(condition=[=($7, $16)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EMPNO0=[$9], ENAME0=[$10], JOB0=[$11], MGR0=[$12], HIREDATE0=[$13], SAL0=[$14], COMM0=[$15], DEPTNO0=[$16], SLACKER0=[$17])
-  LogicalJoin(condition=[AND(=($7, $16), IS NOT DISTINCT FROM($1, $10))], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWhereExpressionInCorrelated">
+    <Resource name="sql">
+      <![CDATA[select ename from (
+  select ename, deptno, sal + 1 as salPlus from emp) as e
+where deptno in (
+  select deptno from emp where sal + 1 = e.salPlus)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(ENAME=[$0])
+  LogicalFilter(condition=[IN($1, {
+LogicalProject(DEPTNO=[$7])
+  LogicalFilter(condition=[=(+($5, 1), $cor0.SALPLUS)])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+})], variablesSet=[[$cor0]])
+    LogicalProject(ENAME=[$1], DEPTNO=[$7], SALPLUS=[+($5, 1)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinToMultiJoinDoesNotMatchSemiJoin">
-        <Resource name="sql">
-            <![CDATA[select * from
-(select * from emp join dept ON emp.deptno = emp.deptno) t
-where emp.job in (select job from bonus))]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalJoin(condition=[=($2, $12)], joinType=[semi])
-  MultiJoin(joinFilter=[=($7, $8)], isFullOuterJoin=[false], joinTypes=[[INNER, INNER]], outerJoinConditions=[[NULL, NULL]], projFields=[[ALL, ALL]])
-    LogicalTableScan(table=[[scott, EMP]])
-    LogicalTableScan(table=[[scott, DEPT]])
-  LogicalTableScan(table=[[scott, BONUS]])
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
+LogicalProject(ENAME=[$0])
+  LogicalProject(ENAME=[$0], DEPTNO=[$1], SALPLUS=[$2])
+    LogicalFilter(condition=[=($1, $3)])
+      LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{2}])
+        LogicalProject(ENAME=[$1], DEPTNO=[$7], SALPLUS=[+($5, 1)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalAggregate(group=[{0}])
+          LogicalProject(DEPTNO=[$7])
+            LogicalFilter(condition=[=(+($5, 1), $cor0.SALPLUS)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinToMultiJoinDoesNotMatchAntiJoin">
-        <Resource name="sql">
-            <![CDATA[select * from
-(select * from emp join dept ON emp.deptno = emp.deptno) t
-where not exists (select job from bonus where emp.job = bonus.job)]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalJoin(condition=[=($2, $12)], joinType=[anti])
-  MultiJoin(joinFilter=[=($7, $8)], isFullOuterJoin=[false], joinTypes=[[INNER, INNER]], outerJoinConditions=[[NULL, NULL]], projFields=[[ALL, ALL]])
-    LogicalTableScan(table=[[scott, EMP]])
-    LogicalTableScan(table=[[scott, DEPT]])
-  LogicalTableScan(table=[[scott, BONUS]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(ENAME=[$0])
+  LogicalJoin(condition=[AND(=($2, $4), =($1, $3))], joinType=[inner])
+    LogicalProject(ENAME=[$1], DEPTNO=[$7], SALPLUS=[+($5, 1)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0, 1}])
+      LogicalProject(DEPTNO=[$7], $f9=[+($5, 1)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDecorrelationWithSort">
-        <Resource name="sql">
-            <![CDATA[SELECT e1.empno
-FROM emp e1, dept d1 where e1.deptno = d1.deptno
-and e1.deptno < 10 and d1.deptno < 15
-and e1.sal > (select avg(sal) from emp e2 where e1.empno = e2.empno)
-order by e1.empno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[ASC])
-  LogicalProject(EMPNO=[$0])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], EMPNO0=[CAST($11):INTEGER], EXPR$0=[CAST($12):INTEGER])
-      LogicalJoin(condition=[AND(=($0, $11), >($5, $12))], joinType=[inner])
-        LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-          LogicalFilter(condition=[<($7, 10)])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-          LogicalFilter(condition=[<($0, 15)])
-            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalAggregate(group=[{0}], EXPR$0=[AVG($1)])
-          LogicalProject(EMPNO=[$0], SAL=[$5])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWhereExpressionInCorrelated2">
+    <Resource name="sql">
+      <![CDATA[select name from (
+  select name, deptno, deptno - 10 as deptnoMinus from dept) as d
+where deptno in (
+  select deptno from emp where sal + 1 = d.deptnoMinus)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(NAME=[$0])
+  LogicalFilter(condition=[IN($1, {
+LogicalProject(DEPTNO=[$7])
+  LogicalFilter(condition=[=(+($5, 1), $cor0.DEPTNOMINUS)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+})], variablesSet=[[$cor0]])
+    LogicalProject(NAME=[$1], DEPTNO=[$0], DEPTNOMINUS=[-($0, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[ASC])
-  LogicalProject(EMPNO=[$0])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], EMPNO0=[CAST($11):INTEGER], EXPR$0=[CAST($12):INTEGER])
-      LogicalJoin(condition=[AND(=($0, $11), >($5, $12))], joinType=[inner])
-        LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-          LogicalFilter(condition=[<($7, 10)])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-          LogicalFilter(condition=[<($0, 15)])
-            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalAggregate(group=[{0}], EXPR$0=[AVG($1)])
-          LogicalProject(EMPNO=[$0], SAL=[$5])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
+LogicalProject(NAME=[$0])
+  LogicalProject(NAME=[$0], DEPTNO=[$1], DEPTNOMINUS=[$2])
+    LogicalFilter(condition=[=($1, $3)])
+      LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{2}])
+        LogicalProject(NAME=[$1], DEPTNO=[$0], DEPTNOMINUS=[-($0, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalAggregate(group=[{0}])
+          LogicalProject(DEPTNO=[$7])
+            LogicalFilter(condition=[=(+($5, 1), $cor0.DEPTNOMINUS)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceDecimal">
-        <Resource name="sql">
-            <![CDATA[select ename from emp where sal > cast (100.0 as decimal(4, 1))]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  LogicalFilter(condition=[>($5, 100.0:DECIMAL(4, 1))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(NAME=[$0])
+  LogicalJoin(condition=[AND(=($2, $4), =($1, $3))], joinType=[inner])
+    LogicalProject(NAME=[$1], DEPTNO=[$0], DEPTNOMINUS=[-($0, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalAggregate(group=[{0, 1}])
+      LogicalProject(DEPTNO=[$7], $f9=[+($5, 1)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  LogicalCalc(expr#0..8=[{inputs}], expr#9=[10:BIGINT], expr#10=[*($t5, $t9)], expr#11=[100.0:DECIMAL(4, 1)], expr#12=[Reinterpret($t11)], expr#13=[>($t10, $t12)], proj#0..8=[{exprs}], $condition=[$t13])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWhereInCorrelated">
+    <Resource name="sql">
+      <![CDATA[select sal from emp where empno IN (
+  select deptno from dept where emp.job = dept.name)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalFilter(condition=[IN($0, {
+LogicalProject(DEPTNO=[$0])
+  LogicalFilter(condition=[=($cor0.JOB, $1)])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+})], variablesSet=[[$cor0]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testEnumerableCalcRule">
-        <Resource name="sql">
-            <![CDATA[select ename from emp where sal > 10.0]]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(FNAME=[$1], LNAME=[$2])
-  LogicalFilter(condition=[>($0, 10)])
-    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-EnumerableProject(FNAME=[$1], LNAME=[$2])
-  EnumerableCalc(expr#0..2=[{inputs}], expr#3=[10], expr#4=[>($t0, $t3)], proj#0..2=[{exprs}], $condition=[$t4])
-    EnumerableTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($0, $9)])
+      LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{2}])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(DEPTNO=[$0])
+          LogicalFilter(condition=[=($cor0.JOB, $1)])
+            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMaxReuseDistinctAttrWithMixedOptionality">
-        <Resource name="sql">
-            <![CDATA[select sum(distinct deptno), count(distinct deptno), max(deptno) from emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM(DISTINCT $0)], EXPR$1=[COUNT(DISTINCT $0)], EXPR$2=[MAX($0)])
-  LogicalProject(DEPTNO=[$7])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalJoin(condition=[AND(=($2, $10), =($0, $9))], joinType=[inner])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$0], NAME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)], EXPR$1=[COUNT($0)], EXPR$2=[MAX($0)])
-  LogicalAggregate(group=[{0}])
-    LogicalProject(DEPTNO=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMinReuseDistinctAttrWithMixedOptionality">
-        <Resource name="sql">
-            <![CDATA[select sum(distinct deptno), count(distinct deptno), min(deptno) from emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM(DISTINCT $0)], EXPR$1=[COUNT(DISTINCT $0)], EXPR$2=[MIN($0)])
-  LogicalProject(DEPTNO=[$7])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWhereInJoinCorrelated">
+    <Resource name="sql">
+      <![CDATA[select empno from emp as e
+join dept as d using (deptno)
+where e.sal in (
+  select e2.sal from emp as e2 where e2.deptno > e.deptno)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[IN($5, {
+LogicalProject(SAL=[$5])
+  LogicalFilter(condition=[>($7, $cor0.DEPTNO)])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)], EXPR$1=[COUNT($0)], EXPR$2=[MIN($0)])
-  LogicalAggregate(group=[{0}])
-    LogicalProject(DEPTNO=[$7])
+})], variablesSet=[[$cor0]])
+    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testBitAndReuseDistinctAttrWithMixedOptionality">
-        <Resource name="sql">
-            <![CDATA[select sum(distinct deptno), count(distinct deptno), bit_and(deptno) from emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM(DISTINCT $0)], EXPR$1=[COUNT(DISTINCT $0)], EXPR$2=[BIT_AND($0)])
-  LogicalProject(DEPTNO=[$7])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+    LogicalFilter(condition=[=($5, $11)])
+      LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{7}])
+        LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalAggregate(group=[{0}])
+          LogicalProject(SAL=[$5])
+            LogicalFilter(condition=[>($7, $cor0.DEPTNO)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testWhereNotInCorrelated">
+    <Resource name="sql">
+      <![CDATA[select sal from emp
+where empno NOT IN (
+  select deptno from dept
+  where emp.job = dept.name)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalFilter(condition=[NOT(IN($0, {
+LogicalProject(DEPTNO=[$0])
+  LogicalFilter(condition=[=($cor0.JOB, $1)])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+}))], variablesSet=[[$cor0]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)], EXPR$1=[COUNT($0)], EXPR$2=[BIT_AND($0)])
-  LogicalAggregate(group=[{0}])
-    LogicalProject(DEPTNO=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalFilter(condition=[OR(=($9, 0), IS NOT TRUE(OR(IS NOT NULL($13), <($10, $9))))])
+    LogicalJoin(condition=[AND(=($0, $12), =($2, $14))], joinType=[left])
+      LogicalJoin(condition=[=($2, $11)], joinType=[left])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(c=[$1], ck=[$1], NAME=[$0])
+          LogicalAggregate(group=[{0}], c=[COUNT()])
+            LogicalProject(NAME=[$1])
+              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalProject(DEPTNO=[$0], i=[true], NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testBitOrReuseDistinctAttrWithMixedOptionality">
-        <Resource name="sql">
-            <![CDATA[select sum(distinct deptno), count(distinct deptno), bit_or(deptno) from emp]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM(DISTINCT $0)], EXPR$1=[COUNT(DISTINCT $0)], EXPR$2=[BIT_OR($0)])
-  LogicalProject(DEPTNO=[$7])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
+LogicalProject(SAL=[$5])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[OR(=($9, 0), IS NOT TRUE(OR(IS NOT NULL($12), <($10, $9))))])
+      LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0, 2}])
+        LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{2}])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+          LogicalProject(c=[$0], ck=[$0])
+            LogicalAggregate(group=[{}], c=[COUNT()])
+              LogicalFilter(condition=[=($cor0.JOB, $1)])
+                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalFilter(condition=[=($cor0.EMPNO, $0)])
+          LogicalProject(DEPTNO=[$0], i=[true])
+            LogicalFilter(condition=[=($cor0.JOB, $1)])
+              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)], EXPR$1=[COUNT($0)], EXPR$2=[BIT_OR($0)])
-  LogicalAggregate(group=[{0}])
-    LogicalProject(DEPTNO=[$7])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWhereNotInCorrelated2">
+    <Resource name="sql">
+      <![CDATA[select * from emp e1
+  where e1.empno NOT IN
+   (select empno from (select ename, empno, sal as r from emp) e2
+    where r > 2 and e1.ename= e2.ename)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[NOT(IN($0, {
+LogicalProject(EMPNO=[$1])
+  LogicalFilter(condition=[AND(>($2, 2), =($cor0.ENAME, $0))])
+    LogicalProject(ENAME=[$1], EMPNO=[$0], R=[$5])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}))], variablesSet=[[$cor0]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectJoinTransposeItem">
-        <Resource name="sql">
-            <![CDATA[select t1.c_nationkey[0], t2.c_nationkey[0]
-from sales.customer as t1
-left outer join sales.customer as t2
-on t1.c_nationkey[0] = t2.c_nationkey[0]]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(EXPR$0=[ITEM($0, 0)], EXPR$1=[ITEM($2, 0)])
-  LogicalJoin(condition=[=($1, $3)], joinType=[left])
-    LogicalProject(C_NATIONKEY=[$0], $f1=[ITEM($0, 0)])
-      LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
-    LogicalProject(C_NATIONKEY=[$0], $f1=[ITEM($0, 0)])
-      LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[OR(=($9, 0), IS NOT TRUE(OR(IS NOT NULL($12), <($10, $9))))])
+      LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0, 1}])
+        LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{1}])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+          LogicalProject(c=[$0], ck=[$0])
+            LogicalAggregate(group=[{}], c=[COUNT()])
+              LogicalFilter(condition=[AND(>($2, 2), =($cor0.ENAME, $0))])
+                LogicalProject(ENAME=[$1], EMPNO=[$0], R=[$5])
+                  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalFilter(condition=[=($cor0.EMPNO, $0)])
+          LogicalProject(EMPNO=[$1], i=[true])
+            LogicalFilter(condition=[AND(>($2, 2), =($cor0.ENAME, $0))])
+              LogicalProject(ENAME=[$1], EMPNO=[$0], R=[$5])
+                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1], EXPR$1=[$3])
-  LogicalJoin(condition=[=($0, $2)], joinType=[left])
-    LogicalProject($f1=[$1], ITEM=[ITEM($0, 0)])
-      LogicalProject(C_NATIONKEY=[$0], $f1=[ITEM($0, 0)])
-        LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
-    LogicalProject($f1=[$1], ITEM=[ITEM($0, 0)])
-      LogicalProject(C_NATIONKEY=[$0], $f1=[ITEM($0, 0)])
-        LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[OR(=($9, 0), IS NOT TRUE(OR(IS NOT NULL($13), <($10, $9))))])
+    LogicalJoin(condition=[AND(=($0, $12), =($1, $14))], joinType=[left])
+      LogicalJoin(condition=[=($1, $11)], joinType=[left])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(c=[$1], ck=[$1], ENAME=[$0])
+          LogicalAggregate(group=[{0}], c=[COUNT()])
+            LogicalProject(ENAME=[$0])
+              LogicalFilter(condition=[>($2, 2)])
+                LogicalProject(ENAME=[$1], EMPNO=[$0], R=[$5])
+                  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EMPNO=[$1], i=[true], ENAME=[$0])
+        LogicalFilter(condition=[>($2, 2)])
+          LogicalProject(ENAME=[$1], EMPNO=[$0], R=[$5])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectJoinTransposeRuleOnAggWithNoFieldsWithTrimmer">
-        <Resource name="planBeforeTrimming">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testWhereOrSubQuery">
+    <Resource name="sql">
+      <![CDATA[select * from emp
+where sal = 4
+or empno NOT IN (select deptno from dept)]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[OR(=($5, 4), NOT(IN($0, {
 LogicalProject(DEPTNO=[$0])
-  LogicalJoin(condition=[true], joinType=[inner])
-    LogicalTableScan(table=[[scott, DEPT]])
-    LogicalAggregate(group=[{}], DUMMY_COUNT=[COUNT()])
-      LogicalTableScan(table=[[scott, EMP]])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+})))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfterTrimming">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0])
-  LogicalJoin(condition=[true], joinType=[inner])
-    LogicalProject(DEPTNO=[$0])
-      LogicalTableScan(table=[[scott, DEPT]])
-    LogicalAggregate(group=[{}], DUMMY=[COUNT()])
-      LogicalProject(EMPNO=[$0])
-        LogicalTableScan(table=[[scott, EMP]])
+    </Resource>
+    <Resource name="planMid">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[OR(=($5, 4), IS NULL($10))])
+      LogicalJoin(condition=[=($0, $9)], joinType=[left])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(DEPTNO=[$0], i=[true])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="finalPlan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0])
-  LogicalJoin(condition=[true], joinType=[inner])
-    LogicalProject(DEPTNO=[$0])
-      LogicalTableScan(table=[[scott, DEPT]])
-    LogicalAggregate(group=[{}], DUMMY=[COUNT()])
-      LogicalProject(EMPNO=[$0])
-        LogicalTableScan(table=[[scott, EMP]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[OR(=($5, 4), IS NULL($10))])
+      LogicalJoin(condition=[=($0, $9)], joinType=[left])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(DEPTNO=[$0], i=[true])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSimplifyItemIsNotNull">
-        <Resource name="sql">
-            <![CDATA[select *
-from sales.customer as t1
-where t1.c_nationkey[0] is not null]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(**=[$1])
-  LogicalFilter(condition=[IS NOT NULL(ITEM($0, 0))])
-    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWindowFunctionOnAggregations">
+    <Resource name="sql">
+      <![CDATA[SELECT
+  min(empno),
+  sum(sal),
+  sum(sum(sal))
+    over (partition by min(empno) order by sum(sal))
+from emp
+group by deptno]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$2], EXPR$2=[SUM($2) OVER (PARTITION BY $1 ORDER BY $2)])
+  LogicalAggregate(group=[{0}], EXPR$0=[MIN($1)], EXPR$1=[SUM($2)])
+    LogicalProject(DEPTNO=[$7], EMPNO=[$0], SAL=[$5])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSimplifyItemIsNull">
-        <Resource name="sql">
-            <![CDATA[select * from sales.customer as t1 where t1.c_nationkey[0] is null]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalProject(**=[$1])
-  LogicalFilter(condition=[IS NULL(ITEM($0, 0))])
-    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1], EXPR$1=[$2], $2=[$3])
+  LogicalWindow(window#0=[window(partition {1} order by [2] aggs [SUM($2)])])
+    LogicalAggregate(group=[{0}], EXPR$0=[MIN($1)], EXPR$1=[SUM($2)])
+      LogicalProject(DEPTNO=[$7], EMPNO=[$0], SAL=[$5])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testWindowInParenthesis">
+    <Resource name="sql">
+      <![CDATA[select count(*) over (w), count(*) over w
+from emp
+window w as (partition by empno order by empno)]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+LogicalProject(EXPR$0=[$9], EXPR$1=[$9])
+  LogicalWindow(window#0=[window(partition {0} order by [0] aggs [COUNT()])])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(EXPR$0=[COUNT() OVER (PARTITION BY $0 ORDER BY $0)], EXPR$1=[COUNT() OVER (PARTITION BY $0 ORDER BY $0)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWithinDistinctNoThrow">
-        <Resource name="sql">
-            <![CDATA[SELECT deptno, SUM(sal), SUM(sal) WITHIN DISTINCT (job)
+    </Resource>
+  </TestCase>
+  <TestCase name="testWithinDistinct">
+    <Resource name="sql">
+      <![CDATA[SELECT deptno, SUM(sal), SUM(sal) WITHIN DISTINCT (job)
 FROM emp
 GROUP BY deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[SUM($1) WITHIN DISTINCT ($2)])
   LogicalProject(DEPTNO=[$7], SAL=[$5], JOB=[$2])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(DEPTNO=[$0], $f1=[CAST($1):INTEGER NOT NULL], $f2=[$2])
   LogicalAggregate(group=[{0}], agg#0=[MIN($1) FILTER $3], agg#1=[$SUM0($2) FILTER $4])
-    LogicalProject(DEPTNO=[$0], $f2=[$2], $f3=[$3], $f5=[=($4, 1)], $f6=[=($4, 0)])
-      LogicalAggregate(group=[{0, 2}], groups=[[{0, 2}, {0}]], agg#0=[$SUM0($1)], agg#1=[MIN($1)], agg#2=[GROUPING($0, $2)])
+    LogicalProject(DEPTNO=[$0], $f2=[$2], $f3=[$3], $f6=[=($5, 1)], $f7=[AND(=($5, 0), $THROW_UNLESS(OR(<>($5, 0), =($3, $4)), 'more than one distinct value in agg UNIQUE_VALUE'))])
+      LogicalAggregate(group=[{0, 2}], groups=[[{0, 2}, {0}]], agg#0=[$SUM0($1)], agg#1=[MIN($1)], agg#2=[MAX($1)], agg#3=[GROUPING($0, $2)])
         LogicalProject(DEPTNO=[$7], SAL=[$5], JOB=[$2])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWithinDistinctCountDistinct">
-        <Resource name="sql">
-            <![CDATA[SELECT deptno,
+    </Resource>
+  </TestCase>
+  <TestCase name="testWithinDistinctCountDistinct">
+    <Resource name="sql">
+      <![CDATA[SELECT deptno,
   SUM(sal) WITHIN DISTINCT (job) AS ss_j,
   COUNT(DISTINCT job) cdj,
   COUNT(job) WITHIN DISTINCT (job) AS cj_j,
   COUNT(DISTINCT job) WITHIN DISTINCT (job) AS cdj_j
 FROM emp
 GROUP BY deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalAggregate(group=[{0}], SS_J=[SUM($1) WITHIN DISTINCT ($2)], CDJ=[COUNT(DISTINCT $2)], CJ_J=[COUNT() WITHIN DISTINCT ($2)], CDJ_J=[COUNT(DISTINCT $2) WITHIN DISTINCT ($2)])
   LogicalProject(DEPTNO=[$7], SAL=[$5], JOB=[$2])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(DEPTNO=[$0], $f1=[$1], $f2=[$2], $f20=[$2], $f21=[$2])
   LogicalAggregate(group=[{0}], agg#0=[$SUM0($1) FILTER $2], agg#1=[COUNT() FILTER $2])
     LogicalProject(DEPTNO=[$0], $f2=[$2], $f4=[=($3, 0)])
@@ -13412,30 +13402,30 @@ LogicalProject(DEPTNO=[$0], $f1=[$1], $f2=[$2], $f20=[$2], $f21=[$2])
         LogicalProject(DEPTNO=[$7], SAL=[$5], JOB=[$2])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWithinDistinct">
-        <Resource name="sql">
-            <![CDATA[SELECT deptno, SUM(sal), SUM(sal) WITHIN DISTINCT (job)
+    </Resource>
+  </TestCase>
+  <TestCase name="testWithinDistinctNoThrow">
+    <Resource name="sql">
+      <![CDATA[SELECT deptno, SUM(sal), SUM(sal) WITHIN DISTINCT (job)
 FROM emp
 GROUP BY deptno]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
 LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[SUM($1) WITHIN DISTINCT ($2)])
   LogicalProject(DEPTNO=[$7], SAL=[$5], JOB=[$2])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 LogicalProject(DEPTNO=[$0], $f1=[CAST($1):INTEGER NOT NULL], $f2=[$2])
   LogicalAggregate(group=[{0}], agg#0=[MIN($1) FILTER $3], agg#1=[$SUM0($2) FILTER $4])
-    LogicalProject(DEPTNO=[$0], $f2=[$2], $f3=[$3], $f6=[=($5, 1)], $f7=[AND(=($5, 0), $THROW_UNLESS(OR(<>($5, 0), =($3, $4)), 'more than one distinct value in agg UNIQUE_VALUE'))])
-      LogicalAggregate(group=[{0, 2}], groups=[[{0, 2}, {0}]], agg#0=[$SUM0($1)], agg#1=[MIN($1)], agg#2=[MAX($1)], agg#3=[GROUPING($0, $2)])
+    LogicalProject(DEPTNO=[$0], $f2=[$2], $f3=[$3], $f5=[=($4, 1)], $f6=[=($4, 0)])
+      LogicalAggregate(group=[{0, 2}], groups=[[{0, 2}, {0}]], agg#0=[$SUM0($1)], agg#1=[MIN($1)], agg#2=[GROUPING($0, $2)])
         LogicalProject(DEPTNO=[$7], SAL=[$5], JOB=[$2])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
+    </Resource>
+  </TestCase>
 </Root>
diff --git a/core/src/test/resources/org/apache/calcite/test/SqlHintsConverterTest.xml b/core/src/test/resources/org/apache/calcite/test/SqlHintsConverterTest.xml
index 658e7cf454e1..4bb56c21cdb5 100644
--- a/core/src/test/resources/org/apache/calcite/test/SqlHintsConverterTest.xml
+++ b/core/src/test/resources/org/apache/calcite/test/SqlHintsConverterTest.xml
@@ -16,84 +16,61 @@
   ~ limitations under the License.
   -->
 <Root>
-    <TestCase name="testNestedQueryHint">
-        <Resource name="sql">
-            <![CDATA[select /*+ resource(parallelism='3'), repartition(10) */ empno
-from (select /*+ resource(mem='20Mb')*/ empno, ename from emp)]]>
-        </Resource>
-        <Resource name="hints">
-            <![CDATA[
-Project:[[RESOURCE inheritPath:[] options:{MEM=20Mb}], [RESOURCE inheritPath:[] options:{PARALLELISM=3}], [REPARTITION inheritPath:[] options:[10]]]
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testQueryHint">
-        <Resource name="sql">
-            <![CDATA[select /*+ properties(k1='v1', k2='v2'), index(ename), no_hash_join */ *
-from emp e1
-inner join dept d1 on e1.deptno = d1.deptno
-inner join emp e2 on e1.ename = e2.job]]>
-        </Resource>
-        <Resource name="hints">
-            <![CDATA[
-Project:[[PROPERTIES inheritPath:[] options:{K1=v1, K2=v2}], [INDEX inheritPath:[] options:[ENAME]], [NO_HASH_JOIN inheritPath:[]]]
-LogicalJoin:[[NO_HASH_JOIN inheritPath:[0]]]
-LogicalJoin:[[NO_HASH_JOIN inheritPath:[0, 0]]]
-TableScan:[[PROPERTIES inheritPath:[0, 0, 0] options:{K1=v1, K2=v2}], [INDEX inheritPath:[0, 0, 0] options:[ENAME]]]
-TableScan:[[PROPERTIES inheritPath:[0, 0, 1] options:{K1=v1, K2=v2}], [INDEX inheritPath:[0, 0, 1] options:[ENAME]]]
-TableScan:[[PROPERTIES inheritPath:[0, 1, 0] options:{K1=v1, K2=v2}], [INDEX inheritPath:[0, 1, 0] options:[ENAME]]]
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testQueryHintWithLiteralOptions">
-        <Resource name="sql">
-            <![CDATA[select /*+ time_zone(1, 1.23, 'a bc', -1.0) */ *
-from emp]]>
-        </Resource>
-        <Resource name="hints">
-            <![CDATA[
-Project:[[TIME_ZONE inheritPath:[] options:[1, 1.23, a bc, -1.0]]]
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateHints">
-        <Resource name="sql">
-            <![CDATA[select /*+ AGG_STRATEGY(TWO_PHASE), RESOURCE(mem='1024') */
+  <TestCase name="testAggregateHints">
+    <Resource name="sql">
+      <![CDATA[select /*+ AGG_STRATEGY(TWO_PHASE), RESOURCE(mem='1024') */
 count(deptno), avg_sal from (
 select /*+ AGG_STRATEGY(ONE_PHASE) */ avg(sal) as avg_sal, deptno
 from emp group by deptno) group by avg_sal]]>
-        </Resource>
-        <Resource name="hints">
-            <![CDATA[
+    </Resource>
+    <Resource name="hints">
+      <![CDATA[
 Project:[[AGG_STRATEGY inheritPath:[] options:[TWO_PHASE]], [RESOURCE inheritPath:[] options:{MEM=1024}]]
 Aggregate:[[AGG_STRATEGY inheritPath:[0] options:[TWO_PHASE]], [RESOURCE inheritPath:[0] options:{MEM=1024}]]
 Project:[[AGG_STRATEGY inheritPath:[] options:[ONE_PHASE]], [RESOURCE inheritPath:[0, 0] options:{MEM=1024}]]
 Aggregate:[[AGG_STRATEGY inheritPath:[0] options:[ONE_PHASE]], [AGG_STRATEGY inheritPath:[0, 0, 0] options:[TWO_PHASE]], [RESOURCE inheritPath:[0, 0, 0] options:{MEM=1024}]]
 Project:[[RESOURCE inheritPath:[0, 0, 0, 0] options:{MEM=1024}]]
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testHintsInSubQueryWithDecorrelation">
-        <Resource name="sql">
-            <![CDATA[select /*+ resource(parallelism='3'), AGG_STRATEGY(TWO_PHASE) */
+    </Resource>
+  </TestCase>
+  <TestCase name="testFourLevelNestedQueryHint">
+    <Resource name="sql">
+      <![CDATA[select /*+ index(idx1), no_hash_join */ * from emp /*+ index(empno) */
+e1 join dept/*+ index(deptno) */ d1 on e1.deptno = d1.deptno join
+(select max(sal) as sal from emp /*+ index(empno) */) e2 on e1.sal = e2.sal]]>
+    </Resource>
+    <Resource name="hints">
+      <![CDATA[
+Project:[[INDEX inheritPath:[] options:[IDX1]], [NO_HASH_JOIN inheritPath:[]]]
+LogicalJoin:[[NO_HASH_JOIN inheritPath:[0]]]
+LogicalJoin:[[NO_HASH_JOIN inheritPath:[0, 0]]]
+TableScan:[[INDEX inheritPath:[] options:[EMPNO]], [INDEX inheritPath:[0, 0, 0] options:[IDX1]]]
+TableScan:[[INDEX inheritPath:[] options:[DEPTNO]], [INDEX inheritPath:[0, 0, 1] options:[IDX1]]]
+TableScan:[[INDEX inheritPath:[] options:[EMPNO]], [INDEX inheritPath:[0, 1, 0, 0] options:[IDX1]]]
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testHintsInSubQueryWithDecorrelation">
+    <Resource name="sql">
+      <![CDATA[select /*+ resource(parallelism='3'), AGG_STRATEGY(TWO_PHASE) */
 sum(e1.empno) from emp e1, dept d1
 where e1.deptno = d1.deptno
 and e1.sal> (
 select /*+ resource(cpu='2') */ avg(e2.sal) from emp e2 where e2.deptno = d1.deptno)]]>
-        </Resource>
-        <Resource name="hints">
-            <![CDATA[
+    </Resource>
+    <Resource name="hints">
+      <![CDATA[
 Aggregate:[[RESOURCE inheritPath:[] options:{PARALLELISM=3}], [AGG_STRATEGY inheritPath:[] options:[TWO_PHASE]]]
 Project:[[RESOURCE inheritPath:[0] options:{PARALLELISM=3}]]
 Project:[[RESOURCE inheritPath:[0, 0] options:{PARALLELISM=3}]]
 Aggregate:[[RESOURCE inheritPath:[] options:{CPU=2}], [RESOURCE inheritPath:[0, 0, 0, 1] options:{PARALLELISM=3}], [AGG_STRATEGY inheritPath:[0, 0, 0, 1] options:[TWO_PHASE]]]
 Project:[[RESOURCE inheritPath:[0] options:{CPU=2}], [RESOURCE inheritPath:[0, 0, 0, 1, 0] options:{PARALLELISM=3}]]
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testHintsInSubQueryWithDecorrelation2">
-        <Resource name="sql">
-            <![CDATA[select /*+ properties(k1='v1', k2='v2'), index(ename), no_hash_join */
+    </Resource>
+  </TestCase>
+  <TestCase name="testHintsInSubQueryWithDecorrelation2">
+    <Resource name="sql">
+      <![CDATA[select /*+ properties(k1='v1', k2='v2'), index(ename), no_hash_join */
 sum(e1.empno) from emp e1, dept d1
 where e1.deptno = d1.deptno
 and e1.sal> (
@@ -101,9 +78,9 @@ select /*+ properties(k1='v1', k2='v2'), index(ename), no_hash_join */
   avg(e2.sal)
   from emp e2
   where e2.deptno = d1.deptno)]]>
-        </Resource>
-        <Resource name="hints">
-            <![CDATA[
+    </Resource>
+    <Resource name="hints">
+      <![CDATA[
 Aggregate:[[PROPERTIES inheritPath:[] options:{K1=v1, K2=v2}], [INDEX inheritPath:[] options:[ENAME]], [NO_HASH_JOIN inheritPath:[]]]
 LogicalJoin:[[NO_HASH_JOIN inheritPath:[0, 0, 0]]]
 LogicalJoin:[[NO_HASH_JOIN inheritPath:[0, 0, 0, 0]]]
@@ -112,11 +89,11 @@ TableScan:[[PROPERTIES inheritPath:[0, 0, 0, 0, 1] options:{K1=v1, K2=v2}], [IND
 Aggregate:[[PROPERTIES inheritPath:[] options:{K1=v1, K2=v2}], [INDEX inheritPath:[] options:[ENAME]], [NO_HASH_JOIN inheritPath:[]]]
 TableScan:[[PROPERTIES inheritPath:[0, 0] options:{K1=v1, K2=v2}], [INDEX inheritPath:[0, 0] options:[ENAME]], [PROPERTIES inheritPath:[0, 0, 0, 1, 0, 0] options:{K1=v1, K2=v2}], [INDEX inheritPath:[0, 0, 0, 1, 0, 0] options:[ENAME]]]
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testHintsInSubQueryWithDecorrelation3">
-        <Resource name="sql">
-            <![CDATA[select /*+ resource(parallelism='3'), index(ename), no_hash_join */
+    </Resource>
+  </TestCase>
+  <TestCase name="testHintsInSubQueryWithDecorrelation3">
+    <Resource name="sql">
+      <![CDATA[select /*+ resource(parallelism='3'), index(ename), no_hash_join */
 sum(e1.empno) from emp e1, dept d1
 where e1.deptno = d1.deptno
 and e1.sal> (
@@ -124,9 +101,9 @@ select /*+ resource(cpu='2'), index(ename), no_hash_join */
   avg(e2.sal)
   from emp e2
   where e2.deptno = d1.deptno)]]>
-        </Resource>
-        <Resource name="hints">
-            <![CDATA[
+    </Resource>
+    <Resource name="hints">
+      <![CDATA[
 Aggregate:[[RESOURCE inheritPath:[] options:{PARALLELISM=3}], [INDEX inheritPath:[] options:[ENAME]], [NO_HASH_JOIN inheritPath:[]]]
 Project:[[RESOURCE inheritPath:[0] options:{PARALLELISM=3}]]
 Project:[[RESOURCE inheritPath:[0, 0] options:{PARALLELISM=3}]]
@@ -138,134 +115,157 @@ Aggregate:[[RESOURCE inheritPath:[] options:{CPU=2}], [INDEX inheritPath:[] opti
 Project:[[RESOURCE inheritPath:[0] options:{CPU=2}], [RESOURCE inheritPath:[0, 0, 0, 1, 0] options:{PARALLELISM=3}]]
 TableScan:[[INDEX inheritPath:[0, 0] options:[ENAME]], [INDEX inheritPath:[0, 0, 0, 1, 0, 0] options:[ENAME]]]
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testHintsInSubQueryWithoutDecorrelation">
-        <Resource name="sql">
-            <![CDATA[select /*+ resource(parallelism='3') */
+    </Resource>
+  </TestCase>
+  <TestCase name="testHintsInSubQueryWithoutDecorrelation">
+    <Resource name="sql">
+      <![CDATA[select /*+ resource(parallelism='3') */
 sum(e1.empno) from emp e1, dept d1
 where e1.deptno = d1.deptno
 and e1.sal> (
 select /*+ resource(cpu='2') */ avg(e2.sal) from emp e2 where e2.deptno = d1.deptno)]]>
-        </Resource>
-        <Resource name="hints">
-            <![CDATA[
+    </Resource>
+    <Resource name="hints">
+      <![CDATA[
 Aggregate:[[RESOURCE inheritPath:[] options:{PARALLELISM=3}]]
 Project:[[RESOURCE inheritPath:[0] options:{PARALLELISM=3}]]
 Aggregate:[[RESOURCE inheritPath:[] options:{CPU=2}], [RESOURCE inheritPath:[0, 0, 0, 1] options:{PARALLELISM=3}]]
 Project:[[RESOURCE inheritPath:[0] options:{CPU=2}], [RESOURCE inheritPath:[0, 0, 0, 1, 0] options:{PARALLELISM=3}]]
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTwoLevelNestedQueryHint">
-        <Resource name="sql">
-            <![CDATA[select /*+ resource(parallelism='3'), no_hash_join */ empno
-from (select /*+ resource(mem='20Mb')*/ empno, ename
-from emp left join dept on emp.deptno = dept.deptno)]]>
-        </Resource>
-        <Resource name="hints">
-            <![CDATA[
-Project:[[RESOURCE inheritPath:[] options:{MEM=20Mb}], [RESOURCE inheritPath:[] options:{PARALLELISM=3}], [NO_HASH_JOIN inheritPath:[]]]
-LogicalJoin:[[NO_HASH_JOIN inheritPath:[0]]]
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinHintRequiresSpecificInputs">
+    <Resource name="sql">
+      <![CDATA[select /*+ use_hash_join(r, s), use_hash_join(emp, dept) */
+ename, job, sal, dept.name
+from emp join dept on emp.deptno = dept.deptno]]>
+    </Resource>
+    <Resource name="hints">
+      <![CDATA[
+Project:[[USE_HASH_JOIN inheritPath:[] options:[R, S]], [USE_HASH_JOIN inheritPath:[] options:[EMP, DEPT]]]
+LogicalJoin:[[USE_HASH_JOIN inheritPath:[0] options:[EMP, DEPT]]]
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testThreeLevelNestedQueryHint">
-        <Resource name="sql">
-            <![CDATA[select /*+ index(idx1), no_hash_join */ * from emp /*+ index(empno) */
-e1 join dept/*+ index(deptno) */ d1 on e1.deptno = d1.deptno
-join emp e2 on d1.name = e2.job]]>
-        </Resource>
-        <Resource name="hints">
-            <![CDATA[
-Project:[[INDEX inheritPath:[] options:[IDX1]], [NO_HASH_JOIN inheritPath:[]]]
-LogicalJoin:[[NO_HASH_JOIN inheritPath:[0]]]
-LogicalJoin:[[NO_HASH_JOIN inheritPath:[0, 0]]]
-TableScan:[[INDEX inheritPath:[] options:[EMPNO]], [INDEX inheritPath:[0, 0, 0] options:[IDX1]]]
-TableScan:[[INDEX inheritPath:[] options:[DEPTNO]], [INDEX inheritPath:[0, 0, 1] options:[IDX1]]]
-TableScan:[[INDEX inheritPath:[0, 1] options:[IDX1]]]
+    </Resource>
+  </TestCase>
+  <TestCase name="testNestedQueryHint">
+    <Resource name="sql">
+      <![CDATA[select /*+ resource(parallelism='3'), repartition(10) */ empno
+from (select /*+ resource(mem='20Mb')*/ empno, ename from emp)]]>
+    </Resource>
+    <Resource name="hints">
+      <![CDATA[
+Project:[[RESOURCE inheritPath:[] options:{MEM=20Mb}], [RESOURCE inheritPath:[] options:{PARALLELISM=3}], [REPARTITION inheritPath:[] options:[10]]]
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testFourLevelNestedQueryHint">
-        <Resource name="sql">
-            <![CDATA[select /*+ index(idx1), no_hash_join */ * from emp /*+ index(empno) */
-e1 join dept/*+ index(deptno) */ d1 on e1.deptno = d1.deptno join
-(select max(sal) as sal from emp /*+ index(empno) */) e2 on e1.sal = e2.sal]]>
-        </Resource>
-        <Resource name="hints">
-            <![CDATA[
-Project:[[INDEX inheritPath:[] options:[IDX1]], [NO_HASH_JOIN inheritPath:[]]]
+    </Resource>
+  </TestCase>
+  <TestCase name="testQueryHint">
+    <Resource name="sql">
+      <![CDATA[select /*+ properties(k1='v1', k2='v2'), index(ename), no_hash_join */ *
+from emp e1
+inner join dept d1 on e1.deptno = d1.deptno
+inner join emp e2 on e1.ename = e2.job]]>
+    </Resource>
+    <Resource name="hints">
+      <![CDATA[
+Project:[[PROPERTIES inheritPath:[] options:{K1=v1, K2=v2}], [INDEX inheritPath:[] options:[ENAME]], [NO_HASH_JOIN inheritPath:[]]]
 LogicalJoin:[[NO_HASH_JOIN inheritPath:[0]]]
 LogicalJoin:[[NO_HASH_JOIN inheritPath:[0, 0]]]
-TableScan:[[INDEX inheritPath:[] options:[EMPNO]], [INDEX inheritPath:[0, 0, 0] options:[IDX1]]]
-TableScan:[[INDEX inheritPath:[] options:[DEPTNO]], [INDEX inheritPath:[0, 0, 1] options:[IDX1]]]
-TableScan:[[INDEX inheritPath:[] options:[EMPNO]], [INDEX inheritPath:[0, 1, 0, 0] options:[IDX1]]]
+TableScan:[[PROPERTIES inheritPath:[0, 0, 0] options:{K1=v1, K2=v2}], [INDEX inheritPath:[0, 0, 0] options:[ENAME]]]
+TableScan:[[PROPERTIES inheritPath:[0, 0, 1] options:{K1=v1, K2=v2}], [INDEX inheritPath:[0, 0, 1] options:[ENAME]]]
+TableScan:[[PROPERTIES inheritPath:[0, 1, 0] options:{K1=v1, K2=v2}], [INDEX inheritPath:[0, 1, 0] options:[ENAME]]]
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testQueryHintWithLiteralOptions">
+    <Resource name="sql">
+      <![CDATA[select /*+ time_zone(1, 1.23, 'a bc', -1.0) */ *
+from emp]]>
+    </Resource>
+    <Resource name="hints">
+      <![CDATA[
+Project:[[TIME_ZONE inheritPath:[] options:[1, 1.23, a bc, -1.0]]]
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableHintsInJoin">
-        <Resource name="sql">
-            <![CDATA[select
+    </Resource>
+  </TestCase>
+  <TestCase name="testSameHintsWithDifferentInheritPath">
+    <Resource name="sql">
+      <![CDATA[select /*+ properties(k1='v1', k2='v2') */
 ename, job, sal, dept.name
 from emp /*+ index(idx1, idx2) */
 join dept /*+ properties(k1='v1', k2='v2') */
 on emp.deptno = dept.deptno]]>
-        </Resource>
-        <Resource name="hints">
-            <![CDATA[
-TableScan:[[INDEX inheritPath:[] options:[IDX1, IDX2]]]
-TableScan:[[PROPERTIES inheritPath:[] options:{K1=v1, K2=v2}]]
+    </Resource>
+    <Resource name="hints">
+      <![CDATA[
+Project:[[PROPERTIES inheritPath:[] options:{K1=v1, K2=v2}]]
+TableScan:[[INDEX inheritPath:[] options:[IDX1, IDX2]], [PROPERTIES inheritPath:[0, 0] options:{K1=v1, K2=v2}]]
+TableScan:[[PROPERTIES inheritPath:[] options:{K1=v1, K2=v2}], [PROPERTIES inheritPath:[0, 1] options:{K1=v1, K2=v2}]]
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSameHintsWithDifferentInheritPath">
-        <Resource name="sql">
-            <![CDATA[select /*+ properties(k1='v1', k2='v2') */
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableHintsInJoin">
+    <Resource name="sql">
+      <![CDATA[select
 ename, job, sal, dept.name
 from emp /*+ index(idx1, idx2) */
 join dept /*+ properties(k1='v1', k2='v2') */
 on emp.deptno = dept.deptno]]>
-        </Resource>
-        <Resource name="hints">
-            <![CDATA[
-Project:[[PROPERTIES inheritPath:[] options:{K1=v1, K2=v2}]]
-TableScan:[[INDEX inheritPath:[] options:[IDX1, IDX2]], [PROPERTIES inheritPath:[0, 0] options:{K1=v1, K2=v2}]]
-TableScan:[[PROPERTIES inheritPath:[] options:{K1=v1, K2=v2}], [PROPERTIES inheritPath:[0, 1] options:{K1=v1, K2=v2}]]
+    </Resource>
+    <Resource name="hints">
+      <![CDATA[
+TableScan:[[INDEX inheritPath:[] options:[IDX1, IDX2]]]
+TableScan:[[PROPERTIES inheritPath:[] options:{K1=v1, K2=v2}]]
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableHintsInSelect">
-        <Resource name="sql">
-            <![CDATA[select * from emp /*+ properties(k1='v1', k2='v2'), index(ename), no_hash_join */]]>
-        </Resource>
-        <Resource name="hints">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableHintsInSelect">
+    <Resource name="sql">
+      <![CDATA[select * from emp /*+ properties(k1='v1', k2='v2'), index(ename), no_hash_join */]]>
+    </Resource>
+    <Resource name="hints">
+      <![CDATA[
 TableScan:[[PROPERTIES inheritPath:[] options:{K1=v1, K2=v2}], [INDEX inheritPath:[] options:[ENAME]]]
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinHintRequiresSpecificInputs">
-        <Resource name="sql">
-            <![CDATA[select /*+ use_hash_join(r, s), use_hash_join(emp, dept) */
-ename, job, sal, dept.name
-from emp join dept on emp.deptno = dept.deptno]]>
-        </Resource>
-        <Resource name="hints">
-            <![CDATA[
-Project:[[USE_HASH_JOIN inheritPath:[] options:[R, S]], [USE_HASH_JOIN inheritPath:[] options:[EMP, DEPT]]]
-LogicalJoin:[[USE_HASH_JOIN inheritPath:[0] options:[EMP, DEPT]]]
+    </Resource>
+  </TestCase>
+  <TestCase name="testThreeLevelNestedQueryHint">
+    <Resource name="sql">
+      <![CDATA[select /*+ index(idx1), no_hash_join */ * from emp /*+ index(empno) */
+e1 join dept/*+ index(deptno) */ d1 on e1.deptno = d1.deptno
+join emp e2 on d1.name = e2.job]]>
+    </Resource>
+    <Resource name="hints">
+      <![CDATA[
+Project:[[INDEX inheritPath:[] options:[IDX1]], [NO_HASH_JOIN inheritPath:[]]]
+LogicalJoin:[[NO_HASH_JOIN inheritPath:[0]]]
+LogicalJoin:[[NO_HASH_JOIN inheritPath:[0, 0]]]
+TableScan:[[INDEX inheritPath:[] options:[EMPNO]], [INDEX inheritPath:[0, 0, 0] options:[IDX1]]]
+TableScan:[[INDEX inheritPath:[] options:[DEPTNO]], [INDEX inheritPath:[0, 0, 1] options:[IDX1]]]
+TableScan:[[INDEX inheritPath:[0, 1] options:[IDX1]]]
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testTwoLevelNestedQueryHint">
+    <Resource name="sql">
+      <![CDATA[select /*+ resource(parallelism='3'), no_hash_join */ empno
+from (select /*+ resource(mem='20Mb')*/ empno, ename
+from emp left join dept on emp.deptno = dept.deptno)]]>
+    </Resource>
+    <Resource name="hints">
+      <![CDATA[
+Project:[[RESOURCE inheritPath:[] options:{MEM=20Mb}], [RESOURCE inheritPath:[] options:{PARALLELISM=3}], [NO_HASH_JOIN inheritPath:[]]]
+LogicalJoin:[[NO_HASH_JOIN inheritPath:[0]]]
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUseMergeJoin">
-        <Resource name="sql">
-            <![CDATA[select /*+ use_merge_join(emp, dept) */
+    </Resource>
+  </TestCase>
+  <TestCase name="testUseMergeJoin">
+    <Resource name="sql">
+      <![CDATA[select /*+ use_merge_join(emp, dept) */
 ename, job, sal, dept.name
 from emp join dept on emp.deptno = dept.deptno]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
 EnumerableProject(ENAME=[$1], JOB=[$2], SAL=[$5], NAME=[$10])
   EnumerableMergeJoin(condition=[=($7, $9)], joinType=[inner])
     EnumerableSort(sort0=[$7], dir0=[ASC])
@@ -273,6 +273,6 @@ EnumerableProject(ENAME=[$1], JOB=[$2], SAL=[$5], NAME=[$10])
     EnumerableSort(sort0=[$0], dir0=[ASC])
       EnumerableTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
+    </Resource>
+  </TestCase>
 </Root>
diff --git a/core/src/test/resources/org/apache/calcite/test/SqlLimitsTest.xml b/core/src/test/resources/org/apache/calcite/test/SqlLimitsTest.xml
index c662841d589b..35bbf4371276 100644
--- a/core/src/test/resources/org/apache/calcite/test/SqlLimitsTest.xml
+++ b/core/src/test/resources/org/apache/calcite/test/SqlLimitsTest.xml
@@ -16,9 +16,9 @@
   ~ limitations under the License.
   -->
 <Root>
-    <TestCase name="testPrintLimits">
-        <Resource name="output">
-            <![CDATA[BOOLEAN
+  <TestCase name="testPrintLimits">
+    <Resource name="output">
+      <![CDATA[BOOLEAN
   zero:                   false; as SQL: FALSE
   max:                    true; as SQL: TRUE
 
@@ -148,6 +148,6 @@ TIMESTAMP(0)
   max:                    Dec 31, 9999 11:59:59 PM; as SQL: TIMESTAMP '9999-12-31 23:59:59'
 
 ]]>
-        </Resource>
-    </TestCase>
+    </Resource>
+  </TestCase>
 </Root>
diff --git a/core/src/test/resources/org/apache/calcite/test/SqlToRelConverterTest.xml b/core/src/test/resources/org/apache/calcite/test/SqlToRelConverterTest.xml
index 25e7b6bcec78..fa6780f02f26 100644
--- a/core/src/test/resources/org/apache/calcite/test/SqlToRelConverterTest.xml
+++ b/core/src/test/resources/org/apache/calcite/test/SqlToRelConverterTest.xml
@@ -16,513 +16,558 @@
   ~ limitations under the License.
   -->
 <Root>
-    <TestCase name="testAggregateFunctionForStructInput">
-        <Resource name="sql">
-            <![CDATA[select collect(skill) as collect_skill,
+  <TestCase name="testAggCaseInSubQuery">
+    <Resource name="sql">
+      <![CDATA[SELECT SUM(
+  CASE WHEN deptno IN (SELECT deptno FROM dept) THEN 1 ELSE 0 END)
+FROM emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
+  LogicalProject($f0=[CASE(IN($7, {
+LogicalProject(DEPTNO=[$0])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+}), 1, 0)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggCaseSubQuery">
+    <Resource name="sql">
+      <![CDATA[SELECT SUM(CASE WHEN empno IN (3) THEN 0 ELSE 1 END) FROM emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
+  LogicalProject($f0=[CASE(=($0, 3), 0, 1)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggDistinct">
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[SUM(DISTINCT $1)], EXPR$3=[COUNT()])
+  LogicalProject(DEPTNO=[$7], SAL=[$5])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select deptno, sum(sal), sum(distinct sal), count(*)
+from emp
+group by deptno]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggFilter">
+    <Resource name="sql">
+      <![CDATA[select
+  deptno, sum(sal * 2) filter (where empno < 10), count(*)
+from emp
+group by deptno]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1) FILTER $2], EXPR$2=[COUNT()])
+  LogicalProject(DEPTNO=[$7], $f1=[*($5, 2)], $f2=[<($0, 10)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggFilterWithIn">
+    <Resource name="sql">
+      <![CDATA[select
+  deptno, sum(sal * 2) filter (where empno not in (1, 2)), count(*)
+from emp
+group by deptno]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[SUM($1) FILTER $2], EXPR$2=[COUNT()])
+  LogicalProject(DEPTNO=[$7], $f1=[*($5, 2)], $f2=[SEARCH($0, Sarg[(-∞..1), (1..2), (2..+∞)])])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggNoDuplicateColumnNames">
+    <Resource name="sql">
+      <![CDATA[SELECT  empno, EXPR$2, COUNT(empno) FROM (
+    SELECT empno, deptno AS EXPR$2
+    FROM emp)
+GROUP BY empno, EXPR$2]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], EXPR$2=[$1], EXPR$20=[$2])
+  LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
+    LogicalProject(EMPNO=[$0], EXPR$2=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggScalarSubQuery">
+    <Resource name="sql">
+      <![CDATA[SELECT SUM(SELECT min(deptno) FROM dept) FROM emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
+  LogicalProject(EXPR$0=[$9])
+    LogicalJoin(condition=[true], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], EXPR$0=[MIN($0)])
+        LogicalProject(DEPTNO=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateAndScalarSubQueryInHaving">
+    <Resource name="sql">
+      <![CDATA[select deptno
+from emp
+group by deptno
+having max(emp.empno) > (SELECT min(emp.empno) FROM emp)
+]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalFilter(condition=[>($1, $2)])
+    LogicalJoin(condition=[true], joinType=[left])
+      LogicalAggregate(group=[{0}], agg#0=[MAX($1)])
+        LogicalProject(DEPTNO=[$7], EMPNO=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], EXPR$0=[MIN($0)])
+        LogicalProject(EMPNO=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateAndScalarSubQueryInSelect">
+    <Resource name="sql">
+      <![CDATA[select deptno,
+  max(emp.empno) > (SELECT min(emp.empno) FROM emp) as b
+from emp
+group by deptno
+]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], B=[>($1, $2)])
+  LogicalJoin(condition=[true], joinType=[left])
+    LogicalAggregate(group=[{0}], agg#0=[MAX($1)])
+      LogicalProject(DEPTNO=[$7], EMPNO=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{}], EXPR$0=[MIN($0)])
+      LogicalProject(EMPNO=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateFunctionForStructInput">
+    <Resource name="sql">
+      <![CDATA[select collect(skill) as collect_skill,
   count(skill) as count_skill, count(*) as count_star,
   approx_count_distinct(skill) as approx_count_distinct_skill,
   max(skill) as max_skill, min(skill) as min_skill,
   any_value(skill) as any_value_skill
 from sales.dept_nested]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(COLLECT_SKILL=[$0], COUNT_SKILL=[$1], COUNT_STAR=[$1], APPROX_COUNT_DISTINCT_SKILL=[$2], MAX_SKILL=[ROW($3.TYPE, $3.DESC, ROW($3.OTHERS.A, $3.OTHERS.B))], MIN_SKILL=[ROW($4.TYPE, $4.DESC, ROW($4.OTHERS.A, $4.OTHERS.B))], ANY_VALUE_SKILL=[ROW($5.TYPE, $5.DESC, ROW($5.OTHERS.A, $5.OTHERS.B))])
   LogicalAggregate(group=[{}], COLLECT_SKILL=[COLLECT($0)], COUNT_SKILL=[COUNT()], APPROX_COUNT_DISTINCT_SKILL=[COUNT(APPROXIMATE DISTINCT $0)], MAX_SKILL=[MAX($0)], MIN_SKILL=[MIN($0)], ANY_VALUE_SKILL=[ANY_VALUE($0)])
     LogicalProject(SKILL=[ROW($2.TYPE, $2.DESC, ROW($2.OTHERS.A, $2.OTHERS.B))])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateFunctionForStructInputByName">
-        <Resource name="sql">
-            <![CDATA[select collect(skill) as collect_skill,
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateFunctionForStructInputByName">
+    <Resource name="sql">
+      <![CDATA[select collect(skill) as collect_skill,
   count(skill) as count_skill, count(*) as count_star,
   approx_count_distinct(skill) as approx_count_distinct_skill,
   max(skill) as max_skill, min(skill) as min_skill,
   any_value(skill) as any_value_skill
 from sales.dept_nested group by name]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(COLLECT_SKILL=[$1], COUNT_SKILL=[$2], COUNT_STAR=[$2], APPROX_COUNT_DISTINCT_SKILL=[$3], MAX_SKILL=[ROW($4.TYPE, $4.DESC, ROW($4.OTHERS.A, $4.OTHERS.B))], MIN_SKILL=[ROW($5.TYPE, $5.DESC, ROW($5.OTHERS.A, $5.OTHERS.B))], ANY_VALUE_SKILL=[ROW($6.TYPE, $6.DESC, ROW($6.OTHERS.A, $6.OTHERS.B))])
   LogicalAggregate(group=[{0}], COLLECT_SKILL=[COLLECT($1)], COUNT_SKILL=[COUNT()], APPROX_COUNT_DISTINCT_SKILL=[COUNT(APPROXIMATE DISTINCT $1)], MAX_SKILL=[MAX($1)], MIN_SKILL=[MIN($1)], ANY_VALUE_SKILL=[ANY_VALUE($1)])
     LogicalProject(NAME=[$1], SKILL=[ROW($2.TYPE, $2.DESC, ROW($2.OTHERS.A, $2.OTHERS.B))])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCase">
-        <Resource name="plan">
-            <![CDATA[
-LogicalValues(tuples=[[{ 1 }]])
-]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[values (case 'a' when 'a' then 1 end)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroup">
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateNoGroup">
+    <Resource name="sql">
+      <![CDATA[select sum(deptno) from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
   LogicalProject(DEPTNO=[$7])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select deptno from emp group by deptno]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupByAlias">
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}])
-  LogicalProject(D=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select empno as d from emp group by d]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupByAliasEqualToColumnName">
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}])
-  LogicalProject(EMPNO=[$0], DEPTNO=[$1])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select empno, ename as deptno from emp group by empno, deptno]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupByAliasOfSubExpressionsInProject">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(D=[$0], EXPR$1=[+($0, $1)])
-  LogicalAggregate(group=[{0, 1}])
-    LogicalProject(D=[+($7, $0)], MGR=[$3])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select deptno+empno as d, deptno+empno+mgr
-from emp group by d,mgr]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupByOrdinal">
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}])
-  LogicalProject(EMPNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select empno from emp group by 1]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupByContainsLiterals">
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
-  LogicalProject($f0=[0])
-    LogicalAggregate(group=[{0}])
-      LogicalProject($f0=[SUBSTRING($1, 2, 3)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAggregateWithSameDigestInSubQueries">
+    <Resource name="sql">
+      <![CDATA[select
+  CASE WHEN job IN ('810000', '820000') THEN job
+  ELSE 'error'
+  END AS job_name,
+  count(empno)
+FROM emp
+where job <> '' or job IN ('810000', '820000')
+GROUP by deptno, job]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(JOB_NAME=[CASE(SEARCH($1, Sarg['810000', '820000']:CHAR(6)), $1, 'error':VARCHAR(10))], EXPR$1=[$2])
+  LogicalAggregate(group=[{0, 1}], EXPR$1=[COUNT()])
+    LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
+      LogicalFilter(condition=[OR(<>($2, ''), =($2, '810000'), =($2, '820000'))])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select count(*) from (
-  select 1 from emp group by substring(ename from 2 for 3))]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAliasInHaving">
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testAliasInHaving">
+    <Resource name="plan">
+      <![CDATA[
 LogicalFilter(condition=[>($0, 1)])
   LogicalAggregate(group=[{}], E=[COUNT()])
     LogicalProject(EMPNO=[$0])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select count(empno) as e from emp having e > 1]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAllValueList">
-        <Resource name="sql">
-            <![CDATA[select empno from emp where deptno > all (10, 20)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[AND(>($7, 10), >($7, 20))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select count(empno) as e from emp having e > 1]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAliasList">
+    <Resource name="sql">
+      <![CDATA[select a + b from (
+  select deptno, 1 as uno, name from dept
+) as d(a, b, c)
+where c like 'X%']]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($0, $1)])
+  LogicalFilter(condition=[LIKE($2, 'X%')])
+    LogicalProject(DEPTNO=[$0], UNO=[1], NAME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupJustOneAgg">
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}], SUM_SAL=[SUM($1)])
-  LogicalProject(DEPTNO=[$7], SAL=[$5])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAliasList2">
+    <Resource name="sql">
+      <![CDATA[select * from (
+  select a, b, c from (values (1, 2, 3)) as t (c, b, a)
+) join dept on dept.deptno = c
+order by c + a]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(A=[$0], B=[$1], C=[$2], DEPTNO=[$3], NAME=[$4])
+  LogicalSort(sort0=[$5], dir0=[ASC])
+    LogicalProject(A=[$0], B=[$1], C=[$2], DEPTNO=[$3], NAME=[$4], EXPR$5=[+($2, $0)])
+      LogicalJoin(condition=[=($3, $2)], joinType=[inner])
+        LogicalProject(A=[$2], B=[$1], C=[$0])
+          LogicalValues(tuples=[[{ 1, 2, 3 }]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select deptno, sum(sal) as sum_sal from emp group by deptno]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupExpressionsInsideAndOut">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($0, 4)], EXPR$1=[$1], EXPR$2=[$2], EXPR$3=[*(2, $3)])
-  LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[SUM($2)], agg#2=[COUNT()])
-    LogicalProject(DEPTNO=[$7], SAL=[$5], $f2=[+(3, $5)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAliasUnnestArrayPlanWithDoubleColumn">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], E=[$5], EMPNO=[$6.EMPNO])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{2, 3}])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED_EXPANDED]])
+    Uncollect
+      LogicalProject(ADMINS=[$cor0.ADMINS], EMPLOYEES=[$cor0.EMPLOYEES])
+        LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select
-  deptno + 4, sum(sal), sum(3 + sal), 2 * count(sal)
-from emp group by deptno]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testHaving">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[$0])
-  LogicalFilter(condition=[>($1, 10)])
-    LogicalAggregate(group=[{}], EXPR$0=[SUM($0)], agg#1=[SUM($1)])
-      LogicalProject($f0=[+($5, $5)], SAL=[$5])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select d.deptno, e, k.empno
+from dept_nested_expanded as d CROSS JOIN
+ UNNEST(d.admins, d.employees) as t(e, k)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAliasUnnestArrayPlanWithSingleColumn">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EMPNO=[$5.EMPNO])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{2}])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED_EXPANDED]])
+    Uncollect
+      LogicalProject(EMPLOYEES=[$cor0.EMPLOYEES])
+        LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select sum(sal + sal) from emp having sum(sal) > 10]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupBug281">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(NAME=[$0])
-  LogicalAggregate(group=[{0}])
-    LogicalProject(NAME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select d.deptno, employee.empno
+from dept_nested_expanded as d,
+ UNNEST(d.employees) as t(employee)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testAllValueList">
+    <Resource name="sql">
+      <![CDATA[select empno from emp where deptno > all (10, 20)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[AND(>($7, 10), >($7, 20))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select name from (select name from dept group by name)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupBug281b">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(NAME=[$0], FOO=[$2])
-  LogicalAggregate(group=[{0, 1}], FOO=[COUNT()])
-    LogicalProject(NAME=[$1], DEPTNO=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAnyValueAggregateFunctionGroupBy">
+    <Resource name="sql">
+      <![CDATA[SELECT any_value(empno) as anyempno FROM emp AS e group by e.sal]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ANYEMPNO=[$1])
+  LogicalAggregate(group=[{0}], ANYEMPNO=[ANY_VALUE($1)])
+    LogicalProject(SAL=[$5], EMPNO=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select name, foo from (
-select deptno, name, count(deptno) as foo
-from dept
-group by name, deptno, name)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggDistinct">
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[SUM(DISTINCT $1)], EXPR$3=[COUNT()])
-  LogicalProject(DEPTNO=[$7], SAL=[$5])
+    </Resource>
+  </TestCase>
+  <TestCase name="testAnyValueAggregateFunctionNoGroupBy">
+    <Resource name="sql">
+      <![CDATA[SELECT any_value(empno) as anyempno FROM emp AS e]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{}], ANYEMPNO=[ANY_VALUE($0)])
+  LogicalProject(EMPNO=[$0])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select deptno, sum(sal), sum(distinct sal), count(*)
-from emp
-group by deptno]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testArrayElementDoublyNestedPrimitive">
-        <Resource name="sql">
-            <![CDATA[select dn.employees[0]['detail']['skills'][0]['type']
+    </Resource>
+  </TestCase>
+  <TestCase name="testArrayElementDoublyNestedPrimitive">
+    <Resource name="sql">
+      <![CDATA[select dn.employees[0]['detail']['skills'][0]['type']
 from sales.dept_nested dn]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EXPR$0=[ITEM(ITEM(ITEM(ITEM(ITEM($3, 0), 'detail'), 'skills'), 0), 'type')])
   LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testArrayElementDoublyNestedStruct">
-        <Resource name="sql">
-            <![CDATA[select dn.employees[0]['detail']['skills'][0]
+    </Resource>
+  </TestCase>
+  <TestCase name="testArrayElementDoublyNestedStruct">
+    <Resource name="sql">
+      <![CDATA[select dn.employees[0]['detail']['skills'][0]
 from sales.dept_nested dn]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EXPR$0=[ROW(ITEM(ITEM(ITEM(ITEM($3, 0), 'detail'), 'skills'), 0).TYPE, ITEM(ITEM(ITEM(ITEM($3, 0), 'detail'), 'skills'), 0).DESC, ROW(ITEM(ITEM(ITEM(ITEM($3, 0), 'detail'), 'skills'), 0).OTHERS.A, ITEM(ITEM(ITEM(ITEM($3, 0), 'detail'), 'skills'), 0).OTHERS.B))])
   LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testArrayElementNestedPrimitive">
-        <Resource name="sql">
-            <![CDATA[select dn.employees[0]['empno']
+    </Resource>
+  </TestCase>
+  <TestCase name="testArrayElementNestedPrimitive">
+    <Resource name="sql">
+      <![CDATA[select dn.employees[0]['empno']
 from sales.dept_nested dn]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EXPR$0=[ITEM(ITEM($3, 0), 'empno')])
   LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testArrayElementThreeTimesNestedStruct">
-        <Resource name="sql">
-            <![CDATA[select dn.employees[0]['detail']['skills'][0]['others']
+    </Resource>
+  </TestCase>
+  <TestCase name="testArrayElementThreeTimesNestedStruct">
+    <Resource name="sql">
+      <![CDATA[select dn.employees[0]['detail']['skills'][0]['others']
 from sales.dept_nested dn]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EXPR$0=[ROW(ITEM(ITEM(ITEM(ITEM($3, 0), 'detail'), 'skills'), 0).OTHERS.A, ITEM(ITEM(ITEM(ITEM($3, 0), 'detail'), 'skills'), 0).OTHERS.B)])
   LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCollectionTableWithLateral">
-        <Resource name="sql">
-            <![CDATA[select * from dept, lateral table(ramp(dept.deptno))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testArrayOfRecord">
+    <Resource name="sql">
+      <![CDATA[select employees[1].detail.skills[2+3].desc from dept_nested]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[ITEM(ITEM($3, 1).DETAIL.SKILLS, +(2, 3)).DESC])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testCase">
+    <Resource name="plan">
+      <![CDATA[
+LogicalValues(tuples=[[{ 1 }]])
+]]>
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[values (case 'a' when 'a' then 1 end)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testCharLength">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[CHAR_LENGTH('foo')])
+  LogicalValues(tuples=[[{ 0 }]])
+]]>
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[values (character_length('foo'))]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testCoalesceOnNullableField">
+    <Resource name="sql">
+      <![CDATA[select coalesce(mgr, 0) from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[CASE(IS NOT NULL($3), CAST($3):INTEGER NOT NULL, 0)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testCollectionTable">
+    <Resource name="sql">
+      <![CDATA[select * from table(ramp(3))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(I=[$0])
+  LogicalTableFunctionScan(invocation=[RAMP(3)], rowType=[RecordType(INTEGER I)])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testCollectionTableWithCursorParam">
+    <Resource name="sql">
+      <![CDATA[select * from table(dedup(cursor(select ename from emp), cursor(select name from dept), 'NAME'))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(NAME=[$0])
+  LogicalTableFunctionScan(invocation=[DEDUP(CAST($0):CURSOR NOT NULL, CAST($1):CURSOR NOT NULL, 'NAME')], rowType=[RecordType(VARCHAR(1024) NAME)])
+    LogicalProject(ENAME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(NAME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testCollectionTableWithLateral">
+    <Resource name="sql">
+      <![CDATA[select * from dept, lateral table(ramp(dept.deptno))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(DEPTNO=[$0], NAME=[$1], I=[$2])
   LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
     LogicalTableFunctionScan(invocation=[RAMP($cor0.DEPTNO)], rowType=[RecordType(INTEGER I)])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCollectionTableWithLateral2">
-        <Resource name="sql">
-            <![CDATA[select * from dept, lateral table(ramp(deptno))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testCollectionTableWithLateral2">
+    <Resource name="sql">
+      <![CDATA[select * from dept, lateral table(ramp(deptno))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(DEPTNO=[$0], NAME=[$1], I=[$2])
   LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
     LogicalTableFunctionScan(invocation=[RAMP($cor0.DEPTNO)], rowType=[RecordType(INTEGER I)])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSnapshotOnTemporalTable1">
-        <Resource name="sql">
-            <![CDATA[select * from products_temporal for system_time as of TIMESTAMP '2011-01-02 00:00:00']]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(PRODUCTID=[$0], NAME=[$1], SUPPLIERID=[$2], SYS_START=[$3], SYS_END=[$4])
-  LogicalSnapshot(period=[2011-01-02 00:00:00])
-    LogicalTableScan(table=[[CATALOG, SALES, PRODUCTS_TEMPORAL]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCollectionTableWithLateral3">
+    <Resource name="sql">
+      <![CDATA[select * from dept, lateral table(DEDUP(dept.deptno, dept.name))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0, 1}])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalTableFunctionScan(invocation=[DEDUP($cor0.DEPTNO, $cor0.NAME)], rowType=[RecordType(VARCHAR(1024) NAME)])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSnapshotOnTemporalTable2">
-        <Resource name="sql">
-            <![CDATA[select * from VIRTUALCOLUMNS.VC_T1 for system_time as of TIMESTAMP '2011-01-02 00:00:00']]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(A=[$0], B=[$1], C=[$2], D=[$3], E=[$4])
-  LogicalSnapshot(period=[2011-01-02 00:00:00])
-    LogicalProject(A=[$0], B=[$1], C=[$2], D=[$3], $f4=[+($0, 1)])
-      LogicalTableScan(table=[[CATALOG, VIRTUALCOLUMNS, VC_T1]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCompositeInUncorrelatedSubQueryRex">
+    <Resource name="sql">
+      <![CDATA[select empno from emp where (empno, deptno) in (select deptno - 10, deptno from dept)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[IN($0, $7, {
+LogicalProject(EXPR$0=[-($0, 10)], DEPTNO=[$0])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+})])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinTemporalTableOnSpecificTime1">
-        <Resource name="sql">
-            <![CDATA[select stream *
-from orders,
-  products_temporal for system_time as of
-    TIMESTAMP '2011-01-02 00:00:00']]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalDelta
-  LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2], PRODUCTID0=[$3], NAME=[$4], SUPPLIERID=[$5], SYS_START=[$6], SYS_END=[$7])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
-      LogicalSnapshot(period=[2011-01-02 00:00:00])
-        LogicalTableScan(table=[[CATALOG, SALES, PRODUCTS_TEMPORAL]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCompositeOfCountRange">
+    <Resource name="sql">
+      <![CDATA[select COMPOSITE(deptno)
+from dept]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[COMPOSITE($0)])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinTemporalTableOnSpecificTime2">
-        <Resource name="sql">
-            <![CDATA[select stream *
-from orders,
-  VIRTUALCOLUMNS.VC_T1 for system_time as of
-    TIMESTAMP '2011-01-02 00:00:00']]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalDelta
-  LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2], A=[$3], B=[$4], C=[$5], D=[$6], E=[$7])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
-      LogicalSnapshot(period=[2011-01-02 00:00:00])
-        LogicalProject(A=[$0], B=[$1], C=[$2], D=[$3], $f4=[+($0, 1)])
-          LogicalTableScan(table=[[CATALOG, VIRTUALCOLUMNS, VC_T1]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testConditionOffByOne">
+    <Resource name="sql">
+      <![CDATA[SELECT * FROM emp
+JOIN dept on emp.deptno + 0 = dept.deptno]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$10], NAME=[$11])
+  LogicalJoin(condition=[=($9, $10)], joinType=[inner])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, 0)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinTemporalTableOnColumnReference1">
-        <Resource name="sql">
-            <![CDATA[select stream *
-from orders
-join products_temporal for system_time as of orders.rowtime
-on orders.productid = products_temporal.productid]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalDelta
-  LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2], PRODUCTID0=[$3], NAME=[$4], SUPPLIERID=[$5], SYS_START=[$6], SYS_END=[$7])
-    LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0, 1}])
-      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
-      LogicalFilter(condition=[=($cor0.PRODUCTID, $0)])
-        LogicalSnapshot(period=[$cor0.ROWTIME])
-          LogicalTableScan(table=[[CATALOG, SALES, PRODUCTS_TEMPORAL]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinTemporalTableOnColumnReference2">
-        <Resource name="sql">
-            <![CDATA[select stream *
-from orders
-join VIRTUALCOLUMNS.VC_T1 for system_time as of orders.rowtime
-on orders.productid = VIRTUALCOLUMNS.VC_T1.a]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalDelta
-  LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2], A=[$3], B=[$4], C=[$5], D=[$6], E=[$7])
-    LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0, 1}])
-      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
-      LogicalFilter(condition=[=($cor0.PRODUCTID, $0)])
-        LogicalSnapshot(period=[$cor0.ROWTIME])
-          LogicalProject(A=[$0], B=[$1], C=[$2], D=[$3], $f4=[+($0, 1)])
-            LogicalTableScan(table=[[CATALOG, VIRTUALCOLUMNS, VC_T1]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCrossJoinTemporalTable1">
-        <Resource name="sql">
-            <![CDATA[select stream *
-from orders
-cross join lateral (
-  select * from products_temporal for system_time
-  as of orders.rowtime
-  where orders.productid = products_temporal.productid)
-]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalDelta
-  LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2], PRODUCTID0=[$3], NAME=[$4], SUPPLIERID=[$5], SYS_START=[$6], SYS_END=[$7])
-    LogicalCorrelate(correlation=[$cor1], joinType=[inner], requiredColumns=[{0, 1}])
-      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
-      LogicalProject(PRODUCTID=[$0], NAME=[$1], SUPPLIERID=[$2], SYS_START=[$3], SYS_END=[$4])
-        LogicalFilter(condition=[=($cor1.PRODUCTID, $0)])
-          LogicalSnapshot(period=[$cor1.ROWTIME])
-            LogicalTableScan(table=[[CATALOG, SALES, PRODUCTS_TEMPORAL]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCrossJoinTemporalTable2">
-        <Resource name="sql">
-            <![CDATA[select stream *
-from orders
-cross join lateral (
-  select * from products_temporal for system_time
-  as of TIMESTAMP '2011-01-02 00:00:00'
-  where orders.productid = products_temporal.productid)
-]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalDelta
-  LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2], PRODUCTID0=[$3], NAME=[$4], SUPPLIERID=[$5], SYS_START=[$6], SYS_END=[$7])
-    LogicalJoin(condition=[=($1, $8)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
-      LogicalProject(PRODUCTID=[$0], NAME=[$1], SUPPLIERID=[$2], SYS_START=[$3], SYS_END=[$4], PRODUCTID5=[$0])
-        LogicalSnapshot(period=[2011-01-02 00:00:00])
-          LogicalTableScan(table=[[CATALOG, SALES, PRODUCTS_TEMPORAL]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCrossJoinTemporalTable3">
-        <Resource name="sql">
-            <![CDATA[select stream *
-from orders
-cross join lateral (
-  select * from products_temporal for system_time
-  as of orders.rowtime
-  where products_temporal.productid > 1)
-]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalDelta
-  LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2], PRODUCTID0=[$3], NAME=[$4], SUPPLIERID=[$5], SYS_START=[$6], SYS_END=[$7])
-    LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
-      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
-      LogicalProject(PRODUCTID=[$0], NAME=[$1], SUPPLIERID=[$2], SYS_START=[$3], SYS_END=[$4])
-        LogicalFilter(condition=[>($0, 1)])
-          LogicalSnapshot(period=[$cor0.ROWTIME])
-            LogicalTableScan(table=[[CATALOG, SALES, PRODUCTS_TEMPORAL]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCollectionTableWithLateral3">
-        <Resource name="sql">
-            <![CDATA[select * from dept, lateral table(DEDUP(dept.deptno, dept.name))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], NAME0=[$2])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0, 1}])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableFunctionScan(invocation=[DEDUP($cor0.DEPTNO, $cor0.NAME)], rowType=[RecordType(VARCHAR(1024) NAME)])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinLateralTableWithConditionCorrelated">
-        <Resource name="sql">
-            <![CDATA[select deptno, r.num from dept join
- lateral table(ramp(dept.deptno)) as r(num)
- on deptno=num]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NUM=[$2])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
+    </Resource>
+  </TestCase>
+  <TestCase name="testConditionOffByOneReversed">
+    <Resource name="sql">
+      <![CDATA[SELECT * FROM emp
+JOIN dept on dept.deptno = emp.deptno + 0]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$10], NAME=[$11])
+  LogicalJoin(condition=[=($10, $9)], joinType=[inner])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, 0)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
-      LogicalTableFunctionScan(invocation=[RAMP($cor0.DEPTNO)], rowType=[RecordType(INTEGER I)])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCorrelateSortWithLimit">
-        <Resource name="sql">
-            <![CDATA[SELECT deptno, ename
+    </Resource>
+  </TestCase>
+  <TestCase name="testCorrelateSortWithLimit">
+    <Resource name="sql">
+      <![CDATA[SELECT deptno, ename
 FROM
   (SELECT DISTINCT deptno FROM emp) t1,
   LATERAL (
@@ -532,9 +577,9 @@ FROM
     ORDER BY sal
     DESC LIMIT 3
   )]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(DEPTNO=[$0], ENAME=[$1])
   LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
     LogicalAggregate(group=[{0}])
@@ -545,42 +590,17 @@ LogicalProject(DEPTNO=[$0], ENAME=[$1])
         LogicalFilter(condition=[=($7, $cor0.DEPTNO)])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortLimitWithCorrelateInput">
-        <Resource name="sql">
-            <![CDATA[SELECT deptno, ename
-    FROM
-        (SELECT DISTINCT deptno FROM emp) t1,
-          LATERAL (
-            SELECT ename, sal
-            FROM emp
-            WHERE deptno = t1.deptno)
-    ORDER BY ename DESC
-    LIMIT 3]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(sort0=[$1], dir0=[DESC], fetch=[3])
-  LogicalProject(DEPTNO=[$0], ENAME=[$1])
-    LogicalJoin(condition=[=($0, $3)], joinType=[inner])
-      LogicalAggregate(group=[{0}])
-        LogicalProject(DEPTNO=[$7])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(ENAME=[$1], SAL=[$5], DEPTNO=[$7])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCorrelatedSubQueryInAggregate">
-        <Resource name="sql">
-            <![CDATA[SELECT SUM(
+    </Resource>
+  </TestCase>
+  <TestCase name="testCorrelatedSubQueryInAggregate">
+    <Resource name="sql">
+      <![CDATA[SELECT SUM(
   (select char_length(name) from dept
    where dept.deptno = emp.empno))
 FROM emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
   LogicalProject($f0=[$SCALAR_QUERY({
 LogicalProject(EXPR$0=[CHAR_LENGTH($1)])
@@ -589,20 +609,20 @@ LogicalProject(EXPR$0=[CHAR_LENGTH($1)])
 })])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCorrelatedSubQueryInJoin">
-        <Resource name="sql">
-            <![CDATA[select *
+    </Resource>
+  </TestCase>
+  <TestCase name="testCorrelatedSubQueryInJoin">
+    <Resource name="sql">
+      <![CDATA[select *
 from emp as e
 join dept as d using (deptno)
 where d.name = (
   select max(name)
   from dept as d2
   where d2.deptno = d.deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(DEPTNO=[$7], EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8], NAME=[$10])
   LogicalFilter(condition=[=($10, $SCALAR_QUERY({
 LogicalAggregate(group=[{}], EXPR$0=[MAX($0)])
@@ -614,169 +634,113 @@ LogicalAggregate(group=[{}], EXPR$0=[MAX($0)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUnnest">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[$0])
-  Uncollect
-    LogicalProject(EXPR$0=[$SLICE($0)])
-      Collect(field=[EXPR$0])
-        LogicalValues(tuples=[[{ 1 }, { 2 }]])
-]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select*from unnest(multiset[1,2])]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUnnestSubQuery">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1])
-  Uncollect
-    Collect(field=[EXPR$0])
-      LogicalProject(DEPTNO=[$0], NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select*from unnest(multiset(select*from dept))]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectOverDistinct">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[CASE(>(COUNT(DISTINCT $7) OVER (ORDER BY $0 ROWS 10 PRECEDING), 0), $SUM0(DISTINCT $7) OVER (ORDER BY $0 ROWS 10 PRECEDING), null:INTEGER)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select SUM(DISTINCT deptno)
-over (ORDER BY empno ROWS BETWEEN 10 PRECEDING AND CURRENT ROW)
-from emp
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectStreamPartitionDistinct">
-        <Resource name="plan">
-            <![CDATA[
-LogicalDelta
-  LogicalProject(C=[COUNT(DISTINCT $2) OVER (PARTITION BY $1 ORDER BY $0 RANGE 1000:INTERVAL SECOND PRECEDING)], C2=[COUNT(DISTINCT $2) OVER (PARTITION BY $1 ORDER BY $0 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], C3=[COUNT($2) OVER (PARTITION BY $1 ORDER BY $0 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)])
-    LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
-]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select stream
-  count(distinct orderId) over (partition by productId
-    order by rowtime
-    range interval '1' second preceding) as c,
-  count(distinct orderId) over w as c2,
-  count(orderId) over w as c3
-from orders
-window w as (partition by productId)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testArrayOfRecord">
-        <Resource name="sql">
-            <![CDATA[select employees[1].detail.skills[2+3].desc from dept_nested]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[ITEM(ITEM($3, 1).DETAIL.SKILLS, +(2, 3)).DESC])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testFlattenRecords">
-        <Resource name="sql">
-            <![CDATA[select employees[1] from dept_nested]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[ROW(ITEM($3, 1).EMPNO, ITEM($3, 1).ENAME, ROW(ITEM($3, 1).DETAIL.SKILLS))])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUnnestArray">
-        <Resource name="sql">
-            <![CDATA[select*from unnest(array(select*from dept))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1])
-  Uncollect
-    Collect(field=[EXPR$0])
-      LogicalProject(DEPTNO=[$0], NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUnnestWithOrdinality">
-        <Resource name="sql">
-            <![CDATA[select*from unnest(array(select*from dept)) with ordinality]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], ORDINALITY=[$2])
-  Uncollect(withOrdinality=[true])
-    Collect(field=[EXPR$0])
-      LogicalProject(DEPTNO=[$0], NAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCorrelationAggregateGroupSets">
+    <Resource name="sql">
+      <![CDATA[select sum(e1.empno)
+from emp e1, dept d1
+where e1.deptno = d1.deptno
+and e1.sal > (select avg(e2.sal) from emp e2
+  where e2.deptno = d1.deptno group by cube(comm, mgr))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
+  LogicalProject(EMPNO=[$0])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], DEPTNO1=[CAST($11):INTEGER], $f1=[CAST($12):INTEGER])
+      LogicalJoin(condition=[AND(=($9, $11), >($5, $12))], joinType=[inner])
+        LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalAggregate(group=[{0}], agg#0=[SINGLE_VALUE($1)])
+          LogicalProject(DEPTNO=[$2], EXPR$0=[$3])
+            LogicalAggregate(group=[{0, 1, 2}], groups=[[{0, 1, 2}, {0, 2}, {1, 2}, {2}]], EXPR$0=[AVG($3)])
+              LogicalProject(COMM=[$6], MGR=[$3], DEPTNO=[$7], SAL=[$5])
+                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMultisetSubQuery">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1])
-  LogicalJoin(condition=[true], joinType=[inner])
-    LogicalValues(tuples=[[{ true }]])
-    Collect(field=[EXPR$0])
-      LogicalProject(DEPTNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCorrelationExistsAndFilter">
+    <Resource name="sql">
+      <![CDATA[SELECT e1.empno
+FROM emp e1, dept d1 where e1.deptno = d1.deptno
+and e1.deptno < 10 and d1.deptno < 15
+and exists (select * from emp e2 where e1.empno = e2.empno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], EMPNO0=[CAST($11):INTEGER], $f1=[CAST($12):BOOLEAN])
+    LogicalJoin(condition=[=($0, $11)], joinType=[inner])
+      LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+        LogicalFilter(condition=[<($7, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalFilter(condition=[<($0, 15)])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+        LogicalProject(EMPNO=[$0], $f0=[true])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select multiset(select deptno from dept) from (values(true))]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMultiset">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=['a'], EXPR$1=[$SLICE($2)])
-  LogicalJoin(condition=[true], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    Collect(field=[EXPR$0])
-      LogicalValues(tuples=[[{ 10 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCorrelationExistsAndFilterRex">
+    <Resource name="sql">
+      <![CDATA[SELECT e1.empno
+FROM emp e1, dept d1 where e1.deptno = d1.deptno
+and e1.deptno < 10 and d1.deptno < 15
+and exists (select * from emp e2 where e1.empno = e2.empno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], EMPNO0=[CAST($11):INTEGER], $f1=[CAST($12):BOOLEAN])
+    LogicalJoin(condition=[=($0, $11)], joinType=[inner])
+      LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+        LogicalFilter(condition=[<($7, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalFilter(condition=[<($0, 15)])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+        LogicalProject(EMPNO=[$0], $f0=[true])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select 'a',multiset[10] from dept]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMultisetOfColumns">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=['abc'], EXPR$1=[$SLICE($9)])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{5, 7}])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    Collect(field=[EXPR$0])
-      LogicalUnion(all=[true])
-        LogicalProject(EXPR$0=[$cor0.DEPTNO])
-          LogicalValues(tuples=[[{ 0 }]])
-        LogicalProject(EXPR$0=[$cor0.SAL])
-          LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCorrelationExistsAndFilterThetaRex">
+    <Resource name="sql">
+      <![CDATA[SELECT e1.empno
+FROM emp e1, dept d1 where e1.deptno = d1.deptno
+and e1.deptno < 10 and d1.deptno < 15
+and exists (select * from emp e2 where e1.empno < e2.empno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], EMPNO0=[CAST($11):INTEGER], $f1=[CAST($12):BOOLEAN])
+    LogicalJoin(condition=[=($0, $11)], joinType=[inner])
+      LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+        LogicalFilter(condition=[<($7, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalFilter(condition=[<($0, 15)])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+        LogicalProject(EMPNO0=[$9], $f0=[true])
+          LogicalJoin(condition=[<($9, $0)], joinType=[inner])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+            LogicalAggregate(group=[{0}])
+              LogicalProject(EMPNO=[$0])
+                LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+                  LogicalFilter(condition=[<($7, 10)])
+                    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+                  LogicalFilter(condition=[<($0, 15)])
+                    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select 'abc',multiset[deptno,sal] from emp]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCorrelationJoin">
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testCorrelationJoin">
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(DEPTNO=[$0], NAME=[$1], EMPSET=[$2])
   LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
@@ -785,435 +749,534 @@ LogicalProject(DEPTNO=[$0], NAME=[$1], EMPSET=[$2])
         LogicalFilter(condition=[=($7, $cor0.DEPTNO)])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select *,
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select *,
   multiset(select * from emp where deptno=dept.deptno) as empset
 from dept]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExists">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[IS NOT NULL($9)])
-    LogicalJoin(condition=[true], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalFilter(condition=[=($0, 55)])
-            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCorrelationJoinRex">
+    <Resource name="sql">
+      <![CDATA[select *,
+  multiset(select * from emp where deptno=dept.deptno) as empset
+from dept]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], EMPSET=[$2])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    Collect(field=[EXPR$0])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalFilter(condition=[=($7, $cor0.DEPTNO)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select*from emp
-where exists (select 1 from dept where deptno=55)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExistsCorrelated">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[IS NOT NULL($9)])
-    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
-            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCorrelationMultiScalarAggregate">
+    <Resource name="sql">
+      <![CDATA[select sum(e1.empno)
+from emp e1, dept d1
+where e1.deptno = d1.deptno
+and e1.sal > (select avg(e2.sal) from emp e2
+  where e2.deptno = d1.deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
+  LogicalProject(EMPNO=[$0])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], DEPTNO1=[CAST($11):INTEGER], EXPR$0=[CAST($12):INTEGER])
+      LogicalJoin(condition=[AND(=($9, $11), >($5, $12))], joinType=[inner])
+        LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalAggregate(group=[{0}], EXPR$0=[AVG($1)])
+          LogicalProject(DEPTNO=[$7], SAL=[$5])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select*from emp where exists (
-  select 1 from dept where emp.deptno=dept.deptno)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUnnestSelect">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[$0])
-  Uncollect
-    LogicalProject(EXPR$0=[$SLICE($2)])
-      LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        Collect(field=[EXPR$0])
-          LogicalUnion(all=[true])
-            LogicalProject(EXPR$0=[$cor0.DEPTNO])
-              LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCorrelationNotExistsAndFilter">
+    <Resource name="sql">
+      <![CDATA[SELECT e1.empno
+FROM emp e1, dept d1 where e1.deptno = d1.deptno
+and e1.deptno < 10 and d1.deptno < 15
+and not exists (select * from emp e2 where e1.empno = e2.empno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[IS NULL($12)])
+    LogicalJoin(condition=[=($0, $11)], joinType=[left])
+      LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+        LogicalFilter(condition=[<($7, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalFilter(condition=[<($0, 15)])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+        LogicalProject(EMPNO=[$0], $f0=[true])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select*from unnest(select multiset[deptno] from dept)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testLateral">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{7}])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], NAME=[$1])
-      LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCorrelationScalarAggAndFilter">
+    <Resource name="sql">
+      <![CDATA[SELECT e1.empno
+FROM emp e1, dept d1 where e1.deptno = d1.deptno
+and e1.deptno < 10 and d1.deptno < 15
+and e1.sal > (select avg(sal) from emp e2 where e1.empno = e2.empno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], EMPNO0=[CAST($11):INTEGER], EXPR$0=[CAST($12):INTEGER])
+    LogicalJoin(condition=[AND(=($0, $11), >($5, $12))], joinType=[inner])
+      LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+        LogicalFilter(condition=[<($7, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalFilter(condition=[<($0, 15)])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalAggregate(group=[{0}], EXPR$0=[AVG($1)])
+        LogicalProject(EMPNO=[$0], SAL=[$5])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select * from emp,
-  LATERAL (select * from dept where emp.deptno=dept.deptno)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testElement">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[ELEMENT($SLICE($9))])
-  LogicalJoin(condition=[true], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    Collect(field=[EXPR$0])
-      LogicalValues(tuples=[[{ 5 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCorrelationScalarAggAndFilterRex">
+    <Resource name="sql">
+      <![CDATA[SELECT e1.empno
+FROM emp e1, dept d1 where e1.deptno = d1.deptno
+and e1.deptno < 10 and d1.deptno < 15
+and e1.sal > (select avg(sal) from emp e2 where e1.empno = e2.empno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[AND(=($7, $9), <($7, 10), <($9, 15), >($5, $SCALAR_QUERY({
+LogicalAggregate(group=[{}], EXPR$0=[AVG($0)])
+  LogicalProject(SAL=[$5])
+    LogicalFilter(condition=[=($cor0.EMPNO, $0)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+})))], variablesSet=[[$cor0]])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select element(multiset[5]) from emp]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testElementInValues">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[ELEMENT($SLICE($0))])
-  Collect(field=[EXPR$0])
-    LogicalValues(tuples=[[{ 5 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCountNoGroup">
+    <Resource name="sql">
+      <![CDATA[select count(*), sum(sal)
+from emp
+where empno > 10]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[COUNT()], EXPR$1=[SUM($0)])
+  LogicalProject(SAL=[$5])
+    LogicalFilter(condition=[>($0, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[values element(multiset[5])]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUnionAll">
-        <Resource name="plan">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalProject(EMPNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(DEPTNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCrossJoinLateral1">
+    <Resource name="sql">
+      <![CDATA[select * from (values (4,5)) as t(c,d)
+ cross join lateral
+ (select c,a*c as f from (values 2) as s(a)
+ where c+d=a*c)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(C=[$0], D=[$1], C0=[$2], F=[$3])
+  LogicalProject(C=[$0], D=[$1], C0=[$4], F=[$5])
+    LogicalCorrelate(correlation=[$cor3], joinType=[inner], requiredColumns=[{2, 3}])
+      LogicalProject(C=[$0], D=[$1], C0=[$0], $f3=[+($0, $1)])
+        LogicalValues(tuples=[[{ 4, 5 }]])
+      LogicalProject(C=[$cor3.C], F=[*($0, $cor3.C)])
+        LogicalFilter(condition=[=($cor3.$f3, *($0, $cor3.C))])
+          LogicalValues(tuples=[[{ 2 }]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select empno from emp union all select deptno from dept]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUnion">
-        <Resource name="plan">
-            <![CDATA[
-LogicalUnion(all=[false])
-  LogicalProject(EMPNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(DEPTNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCrossJoinLateral2">
+    <Resource name="sql">
+      <![CDATA[select * from (values 4) as t (c)
+cross join lateral
+(select * from (
+  select f1+b1 from (values 2) as foo(f1)
+    join
+  (select c+1 from (values 3)) as bar(b1)
+  on f1=b1
+) as r(n) where c=n)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(C=[$0], N=[$1])
+  LogicalProject(C=[$0], N=[$3])
+    LogicalCorrelate(correlation=[$cor1], joinType=[inner], requiredColumns=[{1, 2}])
+      LogicalProject(C=[$0], C0=[$0], $f2=[+($0, 1)])
+        LogicalValues(tuples=[[{ 4 }]])
+      LogicalProject(N=[$0])
+        LogicalFilter(condition=[=($cor1.C, $0)])
+          LogicalProject(EXPR$0=[+($0, $1)])
+            LogicalJoin(condition=[=($0, $1)], joinType=[inner])
+              LogicalValues(tuples=[[{ 2 }]])
+              LogicalProject(EXPR$0=[$cor1.$f2])
+                LogicalValues(tuples=[[{ 3 }]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select empno from emp union select deptno from dept]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUnionValues">
-        <Resource name="plan">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalUnion(all=[true])
-    LogicalValues(tuples=[[{ 10 }, { 20 }]])
-    LogicalProject(EXPR$0=[34])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalUnion(all=[true])
-    LogicalValues(tuples=[[{ 30 }]])
-    LogicalProject(EXPR$0=[+(45, 10)])
-      LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCrossJoinTemporalTable1">
+    <Resource name="sql">
+      <![CDATA[select stream *
+from orders
+cross join lateral (
+  select * from products_temporal for system_time
+  as of orders.rowtime
+  where orders.productid = products_temporal.productid)
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[values (10), (20)
-union all
-select 34 from emp
-union all values (30), (45 + 10)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUnionSubQuery">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7])
-  LogicalJoin(condition=[true], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalUnion(all=[true])
-      LogicalUnion(all=[true])
-        LogicalProject(EMPNO=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(DEPTNO=[$0])
-          LogicalFilter(condition=[>($0, 20)])
-            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalValues(tuples=[[{ 45 }, { 67 }]])
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalDelta
+  LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2], PRODUCTID0=[$3], NAME=[$4], SUPPLIERID=[$5], SYS_START=[$6], SYS_END=[$7])
+    LogicalCorrelate(correlation=[$cor1], joinType=[inner], requiredColumns=[{0, 1}])
+      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
+      LogicalProject(PRODUCTID=[$0], NAME=[$1], SUPPLIERID=[$2], SYS_START=[$3], SYS_END=[$4])
+        LogicalFilter(condition=[=($cor1.PRODUCTID, $0)])
+          LogicalSnapshot(period=[$cor1.ROWTIME])
+            LogicalTableScan(table=[[CATALOG, SALES, PRODUCTS_TEMPORAL]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select deptno from emp as emp0 cross join
- (select empno from emp union all
-  select deptno from dept where deptno > 20 union all
-  values (45), (67))]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testIsDistinctFrom">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[AND(OR(IS NOT NULL($0), IS NOT NULL($1)), IS NOT TRUE(=($0, $1)))])
-  LogicalValues(tuples=[[{ null, 1 }, { 2, null }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCrossJoinTemporalTable2">
+    <Resource name="sql">
+      <![CDATA[select stream *
+from orders
+cross join lateral (
+  select * from products_temporal for system_time
+  as of TIMESTAMP '2011-01-02 00:00:00'
+  where orders.productid = products_temporal.productid)
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select empno is distinct from deptno
-from (values (cast(null as int), 1),
-             (2, cast(null as int))) as emp(empno, deptno)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testIsNotDistinctFrom">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[OR(AND(IS NULL($0), IS NULL($1)), IS TRUE(=($0, $1)))])
-  LogicalValues(tuples=[[{ null, 1 }, { 2, null }]])
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalDelta
+  LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2], PRODUCTID0=[$3], NAME=[$4], SUPPLIERID=[$5], SYS_START=[$6], SYS_END=[$7])
+    LogicalJoin(condition=[=($1, $8)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
+      LogicalProject(PRODUCTID=[$0], NAME=[$1], SUPPLIERID=[$2], SYS_START=[$3], SYS_END=[$4], PRODUCTID5=[$0])
+        LogicalSnapshot(period=[2011-01-02 00:00:00])
+          LogicalTableScan(table=[[CATALOG, SALES, PRODUCTS_TEMPORAL]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select empno is not distinct from deptno
-from (values (cast(null as int), 1),
-             (2, cast(null as int))) as emp(empno, deptno)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNotLike">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[NOT(LIKE('a', 'b', 'c'))])
-  LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCrossJoinTemporalTable3">
+    <Resource name="sql">
+      <![CDATA[select stream *
+from orders
+cross join lateral (
+  select * from products_temporal for system_time
+  as of orders.rowtime
+  where products_temporal.productid > 1)
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[values ('a' not like 'b' escape 'c')]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOverMultiple">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[CASE(>(COUNT($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), 0), $SUM0($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), null:INTEGER)], EXPR$1=[CASE(>(COUNT($7) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), 0), $SUM0($7) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), null:INTEGER)], EXPR$2=[CASE(>=(COUNT() OVER (PARTITION BY $2 ORDER BY $4 ROWS 3 PRECEDING), 2), CASE(>(COUNT($7) OVER (PARTITION BY $2 ORDER BY $4 ROWS 3 PRECEDING), 0), $SUM0($7) OVER (PARTITION BY $2 ORDER BY $4 ROWS 3 PRECEDING), null:INTEGER), null:NULL)])
-  LogicalFilter(condition=[>(-($7, $5), 999)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalDelta
+  LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2], PRODUCTID0=[$3], NAME=[$4], SUPPLIERID=[$5], SYS_START=[$6], SYS_END=[$7])
+    LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
+      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
+      LogicalProject(PRODUCTID=[$0], NAME=[$1], SUPPLIERID=[$2], SYS_START=[$3], SYS_END=[$4])
+        LogicalFilter(condition=[>($0, 1)])
+          LogicalSnapshot(period=[$cor0.ROWTIME])
+            LogicalTableScan(table=[[CATALOG, SALES, PRODUCTS_TEMPORAL]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select sum(sal) over w1,
-  sum(deptno) over w1,
-  sum(deptno) over w2
-from emp
-where deptno - sal > 999
-window w1 as (partition by job order by hiredate rows 2 preceding),
-  w2 as (partition by job order by hiredate rows 3 preceding disallow partial),
-  w3 as (partition by job order by hiredate range interval '1' second preceding)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCharLength">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[CHAR_LENGTH('foo')])
-  LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCube">
+    <Resource name="sql">
+      <![CDATA[select 1
+from (values (1, 2, 3, 4)) as t(a, b, c, d)
+group by cube(a, b)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {1}, {}]])
+    LogicalProject(A=[$0], B=[$1])
+      LogicalValues(tuples=[[{ 1, 2, 3, 4 }]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[values (character_length('foo'))]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDoNotPushDownJoinCondition">
-        <Resource name="sql">
-            <![CDATA[select *
-from emp as e
-join dept as d on e.deptno + 20 = d.deptno / 2]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[=(+($7, 20), /($9, 2))], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCustomColumnResolving">
+    <Resource name="sql">
+      <![CDATA[select k0 from struct.t]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(K0=[$0])
+  LogicalTableScan(table=[[CATALOG, STRUCT, T]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDotLiteralAfterNestedRow">
-        <Resource name="sql">
-            <![CDATA[select ((1,2),(3,4,5))."EXPR$1"."EXPR$2" from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[ROW(ROW(1, 2), ROW(3, 4, 5)).EXPR$1.EXPR$2])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCustomColumnResolving2">
+    <Resource name="sql">
+      <![CDATA[select c2 from struct.t]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(C2=[$7])
+  LogicalTableScan(table=[[CATALOG, STRUCT, T]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDotLiteralAfterRow">
-        <Resource name="sql">
-            <![CDATA[select row(1,2)."EXPR$1" from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[ROW(1, 2).EXPR$1])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCustomColumnResolving3">
+    <Resource name="sql">
+      <![CDATA[select f1.c2 from struct.t]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(C2=[$7])
+  LogicalTableScan(table=[[CATALOG, STRUCT, T]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testRowValueConstructorWithSubquery">
-        <Resource name="sql">
-            <![CDATA[select ROW((select deptno
-from dept
-where dept.deptno = emp.deptno), emp.ename)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[ROW($9, $1)])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO9=[$9])
-    LogicalJoin(condition=[=($9, $7)], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCustomColumnResolving4">
+    <Resource name="sql">
+      <![CDATA[select c1 from struct.t order by f0.c1]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(C1=[$0])
+  LogicalSort(sort0=[$1], dir0=[ASC])
+    LogicalProject(C1=[$1], "F0"."C1"=[$6])
+      LogicalTableScan(table=[[CATALOG, STRUCT, T]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDynamicNestedColumn">
-        <Resource name="sql">
-            <![CDATA[select t3.fake_q1['fake_col2'] as fake2
-from (
-  select t2.fake_col as fake_q1
-  from SALES.CUSTOMER as t2) as t3]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(FAKE2=[ITEM($0, 'fake_col2')])
-  LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCustomColumnResolving5">
+    <Resource name="sql">
+      <![CDATA[select count(c1) from struct.t group by f0.c1]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject("F0"."C1"=[$6], "C1"=[$1])
+      LogicalTableScan(table=[[CATALOG, STRUCT, T]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNestedColumnType">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ZIP=[$3])
-  LogicalFilter(condition=[=($2, 'abc')])
-    LogicalProject(EMPNO=[$0], STREET=[$1.STREET], CITY=[$1.CITY], ZIP=[$1.ZIP], STATE=[$1.STATE], STREET5=[$2.STREET], CITY6=[$2.CITY], ZIP7=[$2.ZIP], STATE8=[$2.STATE])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP_ADDRESS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCustomColumnResolvingWithSelectFieldNameDotStar">
+    <Resource name="sql">
+      <![CDATA[select f1.* from struct.t]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject("F1"."A0"=[$2], "F1"."C0"=[$5], "F1"."C2"=[$7])
+  LogicalTableScan(table=[[CATALOG, STRUCT, T]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select empa.home_address.zip
-from sales.emp_address empa
-where empa.home_address.city = 'abc']]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectNestedColumnType">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(UNIT_LENGTH=[CHAR_LENGTH($3)])
-  LogicalFilter(condition=[=($0, 'john')])
-    LogicalProject(FNAME=[$1], COORD=[$4], COORD2=[$5], COORD3=[$6])
-      LogicalFilter(condition=[AND(>($4, 1), >($5, 1))])
-        LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
-          LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testCustomColumnResolvingWithSelectStar">
+    <Resource name="sql">
+      <![CDATA[select * from struct.t]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
+  LogicalTableScan(table=[[CATALOG, STRUCT, T]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select
-  char_length(coord."unit") as unit_length
-from
-  (
-    select
-      fname,
-      coord
-    from
-      customer.contact_peek
-    where
-      coord.x > 1
-      and coord.y > 1
-  ) as view
-where
-  fname = 'john']]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupByNestedColumn">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(X=[$1], A=[$0], EXPR$2=[$2])
-  LogicalAggregate(group=[{0, 1}], EXPR$2=[AVG($2)])
-    LogicalProject(A=[$5.SUB.A], X=[$4.X], $f2=[$4.Y])
-      LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testDelete">
+    <Resource name="sql">
+      <![CDATA[delete from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[DELETE], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select
-  coord.x,
-  coord_ne.sub.a,
-  avg(coord.y)
-from
-  customer.contact_peek
-group by
-  coord_ne.sub.a,
-  coord.x]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupingSetsWithNestedColumn">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(X=[$1], unit=[$2], A=[$0], EXPR$3=[$3])
-  LogicalAggregate(group=[{0, 1, 2}], groups=[[{0, 1, 2}, {1, 2}]], EXPR$3=[AVG($3)])
-    LogicalProject(A=[$5.SUB.A], X=[$4.X], unit=[$4.unit], $f3=[$4.Y])
-      LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testDeleteBind">
+    <Resource name="sql">
+      <![CDATA[delete from emp where deptno = ?]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[DELETE], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, ?0)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select
-  coord.x,
-  coord."unit",
-  coord_ne.sub.a,
-  avg(coord.y)
-from
-  customer.contact_peek
-group by
-  grouping sets (
-    (coord_ne.sub.a, coord.x, coord."unit"),
-    (coord.x, coord."unit")
-  )]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupByCubeWithNestedColumn">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(X=[$1], unit=[$2], A=[$0], EXPR$3=[$3])
-  LogicalAggregate(group=[{0, 1, 2}], groups=[[{0, 1, 2}, {0, 1}, {0, 2}, {0}, {1, 2}, {1}, {2}, {}]], EXPR$3=[AVG($3)])
-    LogicalProject(A=[$5.SUB.A], X=[$4.X], unit=[$4.unit], $f3=[$4.Y])
-      LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testDeleteBindExtendedColumn">
+    <Resource name="sql">
+      <![CDATA[delete from emp(enddate TIMESTAMP) where enddate < ?]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[DELETE], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENDDATE=[$9])
+    LogicalFilter(condition=[<($9, ?0)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select
-  coord.x,
-  coord."unit",
-  coord_ne.sub.a,
-  avg(coord.y)
-from
-  customer.contact_peek
-group by
-  cube (coord_ne.sub.a, coord.x, coord."unit")]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDynamicSchemaUnnest">
-        <Resource name="sql">
-            <![CDATA[select t1.c_nationkey, t3.fake_col3
+    </Resource>
+  </TestCase>
+  <TestCase name="testDeleteBindExtendedColumnModifiableView">
+    <Resource name="sql">
+      <![CDATA[delete from EMP_MODIFIABLEVIEW2(note VARCHAR)
+where note = ?]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]], operation=[DELETE], flattened=[true])
+  LogicalProject(ENAME=[$0], EMPNO=[$1], JOB=[$2], DEPTNO=[$3], SLACKER=[$4], SAL=[$5], EXTRA=[$6], HIREDATE=[$7], MGR=[$8], COMM=[$9], NOTE=[$10])
+    LogicalFilter(condition=[=($10, ?0)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDeleteBindModifiableView">
+    <Resource name="sql">
+      <![CDATA[delete from EMP_MODIFIABLEVIEW2 where empno = ?]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]], operation=[DELETE], flattened=[true])
+  LogicalProject(ENAME=[$0], EMPNO=[$1], JOB=[$2], DEPTNO=[$3], SLACKER=[$4], SAL=[$5], EXTRA=[$6], HIREDATE=[$7], MGR=[$8], COMM=[$9])
+    LogicalFilter(condition=[=($1, ?0)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDeleteWhere">
+    <Resource name="sql">
+      <![CDATA[delete from emp where deptno = 10]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[DELETE], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalFilter(condition=[=($7, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDoNotPushDownJoinCondition">
+    <Resource name="sql">
+      <![CDATA[select *
+from emp as e
+join dept as d on e.deptno + 20 = d.deptno / 2]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalJoin(condition=[=(+($7, 20), /($9, 2))], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDotLiteralAfterNestedRow">
+    <Resource name="sql">
+      <![CDATA[select ((1,2),(3,4,5))."EXPR$1"."EXPR$2" from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[ROW(ROW(1, 2), ROW(3, 4, 5)).EXPR$1.EXPR$2])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDotLiteralAfterRow">
+    <Resource name="sql">
+      <![CDATA[select row(1,2)."EXPR$1" from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[ROW(1, 2).EXPR$1])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDuplicateColumnsInSubQuery">
+    <Resource name="sql">
+      <![CDATA[select "e" from (
+select empno as "e", deptno as d, 1 as "e0" from EMP)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(e=[$0])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDuplicateGroupingSets">
+    <Resource name="sql">
+      <![CDATA[select sum(sal) from emp
+group by sal,
+  grouping sets (deptno,
+    grouping sets ((deptno, ename), ename),
+      (ename)),
+  ()]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[$3])
+  LogicalAggregate(group=[{0, 1, 2}], groups=[[{0, 1, 2}, {0, 1}, {0, 2}]], EXPR$0=[SUM($0)])
+    LogicalProject(SAL=[$5], DEPTNO=[$7], ENAME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDynStarInExistSubQ">
+    <Resource name="sql">
+      <![CDATA[select *
+from SALES.REGION where exists (select * from SALES.NATION)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(R_REGIONKEY=[$0], R_NAME=[$1], R_COMMENT=[$2])
+  LogicalFilter(condition=[IS NOT NULL($3)])
+    LogicalJoin(condition=[true], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, REGION]])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDynamicNestedColumn">
+    <Resource name="sql">
+      <![CDATA[select t3.fake_q1['fake_col2'] as fake2
+from (
+  select t2.fake_col as fake_q1
+  from SALES.CUSTOMER as t2) as t3]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(FAKE2=[ITEM($0, 'fake_col2')])
+  LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testDynamicSchemaUnnest">
+    <Resource name="sql">
+      <![CDATA[select t1.c_nationkey, t3.fake_col3
 from SALES.CUSTOMER as t1,
 lateral (select t2."$unnest" as fake_col3
          from unnest(t1.fake_col) as t2) as t3]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(C_NATIONKEY=[$1], FAKE_COL3=[$2])
   LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
     LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
@@ -1222,2095 +1285,2395 @@ LogicalProject(C_NATIONKEY=[$1], FAKE_COL3=[$2])
         LogicalProject(FAKE_COL=[$cor0.FAKE_COL])
           LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOverAvg">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[CASE(>(COUNT($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), 0), $SUM0($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), null:INTEGER)], EXPR$1=[CAST(/(CASE(>(COUNT($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), 0), $SUM0($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), null:INTEGER), COUNT($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING))):INTEGER])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select sum(sal) over w1,
-  avg(sal) over w1
-from emp
-window w1 as (partition by job order by hiredate rows 2 preceding)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOverCountStar">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[COUNT($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING)], EXPR$1=[COUNT() OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testDynamicStarInJoinAndSubQ">
+    <Resource name="sql">
+      <![CDATA[select * from  (select * from SALES.NATION T1,  SALES.CUSTOMER T2 where T1.n_nationkey = T2.c_nationkey)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(**=[$1], **0=[$3])
+  LogicalFilter(condition=[=($0, $2)])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+      LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select count(sal) over w1,
-  count(*) over w1
-from emp
-window w1 as (partition by job order by hiredate rows 2 preceding)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testIntegerLiteral">
-        <Resource name="sql">
-            <![CDATA[select 1 from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testDynamicStarInTableJoin">
+    <Resource name="sql">
+      <![CDATA[select * from  (select * from SALES.NATION) T1,  (SELECT * from SALES.CUSTOMER) T2  where T1.n_nationkey = T2.c_nationkey]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(**=[$0], **0=[$1])
+  LogicalFilter(condition=[=(ITEM($0, 'N_NATIONKEY'), ITEM($1, 'C_NATIONKEY'))])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalProject(**=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+      LogicalProject(**=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testIntervalLiteralYearToMonth">
-        <Resource name="sql">
-            <![CDATA[select
-  cast(empno as Integer) * (INTERVAL '1-1' YEAR TO MONTH)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[*($0, 13:INTERVAL YEAR TO MONTH)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testElement">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[ELEMENT($SLICE($9))])
+  LogicalJoin(condition=[true], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    Collect(field=[EXPR$0])
+      LogicalValues(tuples=[[{ 5 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testIntervalLiteralHourToMinute">
-        <Resource name="sql">
-            <![CDATA[select
- cast(empno as Integer) * (INTERVAL '1:1' HOUR TO MINUTE)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[*($0, 3660000:INTERVAL HOUR TO MINUTE)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select element(multiset[5]) from emp]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testElementInValues">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[ELEMENT($SLICE($0))])
+  Collect(field=[EXPR$0])
+    LogicalValues(tuples=[[{ 5 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectNull">
-        <Resource name="sql">
-            <![CDATA[select null from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[null:NULL])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[values element(multiset[5])]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testExists">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[IS NOT NULL($9)])
+    LogicalJoin(condition=[true], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalFilter(condition=[=($0, 55)])
+            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectNullWithAlias">
-        <Resource name="sql">
-            <![CDATA[select null as dummy from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DUMMY=[null:NULL])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select*from emp
+where exists (select 1 from dept where deptno=55)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testExistsCorrelated">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[IS NOT NULL($9)])
+    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
+            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectNullWithCast">
-        <Resource name="sql">
-            <![CDATA[select cast(null as timestamp) dummy from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DUMMY=[null:TIMESTAMP(0)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select*from emp where exists (
+  select 1 from dept where emp.deptno=dept.deptno)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testExistsCorrelatedDecorrelate">
+    <Resource name="sql">
+      <![CDATA[select*from emp where exists (
+  select 1 from dept where emp.deptno=dept.deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[CAST($9):INTEGER], $f1=[CAST($10):BOOLEAN])
+    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+        LogicalProject(DEPTNO=[$0], $f0=[true])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectDistinct">
-        <Resource name="sql">
-            <![CDATA[select distinct sal + 5 from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}])
-  LogicalProject(EXPR$0=[+($5, 5)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExistsCorrelatedDecorrelateRex">
+    <Resource name="sql">
+      <![CDATA[select*from emp where exists (
+  select 1 from dept where emp.deptno=dept.deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[EXISTS({
+LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+})], variablesSet=[[$cor0]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectDistinctGroup">
-        <Resource name="sql">
-            <![CDATA[select distinct sum(sal) from emp group by deptno]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}])
-  LogicalProject(EXPR$0=[$1])
-    LogicalAggregate(group=[{0}], EXPR$0=[SUM($1)])
-      LogicalProject(DEPTNO=[$7], SAL=[$5])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExistsCorrelatedLimit">
+    <Resource name="sql">
+      <![CDATA[select*from emp where exists (
+  select 1 from dept where emp.deptno=dept.deptno limit 1)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[IS NOT NULL($9)])
+    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalSort(fetch=[1])
+            LogicalProject(EXPR$0=[1])
+              LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
+                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testExistsCorrelatedLimitDecorrelate">
+    <Resource name="sql">
+      <![CDATA[select*from emp where exists (
+  select 1 from dept where emp.deptno=dept.deptno limit 1)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f0=[$9])
+    LogicalFilter(condition=[IS NOT NULL($9)])
+      LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+          LogicalProject($f0=[true])
+            LogicalSort(fetch=[1])
+              LogicalProject(EXPR$0=[1])
+                LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
+                  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExplicitTable">
-        <Resource name="sql">
-            <![CDATA[table emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testExistsCorrelatedLimitDecorrelateRex">
+    <Resource name="sql">
+      <![CDATA[select*from emp where exists (
+  select 1 from dept where emp.deptno=dept.deptno limit 1)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalFilter(condition=[EXISTS({
+LogicalSort(fetch=[1])
+  LogicalProject(EXPR$0=[1])
+    LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+})], variablesSet=[[$cor0]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCollectionTable">
-        <Resource name="sql">
-            <![CDATA[select * from table(ramp(3))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(I=[$0])
-  LogicalTableFunctionScan(invocation=[RAMP(3)], rowType=[RecordType(INTEGER I)])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInValueListShort">
-        <Resource name="sql">
-            <![CDATA[select empno from emp where deptno in (10, 20)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testExistsDecorrelateComplexCorrelationPredicate">
+    <Resource name="sql">
+      <![CDATA[select e1.empno from empnullables e1 where exists (
+  select 1 from empnullables e2 where COALESCE(e1.ename,'M')=COALESCE(e2.ename,'M'))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[OR(=($7, 10), =($7, 20))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalFilter(condition=[IS NOT NULL($9)])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f0=[$11])
+      LogicalJoin(condition=[=($9, $10)], joinType=[left])
+        LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[CASE(IS NOT NULL($1), $1, 'M':VARCHAR(20))])
+          LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
+        LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+          LogicalProject($f9=[CASE(IS NOT NULL($1), CAST($1):VARCHAR(20) NOT NULL, 'M':VARCHAR(20))], $f0=[true])
+            LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInValueListLong">
-        <Resource name="sql">
-            <![CDATA[select empno from emp where deptno in (10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 220, 230)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+    </Resource>
+  </TestCase>
+  <TestCase name="testExplicitTable">
+    <Resource name="sql">
+      <![CDATA[table emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testFakeStar">
+    <Resource name="sql">
+      <![CDATA[SELECT * FROM (VALUES (0, 0)) AS T(A, "*")]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(A=[$0], *=[$1])
+  LogicalValues(tuples=[[{ 0, 0 }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testFetch">
+    <Resource name="sql">
+      <![CDATA[select empno from emp fetch next 5 rows only]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(fetch=[5])
+  LogicalProject(EMPNO=[$0])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}])
-      LogicalValues(tuples=[[{ 10 }, { 20 }, { 30 }, { 40 }, { 50 }, { 60 }, { 70 }, { 80 }, { 90 }, { 100 }, { 110 }, { 120 }, { 130 }, { 140 }, { 150 }, { 160 }, { 170 }, { 180 }, { 190 }, { 200 }, { 210 }, { 220 }, { 230 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInUncorrelatedSubQuery">
-        <Resource name="sql">
-            <![CDATA[select empno from emp where deptno in (select deptno from dept)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+    </Resource>
+  </TestCase>
+  <TestCase name="testFetchWithDynamicParameter">
+    <Resource name="sql">
+      <![CDATA[select empno from emp fetch next ? rows only]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(fetch=[?0])
+  LogicalProject(EMPNO=[$0])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}])
-      LogicalProject(DEPTNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCollectionTableWithCursorParam">
-        <Resource name="sql">
-            <![CDATA[select * from table(dedup(cursor(select ename from emp), cursor(select name from dept), 'NAME'))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(NAME=[$0])
-  LogicalTableFunctionScan(invocation=[DEDUP(CAST($0):CURSOR NOT NULL, CAST($1):CURSOR NOT NULL, 'NAME')], rowType=[RecordType(VARCHAR(1024) NAME)])
-    LogicalProject(ENAME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(NAME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testFlattenRecords">
+    <Resource name="sql">
+      <![CDATA[select employees[1] from dept_nested]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[ROW(ITEM($3, 1).EMPNO, ITEM($3, 1).ENAME, ROW(ITEM($3, 1).DETAIL.SKILLS))])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testFunctionWithStructInput">
-        <Resource name="sql">
-            <![CDATA[select json_type(skill)
+    </Resource>
+  </TestCase>
+  <TestCase name="testFunctionWithStructInput">
+    <Resource name="sql">
+      <![CDATA[select json_type(skill)
 from sales.dept_nested]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EXPR$0=[JSON_TYPE(ROW($2.TYPE, $2.DESC, ROW($2.OTHERS.A, $2.OTHERS.B)))])
   LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupingSetsRepeated">
-        <Resource name="sql">
-            <![CDATA[select deptno, group_id()
-from emp
-group by grouping sets (deptno, (), deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalProject(DEPTNO=[$0], EXPR$1=[0:BIGINT])
-    LogicalAggregate(group=[{0}], groups=[[{0}, {}]])
-      LogicalProject(DEPTNO=[$7])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(DEPTNO=[$0], EXPR$1=[1:BIGINT])
-    LogicalAggregate(group=[{0}])
-      LogicalProject(DEPTNO=[$7])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroup">
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}])
+  LogicalProject(DEPTNO=[$7])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrder">
-        <Resource name="sql">
-            <![CDATA[select empno from emp order by empno, empno desc]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[ASC])
-  LogicalProject(EMPNO=[$0])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select deptno from emp group by deptno]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupAlias">
+    <Resource name="sql">
+      <![CDATA[select "$f2", max(x), max(x + 1)
+from (values (1, 2)) as t("$f2", x)
+group by "$f2"]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)], EXPR$2=[MAX($2)])
+  LogicalProject($f2=[$0], X=[$1], $f3=[+($1, 1)])
+    LogicalValues(tuples=[[{ 1, 2 }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupBug281">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(NAME=[$0])
+  LogicalAggregate(group=[{0}])
+    LogicalProject(NAME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select name from (select name from dept group by name)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupBug281b">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(NAME=[$0], FOO=[$2])
+  LogicalAggregate(group=[{0, 1}], FOO=[COUNT()])
+    LogicalProject(NAME=[$1], DEPTNO=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select name, foo from (
+select deptno, name, count(deptno) as foo
+from dept
+group by name, deptno, name)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupByAlias">
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}])
+  LogicalProject(D=[$0])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderDescNullsLast">
-        <Resource name="sql">
-            <![CDATA[select empno from emp order by empno desc nulls last]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[DESC-nulls-last])
-  LogicalProject(EMPNO=[$0])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select empno as d from emp group by d]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupByAliasEqualToColumnName">
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}])
+  LogicalProject(EMPNO=[$0], DEPTNO=[$1])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderBasedRepeatFields">
-        <Resource name="sql">
-            <![CDATA[select empno from emp order by empno DESC, empno ASC]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[DESC])
-  LogicalProject(EMPNO=[$0])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select empno, ename as deptno from emp group by empno, deptno]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupByAliasOfSubExpressionsInProject">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(D=[$0], EXPR$1=[+($0, $1)])
+  LogicalAggregate(group=[{0, 1}])
+    LogicalProject(D=[+($7, $0)], MGR=[$3])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select deptno+empno as d, deptno+empno+mgr
+from emp group by d,mgr]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupByCaseIn">
+    <Resource name="sql">
+      <![CDATA[select
+ (CASE WHEN (deptno IN (10, 20)) THEN 0 ELSE deptno END),
+ min(empno) from EMP
+group by (CASE WHEN (deptno IN (10, 20)) THEN 0 ELSE deptno END)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[MIN($1)])
+  LogicalProject(EXPR$0=[CASE(SEARCH($7, Sarg[10, 20]), 0, $7)], EMPNO=[$0])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderByAlias">
-        <Resource name="sql">
-            <![CDATA[select empno + 1 as x, empno - 2 as y from emp order by y]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(sort0=[$1], dir0=[ASC])
-  LogicalProject(X=[+($0, 1)], Y=[-($0, 2)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupByCaseSubQuery">
+    <Resource name="sql">
+      <![CDATA[SELECT CASE WHEN emp.empno IN (3) THEN 0 ELSE 1 END
+FROM emp
+GROUP BY (CASE WHEN emp.empno IN (3) THEN 0 ELSE 1 END)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}])
+  LogicalProject(EXPR$0=[CASE(=($0, 3), 0, 1)])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderByOrdinalDesc">
-        <Resource name="sql">
-            <![CDATA[select empno + 1, deptno, empno from emp order by 2.5 desc]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(sort0=[$1], dir0=[DESC])
-  LogicalProject(EXPR$0=[+($0, 1)], DEPTNO=[$7], EMPNO=[$0])
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupByCoalesceIn">
+    <Resource name="sql">
+      <![CDATA[select case when coalesce(ename, 'a') in ('1', '2')
+then 'CKA' else 'QT' END, count(distinct deptno) from emp
+group by case when coalesce(ename, 'a') in ('1', '2') then 'CKA' else 'QT' END]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
+  LogicalProject(EXPR$0=[CASE(SEARCH($1, Sarg['1', '2']:CHAR(1)), 'CKA', 'QT ')], DEPTNO=[$7])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderByIdenticalExpr">
-        <Resource name="sql">
-            <![CDATA[select empno + 1 from emp order by deptno asc, empno + 1 desc]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[$0])
-  LogicalSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[DESC])
-    LogicalProject(EXPR$0=[+($0, 1)], DEPTNO=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupByContainsLiterals">
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
+  LogicalProject($f0=[0])
+    LogicalAggregate(group=[{0}])
+      LogicalProject($f0=[SUBSTRING($1, 2, 3)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderByNegativeOrdinal">
-        <Resource name="sql">
-            <![CDATA[select empno + 1, deptno, empno from emp order by -1 desc]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[$0], DEPTNO=[$1], EMPNO=[$2])
-  LogicalSort(sort0=[$3], dir0=[DESC])
-    LogicalProject(EXPR$0=[+($0, 1)], DEPTNO=[$7], EMPNO=[$0], EXPR$3=[-1])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select count(*) from (
+  select 1 from emp group by substring(ename from 2 for 3))]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupByCubeWithNestedColumn">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(X=[$1], unit=[$2], A=[$0], EXPR$3=[$3])
+  LogicalAggregate(group=[{0, 1, 2}], groups=[[{0, 1, 2}, {0, 1}, {0, 2}, {0}, {1, 2}, {1}, {2}, {}]], EXPR$3=[AVG($3)])
+    LogicalProject(A=[$5.SUB.A], X=[$4.X], unit=[$4.unit], $f3=[$4.Y])
+      LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderByOrdinalInExpr">
-        <Resource name="sql">
-            <![CDATA[select empno + 1, deptno, empno from emp order by 1 + 2 desc]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[$0], DEPTNO=[$1], EMPNO=[$2])
-  LogicalSort(sort0=[$3], dir0=[DESC])
-    LogicalProject(EXPR$0=[+($0, 1)], DEPTNO=[$7], EMPNO=[$0], EXPR$3=[+(1, 2)])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select
+  coord.x,
+  coord."unit",
+  coord_ne.sub.a,
+  avg(coord.y)
+from
+  customer.contact_peek
+group by
+  cube (coord_ne.sub.a, coord.x, coord."unit")]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupByExpression">
+    <Resource name="sql">
+      <![CDATA[select count(*)
+from emp
+group by substring(ename FROM 1 FOR 1)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1])
+  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
+    LogicalProject($f0=[SUBSTRING($1, 1, 1)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderByAliasDoesNotObscure">
-        <Resource name="sql">
-            <![CDATA[select empno + 1 as empno, empno - 2 as y from emp order by empno + 3]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-ProjectRel(EMPNO=[$0], Y=[$1])
-  SortRel(sort0=[$2], dir0=[Ascending])
-    ProjectRel(EMPNO=[+($0, 1)], Y=[-($0, 2)], EXPR$2=[+($0, 3)])
-      TableAccessRel(table=[[SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderByAliasInExpr">
-        <Resource name="sql">
-            <![CDATA[select empno + 1 as x, empno - 2 as y
-from emp order by y + 3]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(X=[$0], Y=[$1])
-  LogicalSort(sort0=[$2], dir0=[ASC])
-    LogicalProject(X=[+($0, 1)], Y=[-($0, 2)], EXPR$2=[+(-($0, 2), 3)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupByNestedColumn">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(X=[$1], A=[$0], EXPR$2=[$2])
+  LogicalAggregate(group=[{0, 1}], EXPR$2=[AVG($2)])
+    LogicalProject(A=[$5.SUB.A], X=[$4.X], $f2=[$4.Y])
+      LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderByAliasOverrides">
-        <Resource name="sql">
-            <![CDATA[select empno + 1 as empno, empno - 2 as y
-from emp order by empno + 3]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], Y=[$1])
-  LogicalSort(sort0=[$2], dir0=[ASC])
-    LogicalProject(EMPNO=[+($0, 1)], Y=[-($0, 2)], EXPR$2=[+(+($0, 1), 3)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select
+  coord.x,
+  coord_ne.sub.a,
+  avg(coord.y)
+from
+  customer.contact_peek
+group by
+  coord_ne.sub.a,
+  coord.x]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupByOrdinal">
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}])
+  LogicalProject(EMPNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderUnion">
-        <Resource name="sql">
-            <![CDATA[select empno, sal from emp
-union all
-select deptno, deptno from dept
-order by sal desc, empno asc]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(sort0=[$1], sort1=[$0], dir0=[DESC], dir1=[ASC])
-  LogicalProject(EMPNO=[$0], SAL=[$1])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], SAL=[$5])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(DEPTNO=[$0], DEPTNO0=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select empno from emp group by 1]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupByWithDuplicates">
+    <Resource name="sql">
+      <![CDATA[select sum(sal) from emp group by (), ()]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
+  LogicalProject(SAL=[$5])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderUnionExprs">
-        <Resource name="sql">
-            <![CDATA[select empno, sal from emp
-union all
-select deptno, deptno from dept
-order by empno * sal + 2]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], SAL=[$1])
-  LogicalSort(sort0=[$2], dir0=[ASC])
-    LogicalProject(EMPNO=[$0], SAL=[$1], EXPR$2=[+(*($0, $1), 2)])
-      LogicalUnion(all=[true])
-        LogicalProject(EMPNO=[$0], SAL=[$5])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(DEPTNO=[$0], DEPTNO0=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupEmpty">
+    <Resource name="sql">
+      <![CDATA[select sum(deptno) from emp group by ()]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
+  LogicalProject(DEPTNO=[$7])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderGroup">
-        <Resource name="sql">
-            <![CDATA[select deptno, count(*)
-from emp
-group by deptno
-order by deptno * sum(sal) desc, min(empno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EXPR$1=[$1])
-  LogicalSort(sort0=[$2], sort1=[$3], dir0=[DESC], dir1=[ASC])
-    LogicalProject(DEPTNO=[$0], EXPR$1=[$1], EXPR$2=[*($0, $2)], EXPR$3=[$3])
-      LogicalAggregate(group=[{0}], EXPR$1=[COUNT()], agg#1=[SUM($1)], agg#2=[MIN($2)])
-        LogicalProject(DEPTNO=[$7], SAL=[$5], EMPNO=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupExpressionsInsideAndOut">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($0, 4)], EXPR$1=[$1], EXPR$2=[$2], EXPR$3=[*(2, $3)])
+  LogicalAggregate(group=[{0}], EXPR$1=[SUM($1)], EXPR$2=[SUM($2)], agg#2=[COUNT()])
+    LogicalProject(DEPTNO=[$7], SAL=[$5], $f2=[+(3, $5)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderDistinct">
-        <Resource name="sql">
-            <![CDATA[select distinct empno, deptno + 1
-from emp order by deptno + 1 + empno]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], EXPR$1=[$1])
-  LogicalSort(sort0=[$2], dir0=[ASC])
-    LogicalAggregate(group=[{0, 1, 2}])
-      LogicalProject(EMPNO=[$0], EXPR$1=[+($7, 1)], EXPR$2=[+(+($7, 1), $0)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select
+  deptno + 4, sum(sal), sum(3 + sal), 2 * count(sal)
+from emp group by deptno]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupJustOneAgg">
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}], SUM_SAL=[SUM($1)])
+  LogicalProject(DEPTNO=[$7], SAL=[$5])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderBySameExpr">
-        <Resource name="sql">
-            <![CDATA[select empno from emp, dept
-order by sal + empno desc, sal * empno, sal + empno desc]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalSort(sort0=[$1], sort1=[$2], dir0=[DESC], dir1=[ASC])
-    LogicalProject(EMPNO=[$0], EXPR$1=[+($5, $0)], EXPR$2=[*($5, $0)])
-      LogicalJoin(condition=[true], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select deptno, sum(sal) as sum_sal from emp group by deptno]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupingFunction">
+    <Resource name="sql">
+      <![CDATA[select
+  deptno, grouping(deptno), count(*), grouping(empno)
+from emp
+group by rollup(empno, deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$1], EXPR$1=[$2], EXPR$2=[$3], EXPR$3=[$4])
+  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$1=[GROUPING($1)], EXPR$2=[COUNT()], EXPR$3=[GROUPING($0)])
+    LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderUnionOrdinal">
-        <Resource name="sql">
-            <![CDATA[select empno, sal from emp
-union all
-select deptno, deptno from dept
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupingFunctionWithGroupBy">
+    <Resource name="sql">
+      <![CDATA[select
+  deptno, grouping(deptno), count(*), grouping(empno)
+from emp
+group by empno, deptno
 order by 2]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalSort(sort0=[$1], dir0=[ASC])
-  LogicalProject(EMPNO=[$0], SAL=[$1])
-    LogicalUnion(all=[true])
-      LogicalProject(EMPNO=[$0], SAL=[$5])
+  LogicalProject(DEPTNO=[$1], EXPR$1=[$2], EXPR$2=[$3], EXPR$3=[$4])
+    LogicalAggregate(group=[{0, 1}], EXPR$1=[GROUPING($1)], EXPR$2=[COUNT()], EXPR$3=[GROUPING($0)])
+      LogicalProject(EMPNO=[$0], DEPTNO=[$7])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(DEPTNO=[$0], DEPTNO0=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSample">
-        <Resource name="sql">
-            <![CDATA[select * from emp tablesample substitute('DATASET1') where empno > 5]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[>($0, 5)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupingSets">
+    <Resource name="sql">
+      <![CDATA[select deptno, ename, sum(sal) from emp
+group by grouping sets ((deptno), (ename, deptno))
+order by 2]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(sort0=[$1], dir0=[ASC])
+  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}]], EXPR$2=[SUM($2)])
+    LogicalProject(DEPTNO=[$7], ENAME=[$1], SAL=[$5])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSampleQuery">
-        <Resource name="sql">
-            <![CDATA[select * from (
- select * from emp as e tablesample substitute('DATASET1')
- join dept on e.deptno = dept.deptno
-) tablesample substitute('DATASET2')
-where empno > 5]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalFilter(condition=[>($0, 5)])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-      LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOverOrderWindow">
-        <Resource name="sql">
-            <![CDATA[select last_value(deptno) over (order by empno)
-from emp
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupingSetsCartesianProduct">
+    <Resource name="sql">
+      <![CDATA[select 1
+from (values (1, 2, 3, 4)) as t(a, b, c, d)
+group by grouping sets (a, b), grouping sets (c, d)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalAggregate(group=[{0, 1, 2, 3}], groups=[[{0, 2}, {0, 3}, {1, 2}, {1, 3}]])
+    LogicalValues(tuples=[[{ 1, 2, 3, 4 }]])
 ]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[LAST_VALUE($7) OVER (ORDER BY $0)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupingSetsCartesianProduct2">
+    <Resource name="sql">
+      <![CDATA[select 1
+from (values (1, 2, 3, 4)) as t(a, b, c, d)
+group by grouping sets (a, (a, b)), grouping sets (c), d]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalAggregate(group=[{0, 1, 2, 3}], groups=[[{0, 1, 2, 3}, {0, 2, 3}]])
+    LogicalValues(tuples=[[{ 1, 2, 3, 4 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOverNullTreatmentWindow">
-        <Resource name="sql">
-            <![CDATA[select
-lead(deptno, 1) over w,
- lead(deptno, 2) ignore nulls over w,
-lead(deptno, 3) respect nulls over w,
-lead(deptno, 1) over w,
-lag(deptno, 2) ignore nulls over w,
-lag(deptno, 2) respect nulls over w,
-first_value(deptno) over w,
-first_value(deptno) ignore nulls over w,
-first_value(deptno) respect nulls over w,
-last_value(deptno) over w,
-last_value(deptno) ignore nulls over w,
-last_value(deptno) respect nulls over w
- from emp
-window w as (order by empno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[LEAD($7, 1) OVER (ORDER BY $0)], EXPR$1=[LEAD($7, 2) IGNORE NULLS OVER (ORDER BY $0)], EXPR$2=[LEAD($7, 3) OVER (ORDER BY $0)], EXPR$3=[LEAD($7, 1) OVER (ORDER BY $0)], EXPR$4=[LAG($7, 2) IGNORE NULLS OVER (ORDER BY $0)], EXPR$5=[LAG($7, 2) OVER (ORDER BY $0)], EXPR$6=[FIRST_VALUE($7) OVER (ORDER BY $0)], EXPR$7=[FIRST_VALUE($7) IGNORE NULLS OVER (ORDER BY $0)], EXPR$8=[FIRST_VALUE($7) OVER (ORDER BY $0)], EXPR$9=[LAST_VALUE($7) OVER (ORDER BY $0)], EXPR$10=[LAST_VALUE($7) IGNORE NULLS OVER (ORDER BY $0)], EXPR$11=[LAST_VALUE($7) OVER (ORDER BY $0)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupingSetsProduct">
+    <Resource name="sql">
+      <![CDATA[select 1
+from (values (0, 1, 2, 3, 4)) as t(a, b, c, x, y)
+group by grouping sets ((a, b), c), grouping sets ((x, y), ())]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalAggregate(group=[{0, 1, 2, 3, 4}], groups=[[{0, 1, 3, 4}, {0, 1}, {2, 3, 4}, {2}]])
+    LogicalValues(tuples=[[{ 0, 1, 2, 3, 4 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOverOrderFollowingWindow">
-        <Resource name="sql">
-            <![CDATA[select
-  last_value(deptno) over (order by empno rows 2 following)
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupingSetsRepeated">
+    <Resource name="sql">
+      <![CDATA[select deptno, group_id()
 from emp
+group by grouping sets (deptno, (), deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalProject(DEPTNO=[$0], EXPR$1=[0:BIGINT])
+    LogicalAggregate(group=[{0}], groups=[[{0}, {}]])
+      LogicalProject(DEPTNO=[$7])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(DEPTNO=[$0], EXPR$1=[1:BIGINT])
+    LogicalAggregate(group=[{0}])
+      LogicalProject(DEPTNO=[$7])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[LAST_VALUE($7) OVER (ORDER BY $0 ROWS BETWEEN CURRENT ROW AND 2 FOLLOWING)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupingSetsWith">
+    <Resource name="sql">
+      <![CDATA[with t(a, b, c, d) as (values (1, 2, 3, 4))
+select 1 from t
+group by rollup(a, b), rollup(c, d)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalAggregate(group=[{0, 1, 2, 3}], groups=[[{0, 1, 2, 3}, {0, 1, 2}, {0, 1}, {0, 2, 3}, {0, 2}, {0}, {2, 3}, {2}, {}]])
+    LogicalValues(tuples=[[{ 1, 2, 3, 4 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInterval">
-        <Resource name="sql">
-            <![CDATA[values(cast(interval '1' hour as interval hour to second))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-ProjectRel(EXPR$0=[$0])
-  ProjectRel(EXPR$0=[3600000])
-    OneRowRel
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupingSetsWithCube">
+    <Resource name="sql">
+      <![CDATA[select deptno, ename, sum(sal) from emp
+group by grouping sets ( (deptno), CUBE(ename, deptno))
+order by 2]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(sort0=[$1], dir0=[ASC])
+  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {1}, {}]], EXPR$2=[SUM($2)])
+    LogicalProject(DEPTNO=[$7], ENAME=[$1], SAL=[$5])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOverAvg2">
-        <Resource name="sql">
-            <![CDATA[select sum(sal) over w1,
-  avg(CAST(sal as real)) over w1
-from emp
-window w1 as (partition by job order by hiredate rows 2 preceding)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[CASE(>(COUNT($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), 0), $SUM0($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), null:INTEGER)], EXPR$1=[/(CASE(>(COUNT(CAST($5):REAL NOT NULL) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), 0), $SUM0(CAST($5):REAL NOT NULL) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), null:REAL), COUNT(CAST($5):REAL NOT NULL) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING))])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupingSetsWithNestedColumn">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(X=[$1], unit=[$2], A=[$0], EXPR$3=[$3])
+  LogicalAggregate(group=[{0, 1, 2}], groups=[[{0, 1, 2}, {1, 2}]], EXPR$3=[AVG($3)])
+    LogicalProject(A=[$5.SUB.A], X=[$4.X], unit=[$4.unit], $f3=[$4.Y])
+      LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinUsing">
-        <Resource name="sql">
-            <![CDATA[SELECT * FROM emp JOIN dept USING (deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7], EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8], NAME=[$10])
-  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select
+  coord.x,
+  coord."unit",
+  coord_ne.sub.a,
+  avg(coord.y)
+from
+  customer.contact_peek
+group by
+  grouping sets (
+    (coord_ne.sub.a, coord.x, coord."unit"),
+    (coord.x, coord."unit")
+  )]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupingSetsWithRollup">
+    <Resource name="sql">
+      <![CDATA[select deptno, ename, sum(sal) from emp
+group by grouping sets ( rollup(deptno), (ename, deptno))
+order by 2]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(sort0=[$1], dir0=[ASC])
+  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[SUM($2)])
+    LogicalProject(DEPTNO=[$7], ENAME=[$1], SAL=[$5])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinUsingCompound">
-        <Resource name="sql">
-            <![CDATA[SELECT * FROM emp LEFT JOIN (SELECT *, deptno * 5 as empno FROM dept) USING (deptno,empno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7], EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8], NAME=[$10])
-  LogicalJoin(condition=[AND(=($7, $9), =($0, $11))], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[*($0, 5)])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testGroupingSetsWithRollupCube">
+    <Resource name="sql">
+      <![CDATA[select deptno, ename, sum(sal) from emp
+group by grouping sets ( CUBE(deptno), ROLLUP(ename, deptno))
+order by 2]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(sort0=[$1], dir0=[ASC])
+  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {1}, {}]], EXPR$2=[SUM($2)])
+    LogicalProject(DEPTNO=[$7], ENAME=[$1], SAL=[$5])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinOn">
-        <Resource name="sql">
-            <![CDATA[SELECT * FROM emp
-JOIN dept on emp.deptno = dept.deptno]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testGrpByColFromStarInSubQuery">
+    <Resource name="sql">
+      <![CDATA[SELECT n.n_nationkey AS col  from (SELECT * FROM SALES.NATION) as n  group by n.n_nationkey]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}])
+  LogicalProject(COL=[ITEM($0, 'N_NATIONKEY')])
+    LogicalTableScan(table=[[CATALOG, SALES, NATION]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinOnIn">
-        <Resource name="sql">
-            <![CDATA[select * from emp join dept
- on emp.deptno = dept.deptno and emp.empno in (1, 3)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[AND(=($7, $9), SEARCH($0, Sarg[1, 3]))], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testHaving">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[$0])
+  LogicalFilter(condition=[>($1, 10)])
+    LogicalAggregate(group=[{}], EXPR$0=[SUM($0)], agg#1=[SUM($1)])
+      LogicalProject($f0=[+($5, $5)], SAL=[$5])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSampleBernoulli">
-        <Resource name="sql">
-            <![CDATA[select * from emp tablesample bernoulli(50) where empno > 5]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[>($0, 5)])
-    Sample(mode=[bernoulli], rate=[0.5], repeatableSeed=[-])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select sum(sal + sal) from emp having sum(sal) > 10]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testHavingAggrFunctionIn">
+    <Resource name="sql">
+      <![CDATA[select deptno
+from emp
+group by deptno
+having sum(case when deptno in (1, 2) then 0 else 1 end) +
+sum(case when deptno in (3, 4) then 0 else 1 end) > 10]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0])
+  LogicalFilter(condition=[>(+($1, $2), 10)])
+    LogicalAggregate(group=[{0}], agg#0=[SUM($1)], agg#1=[SUM($2)])
+      LogicalProject(DEPTNO=[$7], $f1=[CASE(SEARCH($7, Sarg[1, 2]), 0, 1)], $f2=[CASE(SEARCH($7, Sarg[3, 4]), 0, 1)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSampleBernoulliQuery">
-        <Resource name="sql">
-            <![CDATA[select * from (
- select * from emp as e tablesample bernoulli(10) repeatable(1)
- join dept on e.deptno = dept.deptno
-) tablesample bernoulli(50) repeatable(99)
-where empno > 5]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalFilter(condition=[>($0, 5)])
-    Sample(mode=[bernoulli], rate=[0.5], repeatableSeed=[99])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-        LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-          Sample(mode=[bernoulli], rate=[0.1], repeatableSeed=[1])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testHavingInSubQueryWithAggrFunction">
+    <Resource name="sql">
+      <![CDATA[select sal
+from emp
+group by sal
+having sal in (
+  select deptno
+  from dept
+  group by deptno
+  having sum(deptno) > 0)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(SAL=[$0])
+  LogicalJoin(condition=[=($0, $1)], joinType=[inner])
+    LogicalAggregate(group=[{0}])
+      LogicalProject(SAL=[$5])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}])
+      LogicalProject(DEPTNO=[$0])
+        LogicalFilter(condition=[>($1, 0)])
+          LogicalAggregate(group=[{0}], agg#0=[SUM($0)])
+            LogicalProject(DEPTNO=[$0])
+              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSampleSystem">
-        <Resource name="sql">
-            <![CDATA[select * from emp tablesample system(50) where empno > 5]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[>($0, 5)])
-    Sample(mode=[system], rate=[0.5], repeatableSeed=[-])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testHopTable">
+    <Resource name="sql">
+      <![CDATA[select stream hop_start(rowtime, interval '1' hour, interval '3' hour) as rowtime,
+  count(*) as c
+from orders
+group by hop(rowtime, interval '1' hour, interval '3' hour)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalDelta
+  LogicalProject(ROWTIME=[$0], C=[$1])
+    LogicalAggregate(group=[{0}], C=[COUNT()])
+      LogicalProject($f0=[$HOP($0, 3600000:INTERVAL HOUR, 10800000:INTERVAL HOUR)])
+        LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSampleSystemQuery">
-        <Resource name="sql">
-            <![CDATA[select * from (
- select * from emp as e tablesample system(10) repeatable(1)
- join dept on e.deptno = dept.deptno
-) tablesample system(50) repeatable(99)
-where empno > 5]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalFilter(condition=[>($0, 5)])
-    Sample(mode=[system], rate=[0.5], repeatableSeed=[99])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-        LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-          Sample(mode=[system], rate=[0.1], repeatableSeed=[1])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testIdenticalExpressionInSubQuery">
+    <Resource name="sql">
+      <![CDATA[select deptno
+from EMP
+where deptno in (1, 2) or deptno in (1, 2)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7])
+  LogicalFilter(condition=[OR(=($7, 1), =($7, 2), =($7, 1), =($7, 2))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectDistinctDup">
-        <Resource name="sql">
-            <![CDATA[select distinct sal + 5, deptno, sal + 5 from emp where deptno < 10]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[$0], DEPTNO=[$1], EXPR$2=[$0])
-  LogicalAggregate(group=[{0, 1}])
-    LogicalProject(EXPR$0=[+($5, 5)], DEPTNO=[$7])
-      LogicalFilter(condition=[<($7, 10)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testImplicitJoinExpandAndDecorrelation">
+    <Resource name="plan_extended">
+      <![CDATA[
+LogicalProject(DEPTNO=[$9], SAL=[$7])
+  LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[$2], ENAME=[$3], JOB=[$4], MGR=[$5], HIREDATE=[$6], SAL=[$7], COMM=[$8], DEPTNO0=[$9], SLACKER=[$10], DEPTNO1=[CAST($11):INTEGER], EXPR$0=[CAST($12):INTEGER])
+    LogicalJoin(condition=[AND(=($0, $11), <($7, $12))], joinType=[inner])
+      LogicalJoin(condition=[=($9, $0)], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{0}], EXPR$0=[AVG($1)])
+        LogicalProject(DEPTNO=[$7], SAL=[$5])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCountNoGroup">
-        <Resource name="sql">
-            <![CDATA[select count(*), sum(sal)
-from emp
-where empno > 10]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[COUNT()], EXPR$1=[SUM($0)])
+    </Resource>
+    <Resource name="plan_not_extended">
+      <![CDATA[
+LogicalProject(DEPTNO=[$9], SAL=[$7])
+  LogicalFilter(condition=[AND(=($9, $0), <($7, $SCALAR_QUERY({
+LogicalAggregate(group=[{}], EXPR$0=[AVG($0)])
   LogicalProject(SAL=[$5])
-    LogicalFilter(condition=[>($0, 10)])
+    LogicalFilter(condition=[=($7, $cor0.DEPTNO)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAliasList">
-        <Resource name="sql">
-            <![CDATA[select a + b from (
-  select deptno, 1 as uno, name from dept
-) as d(a, b, c)
-where c like 'X%']]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($0, $1)])
-  LogicalFilter(condition=[LIKE($2, 'X%')])
-    LogicalProject(DEPTNO=[$0], UNO=[1], NAME=[$1])
+})))], variablesSet=[[$cor0]])
+    LogicalJoin(condition=[true], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAliasList2">
-        <Resource name="sql">
-            <![CDATA[select * from (
-  select a, b, c from (values (1, 2, 3)) as t (c, b, a)
-) join dept on dept.deptno = c
-order by c + a]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(A=[$0], B=[$1], C=[$2], DEPTNO=[$3], NAME=[$4])
-  LogicalSort(sort0=[$5], dir0=[ASC])
-    LogicalProject(A=[$0], B=[$1], C=[$2], DEPTNO=[$3], NAME=[$4], EXPR$5=[+($2, $0)])
-      LogicalJoin(condition=[=($3, $2)], joinType=[inner])
-        LogicalProject(A=[$2], B=[$1], C=[$0])
-          LogicalValues(tuples=[[{ 1, 2, 3 }]])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[SELECT emp.deptno, emp.sal
+FROM dept, emp WHERE emp.deptno = dept.deptno AND emp.sal < (
+  SELECT AVG(emp.sal)
+  FROM emp
+  WHERE  emp.deptno = dept.deptno
+)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testInToSemiJoin">
+    <Resource name="sql">
+      <![CDATA[SELECT empno
+FROM emp AS e
+WHERE cast(e.empno as bigint) in (130, 131, 132, 133, 134)]]>
+    </Resource>
+    <Resource name="planNotConverted">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[OR(=(CAST($0):BIGINT NOT NULL, 130), =(CAST($0):BIGINT NOT NULL, 131), =(CAST($0):BIGINT NOT NULL, 132), =(CAST($0):BIGINT NOT NULL, 133), =(CAST($0):BIGINT NOT NULL, 134))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testStructTypeAlias">
-        <Resource name="sql">
-            <![CDATA[select t.r AS myRow
-from (select row(row(1)) r from dept) t]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(MYROW=[ROW(ROW(1))])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinWithUnion">
-        <Resource name="sql">
-            <![CDATA[select grade
-from (select empno from emp union select deptno from dept),
-  salgrade]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(GRADE=[$1])
-  LogicalJoin(condition=[true], joinType=[inner])
-    LogicalUnion(all=[false])
-      LogicalProject(EMPNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(DEPTNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, SALGRADE]])
+    </Resource>
+    <Resource name="planConverted">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalJoin(condition=[=($9, $10)], joinType=[inner])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EMPNO0=[CAST($0):BIGINT NOT NULL])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}])
+      LogicalValues(tuples=[[{ 130 }, { 131 }, { 132 }, { 133 }, { 134 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinUsingWithUnqualifiedCommonColumn">
-        <Resource name="sql">
-            <![CDATA[SELECT deptno, name
-FROM emp JOIN dept using (deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7], NAME=[$10])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInUncorrelatedSubQuery">
+    <Resource name="sql">
+      <![CDATA[select empno from emp where deptno in (select deptno from dept)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
   LogicalJoin(condition=[=($7, $9)], joinType=[inner])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinUsingWithUnqualifiedNestedCommonColumn">
-        <Resource name="sql">
-            <![CDATA[select (coord).x from
-customer.contact_peek t1
-join customer.contact_peek t2
-using (coord)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[COALESCE(ROW($4, $5, $6), ROW($14, $15, $16)).X])
-  LogicalJoin(condition=[AND(AND(=($4, $14), =($5, $15)), =($6, $16))], joinType=[inner])
-    LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
-      LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-    LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
-      LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinUsingWithAggregate">
-        <Resource name="sql">
-            <![CDATA[select deptno, count(*)
-from emp
-full join dept using (deptno)
-group by deptno]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EXPR$1=[$1])
-  LogicalAggregate(group=[{0}], EXPR$1=[COUNT()])
-    LogicalProject($f0=[COALESCE($7, $9)])
-      LogicalJoin(condition=[=($7, $9)], joinType=[full])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}])
+      LogicalProject(DEPTNO=[$0])
         LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinUsingWithGroupingSets">
-        <Resource name="sql">
-            <![CDATA[select deptno, grouping(deptno),
-grouping(deptno, job), count(*)
+    </Resource>
+  </TestCase>
+  <TestCase name="testInUncorrelatedSubQueryInHavingRex">
+    <Resource name="sql">
+      <![CDATA[select sum(sal) as s
 from emp
-join dept using (deptno)
-group by grouping sets ((deptno), (deptno, job))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EXPR$1=[$2], EXPR$2=[$3], EXPR$3=[$4])
-  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}]], EXPR$1=[GROUPING($0)], EXPR$2=[GROUPING($0, $1)], EXPR$3=[COUNT()])
-    LogicalProject($f0=[$7], JOB=[$2])
-      LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+group by deptno
+having count(*) > 2
+and deptno in (
+  select case when true then deptno else null end from emp)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(S=[$1])
+  LogicalFilter(condition=[AND(>($2, 2), IN($0, {
+LogicalProject(EXPR$0=[CAST($7):INTEGER])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}))])
+    LogicalAggregate(group=[{0}], S=[SUM($1)], agg#1=[COUNT()])
+      LogicalProject(DEPTNO=[$7], SAL=[$5])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testInUncorrelatedSubQueryInSelect">
+    <Resource name="sql">
+      <![CDATA[select name, deptno in (
+  select case when true then deptno else null end from emp)
+from dept]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(NAME=[$1], EXPR$1=[OR(AND(IS NOT NULL($6), <>($2, 0)), AND(<($3, $2), null, <>($2, 0), IS NULL($6)))])
+  LogicalJoin(condition=[=($4, $5)], joinType=[left])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], $f0=[$2], $f1=[$3], DEPTNO0=[$0])
+      LogicalJoin(condition=[true], joinType=[inner])
         LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalAggregate(group=[{}], agg#0=[COUNT()], agg#1=[COUNT($0)])
+          LogicalProject(EXPR$0=[CAST($7):INTEGER], $f1=[true])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+      LogicalProject(EXPR$0=[CAST($7):INTEGER], $f1=[true])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinUsingWithMultipleJoin">
-        <Resource name="sql">
-            <![CDATA[SELECT deptno, ename
-FROM emp JOIN dept using (deptno)
-JOIN (values ('Calcite', 200)) as s(ename, salary) using (ename)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7], ENAME=[$1])
-  LogicalJoin(condition=[=($1, $11)], joinType=[inner])
-    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalValues(tuples=[[{ 'Calcite', 200 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInUncorrelatedSubQueryInSelectRex">
+    <Resource name="sql">
+      <![CDATA[select name, deptno in (
+  select case when true then deptno else null end from emp)
+from dept]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(NAME=[$1], EXPR$1=[IN($0, {
+LogicalProject(EXPR$0=[CAST($7):INTEGER])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+})])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinNatural">
-        <Resource name="sql">
-            <![CDATA[SELECT * FROM emp NATURAL JOIN dept]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7], EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8], NAME=[$10])
-  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInUncorrelatedSubQueryRex">
+    <Resource name="sql">
+      <![CDATA[select empno from emp where deptno in (select deptno from dept)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[IN($7, {
+LogicalProject(DEPTNO=[$0])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+})])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinNaturalNoCommonColumn">
-        <Resource name="sql">
-            <![CDATA[SELECT *
-FROM emp NATURAL JOIN (SELECT deptno AS foo, name FROM dept) AS d]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], FOO=[$9], NAME=[$10])
-  LogicalJoin(condition=[true], joinType=[inner])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInValueListLong">
+    <Resource name="sql">
+      <![CDATA[select empno from emp where deptno in (10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 220, 230)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(FOO=[$0], NAME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalAggregate(group=[{0}])
+      LogicalValues(tuples=[[{ 10 }, { 20 }, { 30 }, { 40 }, { 50 }, { 60 }, { 70 }, { 80 }, { 90 }, { 100 }, { 110 }, { 120 }, { 130 }, { 140 }, { 150 }, { 160 }, { 170 }, { 180 }, { 190 }, { 200 }, { 210 }, { 220 }, { 230 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinNaturalMultipleCommonColumn">
-        <Resource name="sql">
-            <![CDATA[SELECT *
-FROM emp
-NATURAL JOIN (SELECT deptno, name AS ename FROM dept) AS d]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ENAME=[$1], DEPTNO=[$7], EMPNO=[$0], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
-  LogicalJoin(condition=[AND(=($1, $10), =($7, $9))], joinType=[inner])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInValueListShort">
+    <Resource name="sql">
+      <![CDATA[select empno from emp where deptno in (10, 20)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[OR(=($7, 10), =($7, 20))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], ENAME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderOffsetFetch">
-        <Resource name="sql">
-            <![CDATA[select empno from emp
-order by empno offset 10 rows fetch next 5 rows only]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[ASC], offset=[10], fetch=[5])
-  LogicalProject(EMPNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsert">
+    <Resource name="sql">
+      <![CDATA[insert into empnullables (deptno, empno, ename)
+values (10, 150, 'Fred')]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[true])
+  LogicalProject(EMPNO=[$1], ENAME=[$2], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[null:INTEGER], COMM=[null:INTEGER], DEPTNO=[$0], SLACKER=[null:BOOLEAN])
+    LogicalValues(tuples=[[{ 10, 150, 'Fred' }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderOffsetFetchWithDynamicParameter">
-        <Resource name="sql">
-            <![CDATA[select empno from emp
-order by empno offset ? rows fetch next ? rows only]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[ASC], offset=[?0], fetch=[?1])
-  LogicalProject(EMPNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertBind">
+    <Resource name="sql">
+      <![CDATA[insert into empnullables (deptno, empno, ename)
+values (?, ?, ?)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[true])
+  LogicalProject(EMPNO=[?1], ENAME=[?2], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[null:INTEGER], COMM=[null:INTEGER], DEPTNO=[?0], SLACKER=[null:BOOLEAN])
+    LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testFetch">
-        <Resource name="sql">
-            <![CDATA[select empno from emp fetch next 5 rows only]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(fetch=[5])
-  LogicalProject(EMPNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertBindExtendedColumn">
+    <Resource name="sql">
+      <![CDATA[insert into empdefaults(updated TIMESTAMP)
+ (ename, deptno, empno, updated, sal)
+ values ('Fred', 456, 44, ?, 999999)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
+  LogicalProject(EMPNO=[44], ENAME=['Fred'], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[999999], COMM=[null:INTEGER], DEPTNO=[456], SLACKER=[null:BOOLEAN], UPDATED=[?0])
+    LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testFetchWithDynamicParameter">
-        <Resource name="sql">
-            <![CDATA[select empno from emp fetch next ? rows only]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(fetch=[?0])
-  LogicalProject(EMPNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertBindExtendedColumnModifiableView">
+    <Resource name="sql">
+      <![CDATA[insert into EMP_MODIFIABLEVIEW2(updated TIMESTAMP)
+ (ename, deptno, empno, updated, sal)
+ values ('Fred', 20, 44, ?, 999999)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
+  LogicalFilter(condition=[=($7, 20)])
+    LogicalProject(EMPNO=[44], ENAME=['Fred':VARCHAR(20)], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[999999], COMM=[null:INTEGER], DEPTNO=[20], SLACKER=[null:BOOLEAN], EXTRA=[null:BOOLEAN], UPDATED=[?0])
+      LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOffsetFetch">
-        <Resource name="sql">
-            <![CDATA[select empno from emp
-offset 10 rows fetch next 5 rows only]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(offset=[10], fetch=[5])
-  LogicalProject(EMPNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertBindModifiableView">
+    <Resource name="sql">
+      <![CDATA[insert into EMP_MODIFIABLEVIEW (empno, job) values (?, ?)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
+  LogicalProject(EMPNO=[CAST(?0):INTEGER NOT NULL], ENAME=['Bob':VARCHAR(20)], JOB=[?1], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[555], COMM=[null:INTEGER], DEPTNO=[20], SLACKER=[null:BOOLEAN])
+    LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOffsetFetchWithDynamicParameter">
-        <Resource name="sql">
-            <![CDATA[select empno from emp
-offset ? rows fetch next ? rows only]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(offset=[?0], fetch=[?1])
-  LogicalProject(EMPNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertBindSubset">
+    <Resource name="sql">
+      <![CDATA[insert into empnullables
+values (?, ?)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[true])
+  LogicalProject(EMPNO=[?0], ENAME=[?1], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[null:INTEGER], COMM=[null:INTEGER], DEPTNO=[null:INTEGER], SLACKER=[null:BOOLEAN])
+    LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOffset">
-        <Resource name="sql">
-            <![CDATA[select empno from emp offset 10 rows]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(offset=[10])
-  LogicalProject(EMPNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertBindSubsetModifiableView">
+    <Resource name="sql">
+      <![CDATA[insert into EMP_MODIFIABLEVIEW values (?, ?)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
+  LogicalProject(EMPNO=[CAST(?0):INTEGER NOT NULL], ENAME=[CAST(?1):VARCHAR(20) NOT NULL], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[555], COMM=[null:INTEGER], DEPTNO=[20], SLACKER=[null:BOOLEAN])
+    LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOffsetWithDynamicParameter">
-        <Resource name="sql">
-            <![CDATA[select empno from emp offset ? rows]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(offset=[?0])
-  LogicalProject(EMPNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertBindSubsetWithCustomInitializerExpressionFactory">
+    <Resource name="sql">
+      <![CDATA[insert into empdefaults values (?)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
+  LogicalProject(EMPNO=[?0], ENAME=['Bob'], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[555], COMM=[null:INTEGER], DEPTNO=[null:INTEGER], SLACKER=[null:BOOLEAN])
+    LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinUsingDynamicTable">
-        <Resource name="sql">
-            <![CDATA[select * from SALES.NATION t1
-join SALES.NATION t2
-using (n_nationkey)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(**=[$1], **0=[$3])
-  LogicalJoin(condition=[=($0, $2)], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, NATION]])
-    LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertBindWithCustomInitializerExpressionFactory">
+    <Resource name="sql">
+      <![CDATA[insert into empdefaults (deptno) values (?)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
+  LogicalProject(EMPNO=[123], ENAME=['Bob'], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[555], COMM=[null:INTEGER], DEPTNO=[?0], SLACKER=[null:BOOLEAN])
+    LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMultiAnd">
-        <Resource name="sql">
-            <![CDATA[select * from emp
-where deptno < 10
-and deptno > 5
-and (deptno = 8 or empno < 100)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[AND(<($7, 10), >($7, 5), OR(=($7, 8), <($0, 100)))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertExtendedColumn">
+    <Resource name="sql">
+      <![CDATA[insert into empdefaults(updated TIMESTAMP)
+ (ename, deptno, empno, updated, sal)
+ values ('Fred', 456, 44, timestamp '2017-03-12 13:03:05', 999999)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
+  LogicalProject(EMPNO=[$2], ENAME=[$0], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[$4], COMM=[null:INTEGER], DEPTNO=[$1], SLACKER=[null:BOOLEAN], UPDATED=[$3])
+    LogicalValues(tuples=[[{ 'Fred', 456, 44, 2017-03-12 13:03:05, 999999 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinUsingThreeWay">
-        <Resource name="sql">
-            <![CDATA[select *
-from emp as e
-join dept as d using (deptno)
-join emp as e2 using (empno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], DEPTNO=[$7], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8], NAME=[$10], ENAME0=[$12], JOB0=[$13], MGR0=[$14], HIREDATE0=[$15], SAL0=[$16], COMM0=[$17], DEPTNO1=[$18], SLACKER0=[$19])
-  LogicalJoin(condition=[=($0, $11)], joinType=[inner])
-    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertExtendedColumnModifiableView">
+    <Resource name="sql">
+      <![CDATA[insert into EMP_MODIFIABLEVIEW2(updated TIMESTAMP)
+ (ename, deptno, empno, updated, sal)
+ values ('Fred', 20, 44, timestamp '2017-03-12 13:03:05', 999999)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
+  LogicalFilter(condition=[=($7, 20)])
+    LogicalProject(EMPNO=[$2], ENAME=[$0], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[$4], COMM=[null:INTEGER], DEPTNO=[$1], SLACKER=[null:BOOLEAN], EXTRA=[null:BOOLEAN], UPDATED=[$3])
+      LogicalValues(tuples=[[{ 'Fred', 20, 44, 2017-03-12 13:03:05, 999999 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinOnExpression">
-        <Resource name="sql">
-            <![CDATA[SELECT * FROM emp
-JOIN dept on emp.deptno + 1 = dept.deptno - 2]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$10], NAME=[$11])
-  LogicalJoin(condition=[=($9, $12)], joinType=[inner])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, 1)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[-($0, 2)])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertModifiableView">
+    <Resource name="sql">
+      <![CDATA[insert into EMP_MODIFIABLEVIEW (EMPNO, ENAME, JOB) values (34625, 'nom', 'accountant')]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[555], COMM=[null:INTEGER], DEPTNO=[20], SLACKER=[null:BOOLEAN])
+    LogicalValues(tuples=[[{ 34625, 'nom', 'accountant' }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDuplicateColumnsInSubQuery">
-        <Resource name="sql">
-            <![CDATA[select "e" from (
-select empno as "e", deptno as d, 1 as "e0" from EMP)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(e=[$0])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertSubset">
+    <Resource name="sql">
+      <![CDATA[insert into empnullables
+values (50, 'Fred')]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[null:INTEGER], COMM=[null:INTEGER], DEPTNO=[null:INTEGER], SLACKER=[null:BOOLEAN])
+    LogicalValues(tuples=[[{ 50, 'Fred' }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWith">
-        <Resource name="sql">
-            <![CDATA[with emp2 as (select * from emp)
-select * from emp2]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertSubsetModifiableView">
+    <Resource name="sql">
+      <![CDATA[insert into EMP_MODIFIABLEVIEW values (10, 'Fred')]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[555], COMM=[null:INTEGER], DEPTNO=[20], SLACKER=[null:BOOLEAN])
+    LogicalValues(tuples=[[{ 10, 'Fred' }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWithUnion">
-        <Resource name="sql">
-            <![CDATA[with emp2 as (select * from emp where deptno > 10)
-select empno from emp2 where deptno < 30
-union all
-select deptno from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalProject(EMPNO=[$0])
-    LogicalFilter(condition=[<($7, 30)])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalFilter(condition=[>($7, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(DEPTNO=[$7])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertSubsetView">
+    <Resource name="sql">
+      <![CDATA[insert into empnullables_20
+values (10, 'Fred')]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[true])
+  LogicalFilter(condition=[>($5, 1000)])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[null:INTEGER], COMM=[null:INTEGER], DEPTNO=[20], SLACKER=[null:BOOLEAN])
+      LogicalValues(tuples=[[{ 10, 'Fred' }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWithInsideWhereExists">
-        <Resource name="sql">
-            <![CDATA[select * from emp
-where exists (
-  with dept2 as (select * from dept where dept.deptno >= emp.deptno)
-  select 1 from dept2 where deptno <= emp.deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[IS NOT NULL($9)])
-    LogicalCorrelate(correlation=[$cor1], joinType=[left], requiredColumns=[{7}])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalFilter(condition=[<=($0, $cor1.DEPTNO)])
-            LogicalProject(DEPTNO=[$0], NAME=[$1])
-              LogicalFilter(condition=[>=($0, $cor1.DEPTNO)])
-                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWithInsideScalarSubQuery">
-        <Resource name="sql">
-            <![CDATA[select (
- with dept2 as (select * from dept where deptno > 10) select count(*) from dept2) as c
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(C=[$9])
-  LogicalJoin(condition=[true], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{}], agg#0=[SINGLE_VALUE($0)])
-      LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
-        LogicalProject($f0=[0])
-          LogicalFilter(condition=[>($0, 10)])
-            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertSubsetWithCustomInitializerExpressionFactory">
+    <Resource name="sql">
+      <![CDATA[insert into empdefaults values (100)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=['Bob'], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[555], COMM=[null:INTEGER], DEPTNO=[null:INTEGER], SLACKER=[null:BOOLEAN])
+    LogicalValues(tuples=[[{ 100 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateNoGroup">
-        <Resource name="sql">
-            <![CDATA[select sum(deptno) from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
-  LogicalProject(DEPTNO=[$7])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertView">
+    <Resource name="sql">
+      <![CDATA[insert into empnullables_20 (empno, ename)
+values (150, 'Fred')]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[true])
+  LogicalFilter(condition=[>($5, 1000)])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[null:INTEGER], COMM=[null:INTEGER], DEPTNO=[20], SLACKER=[null:BOOLEAN])
+      LogicalValues(tuples=[[{ 150, 'Fred' }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testConditionOffByOneReversed">
-        <Resource name="sql">
-            <![CDATA[SELECT * FROM emp
-JOIN dept on dept.deptno = emp.deptno + 0]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$10], NAME=[$11])
-  LogicalJoin(condition=[=($10, $9)], joinType=[inner])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, 0)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertViewWithCustomColumnResolving">
+    <Resource name="sql">
+      <![CDATA[insert into struct.t_10 (f0.c0, f1.c2, c1, k0,
+  f1.a0, f2.a0, f0.c1, f2.c3)
+values (?, ?, ?, ?, ?, ?, ?, ?)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, STRUCT, T]], operation=[INSERT], flattened=[true])
+  LogicalFilter(condition=[=($4, 10)])
+    LogicalProject("K0"=[CAST(?3):VARCHAR(20) NOT NULL], "C1"=[CAST(?2):VARCHAR(20) NOT NULL], "F1"."A0"=[CAST(?4):INTEGER NOT NULL], "F2"."A0"=[CAST(?5):BOOLEAN NOT NULL], "F0"."C0"=[CAST(?0):INTEGER NOT NULL], "F1"."C0"=[null:INTEGER], "F0"."C1"=[CAST(?6):INTEGER NOT NULL], "F1"."C2"=[CAST(?1):INTEGER NOT NULL], "F2"."C3"=[CAST(?7):INTEGER NOT NULL])
+      LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testConditionOffByOne">
-        <Resource name="sql">
-            <![CDATA[SELECT * FROM emp
-JOIN dept on emp.deptno + 0 = dept.deptno]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$10], NAME=[$11])
-  LogicalJoin(condition=[=($9, $10)], joinType=[inner])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, 0)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertWithCustomColumnResolving">
+    <Resource name="sql">
+      <![CDATA[insert into struct.t values (?, ?, ?, ?, ?, ?, ?, ?, ?)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, STRUCT, T]], operation=[INSERT], flattened=[true])
+  LogicalProject("K0"=[?0], "C1"=[?1], "F1"."A0"=[?2], "F2"."A0"=[?3], "F0"."C0"=[?4], "F1"."C0"=[?5], "F0"."C1"=[?6], "F1"."C2"=[?7], "F2"."C3"=[?8])
+    LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testIntervalExpression">
-        <Resource name="sql">
-            <![CDATA[select interval mgr hour as h from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(H=[*($3, 3600000:INTERVAL HOUR)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertWithCustomColumnResolving2">
+    <Resource name="sql">
+      <![CDATA[insert into struct.t_nullables (f0.c0, f1.c2, c1)
+values (?, ?, ?)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, STRUCT, T_NULLABLES]], operation=[INSERT], flattened=[true])
+  LogicalProject("K0"=[null:VARCHAR(20)], "C1"=[?2], "F1"."A0"=[null:INTEGER], "F2"."A0"=[null:BOOLEAN], "F0"."C0"=[?0], "F1"."C0"=[null:INTEGER], "F0"."C1"=[null:INTEGER], "F1"."C2"=[?1], "F2"."C3"=[null:INTEGER])
+    LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testLateralDecorrelate">
-        <Resource name="sql">
-            <![CDATA[select * from emp,
- LATERAL (select * from dept where emp.deptno=dept.deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[=($7, $11)], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO2=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertWithCustomInitializerExpressionFactory">
+    <Resource name="sql">
+      <![CDATA[insert into empdefaults (deptno) values (300)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
+  LogicalProject(EMPNO=[123], ENAME=['Bob'], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[555], COMM=[null:INTEGER], DEPTNO=[$0], SLACKER=[null:BOOLEAN])
+    LogicalValues(tuples=[[{ 300 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNestedCorrelations">
-        <Resource name="sql">
-            <![CDATA[select *
-from (select 2+deptno d2, 3+deptno d3 from emp) e
- where exists (select 1 from (select deptno+1 d1 from dept) d
- where d1=e.d2 and exists (select 2 from (select deptno+4 d4, deptno+5 d5, deptno+6 d6 from dept)
- where d4=d.d1 and d5=d.d1 and d6=e.d3))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(D2=[$0], D3=[$1])
-  LogicalFilter(condition=[IS NOT NULL($2)])
-    LogicalCorrelate(correlation=[$cor3], joinType=[left], requiredColumns=[{0, 1}])
-      LogicalProject(D2=[+(2, $7)], D3=[+(3, $7)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertWithLimit">
+    <Resource name="sql">
+      <![CDATA[insert into empnullables (empno, ename)
+select deptno, ename from emp order by ename limit 10]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[null:INTEGER], COMM=[null:INTEGER], DEPTNO=[null:INTEGER], SLACKER=[null:BOOLEAN])
+    LogicalSort(sort0=[$1], dir0=[ASC], fetch=[10])
+      LogicalProject(DEPTNO=[$7], ENAME=[$1])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalFilter(condition=[AND(=($0, $cor3.D2), IS NOT NULL($1))])
-            LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0}])
-              LogicalProject(D1=[+($0, 1)])
-                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-              LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-                LogicalProject($f0=[true])
-                  LogicalFilter(condition=[AND(=($0, $cor0.D1), =($1, $cor0.D1), =($2, $cor3.D3))])
-                    LogicalProject(D4=[+($0, 4)], D5=[+($0, 5)], D6=[+($0, 6)])
-                      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNestedCorrelationsDecorrelated">
-        <Resource name="sql">
-            <![CDATA[select *
-from (select 2+deptno d2, 3+deptno d3 from emp) e
- where exists (select 1 from (select deptno+1 d1 from dept) d
- where d1=e.d2 and exists (select 2 from (select deptno+4 d4, deptno+5 d5, deptno+6 d6 from dept)
- where d4=d.d1 and d5=d.d1 and d6=e.d3))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(D2=[$0], D3=[$1])
-  LogicalProject(D2=[$0], D3=[$1], D1=[CAST($2):INTEGER], D6=[$3], $f2=[CAST($4):BOOLEAN])
-    LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[inner])
-      LogicalProject(D2=[+(2, $7)], D3=[+(3, $7)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInsertWithSort">
+    <Resource name="sql">
+      <![CDATA[insert into empnullables (empno, ename)
+select deptno, ename from emp order by ename]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[null:INTEGER], COMM=[null:INTEGER], DEPTNO=[null:INTEGER], SLACKER=[null:BOOLEAN])
+    LogicalSort(sort0=[$1], dir0=[ASC])
+      LogicalProject(DEPTNO=[$7], ENAME=[$1])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{0, 1}], agg#0=[MIN($2)])
-        LogicalProject(D1=[$0], D6=[$2], $f0=[true])
-          LogicalFilter(condition=[IS NOT NULL($1)])
-            LogicalProject(D1=[$0], $f0=[$3], D6=[$2])
-              LogicalJoin(condition=[=($0, $1)], joinType=[left])
-                LogicalProject(D1=[+($0, 1)])
-                  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-                LogicalAggregate(group=[{0, 1}], agg#0=[MIN($2)])
-                  LogicalProject(D4=[$0], D6=[$2], $f0=[true])
-                    LogicalFilter(condition=[=($1, $0)])
-                      LogicalProject(D4=[+($0, 4)], D5=[+($0, 5)], D6=[+($0, 6)])
-                        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWithInsideWhereExistsDecorrelate">
-        <Resource name="sql">
-            <![CDATA[select * from emp
-where exists (
-  with dept2 as (select * from dept where dept.deptno >= emp.deptno)
-  select 1 from dept2 where deptno <= emp.deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[CAST($9):INTEGER], $f1=[CAST($10):BOOLEAN])
-    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-        LogicalProject(DEPTNO0=[$2], $f0=[true])
-          LogicalFilter(condition=[<=($0, $2)])
-            LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO0=[$2])
-              LogicalJoin(condition=[>=($0, $2)], joinType=[inner])
-                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-                LogicalAggregate(group=[{0}])
-                  LogicalProject(DEPTNO=[$7])
-                    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testIntegerLiteral">
+    <Resource name="sql">
+      <![CDATA[select 1 from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExistsCorrelatedDecorrelate">
-        <Resource name="sql">
-            <![CDATA[select*from emp where exists (
-  select 1 from dept where emp.deptno=dept.deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[CAST($9):INTEGER], $f1=[CAST($10):BOOLEAN])
-    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-        LogicalProject(DEPTNO=[$0], $f0=[true])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testInterval">
+    <Resource name="sql">
+      <![CDATA[values(cast(interval '1' hour as interval hour to second))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+ProjectRel(EXPR$0=[$0])
+  ProjectRel(EXPR$0=[3600000])
+    OneRowRel
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExistsDecorrelateComplexCorrelationPredicate">
-        <Resource name="sql">
-            <![CDATA[select e1.empno from empnullables e1 where exists (
-  select 1 from empnullables e2 where COALESCE(e1.ename,'M')=COALESCE(e2.ename,'M'))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[IS NOT NULL($9)])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f0=[$11])
-      LogicalJoin(condition=[=($9, $10)], joinType=[left])
-        LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[CASE(IS NOT NULL($1), $1, 'M':VARCHAR(20))])
-          LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
-        LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-          LogicalProject($f9=[CASE(IS NOT NULL($1), CAST($1):VARCHAR(20) NOT NULL, 'M':VARCHAR(20))], $f0=[true])
-            LogicalTableScan(table=[[CATALOG, SALES, EMPNULLABLES]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testIntervalExpression">
+    <Resource name="sql">
+      <![CDATA[select interval mgr hour as h from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(H=[*($3, 3600000:INTERVAL HOUR)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExistsCorrelatedLimit">
-        <Resource name="sql">
-            <![CDATA[select*from emp where exists (
-  select 1 from dept where emp.deptno=dept.deptno limit 1)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[IS NOT NULL($9)])
-    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalSort(fetch=[1])
-            LogicalProject(EXPR$0=[1])
-              LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
-                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testIntervalLiteralHourToMinute">
+    <Resource name="sql">
+      <![CDATA[select
+ cast(empno as Integer) * (INTERVAL '1:1' HOUR TO MINUTE)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[*($0, 3660000:INTERVAL HOUR TO MINUTE)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExistsCorrelatedLimitDecorrelate">
-        <Resource name="sql">
-            <![CDATA[select*from emp where exists (
-  select 1 from dept where emp.deptno=dept.deptno limit 1)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f0=[$9])
-    LogicalFilter(condition=[IS NOT NULL($9)])
-      LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-          LogicalProject($f0=[true])
-            LogicalSort(fetch=[1])
-              LogicalProject(EXPR$0=[1])
-                LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
-                  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testIntervalLiteralYearToMonth">
+    <Resource name="sql">
+      <![CDATA[select
+  cast(empno as Integer) * (INTERVAL '1-1' YEAR TO MONTH)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[*($0, 13:INTERVAL YEAR TO MONTH)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinUnnest">
-        <Resource name="sql">
-            <![CDATA[select*from dept as d, unnest(multiset[d.deptno * 2])]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], EXPR$0=[$2])
-  LogicalProject(DEPTNO=[$0], NAME=[$1], EXPR$0=[$3])
-    LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{2}])
-      LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[*($0, 2)])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      Uncollect
-        LogicalProject(EXPR$0=[$SLICE($0)])
-          Collect(field=[EXPR$0])
-            LogicalUnion(all=[true])
-              LogicalProject(EXPR$0=[$cor0.$f2])
-                LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testIsDistinctFrom">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[AND(OR(IS NOT NULL($0), IS NOT NULL($1)), IS NOT TRUE(=($0, $1)))])
+  LogicalValues(tuples=[[{ null, 1 }, { 2, null }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNestedAggregates">
-        <Resource name="sql">
-            <![CDATA[SELECT
-  avg(sum(sal) + 2 * min(empno) + 3 * avg(empno))
-  over (partition by deptno)
-from emp
-group by deptno]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[CAST(/(SUM(+(+($1, *(2, $2)), *(3, $3))) OVER (PARTITION BY $0), COUNT(+(+($1, *(2, $2)), *(3, $3))) OVER (PARTITION BY $0))):INTEGER NOT NULL])
-  LogicalAggregate(group=[{0}], agg#0=[SUM($1)], agg#1=[MIN($2)], agg#2=[AVG($2)])
-    LogicalProject(DEPTNO=[$7], SAL=[$5], EMPNO=[$0])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select empno is distinct from deptno
+from (values (cast(null as int), 1),
+             (2, cast(null as int))) as emp(empno, deptno)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testIsNotDistinctFrom">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[OR(AND(IS NULL($0), IS NULL($1)), IS TRUE(=($0, $1)))])
+  LogicalValues(tuples=[[{ null, 1 }, { 2, null }]])
+]]>
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select empno is not distinct from deptno
+from (values (cast(null as int), 1),
+             (2, cast(null as int))) as emp(empno, deptno)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinExpandAndDecorrelation">
+    <Resource name="plan_extended">
+      <![CDATA[
+LogicalProject(DEPTNO=[$9], SAL=[$7])
+  LogicalJoin(condition=[AND(=($9, $0), <($7, $0))], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[$10])
+      LogicalJoin(condition=[=($0, $9)], joinType=[left])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalAggregate(group=[{0}], EXPR$0=[AVG($1)])
+          LogicalProject(DEPTNO=[$7], SAL=[$5])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+    <Resource name="plan_not_extended">
+      <![CDATA[
+LogicalProject(DEPTNO=[$9], SAL=[$7])
+  LogicalJoin(condition=[AND(=($9, $0), <($7, $SCALAR_QUERY({
+LogicalAggregate(group=[{}], EXPR$0=[AVG($0)])
+  LogicalProject(SAL=[$5])
+    LogicalFilter(condition=[=($7, $cor0.DEPTNO)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+})))], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWithAlias">
-        <Resource name="sql">
-            <![CDATA[with w(x, y) as
-  (select * from dept where deptno > 10)
-select x from w where x < 30 union all select deptno from dept]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalProject(X=[$0])
-    LogicalFilter(condition=[<($0, 30)])
-      LogicalProject(DEPTNO=[$0], NAME=[$1])
-        LogicalFilter(condition=[>($0, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-  LogicalProject(DEPTNO=[$0])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[SELECT emp.deptno, emp.sal
+FROM dept
+JOIN emp ON emp.deptno = dept.deptno AND emp.sal < (
+  SELECT AVG(emp.sal)
+  FROM emp
+  WHERE  emp.deptno = dept.deptno
+)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinLateralTableWithConditionCorrelated">
+    <Resource name="sql">
+      <![CDATA[select deptno, r.num from dept join
+ lateral table(ramp(dept.deptno)) as r(num)
+ on deptno=num]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NUM=[$2])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
     LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
+      LogicalTableFunctionScan(invocation=[RAMP($cor0.DEPTNO)], rowType=[RecordType(INTEGER I)])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWithOrder">
-        <Resource name="sql">
-            <![CDATA[with emp2 as (select * from emp)
-select * from emp2 order by deptno]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(sort0=[$7], dir0=[ASC])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinNatural">
+    <Resource name="sql">
+      <![CDATA[SELECT * FROM emp NATURAL JOIN dept]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7], EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8], NAME=[$10])
+  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWithUnionOrder">
-        <Resource name="sql">
-            <![CDATA[with emp2 as (select empno, deptno as x from emp)
-select * from emp2
-union all
-select * from emp2
-order by empno + x]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], X=[$1])
-  LogicalSort(sort0=[$2], dir0=[ASC])
-    LogicalProject(EMPNO=[$0], X=[$1], EXPR$2=[+($0, $1)])
-      LogicalUnion(all=[true])
-        LogicalProject(EMPNO=[$0], X=[$7])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalProject(EMPNO=[$0], X=[$7])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinNaturalMultipleCommonColumn">
+    <Resource name="sql">
+      <![CDATA[SELECT *
+FROM emp
+NATURAL JOIN (SELECT deptno, name AS ename FROM dept) AS d]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ENAME=[$1], DEPTNO=[$7], EMPNO=[$0], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
+  LogicalJoin(condition=[AND(=($1, $10), =($7, $9))], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$0], ENAME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInUncorrelatedSubQueryInSelect">
-        <Resource name="sql">
-            <![CDATA[select name, deptno in (
-  select case when true then deptno else null end from emp)
-from dept]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(NAME=[$1], EXPR$1=[OR(AND(IS NOT NULL($6), <>($2, 0)), AND(<($3, $2), null, <>($2, 0), IS NULL($6)))])
-  LogicalJoin(condition=[=($4, $5)], joinType=[left])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], $f0=[$2], $f1=[$3], DEPTNO0=[$0])
-      LogicalJoin(condition=[true], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalAggregate(group=[{}], agg#0=[COUNT()], agg#1=[COUNT($0)])
-          LogicalProject(EXPR$0=[CAST($7):INTEGER], $f1=[true])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-      LogicalProject(EXPR$0=[CAST($7):INTEGER], $f1=[true])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinNaturalNoCommonColumn">
+    <Resource name="sql">
+      <![CDATA[SELECT *
+FROM emp NATURAL JOIN (SELECT deptno AS foo, name FROM dept) AS d]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], FOO=[$9], NAME=[$10])
+  LogicalJoin(condition=[true], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(FOO=[$0], NAME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNotInUncorrelatedSubQueryInSelect">
-        <Resource name="sql">
-            <![CDATA[select empno, deptno not in (
-  select case when true then deptno else null end from dept)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], EXPR$1=[OR(=($9, 0), AND(<($10, $9), null, IS NULL($13)), AND(IS NULL($13), >=($10, $9)))])
-  LogicalJoin(condition=[=($11, $12)], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f0=[$9], $f1=[$10], DEPTNO0=[$7])
-      LogicalJoin(condition=[true], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{}], agg#0=[COUNT()], agg#1=[COUNT($0)])
-          LogicalProject(EXPR$0=[CAST($0):INTEGER], $f1=[true])
-            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-      LogicalProject(EXPR$0=[CAST($0):INTEGER], $f1=[true])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinOn">
+    <Resource name="sql">
+      <![CDATA[SELECT * FROM emp
+JOIN dept on emp.deptno = dept.deptno]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNotInUncorrelatedSubQuery">
-        <Resource name="sql">
-            <![CDATA[select empno from emp where deptno not in (select deptno from dept)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[NOT(AND(IS TRUE($11), IS NOT NULL($9)))])
-    LogicalJoin(condition=[=($9, $10)], joinType=[left])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$7])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-        LogicalProject(DEPTNO=[$0], $f1=[true])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinOnExists">
+    <Resource name="sql">
+      <![CDATA[select * from emp left join dept
+on emp.empno = 1
+or exists (select deptno from emp where empno > dept.deptno + 5)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalJoin(condition=[OR(=($0, 1), EXISTS({
+LogicalFilter(condition=[>($0, +($cor0.DEPTNO0, 5))])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}))], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNotInUncorrelatedSubQueryInSelectNotNull">
-        <Resource name="sql">
-            <![CDATA[select empno, deptno not in (
-  select deptno from dept)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], EXPR$1=[IS NOT TRUE($11)])
-  LogicalJoin(condition=[=($9, $10)], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$7])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinOnExpression">
+    <Resource name="sql">
+      <![CDATA[SELECT * FROM emp
+JOIN dept on emp.deptno + 1 = dept.deptno - 2]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$10], NAME=[$11])
+  LogicalJoin(condition=[=($9, $12)], joinType=[inner])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, 1)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-      LogicalProject(DEPTNO=[$0], $f1=[true])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[-($0, 2)])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortWithTrim">
-        <Resource name="sql">
-            <![CDATA[select ename from (select * from emp order by sal) a]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ENAME=[$1])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinOnIn">
+    <Resource name="sql">
+      <![CDATA[select * from emp join dept
+ on emp.deptno = dept.deptno and emp.empno in (1, 3)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalJoin(condition=[AND(=($7, $9), SEARCH($0, Sarg[1, 3]))], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupAlias">
-        <Resource name="sql">
-            <![CDATA[select "$f2", max(x), max(x + 1)
-from (values (1, 2)) as t("$f2", x)
-group by "$f2"]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[MAX($1)], EXPR$2=[MAX($2)])
-  LogicalProject($f2=[$0], X=[$1], $f3=[+($1, 1)])
-    LogicalValues(tuples=[[{ 1, 2 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinOnInSubQuery">
+    <Resource name="sql">
+      <![CDATA[select * from emp left join dept
+on emp.empno = 1
+or dept.deptno in (select deptno from emp where empno > 5)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalJoin(condition=[OR(=($0, 1), IN($9, {
+LogicalProject(DEPTNO=[$7])
+  LogicalFilter(condition=[>($0, 5)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+}))], joinType=[left])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNotInUncorrelatedSubQueryInSelectDeduceNotNull">
-        <Resource name="sql">
-            <![CDATA[select empno, deptno not in (
-  select mgr from emp where mgr > 5)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], EXPR$1=[CAST(IS NOT TRUE($11)):BOOLEAN])
-  LogicalJoin(condition=[=($9, $10)], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-      LogicalProject(MGR=[$3], $f1=[true])
-        LogicalFilter(condition=[>($3, 5)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinTemporalTableOnColumnReference1">
+    <Resource name="sql">
+      <![CDATA[select stream *
+from orders
+join products_temporal for system_time as of orders.rowtime
+on orders.productid = products_temporal.productid]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalDelta
+  LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2], PRODUCTID0=[$3], NAME=[$4], SUPPLIERID=[$5], SYS_START=[$6], SYS_END=[$7])
+    LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0, 1}])
+      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
+      LogicalFilter(condition=[=($cor0.PRODUCTID, $0)])
+        LogicalSnapshot(period=[$cor0.ROWTIME])
+          LogicalTableScan(table=[[CATALOG, SALES, PRODUCTS_TEMPORAL]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNotInUncorrelatedSubQueryInSelectDeduceNotNull2">
-        <Resource name="sql">
-            <![CDATA[select empno, deptno not in (
-  select mgr from emp where mgr is not null)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], EXPR$1=[CAST(IS NOT TRUE($11)):BOOLEAN])
-  LogicalJoin(condition=[=($9, $10)], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-      LogicalProject(MGR=[$3], $f1=[true])
-        LogicalFilter(condition=[IS NOT NULL($3)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinTemporalTableOnColumnReference2">
+    <Resource name="sql">
+      <![CDATA[select stream *
+from orders
+join VIRTUALCOLUMNS.VC_T1 for system_time as of orders.rowtime
+on orders.productid = VIRTUALCOLUMNS.VC_T1.a]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalDelta
+  LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2], A=[$3], B=[$4], C=[$5], D=[$6], E=[$7])
+    LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0, 1}])
+      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
+      LogicalFilter(condition=[=($cor0.PRODUCTID, $0)])
+        LogicalSnapshot(period=[$cor0.ROWTIME])
+          LogicalProject(A=[$0], B=[$1], C=[$2], D=[$3], $f4=[+($0, 1)])
+            LogicalTableScan(table=[[CATALOG, VIRTUALCOLUMNS, VC_T1]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNotInUncorrelatedSubQueryInSelectDeduceNotNull3">
-        <Resource name="sql">
-            <![CDATA[select empno, deptno not in (
-  select mgr from emp where mgr in (
-    select mgr from emp where deptno = 10))
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], EXPR$1=[CAST(IS NOT TRUE($11)):BOOLEAN])
-  LogicalJoin(condition=[=($9, $10)], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-      LogicalProject(MGR=[$3], $f1=[true])
-        LogicalJoin(condition=[=($3, $9)], joinType=[inner])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-          LogicalAggregate(group=[{0}])
-            LogicalProject(MGR=[$3])
-              LogicalFilter(condition=[=($7, 10)])
-                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinTemporalTableOnSpecificTime1">
+    <Resource name="sql">
+      <![CDATA[select stream *
+from orders,
+  products_temporal for system_time as of
+    TIMESTAMP '2011-01-02 00:00:00']]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalDelta
+  LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2], PRODUCTID0=[$3], NAME=[$4], SUPPLIERID=[$5], SYS_START=[$6], SYS_END=[$7])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
+      LogicalSnapshot(period=[2011-01-02 00:00:00])
+        LogicalTableScan(table=[[CATALOG, SALES, PRODUCTS_TEMPORAL]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNotInUncorrelatedSubQueryInSelectMayBeNull">
-        <Resource name="sql">
-            <![CDATA[select empno, deptno not in (
-  select mgr from emp)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], EXPR$1=[OR(=($9, 0), AND(<($10, $9), null, IS NULL($13)), AND(IS NULL($13), >=($10, $9)))])
-  LogicalJoin(condition=[=($11, $12)], joinType=[left])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f0=[$9], $f1=[$10], DEPTNO0=[$7])
-      LogicalJoin(condition=[true], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{}], agg#0=[COUNT()], agg#1=[COUNT($0)])
-          LogicalProject(MGR=[$3], $f1=[true])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-      LogicalProject(MGR=[$3], $f1=[true])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinTemporalTableOnSpecificTime2">
+    <Resource name="sql">
+      <![CDATA[select stream *
+from orders,
+  VIRTUALCOLUMNS.VC_T1 for system_time as of
+    TIMESTAMP '2011-01-02 00:00:00']]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalDelta
+  LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2], A=[$3], B=[$4], C=[$5], D=[$6], E=[$7])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
+      LogicalSnapshot(period=[2011-01-02 00:00:00])
+        LogicalProject(A=[$0], B=[$1], C=[$2], D=[$3], $f4=[+($0, 1)])
+          LogicalTableScan(table=[[CATALOG, VIRTUALCOLUMNS, VC_T1]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSingletonGroupingSet">
-        <Resource name="sql">
-            <![CDATA[select sum(sal) from emp group by grouping sets (deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1])
-  LogicalAggregate(group=[{0}], EXPR$0=[SUM($1)])
-    LogicalProject(DEPTNO=[$7], SAL=[$5])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinUnnest">
+    <Resource name="sql">
+      <![CDATA[select*from dept as d, unnest(multiset[d.deptno * 2])]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], EXPR$0=[$2])
+  LogicalProject(DEPTNO=[$0], NAME=[$1], EXPR$0=[$3])
+    LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{2}])
+      LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[*($0, 2)])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      Uncollect
+        LogicalProject(EXPR$0=[$SLICE($0)])
+          Collect(field=[EXPR$0])
+            LogicalUnion(all=[true])
+              LogicalProject(EXPR$0=[$cor0.$f2])
+                LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupEmpty">
-        <Resource name="sql">
-            <![CDATA[select sum(deptno) from emp group by ()]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
-  LogicalProject(DEPTNO=[$7])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinUnnestRex">
+    <Resource name="sql">
+      <![CDATA[select*from dept as d, unnest(multiset[d.deptno * 2])]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], EXPR$0=[$2])
+  LogicalProject(DEPTNO=[$0], NAME=[$1], EXPR$0=[$3])
+    LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{2}])
+      LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[*($0, 2)])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      Uncollect
+        LogicalProject(EXPR$0=[$SLICE($0)])
+          Collect(field=[EXPR$0])
+            LogicalUnion(all=[true])
+              LogicalProject(EXPR$0=[$cor0.$f2])
+                LogicalValues(tuples=[[{ 0 }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinUsing">
+    <Resource name="sql">
+      <![CDATA[SELECT * FROM emp JOIN dept USING (deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7], EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8], NAME=[$10])
+  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupByWithDuplicates">
-        <Resource name="sql">
-            <![CDATA[select sum(sal) from emp group by (), ()]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
-  LogicalProject(SAL=[$5])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinUsingCompound">
+    <Resource name="sql">
+      <![CDATA[SELECT * FROM emp LEFT JOIN (SELECT *, deptno * 5 as empno FROM dept) USING (deptno,empno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7], EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8], NAME=[$10])
+  LogicalJoin(condition=[AND(=($7, $9), =($0, $11))], joinType=[left])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[*($0, 5)])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupingSets">
-        <Resource name="sql">
-            <![CDATA[select deptno, ename, sum(sal) from emp
-group by grouping sets ((deptno), (ename, deptno))
-order by 2]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(sort0=[$1], dir0=[ASC])
-  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}]], EXPR$2=[SUM($2)])
-    LogicalProject(DEPTNO=[$7], ENAME=[$1], SAL=[$5])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinUsingDynamicTable">
+    <Resource name="sql">
+      <![CDATA[select * from SALES.NATION t1
+join SALES.NATION t2
+using (n_nationkey)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(**=[$1], **0=[$3])
+  LogicalJoin(condition=[=($0, $2)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+    LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinUsingThreeWay">
+    <Resource name="sql">
+      <![CDATA[select *
+from emp as e
+join dept as d using (deptno)
+join emp as e2 using (empno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], DEPTNO=[$7], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8], NAME=[$10], ENAME0=[$12], JOB0=[$13], MGR0=[$14], HIREDATE0=[$15], SAL0=[$16], COMM0=[$17], DEPTNO1=[$18], SLACKER0=[$19])
+  LogicalJoin(condition=[=($0, $11)], joinType=[inner])
+    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupingSetsWithRollup">
-        <Resource name="sql">
-            <![CDATA[select deptno, ename, sum(sal) from emp
-group by grouping sets ( rollup(deptno), (ename, deptno))
-order by 2]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(sort0=[$1], dir0=[ASC])
-  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$2=[SUM($2)])
-    LogicalProject(DEPTNO=[$7], ENAME=[$1], SAL=[$5])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinUsingWithAggregate">
+    <Resource name="sql">
+      <![CDATA[select deptno, count(*)
+from emp
+full join dept using (deptno)
+group by deptno]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EXPR$1=[$1])
+  LogicalAggregate(group=[{0}], EXPR$1=[COUNT()])
+    LogicalProject($f0=[COALESCE($7, $9)])
+      LogicalJoin(condition=[=($7, $9)], joinType=[full])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupingSetsWithCube">
-        <Resource name="sql">
-            <![CDATA[select deptno, ename, sum(sal) from emp
-group by grouping sets ( (deptno), CUBE(ename, deptno))
-order by 2]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(sort0=[$1], dir0=[ASC])
-  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {1}, {}]], EXPR$2=[SUM($2)])
-    LogicalProject(DEPTNO=[$7], ENAME=[$1], SAL=[$5])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinUsingWithGroupingSets">
+    <Resource name="sql">
+      <![CDATA[select deptno, grouping(deptno),
+grouping(deptno, job), count(*)
+from emp
+join dept using (deptno)
+group by grouping sets ((deptno), (deptno, job))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EXPR$1=[$2], EXPR$2=[$3], EXPR$3=[$4])
+  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}]], EXPR$1=[GROUPING($0)], EXPR$2=[GROUPING($0, $1)], EXPR$3=[COUNT()])
+    LogicalProject($f0=[$7], JOB=[$2])
+      LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupingSetsWithRollupCube">
-        <Resource name="sql">
-            <![CDATA[select deptno, ename, sum(sal) from emp
-group by grouping sets ( CUBE(deptno), ROLLUP(ename, deptno))
-order by 2]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(sort0=[$1], dir0=[ASC])
-  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {1}, {}]], EXPR$2=[SUM($2)])
-    LogicalProject(DEPTNO=[$7], ENAME=[$1], SAL=[$5])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinUsingWithMultipleJoin">
+    <Resource name="sql">
+      <![CDATA[SELECT deptno, ename
+FROM emp JOIN dept using (deptno)
+JOIN (values ('Calcite', 200)) as s(ename, salary) using (ename)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7], ENAME=[$1])
+  LogicalJoin(condition=[=($1, $11)], joinType=[inner])
+    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalValues(tuples=[[{ 'Calcite', 200 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDuplicateGroupingSets">
-        <Resource name="sql">
-            <![CDATA[select sum(sal) from emp
-group by sal,
-  grouping sets (deptno,
-    grouping sets ((deptno, ename), ename),
-      (ename)),
-  ()]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[$3])
-  LogicalAggregate(group=[{0, 1, 2}], groups=[[{0, 1, 2}, {0, 1}, {0, 2}]], EXPR$0=[SUM($0)])
-    LogicalProject(SAL=[$5], DEPTNO=[$7], ENAME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinUsingWithUnqualifiedCommonColumn">
+    <Resource name="sql">
+      <![CDATA[SELECT deptno, name
+FROM emp JOIN dept using (deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7], NAME=[$10])
+  LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupingSetsCartesianProduct">
-        <Resource name="sql">
-            <![CDATA[select 1
-from (values (1, 2, 3, 4)) as t(a, b, c, d)
-group by grouping sets (a, b), grouping sets (c, d)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalAggregate(group=[{0, 1, 2, 3}], groups=[[{0, 2}, {0, 3}, {1, 2}, {1, 3}]])
-    LogicalValues(tuples=[[{ 1, 2, 3, 4 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinUsingWithUnqualifiedNestedCommonColumn">
+    <Resource name="sql">
+      <![CDATA[select (coord).x from
+customer.contact_peek t1
+join customer.contact_peek t2
+using (coord)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[COALESCE(ROW($4, $5, $6), ROW($14, $15, $16)).X])
+  LogicalJoin(condition=[AND(AND(=($4, $14), =($5, $15)), =($6, $16))], joinType=[inner])
+    LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
+      LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+    LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
+      LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupingSetsCartesianProduct2">
-        <Resource name="sql">
-            <![CDATA[select 1
-from (values (1, 2, 3, 4)) as t(a, b, c, d)
-group by grouping sets (a, (a, b)), grouping sets (c), d]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalAggregate(group=[{0, 1, 2, 3}], groups=[[{0, 1, 2, 3}, {0, 2, 3}]])
-    LogicalValues(tuples=[[{ 1, 2, 3, 4 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJoinWithUnion">
+    <Resource name="sql">
+      <![CDATA[select grade
+from (select empno from emp union select deptno from dept),
+  salgrade]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(GRADE=[$1])
+  LogicalJoin(condition=[true], joinType=[inner])
+    LogicalUnion(all=[false])
+      LogicalProject(EMPNO=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(DEPTNO=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalTableScan(table=[[CATALOG, SALES, SALGRADE]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testRollup">
-        <Resource name="sql">
-            <![CDATA[select 1
-from (values (1, 2, 3, 4)) as t(a, b, c, d)
-group by rollup(a, b), rollup(c, d)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalAggregate(group=[{0, 1, 2, 3}], groups=[[{0, 1, 2, 3}, {0, 1, 2}, {0, 1}, {0, 2, 3}, {0, 2}, {0}, {2, 3}, {2}, {}]])
-    LogicalValues(tuples=[[{ 1, 2, 3, 4 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJsonArray">
+    <Resource name="sql">
+      <![CDATA[select json_array(ename, ename)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[JSON_ARRAY(FLAG(ABSENT_ON_NULL), $1, $1)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCube">
-        <Resource name="sql">
-            <![CDATA[select 1
-from (values (1, 2, 3, 4)) as t(a, b, c, d)
-group by cube(a, b)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {1}, {}]])
-    LogicalProject(A=[$0], B=[$1])
-      LogicalValues(tuples=[[{ 1, 2, 3, 4 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJsonArrayAgg1">
+    <Resource name="sql">
+      <![CDATA[select json_arrayagg(ename)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[JSON_ARRAYAGG_ABSENT_ON_NULL($0)])
+  LogicalProject(ENAME=[$1])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testRollupTuples">
-        <Resource name="sql">
-            <![CDATA[select 1
-from (values (1, 2, 3, 4)) as t(a, b, c, d)
-group by rollup(b, (a, d))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalAggregate(group=[{0, 1, 2}], groups=[[{0, 1, 2}, {0}, {}]])
-    LogicalProject(B=[$1], A=[$0], D=[$3])
-      LogicalValues(tuples=[[{ 1, 2, 3, 4 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJsonArrayAgg2">
+    <Resource name="sql">
+      <![CDATA[select json_arrayagg(ename order by ename)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[JSON_ARRAYAGG_ABSENT_ON_NULL($0) WITHIN GROUP ([0])])
+  LogicalProject(ENAME=[$1])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupingSetsWith">
-        <Resource name="sql">
-            <![CDATA[with t(a, b, c, d) as (values (1, 2, 3, 4))
-select 1 from t
-group by rollup(a, b), rollup(c, d)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalAggregate(group=[{0, 1, 2, 3}], groups=[[{0, 1, 2, 3}, {0, 1, 2}, {0, 1}, {0, 2, 3}, {0, 2}, {0}, {2, 3}, {2}, {}]])
-    LogicalValues(tuples=[[{ 1, 2, 3, 4 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJsonArrayAgg3">
+    <Resource name="sql">
+      <![CDATA[select json_arrayagg(ename order by ename null on null)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[JSON_ARRAYAGG_NULL_ON_NULL($0) WITHIN GROUP ([0])])
+  LogicalProject(ENAME=[$1])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testRollupSimple">
-        <Resource name="sql">
-            <![CDATA[select a, b, count(*) as c
-from (values (cast(null as integer), 2)) as t(a, b)
-group by rollup(a, b)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], C=[COUNT()])
-  LogicalValues(tuples=[[{ null, 2 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJsonArrayAgg4">
+    <Resource name="sql">
+      <![CDATA[select json_arrayagg(ename null on null) within group (order by ename)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[JSON_ARRAYAGG_NULL_ON_NULL($0) WITHIN GROUP ([0])])
+  LogicalProject(ENAME=[$1])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupByExpression">
-        <Resource name="sql">
-            <![CDATA[select count(*)
-from emp
-group by substring(ename FROM 1 FOR 1)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject($f0=[SUBSTRING($1, 1, 1)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJsonDepth">
+    <Resource name="sql">
+      <![CDATA[select json_depth(ename)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[JSON_DEPTH($1)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupingSetsProduct">
-        <Resource name="sql">
-            <![CDATA[select 1
-from (values (0, 1, 2, 3, 4)) as t(a, b, c, x, y)
-group by grouping sets ((a, b), c), grouping sets ((x, y), ())]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[1])
-  LogicalAggregate(group=[{0, 1, 2, 3, 4}], groups=[[{0, 1, 3, 4}, {0, 1}, {2, 3, 4}, {2}]])
-    LogicalValues(tuples=[[{ 0, 1, 2, 3, 4 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJsonExists">
+    <Resource name="sql">
+      <![CDATA[select json_exists(ename, 'lax $')
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[JSON_EXISTS($1, 'lax $')])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupingFunctionWithGroupBy">
-        <Resource name="sql">
-            <![CDATA[select
-  deptno, grouping(deptno), count(*), grouping(empno)
-from emp
-group by empno, deptno
-order by 2]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(sort0=[$1], dir0=[ASC])
-  LogicalProject(DEPTNO=[$1], EXPR$1=[$2], EXPR$2=[$3], EXPR$3=[$4])
-    LogicalAggregate(group=[{0, 1}], EXPR$1=[GROUPING($1)], EXPR$2=[COUNT()], EXPR$3=[GROUPING($0)])
-      LogicalProject(EMPNO=[$0], DEPTNO=[$7])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJsonKeys">
+    <Resource name="sql">
+      <![CDATA[select json_keys(ename, 'strict $')
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[JSON_KEYS($1, 'strict $')])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupingFunction">
-        <Resource name="sql">
-            <![CDATA[select
-  deptno, grouping(deptno), count(*), grouping(empno)
-from emp
-group by rollup(empno, deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$1], EXPR$1=[$2], EXPR$2=[$3], EXPR$3=[$4])
-  LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], EXPR$1=[GROUPING($1)], EXPR$2=[COUNT()], EXPR$3=[GROUPING($0)])
-    LogicalProject(EMPNO=[$0], DEPTNO=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJsonLength">
+    <Resource name="sql">
+      <![CDATA[select json_length(ename, 'strict $')
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[JSON_LENGTH($1, 'strict $')])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMatchRecognize1">
-        <Resource name="sql">
-            <![CDATA[select *
-  from emp match_recognize
-  (
-    partition by job, sal
-    order by job asc, sal desc, empno
-    pattern (strt down+ up+)
-    define
-      down as down.mgr < PREV(down.mgr),
-      up as up.mgr > prev(up.mgr)) as mr]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalMatch(partition=[[2, 5]], order=[[2, 5 DESC, 0]], outputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]], allRows=[false], after=[FLAG(SKIP TO NEXT ROW)], pattern=[(('STRT', PATTERN_QUANTIFIER('DOWN', 1, -1, false)), PATTERN_QUANTIFIER('UP', 1, -1, false))], isStrictStarts=[false], isStrictEnds=[false], subsets=[[]], patternDefinitions=[[<(PREV(DOWN.$3, 0), PREV(DOWN.$3, 1)), >(PREV(UP.$3, 0), PREV(UP.$3, 1))]], inputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJsonObject">
+    <Resource name="sql">
+      <![CDATA[select json_object(ename: deptno, ename: deptno)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[JSON_OBJECT(FLAG(NULL_ON_NULL), $1, $7, $1, $7)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMatchRecognizeMeasures1">
-        <Resource name="sql">
-            <![CDATA[select *
-from emp match_recognize (
-  partition by job, sal
-  order by job asc, sal desc
-  measures MATCH_NUMBER() as match_num,
-    CLASSIFIER() as var_match,
-    STRT.mgr as start_nw,
-    LAST(DOWN.mgr) as bottom_nw,
-    LAST(up.mgr) as end_nw
-  pattern (strt down+ up+)
-  define
-    down as down.mgr < PREV(down.mgr),
-    up as up.mgr > prev(up.mgr)) as mr]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(JOB=[$0], SAL=[$1], MATCH_NUM=[$2], VAR_MATCH=[$3], START_NW=[$4], BOTTOM_NW=[$5], END_NW=[$6])
-  LogicalMatch(partition=[[2, 5]], order=[[2, 5 DESC]], outputFields=[[JOB, SAL, MATCH_NUM, VAR_MATCH, START_NW, BOTTOM_NW, END_NW]], allRows=[false], after=[FLAG(SKIP TO NEXT ROW)], pattern=[(('STRT', PATTERN_QUANTIFIER('DOWN', 1, -1, false)), PATTERN_QUANTIFIER('UP', 1, -1, false))], isStrictStarts=[false], isStrictEnds=[false], subsets=[[]], patternDefinitions=[[<(PREV(DOWN.$3, 0), PREV(DOWN.$3, 1)), >(PREV(UP.$3, 0), PREV(UP.$3, 1))]], inputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJsonObjectAgg">
+    <Resource name="sql">
+      <![CDATA[select json_objectagg(ename: deptno)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[JSON_OBJECTAGG_NULL_ON_NULL($0, $1)])
+  LogicalProject(ENAME=[$1], DEPTNO=[$7])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMatchRecognizeMeasures2">
-        <Resource name="sql">
-            <![CDATA[select *
-from emp match_recognize (
-  partition by job
-  order by sal
-  measures MATCH_NUMBER() as match_num,
-    CLASSIFIER() as var_match,
-    STRT.mgr as start_nw,
-    LAST(DOWN.mgr) as bottom_nw,
-    LAST(up.mgr) as end_nw
-  pattern (strt down+ up+)
-  define
-    down as down.mgr < PREV(down.mgr),
-    up as up.mgr > prev(up.mgr)) as mr]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(JOB=[$0], MATCH_NUM=[$1], VAR_MATCH=[$2], START_NW=[$3], BOTTOM_NW=[$4], END_NW=[$5])
-  LogicalMatch(partition=[[2]], order=[[5]], outputFields=[[JOB, MATCH_NUM, VAR_MATCH, START_NW, BOTTOM_NW, END_NW]], allRows=[false], after=[FLAG(SKIP TO NEXT ROW)], pattern=[(('STRT', PATTERN_QUANTIFIER('DOWN', 1, -1, false)), PATTERN_QUANTIFIER('UP', 1, -1, false))], isStrictStarts=[false], isStrictEnds=[false], subsets=[[]], patternDefinitions=[[<(PREV(DOWN.$3, 0), PREV(DOWN.$3, 1)), >(PREV(UP.$3, 0), PREV(UP.$3, 1))]], inputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJsonPredicate">
+    <Resource name="sql">
+      <![CDATA[select
+ename is json,
+ename is json value,
+ename is json object,
+ename is json array,
+ename is json scalar,
+ename is not json,
+ename is not json value,
+ename is not json object,
+ename is not json array,
+ename is not json scalar
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[IS JSON VALUE($1)], EXPR$1=[IS JSON VALUE($1)], EXPR$2=[IS JSON OBJECT($1)], EXPR$3=[IS JSON ARRAY($1)], EXPR$4=[IS JSON SCALAR($1)], EXPR$5=[IS NOT JSON VALUE($1)], EXPR$6=[IS NOT JSON VALUE($1)], EXPR$7=[IS NOT JSON OBJECT($1)], EXPR$8=[IS NOT JSON ARRAY($1)], EXPR$9=[IS NOT JSON SCALAR($1)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMatchRecognizeMeasures3">
-        <Resource name="sql">
-            <![CDATA[select *
-from emp match_recognize (
-  partition by job
-  order by sal
-  measures MATCH_NUMBER() as match_num,
-    CLASSIFIER() as var_match,
-    STRT.mgr as start_nw,
-    LAST(DOWN.mgr) as bottom_nw,
-    LAST(up.mgr) as end_nw
-  ALL ROWS PER MATCH
-  pattern (strt down+ up+)
-  define
-    down as down.mgr < PREV(down.mgr),
-    up as up.mgr > prev(up.mgr)) as mr]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(JOB=[$0], SAL=[$1], EMPNO=[$2], ENAME=[$3], MGR=[$4], HIREDATE=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], MATCH_NUM=[$9], VAR_MATCH=[$10], START_NW=[$11], BOTTOM_NW=[$12], END_NW=[$13])
-  LogicalMatch(partition=[[2]], order=[[5]], outputFields=[[JOB, SAL, EMPNO, ENAME, MGR, HIREDATE, COMM, DEPTNO, SLACKER, MATCH_NUM, VAR_MATCH, START_NW, BOTTOM_NW, END_NW]], allRows=[true], after=[FLAG(SKIP TO NEXT ROW)], pattern=[(('STRT', PATTERN_QUANTIFIER('DOWN', 1, -1, false)), PATTERN_QUANTIFIER('UP', 1, -1, false))], isStrictStarts=[false], isStrictEnds=[false], subsets=[[]], patternDefinitions=[[<(PREV(DOWN.$3, 0), PREV(DOWN.$3, 1)), >(PREV(UP.$3, 0), PREV(UP.$3, 1))]], inputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJsonPretty">
+    <Resource name="sql">
+      <![CDATA[select json_pretty(ename)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[JSON_PRETTY($1)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMatchRecognizePatternSkip1">
-        <Resource name="sql">
-            <![CDATA[select *
-  from emp match_recognize
-  (
-    after match skip to next row
-    pattern (strt down+ up+)
-    define
-      down as down.mgr < PREV(down.mgr),
-      up as up.mgr > NEXT(up.mgr)
-  ) mr]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalMatch(partition=[[]], order=[[]], outputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]], allRows=[false], after=[FLAG(SKIP TO NEXT ROW)], pattern=[(('STRT', PATTERN_QUANTIFIER('DOWN', 1, -1, false)), PATTERN_QUANTIFIER('UP', 1, -1, false))], isStrictStarts=[false], isStrictEnds=[false], subsets=[[]], patternDefinitions=[[<(PREV(DOWN.$3, 0), PREV(DOWN.$3, 1)), >(PREV(UP.$3, 0), NEXT(PREV(UP.$3, 0), 1))]], inputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testJsonQuery">
+    <Resource name="sql">
+      <![CDATA[select json_query(ename, 'lax $')
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[JSON_QUERY($1, 'lax $', FLAG(WITHOUT_ARRAY), FLAG(SqlJsonQueryEmptyOrErrorBehavior[NULL]), FLAG(SqlJsonQueryEmptyOrErrorBehavior[NULL]))])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testJsonType">
+    <Resource name="sql">
+      <![CDATA[select json_type(ename)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[JSON_TYPE($1)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testJsonValue">
+    <Resource name="sql">
+      <![CDATA[select json_value(ename, 'lax $')
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[JSON_VALUE($1, 'lax $')])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testJsonValueExpressionOperator">
+    <Resource name="sql">
+      <![CDATA[select ename format json,
+ename format json encoding utf8,
+ename format json encoding utf16,
+ename format json encoding utf32
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[FORMAT JSON($1)], EXPR$1=[FORMAT JSON($1)], EXPR$2=[FORMAT JSON($1)], EXPR$3=[FORMAT JSON($1)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testLateral">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{7}])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$0], NAME=[$1])
+      LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select * from emp,
+  LATERAL (select * from dept where emp.deptno=dept.deptno)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testLateralDecorrelate">
+    <Resource name="sql">
+      <![CDATA[select * from emp,
+ LATERAL (select * from dept where emp.deptno=dept.deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalJoin(condition=[=($7, $11)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO2=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testLateralDecorrelateRex">
+    <Resource name="sql">
+      <![CDATA[select * from emp,
+ LATERAL (select * from dept where emp.deptno=dept.deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalJoin(condition=[=($7, $11)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO2=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testLateralDecorrelateThetaRex">
+    <Resource name="sql">
+      <![CDATA[select * from emp,
+ LATERAL (select * from dept where emp.deptno < dept.deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalJoin(condition=[=($7, $11)], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO0=[$2])
+      LogicalJoin(condition=[<($2, $0)], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalAggregate(group=[{0}])
+          LogicalProject(DEPTNO=[$7])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testLeftJoinLateral1">
+    <Resource name="sql">
+      <![CDATA[select * from (values 4) as t(c)
+ left join lateral
+ (select c,a*c from (values 2) as s(a)) as r(d,c)
+ using(c)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(C=[$0], D=[$1])
+  LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0}])
+    LogicalValues(tuples=[[{ 4 }]])
+    LogicalFilter(condition=[=($cor0.C, $1)])
+      LogicalProject(C=[$cor0.C], EXPR$1=[*($0, $cor0.C)])
+        LogicalValues(tuples=[[{ 2 }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testLeftJoinLateral2">
+    <Resource name="sql">
+      <![CDATA[select * from (values 4) as t(c)
+ natural left join lateral
+ (select c,a*c from (values 2) as s(a)) as r(d,c)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(C=[$0], D=[$1])
+  LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0}])
+    LogicalValues(tuples=[[{ 4 }]])
+    LogicalFilter(condition=[=($cor0.C, $1)])
+      LogicalProject(C=[$cor0.C], EXPR$1=[*($0, $cor0.C)])
+        LogicalValues(tuples=[[{ 2 }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testLeftJoinLateral3">
+    <Resource name="sql">
+      <![CDATA[select * from (values 4) as t(c)
+ left join lateral
+ (select c,a*c from (values 2) as s(a)) as r(d,c)
+ on t.c=r.c]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(C=[$0], D=[$1], C0=[$2])
+  LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0}])
+    LogicalValues(tuples=[[{ 4 }]])
+    LogicalFilter(condition=[=($cor0.C, $1)])
+      LogicalProject(C=[$cor0.C], EXPR$1=[*($0, $cor0.C)])
+        LogicalValues(tuples=[[{ 2 }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testLeftJoinLateral4">
+    <Resource name="sql">
+      <![CDATA[select * from (values (4,5)) as t(c,d)
+ left join lateral
+ (select c,a*c from (values 2) as s(a)) as r(d,c)
+ on t.c+t.d=r.c]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(C=[$0], D=[$1], D0=[$2], C0=[$3])
+  LogicalProject(C=[$0], D=[$1], C0=[$4], EXPR$1=[$5])
+    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{2, 3}])
+      LogicalProject(C=[$0], D=[$1], $f2=[+($0, $1)], C0=[$0])
+        LogicalValues(tuples=[[{ 4, 5 }]])
+      LogicalFilter(condition=[=($cor0.$f2, $1)])
+        LogicalProject(C=[$cor0.C], EXPR$1=[*($0, $cor0.C)])
+          LogicalValues(tuples=[[{ 2 }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testLeftJoinLateral5">
+    <Resource name="sql">
+      <![CDATA[select * from (values 4) as t (c)
+left join lateral
+  (select f1+b1 from (values 2) as foo(f1)
+    join
+  (select c+1 from (values 3)) as bar(b1)
+  on f1=b1)
+as r(n) on c=n]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(C=[$0], N=[$1])
+  LogicalProject(C=[$0], EXPR$0=[$3])
+    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{1, 2}])
+      LogicalProject(C=[$0], C0=[$0], $f2=[+($0, 1)])
+        LogicalValues(tuples=[[{ 4 }]])
+      LogicalFilter(condition=[=($cor0.C, $0)])
+        LogicalProject(EXPR$0=[+($0, $1)])
+          LogicalJoin(condition=[=($0, $1)], joinType=[inner])
+            LogicalValues(tuples=[[{ 2 }]])
+            LogicalProject(EXPR$0=[$cor0.$f2])
+              LogicalValues(tuples=[[{ 3 }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testMatchRecognize1">
+    <Resource name="sql">
+      <![CDATA[select *
+  from emp match_recognize
+  (
+    partition by job, sal
+    order by job asc, sal desc, empno
+    pattern (strt down+ up+)
+    define
+      down as down.mgr < PREV(down.mgr),
+      up as up.mgr > prev(up.mgr)) as mr]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalMatch(partition=[[2, 5]], order=[[2, 5 DESC, 0]], outputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]], allRows=[false], after=[FLAG(SKIP TO NEXT ROW)], pattern=[(('STRT', PATTERN_QUANTIFIER('DOWN', 1, -1, false)), PATTERN_QUANTIFIER('UP', 1, -1, false))], isStrictStarts=[false], isStrictEnds=[false], subsets=[[]], patternDefinitions=[[<(PREV(DOWN.$3, 0), PREV(DOWN.$3, 1)), >(PREV(UP.$3, 0), PREV(UP.$3, 1))]], inputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testMatchRecognizeIn">
+    <Resource name="sql">
+      <![CDATA[select *
+  from emp match_recognize
+  (
+    partition by job, sal
+    order by job asc, sal desc, empno
+    pattern (strt down+ up+)
+    define
+      down as down.mgr in (0, 1),
+      up as up.mgr > prev(up.mgr)) as mr]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalMatch(partition=[[2, 5]], order=[[2, 5 DESC, 0]], outputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]], allRows=[false], after=[FLAG(SKIP TO NEXT ROW)], pattern=[(('STRT', PATTERN_QUANTIFIER('DOWN', 1, -1, false)), PATTERN_QUANTIFIER('UP', 1, -1, false))], isStrictStarts=[false], isStrictEnds=[false], subsets=[[]], patternDefinitions=[[OR(=(PREV(DOWN.$3, 0), 0), =(PREV(DOWN.$3, 0), 1)), >(PREV(UP.$3, 0), PREV(UP.$3, 1))]], inputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testMatchRecognizeMeasures1">
+    <Resource name="sql">
+      <![CDATA[select *
+from emp match_recognize (
+  partition by job, sal
+  order by job asc, sal desc
+  measures MATCH_NUMBER() as match_num,
+    CLASSIFIER() as var_match,
+    STRT.mgr as start_nw,
+    LAST(DOWN.mgr) as bottom_nw,
+    LAST(up.mgr) as end_nw
+  pattern (strt down+ up+)
+  define
+    down as down.mgr < PREV(down.mgr),
+    up as up.mgr > prev(up.mgr)) as mr]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(JOB=[$0], SAL=[$1], MATCH_NUM=[$2], VAR_MATCH=[$3], START_NW=[$4], BOTTOM_NW=[$5], END_NW=[$6])
+  LogicalMatch(partition=[[2, 5]], order=[[2, 5 DESC]], outputFields=[[JOB, SAL, MATCH_NUM, VAR_MATCH, START_NW, BOTTOM_NW, END_NW]], allRows=[false], after=[FLAG(SKIP TO NEXT ROW)], pattern=[(('STRT', PATTERN_QUANTIFIER('DOWN', 1, -1, false)), PATTERN_QUANTIFIER('UP', 1, -1, false))], isStrictStarts=[false], isStrictEnds=[false], subsets=[[]], patternDefinitions=[[<(PREV(DOWN.$3, 0), PREV(DOWN.$3, 1)), >(PREV(UP.$3, 0), PREV(UP.$3, 1))]], inputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testMatchRecognizeMeasures2">
+    <Resource name="sql">
+      <![CDATA[select *
+from emp match_recognize (
+  partition by job
+  order by sal
+  measures MATCH_NUMBER() as match_num,
+    CLASSIFIER() as var_match,
+    STRT.mgr as start_nw,
+    LAST(DOWN.mgr) as bottom_nw,
+    LAST(up.mgr) as end_nw
+  pattern (strt down+ up+)
+  define
+    down as down.mgr < PREV(down.mgr),
+    up as up.mgr > prev(up.mgr)) as mr]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(JOB=[$0], MATCH_NUM=[$1], VAR_MATCH=[$2], START_NW=[$3], BOTTOM_NW=[$4], END_NW=[$5])
+  LogicalMatch(partition=[[2]], order=[[5]], outputFields=[[JOB, MATCH_NUM, VAR_MATCH, START_NW, BOTTOM_NW, END_NW]], allRows=[false], after=[FLAG(SKIP TO NEXT ROW)], pattern=[(('STRT', PATTERN_QUANTIFIER('DOWN', 1, -1, false)), PATTERN_QUANTIFIER('UP', 1, -1, false))], isStrictStarts=[false], isStrictEnds=[false], subsets=[[]], patternDefinitions=[[<(PREV(DOWN.$3, 0), PREV(DOWN.$3, 1)), >(PREV(UP.$3, 0), PREV(UP.$3, 1))]], inputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testMatchRecognizeMeasures3">
+    <Resource name="sql">
+      <![CDATA[select *
+from emp match_recognize (
+  partition by job
+  order by sal
+  measures MATCH_NUMBER() as match_num,
+    CLASSIFIER() as var_match,
+    STRT.mgr as start_nw,
+    LAST(DOWN.mgr) as bottom_nw,
+    LAST(up.mgr) as end_nw
+  ALL ROWS PER MATCH
+  pattern (strt down+ up+)
+  define
+    down as down.mgr < PREV(down.mgr),
+    up as up.mgr > prev(up.mgr)) as mr]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(JOB=[$0], SAL=[$1], EMPNO=[$2], ENAME=[$3], MGR=[$4], HIREDATE=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], MATCH_NUM=[$9], VAR_MATCH=[$10], START_NW=[$11], BOTTOM_NW=[$12], END_NW=[$13])
+  LogicalMatch(partition=[[2]], order=[[5]], outputFields=[[JOB, SAL, EMPNO, ENAME, MGR, HIREDATE, COMM, DEPTNO, SLACKER, MATCH_NUM, VAR_MATCH, START_NW, BOTTOM_NW, END_NW]], allRows=[true], after=[FLAG(SKIP TO NEXT ROW)], pattern=[(('STRT', PATTERN_QUANTIFIER('DOWN', 1, -1, false)), PATTERN_QUANTIFIER('UP', 1, -1, false))], isStrictStarts=[false], isStrictEnds=[false], subsets=[[]], patternDefinitions=[[<(PREV(DOWN.$3, 0), PREV(DOWN.$3, 1)), >(PREV(UP.$3, 0), PREV(UP.$3, 1))]], inputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testMatchRecognizePatternSkip1">
+    <Resource name="sql">
+      <![CDATA[select *
+  from emp match_recognize
+  (
+    after match skip to next row
+    pattern (strt down+ up+)
+    define
+      down as down.mgr < PREV(down.mgr),
+      up as up.mgr > NEXT(up.mgr)
+  ) mr]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalMatch(partition=[[]], order=[[]], outputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]], allRows=[false], after=[FLAG(SKIP TO NEXT ROW)], pattern=[(('STRT', PATTERN_QUANTIFIER('DOWN', 1, -1, false)), PATTERN_QUANTIFIER('UP', 1, -1, false))], isStrictStarts=[false], isStrictEnds=[false], subsets=[[]], patternDefinitions=[[<(PREV(DOWN.$3, 0), PREV(DOWN.$3, 1)), >(PREV(UP.$3, 0), NEXT(PREV(UP.$3, 0), 1))]], inputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMatchRecognizePrevDown">
-        <Resource name="sql">
-            <![CDATA[SELECT *
+    </Resource>
+  </TestCase>
+  <TestCase name="testMatchRecognizePrevDown">
+    <Resource name="sql">
+      <![CDATA[SELECT *
 FROM emp
 MATCH_RECOGNIZE (
   MEASURES
@@ -3322,18 +3685,18 @@ MATCH_RECOGNIZE (
     DOWN AS DOWN.mgr < PREV(DOWN.mgr),
     UP AS UP.mgr > PREV(DOWN.mgr)
 ) AS T]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(START_MGR=[$0], UP_DAYS=[$1], TOTAL_DAYS=[$2])
   LogicalMatch(partition=[[]], order=[[]], outputFields=[[START_MGR, UP_DAYS, TOTAL_DAYS]], allRows=[false], after=[FLAG(SKIP TO NEXT ROW)], pattern=[(('STRT', PATTERN_QUANTIFIER('DOWN', 1, -1, false)), PATTERN_QUANTIFIER('UP', 1, -1, false))], isStrictStarts=[false], isStrictEnds=[false], subsets=[[]], patternDefinitions=[[<(PREV(DOWN.$3, 0), PREV(DOWN.$3, 1)), >(PREV(UP.$3, 0), LAST(DOWN.$3, 1))]], inputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMatchRecognizePrevLast">
-        <Resource name="sql">
-            <![CDATA[SELECT *
+    </Resource>
+  </TestCase>
+  <TestCase name="testMatchRecognizePrevLast">
+    <Resource name="sql">
+      <![CDATA[SELECT *
 FROM emp
 MATCH_RECOGNIZE (
   MEASURES
@@ -3346,18 +3709,18 @@ MATCH_RECOGNIZE (
     DOWN AS DOWN.mgr < PREV(DOWN.mgr),
     UP AS UP.mgr > PREV(LAST(DOWN.mgr, 1), 1)
 ) AS T]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(START_MGR=[$0], BOTTOM_MGR=[$1], END_MGR=[$2])
   LogicalMatch(partition=[[]], order=[[]], outputFields=[[START_MGR, BOTTOM_MGR, END_MGR]], allRows=[false], after=[FLAG(SKIP TO NEXT ROW)], pattern=[(('STRT', PATTERN_QUANTIFIER('DOWN', 1, -1, false)), PATTERN_QUANTIFIER('UP', 1, -1, false))], isStrictStarts=[false], isStrictEnds=[false], subsets=[[]], patternDefinitions=[[<(PREV(DOWN.$3, 0), PREV(DOWN.$3, 1)), >(PREV(UP.$3, 0), PREV(LAST(DOWN.$3, 1), 1))]], inputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMatchRecognizeSubset1">
-        <Resource name="sql">
-            <![CDATA[select *
+    </Resource>
+  </TestCase>
+  <TestCase name="testMatchRecognizeSubset1">
+    <Resource name="sql">
+      <![CDATA[select *
   from emp match_recognize
   (
     after match skip to down
@@ -3367,1550 +3730,1211 @@ LogicalProject(START_MGR=[$0], BOTTOM_MGR=[$1], END_MGR=[$2])
       down as down.mgr < PREV(down.mgr),
       up as up.mgr > NEXT(up.mgr)
   ) mr]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
   LogicalMatch(partition=[[]], order=[[]], outputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]], allRows=[false], after=[SKIP TO LAST('DOWN')], pattern=[(('STRT', PATTERN_QUANTIFIER('DOWN', 1, -1, false)), PATTERN_QUANTIFIER('UP', 1, -1, false))], isStrictStarts=[false], isStrictEnds=[false], subsets=[[[DOWN, STRT]]], patternDefinitions=[[<(PREV(DOWN.$3, 0), PREV(DOWN.$3, 1)), >(PREV(UP.$3, 0), NEXT(PREV(UP.$3, 0), 1))]], inputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPrevClassifier">
-        <Resource name="sql">
-            <![CDATA[SELECT *
-FROM emp
-MATCH_RECOGNIZE (
-  MEASURES
-    STRT.mgr AS start_mgr,
-    LAST(DOWN.mgr) AS up_days,
-    LAST(UP.mgr) AS total_days
-  PATTERN (STRT DOWN? UP+)
-  DEFINE
-    DOWN AS DOWN.mgr < PREV(DOWN.mgr),
-    UP AS CASE
-            WHEN PREV(CLASSIFIER()) = 'STRT'
-              THEN UP.mgr > 15
-            ELSE
-              UP.mgr > 20
-            END
-) AS T]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(START_MGR=[$0], UP_DAYS=[$1], TOTAL_DAYS=[$2])
-  LogicalMatch(partition=[[]], order=[[]], outputFields=[[START_MGR, UP_DAYS, TOTAL_DAYS]], allRows=[false], after=[FLAG(SKIP TO NEXT ROW)], pattern=[(('STRT', PATTERN_QUANTIFIER('DOWN', 0, 1, false)), PATTERN_QUANTIFIER('UP', 1, -1, false))], isStrictStarts=[false], isStrictEnds=[false], subsets=[[]], patternDefinitions=[[<(PREV(DOWN.$3, 0), PREV(DOWN.$3, 1)), CASE(=(PREV(CLASSIFIER(), 1), 'STRT'), >(PREV(UP.$3, 0), 15), >(PREV(UP.$3, 0), 20))]], inputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNotNotIn">
-        <Resource name="sql">
-            <![CDATA[select * from EMP where not (ename not in ('Fred') )]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[=($1, 'Fred')])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableSubset">
-        <Resource name="sql">
-            <![CDATA[select deptno, name from dept]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableExpression">
-        <Resource name="sql">
-            <![CDATA[select deptno + deptno from dept]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($0, $0)])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableExtend">
-        <Resource name="sql">
-            <![CDATA[select * from dept extend (x varchar(5) not null)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], X=[$2])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableExtendSubset">
-        <Resource name="sql">
-            <![CDATA[select deptno, x from dept extend (x int)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], X=[$2])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableExtendExpression">
-        <Resource name="sql">
-            <![CDATA[select deptno + x from dept extend (x int not null)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[+($0, $2)])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testModifiableViewDdlExtend">
+    <Resource name="sql">
+      <![CDATA[select extra from EMP_MODIFIABLEVIEW2]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXTRA=[$6])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testModifiableViewExtend">
-        <Resource name="sql">
-            <![CDATA[select *
+    </Resource>
+  </TestCase>
+  <TestCase name="testModifiableViewExtend">
+    <Resource name="sql">
+      <![CDATA[select *
 from EMP_MODIFIABLEVIEW extend (x varchar(5) not null)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$7], X=[$8])
   LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testModifiableViewExtendSubset">
-        <Resource name="sql">
-            <![CDATA[select x, empno
-from EMP_MODIFIABLEVIEW extend (x varchar(5) not null)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(X=[$8], EMPNO=[$0])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testModifiableViewExtendExpression">
-        <Resource name="sql">
-            <![CDATA[select empno + x
+    </Resource>
+  </TestCase>
+  <TestCase name="testModifiableViewExtendExpression">
+    <Resource name="sql">
+      <![CDATA[select empno + x
 from EMP_MODIFIABLEVIEW extend (x int not null)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EXPR$0=[+($0, $8)])
   LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectModifiableViewConstraint">
-        <Resource name="sql">
-            <![CDATA[select deptno from EMP_MODIFIABLEVIEW2
-where deptno = ?]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$3])
-  LogicalFilter(condition=[=($3, ?0)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testModifiableViewExtendSubset">
+    <Resource name="sql">
+      <![CDATA[select x, empno
+from EMP_MODIFIABLEVIEW extend (x varchar(5) not null)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(X=[$8], EMPNO=[$0])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testModifiableViewDdlExtend">
-        <Resource name="sql">
-            <![CDATA[select extra from EMP_MODIFIABLEVIEW2]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXTRA=[$6])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testMultiAnd">
+    <Resource name="sql">
+      <![CDATA[select * from emp
+where deptno < 10
+and deptno > 5
+and (deptno = 8 or empno < 100)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[AND(<($7, 10), >($7, 5), OR(=($7, 8), <($0, 100)))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupByCaseSubQuery">
-        <Resource name="sql">
-            <![CDATA[SELECT CASE WHEN emp.empno IN (3) THEN 0 ELSE 1 END
-FROM emp
-GROUP BY (CASE WHEN emp.empno IN (3) THEN 0 ELSE 1 END)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}])
-  LogicalProject(EXPR$0=[CASE(=($0, 3), 0, 1)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testMultiset">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=['a'], EXPR$1=[$SLICE($2)])
+  LogicalJoin(condition=[true], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    Collect(field=[EXPR$0])
+      LogicalValues(tuples=[[{ 10 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMatchRecognizeIn">
-        <Resource name="sql">
-            <![CDATA[select *
-  from emp match_recognize
-  (
-    partition by job, sal
-    order by job asc, sal desc, empno
-    pattern (strt down+ up+)
-    define
-      down as down.mgr in (0, 1),
-      up as up.mgr > prev(up.mgr)) as mr]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalMatch(partition=[[2, 5]], order=[[2, 5 DESC, 0]], outputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]], allRows=[false], after=[FLAG(SKIP TO NEXT ROW)], pattern=[(('STRT', PATTERN_QUANTIFIER('DOWN', 1, -1, false)), PATTERN_QUANTIFIER('UP', 1, -1, false))], isStrictStarts=[false], isStrictEnds=[false], subsets=[[]], patternDefinitions=[[OR(=(PREV(DOWN.$3, 0), 0), =(PREV(DOWN.$3, 0), 1)), >(PREV(UP.$3, 0), PREV(UP.$3, 1))]], inputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select 'a',multiset[10] from dept]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testMultisetOfColumns">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=['abc'], EXPR$1=[$SLICE($9)])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{5, 7}])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    Collect(field=[EXPR$0])
+      LogicalUnion(all=[true])
+        LogicalProject(EXPR$0=[$cor0.DEPTNO])
+          LogicalValues(tuples=[[{ 0 }]])
+        LogicalProject(EXPR$0=[$cor0.SAL])
+          LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggNoDuplicateColumnNames">
-        <Resource name="sql">
-            <![CDATA[SELECT  empno, EXPR$2, COUNT(empno) FROM (
-    SELECT empno, deptno AS EXPR$2
-    FROM emp)
-GROUP BY empno, EXPR$2]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], EXPR$2=[$1], EXPR$20=[$2])
-  LogicalAggregate(group=[{0, 1}], EXPR$2=[COUNT()])
-    LogicalProject(EMPNO=[$0], EXPR$2=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggCaseSubQuery">
-        <Resource name="sql">
-            <![CDATA[SELECT SUM(CASE WHEN empno IN (3) THEN 0 ELSE 1 END) FROM emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
-  LogicalProject($f0=[CASE(=($0, 3), 0, 1)])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select 'abc',multiset[deptno,sal] from emp]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testMultisetOfColumnsRex">
+    <Resource name="sql">
+      <![CDATA[select 'abc',multiset[deptno,sal] from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=['abc'], EXPR$1=[$SLICE($9)])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{5, 7}])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    Collect(field=[EXPR$0])
+      LogicalUnion(all=[true])
+        LogicalProject(EXPR$0=[$cor0.DEPTNO])
+          LogicalValues(tuples=[[{ 0 }]])
+        LogicalProject(EXPR$0=[$cor0.SAL])
+          LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggCaseInSubQuery">
-        <Resource name="sql">
-            <![CDATA[SELECT SUM(
-  CASE WHEN deptno IN (SELECT deptno FROM dept) THEN 1 ELSE 0 END)
-FROM emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
-  LogicalProject($f0=[CASE(IN($7, {
-LogicalProject(DEPTNO=[$0])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-}), 1, 0)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testMultisetSubQuery">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1])
+  LogicalJoin(condition=[true], joinType=[inner])
+    LogicalValues(tuples=[[{ true }]])
+    Collect(field=[EXPR$0])
+      LogicalProject(DEPTNO=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggScalarSubQuery">
-        <Resource name="sql">
-            <![CDATA[SELECT SUM(SELECT min(deptno) FROM dept) FROM emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
-  LogicalProject(EXPR$0=[$9])
-    LogicalJoin(condition=[true], joinType=[left])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select multiset(select deptno from dept) from (values(true))]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testNestedAggregates">
+    <Resource name="sql">
+      <![CDATA[SELECT
+  avg(sum(sal) + 2 * min(empno) + 3 * avg(empno))
+  over (partition by deptno)
+from emp
+group by deptno]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[CAST(/(SUM(+(+($1, *(2, $2)), *(3, $3))) OVER (PARTITION BY $0), COUNT(+(+($1, *(2, $2)), *(3, $3))) OVER (PARTITION BY $0))):INTEGER NOT NULL])
+  LogicalAggregate(group=[{0}], agg#0=[SUM($1)], agg#1=[MIN($2)], agg#2=[AVG($2)])
+    LogicalProject(DEPTNO=[$7], SAL=[$5], EMPNO=[$0])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], EXPR$0=[MIN($0)])
-        LogicalProject(DEPTNO=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testStream">
-        <Resource name="sql">
-            <![CDATA[select stream productId from orders where productId = 10]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalDelta
-  LogicalProject(PRODUCTID=[$1])
-    LogicalFilter(condition=[=($1, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testStreamGroupBy">
-        <Resource name="sql">
-            <![CDATA[select stream
- floor(rowtime to second) as rowtime, count(*) as c
-from orders
-group by floor(rowtime to second)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalDelta
-  LogicalAggregate(group=[{0}], C=[COUNT()])
-    LogicalProject(ROWTIME=[FLOOR($0, FLAG(SECOND))])
-      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testStreamWindowedAggregation">
-        <Resource name="sql">
-            <![CDATA[select stream *,
-  count(*) over (partition by productId
-    order by rowtime
-    range interval '1' second preceding) as c
-from orders]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalDelta
-  LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2], C=[COUNT() OVER (PARTITION BY $1 ORDER BY $0 RANGE 1000:INTERVAL SECOND PRECEDING)])
-    LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTumbleTable">
-        <Resource name="sql">
-            <![CDATA[select stream tumble_end(rowtime, interval '2' hour) as rowtime, productId
-from orders
-group by tumble(rowtime, interval '2' hour), productId]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalDelta
-  LogicalProject(ROWTIME=[+($0, 7200000:INTERVAL HOUR)], PRODUCTID=[$1])
-    LogicalAggregate(group=[{0, 1}])
-      LogicalProject($f0=[$TUMBLE($0, 7200000:INTERVAL HOUR)], PRODUCTID=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testHopTable">
-        <Resource name="sql">
-            <![CDATA[select stream hop_start(rowtime, interval '1' hour, interval '3' hour) as rowtime,
-  count(*) as c
-from orders
-group by hop(rowtime, interval '1' hour, interval '3' hour)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalDelta
-  LogicalProject(ROWTIME=[$0], C=[$1])
-    LogicalAggregate(group=[{0}], C=[COUNT()])
-      LogicalProject($f0=[$HOP($0, 3600000:INTERVAL HOUR, 10800000:INTERVAL HOUR)])
-        LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNotInWithLiteral">
-        <Resource name="sql">
-            <![CDATA[SELECT *
-FROM SALES.NATION
-WHERE n_name NOT IN
-    (SELECT ''
-     FROM SALES.NATION)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(**=[$1])
-  LogicalFilter(condition=[NOT(AND(IS TRUE($4), IS NOT NULL($2)))])
-    LogicalJoin(condition=[=($2, $3)], joinType=[left])
-      LogicalProject(N_NAME=[$0], **=[$1], N_NAME0=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, NATION]])
-      LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-        LogicalProject(EXPR$0=[''], $f1=[true])
-          LogicalTableScan(table=[[CATALOG, SALES, NATION]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSessionTable">
-        <Resource name="sql">
-            <![CDATA[select stream session_start(rowtime, interval '1' hour) as rowtime,
-  session_end(rowtime, interval '1' hour),
-  count(*) as c
-from orders
-group by session(rowtime, interval '1' hour)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalDelta
-  LogicalProject(ROWTIME=[$0], EXPR$1=[$0], C=[$1])
-    LogicalAggregate(group=[{0}], C=[COUNT()])
-      LogicalProject($f0=[$SESSION($0, 3600000:INTERVAL HOUR)])
-        LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testNestedColumnType">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ZIP=[$3])
+  LogicalFilter(condition=[=($2, 'abc')])
+    LogicalProject(EMPNO=[$0], STREET=[$1.STREET], CITY=[$1.CITY], ZIP=[$1.ZIP], STATE=[$1.STATE], STREET5=[$2.STREET], CITY6=[$2.CITY], ZIP7=[$2.ZIP], STATE8=[$2.STATE])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP_ADDRESS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupByCaseIn">
-        <Resource name="sql">
-            <![CDATA[select
- (CASE WHEN (deptno IN (10, 20)) THEN 0 ELSE deptno END),
- min(empno) from EMP
-group by (CASE WHEN (deptno IN (10, 20)) THEN 0 ELSE deptno END)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[MIN($1)])
-  LogicalProject(EXPR$0=[CASE(SEARCH($7, Sarg[10, 20]), 0, $7)], EMPNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select empa.home_address.zip
+from sales.emp_address empa
+where empa.home_address.city = 'abc']]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testNestedCorrelations">
+    <Resource name="sql">
+      <![CDATA[select *
+from (select 2+deptno d2, 3+deptno d3 from emp) e
+ where exists (select 1 from (select deptno+1 d1 from dept) d
+ where d1=e.d2 and exists (select 2 from (select deptno+4 d4, deptno+5 d5, deptno+6 d6 from dept)
+ where d4=d.d1 and d5=d.d1 and d6=e.d3))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(D2=[$0], D3=[$1])
+  LogicalFilter(condition=[IS NOT NULL($2)])
+    LogicalCorrelate(correlation=[$cor3], joinType=[left], requiredColumns=[{0, 1}])
+      LogicalProject(D2=[+(2, $7)], D3=[+(3, $7)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalFilter(condition=[AND(=($0, $cor3.D2), IS NOT NULL($1))])
+            LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0}])
+              LogicalProject(D1=[+($0, 1)])
+                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+              LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+                LogicalProject($f0=[true])
+                  LogicalFilter(condition=[AND(=($0, $cor0.D1), =($1, $cor0.D1), =($2, $cor3.D3))])
+                    LogicalProject(D4=[+($0, 4)], D5=[+($0, 5)], D6=[+($0, 6)])
+                      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggFilter">
-        <Resource name="sql">
-            <![CDATA[select
-  deptno, sum(sal * 2) filter (where empno < 10), count(*)
-from emp
-group by deptno]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1) FILTER $2], EXPR$2=[COUNT()])
-  LogicalProject(DEPTNO=[$7], $f1=[*($5, 2)], $f2=[<($0, 10)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testNestedCorrelationsDecorrelated">
+    <Resource name="sql">
+      <![CDATA[select *
+from (select 2+deptno d2, 3+deptno d3 from emp) e
+ where exists (select 1 from (select deptno+1 d1 from dept) d
+ where d1=e.d2 and exists (select 2 from (select deptno+4 d4, deptno+5 d5, deptno+6 d6 from dept)
+ where d4=d.d1 and d5=d.d1 and d6=e.d3))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(D2=[$0], D3=[$1])
+  LogicalProject(D2=[$0], D3=[$1], D1=[CAST($2):INTEGER], D6=[$3], $f2=[CAST($4):BOOLEAN])
+    LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[inner])
+      LogicalProject(D2=[+(2, $7)], D3=[+(3, $7)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{0, 1}], agg#0=[MIN($2)])
+        LogicalProject(D1=[$0], D6=[$2], $f0=[true])
+          LogicalFilter(condition=[IS NOT NULL($1)])
+            LogicalProject(D1=[$0], $f0=[$3], D6=[$2])
+              LogicalJoin(condition=[=($0, $1)], joinType=[left])
+                LogicalProject(D1=[+($0, 1)])
+                  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+                LogicalAggregate(group=[{0, 1}], agg#0=[MIN($2)])
+                  LogicalProject(D4=[$0], D6=[$2], $f0=[true])
+                    LogicalFilter(condition=[=($1, $0)])
+                      LogicalProject(D4=[+($0, 4)], D5=[+($0, 5)], D6=[+($0, 6)])
+                        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggFilterWithIn">
-        <Resource name="sql">
-            <![CDATA[select
-  deptno, sum(sal * 2) filter (where empno not in (1, 2)), count(*)
-from emp
-group by deptno]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[SUM($1) FILTER $2], EXPR$2=[COUNT()])
-  LogicalProject(DEPTNO=[$7], $f1=[*($5, 2)], $f2=[SEARCH($0, Sarg[(-∞..1), (1..2), (2..+∞)])])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testNestedCorrelationsDecorrelatedRex">
+    <Resource name="sql">
+      <![CDATA[select *
+from (select 2+deptno d2, 3+deptno d3 from emp) e
+ where exists (select 1 from (select deptno+1 d1 from dept) d
+ where d1=e.d2 and exists (select 2 from (select deptno+4 d4, deptno+5 d5, deptno+6 d6 from dept)
+ where d4=d.d1 and d5=d.d1 and d6=e.d3))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(D2=[$0], D3=[$1])
+  LogicalProject(D2=[$0], D3=[$1], D1=[CAST($2):INTEGER], D6=[$3], $f2=[CAST($4):BOOLEAN])
+    LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[inner])
+      LogicalProject(D2=[+(2, $7)], D3=[+(3, $7)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{0, 1}], agg#0=[MIN($2)])
+        LogicalProject(D1=[$0], D6=[$2], $f0=[true])
+          LogicalFilter(condition=[IS NOT NULL($1)])
+            LogicalProject(D1=[$0], $f0=[$3], D6=[$2])
+              LogicalJoin(condition=[=($0, $1)], joinType=[left])
+                LogicalProject(D1=[+($0, 1)])
+                  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+                LogicalAggregate(group=[{0, 1}], agg#0=[MIN($2)])
+                  LogicalProject(D4=[$0], D6=[$2], $f0=[true])
+                    LogicalFilter(condition=[=($1, $0)])
+                      LogicalProject(D4=[+($0, 4)], D5=[+($0, 5)], D6=[+($0, 6)])
+                        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNestedPrimitiveFieldAccess">
-        <Resource name="sql">
-            <![CDATA[select dn.skill['desc']
+    </Resource>
+  </TestCase>
+  <TestCase name="testNestedPrimitiveFieldAccess">
+    <Resource name="sql">
+      <![CDATA[select dn.skill['desc']
 from sales.dept_nested dn]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EXPR$0=[$2.DESC])
   LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNestedStructFieldAccess">
-        <Resource name="sql">
-            <![CDATA[select dn.skill['others']
+    </Resource>
+  </TestCase>
+  <TestCase name="testNestedStructFieldAccess">
+    <Resource name="sql">
+      <![CDATA[select dn.skill['others']
 from sales.dept_nested dn]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EXPR$0=[ROW($2.OTHERS.A, $2.OTHERS.B)])
   LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNestedStructPrimitiveFieldAccess">
-        <Resource name="sql">
-            <![CDATA[select dn.skill['others']['a']
+    </Resource>
+  </TestCase>
+  <TestCase name="testNestedStructPrimitiveFieldAccess">
+    <Resource name="sql">
+      <![CDATA[select dn.skill['others']['a']
 from sales.dept_nested dn]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EXPR$0=[$2.OTHERS.A])
   LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSimplifyExistsAggregateSubQuery">
-        <Resource name="sql">
-            <![CDATA[SELECT e1.empno
-FROM emp e1 where exists
-(select avg(sal) from emp e2 where e1.empno = e2.empno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSimplifyNotExistsAggregateSubQuery">
-        <Resource name="sql">
-            <![CDATA[SELECT e1.empno
-FROM emp e1 where not exists
-(select avg(sal) from emp e2 where e1.empno = e2.empno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testNotCaseInMoreClause">
+    <Resource name="sql">
+      <![CDATA[select empno from emp where not case when true then deptno in (10,20) when false then false else deptno in (30,40) end]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[NOT(true)])
+  LogicalFilter(condition=[CASE(true, NOT(OR(=($7, 10), =($7, 20))), false, NOT(false), NOT(OR(=($7, 30), =($7, 40))))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSimplifyExistsValuesSubQuery">
-        <Resource name="sql">
-            <![CDATA[select deptno
-from EMP
-where exists (values 10)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReduceConstExpr">
-        <Resource name="sql">
-            <![CDATA[select sum(case when 'y' = 'n' then ename else 0.1 end) from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
-  LogicalProject($f0=[0.1:DECIMAL(19, 9)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testNotCaseInThreeClause">
+    <Resource name="sql">
+      <![CDATA[select empno from emp where not case when true then deptno in (10,20) else true end]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[CASE(true, NOT(OR(=($7, 10), =($7, 20))), NOT(true))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSimplifyNotExistsValuesSubQuery">
-        <Resource name="sql">
-            <![CDATA[select deptno
-from EMP
-where not exists (values 10)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7])
-  LogicalFilter(condition=[NOT(true)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testNotCaseInWithoutElse">
+    <Resource name="sql">
+      <![CDATA[select empno from emp where not case when true then deptno in (10,20)  end]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[CASE(true, CAST(NOT(OR(=($7, 10), =($7, 20)))):BOOLEAN, null:BOOLEAN)])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSubQueryAggregateFunctionFollowedBySimpleOperation">
-        <Resource name="sql">
-            <![CDATA[select deptno
-from EMP
-where deptno > (select min(deptno) * 2 + 10 from EMP)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7])
-  LogicalFilter(condition=[>($7, $9)])
-    LogicalJoin(condition=[true], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testNotExistsCorrelated">
+    <Resource name="sql">
+      <![CDATA[select * from emp where not exists (
+  select 1 from dept where emp.deptno=dept.deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[NOT(IS NOT NULL($9))])
+    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalProject(EXPR$0=[+(*($0, 2), 10)])
-        LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-          LogicalProject(DEPTNO=[$7])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSubQueryValues">
-        <Resource name="sql">
-            <![CDATA[select deptno
-from EMP
-where deptno > (values 10)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7])
-  LogicalFilter(condition=[>($7, $9)])
-    LogicalJoin(condition=[true], joinType=[left])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
+            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testNotInUncorrelatedSubQuery">
+    <Resource name="sql">
+      <![CDATA[select empno from emp where deptno not in (select deptno from dept)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[NOT(AND(IS TRUE($11), IS NOT NULL($9)))])
+    LogicalJoin(condition=[=($9, $10)], joinType=[left])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$7])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+        LogicalProject(DEPTNO=[$0], $f1=[true])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testNotInUncorrelatedSubQueryInSelect">
+    <Resource name="sql">
+      <![CDATA[select empno, deptno not in (
+  select case when true then deptno else null end from dept)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], EXPR$1=[OR(=($9, 0), AND(<($10, $9), null, IS NULL($13)), AND(IS NULL($13), >=($10, $9)))])
+  LogicalJoin(condition=[=($11, $12)], joinType=[left])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f0=[$9], $f1=[$10], DEPTNO0=[$7])
+      LogicalJoin(condition=[true], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalAggregate(group=[{}], agg#0=[COUNT()], agg#1=[COUNT($0)])
+          LogicalProject(EXPR$0=[CAST($0):INTEGER], $f1=[true])
+            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+      LogicalProject(EXPR$0=[CAST($0):INTEGER], $f1=[true])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testNotInUncorrelatedSubQueryInSelectDeduceNotNull">
+    <Resource name="sql">
+      <![CDATA[select empno, deptno not in (
+  select mgr from emp where mgr > 5)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], EXPR$1=[CAST(IS NOT TRUE($11)):BOOLEAN])
+  LogicalJoin(condition=[=($9, $10)], joinType=[left])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$7])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalValues(tuples=[[{ 10 }]])
+    LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+      LogicalProject(MGR=[$3], $f1=[true])
+        LogicalFilter(condition=[>($3, 5)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSubQueryLimitOne">
-        <Resource name="sql">
-            <![CDATA[select deptno
-from EMP
-where deptno > (select deptno
-from EMP order by deptno limit 1)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7])
-  LogicalFilter(condition=[>($7, $9)])
-    LogicalJoin(condition=[true], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testNotInUncorrelatedSubQueryInSelectDeduceNotNull2">
+    <Resource name="sql">
+      <![CDATA[select empno, deptno not in (
+  select mgr from emp where mgr is not null)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], EXPR$1=[CAST(IS NOT TRUE($11)):BOOLEAN])
+  LogicalJoin(condition=[=($9, $10)], joinType=[left])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$7])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalSort(sort0=[$0], dir0=[ASC], fetch=[1])
-        LogicalProject(DEPTNO=[$7])
+    LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+      LogicalProject(MGR=[$3], $f1=[true])
+        LogicalFilter(condition=[IS NOT NULL($3)])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testIdenticalExpressionInSubQuery">
-        <Resource name="sql">
-            <![CDATA[select deptno
-from EMP
-where deptno in (1, 2) or deptno in (1, 2)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$7])
-  LogicalFilter(condition=[OR(=($7, 1), =($7, 2), =($7, 1), =($7, 2))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testNotInUncorrelatedSubQueryInSelectDeduceNotNull3">
+    <Resource name="sql">
+      <![CDATA[select empno, deptno not in (
+  select mgr from emp where mgr in (
+    select mgr from emp where deptno = 10))
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], EXPR$1=[CAST(IS NOT TRUE($11)):BOOLEAN])
+  LogicalJoin(condition=[=($9, $10)], joinType=[left])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+      LogicalProject(MGR=[$3], $f1=[true])
+        LogicalJoin(condition=[=($3, $9)], joinType=[inner])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+          LogicalAggregate(group=[{0}])
+            LogicalProject(MGR=[$3])
+              LogicalFilter(condition=[=($7, 10)])
+                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testHavingAggrFunctionIn">
-        <Resource name="sql">
-            <![CDATA[select deptno
-from emp
-group by deptno
-having sum(case when deptno in (1, 2) then 0 else 1 end) +
-sum(case when deptno in (3, 4) then 0 else 1 end) > 10]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0])
-  LogicalFilter(condition=[>(+($1, $2), 10)])
-    LogicalAggregate(group=[{0}], agg#0=[SUM($1)], agg#1=[SUM($2)])
-      LogicalProject(DEPTNO=[$7], $f1=[CASE(SEARCH($7, Sarg[1, 2]), 0, 1)], $f2=[CASE(SEARCH($7, Sarg[3, 4]), 0, 1)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testNotInUncorrelatedSubQueryInSelectMayBeNull">
+    <Resource name="sql">
+      <![CDATA[select empno, deptno not in (
+  select mgr from emp)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], EXPR$1=[OR(=($9, 0), AND(<($10, $9), null, IS NULL($13)), AND(IS NULL($13), >=($10, $9)))])
+  LogicalJoin(condition=[=($11, $12)], joinType=[left])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f0=[$9], $f1=[$10], DEPTNO0=[$7])
+      LogicalJoin(condition=[true], joinType=[inner])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testHavingInSubQueryWithAggrFunction">
-        <Resource name="sql">
-            <![CDATA[select sal
-from emp
-group by sal
-having sal in (
-  select deptno
-  from dept
-  group by deptno
-  having sum(deptno) > 0)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(SAL=[$0])
-  LogicalJoin(condition=[=($0, $1)], joinType=[inner])
-    LogicalAggregate(group=[{0}])
-      LogicalProject(SAL=[$5])
+        LogicalAggregate(group=[{}], agg#0=[COUNT()], agg#1=[COUNT($0)])
+          LogicalProject(MGR=[$3], $f1=[true])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+      LogicalProject(MGR=[$3], $f1=[true])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}])
-      LogicalProject(DEPTNO=[$0])
-        LogicalFilter(condition=[>($1, 0)])
-          LogicalAggregate(group=[{0}], agg#0=[SUM($0)])
-            LogicalProject(DEPTNO=[$0])
-              LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateAndScalarSubQueryInHaving">
-        <Resource name="sql">
-            <![CDATA[select deptno
-from emp
-group by deptno
-having max(emp.empno) > (SELECT min(emp.empno) FROM emp)
+    </Resource>
+  </TestCase>
+  <TestCase name="testNotInUncorrelatedSubQueryInSelectNotNull">
+    <Resource name="sql">
+      <![CDATA[select empno, deptno not in (
+  select deptno from dept)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], EXPR$1=[IS NOT TRUE($11)])
+  LogicalJoin(condition=[=($9, $10)], joinType=[left])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+      LogicalProject(DEPTNO=[$0], $f1=[true])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testNotInUncorrelatedSubQueryInSelectNotNullRex">
+    <Resource name="sql">
+      <![CDATA[select empno, deptno not in (
+  select deptno from dept)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], EXPR$1=[NOT(IN($7, {
 LogicalProject(DEPTNO=[$0])
-  LogicalFilter(condition=[>($1, $2)])
-    LogicalJoin(condition=[true], joinType=[left])
-      LogicalAggregate(group=[{0}], agg#0=[MAX($1)])
-        LogicalProject(DEPTNO=[$7], EMPNO=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], EXPR$0=[MIN($0)])
-        LogicalProject(EMPNO=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+}))])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateAndScalarSubQueryInSelect">
-        <Resource name="sql">
-            <![CDATA[select deptno,
-  max(emp.empno) > (SELECT min(emp.empno) FROM emp) as b
-from emp
-group by deptno
+    </Resource>
+  </TestCase>
+  <TestCase name="testNotInUncorrelatedSubQueryInSelectRex">
+    <Resource name="sql">
+      <![CDATA[select empno, deptno not in (
+  select case when true then deptno else null end from dept)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], EXPR$1=[NOT(IN($7, {
+LogicalProject(EXPR$0=[CAST($0):INTEGER])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+}))])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], B=[>($1, $2)])
-  LogicalJoin(condition=[true], joinType=[left])
-    LogicalAggregate(group=[{0}], agg#0=[MAX($1)])
-      LogicalProject(DEPTNO=[$7], EMPNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{}], EXPR$0=[MIN($0)])
-      LogicalProject(EMPNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testNotInUncorrelatedSubQueryRex">
+    <Resource name="sql">
+      <![CDATA[select empno from emp where deptno not in (select deptno from dept)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[NOT(IN($7, {
+LogicalProject(DEPTNO=[$0])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+}))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsert">
-        <Resource name="sql">
-            <![CDATA[insert into empnullables (deptno, empno, ename)
-values (10, 150, 'Fred')]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[true])
-  LogicalProject(EMPNO=[$1], ENAME=[$2], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[null:INTEGER], COMM=[null:INTEGER], DEPTNO=[$0], SLACKER=[null:BOOLEAN])
-    LogicalValues(tuples=[[{ 10, 150, 'Fred' }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testNotInWithLiteral">
+    <Resource name="sql">
+      <![CDATA[SELECT *
+FROM SALES.NATION
+WHERE n_name NOT IN
+    (SELECT ''
+     FROM SALES.NATION)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(**=[$1])
+  LogicalFilter(condition=[NOT(AND(IS TRUE($4), IS NOT NULL($2)))])
+    LogicalJoin(condition=[=($2, $3)], joinType=[left])
+      LogicalProject(N_NAME=[$0], **=[$1], N_NAME0=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+      LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+        LogicalProject(EXPR$0=[''], $f1=[true])
+          LogicalTableScan(table=[[CATALOG, SALES, NATION]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertSubset">
-        <Resource name="sql">
-            <![CDATA[insert into empnullables
-values (50, 'Fred')]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[null:INTEGER], COMM=[null:INTEGER], DEPTNO=[null:INTEGER], SLACKER=[null:BOOLEAN])
-    LogicalValues(tuples=[[{ 50, 'Fred' }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testNotLike">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[NOT(LIKE('a', 'b', 'c'))])
+  LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertBind">
-        <Resource name="sql">
-            <![CDATA[insert into empnullables (deptno, empno, ename)
-values (?, ?, ?)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[true])
-  LogicalProject(EMPNO=[?1], ENAME=[?2], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[null:INTEGER], COMM=[null:INTEGER], DEPTNO=[?0], SLACKER=[null:BOOLEAN])
-    LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[values ('a' not like 'b' escape 'c')]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testNotNotIn">
+    <Resource name="sql">
+      <![CDATA[select * from EMP where not (ename not in ('Fred') )]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[=($1, 'Fred')])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertWithSort">
-        <Resource name="sql">
-            <![CDATA[insert into empnullables (empno, ename)
-select deptno, ename from emp order by ename]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[null:INTEGER], COMM=[null:INTEGER], DEPTNO=[null:INTEGER], SLACKER=[null:BOOLEAN])
-    LogicalSort(sort0=[$1], dir0=[ASC])
-      LogicalProject(DEPTNO=[$7], ENAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOffset">
+    <Resource name="sql">
+      <![CDATA[select empno from emp offset 10 rows]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(offset=[10])
+  LogicalProject(EMPNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertWithLimit">
-        <Resource name="sql">
-            <![CDATA[insert into empnullables (empno, ename)
-select deptno, ename from emp order by ename limit 10]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[null:INTEGER], COMM=[null:INTEGER], DEPTNO=[null:INTEGER], SLACKER=[null:BOOLEAN])
-    LogicalSort(sort0=[$1], dir0=[ASC], fetch=[10])
-      LogicalProject(DEPTNO=[$7], ENAME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOffset0">
+    <Resource name="sql">
+      <![CDATA[select * from emp offset 0]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertBindSubset">
-        <Resource name="sql">
-            <![CDATA[insert into empnullables
-values (?, ?)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[true])
-  LogicalProject(EMPNO=[?0], ENAME=[?1], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[null:INTEGER], COMM=[null:INTEGER], DEPTNO=[null:INTEGER], SLACKER=[null:BOOLEAN])
-    LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOffsetFetch">
+    <Resource name="sql">
+      <![CDATA[select empno from emp
+offset 10 rows fetch next 5 rows only]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(offset=[10], fetch=[5])
+  LogicalProject(EMPNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertBindExtendedColumn">
-        <Resource name="sql">
-            <![CDATA[insert into empdefaults(updated TIMESTAMP)
- (ename, deptno, empno, updated, sal)
- values ('Fred', 456, 44, ?, 999999)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
-  LogicalProject(EMPNO=[44], ENAME=['Fred'], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[999999], COMM=[null:INTEGER], DEPTNO=[456], SLACKER=[null:BOOLEAN], UPDATED=[?0])
-    LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOffsetFetchWithDynamicParameter">
+    <Resource name="sql">
+      <![CDATA[select empno from emp
+offset ? rows fetch next ? rows only]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(offset=[?0], fetch=[?1])
+  LogicalProject(EMPNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertExtendedColumnModifiableView">
-        <Resource name="sql">
-            <![CDATA[insert into EMP_MODIFIABLEVIEW2(updated TIMESTAMP)
- (ename, deptno, empno, updated, sal)
- values ('Fred', 20, 44, timestamp '2017-03-12 13:03:05', 999999)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
-  LogicalFilter(condition=[=($7, 20)])
-    LogicalProject(EMPNO=[$2], ENAME=[$0], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[$4], COMM=[null:INTEGER], DEPTNO=[$1], SLACKER=[null:BOOLEAN], EXTRA=[null:BOOLEAN], UPDATED=[$3])
-      LogicalValues(tuples=[[{ 'Fred', 20, 44, 2017-03-12 13:03:05, 999999 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOffsetWithDynamicParameter">
+    <Resource name="sql">
+      <![CDATA[select empno from emp offset ? rows]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(offset=[?0])
+  LogicalProject(EMPNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertBindExtendedColumnModifiableView">
-        <Resource name="sql">
-            <![CDATA[insert into EMP_MODIFIABLEVIEW2(updated TIMESTAMP)
- (ename, deptno, empno, updated, sal)
- values ('Fred', 20, 44, ?, 999999)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
-  LogicalFilter(condition=[=($7, 20)])
-    LogicalProject(EMPNO=[44], ENAME=['Fred':VARCHAR(20)], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[999999], COMM=[null:INTEGER], DEPTNO=[20], SLACKER=[null:BOOLEAN], EXTRA=[null:BOOLEAN], UPDATED=[?0])
-      LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrder">
+    <Resource name="sql">
+      <![CDATA[select empno from emp order by empno, empno desc]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[ASC])
+  LogicalProject(EMPNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectView">
-        <Resource name="sql">
-            <![CDATA[select * from emp_20 where empno > 100]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$7])
-  LogicalFilter(condition=[>($0, 100)])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
-      LogicalFilter(condition=[AND(=($7, 20), >($5, 1000))])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderBasedRepeatFields">
+    <Resource name="sql">
+      <![CDATA[select empno from emp order by empno DESC, empno ASC]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[DESC])
+  LogicalProject(EMPNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectViewExtendedColumnCollision">
-        <Resource name="sql">
-            <![CDATA[select ENAME, EMPNO, JOB, SLACKER, SAL, HIREDATE, MGR
- from EMP_MODIFIABLEVIEW3 extend (SAL int)
- where SAL = 20]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ENAME=[$1], EMPNO=[$0], JOB=[$2], SLACKER=[$6], SAL=[$5], HIREDATE=[$4], MGR=[$3])
-  LogicalFilter(condition=[=($5, 20)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW3]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectViewExtendedColumnCaseSensitiveCollision">
-        <Resource name="sql">
-            <![CDATA[select ENAME, EMPNO, JOB, SLACKER, "sal", HIREDATE, MGR
- from EMP_MODIFIABLEVIEW3 extend ("sal" boolean)
- where "sal" = true]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ENAME=[$1], EMPNO=[$0], JOB=[$2], SLACKER=[$6], sal=[$7], HIREDATE=[$4], MGR=[$3])
-  LogicalFilter(condition=[=($7, true)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW3]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectViewExtendedColumnExtendedCollision">
-        <Resource name="sql">
-            <![CDATA[select ENAME, EMPNO, JOB, SLACKER, SAL, HIREDATE, EXTRA
- from EMP_MODIFIABLEVIEW2 extend (EXTRA boolean)
- where SAL = 20]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ENAME=[$0], EMPNO=[$1], JOB=[$2], SLACKER=[$4], SAL=[$5], HIREDATE=[$7], EXTRA=[$6])
-  LogicalFilter(condition=[=($5, 20)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderByAlias">
+    <Resource name="sql">
+      <![CDATA[select empno + 1 as x, empno - 2 as y from emp order by y]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(sort0=[$1], dir0=[ASC])
+  LogicalProject(X=[+($0, 1)], Y=[-($0, 2)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectViewExtendedColumnCaseSensitiveExtendedCollision">
-        <Resource name="sql">
-            <![CDATA[select ENAME, EMPNO, JOB, SLACKER, SAL, HIREDATE, "extra"
- from EMP_MODIFIABLEVIEW2 extend ("extra" boolean)
- where "extra" = false]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ENAME=[$0], EMPNO=[$1], JOB=[$2], SLACKER=[$4], SAL=[$5], HIREDATE=[$7], extra=[$10])
-  LogicalFilter(condition=[=($10, false)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderByAliasDoesNotObscure">
+    <Resource name="sql">
+      <![CDATA[select empno + 1 as empno, empno - 2 as y from emp order by empno + 3]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+ProjectRel(EMPNO=[$0], Y=[$1])
+  SortRel(sort0=[$2], dir0=[Ascending])
+    ProjectRel(EMPNO=[+($0, 1)], Y=[-($0, 2)], EXPR$2=[+($0, 3)])
+      TableAccessRel(table=[[SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectViewExtendedColumnUnderlyingCollision">
-        <Resource name="sql">
-            <![CDATA[select ENAME, EMPNO, JOB, SLACKER, SAL, HIREDATE, MGR, COMM
- from EMP_MODIFIABLEVIEW3 extend (COMM int)
- where SAL = 20]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ENAME=[$1], EMPNO=[$0], JOB=[$2], SLACKER=[$6], SAL=[$5], HIREDATE=[$4], MGR=[$3], COMM=[$7])
-  LogicalFilter(condition=[=($5, 20)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW3]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderByAliasInExpr">
+    <Resource name="sql">
+      <![CDATA[select empno + 1 as x, empno - 2 as y
+from emp order by y + 3]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(X=[$0], Y=[$1])
+  LogicalSort(sort0=[$2], dir0=[ASC])
+    LogicalProject(X=[+($0, 1)], Y=[-($0, 2)], EXPR$2=[+(-($0, 2), 3)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectViewExtendedColumnCaseSensitiveUnderlyingCollision">
-        <Resource name="sql">
-            <![CDATA[select ENAME, EMPNO, JOB, SLACKER, SAL, HIREDATE, MGR, "comm"
- from EMP_MODIFIABLEVIEW3 extend ("comm" int)
- where "comm" = 20]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ENAME=[$1], EMPNO=[$0], JOB=[$2], SLACKER=[$6], SAL=[$5], HIREDATE=[$4], MGR=[$3], comm=[$7])
-  LogicalFilter(condition=[=($7, 20)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW3]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderByAliasOverrides">
+    <Resource name="sql">
+      <![CDATA[select empno + 1 as empno, empno - 2 as y
+from emp order by empno + 3]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], Y=[$1])
+  LogicalSort(sort0=[$2], dir0=[ASC])
+    LogicalProject(EMPNO=[+($0, 1)], Y=[-($0, 2)], EXPR$2=[+(+($0, 1), 3)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertView">
-        <Resource name="sql">
-            <![CDATA[insert into empnullables_20 (empno, ename)
-values (150, 'Fred')]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[true])
-  LogicalFilter(condition=[>($5, 1000)])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[null:INTEGER], COMM=[null:INTEGER], DEPTNO=[20], SLACKER=[null:BOOLEAN])
-      LogicalValues(tuples=[[{ 150, 'Fred' }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderByIdenticalExpr">
+    <Resource name="sql">
+      <![CDATA[select empno + 1 from emp order by deptno asc, empno + 1 desc]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[$0])
+  LogicalSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[DESC])
+    LogicalProject(EXPR$0=[+($0, 1)], DEPTNO=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertSubsetView">
-        <Resource name="sql">
-            <![CDATA[insert into empnullables_20
-values (10, 'Fred')]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPNULLABLES]], operation=[INSERT], flattened=[true])
-  LogicalFilter(condition=[>($5, 1000)])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[null:INTEGER], COMM=[null:INTEGER], DEPTNO=[20], SLACKER=[null:BOOLEAN])
-      LogicalValues(tuples=[[{ 10, 'Fred' }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderByNegativeOrdinal">
+    <Resource name="sql">
+      <![CDATA[select empno + 1, deptno, empno from emp order by -1 desc]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[$0], DEPTNO=[$1], EMPNO=[$2])
+  LogicalSort(sort0=[$3], dir0=[DESC])
+    LogicalProject(EXPR$0=[+($0, 1)], DEPTNO=[$7], EMPNO=[$0], EXPR$3=[-1])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertModifiableView">
-        <Resource name="sql">
-            <![CDATA[insert into EMP_MODIFIABLEVIEW (EMPNO, ENAME, JOB) values (34625, 'nom', 'accountant')]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[555], COMM=[null:INTEGER], DEPTNO=[20], SLACKER=[null:BOOLEAN])
-    LogicalValues(tuples=[[{ 34625, 'nom', 'accountant' }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderByOrdinalDesc">
+    <Resource name="sql">
+      <![CDATA[select empno + 1, deptno, empno from emp order by 2.5 desc]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(sort0=[$1], dir0=[DESC])
+  LogicalProject(EXPR$0=[+($0, 1)], DEPTNO=[$7], EMPNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertSubsetModifiableView">
-        <Resource name="sql">
-            <![CDATA[insert into EMP_MODIFIABLEVIEW values (10, 'Fred')]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[555], COMM=[null:INTEGER], DEPTNO=[20], SLACKER=[null:BOOLEAN])
-    LogicalValues(tuples=[[{ 10, 'Fred' }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderByOrdinalInExpr">
+    <Resource name="sql">
+      <![CDATA[select empno + 1, deptno, empno from emp order by 1 + 2 desc]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[$0], DEPTNO=[$1], EMPNO=[$2])
+  LogicalSort(sort0=[$3], dir0=[DESC])
+    LogicalProject(EXPR$0=[+($0, 1)], DEPTNO=[$7], EMPNO=[$0], EXPR$3=[+(1, 2)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertBindModifiableView">
-        <Resource name="sql">
-            <![CDATA[insert into EMP_MODIFIABLEVIEW (empno, job) values (?, ?)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
-  LogicalProject(EMPNO=[CAST(?0):INTEGER NOT NULL], ENAME=['Bob':VARCHAR(20)], JOB=[?1], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[555], COMM=[null:INTEGER], DEPTNO=[20], SLACKER=[null:BOOLEAN])
-    LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderByOver">
+    <Resource name="sql">
+      <![CDATA[select deptno, rank() over(partition by empno order by deptno)
+from emp order by row_number() over(partition by empno order by deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EXPR$1=[$1])
+  LogicalSort(sort0=[$2], dir0=[ASC])
+    LogicalProject(DEPTNO=[$7], EXPR$1=[RANK() OVER (PARTITION BY $0 ORDER BY $7)], EXPR$2=[ROW_NUMBER() OVER (PARTITION BY $0 ORDER BY $7)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertBindSubsetModifiableView">
-        <Resource name="sql">
-            <![CDATA[insert into EMP_MODIFIABLEVIEW values (?, ?)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
-  LogicalProject(EMPNO=[CAST(?0):INTEGER NOT NULL], ENAME=[CAST(?1):VARCHAR(20) NOT NULL], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[555], COMM=[null:INTEGER], DEPTNO=[20], SLACKER=[null:BOOLEAN])
-    LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderByRemoval1">
+    <Resource name="sql">
+      <![CDATA[select * from (
+  select empno from emp order by deptno offset 0) t
+order by empno desc]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[DESC])
+  LogicalProject(EMPNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertWithCustomInitializerExpressionFactory">
-        <Resource name="sql">
-            <![CDATA[insert into empdefaults (deptno) values (300)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
-  LogicalProject(EMPNO=[123], ENAME=['Bob'], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[555], COMM=[null:INTEGER], DEPTNO=[$0], SLACKER=[null:BOOLEAN])
-    LogicalValues(tuples=[[{ 300 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderByRemoval2">
+    <Resource name="sql">
+      <![CDATA[select * from (
+  select empno from emp order by deptno offset 1) t
+order by empno desc]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[DESC])
+  LogicalProject(EMPNO=[$0])
+    LogicalSort(sort0=[$1], dir0=[ASC], offset=[1])
+      LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertSubsetWithCustomInitializerExpressionFactory">
-        <Resource name="sql">
-            <![CDATA[insert into empdefaults values (100)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=['Bob'], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[555], COMM=[null:INTEGER], DEPTNO=[null:INTEGER], SLACKER=[null:BOOLEAN])
-    LogicalValues(tuples=[[{ 100 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderByRemoval3">
+    <Resource name="sql">
+      <![CDATA[select * from (
+  select empno from emp order by deptno limit 10) t
+order by empno]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[ASC])
+  LogicalProject(EMPNO=[$0])
+    LogicalSort(sort0=[$1], dir0=[ASC], fetch=[10])
+      LogicalProject(EMPNO=[$0], DEPTNO=[$7])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertBindWithCustomInitializerExpressionFactory">
-        <Resource name="sql">
-            <![CDATA[insert into empdefaults (deptno) values (?)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
-  LogicalProject(EMPNO=[123], ENAME=['Bob'], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[555], COMM=[null:INTEGER], DEPTNO=[?0], SLACKER=[null:BOOLEAN])
-    LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderBySameExpr">
+    <Resource name="sql">
+      <![CDATA[select empno from emp, dept
+order by sal + empno desc, sal * empno, sal + empno desc]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalSort(sort0=[$1], sort1=[$2], dir0=[DESC], dir1=[ASC])
+    LogicalProject(EMPNO=[$0], EXPR$1=[+($5, $0)], EXPR$2=[*($5, $0)])
+      LogicalJoin(condition=[true], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertBindSubsetWithCustomInitializerExpressionFactory">
-        <Resource name="sql">
-            <![CDATA[insert into empdefaults values (?)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
-  LogicalProject(EMPNO=[?0], ENAME=['Bob'], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[555], COMM=[null:INTEGER], DEPTNO=[null:INTEGER], SLACKER=[null:BOOLEAN])
-    LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderDescNullsLast">
+    <Resource name="sql">
+      <![CDATA[select empno from emp order by empno desc nulls last]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[DESC-nulls-last])
+  LogicalProject(EMPNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertWithCustomColumnResolving">
-        <Resource name="sql">
-            <![CDATA[insert into struct.t values (?, ?, ?, ?, ?, ?, ?, ?, ?)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, STRUCT, T]], operation=[INSERT], flattened=[true])
-  LogicalProject("K0"=[?0], "C1"=[?1], "F1"."A0"=[?2], "F2"."A0"=[?3], "F0"."C0"=[?4], "F1"."C0"=[?5], "F0"."C1"=[?6], "F1"."C2"=[?7], "F2"."C3"=[?8])
-    LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderDistinct">
+    <Resource name="sql">
+      <![CDATA[select distinct empno, deptno + 1
+from emp order by deptno + 1 + empno]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], EXPR$1=[$1])
+  LogicalSort(sort0=[$2], dir0=[ASC])
+    LogicalAggregate(group=[{0, 1, 2}])
+      LogicalProject(EMPNO=[$0], EXPR$1=[+($7, 1)], EXPR$2=[+(+($7, 1), $0)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertWithCustomColumnResolving2">
-        <Resource name="sql">
-            <![CDATA[insert into struct.t_nullables (f0.c0, f1.c2, c1)
-values (?, ?, ?)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, STRUCT, T_NULLABLES]], operation=[INSERT], flattened=[true])
-  LogicalProject("K0"=[null:VARCHAR(20)], "C1"=[?2], "F1"."A0"=[null:INTEGER], "F2"."A0"=[null:BOOLEAN], "F0"."C0"=[?0], "F1"."C0"=[null:INTEGER], "F0"."C1"=[null:INTEGER], "F1"."C2"=[?1], "F2"."C3"=[null:INTEGER])
-    LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderGroup">
+    <Resource name="sql">
+      <![CDATA[select deptno, count(*)
+from emp
+group by deptno
+order by deptno * sum(sal) desc, min(empno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EXPR$1=[$1])
+  LogicalSort(sort0=[$2], sort1=[$3], dir0=[DESC], dir1=[ASC])
+    LogicalProject(DEPTNO=[$0], EXPR$1=[$1], EXPR$2=[*($0, $2)], EXPR$3=[$3])
+      LogicalAggregate(group=[{0}], EXPR$1=[COUNT()], agg#1=[SUM($1)], agg#2=[MIN($2)])
+        LogicalProject(DEPTNO=[$7], SAL=[$5], EMPNO=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertViewWithCustomColumnResolving">
-        <Resource name="sql">
-            <![CDATA[insert into struct.t_10 (f0.c0, f1.c2, c1, k0,
-  f1.a0, f2.a0, f0.c1, f2.c3)
-values (?, ?, ?, ?, ?, ?, ?, ?)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, STRUCT, T]], operation=[INSERT], flattened=[true])
-  LogicalFilter(condition=[=($4, 10)])
-    LogicalProject("K0"=[CAST(?3):VARCHAR(20) NOT NULL], "C1"=[CAST(?2):VARCHAR(20) NOT NULL], "F1"."A0"=[CAST(?4):INTEGER NOT NULL], "F2"."A0"=[CAST(?5):BOOLEAN NOT NULL], "F0"."C0"=[CAST(?0):INTEGER NOT NULL], "F1"."C0"=[null:INTEGER], "F0"."C1"=[CAST(?6):INTEGER NOT NULL], "F1"."C2"=[CAST(?1):INTEGER NOT NULL], "F2"."C3"=[CAST(?7):INTEGER NOT NULL])
-      LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderOffsetFetch">
+    <Resource name="sql">
+      <![CDATA[select empno from emp
+order by empno offset 10 rows fetch next 5 rows only]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[ASC], offset=[10], fetch=[5])
+  LogicalProject(EMPNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdateWithCustomColumnResolving">
-        <Resource name="sql">
-            <![CDATA[update struct.t set c0 = c0 + 1]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, STRUCT, T]], operation=[UPDATE], updateColumnList=[["F0"."C0"]], sourceExpressionList=[[+($4, 1)]], flattened=[true])
-  LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8], EXPR$0=[+($4, 1)])
-    LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderOffsetFetchWithDynamicParameter">
+    <Resource name="sql">
+      <![CDATA[select empno from emp
+order by empno offset ? rows fetch next ? rows only]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(sort0=[$0], dir0=[ASC], offset=[?0], fetch=[?1])
+  LogicalProject(EMPNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCustomColumnResolving">
-        <Resource name="sql">
-            <![CDATA[select k0 from struct.t]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(K0=[$0])
-  LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderUnion">
+    <Resource name="sql">
+      <![CDATA[select empno, sal from emp
+union all
+select deptno, deptno from dept
+order by sal desc, empno asc]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(sort0=[$1], sort1=[$0], dir0=[DESC], dir1=[ASC])
+  LogicalProject(EMPNO=[$0], SAL=[$1])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], SAL=[$5])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(DEPTNO=[$0], DEPTNO0=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCustomColumnResolving2">
-        <Resource name="sql">
-            <![CDATA[select c2 from struct.t]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(C2=[$7])
-  LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderUnionExprs">
+    <Resource name="sql">
+      <![CDATA[select empno, sal from emp
+union all
+select deptno, deptno from dept
+order by empno * sal + 2]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], SAL=[$1])
+  LogicalSort(sort0=[$2], dir0=[ASC])
+    LogicalProject(EMPNO=[$0], SAL=[$1], EXPR$2=[+(*($0, $1), 2)])
+      LogicalUnion(all=[true])
+        LogicalProject(EMPNO=[$0], SAL=[$5])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(DEPTNO=[$0], DEPTNO0=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCustomColumnResolving3">
-        <Resource name="sql">
-            <![CDATA[select f1.c2 from struct.t]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(C2=[$7])
-  LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOrderUnionOrdinal">
+    <Resource name="sql">
+      <![CDATA[select empno, sal from emp
+union all
+select deptno, deptno from dept
+order by 2]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(sort0=[$1], dir0=[ASC])
+  LogicalProject(EMPNO=[$0], SAL=[$1])
+    LogicalUnion(all=[true])
+      LogicalProject(EMPNO=[$0], SAL=[$5])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(DEPTNO=[$0], DEPTNO0=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCustomColumnResolving4">
-        <Resource name="sql">
-            <![CDATA[select c1 from struct.t order by f0.c1]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(C1=[$0])
-  LogicalSort(sort0=[$1], dir0=[ASC])
-    LogicalProject(C1=[$1], "F0"."C1"=[$6])
-      LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOverAvg">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[CASE(>(COUNT($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), 0), $SUM0($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), null:INTEGER)], EXPR$1=[CAST(/(CASE(>(COUNT($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), 0), $SUM0($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), null:INTEGER), COUNT($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING))):INTEGER])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCustomColumnResolving5">
-        <Resource name="sql">
-            <![CDATA[select count(c1) from struct.t group by f0.c1]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[$1])
-  LogicalAggregate(group=[{0}], EXPR$0=[COUNT()])
-    LogicalProject("F0"."C1"=[$6], "C1"=[$1])
-      LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select sum(sal) over w1,
+  avg(sal) over w1
+from emp
+window w1 as (partition by job order by hiredate rows 2 preceding)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testOverAvg2">
+    <Resource name="sql">
+      <![CDATA[select sum(sal) over w1,
+  avg(CAST(sal as real)) over w1
+from emp
+window w1 as (partition by job order by hiredate rows 2 preceding)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[CASE(>(COUNT($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), 0), $SUM0($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), null:INTEGER)], EXPR$1=[/(CASE(>(COUNT(CAST($5):REAL NOT NULL) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), 0), $SUM0(CAST($5):REAL NOT NULL) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), null:REAL), COUNT(CAST($5):REAL NOT NULL) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING))])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCustomColumnResolvingWithSelectStar">
-        <Resource name="sql">
-            <![CDATA[select * from struct.t]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8])
-  LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOverCountStar">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[COUNT($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING)], EXPR$1=[COUNT() OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCustomColumnResolvingWithSelectFieldNameDotStar">
-        <Resource name="sql">
-            <![CDATA[select f1.* from struct.t]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject("F1"."A0"=[$2], "F1"."C0"=[$5], "F1"."C2"=[$7])
-  LogicalTableScan(table=[[CATALOG, STRUCT, T]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select count(sal) over w1,
+  count(*) over w1
+from emp
+window w1 as (partition by job order by hiredate rows 2 preceding)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testOverDefaultBracket">
+    <Resource name="sql">
+      <![CDATA[select
+  count(*) over (order by deptno) c1,
+  count(*) over (order by deptno
+    range unbounded preceding) c2,
+  count(*) over (order by deptno
+    range between unbounded preceding and current row) c3,
+  count(*) over (order by deptno
+    rows unbounded preceding) c4,
+  count(*) over (order by deptno
+    rows between unbounded preceding and current row) c5,
+  count(*) over (order by deptno
+    range between unbounded preceding and unbounded following) c6,
+ count(*) over (order by deptno
+    rows between unbounded preceding and unbounded following) c7
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(C1=[COUNT() OVER (ORDER BY $7)], C2=[COUNT() OVER (ORDER BY $7)], C3=[COUNT() OVER (ORDER BY $7)], C4=[COUNT() OVER (ORDER BY $7 ROWS UNBOUNDED PRECEDING)], C5=[COUNT() OVER (ORDER BY $7 ROWS UNBOUNDED PRECEDING)], C6=[COUNT() OVER (ORDER BY $7 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], C7=[COUNT() OVER (ORDER BY $7 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWindowAggWithGroupBy">
-        <Resource name="sql">
-            <![CDATA[select min(deptno), rank() over (order by empno),
-max(empno) over (partition by deptno)
-from emp group by deptno, empno
+    </Resource>
+  </TestCase>
+  <TestCase name="testOverMultiple">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[CASE(>(COUNT($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), 0), $SUM0($5) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), null:INTEGER)], EXPR$1=[CASE(>(COUNT($7) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), 0), $SUM0($7) OVER (PARTITION BY $2 ORDER BY $4 ROWS 2 PRECEDING), null:INTEGER)], EXPR$2=[CASE(>=(COUNT() OVER (PARTITION BY $2 ORDER BY $4 ROWS 3 PRECEDING), 2), CASE(>(COUNT($7) OVER (PARTITION BY $2 ORDER BY $4 ROWS 3 PRECEDING), 0), $SUM0($7) OVER (PARTITION BY $2 ORDER BY $4 ROWS 3 PRECEDING), null:INTEGER), null:NULL)])
+  LogicalFilter(condition=[>(-($7, $5), 999)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[$2], EXPR$1=[RANK() OVER (ORDER BY $1)], EXPR$2=[MAX($1) OVER (PARTITION BY $0)])
-  LogicalAggregate(group=[{0, 1}], EXPR$0=[MIN($0)])
-    LogicalProject(DEPTNO=[$7], EMPNO=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWindowAverageWithGroupBy">
-        <Resource name="sql">
-            <![CDATA[select avg(deptno) over ()
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select sum(sal) over w1,
+  sum(deptno) over w1,
+  sum(deptno) over w2
 from emp
-group by deptno]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[CAST(/(SUM($0) OVER (), COUNT($0) OVER ())):INTEGER NOT NULL])
-  LogicalAggregate(group=[{0}])
-    LogicalProject(DEPTNO=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWindowAggWithGroupByAndJoin">
-        <Resource name="sql">
-            <![CDATA[select min(d.deptno), rank() over (order by e.empno),
- max(e.empno) over (partition by e.deptno)
-from emp e, dept d
-where e.deptno = d.deptno
-group by d.deptno, e.empno, e.deptno
-]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[$3], EXPR$1=[RANK() OVER (ORDER BY $1)], EXPR$2=[MAX($1) OVER (PARTITION BY $2)])
-  LogicalAggregate(group=[{0, 1, 2}], EXPR$0=[MIN($0)])
-    LogicalProject(DEPTNO0=[$9], EMPNO=[$0], DEPTNO=[$7])
-      LogicalFilter(condition=[=($7, $9)])
-        LogicalJoin(condition=[true], joinType=[inner])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWindowAggWithGroupByAndHaving">
-        <Resource name="sql">
-            <![CDATA[select min(deptno), rank() over (order by empno),
-max(empno) over (partition by deptno)
-from emp group by deptno, empno
-having empno < 10 and min(deptno) < 20
-]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[$2], EXPR$1=[RANK() OVER (ORDER BY $1)], EXPR$2=[MAX($1) OVER (PARTITION BY $0)])
-  LogicalFilter(condition=[AND(<($1, 10), <($2, 20))])
-    LogicalAggregate(group=[{0, 1}], EXPR$0=[MIN($0)])
-      LogicalProject(DEPTNO=[$7], EMPNO=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWindowAggInSubQueryJoin">
-        <Resource name="sql">
-            <![CDATA[select T.x, T.y, T.z, emp.empno
-from (select min(deptno) as x,
-   rank() over (order by empno) as y,
-   max(empno) over (partition by deptno) as z
-   from emp group by deptno, empno) as T
- inner join emp on T.x = emp.deptno
- and T.y = emp.empno
-]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(X=[$0], Y=[$1], Z=[$2], EMPNO=[$3])
-  LogicalJoin(condition=[AND(=($0, $10), =($1, $12))], joinType=[inner])
-    LogicalProject(X=[$2], Y=[RANK() OVER (ORDER BY $1)], Z=[MAX($1) OVER (PARTITION BY $0)])
-      LogicalAggregate(group=[{0, 1}], X=[MIN($0)])
-        LogicalProject(DEPTNO=[$7], EMPNO=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EMPNO0=[CAST($0):BIGINT NOT NULL])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderByOver">
-        <Resource name="sql">
-            <![CDATA[select deptno, rank() over(partition by empno order by deptno)
-from emp order by row_number() over(partition by empno order by deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EXPR$1=[$1])
-  LogicalSort(sort0=[$2], dir0=[ASC])
-    LogicalProject(DEPTNO=[$7], EXPR$1=[RANK() OVER (PARTITION BY $0 ORDER BY $7)], EXPR$2=[ROW_NUMBER() OVER (PARTITION BY $0 ORDER BY $7)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testValuesUsing">
-        <Resource name="sql">
-            <![CDATA[select d.deptno, min(e.empid) as empid
-from (values (100, 'Bill', 1)) as e(empid, name, deptno)
-join (values (1, 'LeaderShip')) as d(deptno, name)
-  using (deptno)
-group by d.deptno]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EMPID=[MIN($1)])
-  LogicalProject(DEPTNO=[$3], EMPID=[$0])
-    LogicalJoin(condition=[=($2, $3)], joinType=[inner])
-      LogicalValues(tuples=[[{ 100, 'Bill', 1 }]])
-      LogicalValues(tuples=[[{ 1, 'LeaderShip' }]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCorrelationScalarAggAndFilter">
-        <Resource name="sql">
-            <![CDATA[SELECT e1.empno
-FROM emp e1, dept d1 where e1.deptno = d1.deptno
-and e1.deptno < 10 and d1.deptno < 15
-and e1.sal > (select avg(sal) from emp e2 where e1.empno = e2.empno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], EMPNO0=[CAST($11):INTEGER], EXPR$0=[CAST($12):INTEGER])
-    LogicalJoin(condition=[AND(=($0, $11), >($5, $12))], joinType=[inner])
-      LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-        LogicalFilter(condition=[<($7, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalFilter(condition=[<($0, 15)])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalAggregate(group=[{0}], EXPR$0=[AVG($1)])
-        LogicalProject(EMPNO=[$0], SAL=[$5])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCorrelationMultiScalarAggregate">
-        <Resource name="sql">
-            <![CDATA[select sum(e1.empno)
-from emp e1, dept d1
-where e1.deptno = d1.deptno
-and e1.sal > (select avg(e2.sal) from emp e2
-  where e2.deptno = d1.deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
-  LogicalProject(EMPNO=[$0])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], DEPTNO1=[CAST($11):INTEGER], EXPR$0=[CAST($12):INTEGER])
-      LogicalJoin(condition=[AND(=($9, $11), >($5, $12))], joinType=[inner])
-        LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalAggregate(group=[{0}], EXPR$0=[AVG($1)])
-          LogicalProject(DEPTNO=[$7], SAL=[$5])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCorrelationExistsAndFilter">
-        <Resource name="sql">
-            <![CDATA[SELECT e1.empno
-FROM emp e1, dept d1 where e1.deptno = d1.deptno
-and e1.deptno < 10 and d1.deptno < 15
-and exists (select * from emp e2 where e1.empno = e2.empno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], EMPNO0=[CAST($11):INTEGER], $f1=[CAST($12):BOOLEAN])
-    LogicalJoin(condition=[=($0, $11)], joinType=[inner])
-      LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-        LogicalFilter(condition=[<($7, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalFilter(condition=[<($0, 15)])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-        LogicalProject(EMPNO=[$0], $f0=[true])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCorrelationNotExistsAndFilter">
-        <Resource name="sql">
-            <![CDATA[SELECT e1.empno
-FROM emp e1, dept d1 where e1.deptno = d1.deptno
-and e1.deptno < 10 and d1.deptno < 15
-and not exists (select * from emp e2 where e1.empno = e2.empno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[IS NULL($12)])
-    LogicalJoin(condition=[=($0, $11)], joinType=[left])
-      LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-        LogicalFilter(condition=[<($7, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalFilter(condition=[<($0, 15)])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-        LogicalProject(EMPNO=[$0], $f0=[true])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCorrelationAggregateGroupSets">
-        <Resource name="sql">
-            <![CDATA[select sum(e1.empno)
-from emp e1, dept d1
-where e1.deptno = d1.deptno
-and e1.sal > (select avg(e2.sal) from emp e2
-  where e2.deptno = d1.deptno group by cube(comm, mgr))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
-  LogicalProject(EMPNO=[$0])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], DEPTNO1=[CAST($11):INTEGER], $f1=[CAST($12):INTEGER])
-      LogicalJoin(condition=[AND(=($9, $11), >($5, $12))], joinType=[inner])
-        LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalAggregate(group=[{0}], agg#0=[SINGLE_VALUE($1)])
-          LogicalProject(DEPTNO=[$2], EXPR$0=[$3])
-            LogicalAggregate(group=[{0, 1, 2}], groups=[[{0, 1, 2}, {0, 2}, {1, 2}, {2}]], EXPR$0=[AVG($3)])
-              LogicalProject(COMM=[$6], MGR=[$3], DEPTNO=[$7], SAL=[$5])
-                LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testFakeStar">
-        <Resource name="sql">
-            <![CDATA[SELECT * FROM (VALUES (0, 0)) AS T(A, "*")]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(A=[$0], *=[$1])
-  LogicalValues(tuples=[[{ 0, 0 }]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDeleteWhere">
-        <Resource name="sql">
-            <![CDATA[delete from emp where deptno = 10]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[DELETE], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDeleteBind">
-        <Resource name="sql">
-            <![CDATA[delete from emp where deptno = ?]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[DELETE], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalFilter(condition=[=($7, ?0)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+where deptno - sal > 999
+window w1 as (partition by job order by hiredate rows 2 preceding),
+  w2 as (partition by job order by hiredate rows 3 preceding disallow partial),
+  w3 as (partition by job order by hiredate range interval '1' second preceding)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testOverNullTreatmentWindow">
+    <Resource name="sql">
+      <![CDATA[select
+lead(deptno, 1) over w,
+ lead(deptno, 2) ignore nulls over w,
+lead(deptno, 3) respect nulls over w,
+lead(deptno, 1) over w,
+lag(deptno, 2) ignore nulls over w,
+lag(deptno, 2) respect nulls over w,
+first_value(deptno) over w,
+first_value(deptno) ignore nulls over w,
+first_value(deptno) respect nulls over w,
+last_value(deptno) over w,
+last_value(deptno) ignore nulls over w,
+last_value(deptno) respect nulls over w
+ from emp
+window w as (order by empno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[LEAD($7, 1) OVER (ORDER BY $0)], EXPR$1=[LEAD($7, 2) IGNORE NULLS OVER (ORDER BY $0)], EXPR$2=[LEAD($7, 3) OVER (ORDER BY $0)], EXPR$3=[LEAD($7, 1) OVER (ORDER BY $0)], EXPR$4=[LAG($7, 2) IGNORE NULLS OVER (ORDER BY $0)], EXPR$5=[LAG($7, 2) OVER (ORDER BY $0)], EXPR$6=[FIRST_VALUE($7) OVER (ORDER BY $0)], EXPR$7=[FIRST_VALUE($7) IGNORE NULLS OVER (ORDER BY $0)], EXPR$8=[FIRST_VALUE($7) OVER (ORDER BY $0)], EXPR$9=[LAST_VALUE($7) OVER (ORDER BY $0)], EXPR$10=[LAST_VALUE($7) IGNORE NULLS OVER (ORDER BY $0)], EXPR$11=[LAST_VALUE($7) OVER (ORDER BY $0)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDeleteBindExtendedColumn">
-        <Resource name="sql">
-            <![CDATA[delete from emp(enddate TIMESTAMP) where enddate < ?]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[DELETE], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENDDATE=[$9])
-    LogicalFilter(condition=[<($9, ?0)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOverOrderFollowingWindow">
+    <Resource name="sql">
+      <![CDATA[select
+  last_value(deptno) over (order by empno rows 2 following)
+from emp
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDeleteBindModifiableView">
-        <Resource name="sql">
-            <![CDATA[delete from EMP_MODIFIABLEVIEW2 where empno = ?]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]], operation=[DELETE], flattened=[true])
-  LogicalProject(ENAME=[$0], EMPNO=[$1], JOB=[$2], DEPTNO=[$3], SLACKER=[$4], SAL=[$5], EXTRA=[$6], HIREDATE=[$7], MGR=[$8], COMM=[$9])
-    LogicalFilter(condition=[=($1, ?0)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[LAST_VALUE($7) OVER (ORDER BY $0 ROWS BETWEEN CURRENT ROW AND 2 FOLLOWING)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDeleteBindExtendedColumnModifiableView">
-        <Resource name="sql">
-            <![CDATA[delete from EMP_MODIFIABLEVIEW2(note VARCHAR)
-where note = ?]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]], operation=[DELETE], flattened=[true])
-  LogicalProject(ENAME=[$0], EMPNO=[$1], JOB=[$2], DEPTNO=[$3], SLACKER=[$4], SAL=[$5], EXTRA=[$6], HIREDATE=[$7], MGR=[$8], COMM=[$9], NOTE=[$10])
-    LogicalFilter(condition=[=($10, ?0)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testOverOrderWindow">
+    <Resource name="sql">
+      <![CDATA[select last_value(deptno) over (order by empno)
+from emp
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOverDefaultBracket">
-        <Resource name="sql">
-            <![CDATA[select
-  count(*) over (order by deptno) c1,
-  count(*) over (order by deptno
-    range unbounded preceding) c2,
-  count(*) over (order by deptno
-    range between unbounded preceding and current row) c3,
-  count(*) over (order by deptno
-    rows unbounded preceding) c4,
-  count(*) over (order by deptno
-    rows between unbounded preceding and current row) c5,
-  count(*) over (order by deptno
-    range between unbounded preceding and unbounded following) c6,
- count(*) over (order by deptno
-    rows between unbounded preceding and unbounded following) c7
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(C1=[COUNT() OVER (ORDER BY $7)], C2=[COUNT() OVER (ORDER BY $7)], C3=[COUNT() OVER (ORDER BY $7)], C4=[COUNT() OVER (ORDER BY $7 ROWS UNBOUNDED PRECEDING)], C5=[COUNT() OVER (ORDER BY $7 ROWS UNBOUNDED PRECEDING)], C6=[COUNT() OVER (ORDER BY $7 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], C7=[COUNT() OVER (ORDER BY $7 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)])
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[LAST_VALUE($7) OVER (ORDER BY $0)])
   LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPivot">
-        <Resource name="sql">
-            <![CDATA[SELECT *
+    </Resource>
+  </TestCase>
+  <TestCase name="testPivot">
+    <Resource name="sql">
+      <![CDATA[SELECT *
 FROM (SELECT mgr, deptno, job, sal FROM emp)
 PIVOT (SUM(sal) AS ss, COUNT(*)
     FOR (job, deptno)
     IN (('CLERK', 10) AS c10, ('MANAGER', 20) AS m20))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(MGR=[$0], C10_SS=[$1], C10=[$2], M20_SS=[$3], M20=[$4])
   LogicalAggregate(group=[{0}], C10_SS=[SUM($3) FILTER $4], C10_null=[COUNT() FILTER $4], M20_SS=[SUM($3) FILTER $5], M20_null=[COUNT() FILTER $5])
     LogicalProject(MGR=[$3], JOB=[$2], DEPTNO=[$7], SAL=[$5], $f4=[AND(=($2, 'CLERK'), =($7, 10))], $f5=[AND(=($2, 'MANAGER'), =($7, 20))])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPivot2">
-        <Resource name="sql">
-            <![CDATA[SELECT *
+    </Resource>
+  </TestCase>
+  <TestCase name="testPivot2">
+    <Resource name="sql">
+      <![CDATA[SELECT *
 FROM   (SELECT deptno, job, sal
         FROM   emp)
 PIVOT  (SUM(sal) AS sum_sal, COUNT(*) AS "COUNT"
         FOR (job) IN ('CLERK', 'MANAGER' mgr, 'ANALYST' AS "a"))
 ORDER BY deptno]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalSort(sort0=[$0], dir0=[ASC])
   LogicalProject(DEPTNO=[$0], 'CLERK'_SUM_SAL=[$1], 'CLERK'_COUNT=[$2], MGR_SUM_SAL=[$3], MGR_COUNT=[$4], a_SUM_SAL=[$5], a_COUNT=[$6])
     LogicalAggregate(group=[{0}], 'CLERK'_SUM_SAL=[SUM($2) FILTER $3], 'CLERK'_COUNT=[COUNT() FILTER $3], MGR_SUM_SAL=[SUM($2) FILTER $4], MGR_COUNT=[COUNT() FILTER $4], a_SUM_SAL=[SUM($2) FILTER $5], a_COUNT=[COUNT() FILTER $5])
       LogicalProject(DEPTNO=[$7], JOB=[$2], SAL=[$5], $f3=[=($2, 'CLERK')], $f4=[=($2, 'MANAGER')], $f5=[=($2, 'ANALYST')])
         LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectSortLimitWithCorrelateInput">
-        <Resource name="sql">
-            <![CDATA[SELECT ename||deptno FROM
+    </Resource>
+  </TestCase>
+  <TestCase name="testPrevClassifier">
+    <Resource name="sql">
+      <![CDATA[SELECT *
+FROM emp
+MATCH_RECOGNIZE (
+  MEASURES
+    STRT.mgr AS start_mgr,
+    LAST(DOWN.mgr) AS up_days,
+    LAST(UP.mgr) AS total_days
+  PATTERN (STRT DOWN? UP+)
+  DEFINE
+    DOWN AS DOWN.mgr < PREV(DOWN.mgr),
+    UP AS CASE
+            WHEN PREV(CLASSIFIER()) = 'STRT'
+              THEN UP.mgr > 15
+            ELSE
+              UP.mgr > 20
+            END
+) AS T]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(START_MGR=[$0], UP_DAYS=[$1], TOTAL_DAYS=[$2])
+  LogicalMatch(partition=[[]], order=[[]], outputFields=[[START_MGR, UP_DAYS, TOTAL_DAYS]], allRows=[false], after=[FLAG(SKIP TO NEXT ROW)], pattern=[(('STRT', PATTERN_QUANTIFIER('DOWN', 0, 1, false)), PATTERN_QUANTIFIER('UP', 1, -1, false))], isStrictStarts=[false], isStrictEnds=[false], subsets=[[]], patternDefinitions=[[<(PREV(DOWN.$3, 0), PREV(DOWN.$3, 1)), CASE(=(PREV(CLASSIFIER(), 1), 'STRT'), >(PREV(UP.$3, 0), 15), >(PREV(UP.$3, 0), 20))]], inputFields=[[EMPNO, ENAME, JOB, MGR, HIREDATE, SAL, COMM, DEPTNO, SLACKER]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectAggregatesIgnoreNullsAndNot">
+    <Resource name="sql">
+      <![CDATA[select lead(sal, 4) IGNORE NULLS, lead(sal, 4) over (w)
+from emp window w as (order by empno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[IGNORE NULLS(LEAD($5, 4))], EXPR$1=[LEAD($5, 4) OVER (ORDER BY $0)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectApproximateAndExactAggregates">
+    <Resource name="sql">
+      <![CDATA[SELECT empno, count(distinct ename),
+approx_count_distinct(ename)
+FROM emp
+GROUP BY empno]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)], EXPR$2=[COUNT(APPROXIMATE DISTINCT $1)])
+  LogicalProject(EMPNO=[$0], ENAME=[$1])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testProjectSortLimitWithCorrelateInput">
+    <Resource name="sql">
+      <![CDATA[SELECT ename||deptno FROM
     (SELECT deptno, ename
     FROM
         (SELECT DISTINCT deptno FROM emp) t1,
@@ -4920,9 +4944,9 @@ LogicalSort(sort0=[$0], dir0=[ASC])
             WHERE deptno = t1.deptno)
     ORDER BY ename DESC
     LIMIT 3)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EXPR$0=[||($1, CAST($0):VARCHAR NOT NULL)])
   LogicalSort(sort0=[$1], dir0=[DESC], fetch=[3])
     LogicalProject(DEPTNO=[$0], ENAME=[$1])
@@ -4933,16 +4957,16 @@ LogicalProject(EXPR$0=[||($1, CAST($0):VARCHAR NOT NULL)])
         LogicalProject(ENAME=[$1], SAL=[$5], DEPTNO=[$7])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushDownJoinCondition">
-        <Resource name="sql">
-            <![CDATA[select *
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushDownJoinCondition">
+    <Resource name="sql">
+      <![CDATA[select *
 from emp as e
 join dept as d on e.deptno + 20 = d.deptno / 2]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$10], NAME=[$11])
   LogicalJoin(condition=[=($9, $12)], joinType=[inner])
     LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], $f9=[+($7, 20)])
@@ -4950,664 +4974,676 @@ LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$
     LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[/($0, 2)])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectWithoutFrom">
-        <Resource name="sql">
-            <![CDATA[select 2+2]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[+(2, 2)])
-  LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testPushDownJoinConditionWithProjectMerge">
+    <Resource name="sql">
+      <![CDATA[select * from
+ (select empno, deptno from emp) a
+ join dept b
+on a.deptno + 20 = b.deptno]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], DEPTNO=[$1], DEPTNO0=[$3], NAME=[$4])
+  LogicalJoin(condition=[=($2, $3)], joinType=[inner])
+    LogicalProject(EMPNO=[$0], DEPTNO=[$7], $f2=[+($7, 20)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSome">
-        <Resource name="sql">
-            <![CDATA[select empno from emp where deptno > some (
-  select deptno from dept)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[> SOME($7, {
-LogicalProject(DEPTNO=[$0])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-})])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSomeValueList">
-        <Resource name="sql">
-            <![CDATA[select empno from emp where deptno > some (10, 20)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[OR(>($7, 10), >($7, 20))])
+    </Resource>
+  </TestCase>
+  <TestCase name="testReduceConstExpr">
+    <Resource name="sql">
+      <![CDATA[select sum(case when 'y' = 'n' then ename else 0.1 end) from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
+  LogicalProject($f0=[0.1:DECIMAL(19, 9)])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSubQueryOr">
-        <Resource name="sql">
-            <![CDATA[select * from emp where deptno = 10 or deptno in (
-    select dept.deptno from dept where deptno < 5)
+    </Resource>
+  </TestCase>
+  <TestCase name="testReferDynamicStarInSelectOB">
+    <Resource name="sql">
+      <![CDATA[select n_nationkey, n_name
+from (select * from SALES.NATION)
+order by n_regionkey]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(N_NATIONKEY=[$0], N_NAME=[$1])
+  LogicalSort(sort0=[$2], dir0=[ASC])
+    LogicalProject(N_NATIONKEY=[ITEM($0, 'N_NATIONKEY')], N_NAME=[ITEM($0, 'N_NAME')], EXPR$2=[ITEM($0, 'N_REGIONKEY')])
+      LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testReferDynamicStarInSelectWhereGB">
+    <Resource name="sql">
+      <![CDATA[select n_regionkey, count(*) as cnt from (select * from SALES.NATION) where n_nationkey > 5 group by n_regionkey]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}], CNT=[COUNT()])
+  LogicalProject(N_REGIONKEY=[ITEM($0, 'N_REGIONKEY')])
+    LogicalFilter(condition=[>(ITEM($0, 'N_NATIONKEY'), 5)])
+      LogicalProject(**=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testRollup">
+    <Resource name="sql">
+      <![CDATA[select 1
+from (values (1, 2, 3, 4)) as t(a, b, c, d)
+group by rollup(a, b), rollup(c, d)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalAggregate(group=[{0, 1, 2, 3}], groups=[[{0, 1, 2, 3}, {0, 1, 2}, {0, 1}, {0, 2, 3}, {0, 2}, {0}, {2, 3}, {2}, {}]])
+    LogicalValues(tuples=[[{ 1, 2, 3, 4 }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testRollupSimple">
+    <Resource name="sql">
+      <![CDATA[select a, b, count(*) as c
+from (values (cast(null as integer), 2)) as t(a, b)
+group by rollup(a, b)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0, 1}], groups=[[{0, 1}, {0}, {}]], C=[COUNT()])
+  LogicalValues(tuples=[[{ null, 2 }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testRollupTuples">
+    <Resource name="sql">
+      <![CDATA[select 1
+from (values (1, 2, 3, 4)) as t(a, b, c, d)
+group by rollup(b, (a, d))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[1])
+  LogicalAggregate(group=[{0, 1, 2}], groups=[[{0, 1, 2}, {0}, {}]])
+    LogicalProject(B=[$1], A=[$0], D=[$3])
+      LogicalValues(tuples=[[{ 1, 2, 3, 4 }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testRowValueConstructorWithSubquery">
+    <Resource name="sql">
+      <![CDATA[select ROW((select deptno
+from dept
+where dept.deptno = emp.deptno), emp.ename)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[ROW($9, $1)])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO9=[$9])
+    LogicalJoin(condition=[=($9, $7)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testSample">
+    <Resource name="sql">
+      <![CDATA[select * from emp tablesample substitute('DATASET1') where empno > 5]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[OR(=($7, 10), IN($7, {
-LogicalProject(DEPTNO=[$0])
-  LogicalFilter(condition=[<($0, 5)])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-}))])
+  LogicalFilter(condition=[>($0, 5)])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdateWhere">
-        <Resource name="sql">
-            <![CDATA[update emp set empno = empno + 1 where deptno = 10]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[EMPNO]], sourceExpressionList=[[+($0, 1)]], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[+($0, 1)])
-    LogicalFilter(condition=[=($7, 10)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSampleBernoulli">
+    <Resource name="sql">
+      <![CDATA[select * from emp tablesample bernoulli(50) where empno > 5]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[>($0, 5)])
+    Sample(mode=[bernoulli], rate=[0.5], repeatableSeed=[-])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdateBind">
-        <Resource name="sql">
-            <![CDATA[update emp set sal = sal + ? where slacker = false]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[SAL]], sourceExpressionList=[[+($5, ?0)]], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[+($5, ?0)])
-    LogicalFilter(condition=[=($8, false)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSampleBernoulliQuery">
+    <Resource name="sql">
+      <![CDATA[select * from (
+ select * from emp as e tablesample bernoulli(10) repeatable(1)
+ join dept on e.deptno = dept.deptno
+) tablesample bernoulli(50) repeatable(99)
+where empno > 5]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalFilter(condition=[>($0, 5)])
+    Sample(mode=[bernoulli], rate=[0.5], repeatableSeed=[99])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+        LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+          Sample(mode=[bernoulli], rate=[0.1], repeatableSeed=[1])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdateBind2">
-        <Resource name="sql">
-            <![CDATA[update emp set sal = ? where slacker = false]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[SAL]], sourceExpressionList=[[?0]], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[?0])
-    LogicalFilter(condition=[=($8, false)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSampleQuery">
+    <Resource name="sql">
+      <![CDATA[select * from (
+ select * from emp as e tablesample substitute('DATASET1')
+ join dept on e.deptno = dept.deptno
+) tablesample substitute('DATASET2')
+where empno > 5]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalFilter(condition=[>($0, 5)])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+      LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSampleSystem">
+    <Resource name="sql">
+      <![CDATA[select * from emp tablesample system(50) where empno > 5]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[>($0, 5)])
+    Sample(mode=[system], rate=[0.5], repeatableSeed=[-])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdateExtendedColumnCollision">
-        <Resource name="sql">
-            <![CDATA[update empdefaults(empno INTEGER NOT NULL, deptno INTEGER) set deptno = 1, empno = 20, ename = 'Bob' where deptno = 10]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPDEFAULTS]], operation=[UPDATE], updateColumnList=[[DEPTNO, EMPNO, ENAME]], sourceExpressionList=[[1, 20, 'Bob']], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[1], EXPR$1=[20], EXPR$2=['Bob'])
-    LogicalFilter(condition=[=($7, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMPDEFAULTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSampleSystemQuery">
+    <Resource name="sql">
+      <![CDATA[select * from (
+ select * from emp as e tablesample system(10) repeatable(1)
+ join dept on e.deptno = dept.deptno
+) tablesample system(50) repeatable(99)
+where empno > 5]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+  LogicalFilter(condition=[>($0, 5)])
+    Sample(mode=[system], rate=[0.5], repeatableSeed=[99])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+        LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+          Sample(mode=[system], rate=[0.1], repeatableSeed=[1])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdateExtendedColumnCaseSensitiveCollision">
-        <Resource name="sql">
-            <![CDATA[update empdefaults("slacker" INTEGER, deptno INTEGER) set deptno = 1, "slacker" = 100 where ename = 'Bob']]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPDEFAULTS]], operation=[UPDATE], updateColumnList=[[DEPTNO, slacker]], sourceExpressionList=[[1, 100]], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], slacker=[$9], EXPR$0=[1], EXPR$1=[100])
-    LogicalFilter(condition=[=($1, 'Bob')])
-      LogicalTableScan(table=[[CATALOG, SALES, EMPDEFAULTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectDistinct">
+    <Resource name="sql">
+      <![CDATA[select distinct sal + 5 from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}])
+  LogicalProject(EXPR$0=[+($5, 5)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdateExtendedColumnModifiableViewCollision">
-        <Resource name="sql">
-            <![CDATA[update EMP_MODIFIABLEVIEW3(empno INTEGER NOT NULL, deptno INTEGER) set deptno = 20, empno = 20, ename = 'Bob' where empno = 10]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW3]], operation=[UPDATE], updateColumnList=[[DEPTNO, EMPNO, ENAME]], sourceExpressionList=[[20, 20, 'Bob']], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], SLACKER=[$6], DEPTNO=[$7], EXPR$0=[20], EXPR$1=[20], EXPR$2=['Bob'])
-    LogicalFilter(condition=[=($0, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW3]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectDistinctDup">
+    <Resource name="sql">
+      <![CDATA[select distinct sal + 5, deptno, sal + 5 from emp where deptno < 10]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[$0], DEPTNO=[$1], EXPR$2=[$0])
+  LogicalAggregate(group=[{0, 1}])
+    LogicalProject(EXPR$0=[+($5, 5)], DEPTNO=[$7])
+      LogicalFilter(condition=[<($7, 10)])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdateExtendedColumnModifiableViewCaseSensitiveCollision">
-        <Resource name="sql">
-            <![CDATA[update EMP_MODIFIABLEVIEW2("slacker" INTEGER, deptno INTEGER) set deptno = 20, "slacker" = 100 where ename = 'Bob']]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]], operation=[UPDATE], updateColumnList=[[DEPTNO, slacker]], sourceExpressionList=[[20, 100]], flattened=[true])
-  LogicalProject(ENAME=[$0], EMPNO=[$1], JOB=[$2], DEPTNO=[$3], SLACKER=[$4], SAL=[$5], EXTRA=[$6], HIREDATE=[$7], MGR=[$8], COMM=[$9], slacker=[$10], EXPR$0=[20], EXPR$1=[100])
-    LogicalFilter(condition=[=($0, 'Bob')])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectDistinctGroup">
+    <Resource name="sql">
+      <![CDATA[select distinct sum(sal) from emp group by deptno]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}])
+  LogicalProject(EXPR$0=[$1])
+    LogicalAggregate(group=[{0}], EXPR$0=[SUM($1)])
+      LogicalProject(DEPTNO=[$7], SAL=[$5])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdateExtendedColumnModifiableViewExtendedCollision">
-        <Resource name="sql">
-            <![CDATA[update EMP_MODIFIABLEVIEW2("slacker" INTEGER, extra BOOLEAN) set deptno = 20, "slacker" = 100, extra = true where ename = 'Bob']]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]], operation=[UPDATE], updateColumnList=[[DEPTNO, slacker, EXTRA]], sourceExpressionList=[[20, 100, true]], flattened=[true])
-  LogicalProject(ENAME=[$0], EMPNO=[$1], JOB=[$2], DEPTNO=[$3], SLACKER=[$4], SAL=[$5], EXTRA=[$6], HIREDATE=[$7], MGR=[$8], COMM=[$9], slacker=[$10], EXPR$0=[20], EXPR$1=[100], EXPR$2=[true])
-    LogicalFilter(condition=[=($0, 'Bob')])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectDynamicStarOrderBy">
+    <Resource name="sql">
+      <![CDATA[SELECT * from SALES.NATION order by n_nationkey]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(**=[$0])
+  LogicalSort(sort0=[$1], dir0=[ASC])
+    LogicalProject(**=[$0], EXPR$1=[ITEM($0, 'N_NATIONKEY')])
+      LogicalTableScan(table=[[CATALOG, SALES, NATION]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdateExtendedColumnModifiableViewExtendedCaseSensitiveCollision">
-        <Resource name="sql">
-            <![CDATA[update EMP_MODIFIABLEVIEW2("extra" INTEGER, extra BOOLEAN) set deptno = 20, "extra" = 100, extra = true where ename = 'Bob']]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]], operation=[UPDATE], updateColumnList=[[DEPTNO, extra, EXTRA]], sourceExpressionList=[[20, 100, true]], flattened=[true])
-  LogicalProject(ENAME=[$0], EMPNO=[$1], JOB=[$2], DEPTNO=[$3], SLACKER=[$4], SAL=[$5], EXTRA=[$6], HIREDATE=[$7], MGR=[$8], COMM=[$9], extra=[$10], EXPR$0=[20], EXPR$1=[100], EXPR$2=[true])
-    LogicalFilter(condition=[=($0, 'Bob')])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectFromDynamicTable">
+    <Resource name="sql">
+      <![CDATA[select n_nationkey, n_name from SALES.NATION]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(N_NATIONKEY=[$0], N_NAME=[$1])
+  LogicalTableScan(table=[[CATALOG, SALES, NATION]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdateExtendedColumnModifiableViewUnderlyingCollision">
-        <Resource name="sql">
-            <![CDATA[update EMP_MODIFIABLEVIEW3(extra BOOLEAN, comm INTEGER) set empno = 20, comm = 123, extra = true where ename = 'Bob']]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW3]], operation=[UPDATE], updateColumnList=[[EMPNO, COMM, EXTRA]], sourceExpressionList=[[20, 123, true]], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], SLACKER=[$6], EXTRA=[$7], COMM=[$8], EXPR$0=[20], EXPR$1=[123], EXPR$2=[true])
-    LogicalFilter(condition=[=($1, 'Bob')])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW3]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectModifiableViewConstraint">
+    <Resource name="sql">
+      <![CDATA[select deptno from EMP_MODIFIABLEVIEW2
+where deptno = ?]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$3])
+  LogicalFilter(condition=[=($3, ?0)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInsertExtendedColumn">
-        <Resource name="sql">
-            <![CDATA[insert into empdefaults(updated TIMESTAMP)
- (ename, deptno, empno, updated, sal)
- values ('Fred', 456, 44, timestamp '2017-03-12 13:03:05', 999999)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPDEFAULTS]], operation=[INSERT], flattened=[true])
-  LogicalProject(EMPNO=[$2], ENAME=[$0], JOB=[null:VARCHAR(10)], MGR=[null:INTEGER], HIREDATE=[null:TIMESTAMP(0)], SAL=[$4], COMM=[null:INTEGER], DEPTNO=[$1], SLACKER=[null:BOOLEAN], UPDATED=[$3])
-    LogicalValues(tuples=[[{ 'Fred', 456, 44, 2017-03-12 13:03:05, 999999 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectNestedColumnType">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(UNIT_LENGTH=[CHAR_LENGTH($3)])
+  LogicalFilter(condition=[=($0, 'john')])
+    LogicalProject(FNAME=[$1], COORD=[$4], COORD2=[$5], COORD3=[$6])
+      LogicalFilter(condition=[AND(>($4, 1), >($5, 1))])
+        LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
+          LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTumble">
-        <Resource name="sql">
-            <![CDATA[select STREAM
-  TUMBLE_START(rowtime, INTERVAL '1' MINUTE) AS s,
-  TUMBLE_END(rowtime, INTERVAL '1' MINUTE) AS e
-from Shipments
-GROUP BY TUMBLE(rowtime, INTERVAL '1' MINUTE)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalDelta
-  LogicalProject(S=[$0], E=[+($0, 60000:INTERVAL MINUTE)])
-    LogicalAggregate(group=[{0}])
-      LogicalProject($f0=[$TUMBLE($1, 60000:INTERVAL MINUTE)])
-        LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select
+  char_length(coord."unit") as unit_length
+from
+  (
+    select
+      fname,
+      coord
+    from
+      customer.contact_peek
+    where
+      coord.x > 1
+      and coord.y > 1
+  ) as view
+where
+  fname = 'john']]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectNull">
+    <Resource name="sql">
+      <![CDATA[select null from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[null:NULL])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableFunctionTumble">
-        <Resource name="sql">
-            <![CDATA[select *
-from table(tumble(table Shipments, descriptor(rowtime), INTERVAL '1' MINUTE))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
-  LogicalTableFunctionScan(invocation=[TUMBLE(DESCRIPTOR($1), 60000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
-    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectNullWithAlias">
+    <Resource name="sql">
+      <![CDATA[select null as dummy from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DUMMY=[null:NULL])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableFunctionTumbleWithParamNames">
-        <Resource name="sql">
-            <![CDATA[select *
-from table(
-tumble(
-  DATA => table Shipments,
-  TIMECOL => descriptor(rowtime),
-  SIZE => INTERVAL '1' MINUTE))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
-  LogicalTableFunctionScan(invocation=[TUMBLE(DESCRIPTOR($1), 60000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
-    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectNullWithCast">
+    <Resource name="sql">
+      <![CDATA[select cast(null as timestamp) dummy from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DUMMY=[null:TIMESTAMP(0)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableFunctionTumbleWithParamReordered">
-        <Resource name="sql">
-            <![CDATA[select *
-from table(
-tumble(
-  DATA => table Shipments,
-  SIZE => INTERVAL '1' MINUTE,
-  TIMECOL => descriptor(rowtime)))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
-  LogicalTableFunctionScan(invocation=[TUMBLE(DESCRIPTOR($1), 60000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
-    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectOverDistinct">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[CASE(>(COUNT(DISTINCT $7) OVER (ORDER BY $0 ROWS 10 PRECEDING), 0), $SUM0(DISTINCT $7) OVER (ORDER BY $0 ROWS 10 PRECEDING), null:INTEGER)])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableFunctionTumbleWithInnerJoin">
-        <Resource name="sql">
-            <![CDATA[select *
-from table(tumble(table Shipments, descriptor(rowtime), INTERVAL '1' MINUTE)) a
-join table(tumble(table Shipments, descriptor(rowtime), INTERVAL '1' MINUTE)) b
-on a.orderid = b.orderid]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3], ORDERID0=[$4], ROWTIME0=[$5], window_start0=[$6], window_end0=[$7])
-  LogicalJoin(condition=[=($0, $4)], joinType=[inner])
-    LogicalTableFunctionScan(invocation=[TUMBLE(DESCRIPTOR($1), 60000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
-      LogicalProject(ORDERID=[$0], ROWTIME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
-    LogicalTableFunctionScan(invocation=[TUMBLE(DESCRIPTOR($1), 60000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
-      LogicalProject(ORDERID=[$0], ROWTIME=[$1])
-        LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select SUM(DISTINCT deptno)
+over (ORDER BY empno ROWS BETWEEN 10 PRECEDING AND CURRENT ROW)
+from emp
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableFunctionTumbleWithOffset">
-        <Resource name="sql">
-            <![CDATA[select *
-from table(tumble(table Shipments, descriptor(rowtime),
-  INTERVAL '10' MINUTE, INTERVAL '1' MINUTE))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
-  LogicalTableFunctionScan(invocation=[TUMBLE(DESCRIPTOR($1), 600000:INTERVAL MINUTE, 60000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
-    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectStarFromDynamicTable">
+    <Resource name="sql">
+      <![CDATA[select * from SALES.NATION]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(**=[$0])
+  LogicalTableScan(table=[[CATALOG, SALES, NATION]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableFunctionHop">
-        <Resource name="sql">
-            <![CDATA[select *
-from table(hop(table Shipments, descriptor(rowtime), INTERVAL '1' MINUTE, INTERVAL '2' MINUTE))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
-  LogicalTableFunctionScan(invocation=[HOP(DESCRIPTOR($1), 60000:INTERVAL MINUTE, 120000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
-    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectStreamPartitionDistinct">
+    <Resource name="plan">
+      <![CDATA[
+LogicalDelta
+  LogicalProject(C=[COUNT(DISTINCT $2) OVER (PARTITION BY $1 ORDER BY $0 RANGE 1000:INTERVAL SECOND PRECEDING)], C2=[COUNT(DISTINCT $2) OVER (PARTITION BY $1 ORDER BY $0 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)], C3=[COUNT($2) OVER (PARTITION BY $1 ORDER BY $0 RANGE BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)])
+    LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableFunctionHopWithParamNames">
-        <Resource name="sql">
-            <![CDATA[select *
-from table(
-hop(
-  DATA => table Shipments,
-  TIMECOL => descriptor(rowtime),
-  SLIDE => INTERVAL '1' MINUTE,
-  SIZE => INTERVAL '2' MINUTE))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
-  LogicalTableFunctionScan(invocation=[HOP(DESCRIPTOR($1), 60000:INTERVAL MINUTE, 120000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
-    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableFunctionHopWithParamReordered">
-        <Resource name="sql">
-            <![CDATA[select *
-from table(
-hop(
-  DATA => table Shipments,
-  SLIDE => INTERVAL '1' MINUTE,
-  TIMECOL => descriptor(rowtime),
-  SIZE => INTERVAL '2' MINUTE))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
-  LogicalTableFunctionScan(invocation=[HOP(DESCRIPTOR($1), 60000:INTERVAL MINUTE, 120000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
-    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableFunctionHopWithOffset">
-        <Resource name="sql">
-            <![CDATA[select *
-from table(hop(table Shipments, descriptor(rowtime), INTERVAL '1' MINUTE, INTERVAL '5' MINUTE, INTERVAL '3' MINUTE))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
-  LogicalTableFunctionScan(invocation=[HOP(DESCRIPTOR($1), 60000:INTERVAL MINUTE, 300000:INTERVAL MINUTE, 180000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
-    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select stream
+  count(distinct orderId) over (partition by productId
+    order by rowtime
+    range interval '1' second preceding) as c,
+  count(distinct orderId) over w as c2,
+  count(orderId) over w as c3
+from orders
+window w as (partition by productId)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectView">
+    <Resource name="sql">
+      <![CDATA[select * from emp_20 where empno > 100]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$7])
+  LogicalFilter(condition=[>($0, 100)])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], SLACKER=[$8])
+      LogicalFilter(condition=[AND(=($7, 20), >($5, 1000))])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableFunctionSession">
-        <Resource name="sql">
-            <![CDATA[select *
-from table(session(table Shipments, descriptor(rowtime), descriptor(orderId), INTERVAL '10' MINUTE))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
-  LogicalTableFunctionScan(invocation=[SESSION(DESCRIPTOR($1), DESCRIPTOR($0), 600000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
-    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectViewExtendedColumnCaseSensitiveCollision">
+    <Resource name="sql">
+      <![CDATA[select ENAME, EMPNO, JOB, SLACKER, "sal", HIREDATE, MGR
+ from EMP_MODIFIABLEVIEW3 extend ("sal" boolean)
+ where "sal" = true]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ENAME=[$1], EMPNO=[$0], JOB=[$2], SLACKER=[$6], sal=[$7], HIREDATE=[$4], MGR=[$3])
+  LogicalFilter(condition=[=($7, true)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW3]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableFunctionSessionWithParamNames">
-        <Resource name="sql">
-            <![CDATA[select *
-from table(
-session(
-  DATA => table Shipments,
-  TIMECOL => descriptor(rowtime),
-  KEY => descriptor(orderId),
-  SIZE => INTERVAL '10' MINUTE))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
-  LogicalTableFunctionScan(invocation=[SESSION(DESCRIPTOR($1), DESCRIPTOR($0), 600000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
-    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectViewExtendedColumnCaseSensitiveExtendedCollision">
+    <Resource name="sql">
+      <![CDATA[select ENAME, EMPNO, JOB, SLACKER, SAL, HIREDATE, "extra"
+ from EMP_MODIFIABLEVIEW2 extend ("extra" boolean)
+ where "extra" = false]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ENAME=[$0], EMPNO=[$1], JOB=[$2], SLACKER=[$4], SAL=[$5], HIREDATE=[$7], extra=[$10])
+  LogicalFilter(condition=[=($10, false)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableFunctionSessionWithParamReordered">
-        <Resource name="sql">
-            <![CDATA[select *
-from table(
-session(
-  DATA => table Shipments,
-  KEY => descriptor(orderId),
-  TIMECOL => descriptor(rowtime),
-  SIZE => INTERVAL '10' MINUTE))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
-  LogicalTableFunctionScan(invocation=[SESSION(DESCRIPTOR($1), DESCRIPTOR($0), 600000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
-    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectViewExtendedColumnCaseSensitiveUnderlyingCollision">
+    <Resource name="sql">
+      <![CDATA[select ENAME, EMPNO, JOB, SLACKER, SAL, HIREDATE, MGR, "comm"
+ from EMP_MODIFIABLEVIEW3 extend ("comm" int)
+ where "comm" = 20]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ENAME=[$1], EMPNO=[$0], JOB=[$2], SLACKER=[$6], SAL=[$5], HIREDATE=[$4], MGR=[$3], comm=[$7])
+  LogicalFilter(condition=[=($7, 20)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW3]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableFunctionTumbleWithSubQueryParam">
-        <Resource name="sql">
-            <![CDATA[select *
-from table(tumble((select * from Shipments), descriptor(rowtime), INTERVAL '1' MINUTE))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
-  LogicalTableFunctionScan(invocation=[TUMBLE(DESCRIPTOR($1), 60000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
-    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectViewExtendedColumnCollision">
+    <Resource name="sql">
+      <![CDATA[select ENAME, EMPNO, JOB, SLACKER, SAL, HIREDATE, MGR
+ from EMP_MODIFIABLEVIEW3 extend (SAL int)
+ where SAL = 20]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ENAME=[$1], EMPNO=[$0], JOB=[$2], SLACKER=[$6], SAL=[$5], HIREDATE=[$4], MGR=[$3])
+  LogicalFilter(condition=[=($5, 20)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW3]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableFunctionHopWithSubQueryParam">
-        <Resource name="sql">
-            <![CDATA[select *
-from table(hop((select * from Shipments), descriptor(rowtime), INTERVAL '1' MINUTE, INTERVAL '2' MINUTE))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
-  LogicalTableFunctionScan(invocation=[HOP(DESCRIPTOR($1), 60000:INTERVAL MINUTE, 120000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
-    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectViewExtendedColumnExtendedCollision">
+    <Resource name="sql">
+      <![CDATA[select ENAME, EMPNO, JOB, SLACKER, SAL, HIREDATE, EXTRA
+ from EMP_MODIFIABLEVIEW2 extend (EXTRA boolean)
+ where SAL = 20]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ENAME=[$0], EMPNO=[$1], JOB=[$2], SLACKER=[$4], SAL=[$5], HIREDATE=[$7], EXTRA=[$6])
+  LogicalFilter(condition=[=($5, 20)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableFunctionSessionWithSubQueryParam">
-        <Resource name="sql">
-            <![CDATA[select *
-from table(session((select * from Shipments), descriptor(rowtime), descriptor(orderId), INTERVAL '10' MINUTE))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
-  LogicalTableFunctionScan(invocation=[SESSION(DESCRIPTOR($1), DESCRIPTOR($0), 600000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
-    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
-      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectViewExtendedColumnUnderlyingCollision">
+    <Resource name="sql">
+      <![CDATA[select ENAME, EMPNO, JOB, SLACKER, SAL, HIREDATE, MGR, COMM
+ from EMP_MODIFIABLEVIEW3 extend (COMM int)
+ where SAL = 20]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ENAME=[$1], EMPNO=[$0], JOB=[$2], SLACKER=[$6], SAL=[$5], HIREDATE=[$4], MGR=[$3], COMM=[$7])
+  LogicalFilter(condition=[=($5, 20)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW3]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTableFunctionSessionCompoundSessionKey">
-        <Resource name="sql">
-            <![CDATA[select *
-from table(session(table Orders, descriptor(rowtime), descriptor(orderId, productId), INTERVAL '10' MINUTE))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2], window_start=[$3], window_end=[$4])
-  LogicalTableFunctionScan(invocation=[SESSION(DESCRIPTOR($0), DESCRIPTOR($2, $1), 600000:INTERVAL MINUTE)], rowType=[RecordType(TIMESTAMP(0) ROWTIME, INTEGER PRODUCTID, INTEGER ORDERID, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
-    LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2])
-      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSelectWithoutFrom">
+    <Resource name="sql">
+      <![CDATA[select 2+2]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[+(2, 2)])
+  LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTumbleTableRowtimeNotFirstColumn">
-        <Resource name="sql">
-            <![CDATA[select stream
-   tumble_end(rowtime, interval '2' hour) as rowtime, orderId
-from shipments
-group by tumble(rowtime, interval '2' hour), orderId]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+  </TestCase>
+  <TestCase name="testSessionTable">
+    <Resource name="sql">
+      <![CDATA[select stream session_start(rowtime, interval '1' hour) as rowtime,
+  session_end(rowtime, interval '1' hour),
+  count(*) as c
+from orders
+group by session(rowtime, interval '1' hour)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalDelta
-  LogicalProject(ROWTIME=[+($0, 7200000:INTERVAL HOUR)], ORDERID=[$1])
-    LogicalAggregate(group=[{0, 1}])
-      LogicalProject($f0=[$TUMBLE($1, 7200000:INTERVAL HOUR)], ORDERID=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdateExtendedColumn">
-        <Resource name="sql">
-            <![CDATA[update empdefaults(updated TIMESTAMP) set deptno = 1, updated = timestamp '2017-03-12 13:03:05', empno = 20, ename = 'Bob' where deptno = 10]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMPDEFAULTS]], operation=[UPDATE], updateColumnList=[[DEPTNO, UPDATED, EMPNO, ENAME]], sourceExpressionList=[[1, 2017-03-12 13:03:05, 20, 'Bob']], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], UPDATED=[$9], EXPR$0=[1], EXPR$1=[2017-03-12 13:03:05], EXPR$2=[20], EXPR$3=['Bob'])
-    LogicalFilter(condition=[=($7, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMPDEFAULTS]])
+  LogicalProject(ROWTIME=[$0], EXPR$1=[$0], C=[$1])
+    LogicalAggregate(group=[{0}], C=[COUNT()])
+      LogicalProject($f0=[$SESSION($0, 3600000:INTERVAL HOUR)])
+        LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdateModifiableView">
-        <Resource name="sql">
-            <![CDATA[update EMP_MODIFIABLEVIEW2
-set sal = sal + 5000 where slacker = false]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]], operation=[UPDATE], updateColumnList=[[SAL]], sourceExpressionList=[[+($5, 5000)]], flattened=[true])
-  LogicalProject(ENAME=[$0], EMPNO=[$1], JOB=[$2], DEPTNO=[$3], SLACKER=[$4], SAL=[$5], EXTRA=[$6], HIREDATE=[$7], MGR=[$8], COMM=[$9], EXPR$0=[+($5, 5000)])
-    LogicalFilter(condition=[=($4, false)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSimplifyExistsAggregateSubQuery">
+    <Resource name="sql">
+      <![CDATA[SELECT e1.empno
+FROM emp e1 where exists
+(select avg(sal) from emp e2 where e1.empno = e2.empno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdateExtendedColumnModifiableView">
-        <Resource name="sql">
-            <![CDATA[update EMP_MODIFIABLEVIEW2(updated TIMESTAMP)
-set updated = timestamp '2017-03-12 13:03:05', sal = sal + 5000
-where slacker = false]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]], operation=[UPDATE], updateColumnList=[[UPDATED, SAL]], sourceExpressionList=[[2017-03-12 13:03:05, +($5, 5000)]], flattened=[true])
-  LogicalProject(ENAME=[$0], EMPNO=[$1], JOB=[$2], DEPTNO=[$3], SLACKER=[$4], SAL=[$5], EXTRA=[$6], HIREDATE=[$7], MGR=[$8], COMM=[$9], UPDATED=[$10], EXPR$0=[2017-03-12 13:03:05], EXPR$1=[+($5, 5000)])
-    LogicalFilter(condition=[=($4, false)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSimplifyExistsValuesSubQuery">
+    <Resource name="sql">
+      <![CDATA[select deptno
+from EMP
+where exists (values 10)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDelete">
-        <Resource name="sql">
-            <![CDATA[delete from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[DELETE], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSimplifyNotExistsAggregateSubQuery">
+    <Resource name="sql">
+      <![CDATA[SELECT e1.empno
+FROM emp e1 where not exists
+(select avg(sal) from emp e2 where e1.empno = e2.empno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[NOT(true)])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdate">
-        <Resource name="sql">
-            <![CDATA[update emp set empno = empno + 1]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[EMPNO]], sourceExpressionList=[[+($0, 1)]], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[+($0, 1)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSimplifyNotExistsValuesSubQuery">
+    <Resource name="sql">
+      <![CDATA[select deptno
+from EMP
+where not exists (values 10)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7])
+  LogicalFilter(condition=[NOT(true)])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdateSubQuery">
-        <Resource name="sql">
-            <![CDATA[update emp
-set empno = (
-  select min(empno) from emp as e where e.deptno = emp.deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[EMPNO]], sourceExpressionList=[[$0]], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[$10])
-    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSingletonGroupingSet">
+    <Resource name="sql">
+      <![CDATA[select sum(sal) from emp group by grouping sets (deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[$1])
+  LogicalAggregate(group=[{0}], EXPR$0=[SUM($1)])
+    LogicalProject(DEPTNO=[$7], SAL=[$5])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{0}], EXPR$0=[MIN($1)])
-        LogicalProject(DEPTNO=[$7], EMPNO=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdateSubQueryWithIn">
-        <Resource name="sql">
-            <![CDATA[update emp
-set empno = 1 where empno in (
-  select empno from emp where empno=2)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[EMPNO]], sourceExpressionList=[[1]], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[1])
-    LogicalJoin(condition=[=($0, $9)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{0}])
-        LogicalProject(EMPNO=[$0])
-          LogicalFilter(condition=[=($0, 2)])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSnapshotOnTemporalTable1">
+    <Resource name="sql">
+      <![CDATA[select * from products_temporal for system_time as of TIMESTAMP '2011-01-02 00:00:00']]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(PRODUCTID=[$0], NAME=[$1], SUPPLIERID=[$2], SYS_START=[$3], SYS_END=[$4])
+  LogicalSnapshot(period=[2011-01-02 00:00:00])
+    LogicalTableScan(table=[[CATALOG, SALES, PRODUCTS_TEMPORAL]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdateSubQueryWithNotIn">
-        <Resource name="sql">
-            <![CDATA[update emp
-set empno = 1 where empno not in (
-  select empno from emp where empno=2)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[EMPNO]], sourceExpressionList=[[1]], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[1])
-    LogicalFilter(condition=[NOT(AND(IS TRUE($11), IS NOT NULL($9)))])
-      LogicalJoin(condition=[=($9, $10)], joinType=[left])
-        LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EMPNO0=[$0])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-          LogicalProject(EMPNO=[$0], $f1=[true])
-            LogicalFilter(condition=[=($0, 2)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSnapshotOnTemporalTable2">
+    <Resource name="sql">
+      <![CDATA[select * from VIRTUALCOLUMNS.VC_T1 for system_time as of TIMESTAMP '2011-01-02 00:00:00']]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(A=[$0], B=[$1], C=[$2], D=[$3], E=[$4])
+  LogicalSnapshot(period=[2011-01-02 00:00:00])
+    LogicalProject(A=[$0], B=[$1], C=[$2], D=[$3], $f4=[+($0, 1)])
+      LogicalTableScan(table=[[CATALOG, VIRTUALCOLUMNS, VC_T1]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUpdateSubQueryWithIn1">
-        <Resource name="sql">
-            <![CDATA[update emp
-set empno = 1 where emp.empno in (
-  select emp.empno from emp where emp.empno=2)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[EMPNO]], sourceExpressionList=[[1]], flattened=[true])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[1])
-    LogicalJoin(condition=[=($0, $9)], joinType=[inner])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSome">
+    <Resource name="sql">
+      <![CDATA[select empno from emp where deptno > some (
+  select deptno from dept)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[> SOME($7, {
+LogicalProject(DEPTNO=[$0])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+})])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSomeAndEveryAggregateFunctions">
+    <Resource name="sql">
+      <![CDATA[SELECT some(empno = 130) as someempnoexists,
+ every(empno > 0) as everyempnogtzero
+ FROM emp AS e group by e.sal]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(SOMEEMPNOEXISTS=[$1], EVERYEMPNOGTZERO=[$2])
+  LogicalAggregate(group=[{0}], SOMEEMPNOEXISTS=[SOME($1)], EVERYEMPNOGTZERO=[EVERY($2)])
+    LogicalProject(SAL=[$5], $f1=[=($0, 130)], $f2=[>($0, 0)])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{0}])
-        LogicalProject(EMPNO=[$0])
-          LogicalFilter(condition=[=($0, 2)])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOffset0">
-        <Resource name="sql">
-            <![CDATA[select * from emp offset 0]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSomeValueList">
+    <Resource name="sql">
+      <![CDATA[select empno from emp where deptno > some (10, 20)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[OR(>($7, 10), >($7, 20))])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSomeWithEquality">
-        <Resource name="sql">
-            <![CDATA[select empno from emp where deptno = some (
+    </Resource>
+  </TestCase>
+  <TestCase name="testSomeWithEquality">
+    <Resource name="sql">
+      <![CDATA[select empno from emp where deptno = some (
   select deptno from dept)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EMPNO=[$0])
   LogicalFilter(condition=[IN($7, {
 LogicalProject(DEPTNO=[$0])
@@ -5615,1843 +5651,1807 @@ LogicalProject(DEPTNO=[$0])
 })])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWithInsideScalarSubQueryRex">
-        <Resource name="sql">
-            <![CDATA[select (
- with dept2 as (select * from dept where deptno > 10) select count(*) from dept2) as c
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(C=[$SCALAR_QUERY({
-LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
-  LogicalProject($f0=[0])
-    LogicalFilter(condition=[>($0, 10)])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-})])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortInSubQuery">
+    <Resource name="sql">
+      <![CDATA[select * from (select empno from emp order by empno)]]>
+    </Resource>
+    <Resource name="planRemoveSort">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
   LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWithInsideWhereExistsRex">
-        <Resource name="sql">
-            <![CDATA[select * from emp
-where exists (
-  with dept2 as (select * from dept where dept.deptno >= emp.deptno)
-  select 1 from dept2 where deptno <= emp.deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[EXISTS({
-LogicalFilter(condition=[<=($0, $cor1.DEPTNO)])
-  LogicalProject(DEPTNO=[$0], NAME=[$1])
-    LogicalFilter(condition=[>=($0, $cor1.DEPTNO)])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-})], variablesSet=[[$cor1]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="planKeepSort">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalSort(sort0=[$0], dir0=[ASC])
+    LogicalProject(EMPNO=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInUncorrelatedSubQueryInSelectRex">
-        <Resource name="sql">
-            <![CDATA[select name, deptno in (
-  select case when true then deptno else null end from emp)
-from dept]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(NAME=[$1], EXPR$1=[IN($0, {
-LogicalProject(EXPR$0=[CAST($7):INTEGER])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortLimitWithCorrelateInput">
+    <Resource name="sql">
+      <![CDATA[SELECT deptno, ename
+    FROM
+        (SELECT DISTINCT deptno FROM emp) t1,
+          LATERAL (
+            SELECT ename, sal
+            FROM emp
+            WHERE deptno = t1.deptno)
+    ORDER BY ename DESC
+    LIMIT 3]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(sort0=[$1], dir0=[DESC], fetch=[3])
+  LogicalProject(DEPTNO=[$0], ENAME=[$1])
+    LogicalJoin(condition=[=($0, $3)], joinType=[inner])
+      LogicalAggregate(group=[{0}])
+        LogicalProject(DEPTNO=[$7])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(ENAME=[$1], SAL=[$5], DEPTNO=[$7])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNotInUncorrelatedSubQueryInSelectNotNullRex">
-        <Resource name="sql">
-            <![CDATA[select empno, deptno not in (
-  select deptno from dept)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], EXPR$1=[NOT(IN($7, {
-LogicalProject(DEPTNO=[$0])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-}))])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortWithTrim">
+    <Resource name="sql">
+      <![CDATA[select ename from (select * from emp order by sal) a]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ENAME=[$1])
   LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNotInUncorrelatedSubQueryRex">
-        <Resource name="sql">
-            <![CDATA[select empno from emp where deptno not in (select deptno from dept)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[NOT(IN($7, {
-LogicalProject(DEPTNO=[$0])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-}))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testStarDynamicSchemaUnnest">
+    <Resource name="sql">
+      <![CDATA[select *
+from SALES.CUSTOMER as t1,
+lateral (select t2."$unnest" as fake_col3
+         from unnest(t1.fake_col) as t2) as t3]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(**=[$1], FAKE_COL3=[$2])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
+    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+    LogicalProject(FAKE_COL3=[$0])
+      Uncollect
+        LogicalProject(FAKE_COL=[$cor0.FAKE_COL])
+          LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNotCaseInThreeClause">
-        <Resource name="sql">
-            <![CDATA[select empno from emp where not case when true then deptno in (10,20) else true end]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[CASE(true, NOT(OR(=($7, 10), =($7, 20))), NOT(true))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testStarDynamicSchemaUnnest2">
+    <Resource name="sql">
+      <![CDATA[select *
+from SALES.CUSTOMER as t1,
+unnest(t1.fake_col) as t2]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(**=[$1], $unnest=[$2])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
+    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+    Uncollect
+      LogicalProject(FAKE_COL=[$cor0.FAKE_COL])
+        LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNotCaseInMoreClause">
-        <Resource name="sql">
-            <![CDATA[select empno from emp where not case when true then deptno in (10,20) when false then false else deptno in (30,40) end]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[CASE(true, NOT(OR(=($7, 10), =($7, 20))), false, NOT(false), NOT(OR(=($7, 30), =($7, 40))))])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testStarDynamicSchemaUnnestNestedSubQuery">
+    <Resource name="sql">
+      <![CDATA[select t2.c1
+from (select * from SALES.CUSTOMER) as t1,
+unnest(t1.fake_col) as t2(c1)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(C1=[$1])
+  LogicalProject(**=[$0], C1=[$2])
+    LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{1}])
+      LogicalProject(**=[$0], $f1=[ITEM($0, 'FAKE_COL')])
+        LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+      LogicalProject(C1=[$0])
+        Uncollect
+          LogicalProject(EXPR$0=[$cor0.$f1])
+            LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNotCaseInWithoutElse">
-        <Resource name="sql">
-            <![CDATA[select empno from emp where not case when true then deptno in (10,20)  end]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[CASE(true, CAST(NOT(OR(=($7, 10), =($7, 20)))):BOOLEAN, null:BOOLEAN)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testStarJoinStaticDynTable">
+    <Resource name="sql">
+      <![CDATA[select * from SALES.NATION N, SALES.REGION as R where N.n_regionkey = R.r_regionkey]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(**=[$1], R_REGIONKEY=[$2], R_NAME=[$3], R_COMMENT=[$4])
+  LogicalFilter(condition=[=($0, $2)])
+    LogicalJoin(condition=[true], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+      LogicalTableScan(table=[[CATALOG, SALES, REGION]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNotInUncorrelatedSubQueryInSelectRex">
-        <Resource name="sql">
-            <![CDATA[select empno, deptno not in (
-  select case when true then deptno else null end from dept)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], EXPR$1=[NOT(IN($7, {
-LogicalProject(EXPR$0=[CAST($0):INTEGER])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-}))])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testStream">
+    <Resource name="sql">
+      <![CDATA[select stream productId from orders where productId = 10]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalDelta
+  LogicalProject(PRODUCTID=[$1])
+    LogicalFilter(condition=[=($1, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInUncorrelatedSubQueryRex">
-        <Resource name="sql">
-            <![CDATA[select empno from emp where deptno in (select deptno from dept)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[IN($7, {
-LogicalProject(DEPTNO=[$0])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-})])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testStreamGroupBy">
+    <Resource name="sql">
+      <![CDATA[select stream
+ floor(rowtime to second) as rowtime, count(*) as c
+from orders
+group by floor(rowtime to second)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalDelta
+  LogicalAggregate(group=[{0}], C=[COUNT()])
+    LogicalProject(ROWTIME=[FLOOR($0, FLAG(SECOND))])
+      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUnnestArrayAggPlan">
-        <Resource name="sql">
-            <![CDATA[select d.deptno, e2.empno_avg
-from dept_nested as d outer apply
- (select avg(e.empno) as empno_avg from UNNEST(d.employees) as e) e2]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EMPNO_AVG=[$7])
-  LogicalProject(DEPTNO=[$0], NAME=[$1], TYPE=[$2], DESC=[$3], A=[$4], B=[$5], EMPLOYEES=[$6], EMPNO_AVG=[$7])
-    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{6}])
-      LogicalProject(DEPTNO=[$0], NAME=[$1], TYPE=[$2.TYPE], DESC=[$2.DESC], A=[$2.OTHERS.A], B=[$2.OTHERS.B], EMPLOYEES=[$3])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
-      LogicalAggregate(group=[{}], EMPNO_AVG=[AVG($0)])
-        LogicalProject(EMPNO=[$0])
-          Uncollect
-            LogicalProject(EMPLOYEES=[$cor0.EMPLOYEES])
-              LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testStreamWindowedAggregation">
+    <Resource name="sql">
+      <![CDATA[select stream *,
+  count(*) over (partition by productId
+    order by rowtime
+    range interval '1' second preceding) as c
+from orders]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalDelta
+  LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2], C=[COUNT() OVER (PARTITION BY $1 ORDER BY $0 RANGE 1000:INTERVAL SECOND PRECEDING)])
+    LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUnnestArrayPlan">
-        <Resource name="sql">
-            <![CDATA[select d.deptno, e2.empno
-from dept_nested as d,
- UNNEST(d.employees) e2]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EMPNO=[$7])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{6}])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], TYPE=[$2.TYPE], DESC=[$2.DESC], A=[$2.OTHERS.A], B=[$2.OTHERS.B], EMPLOYEES=[$3])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
-    Uncollect
-      LogicalProject(EMPLOYEES=[$cor0.EMPLOYEES])
-        LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testStructTypeAlias">
+    <Resource name="sql">
+      <![CDATA[select t.r AS myRow
+from (select row(row(1)) r from dept) t]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(MYROW=[ROW(ROW(1))])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUnnestArrayPlanAs">
-        <Resource name="sql">
-            <![CDATA[select d.deptno, e2.empno
-from dept_nested as d,
- UNNEST(d.employees) as e2(empno, y, z)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EMPNO=[$7])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{6}])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], TYPE=[$2.TYPE], DESC=[$2.DESC], A=[$2.OTHERS.A], B=[$2.OTHERS.B], EMPLOYEES=[$3])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
-    LogicalProject(EMPNO=[$0], Y=[$1], Z=[$2])
-      Uncollect
-        LogicalProject(EMPLOYEES=[$cor0.EMPLOYEES])
-          LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSubQueryAggregateFunctionFollowedBySimpleOperation">
+    <Resource name="sql">
+      <![CDATA[select deptno
+from EMP
+where deptno > (select min(deptno) * 2 + 10 from EMP)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7])
+  LogicalFilter(condition=[>($7, $9)])
+    LogicalJoin(condition=[true], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalProject(EXPR$0=[+(*($0, 2), 10)])
+        LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+          LogicalProject(DEPTNO=[$7])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAliasUnnestArrayPlanWithSingleColumn">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EMPNO=[$5.EMPNO])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{2}])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED_EXPANDED]])
-    Uncollect
-      LogicalProject(EMPLOYEES=[$cor0.EMPLOYEES])
-        LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSubQueryLimitOne">
+    <Resource name="sql">
+      <![CDATA[select deptno
+from EMP
+where deptno > (select deptno
+from EMP order by deptno limit 1)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7])
+  LogicalFilter(condition=[>($7, $9)])
+    LogicalJoin(condition=[true], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalSort(sort0=[$0], dir0=[ASC], fetch=[1])
+        LogicalProject(DEPTNO=[$7])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select d.deptno, employee.empno
-from dept_nested_expanded as d,
- UNNEST(d.employees) as t(employee)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAliasUnnestArrayPlanWithDoubleColumn">
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], E=[$5], EMPNO=[$6.EMPNO])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{2, 3}])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED_EXPANDED]])
-    Uncollect
-      LogicalProject(ADMINS=[$cor0.ADMINS], EMPLOYEES=[$cor0.EMPLOYEES])
-        LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testSubQueryOr">
+    <Resource name="sql">
+      <![CDATA[select * from emp where deptno = 10 or deptno in (
+    select dept.deptno from dept where deptno < 5)
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[select d.deptno, e, k.empno
-from dept_nested_expanded as d CROSS JOIN
- UNNEST(d.admins, d.employees) as t(e, k)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWithInsideWhereExistsDecorrelateRex">
-        <Resource name="sql">
-            <![CDATA[select * from emp
-where exists (
-  with dept2 as (select * from dept where dept.deptno >= emp.deptno)
-  select 1 from dept2 where deptno <= emp.deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[EXISTS({
-LogicalFilter(condition=[<=($0, $cor1.DEPTNO)])
-  LogicalProject(DEPTNO=[$0], NAME=[$1])
-    LogicalFilter(condition=[>=($0, $cor1.DEPTNO)])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-})], variablesSet=[[$cor1]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCompositeInUncorrelatedSubQueryRex">
-        <Resource name="sql">
-            <![CDATA[select empno from emp where (empno, deptno) in (select deptno - 10, deptno from dept)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[IN($0, $7, {
-LogicalProject(EXPR$0=[-($0, 10)], DEPTNO=[$0])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-})])
+  LogicalFilter(condition=[OR(=($7, 10), IN($7, {
+LogicalProject(DEPTNO=[$0])
+  LogicalFilter(condition=[<($0, 5)])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+}))])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinOnInSubQuery">
-        <Resource name="sql">
-            <![CDATA[select * from emp left join dept
-on emp.empno = 1
-or dept.deptno in (select deptno from emp where empno > 5)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[OR(=($0, 1), IN($9, {
+    </Resource>
+  </TestCase>
+  <TestCase name="testSubQueryValues">
+    <Resource name="sql">
+      <![CDATA[select deptno
+from EMP
+where deptno > (values 10)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
 LogicalProject(DEPTNO=[$7])
-  LogicalFilter(condition=[>($0, 5)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}))], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+  LogicalFilter(condition=[>($7, $9)])
+    LogicalJoin(condition=[true], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalValues(tuples=[[{ 10 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinOnExists">
-        <Resource name="sql">
-            <![CDATA[select * from emp left join dept
-on emp.empno = 1
-or exists (select deptno from emp where empno > dept.deptno + 5)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[OR(=($0, 1), EXISTS({
-LogicalFilter(condition=[>($0, +($cor0.DEPTNO0, 5))])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}))], joinType=[left])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableExpression">
+    <Resource name="sql">
+      <![CDATA[select deptno + deptno from dept]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($0, $0)])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInUncorrelatedSubQueryInHavingRex">
-        <Resource name="sql">
-            <![CDATA[select sum(sal) as s
-from emp
-group by deptno
-having count(*) > 2
-and deptno in (
-  select case when true then deptno else null end from emp)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(S=[$1])
-  LogicalFilter(condition=[AND(>($2, 2), IN($0, {
-LogicalProject(EXPR$0=[CAST($7):INTEGER])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-}))])
-    LogicalAggregate(group=[{0}], S=[SUM($1)], agg#1=[COUNT()])
-      LogicalProject(DEPTNO=[$7], SAL=[$5])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableExtend">
+    <Resource name="sql">
+      <![CDATA[select * from dept extend (x varchar(5) not null)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], X=[$2])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUncorrelatedScalarSubQueryInGroupOrderRex">
-        <Resource name="sql">
-            <![CDATA[select sum(sal) as s
-from emp
-group by deptno
-order by (select case when true then deptno else null end from emp) desc,
-  count(*)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(S=[$0])
-  LogicalSort(sort0=[$1], sort1=[$2], dir0=[DESC], dir1=[ASC])
-    LogicalProject(S=[$1], EXPR$1=[$SCALAR_QUERY({
-LogicalProject(EXPR$0=[CAST($7):INTEGER])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})], EXPR$2=[$2])
-      LogicalAggregate(group=[{0}], S=[SUM($1)], agg#1=[COUNT()])
-        LogicalProject(DEPTNO=[$7], SAL=[$5])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableExtendExpression">
+    <Resource name="sql">
+      <![CDATA[select deptno + x from dept extend (x int not null)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[+($0, $2)])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUncorrelatedScalarSubQueryInOrderRex">
-        <Resource name="sql">
-            <![CDATA[select ename
-from emp
-order by (select case when true then deptno else null end from emp) desc,
-  ename]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ENAME=[$0])
-  LogicalSort(sort0=[$1], sort1=[$0], dir0=[DESC], dir1=[ASC])
-    LogicalProject(ENAME=[$1], EXPR$1=[$SCALAR_QUERY({
-LogicalProject(EXPR$0=[CAST($7):INTEGER])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableExtendSubset">
+    <Resource name="sql">
+      <![CDATA[select deptno, x from dept extend (x int)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], X=[$2])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUncorrelatedScalarSubQueryInAggregateRex">
-        <Resource name="sql">
-            <![CDATA[select sum((select min(deptno) from emp)) as s
-from emp
-group by deptno
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableFunctionHop">
+    <Resource name="sql">
+      <![CDATA[select *
+from table(hop(table Shipments, descriptor(rowtime), INTERVAL '1' MINUTE, INTERVAL '2' MINUTE))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
+  LogicalTableFunctionScan(invocation=[HOP(DESCRIPTOR($1), 60000:INTERVAL MINUTE, 120000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
+    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
 ]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(S=[$1])
-  LogicalAggregate(group=[{0}], S=[SUM($1)])
-    LogicalProject(DEPTNO=[$7], $f1=[$SCALAR_QUERY({
-LogicalAggregate(group=[{}], EXPR$0=[MIN($0)])
-  LogicalProject(DEPTNO=[$7])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableFunctionHopWithOffset">
+    <Resource name="sql">
+      <![CDATA[select *
+from table(hop(table Shipments, descriptor(rowtime), INTERVAL '1' MINUTE, INTERVAL '5' MINUTE, INTERVAL '3' MINUTE))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
+  LogicalTableFunctionScan(invocation=[HOP(DESCRIPTOR($1), 60000:INTERVAL MINUTE, 300000:INTERVAL MINUTE, 180000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
+    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUnionInFrom">
-        <Resource name="sql">
-            <![CDATA[select x0, x1 from (
-  select 'a' as x0, 'a' as x1, 'a' as x2 from emp
-  union all
-  select 'bb' as x0, 'bb' as x1, 'bb' as x2 from dept)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(X0=[$0], X1=[$1])
-  LogicalUnion(all=[true])
-    LogicalProject(X0=['a'], X1=['a'], X2=['a'])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(X0=['bb'], X1=['bb'], X2=['bb'])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableFunctionHopWithParamNames">
+    <Resource name="sql">
+      <![CDATA[select *
+from table(
+hop(
+  DATA => table Shipments,
+  TIMECOL => descriptor(rowtime),
+  SLIDE => INTERVAL '1' MINUTE,
+  SIZE => INTERVAL '2' MINUTE))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
+  LogicalTableFunctionScan(invocation=[HOP(DESCRIPTOR($1), 60000:INTERVAL MINUTE, 120000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
+    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWhereInCorrelated">
-        <Resource name="sql">
-            <![CDATA[select empno from emp as e
-join dept as d using (deptno)
-where e.sal in (
-  select e2.sal from emp as e2 where e2.deptno > e.deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[IN($5, {
-LogicalProject(SAL=[$5])
-  LogicalFilter(condition=[>($7, $cor0.DEPTNO)])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})], variablesSet=[[$cor0]])
-    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableFunctionHopWithParamReordered">
+    <Resource name="sql">
+      <![CDATA[select *
+from table(
+hop(
+  DATA => table Shipments,
+  SLIDE => INTERVAL '1' MINUTE,
+  TIMECOL => descriptor(rowtime),
+  SIZE => INTERVAL '2' MINUTE))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
+  LogicalTableFunctionScan(invocation=[HOP(DESCRIPTOR($1), 60000:INTERVAL MINUTE, 120000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
+    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testLateralDecorrelateRex">
-        <Resource name="sql">
-            <![CDATA[select * from emp,
- LATERAL (select * from dept where emp.deptno=dept.deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[=($7, $11)], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO2=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableFunctionHopWithSubQueryParam">
+    <Resource name="sql">
+      <![CDATA[select *
+from table(hop((select * from Shipments), descriptor(rowtime), INTERVAL '1' MINUTE, INTERVAL '2' MINUTE))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
+  LogicalTableFunctionScan(invocation=[HOP(DESCRIPTOR($1), 60000:INTERVAL MINUTE, 120000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
+    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testLateralDecorrelateThetaRex">
-        <Resource name="sql">
-            <![CDATA[select * from emp,
- LATERAL (select * from dept where emp.deptno < dept.deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-  LogicalJoin(condition=[=($7, $11)], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO0=[$2])
-      LogicalJoin(condition=[<($2, $0)], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalAggregate(group=[{0}])
-          LogicalProject(DEPTNO=[$7])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableFunctionSession">
+    <Resource name="sql">
+      <![CDATA[select *
+from table(session(table Shipments, descriptor(rowtime), descriptor(orderId), INTERVAL '10' MINUTE))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
+  LogicalTableFunctionScan(invocation=[SESSION(DESCRIPTOR($1), DESCRIPTOR($0), 600000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
+    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExistsCorrelatedDecorrelateRex">
-        <Resource name="sql">
-            <![CDATA[select*from emp where exists (
-  select 1 from dept where emp.deptno=dept.deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[EXISTS({
-LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-})], variablesSet=[[$cor0]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableFunctionSessionCompoundSessionKey">
+    <Resource name="sql">
+      <![CDATA[select *
+from table(session(table Orders, descriptor(rowtime), descriptor(orderId, productId), INTERVAL '10' MINUTE))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2], window_start=[$3], window_end=[$4])
+  LogicalTableFunctionScan(invocation=[SESSION(DESCRIPTOR($0), DESCRIPTOR($2, $1), 600000:INTERVAL MINUTE)], rowType=[RecordType(TIMESTAMP(0) ROWTIME, INTEGER PRODUCTID, INTEGER ORDERID, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
+    LogicalProject(ROWTIME=[$0], PRODUCTID=[$1], ORDERID=[$2])
+      LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNestedCorrelationsDecorrelatedRex">
-        <Resource name="sql">
-            <![CDATA[select *
-from (select 2+deptno d2, 3+deptno d3 from emp) e
- where exists (select 1 from (select deptno+1 d1 from dept) d
- where d1=e.d2 and exists (select 2 from (select deptno+4 d4, deptno+5 d5, deptno+6 d6 from dept)
- where d4=d.d1 and d5=d.d1 and d6=e.d3))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(D2=[$0], D3=[$1])
-  LogicalProject(D2=[$0], D3=[$1], D1=[CAST($2):INTEGER], D6=[$3], $f2=[CAST($4):BOOLEAN])
-    LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[inner])
-      LogicalProject(D2=[+(2, $7)], D3=[+(3, $7)])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{0, 1}], agg#0=[MIN($2)])
-        LogicalProject(D1=[$0], D6=[$2], $f0=[true])
-          LogicalFilter(condition=[IS NOT NULL($1)])
-            LogicalProject(D1=[$0], $f0=[$3], D6=[$2])
-              LogicalJoin(condition=[=($0, $1)], joinType=[left])
-                LogicalProject(D1=[+($0, 1)])
-                  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-                LogicalAggregate(group=[{0, 1}], agg#0=[MIN($2)])
-                  LogicalProject(D4=[$0], D6=[$2], $f0=[true])
-                    LogicalFilter(condition=[=($1, $0)])
-                      LogicalProject(D4=[+($0, 4)], D5=[+($0, 5)], D6=[+($0, 6)])
-                        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableFunctionSessionWithParamNames">
+    <Resource name="sql">
+      <![CDATA[select *
+from table(
+session(
+  DATA => table Shipments,
+  TIMECOL => descriptor(rowtime),
+  KEY => descriptor(orderId),
+  SIZE => INTERVAL '10' MINUTE))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
+  LogicalTableFunctionScan(invocation=[SESSION(DESCRIPTOR($1), DESCRIPTOR($0), 600000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
+    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinUnnestRex">
-        <Resource name="sql">
-            <![CDATA[select*from dept as d, unnest(multiset[d.deptno * 2])]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], EXPR$0=[$2])
-  LogicalProject(DEPTNO=[$0], NAME=[$1], EXPR$0=[$3])
-    LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{2}])
-      LogicalProject(DEPTNO=[$0], NAME=[$1], $f2=[*($0, 2)])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      Uncollect
-        LogicalProject(EXPR$0=[$SLICE($0)])
-          Collect(field=[EXPR$0])
-            LogicalUnion(all=[true])
-              LogicalProject(EXPR$0=[$cor0.$f2])
-                LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableFunctionSessionWithParamReordered">
+    <Resource name="sql">
+      <![CDATA[select *
+from table(
+session(
+  DATA => table Shipments,
+  KEY => descriptor(orderId),
+  TIMECOL => descriptor(rowtime),
+  SIZE => INTERVAL '10' MINUTE))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
+  LogicalTableFunctionScan(invocation=[SESSION(DESCRIPTOR($1), DESCRIPTOR($0), 600000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
+    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCorrelationScalarAggAndFilterRex">
-        <Resource name="sql">
-            <![CDATA[SELECT e1.empno
-FROM emp e1, dept d1 where e1.deptno = d1.deptno
-and e1.deptno < 10 and d1.deptno < 15
-and e1.sal > (select avg(sal) from emp e2 where e1.empno = e2.empno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[AND(=($7, $9), <($7, 10), <($9, 15), >($5, $SCALAR_QUERY({
-LogicalAggregate(group=[{}], EXPR$0=[AVG($0)])
-  LogicalProject(SAL=[$5])
-    LogicalFilter(condition=[=($cor0.EMPNO, $0)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})))], variablesSet=[[$cor0]])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableFunctionSessionWithSubQueryParam">
+    <Resource name="sql">
+      <![CDATA[select *
+from table(session((select * from Shipments), descriptor(rowtime), descriptor(orderId), INTERVAL '10' MINUTE))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
+  LogicalTableFunctionScan(invocation=[SESSION(DESCRIPTOR($1), DESCRIPTOR($0), 600000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
+    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testExistsCorrelatedLimitDecorrelateRex">
-        <Resource name="sql">
-            <![CDATA[select*from emp where exists (
-  select 1 from dept where emp.deptno=dept.deptno limit 1)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[EXISTS({
-LogicalSort(fetch=[1])
-  LogicalProject(EXPR$0=[1])
-    LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-})], variablesSet=[[$cor0]])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableFunctionTumble">
+    <Resource name="sql">
+      <![CDATA[select *
+from table(tumble(table Shipments, descriptor(rowtime), INTERVAL '1' MINUTE))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
+  LogicalTableFunctionScan(invocation=[TUMBLE(DESCRIPTOR($1), 60000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
+    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUnnestSelectRex">
-        <Resource name="sql">
-            <![CDATA[select*from unnest(select multiset[deptno] from dept)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[$0])
-  Uncollect
-    LogicalProject(EXPR$0=[$SLICE($2)])
-      LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        Collect(field=[EXPR$0])
-          LogicalUnion(all=[true])
-            LogicalProject(EXPR$0=[$cor0.DEPTNO])
-              LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableFunctionTumbleWithInnerJoin">
+    <Resource name="sql">
+      <![CDATA[select *
+from table(tumble(table Shipments, descriptor(rowtime), INTERVAL '1' MINUTE)) a
+join table(tumble(table Shipments, descriptor(rowtime), INTERVAL '1' MINUTE)) b
+on a.orderid = b.orderid]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3], ORDERID0=[$4], ROWTIME0=[$5], window_start0=[$6], window_end0=[$7])
+  LogicalJoin(condition=[=($0, $4)], joinType=[inner])
+    LogicalTableFunctionScan(invocation=[TUMBLE(DESCRIPTOR($1), 60000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
+      LogicalProject(ORDERID=[$0], ROWTIME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
+    LogicalTableFunctionScan(invocation=[TUMBLE(DESCRIPTOR($1), 60000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
+      LogicalProject(ORDERID=[$0], ROWTIME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCorrelationExistsAndFilterRex">
-        <Resource name="sql">
-            <![CDATA[SELECT e1.empno
-FROM emp e1, dept d1 where e1.deptno = d1.deptno
-and e1.deptno < 10 and d1.deptno < 15
-and exists (select * from emp e2 where e1.empno = e2.empno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], EMPNO0=[CAST($11):INTEGER], $f1=[CAST($12):BOOLEAN])
-    LogicalJoin(condition=[=($0, $11)], joinType=[inner])
-      LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-        LogicalFilter(condition=[<($7, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalFilter(condition=[<($0, 15)])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-        LogicalProject(EMPNO=[$0], $f0=[true])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableFunctionTumbleWithOffset">
+    <Resource name="sql">
+      <![CDATA[select *
+from table(tumble(table Shipments, descriptor(rowtime),
+  INTERVAL '10' MINUTE, INTERVAL '1' MINUTE))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
+  LogicalTableFunctionScan(invocation=[TUMBLE(DESCRIPTOR($1), 600000:INTERVAL MINUTE, 60000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
+    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCorrelationExistsAndFilterThetaRex">
-        <Resource name="sql">
-            <![CDATA[SELECT e1.empno
-FROM emp e1, dept d1 where e1.deptno = d1.deptno
-and e1.deptno < 10 and d1.deptno < 15
-and exists (select * from emp e2 where e1.empno < e2.empno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10], EMPNO0=[CAST($11):INTEGER], $f1=[CAST($12):BOOLEAN])
-    LogicalJoin(condition=[=($0, $11)], joinType=[inner])
-      LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-        LogicalFilter(condition=[<($7, 10)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalFilter(condition=[<($0, 15)])
-          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-        LogicalProject(EMPNO0=[$9], $f0=[true])
-          LogicalJoin(condition=[<($9, $0)], joinType=[inner])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-            LogicalAggregate(group=[{0}])
-              LogicalProject(EMPNO=[$0])
-                LogicalJoin(condition=[=($7, $9)], joinType=[inner])
-                  LogicalFilter(condition=[<($7, 10)])
-                    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-                  LogicalFilter(condition=[<($0, 15)])
-                    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableFunctionTumbleWithParamNames">
+    <Resource name="sql">
+      <![CDATA[select *
+from table(
+tumble(
+  DATA => table Shipments,
+  TIMECOL => descriptor(rowtime),
+  SIZE => INTERVAL '1' MINUTE))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
+  LogicalTableFunctionScan(invocation=[TUMBLE(DESCRIPTOR($1), 60000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
+    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCorrelationJoinRex">
-        <Resource name="sql">
-            <![CDATA[select *,
-  multiset(select * from emp where deptno=dept.deptno) as empset
-from dept]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], NAME=[$1], EMPSET=[$2])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    Collect(field=[EXPR$0])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalFilter(condition=[=($7, $cor0.DEPTNO)])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableFunctionTumbleWithParamReordered">
+    <Resource name="sql">
+      <![CDATA[select *
+from table(
+tumble(
+  DATA => table Shipments,
+  SIZE => INTERVAL '1' MINUTE,
+  TIMECOL => descriptor(rowtime)))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
+  LogicalTableFunctionScan(invocation=[TUMBLE(DESCRIPTOR($1), 60000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
+    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableFunctionTumbleWithSubQueryParam">
+    <Resource name="sql">
+      <![CDATA[select *
+from table(tumble((select * from Shipments), descriptor(rowtime), INTERVAL '1' MINUTE))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ORDERID=[$0], ROWTIME=[$1], window_start=[$2], window_end=[$3])
+  LogicalTableFunctionScan(invocation=[TUMBLE(DESCRIPTOR($1), 60000:INTERVAL MINUTE)], rowType=[RecordType(INTEGER ORDERID, TIMESTAMP(0) ROWTIME, TIMESTAMP(3) window_start, TIMESTAMP(3) window_end)])
+    LogicalProject(ORDERID=[$0], ROWTIME=[$1])
+      LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testTableSubset">
+    <Resource name="sql">
+      <![CDATA[select deptno, name from dept]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testTrimExceptAll">
+    <Resource name="sql">
+      <![CDATA[select deptno from
+(select ename, deptno from emp
+except all
+select name, deptno from dept)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$1])
+  LogicalMinus(all=[true])
+    LogicalProject(ENAME=[$1], DEPTNO=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(NAME=[$1], DEPTNO=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testTrimExceptDistinct">
+    <Resource name="sql">
+      <![CDATA[select deptno from
+(select ename, deptno from emp
+except
+select name, deptno from dept)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$1])
+  LogicalMinus(all=[false])
+    LogicalProject(ENAME=[$1], DEPTNO=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(NAME=[$1], DEPTNO=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testTrimIntersectAll">
+    <Resource name="sql">
+      <![CDATA[select deptno from
+(select ename, deptno from emp
+intersect all
+select name, deptno from dept)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$1])
+  LogicalIntersect(all=[true])
+    LogicalProject(ENAME=[$1], DEPTNO=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(NAME=[$1], DEPTNO=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testMultisetOfColumnsRex">
-        <Resource name="sql">
-            <![CDATA[select 'abc',multiset[deptno,sal] from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=['abc'], EXPR$1=[$SLICE($9)])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{5, 7}])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTrimIntersectDistinct">
+    <Resource name="sql">
+      <![CDATA[select deptno from
+(select ename, deptno from emp
+intersect
+select name, deptno from dept)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$1])
+  LogicalIntersect(all=[false])
+    LogicalProject(ENAME=[$1], DEPTNO=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(NAME=[$1], DEPTNO=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testTrimUnionAll">
+    <Resource name="sql">
+      <![CDATA[select deptno from
+(select ename, deptno from emp
+union all
+select name, deptno from dept)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalProject(DEPTNO=[$7])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    Collect(field=[EXPR$0])
-      LogicalUnion(all=[true])
-        LogicalProject(EXPR$0=[$cor0.DEPTNO])
-          LogicalValues(tuples=[[{ 0 }]])
-        LogicalProject(EXPR$0=[$cor0.SAL])
-          LogicalValues(tuples=[[{ 0 }]])
+  LogicalProject(DEPTNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testNotExistsCorrelated">
-        <Resource name="sql">
-            <![CDATA[select * from emp where not exists (
-  select 1 from dept where emp.deptno=dept.deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  LogicalFilter(condition=[NOT(IS NOT NULL($9))])
-    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTrimUnionDistinct">
+    <Resource name="sql">
+      <![CDATA[select deptno from
+(select ename, deptno from emp
+union
+select name, deptno from dept)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$1])
+  LogicalUnion(all=[false])
+    LogicalProject(ENAME=[$1], DEPTNO=[$7])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalFilter(condition=[=($cor0.DEPTNO, $0)])
-            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectFromDynamicTable">
-        <Resource name="sql">
-            <![CDATA[select n_nationkey, n_name from SALES.NATION]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(N_NATIONKEY=[$0], N_NAME=[$1])
-  LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+    LogicalProject(NAME=[$1], DEPTNO=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectStarFromDynamicTable">
-        <Resource name="sql">
-            <![CDATA[select * from SALES.NATION]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(**=[$0])
-  LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTumble">
+    <Resource name="sql">
+      <![CDATA[select STREAM
+  TUMBLE_START(rowtime, INTERVAL '1' MINUTE) AS s,
+  TUMBLE_END(rowtime, INTERVAL '1' MINUTE) AS e
+from Shipments
+GROUP BY TUMBLE(rowtime, INTERVAL '1' MINUTE)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalDelta
+  LogicalProject(S=[$0], E=[+($0, 60000:INTERVAL MINUTE)])
+    LogicalAggregate(group=[{0}])
+      LogicalProject($f0=[$TUMBLE($1, 60000:INTERVAL MINUTE)])
+        LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReferDynamicStarInSelectOB">
-        <Resource name="sql">
-            <![CDATA[select n_nationkey, n_name
-from (select * from SALES.NATION)
-order by n_regionkey]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(N_NATIONKEY=[$0], N_NAME=[$1])
-  LogicalSort(sort0=[$2], dir0=[ASC])
-    LogicalProject(N_NATIONKEY=[ITEM($0, 'N_NATIONKEY')], N_NAME=[ITEM($0, 'N_NAME')], EXPR$2=[ITEM($0, 'N_REGIONKEY')])
-      LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTumbleTable">
+    <Resource name="sql">
+      <![CDATA[select stream tumble_end(rowtime, interval '2' hour) as rowtime, productId
+from orders
+group by tumble(rowtime, interval '2' hour), productId]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalDelta
+  LogicalProject(ROWTIME=[+($0, 7200000:INTERVAL HOUR)], PRODUCTID=[$1])
+    LogicalAggregate(group=[{0, 1}])
+      LogicalProject($f0=[$TUMBLE($0, 7200000:INTERVAL HOUR)], PRODUCTID=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, ORDERS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDynamicStarInTableJoin">
-        <Resource name="sql">
-            <![CDATA[select * from  (select * from SALES.NATION) T1,  (SELECT * from SALES.CUSTOMER) T2  where T1.n_nationkey = T2.c_nationkey]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(**=[$0], **0=[$1])
-  LogicalFilter(condition=[=(ITEM($0, 'N_NATIONKEY'), ITEM($1, 'C_NATIONKEY'))])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalProject(**=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, NATION]])
-      LogicalProject(**=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testTumbleTableRowtimeNotFirstColumn">
+    <Resource name="sql">
+      <![CDATA[select stream
+   tumble_end(rowtime, interval '2' hour) as rowtime, orderId
+from shipments
+group by tumble(rowtime, interval '2' hour), orderId]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalDelta
+  LogicalProject(ROWTIME=[+($0, 7200000:INTERVAL HOUR)], ORDERID=[$1])
+    LogicalAggregate(group=[{0, 1}])
+      LogicalProject($f0=[$TUMBLE($1, 7200000:INTERVAL HOUR)], ORDERID=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, SHIPMENTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testReferDynamicStarInSelectWhereGB">
-        <Resource name="sql">
-            <![CDATA[select n_regionkey, count(*) as cnt from (select * from SALES.NATION) where n_nationkey > 5 group by n_regionkey]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}], CNT=[COUNT()])
-  LogicalProject(N_REGIONKEY=[ITEM($0, 'N_REGIONKEY')])
-    LogicalFilter(condition=[>(ITEM($0, 'N_NATIONKEY'), 5)])
-      LogicalProject(**=[$0])
-        LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUdfWithStructuredReturnType">
+    <Resource name="sql">
+      <![CDATA[SELECT deptno, tmp.r.f0, tmp.r.f1 FROM
+(SELECT deptno, STRUCTURED_FUNC() AS r from dept)tmp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], F0=[STRUCTURED_FUNC().F0], F1=[STRUCTURED_FUNC().F1])
+  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDynamicStarInJoinAndSubQ">
-        <Resource name="sql">
-            <![CDATA[select * from  (select * from SALES.NATION T1,  SALES.CUSTOMER T2 where T1.n_nationkey = T2.c_nationkey)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(**=[$1], **0=[$3])
-  LogicalFilter(condition=[=($0, $2)])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, NATION]])
-      LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUncorrelatedScalarSubQueryInAggregateRex">
+    <Resource name="sql">
+      <![CDATA[select sum((select min(deptno) from emp)) as s
+from emp
+group by deptno
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testStarJoinStaticDynTable">
-        <Resource name="sql">
-            <![CDATA[select * from SALES.NATION N, SALES.REGION as R where N.n_regionkey = R.r_regionkey]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(**=[$1], R_REGIONKEY=[$2], R_NAME=[$3], R_COMMENT=[$4])
-  LogicalFilter(condition=[=($0, $2)])
-    LogicalJoin(condition=[true], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, NATION]])
-      LogicalTableScan(table=[[CATALOG, SALES, REGION]])
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(S=[$1])
+  LogicalAggregate(group=[{0}], S=[SUM($1)])
+    LogicalProject(DEPTNO=[$7], $f1=[$SCALAR_QUERY({
+LogicalAggregate(group=[{}], EXPR$0=[MIN($0)])
+  LogicalProject(DEPTNO=[$7])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+})])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGrpByColFromStarInSubQuery">
-        <Resource name="sql">
-            <![CDATA[SELECT n.n_nationkey AS col  from (SELECT * FROM SALES.NATION) as n  group by n.n_nationkey]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}])
-  LogicalProject(COL=[ITEM($0, 'N_NATIONKEY')])
-    LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUncorrelatedScalarSubQueryInGroupOrderRex">
+    <Resource name="sql">
+      <![CDATA[select sum(sal) as s
+from emp
+group by deptno
+order by (select case when true then deptno else null end from emp) desc,
+  count(*)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(S=[$0])
+  LogicalSort(sort0=[$1], sort1=[$2], dir0=[DESC], dir1=[ASC])
+    LogicalProject(S=[$1], EXPR$1=[$SCALAR_QUERY({
+LogicalProject(EXPR$0=[CAST($7):INTEGER])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+})], EXPR$2=[$2])
+      LogicalAggregate(group=[{0}], S=[SUM($1)], agg#1=[COUNT()])
+        LogicalProject(DEPTNO=[$7], SAL=[$5])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testDynStarInExistSubQ">
-        <Resource name="sql">
-            <![CDATA[select *
-from SALES.REGION where exists (select * from SALES.NATION)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(R_REGIONKEY=[$0], R_NAME=[$1], R_COMMENT=[$2])
-  LogicalFilter(condition=[IS NOT NULL($3)])
-    LogicalJoin(condition=[true], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, REGION]])
-      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-        LogicalProject($f0=[true])
-          LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUncorrelatedScalarSubQueryInOrderRex">
+    <Resource name="sql">
+      <![CDATA[select ename
+from emp
+order by (select case when true then deptno else null end from emp) desc,
+  ename]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(ENAME=[$0])
+  LogicalSort(sort0=[$1], sort1=[$0], dir0=[DESC], dir1=[ASC])
+    LogicalProject(ENAME=[$1], EXPR$1=[$SCALAR_QUERY({
+LogicalProject(EXPR$0=[CAST($7):INTEGER])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+})])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSelectDynamicStarOrderBy">
-        <Resource name="sql">
-            <![CDATA[SELECT * from SALES.NATION order by n_nationkey]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(**=[$0])
-  LogicalSort(sort0=[$1], dir0=[ASC])
-    LogicalProject(**=[$0], EXPR$1=[ITEM($0, 'N_NATIONKEY')])
-      LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUnion">
+    <Resource name="plan">
+      <![CDATA[
+LogicalUnion(all=[false])
+  LogicalProject(EMPNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(DEPTNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testInToSemiJoin">
-        <Resource name="sql">
-            <![CDATA[SELECT empno
-FROM emp AS e
-WHERE cast(e.empno as bigint) in (130, 131, 132, 133, 134)]]>
-        </Resource>
-        <Resource name="planNotConverted">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalFilter(condition=[OR(=(CAST($0):BIGINT NOT NULL, 130), =(CAST($0):BIGINT NOT NULL, 131), =(CAST($0):BIGINT NOT NULL, 132), =(CAST($0):BIGINT NOT NULL, 133), =(CAST($0):BIGINT NOT NULL, 134))])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select empno from emp union select deptno from dept]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testUnionAll">
+    <Resource name="plan">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalProject(EMPNO=[$0])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(DEPTNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-        <Resource name="planConverted">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalJoin(condition=[=($9, $10)], joinType=[inner])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EMPNO0=[CAST($0):BIGINT NOT NULL])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select empno from emp union all select deptno from dept]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testUnionInFrom">
+    <Resource name="sql">
+      <![CDATA[select x0, x1 from (
+  select 'a' as x0, 'a' as x1, 'a' as x2 from emp
+  union all
+  select 'bb' as x0, 'bb' as x1, 'bb' as x2 from dept)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(X0=[$0], X1=[$1])
+  LogicalUnion(all=[true])
+    LogicalProject(X0=['a'], X1=['a'], X2=['a'])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalAggregate(group=[{0}])
-      LogicalValues(tuples=[[{ 130 }, { 131 }, { 132 }, { 133 }, { 134 }]])
+    LogicalProject(X0=['bb'], X1=['bb'], X2=['bb'])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUserDefinedOrderByOver">
-        <Resource name="sql">
-            <![CDATA[select deptno,
-  rank() over(partition by empno order by deptno)
-from emp
-order by row_number() over(partition by empno order by deptno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], EXPR$1=[$1])
-  LogicalSort(sort0=[$2], dir0=[ASC-nulls-first])
-    LogicalProject(DEPTNO=[$7], EXPR$1=[RANK() OVER (PARTITION BY $0 ORDER BY $7 NULLS FIRST)], EXPR$2=[ROW_NUMBER() OVER (PARTITION BY $0 ORDER BY $7 NULLS FIRST)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUnionSubQuery">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$7])
+  LogicalJoin(condition=[true], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalUnion(all=[true])
+      LogicalUnion(all=[true])
+        LogicalProject(EMPNO=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(DEPTNO=[$0])
+          LogicalFilter(condition=[>($0, 20)])
+            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalValues(tuples=[[{ 45 }, { 67 }]])
+]]>
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select deptno from emp as emp0 cross join
+ (select empno from emp union all
+  select deptno from dept where deptno > 20 union all
+  values (45), (67))]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testUnionValues">
+    <Resource name="plan">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalUnion(all=[true])
+    LogicalValues(tuples=[[{ 10 }, { 20 }]])
+    LogicalProject(EXPR$0=[34])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalUnion(all=[true])
+    LogicalValues(tuples=[[{ 30 }]])
+    LogicalProject(EXPR$0=[+(45, 10)])
+      LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWindowOnDynamicStar">
-        <Resource name="sql">
-            <![CDATA[SELECT SUM(n_nationkey) OVER w
-FROM (SELECT * FROM SALES.NATION) subQry
-WINDOW w AS (PARTITION BY REGION ORDER BY n_nationkey)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[CASE(>(COUNT(ITEM($0, 'N_NATIONKEY')) OVER (PARTITION BY ITEM($0, 'REGION') ORDER BY ITEM($0, 'N_NATIONKEY')), 0), $SUM0(ITEM($0, 'N_NATIONKEY')) OVER (PARTITION BY ITEM($0, 'REGION') ORDER BY ITEM($0, 'N_NATIONKEY')), null:ANY)])
-  LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[values (10), (20)
+union all
+select 34 from emp
+union all values (30), (45 + 10)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testUnnest">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[$0])
+  Uncollect
+    LogicalProject(EXPR$0=[$SLICE($0)])
+      Collect(field=[EXPR$0])
+        LogicalValues(tuples=[[{ 1 }, { 2 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWindowAndGroupByWithDynamicStar">
-        <Resource name="sql">
-            <![CDATA[SELECT
-n_regionkey,
-MAX(MIN(n_nationkey)) OVER (PARTITION BY n_regionkey)
-FROM (SELECT * FROM SALES.NATION)
-GROUP BY n_regionkey]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(N_REGIONKEY=[$0], EXPR$1=[MAX($1) OVER (PARTITION BY $0)])
-  LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-    LogicalProject(N_REGIONKEY=[ITEM($0, 'N_REGIONKEY')], $f1=[ITEM($0, 'N_NATIONKEY')])
-      LogicalTableScan(table=[[CATALOG, SALES, NATION]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select*from unnest(multiset[1,2])]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testUnnestArray">
+    <Resource name="sql">
+      <![CDATA[select*from unnest(array(select*from dept))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1])
+  Uncollect
+    Collect(field=[EXPR$0])
+      LogicalProject(DEPTNO=[$0], NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWithExists">
-        <Resource name="sql">
-            <![CDATA[with t (a, b) as (select * from (values (1, 2)))
-select * from t where exists (
-  select 1 from emp where deptno = t.a)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(A=[$0], B=[$1])
-  LogicalProject(EXPR$0=[$0], EXPR$1=[$1], $f0=[$2])
-    LogicalFilter(condition=[IS NOT NULL($2)])
-      LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0}])
-        LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
-          LogicalValues(tuples=[[{ 1, 2 }]])
-        LogicalAggregate(group=[{}], agg#0=[MIN($0)])
-          LogicalProject($f0=[true])
-            LogicalFilter(condition=[=($7, $cor0.A)])
-              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUnnestArrayAggPlan">
+    <Resource name="sql">
+      <![CDATA[select d.deptno, e2.empno_avg
+from dept_nested as d outer apply
+ (select avg(e.empno) as empno_avg from UNNEST(d.employees) as e) e2]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EMPNO_AVG=[$7])
+  LogicalProject(DEPTNO=[$0], NAME=[$1], TYPE=[$2], DESC=[$3], A=[$4], B=[$5], EMPLOYEES=[$6], EMPNO_AVG=[$7])
+    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{6}])
+      LogicalProject(DEPTNO=[$0], NAME=[$1], TYPE=[$2.TYPE], DESC=[$2.DESC], A=[$2.OTHERS.A], B=[$2.OTHERS.B], EMPLOYEES=[$3])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
+      LogicalAggregate(group=[{}], EMPNO_AVG=[AVG($0)])
+        LogicalProject(EMPNO=[$0])
+          Uncollect
+            LogicalProject(EMPLOYEES=[$cor0.EMPLOYEES])
+              LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testStarDynamicSchemaUnnest">
-        <Resource name="sql">
-            <![CDATA[select *
-from SALES.CUSTOMER as t1,
-lateral (select t2."$unnest" as fake_col3
-         from unnest(t1.fake_col) as t2) as t3]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(**=[$1], FAKE_COL3=[$2])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
-    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
-    LogicalProject(FAKE_COL3=[$0])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUnnestArrayPlan">
+    <Resource name="sql">
+      <![CDATA[select d.deptno, e2.empno
+from dept_nested as d,
+ UNNEST(d.employees) e2]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EMPNO=[$7])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{6}])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], TYPE=[$2.TYPE], DESC=[$2.DESC], A=[$2.OTHERS.A], B=[$2.OTHERS.B], EMPLOYEES=[$3])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
+    Uncollect
+      LogicalProject(EMPLOYEES=[$cor0.EMPLOYEES])
+        LogicalValues(tuples=[[{ 0 }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testUnnestArrayPlanAs">
+    <Resource name="sql">
+      <![CDATA[select d.deptno, e2.empno
+from dept_nested as d,
+ UNNEST(d.employees) as e2(empno, y, z)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EMPNO=[$7])
+  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{6}])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], TYPE=[$2.TYPE], DESC=[$2.DESC], A=[$2.OTHERS.A], B=[$2.OTHERS.B], EMPLOYEES=[$3])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT_NESTED]])
+    LogicalProject(EMPNO=[$0], Y=[$1], Z=[$2])
       Uncollect
-        LogicalProject(FAKE_COL=[$cor0.FAKE_COL])
+        LogicalProject(EMPLOYEES=[$cor0.EMPLOYEES])
           LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testStarDynamicSchemaUnnest2">
-        <Resource name="sql">
-            <![CDATA[select *
-from SALES.CUSTOMER as t1,
-unnest(t1.fake_col) as t2]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(**=[$1], $unnest=[$2])
-  LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
-    LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
-    Uncollect
-      LogicalProject(FAKE_COL=[$cor0.FAKE_COL])
-        LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUnnestSelect">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[$0])
+  Uncollect
+    LogicalProject(EXPR$0=[$SLICE($2)])
+      LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        Collect(field=[EXPR$0])
+          LogicalUnion(all=[true])
+            LogicalProject(EXPR$0=[$cor0.DEPTNO])
+              LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testStarDynamicSchemaUnnestNestedSubQuery">
-        <Resource name="sql">
-            <![CDATA[select t2.c1
-from (select * from SALES.CUSTOMER) as t1,
-unnest(t1.fake_col) as t2(c1)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(C1=[$1])
-  LogicalProject(**=[$0], C1=[$2])
-    LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{1}])
-      LogicalProject(**=[$0], $f1=[ITEM($0, 'FAKE_COL')])
-        LogicalTableScan(table=[[CATALOG, SALES, CUSTOMER]])
-      LogicalProject(C1=[$0])
-        Uncollect
-          LogicalProject(EXPR$0=[$cor0.$f1])
-            LogicalValues(tuples=[[{ 0 }]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select*from unnest(select multiset[deptno] from dept)]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testUnnestSelectRex">
+    <Resource name="sql">
+      <![CDATA[select*from unnest(select multiset[deptno] from dept)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[$0])
+  Uncollect
+    LogicalProject(EXPR$0=[$SLICE($2)])
+      LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{0}])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        Collect(field=[EXPR$0])
+          LogicalUnion(all=[true])
+            LogicalProject(EXPR$0=[$cor0.DEPTNO])
+              LogicalValues(tuples=[[{ 0 }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSomeAndEveryAggregateFunctions">
-        <Resource name="sql">
-            <![CDATA[SELECT some(empno = 130) as someempnoexists,
- every(empno > 0) as everyempnogtzero
- FROM emp AS e group by e.sal]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(SOMEEMPNOEXISTS=[$1], EVERYEMPNOGTZERO=[$2])
-  LogicalAggregate(group=[{0}], SOMEEMPNOEXISTS=[SOME($1)], EVERYEMPNOGTZERO=[EVERY($2)])
-    LogicalProject(SAL=[$5], $f1=[=($0, 130)], $f2=[>($0, 0)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUnnestSubQuery">
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1])
+  Uncollect
+    Collect(field=[EXPR$0])
+      LogicalProject(DEPTNO=[$0], NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAnyValueAggregateFunctionNoGroupBy">
-        <Resource name="sql">
-            <![CDATA[SELECT any_value(empno) as anyempno FROM emp AS e]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{}], ANYEMPNO=[ANY_VALUE($0)])
-  LogicalProject(EMPNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="sql">
+      <![CDATA[select*from unnest(multiset(select*from dept))]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testUnnestWithOrdinality">
+    <Resource name="sql">
+      <![CDATA[select*from unnest(array(select*from dept)) with ordinality]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], NAME=[$1], ORDINALITY=[$2])
+  Uncollect(withOrdinality=[true])
+    Collect(field=[EXPR$0])
+      LogicalProject(DEPTNO=[$0], NAME=[$1])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAnyValueAggregateFunctionGroupBy">
-        <Resource name="sql">
-            <![CDATA[SELECT any_value(empno) as anyempno FROM emp AS e group by e.sal]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(ANYEMPNO=[$1])
-  LogicalAggregate(group=[{0}], ANYEMPNO=[ANY_VALUE($1)])
-    LogicalProject(SAL=[$5], EMPNO=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUnpivot">
+    <Resource name="sql">
+      <![CDATA[SELECT * FROM emp
+UNPIVOT INCLUDE NULLS (remuneration
+  FOR remuneration_type IN (comm AS 'commission',
+                            sal as 'salary'))]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], DEPTNO=[$7], SLACKER=[$8], REMUNERATION_TYPE=[$9], REMUNERATION=[CASE(=($9, 'commission'), $6, =($9, 'salary    '), $5, null:NULL)])
+  LogicalJoin(condition=[true], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalValues(tuples=[[{ 'commission' }, { 'salary    ' }]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJsonValueExpressionOperator">
-        <Resource name="sql">
-            <![CDATA[select ename format json,
-ename format json encoding utf8,
-ename format json encoding utf16,
-ename format json encoding utf32
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[FORMAT JSON($1)], EXPR$1=[FORMAT JSON($1)], EXPR$2=[FORMAT JSON($1)], EXPR$3=[FORMAT JSON($1)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdate">
+    <Resource name="sql">
+      <![CDATA[update emp set empno = empno + 1]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[EMPNO]], sourceExpressionList=[[+($0, 1)]], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[+($0, 1)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJsonExists">
-        <Resource name="sql">
-            <![CDATA[select json_exists(ename, 'lax $')
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[JSON_EXISTS($1, 'lax $')])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdateBind">
+    <Resource name="sql">
+      <![CDATA[update emp set sal = sal + ? where slacker = false]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[SAL]], sourceExpressionList=[[+($5, ?0)]], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[+($5, ?0)])
+    LogicalFilter(condition=[=($8, false)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJsonValue">
-        <Resource name="sql">
-            <![CDATA[select json_value(ename, 'lax $')
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[JSON_VALUE($1, 'lax $')])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdateBind2">
+    <Resource name="sql">
+      <![CDATA[update emp set sal = ? where slacker = false]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[SAL]], sourceExpressionList=[[?0]], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[?0])
+    LogicalFilter(condition=[=($8, false)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJsonQuery">
-        <Resource name="sql">
-            <![CDATA[select json_query(ename, 'lax $')
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[JSON_QUERY($1, 'lax $', FLAG(WITHOUT_ARRAY), FLAG(SqlJsonQueryEmptyOrErrorBehavior[NULL]), FLAG(SqlJsonQueryEmptyOrErrorBehavior[NULL]))])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdateExtendedColumn">
+    <Resource name="sql">
+      <![CDATA[update empdefaults(updated TIMESTAMP) set deptno = 1, updated = timestamp '2017-03-12 13:03:05', empno = 20, ename = 'Bob' where deptno = 10]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPDEFAULTS]], operation=[UPDATE], updateColumnList=[[DEPTNO, UPDATED, EMPNO, ENAME]], sourceExpressionList=[[1, 2017-03-12 13:03:05, 20, 'Bob']], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], UPDATED=[$9], EXPR$0=[1], EXPR$1=[2017-03-12 13:03:05], EXPR$2=[20], EXPR$3=['Bob'])
+    LogicalFilter(condition=[=($7, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMPDEFAULTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJsonType">
-        <Resource name="sql">
-            <![CDATA[select json_type(ename)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[JSON_TYPE($1)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdateExtendedColumnCaseSensitiveCollision">
+    <Resource name="sql">
+      <![CDATA[update empdefaults("slacker" INTEGER, deptno INTEGER) set deptno = 1, "slacker" = 100 where ename = 'Bob']]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPDEFAULTS]], operation=[UPDATE], updateColumnList=[[DEPTNO, slacker]], sourceExpressionList=[[1, 100]], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], slacker=[$9], EXPR$0=[1], EXPR$1=[100])
+    LogicalFilter(condition=[=($1, 'Bob')])
+      LogicalTableScan(table=[[CATALOG, SALES, EMPDEFAULTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJsonPretty">
-        <Resource name="sql">
-            <![CDATA[select json_pretty(ename)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[JSON_PRETTY($1)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdateExtendedColumnCollision">
+    <Resource name="sql">
+      <![CDATA[update empdefaults(empno INTEGER NOT NULL, deptno INTEGER) set deptno = 1, empno = 20, ename = 'Bob' where deptno = 10]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMPDEFAULTS]], operation=[UPDATE], updateColumnList=[[DEPTNO, EMPNO, ENAME]], sourceExpressionList=[[1, 20, 'Bob']], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[1], EXPR$1=[20], EXPR$2=['Bob'])
+    LogicalFilter(condition=[=($7, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMPDEFAULTS]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJsonDepth">
-        <Resource name="sql">
-            <![CDATA[select json_depth(ename)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[JSON_DEPTH($1)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdateExtendedColumnModifiableView">
+    <Resource name="sql">
+      <![CDATA[update EMP_MODIFIABLEVIEW2(updated TIMESTAMP)
+set updated = timestamp '2017-03-12 13:03:05', sal = sal + 5000
+where slacker = false]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]], operation=[UPDATE], updateColumnList=[[UPDATED, SAL]], sourceExpressionList=[[2017-03-12 13:03:05, +($5, 5000)]], flattened=[true])
+  LogicalProject(ENAME=[$0], EMPNO=[$1], JOB=[$2], DEPTNO=[$3], SLACKER=[$4], SAL=[$5], EXTRA=[$6], HIREDATE=[$7], MGR=[$8], COMM=[$9], UPDATED=[$10], EXPR$0=[2017-03-12 13:03:05], EXPR$1=[+($5, 5000)])
+    LogicalFilter(condition=[=($4, false)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJsonLength">
-        <Resource name="sql">
-            <![CDATA[select json_length(ename, 'strict $')
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[JSON_LENGTH($1, 'strict $')])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdateExtendedColumnModifiableViewCaseSensitiveCollision">
+    <Resource name="sql">
+      <![CDATA[update EMP_MODIFIABLEVIEW2("slacker" INTEGER, deptno INTEGER) set deptno = 20, "slacker" = 100 where ename = 'Bob']]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]], operation=[UPDATE], updateColumnList=[[DEPTNO, slacker]], sourceExpressionList=[[20, 100]], flattened=[true])
+  LogicalProject(ENAME=[$0], EMPNO=[$1], JOB=[$2], DEPTNO=[$3], SLACKER=[$4], SAL=[$5], EXTRA=[$6], HIREDATE=[$7], MGR=[$8], COMM=[$9], slacker=[$10], EXPR$0=[20], EXPR$1=[100])
+    LogicalFilter(condition=[=($0, 'Bob')])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJsonKeys">
-        <Resource name="sql">
-            <![CDATA[select json_keys(ename, 'strict $')
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[JSON_KEYS($1, 'strict $')])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdateExtendedColumnModifiableViewCollision">
+    <Resource name="sql">
+      <![CDATA[update EMP_MODIFIABLEVIEW3(empno INTEGER NOT NULL, deptno INTEGER) set deptno = 20, empno = 20, ename = 'Bob' where empno = 10]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW3]], operation=[UPDATE], updateColumnList=[[DEPTNO, EMPNO, ENAME]], sourceExpressionList=[[20, 20, 'Bob']], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], SLACKER=[$6], DEPTNO=[$7], EXPR$0=[20], EXPR$1=[20], EXPR$2=['Bob'])
+    LogicalFilter(condition=[=($0, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW3]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJsonArray">
-        <Resource name="sql">
-            <![CDATA[select json_array(ename, ename)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[JSON_ARRAY(FLAG(ABSENT_ON_NULL), $1, $1)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdateExtendedColumnModifiableViewExtendedCaseSensitiveCollision">
+    <Resource name="sql">
+      <![CDATA[update EMP_MODIFIABLEVIEW2("extra" INTEGER, extra BOOLEAN) set deptno = 20, "extra" = 100, extra = true where ename = 'Bob']]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]], operation=[UPDATE], updateColumnList=[[DEPTNO, extra, EXTRA]], sourceExpressionList=[[20, 100, true]], flattened=[true])
+  LogicalProject(ENAME=[$0], EMPNO=[$1], JOB=[$2], DEPTNO=[$3], SLACKER=[$4], SAL=[$5], EXTRA=[$6], HIREDATE=[$7], MGR=[$8], COMM=[$9], extra=[$10], EXPR$0=[20], EXPR$1=[100], EXPR$2=[true])
+    LogicalFilter(condition=[=($0, 'Bob')])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJsonArrayAgg1">
-        <Resource name="sql">
-            <![CDATA[select json_arrayagg(ename)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[JSON_ARRAYAGG_ABSENT_ON_NULL($0)])
-  LogicalProject(ENAME=[$1])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdateExtendedColumnModifiableViewExtendedCollision">
+    <Resource name="sql">
+      <![CDATA[update EMP_MODIFIABLEVIEW2("slacker" INTEGER, extra BOOLEAN) set deptno = 20, "slacker" = 100, extra = true where ename = 'Bob']]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]], operation=[UPDATE], updateColumnList=[[DEPTNO, slacker, EXTRA]], sourceExpressionList=[[20, 100, true]], flattened=[true])
+  LogicalProject(ENAME=[$0], EMPNO=[$1], JOB=[$2], DEPTNO=[$3], SLACKER=[$4], SAL=[$5], EXTRA=[$6], HIREDATE=[$7], MGR=[$8], COMM=[$9], slacker=[$10], EXPR$0=[20], EXPR$1=[100], EXPR$2=[true])
+    LogicalFilter(condition=[=($0, 'Bob')])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJsonArrayAgg2">
-        <Resource name="sql">
-            <![CDATA[select json_arrayagg(ename order by ename)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[JSON_ARRAYAGG_ABSENT_ON_NULL($0) WITHIN GROUP ([0])])
-  LogicalProject(ENAME=[$1])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdateExtendedColumnModifiableViewUnderlyingCollision">
+    <Resource name="sql">
+      <![CDATA[update EMP_MODIFIABLEVIEW3(extra BOOLEAN, comm INTEGER) set empno = 20, comm = 123, extra = true where ename = 'Bob']]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW3]], operation=[UPDATE], updateColumnList=[[EMPNO, COMM, EXTRA]], sourceExpressionList=[[20, 123, true]], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], SLACKER=[$6], EXTRA=[$7], COMM=[$8], EXPR$0=[20], EXPR$1=[123], EXPR$2=[true])
+    LogicalFilter(condition=[=($1, 'Bob')])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW3]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJsonArrayAgg3">
-        <Resource name="sql">
-            <![CDATA[select json_arrayagg(ename order by ename null on null)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[JSON_ARRAYAGG_NULL_ON_NULL($0) WITHIN GROUP ([0])])
-  LogicalProject(ENAME=[$1])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdateModifiableView">
+    <Resource name="sql">
+      <![CDATA[update EMP_MODIFIABLEVIEW2
+set sal = sal + 5000 where slacker = false]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]], operation=[UPDATE], updateColumnList=[[SAL]], sourceExpressionList=[[+($5, 5000)]], flattened=[true])
+  LogicalProject(ENAME=[$0], EMPNO=[$1], JOB=[$2], DEPTNO=[$3], SLACKER=[$4], SAL=[$5], EXTRA=[$6], HIREDATE=[$7], MGR=[$8], COMM=[$9], EXPR$0=[+($5, 5000)])
+    LogicalFilter(condition=[=($4, false)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP_MODIFIABLEVIEW2]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJsonArrayAgg4">
-        <Resource name="sql">
-            <![CDATA[select json_arrayagg(ename null on null) within group (order by ename)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[JSON_ARRAYAGG_NULL_ON_NULL($0) WITHIN GROUP ([0])])
-  LogicalProject(ENAME=[$1])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdateSubQuery">
+    <Resource name="sql">
+      <![CDATA[update emp
+set empno = (
+  select min(empno) from emp as e where e.deptno = emp.deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[EMPNO]], sourceExpressionList=[[$0]], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[$10])
+    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{0}], EXPR$0=[MIN($1)])
+        LogicalProject(DEPTNO=[$7], EMPNO=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJsonObject">
-        <Resource name="sql">
-            <![CDATA[select json_object(ename: deptno, ename: deptno)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[JSON_OBJECT(FLAG(NULL_ON_NULL), $1, $7, $1, $7)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdateSubQueryWithIn">
+    <Resource name="sql">
+      <![CDATA[update emp
+set empno = 1 where empno in (
+  select empno from emp where empno=2)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[EMPNO]], sourceExpressionList=[[1]], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[1])
+    LogicalJoin(condition=[=($0, $9)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{0}])
+        LogicalProject(EMPNO=[$0])
+          LogicalFilter(condition=[=($0, 2)])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJsonObjectAgg">
-        <Resource name="sql">
-            <![CDATA[select json_objectagg(ename: deptno)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[JSON_OBJECTAGG_NULL_ON_NULL($0, $1)])
-  LogicalProject(ENAME=[$1], DEPTNO=[$7])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdateSubQueryWithIn1">
+    <Resource name="sql">
+      <![CDATA[update emp
+set empno = 1 where emp.empno in (
+  select emp.empno from emp where emp.empno=2)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[EMPNO]], sourceExpressionList=[[1]], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[1])
+    LogicalJoin(condition=[=($0, $9)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalAggregate(group=[{0}])
+        LogicalProject(EMPNO=[$0])
+          LogicalFilter(condition=[=($0, 2)])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJsonPredicate">
-        <Resource name="sql">
-            <![CDATA[select
-ename is json,
-ename is json value,
-ename is json object,
-ename is json array,
-ename is json scalar,
-ename is not json,
-ename is not json value,
-ename is not json object,
-ename is not json array,
-ename is not json scalar
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[IS JSON VALUE($1)], EXPR$1=[IS JSON VALUE($1)], EXPR$2=[IS JSON OBJECT($1)], EXPR$3=[IS JSON ARRAY($1)], EXPR$4=[IS JSON SCALAR($1)], EXPR$5=[IS NOT JSON VALUE($1)], EXPR$6=[IS NOT JSON VALUE($1)], EXPR$7=[IS NOT JSON OBJECT($1)], EXPR$8=[IS NOT JSON ARRAY($1)], EXPR$9=[IS NOT JSON SCALAR($1)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdateSubQueryWithNotIn">
+    <Resource name="sql">
+      <![CDATA[update emp
+set empno = 1 where empno not in (
+  select empno from emp where empno=2)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[EMPNO]], sourceExpressionList=[[1]], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[1])
+    LogicalFilter(condition=[NOT(AND(IS TRUE($11), IS NOT NULL($9)))])
+      LogicalJoin(condition=[=($9, $10)], joinType=[left])
+        LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EMPNO0=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+          LogicalProject(EMPNO=[$0], $f1=[true])
+            LogicalFilter(condition=[=($0, 2)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUnpivot">
-        <Resource name="sql">
-            <![CDATA[SELECT * FROM emp
-UNPIVOT INCLUDE NULLS (remuneration
-  FOR remuneration_type IN (comm AS 'commission',
-                            sal as 'salary'))]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], DEPTNO=[$7], SLACKER=[$8], REMUNERATION_TYPE=[$9], REMUNERATION=[CASE(=($9, 'commission'), $6, =($9, 'salary    '), $5, null:NULL)])
-  LogicalJoin(condition=[true], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalValues(tuples=[[{ 'commission' }, { 'salary    ' }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdateWhere">
+    <Resource name="sql">
+      <![CDATA[update emp set empno = empno + 1 where deptno = 10]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, SALES, EMP]], operation=[UPDATE], updateColumnList=[[EMPNO]], sourceExpressionList=[[+($0, 1)]], flattened=[true])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[+($0, 1)])
+    LogicalFilter(condition=[=($7, 10)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWithinDistinct1">
-        <Resource name="sql">
-            <![CDATA[select avg(empno) within distinct (deptno)
-from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[AVG($0) WITHIN DISTINCT ($1)])
-  LogicalProject(EMPNO=[$0], DEPTNO=[$7])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testUpdateWithCustomColumnResolving">
+    <Resource name="sql">
+      <![CDATA[update struct.t set c0 = c0 + 1]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalTableModify(table=[[CATALOG, STRUCT, T]], operation=[UPDATE], updateColumnList=[["F0"."C0"]], sourceExpressionList=[[+($4, 1)]], flattened=[true])
+  LogicalProject("K0"=[$0], "C1"=[$1], "F1"."A0"=[$2], "F2"."A0"=[$3], "F0"."C0"=[$4], "F1"."C0"=[$5], "F0"."C1"=[$6], "F1"."C2"=[$7], "F2"."C3"=[$8], EXPR$0=[+($4, 1)])
+    LogicalTableScan(table=[[CATALOG, STRUCT, T]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWithinGroup1">
-        <Resource name="sql">
-            <![CDATA[select deptno,
- collect(empno) within group (order by deptno, hiredate desc)
+    </Resource>
+  </TestCase>
+  <TestCase name="testUserDefinedOrderByOver">
+    <Resource name="sql">
+      <![CDATA[select deptno,
+  rank() over(partition by empno order by deptno)
 from emp
-group by deptno]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COLLECT($1) WITHIN GROUP ([1, 2 DESC])])
-  LogicalProject(DEPTNO=[$7], EMPNO=[$0], HIREDATE=[$4])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+order by row_number() over(partition by empno order by deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(DEPTNO=[$0], EXPR$1=[$1])
+  LogicalSort(sort0=[$2], dir0=[ASC-nulls-first])
+    LogicalProject(DEPTNO=[$7], EXPR$1=[RANK() OVER (PARTITION BY $0 ORDER BY $7 NULLS FIRST)], EXPR$2=[ROW_NUMBER() OVER (PARTITION BY $0 ORDER BY $7 NULLS FIRST)])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWithinGroup2">
-        <Resource name="sql">
-            <![CDATA[select dept.deptno,
- collect(sal) within group (order by sal desc) as s,
- collect(sal) within group (order by 1)as s1,
- collect(sal) within group (order by sal)
-  filter (where sal > 2000) as s2
-from emp
-join dept using (deptno)
-group by dept.deptno]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}], S=[COLLECT($1) WITHIN GROUP ([1 DESC])], S1=[COLLECT($1) WITHIN GROUP ([2])], S2=[COLLECT($1) WITHIN GROUP ([1]) FILTER $3])
-  LogicalProject(DEPTNO=[$9], SAL=[$5], $f2=[1], $f3=[>($5, 2000)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testValuesUsing">
+    <Resource name="sql">
+      <![CDATA[select d.deptno, min(e.empid) as empid
+from (values (100, 'Bill', 1)) as e(empid, name, deptno)
+join (values (1, 'LeaderShip')) as d(deptno, name)
+  using (deptno)
+group by d.deptno]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EMPID=[MIN($1)])
+  LogicalProject(DEPTNO=[$3], EMPID=[$0])
+    LogicalJoin(condition=[=($2, $3)], joinType=[inner])
+      LogicalValues(tuples=[[{ 100, 'Bill', 1 }]])
+      LogicalValues(tuples=[[{ 1, 'LeaderShip' }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testWhereInCorrelated">
+    <Resource name="sql">
+      <![CDATA[select empno from emp as e
+join dept as d using (deptno)
+where e.sal in (
+  select e2.sal from emp as e2 where e2.deptno > e.deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0])
+  LogicalFilter(condition=[IN($5, {
+LogicalProject(SAL=[$5])
+  LogicalFilter(condition=[>($7, $cor0.DEPTNO)])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+})], variablesSet=[[$cor0]])
     LogicalJoin(condition=[=($7, $9)], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testWithinGroup3">
-        <Resource name="sql">
-            <![CDATA[select deptno,
- collect(empno) within group (order by empno not in (1, 2)), count(*)
-from emp
-group by deptno]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COLLECT($1) WITHIN GROUP ([2])], EXPR$2=[COUNT()])
-  LogicalProject(DEPTNO=[$7], EMPNO=[$0], $f2=[SEARCH($0, Sarg[(-∞..1), (1..2), (2..+∞)])])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderByRemoval1">
-        <Resource name="sql">
-            <![CDATA[select * from (
-  select empno from emp order by deptno offset 0) t
-order by empno desc]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[DESC])
-  LogicalProject(EMPNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWindowAggInSubQueryJoin">
+    <Resource name="sql">
+      <![CDATA[select T.x, T.y, T.z, emp.empno
+from (select min(deptno) as x,
+   rank() over (order by empno) as y,
+   max(empno) over (partition by deptno) as z
+   from emp group by deptno, empno) as T
+ inner join emp on T.x = emp.deptno
+ and T.y = emp.empno
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderByRemoval2">
-        <Resource name="sql">
-            <![CDATA[select * from (
-  select empno from emp order by deptno offset 1) t
-order by empno desc]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[DESC])
-  LogicalProject(EMPNO=[$0])
-    LogicalSort(sort0=[$1], dir0=[ASC], offset=[1])
-      LogicalProject(EMPNO=[$0], DEPTNO=[$7])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(X=[$0], Y=[$1], Z=[$2], EMPNO=[$3])
+  LogicalJoin(condition=[AND(=($0, $10), =($1, $12))], joinType=[inner])
+    LogicalProject(X=[$2], Y=[RANK() OVER (ORDER BY $1)], Z=[MAX($1) OVER (PARTITION BY $0)])
+      LogicalAggregate(group=[{0, 1}], X=[MIN($0)])
+        LogicalProject(DEPTNO=[$7], EMPNO=[$0])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EMPNO0=[CAST($0):BIGINT NOT NULL])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testOrderByRemoval3">
-        <Resource name="sql">
-            <![CDATA[select * from (
-  select empno from emp order by deptno limit 10) t
-order by empno]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalSort(sort0=[$0], dir0=[ASC])
-  LogicalProject(EMPNO=[$0])
-    LogicalSort(sort0=[$1], dir0=[ASC], fetch=[10])
-      LogicalProject(EMPNO=[$0], DEPTNO=[$7])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWindowAggWithGroupBy">
+    <Resource name="sql">
+      <![CDATA[select min(deptno), rank() over (order by empno),
+max(empno) over (partition by deptno)
+from emp group by deptno, empno
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testLeftJoinLateral1">
-        <Resource name="sql">
-            <![CDATA[select * from (values 4) as t(c)
- left join lateral
- (select c,a*c from (values 2) as s(a)) as r(d,c)
- using(c)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(C=[$0], D=[$1])
-  LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0}])
-    LogicalValues(tuples=[[{ 4 }]])
-    LogicalFilter(condition=[=($cor0.C, $1)])
-      LogicalProject(C=[$cor0.C], EXPR$1=[*($0, $cor0.C)])
-        LogicalValues(tuples=[[{ 2 }]])
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[$2], EXPR$1=[RANK() OVER (ORDER BY $1)], EXPR$2=[MAX($1) OVER (PARTITION BY $0)])
+  LogicalAggregate(group=[{0, 1}], EXPR$0=[MIN($0)])
+    LogicalProject(DEPTNO=[$7], EMPNO=[$0])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testLeftJoinLateral2">
-        <Resource name="sql">
-            <![CDATA[select * from (values 4) as t(c)
- natural left join lateral
- (select c,a*c from (values 2) as s(a)) as r(d,c)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(C=[$0], D=[$1])
-  LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0}])
-    LogicalValues(tuples=[[{ 4 }]])
-    LogicalFilter(condition=[=($cor0.C, $1)])
-      LogicalProject(C=[$cor0.C], EXPR$1=[*($0, $cor0.C)])
-        LogicalValues(tuples=[[{ 2 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWindowAggWithGroupByAndHaving">
+    <Resource name="sql">
+      <![CDATA[select min(deptno), rank() over (order by empno),
+max(empno) over (partition by deptno)
+from emp group by deptno, empno
+having empno < 10 and min(deptno) < 20
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testLeftJoinLateral3">
-        <Resource name="sql">
-            <![CDATA[select * from (values 4) as t(c)
- left join lateral
- (select c,a*c from (values 2) as s(a)) as r(d,c)
- on t.c=r.c]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(C=[$0], D=[$1], C0=[$2])
-  LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0}])
-    LogicalValues(tuples=[[{ 4 }]])
-    LogicalFilter(condition=[=($cor0.C, $1)])
-      LogicalProject(C=[$cor0.C], EXPR$1=[*($0, $cor0.C)])
-        LogicalValues(tuples=[[{ 2 }]])
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[$2], EXPR$1=[RANK() OVER (ORDER BY $1)], EXPR$2=[MAX($1) OVER (PARTITION BY $0)])
+  LogicalFilter(condition=[AND(<($1, 10), <($2, 20))])
+    LogicalAggregate(group=[{0, 1}], EXPR$0=[MIN($0)])
+      LogicalProject(DEPTNO=[$7], EMPNO=[$0])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testLeftJoinLateral4">
-        <Resource name="sql">
-            <![CDATA[select * from (values (4,5)) as t(c,d)
- left join lateral
- (select c,a*c from (values 2) as s(a)) as r(d,c)
- on t.c+t.d=r.c]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(C=[$0], D=[$1], D0=[$2], C0=[$3])
-  LogicalProject(C=[$0], D=[$1], C0=[$4], EXPR$1=[$5])
-    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{2, 3}])
-      LogicalProject(C=[$0], D=[$1], $f2=[+($0, $1)], C0=[$0])
-        LogicalValues(tuples=[[{ 4, 5 }]])
-      LogicalFilter(condition=[=($cor0.$f2, $1)])
-        LogicalProject(C=[$cor0.C], EXPR$1=[*($0, $cor0.C)])
-          LogicalValues(tuples=[[{ 2 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWindowAggWithGroupByAndJoin">
+    <Resource name="sql">
+      <![CDATA[select min(d.deptno), rank() over (order by e.empno),
+ max(e.empno) over (partition by e.deptno)
+from emp e, dept d
+where e.deptno = d.deptno
+group by d.deptno, e.empno, e.deptno
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testLeftJoinLateral5">
-        <Resource name="sql">
-            <![CDATA[select * from (values 4) as t (c)
-left join lateral
-  (select f1+b1 from (values 2) as foo(f1)
-    join
-  (select c+1 from (values 3)) as bar(b1)
-  on f1=b1)
-as r(n) on c=n]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(C=[$0], N=[$1])
-  LogicalProject(C=[$0], EXPR$0=[$3])
-    LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{1, 2}])
-      LogicalProject(C=[$0], C0=[$0], $f2=[+($0, 1)])
-        LogicalValues(tuples=[[{ 4 }]])
-      LogicalFilter(condition=[=($cor0.C, $0)])
-        LogicalProject(EXPR$0=[+($0, $1)])
-          LogicalJoin(condition=[=($0, $1)], joinType=[inner])
-            LogicalValues(tuples=[[{ 2 }]])
-            LogicalProject(EXPR$0=[$cor0.$f2])
-              LogicalValues(tuples=[[{ 3 }]])
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[$3], EXPR$1=[RANK() OVER (ORDER BY $1)], EXPR$2=[MAX($1) OVER (PARTITION BY $2)])
+  LogicalAggregate(group=[{0, 1, 2}], EXPR$0=[MIN($0)])
+    LogicalProject(DEPTNO0=[$9], EMPNO=[$0], DEPTNO=[$7])
+      LogicalFilter(condition=[=($7, $9)])
+        LogicalJoin(condition=[true], joinType=[inner])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCrossJoinLateral1">
-        <Resource name="sql">
-            <![CDATA[select * from (values (4,5)) as t(c,d)
- cross join lateral
- (select c,a*c as f from (values 2) as s(a)
- where c+d=a*c)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(C=[$0], D=[$1], C0=[$2], F=[$3])
-  LogicalProject(C=[$0], D=[$1], C0=[$4], F=[$5])
-    LogicalCorrelate(correlation=[$cor3], joinType=[inner], requiredColumns=[{2, 3}])
-      LogicalProject(C=[$0], D=[$1], C0=[$0], $f3=[+($0, $1)])
-        LogicalValues(tuples=[[{ 4, 5 }]])
-      LogicalProject(C=[$cor3.C], F=[*($0, $cor3.C)])
-        LogicalFilter(condition=[=($cor3.$f3, *($0, $cor3.C))])
-          LogicalValues(tuples=[[{ 2 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWindowAndGroupByWithDynamicStar">
+    <Resource name="sql">
+      <![CDATA[SELECT
+n_regionkey,
+MAX(MIN(n_nationkey)) OVER (PARTITION BY n_regionkey)
+FROM (SELECT * FROM SALES.NATION)
+GROUP BY n_regionkey]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(N_REGIONKEY=[$0], EXPR$1=[MAX($1) OVER (PARTITION BY $0)])
+  LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+    LogicalProject(N_REGIONKEY=[ITEM($0, 'N_REGIONKEY')], $f1=[ITEM($0, 'N_NATIONKEY')])
+      LogicalTableScan(table=[[CATALOG, SALES, NATION]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCrossJoinLateral2">
-        <Resource name="sql">
-            <![CDATA[select * from (values 4) as t (c)
-cross join lateral
-(select * from (
-  select f1+b1 from (values 2) as foo(f1)
-    join
-  (select c+1 from (values 3)) as bar(b1)
-  on f1=b1
-) as r(n) where c=n)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(C=[$0], N=[$1])
-  LogicalProject(C=[$0], N=[$3])
-    LogicalCorrelate(correlation=[$cor1], joinType=[inner], requiredColumns=[{1, 2}])
-      LogicalProject(C=[$0], C0=[$0], $f2=[+($0, 1)])
-        LogicalValues(tuples=[[{ 4 }]])
-      LogicalProject(N=[$0])
-        LogicalFilter(condition=[=($cor1.C, $0)])
-          LogicalProject(EXPR$0=[+($0, $1)])
-            LogicalJoin(condition=[=($0, $1)], joinType=[inner])
-              LogicalValues(tuples=[[{ 2 }]])
-              LogicalProject(EXPR$0=[$cor1.$f2])
-                LogicalValues(tuples=[[{ 3 }]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWindowAverageWithGroupBy">
+    <Resource name="sql">
+      <![CDATA[select avg(deptno) over ()
+from emp
+group by deptno]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[CAST(/(SUM($0) OVER (), COUNT($0) OVER ())):INTEGER NOT NULL])
+  LogicalAggregate(group=[{0}])
+    LogicalProject(DEPTNO=[$7])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectApproximateAndExactAggregates">
-        <Resource name="sql">
-            <![CDATA[SELECT empno, count(distinct ename),
-approx_count_distinct(ename)
-FROM emp
-GROUP BY empno]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)], EXPR$2=[COUNT(APPROXIMATE DISTINCT $1)])
-  LogicalProject(EMPNO=[$0], ENAME=[$1])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWindowOnDynamicStar">
+    <Resource name="sql">
+      <![CDATA[SELECT SUM(n_nationkey) OVER w
+FROM (SELECT * FROM SALES.NATION) subQry
+WINDOW w AS (PARTITION BY REGION ORDER BY n_nationkey)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[CASE(>(COUNT(ITEM($0, 'N_NATIONKEY')) OVER (PARTITION BY ITEM($0, 'REGION') ORDER BY ITEM($0, 'N_NATIONKEY')), 0), $SUM0(ITEM($0, 'N_NATIONKEY')) OVER (PARTITION BY ITEM($0, 'REGION') ORDER BY ITEM($0, 'N_NATIONKEY')), null:ANY)])
+  LogicalTableScan(table=[[CATALOG, SALES, NATION]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testProjectAggregatesIgnoreNullsAndNot">
-        <Resource name="sql">
-            <![CDATA[select lead(sal, 4) IGNORE NULLS, lead(sal, 4) over (w)
-from emp window w as (order by empno)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[IGNORE NULLS(LEAD($5, 4))], EXPR$1=[LEAD($5, 4) OVER (ORDER BY $0)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWith">
+    <Resource name="sql">
+      <![CDATA[with emp2 as (select * from emp)
+select * from emp2]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
   LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTrimUnionAll">
-        <Resource name="sql">
-            <![CDATA[select deptno from
-(select ename, deptno from emp
-union all
-select name, deptno from dept)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalUnion(all=[true])
-  LogicalProject(DEPTNO=[$7])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWithAlias">
+    <Resource name="sql">
+      <![CDATA[with w(x, y) as
+  (select * from dept where deptno > 10)
+select x from w where x < 30 union all select deptno from dept]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalProject(X=[$0])
+    LogicalFilter(condition=[<($0, 30)])
+      LogicalProject(DEPTNO=[$0], NAME=[$1])
+        LogicalFilter(condition=[>($0, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+  LogicalProject(DEPTNO=[$0])
+    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testWithExists">
+    <Resource name="sql">
+      <![CDATA[with t (a, b) as (select * from (values (1, 2)))
+select * from t where exists (
+  select 1 from emp where deptno = t.a)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(A=[$0], B=[$1])
+  LogicalProject(EXPR$0=[$0], EXPR$1=[$1], $f0=[$2])
+    LogicalFilter(condition=[IS NOT NULL($2)])
+      LogicalCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{0}])
+        LogicalProject(EXPR$0=[$0], EXPR$1=[$1])
+          LogicalValues(tuples=[[{ 1, 2 }]])
+        LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+          LogicalProject($f0=[true])
+            LogicalFilter(condition=[=($7, $cor0.A)])
+              LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testWithInsideScalarSubQuery">
+    <Resource name="sql">
+      <![CDATA[select (
+ with dept2 as (select * from dept where deptno > 10) select count(*) from dept2) as c
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(C=[$9])
+  LogicalJoin(condition=[true], joinType=[left])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-  LogicalProject(DEPTNO=[$0])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    LogicalAggregate(group=[{}], agg#0=[SINGLE_VALUE($0)])
+      LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
+        LogicalProject($f0=[0])
+          LogicalFilter(condition=[>($0, 10)])
+            LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTrimUnionDistinct">
-        <Resource name="sql">
-            <![CDATA[select deptno from
-(select ename, deptno from emp
-union
-select name, deptno from dept)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$1])
-  LogicalUnion(all=[false])
-    LogicalProject(ENAME=[$1], DEPTNO=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(NAME=[$1], DEPTNO=[$0])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWithInsideScalarSubQueryRex">
+    <Resource name="sql">
+      <![CDATA[select (
+ with dept2 as (select * from dept where deptno > 10) select count(*) from dept2) as c
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(C=[$SCALAR_QUERY({
+LogicalAggregate(group=[{}], EXPR$0=[COUNT()])
+  LogicalProject($f0=[0])
+    LogicalFilter(condition=[>($0, 10)])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+})])
+  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTrimIntersectAll">
-        <Resource name="sql">
-            <![CDATA[select deptno from
-(select ename, deptno from emp
-intersect all
-select name, deptno from dept)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$1])
-  LogicalIntersect(all=[true])
-    LogicalProject(ENAME=[$1], DEPTNO=[$7])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWithInsideWhereExists">
+    <Resource name="sql">
+      <![CDATA[select * from emp
+where exists (
+  with dept2 as (select * from dept where dept.deptno >= emp.deptno)
+  select 1 from dept2 where deptno <= emp.deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[IS NOT NULL($9)])
+    LogicalCorrelate(correlation=[$cor1], joinType=[left], requiredColumns=[{7}])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(NAME=[$1], DEPTNO=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalAggregate(group=[{}], agg#0=[MIN($0)])
+        LogicalProject($f0=[true])
+          LogicalFilter(condition=[<=($0, $cor1.DEPTNO)])
+            LogicalProject(DEPTNO=[$0], NAME=[$1])
+              LogicalFilter(condition=[>=($0, $cor1.DEPTNO)])
+                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTrimIntersectDistinct">
-        <Resource name="sql">
-            <![CDATA[select deptno from
-(select ename, deptno from emp
-intersect
-select name, deptno from dept)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$1])
-  LogicalIntersect(all=[false])
-    LogicalProject(ENAME=[$1], DEPTNO=[$7])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWithInsideWhereExistsDecorrelate">
+    <Resource name="sql">
+      <![CDATA[select * from emp
+where exists (
+  with dept2 as (select * from dept where dept.deptno >= emp.deptno)
+  select 1 from dept2 where deptno <= emp.deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[CAST($9):INTEGER], $f1=[CAST($10):BOOLEAN])
+    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(NAME=[$1], DEPTNO=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+        LogicalProject(DEPTNO0=[$2], $f0=[true])
+          LogicalFilter(condition=[<=($0, $2)])
+            LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO0=[$2])
+              LogicalJoin(condition=[>=($0, $2)], joinType=[inner])
+                LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+                LogicalAggregate(group=[{0}])
+                  LogicalProject(DEPTNO=[$7])
+                    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTrimExceptAll">
-        <Resource name="sql">
-            <![CDATA[select deptno from
-(select ename, deptno from emp
-except all
-select name, deptno from dept)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$1])
-  LogicalMinus(all=[true])
-    LogicalProject(ENAME=[$1], DEPTNO=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(NAME=[$1], DEPTNO=[$0])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWithInsideWhereExistsDecorrelateRex">
+    <Resource name="sql">
+      <![CDATA[select * from emp
+where exists (
+  with dept2 as (select * from dept where dept.deptno >= emp.deptno)
+  select 1 from dept2 where deptno <= emp.deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[EXISTS({
+LogicalFilter(condition=[<=($0, $cor1.DEPTNO)])
+  LogicalProject(DEPTNO=[$0], NAME=[$1])
+    LogicalFilter(condition=[>=($0, $cor1.DEPTNO)])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+})], variablesSet=[[$cor1]])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testTrimExceptDistinct">
-        <Resource name="sql">
-            <![CDATA[select deptno from
-(select ename, deptno from emp
-except
-select name, deptno from dept)]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$1])
-  LogicalMinus(all=[false])
-    LogicalProject(ENAME=[$1], DEPTNO=[$7])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(NAME=[$1], DEPTNO=[$0])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWithInsideWhereExistsRex">
+    <Resource name="sql">
+      <![CDATA[select * from emp
+where exists (
+  with dept2 as (select * from dept where dept.deptno >= emp.deptno)
+  select 1 from dept2 where deptno <= emp.deptno)]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  LogicalFilter(condition=[EXISTS({
+LogicalFilter(condition=[<=($0, $cor1.DEPTNO)])
+  LogicalProject(DEPTNO=[$0], NAME=[$1])
+    LogicalFilter(condition=[>=($0, $cor1.DEPTNO)])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testAggregateWithSameDigestInSubQueries">
-        <Resource name="sql">
-            <![CDATA[select
-  CASE WHEN job IN ('810000', '820000') THEN job
-  ELSE 'error'
-  END AS job_name,
-  count(empno)
-FROM emp
-where job <> '' or job IN ('810000', '820000')
-GROUP by deptno, job]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(JOB_NAME=[CASE(SEARCH($1, Sarg['810000', '820000']:CHAR(6)), $1, 'error':VARCHAR(10))], EXPR$1=[$2])
-  LogicalAggregate(group=[{0, 1}], EXPR$1=[COUNT()])
-    LogicalProject(DEPTNO=[$7], JOB=[$2], EMPNO=[$0])
-      LogicalFilter(condition=[OR(<>($2, ''), =($2, '810000'), =($2, '820000'))])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testPushDownJoinConditionWithProjectMerge">
-        <Resource name="sql">
-            <![CDATA[select * from
- (select empno, deptno from emp) a
- join dept b
-on a.deptno + 20 = b.deptno]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EMPNO=[$0], DEPTNO=[$1], DEPTNO0=[$3], NAME=[$4])
-  LogicalJoin(condition=[=($2, $3)], joinType=[inner])
-    LogicalProject(EMPNO=[$0], DEPTNO=[$7], $f2=[+($7, 20)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCoalesceOnNullableField">
-        <Resource name="sql">
-            <![CDATA[select coalesce(mgr, 0) from emp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[CASE(IS NOT NULL($3), CAST($3):INTEGER NOT NULL, 0)])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testUdfWithStructuredReturnType">
-        <Resource name="sql">
-            <![CDATA[SELECT deptno, tmp.r.f0, tmp.r.f1 FROM
-(SELECT deptno, STRUCTURED_FUNC() AS r from dept)tmp]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(DEPTNO=[$0], F0=[STRUCTURED_FUNC().F0], F1=[STRUCTURED_FUNC().F1])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testGroupByCoalesceIn">
-        <Resource name="sql">
-            <![CDATA[select case when coalesce(ename, 'a') in ('1', '2')
-then 'CKA' else 'QT' END, count(distinct deptno) from emp
-group by case when coalesce(ename, 'a') in ('1', '2') then 'CKA' else 'QT' END]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalAggregate(group=[{0}], EXPR$1=[COUNT(DISTINCT $1)])
-  LogicalProject(EXPR$0=[CASE(SEARCH($1, Sarg['1', '2']:CHAR(1)), 'CKA', 'QT ')], DEPTNO=[$7])
+})], variablesSet=[[$cor1]])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortInSubQuery">
-        <Resource name="sql">
-            <![CDATA[select * from (select empno from emp order by empno)]]>
-        </Resource>
-        <Resource name="planRemoveSort">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWithOrder">
+    <Resource name="sql">
+      <![CDATA[with emp2 as (select * from emp)
+select * from emp2 order by deptno]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalSort(sort0=[$7], dir0=[ASC])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planKeepSort">
-            <![CDATA[
-LogicalProject(EMPNO=[$0])
-  LogicalSort(sort0=[$0], dir0=[ASC])
-    LogicalProject(EMPNO=[$0])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWithUnion">
+    <Resource name="sql">
+      <![CDATA[with emp2 as (select * from emp where deptno > 10)
+select empno from emp2 where deptno < 30
+union all
+select deptno from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalUnion(all=[true])
+  LogicalProject(EMPNO=[$0])
+    LogicalFilter(condition=[<($7, 30)])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalFilter(condition=[>($7, 10)])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+  LogicalProject(DEPTNO=[$7])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testJoinExpandAndDecorrelation">
-        <Resource name="plan_extended">
-            <![CDATA[
-LogicalProject(DEPTNO=[$9], SAL=[$7])
-  LogicalJoin(condition=[AND(=($9, $0), <($7, $0))], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-    LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], EXPR$0=[$10])
-      LogicalJoin(condition=[=($0, $9)], joinType=[left])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-        LogicalAggregate(group=[{0}], EXPR$0=[AVG($1)])
-          LogicalProject(DEPTNO=[$7], SAL=[$5])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWithUnionOrder">
+    <Resource name="sql">
+      <![CDATA[with emp2 as (select empno, deptno as x from emp)
+select * from emp2
+union all
+select * from emp2
+order by empno + x]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EMPNO=[$0], X=[$1])
+  LogicalSort(sort0=[$2], dir0=[ASC])
+    LogicalProject(EMPNO=[$0], X=[$1], EXPR$2=[+($0, $1)])
+      LogicalUnion(all=[true])
+        LogicalProject(EMPNO=[$0], X=[$7])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+        LogicalProject(EMPNO=[$0], X=[$7])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="plan_not_extended">
-            <![CDATA[
-LogicalProject(DEPTNO=[$9], SAL=[$7])
-  LogicalJoin(condition=[AND(=($9, $0), <($7, $SCALAR_QUERY({
-LogicalAggregate(group=[{}], EXPR$0=[AVG($0)])
-  LogicalProject(SAL=[$5])
-    LogicalFilter(condition=[=($7, $cor0.DEPTNO)])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})))], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWithinDistinct1">
+    <Resource name="sql">
+      <![CDATA[select avg(empno) within distinct (deptno)
+from emp]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{}], EXPR$0=[AVG($0) WITHIN DISTINCT ($1)])
+  LogicalProject(EMPNO=[$0], DEPTNO=[$7])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[SELECT emp.deptno, emp.sal
-FROM dept
-JOIN emp ON emp.deptno = dept.deptno AND emp.sal < (
-  SELECT AVG(emp.sal)
-  FROM emp
-  WHERE  emp.deptno = dept.deptno
-)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testImplicitJoinExpandAndDecorrelation">
-        <Resource name="plan_extended">
-            <![CDATA[
-LogicalProject(DEPTNO=[$9], SAL=[$7])
-  LogicalProject(DEPTNO=[$0], NAME=[$1], EMPNO=[$2], ENAME=[$3], JOB=[$4], MGR=[$5], HIREDATE=[$6], SAL=[$7], COMM=[$8], DEPTNO0=[$9], SLACKER=[$10], DEPTNO1=[CAST($11):INTEGER], EXPR$0=[CAST($12):INTEGER])
-    LogicalJoin(condition=[AND(=($0, $11), <($7, $12))], joinType=[inner])
-      LogicalJoin(condition=[=($9, $0)], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalAggregate(group=[{0}], EXPR$0=[AVG($1)])
-        LogicalProject(DEPTNO=[$7], SAL=[$5])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWithinGroup1">
+    <Resource name="sql">
+      <![CDATA[select deptno,
+ collect(empno) within group (order by deptno, hiredate desc)
+from emp
+group by deptno]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COLLECT($1) WITHIN GROUP ([1, 2 DESC])])
+  LogicalProject(DEPTNO=[$7], EMPNO=[$0], HIREDATE=[$4])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="plan_not_extended">
-            <![CDATA[
-LogicalProject(DEPTNO=[$9], SAL=[$7])
-  LogicalFilter(condition=[AND(=($9, $0), <($7, $SCALAR_QUERY({
-LogicalAggregate(group=[{}], EXPR$0=[AVG($0)])
-  LogicalProject(SAL=[$5])
-    LogicalFilter(condition=[=($7, $cor0.DEPTNO)])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWithinGroup2">
+    <Resource name="sql">
+      <![CDATA[select dept.deptno,
+ collect(sal) within group (order by sal desc) as s,
+ collect(sal) within group (order by 1)as s1,
+ collect(sal) within group (order by sal)
+  filter (where sal > 2000) as s2
+from emp
+join dept using (deptno)
+group by dept.deptno]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}], S=[COLLECT($1) WITHIN GROUP ([1 DESC])], S1=[COLLECT($1) WITHIN GROUP ([2])], S2=[COLLECT($1) WITHIN GROUP ([1]) FILTER $3])
+  LogicalProject(DEPTNO=[$9], SAL=[$5], $f2=[1], $f3=[>($5, 2000)])
+    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-})))], variablesSet=[[$cor0]])
-    LogicalJoin(condition=[true], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="sql">
-            <![CDATA[SELECT emp.deptno, emp.sal
-FROM dept, emp WHERE emp.deptno = dept.deptno AND emp.sal < (
-  SELECT AVG(emp.sal)
-  FROM emp
-  WHERE  emp.deptno = dept.deptno
-)]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testCompositeOfCountRange">
-        <Resource name="sql">
-            <![CDATA[select COMPOSITE(deptno)
-from dept]]>
-        </Resource>
-        <Resource name="plan">
-            <![CDATA[
-LogicalProject(EXPR$0=[COMPOSITE($0)])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testWithinGroup3">
+    <Resource name="sql">
+      <![CDATA[select deptno,
+ collect(empno) within group (order by empno not in (1, 2)), count(*)
+from emp
+group by deptno]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalAggregate(group=[{0}], EXPR$1=[COLLECT($1) WITHIN GROUP ([2])], EXPR$2=[COUNT()])
+  LogicalProject(DEPTNO=[$7], EMPNO=[$0], $f2=[SEARCH($0, Sarg[(-∞..1), (1..2), (2..+∞)])])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
+    </Resource>
+  </TestCase>
 </Root>
diff --git a/core/src/test/resources/org/apache/calcite/test/TopDownOptTest.xml b/core/src/test/resources/org/apache/calcite/test/TopDownOptTest.xml
index db646a6ffb5e..a8315af10511 100644
--- a/core/src/test/resources/org/apache/calcite/test/TopDownOptTest.xml
+++ b/core/src/test/resources/org/apache/calcite/test/TopDownOptTest.xml
@@ -16,1540 +16,1529 @@
   ~ limitations under the License.
   -->
 <Root>
-  <TestCase name="testSortAgg">
+  <TestCase name="testBatchNestedLoopJoinLeftOuterJoinPushDownSort">
     <Resource name="sql">
-      <![CDATA[select mgr, count(*) from sales.emp
-group by mgr order by mgr desc nulls last limit 5]]>
+      <![CDATA[select * from
+ customer.contact_peek r left outer join
+customer.account s
+on r.contactno>s.acctno and r.email<s.type
+order by r.contactno desc, r.email desc]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$0], dir0=[DESC-nulls-last], fetch=[5])
-  LogicalAggregate(group=[{0}], EXPR$1=[COUNT()])
-    LogicalProject(MGR=[$3])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
+  LogicalSort(sort0=[$0], sort1=[$3], dir0=[DESC], dir1=[DESC])
+    LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[$7], COORD_NE8=[$8], COORD_NE9=[$9], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
+      LogicalJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[left])
+        LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
+          LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+        LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableLimit(fetch=[5])
-  EnumerableSortedAggregate(group=[{3}], EXPR$1=[COUNT()])
-    EnumerableSort(sort0=[$3], dir0=[DESC-nulls-last])
-      EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
+  EnumerableBatchNestedLoopJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[left], batchSize=[100])
+    EnumerableSort(sort0=[$0], sort1=[$3], dir0=[DESC], dir1=[DESC])
+      EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
+        EnumerableTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+    EnumerableFilter(condition=[OR(AND(>($cor0.CONTACTNO, $0), <($cor0.EMAIL, $1)), AND(>($cor1.CONTACTNO, $0), <($cor1.EMAIL, $1)), AND(>($cor2.CONTACTNO, $0), <($cor2.EMAIL, $1)), AND(>($cor3.CONTACTNO, $0), <($cor3.EMAIL, $1)), AND(>($cor4.CONTACTNO, $0), <($cor4.EMAIL, $1)), AND(>($cor5.CONTACTNO, $0), <($cor5.EMAIL, $1)), AND(>($cor6.CONTACTNO, $0), <($cor6.EMAIL, $1)), AND(>($cor7.CONTACTNO, $0), <($cor7.EMAIL, $1)), AND(>($cor8.CONTACTNO, $0), <($cor8.EMAIL, $1)), AND(>($cor9.CONTACTNO, $0), <($cor9.EMAIL, $1)), AND(>($cor10.CONTACTNO, $0), <($cor10.EMAIL, $1)), AND(>($cor11.CONTACTNO, $0), <($cor11.EMAIL, $1)), AND(>($cor12.CONTACTNO, $0), <($cor12.EMAIL, $1)), AND(>($cor13.CONTACTNO, $0), <($cor13.EMAIL, $1)), AND(>($cor14.CONTACTNO, $0), <($cor14.EMAIL, $1)), AND(>($cor15.CONTACTNO, $0), <($cor15.EMAIL, $1)), AND(>($cor16.CONTACTNO, $0), <($cor16.EMAIL, $1)), AND(>($cor17.CONTACTNO, $0), <($cor17.EMAIL, $1)), AND(>($cor18.CONTACTNO, $0), <($cor18.EMAIL, $1)), AND(>($cor19.CONTACTNO, $0), <($cor19.EMAIL, $1)), AND(>($cor20.CONTACTNO, $0), <($cor20.EMAIL, $1)), AND(>($cor21.CONTACTNO, $0), <($cor21.EMAIL, $1)), AND(>($cor22.CONTACTNO, $0), <($cor22.EMAIL, $1)), AND(>($cor23.CONTACTNO, $0), <($cor23.EMAIL, $1)), AND(>($cor24.CONTACTNO, $0), <($cor24.EMAIL, $1)), AND(>($cor25.CONTACTNO, $0), <($cor25.EMAIL, $1)), AND(>($cor26.CONTACTNO, $0), <($cor26.EMAIL, $1)), AND(>($cor27.CONTACTNO, $0), <($cor27.EMAIL, $1)), AND(>($cor28.CONTACTNO, $0), <($cor28.EMAIL, $1)), AND(>($cor29.CONTACTNO, $0), <($cor29.EMAIL, $1)), AND(>($cor30.CONTACTNO, $0), <($cor30.EMAIL, $1)), AND(>($cor31.CONTACTNO, $0), <($cor31.EMAIL, $1)), AND(>($cor32.CONTACTNO, $0), <($cor32.EMAIL, $1)), AND(>($cor33.CONTACTNO, $0), <($cor33.EMAIL, $1)), AND(>($cor34.CONTACTNO, $0), <($cor34.EMAIL, $1)), AND(>($cor35.CONTACTNO, $0), <($cor35.EMAIL, $1)), AND(>($cor36.CONTACTNO, $0), <($cor36.EMAIL, $1)), AND(>($cor37.CONTACTNO, $0), <($cor37.EMAIL, $1)), AND(>($cor38.CONTACTNO, $0), <($cor38.EMAIL, $1)), AND(>($cor39.CONTACTNO, $0), <($cor39.EMAIL, $1)), AND(>($cor40.CONTACTNO, $0), <($cor40.EMAIL, $1)), AND(>($cor41.CONTACTNO, $0), <($cor41.EMAIL, $1)), AND(>($cor42.CONTACTNO, $0), <($cor42.EMAIL, $1)), AND(>($cor43.CONTACTNO, $0), <($cor43.EMAIL, $1)), AND(>($cor44.CONTACTNO, $0), <($cor44.EMAIL, $1)), AND(>($cor45.CONTACTNO, $0), <($cor45.EMAIL, $1)), AND(>($cor46.CONTACTNO, $0), <($cor46.EMAIL, $1)), AND(>($cor47.CONTACTNO, $0), <($cor47.EMAIL, $1)), AND(>($cor48.CONTACTNO, $0), <($cor48.EMAIL, $1)), AND(>($cor49.CONTACTNO, $0), <($cor49.EMAIL, $1)), AND(>($cor50.CONTACTNO, $0), <($cor50.EMAIL, $1)), AND(>($cor51.CONTACTNO, $0), <($cor51.EMAIL, $1)), AND(>($cor52.CONTACTNO, $0), <($cor52.EMAIL, $1)), AND(>($cor53.CONTACTNO, $0), <($cor53.EMAIL, $1)), AND(>($cor54.CONTACTNO, $0), <($cor54.EMAIL, $1)), AND(>($cor55.CONTACTNO, $0), <($cor55.EMAIL, $1)), AND(>($cor56.CONTACTNO, $0), <($cor56.EMAIL, $1)), AND(>($cor57.CONTACTNO, $0), <($cor57.EMAIL, $1)), AND(>($cor58.CONTACTNO, $0), <($cor58.EMAIL, $1)), AND(>($cor59.CONTACTNO, $0), <($cor59.EMAIL, $1)), AND(>($cor60.CONTACTNO, $0), <($cor60.EMAIL, $1)), AND(>($cor61.CONTACTNO, $0), <($cor61.EMAIL, $1)), AND(>($cor62.CONTACTNO, $0), <($cor62.EMAIL, $1)), AND(>($cor63.CONTACTNO, $0), <($cor63.EMAIL, $1)), AND(>($cor64.CONTACTNO, $0), <($cor64.EMAIL, $1)), AND(>($cor65.CONTACTNO, $0), <($cor65.EMAIL, $1)), AND(>($cor66.CONTACTNO, $0), <($cor66.EMAIL, $1)), AND(>($cor67.CONTACTNO, $0), <($cor67.EMAIL, $1)), AND(>($cor68.CONTACTNO, $0), <($cor68.EMAIL, $1)), AND(>($cor69.CONTACTNO, $0), <($cor69.EMAIL, $1)), AND(>($cor70.CONTACTNO, $0), <($cor70.EMAIL, $1)), AND(>($cor71.CONTACTNO, $0), <($cor71.EMAIL, $1)), AND(>($cor72.CONTACTNO, $0), <($cor72.EMAIL, $1)), AND(>($cor73.CONTACTNO, $0), <($cor73.EMAIL, $1)), AND(>($cor74.CONTACTNO, $0), <($cor74.EMAIL, $1)), AND(>($cor75.CONTACTNO, $0), <($cor75.EMAIL, $1)), AND(>($cor76.CONTACTNO, $0), <($cor76.EMAIL, $1)), AND(>($cor77.CONTACTNO, $0), <($cor77.EMAIL, $1)), AND(>($cor78.CONTACTNO, $0), <($cor78.EMAIL, $1)), AND(>($cor79.CONTACTNO, $0), <($cor79.EMAIL, $1)), AND(>($cor80.CONTACTNO, $0), <($cor80.EMAIL, $1)), AND(>($cor81.CONTACTNO, $0), <($cor81.EMAIL, $1)), AND(>($cor82.CONTACTNO, $0), <($cor82.EMAIL, $1)), AND(>($cor83.CONTACTNO, $0), <($cor83.EMAIL, $1)), AND(>($cor84.CONTACTNO, $0), <($cor84.EMAIL, $1)), AND(>($cor85.CONTACTNO, $0), <($cor85.EMAIL, $1)), AND(>($cor86.CONTACTNO, $0), <($cor86.EMAIL, $1)), AND(>($cor87.CONTACTNO, $0), <($cor87.EMAIL, $1)), AND(>($cor88.CONTACTNO, $0), <($cor88.EMAIL, $1)), AND(>($cor89.CONTACTNO, $0), <($cor89.EMAIL, $1)), AND(>($cor90.CONTACTNO, $0), <($cor90.EMAIL, $1)), AND(>($cor91.CONTACTNO, $0), <($cor91.EMAIL, $1)), AND(>($cor92.CONTACTNO, $0), <($cor92.EMAIL, $1)), AND(>($cor93.CONTACTNO, $0), <($cor93.EMAIL, $1)), AND(>($cor94.CONTACTNO, $0), <($cor94.EMAIL, $1)), AND(>($cor95.CONTACTNO, $0), <($cor95.EMAIL, $1)), AND(>($cor96.CONTACTNO, $0), <($cor96.EMAIL, $1)), AND(>($cor97.CONTACTNO, $0), <($cor97.EMAIL, $1)), AND(>($cor98.CONTACTNO, $0), <($cor98.EMAIL, $1)), AND(>($cor99.CONTACTNO, $0), <($cor99.EMAIL, $1)))])
+      EnumerableTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortProject">
+  <TestCase name="testBatchNestedLoopJoinTraitDerivation">
     <Resource name="sql">
-      <![CDATA[select mgr from sales.emp order by mgr desc nulls last]]>
+      <![CDATA[select * from
+(select ename, job, mgr from sales.emp order by ename desc, job desc, mgr limit 10) r
+join sales.bonus s on r.ename>s.ename and r.job<s.job
+order by r.ename desc, r.job desc]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$0], dir0=[DESC-nulls-last])
-  LogicalProject(MGR=[$3])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+LogicalSort(sort0=[$0], sort1=[$1], dir0=[DESC], dir1=[DESC])
+  LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
+    LogicalJoin(condition=[AND(>($0, $3), <($1, $4))], joinType=[inner])
+      LogicalSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[DESC], dir2=[ASC], fetch=[10])
+        LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableSort(sort0=[$0], dir0=[DESC-nulls-last])
-  EnumerableProject(MGR=[$3])
-    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+EnumerableBatchNestedLoopJoin(condition=[AND(>($0, $3), <($1, $4))], joinType=[inner], batchSize=[100])
+  EnumerableLimit(fetch=[10])
+    EnumerableSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[DESC], dir2=[ASC])
+      EnumerableProject(ENAME=[$1], JOB=[$2], MGR=[$3])
+        EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+  EnumerableFilter(condition=[OR(AND(>($cor0.ENAME, $0), <($cor0.JOB, $1)), AND(>($cor1.ENAME, $0), <($cor1.JOB, $1)), AND(>($cor2.ENAME, $0), <($cor2.JOB, $1)), AND(>($cor3.ENAME, $0), <($cor3.JOB, $1)), AND(>($cor4.ENAME, $0), <($cor4.JOB, $1)), AND(>($cor5.ENAME, $0), <($cor5.JOB, $1)), AND(>($cor6.ENAME, $0), <($cor6.JOB, $1)), AND(>($cor7.ENAME, $0), <($cor7.JOB, $1)), AND(>($cor8.ENAME, $0), <($cor8.JOB, $1)), AND(>($cor9.ENAME, $0), <($cor9.JOB, $1)), AND(>($cor10.ENAME, $0), <($cor10.JOB, $1)), AND(>($cor11.ENAME, $0), <($cor11.JOB, $1)), AND(>($cor12.ENAME, $0), <($cor12.JOB, $1)), AND(>($cor13.ENAME, $0), <($cor13.JOB, $1)), AND(>($cor14.ENAME, $0), <($cor14.JOB, $1)), AND(>($cor15.ENAME, $0), <($cor15.JOB, $1)), AND(>($cor16.ENAME, $0), <($cor16.JOB, $1)), AND(>($cor17.ENAME, $0), <($cor17.JOB, $1)), AND(>($cor18.ENAME, $0), <($cor18.JOB, $1)), AND(>($cor19.ENAME, $0), <($cor19.JOB, $1)), AND(>($cor20.ENAME, $0), <($cor20.JOB, $1)), AND(>($cor21.ENAME, $0), <($cor21.JOB, $1)), AND(>($cor22.ENAME, $0), <($cor22.JOB, $1)), AND(>($cor23.ENAME, $0), <($cor23.JOB, $1)), AND(>($cor24.ENAME, $0), <($cor24.JOB, $1)), AND(>($cor25.ENAME, $0), <($cor25.JOB, $1)), AND(>($cor26.ENAME, $0), <($cor26.JOB, $1)), AND(>($cor27.ENAME, $0), <($cor27.JOB, $1)), AND(>($cor28.ENAME, $0), <($cor28.JOB, $1)), AND(>($cor29.ENAME, $0), <($cor29.JOB, $1)), AND(>($cor30.ENAME, $0), <($cor30.JOB, $1)), AND(>($cor31.ENAME, $0), <($cor31.JOB, $1)), AND(>($cor32.ENAME, $0), <($cor32.JOB, $1)), AND(>($cor33.ENAME, $0), <($cor33.JOB, $1)), AND(>($cor34.ENAME, $0), <($cor34.JOB, $1)), AND(>($cor35.ENAME, $0), <($cor35.JOB, $1)), AND(>($cor36.ENAME, $0), <($cor36.JOB, $1)), AND(>($cor37.ENAME, $0), <($cor37.JOB, $1)), AND(>($cor38.ENAME, $0), <($cor38.JOB, $1)), AND(>($cor39.ENAME, $0), <($cor39.JOB, $1)), AND(>($cor40.ENAME, $0), <($cor40.JOB, $1)), AND(>($cor41.ENAME, $0), <($cor41.JOB, $1)), AND(>($cor42.ENAME, $0), <($cor42.JOB, $1)), AND(>($cor43.ENAME, $0), <($cor43.JOB, $1)), AND(>($cor44.ENAME, $0), <($cor44.JOB, $1)), AND(>($cor45.ENAME, $0), <($cor45.JOB, $1)), AND(>($cor46.ENAME, $0), <($cor46.JOB, $1)), AND(>($cor47.ENAME, $0), <($cor47.JOB, $1)), AND(>($cor48.ENAME, $0), <($cor48.JOB, $1)), AND(>($cor49.ENAME, $0), <($cor49.JOB, $1)), AND(>($cor50.ENAME, $0), <($cor50.JOB, $1)), AND(>($cor51.ENAME, $0), <($cor51.JOB, $1)), AND(>($cor52.ENAME, $0), <($cor52.JOB, $1)), AND(>($cor53.ENAME, $0), <($cor53.JOB, $1)), AND(>($cor54.ENAME, $0), <($cor54.JOB, $1)), AND(>($cor55.ENAME, $0), <($cor55.JOB, $1)), AND(>($cor56.ENAME, $0), <($cor56.JOB, $1)), AND(>($cor57.ENAME, $0), <($cor57.JOB, $1)), AND(>($cor58.ENAME, $0), <($cor58.JOB, $1)), AND(>($cor59.ENAME, $0), <($cor59.JOB, $1)), AND(>($cor60.ENAME, $0), <($cor60.JOB, $1)), AND(>($cor61.ENAME, $0), <($cor61.JOB, $1)), AND(>($cor62.ENAME, $0), <($cor62.JOB, $1)), AND(>($cor63.ENAME, $0), <($cor63.JOB, $1)), AND(>($cor64.ENAME, $0), <($cor64.JOB, $1)), AND(>($cor65.ENAME, $0), <($cor65.JOB, $1)), AND(>($cor66.ENAME, $0), <($cor66.JOB, $1)), AND(>($cor67.ENAME, $0), <($cor67.JOB, $1)), AND(>($cor68.ENAME, $0), <($cor68.JOB, $1)), AND(>($cor69.ENAME, $0), <($cor69.JOB, $1)), AND(>($cor70.ENAME, $0), <($cor70.JOB, $1)), AND(>($cor71.ENAME, $0), <($cor71.JOB, $1)), AND(>($cor72.ENAME, $0), <($cor72.JOB, $1)), AND(>($cor73.ENAME, $0), <($cor73.JOB, $1)), AND(>($cor74.ENAME, $0), <($cor74.JOB, $1)), AND(>($cor75.ENAME, $0), <($cor75.JOB, $1)), AND(>($cor76.ENAME, $0), <($cor76.JOB, $1)), AND(>($cor77.ENAME, $0), <($cor77.JOB, $1)), AND(>($cor78.ENAME, $0), <($cor78.JOB, $1)), AND(>($cor79.ENAME, $0), <($cor79.JOB, $1)), AND(>($cor80.ENAME, $0), <($cor80.JOB, $1)), AND(>($cor81.ENAME, $0), <($cor81.JOB, $1)), AND(>($cor82.ENAME, $0), <($cor82.JOB, $1)), AND(>($cor83.ENAME, $0), <($cor83.JOB, $1)), AND(>($cor84.ENAME, $0), <($cor84.JOB, $1)), AND(>($cor85.ENAME, $0), <($cor85.JOB, $1)), AND(>($cor86.ENAME, $0), <($cor86.JOB, $1)), AND(>($cor87.ENAME, $0), <($cor87.JOB, $1)), AND(>($cor88.ENAME, $0), <($cor88.JOB, $1)), AND(>($cor89.ENAME, $0), <($cor89.JOB, $1)), AND(>($cor90.ENAME, $0), <($cor90.JOB, $1)), AND(>($cor91.ENAME, $0), <($cor91.JOB, $1)), AND(>($cor92.ENAME, $0), <($cor92.JOB, $1)), AND(>($cor93.ENAME, $0), <($cor93.JOB, $1)), AND(>($cor94.ENAME, $0), <($cor94.JOB, $1)), AND(>($cor95.ENAME, $0), <($cor95.JOB, $1)), AND(>($cor96.ENAME, $0), <($cor96.JOB, $1)), AND(>($cor97.ENAME, $0), <($cor97.JOB, $1)), AND(>($cor98.ENAME, $0), <($cor98.JOB, $1)), AND(>($cor99.ENAME, $0), <($cor99.JOB, $1)))])
+    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortProjectDerive2">
+  <TestCase name="testCorrelateInnerJoinDeriveLeft">
     <Resource name="sql">
-      <![CDATA[select distinct ename, sal*-2, mgr
-from (select ename, mgr, sal from sales.emp order by ename, mgr, sal limit 100) t]]>
+      <![CDATA[select * from emp e
+join dept d on e.deptno=d.deptno
+order by e.ename]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalAggregate(group=[{0, 1, 2}])
-  LogicalProject(ENAME=[$0], EXPR$1=[*($2, -2)], MGR=[$1])
-    LogicalSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC], fetch=[100])
-      LogicalProject(ENAME=[$1], MGR=[$3], SAL=[$5])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+LogicalSort(sort0=[$1], dir0=[ASC])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableSortedAggregate(group=[{0, 1, 2}])
-  EnumerableSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC])
-    EnumerableProject(ENAME=[$0], EXPR$1=[*($2, -2)], MGR=[$1])
-      EnumerableLimit(fetch=[100])
-        EnumerableSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC])
-          EnumerableProject(ENAME=[$1], MGR=[$3], SAL=[$5])
-            EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+EnumerableCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{7}])
+  EnumerableSort(sort0=[$1], dir0=[ASC])
+    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+  EnumerableFilter(condition=[=($cor0.DEPTNO, $0)])
+    EnumerableTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortProjectOnRexCall">
+  <TestCase name="testCorrelateInnerJoinNoDerive">
     <Resource name="sql">
-      <![CDATA[select ename, sal * -1 as sal, mgr from
-sales.emp order by ename desc, sal desc, mgr desc nulls last]]>
+      <![CDATA[select * from emp e
+join dept d on e.deptno=d.deptno
+order by e.ename, d.name]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[DESC], dir2=[DESC-nulls-last])
-  LogicalProject(ENAME=[$1], SAL=[*($5, -1)], MGR=[$3])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+LogicalSort(sort0=[$1], sort1=[$10], dir0=[ASC], dir1=[ASC])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[DESC], dir2=[DESC-nulls-last])
-  EnumerableProject(ENAME=[$1], SAL=[*($5, -1)], MGR=[$3])
+EnumerableSort(sort0=[$1], sort1=[$10], dir0=[ASC], dir1=[ASC])
+  EnumerableCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{7}])
     EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+    EnumerableFilter(condition=[=($cor0.DEPTNO, $0)])
+      EnumerableTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortProjectDeriveOnRexCall">
+  <TestCase name="testCorrelateLeftJoinDeriveLeft">
     <Resource name="sql">
-      <![CDATA[select * from
-(select ename, sal * -1 as sal, max_job from
-(select ename, sal, max(job) as max_job from sales.emp group by ename, sal) t) r
-join sales.bonus s on r.sal=s.sal and r.ename=s.ename]]>
+      <![CDATA[select * from emp e
+left join dept d on e.deptno=d.deptno
+order by e.ename]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(ENAME=[$0], SAL=[$1], MAX_JOB=[$2], ENAME0=[$3], JOB=[$4], SAL0=[$5], COMM=[$6])
-  LogicalJoin(condition=[AND(=($1, $5), =($0, $3))], joinType=[inner])
-    LogicalProject(ENAME=[$0], SAL=[*($1, -1)], MAX_JOB=[$2])
-      LogicalAggregate(group=[{0, 1}], MAX_JOB=[MAX($2)])
-        LogicalProject(ENAME=[$1], SAL=[$5], JOB=[$2])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+LogicalSort(sort0=[$1], dir0=[ASC])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableMergeJoin(condition=[AND(=($1, $5), =($0, $3))], joinType=[inner])
-  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
-    EnumerableProject(ENAME=[$0], SAL=[*($1, -1)], MAX_JOB=[$2])
-      EnumerableSortedAggregate(group=[{1, 5}], MAX_JOB=[MAX($2)])
-        EnumerableSort(sort0=[$1], sort1=[$5], dir0=[ASC], dir1=[ASC])
-          EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableSort(sort0=[$2], sort1=[$0], dir0=[ASC], dir1=[ASC])
-    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+EnumerableCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+  EnumerableSort(sort0=[$1], dir0=[ASC])
+    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+  EnumerableFilter(condition=[=($cor0.DEPTNO, $0)])
+    EnumerableTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortProjectWhenCastLeadingToMonotonic">
+  <TestCase name="testCorrelateLeftJoinNoDerive">
     <Resource name="sql">
-      <![CDATA[select deptno from sales.emp order by cast(deptno as float) desc]]>
+      <![CDATA[select * from emp e
+left join dept d on e.deptno=d.deptno
+order by e.ename, d.name]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$1], dir0=[DESC])
-  LogicalProject(DEPTNO=[$7], EXPR$1=[CAST($7):FLOAT NOT NULL])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+LogicalSort(sort0=[$1], sort1=[$10], dir0=[ASC], dir1=[ASC])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
+    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableSort(sort0=[$1], dir0=[DESC])
-  EnumerableProject(DEPTNO=[$7], EXPR$1=[CAST($7):FLOAT NOT NULL])
+EnumerableSort(sort0=[$1], sort1=[$10], dir0=[ASC], dir1=[ASC])
+  EnumerableCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
     EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+    EnumerableFilter(condition=[=($cor0.DEPTNO, $0)])
+      EnumerableTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortProjectWhenCastLeadingToNonMonotonic">
+  <TestCase name="testCorrelateSemiJoinDeriveLeft">
     <Resource name="sql">
-      <![CDATA[select deptno from sales.emp order by cast(deptno as varchar) desc]]>
+      <![CDATA[select * from dept d
+where exists (select 1 from emp e where e.deptno=d.deptno)
+order by d.name]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$1], dir0=[DESC])
-  LogicalProject(DEPTNO=[$7], EXPR$1=[CAST($7):VARCHAR NOT NULL])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+LogicalSort(sort0=[$1], dir0=[ASC])
+  LogicalProject(DEPTNO=[$0], NAME=[$1])
+    LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO0=[CAST($2):INTEGER], $f1=[CAST($3):BOOLEAN])
+      LogicalJoin(condition=[=($0, $2)], joinType=[inner])
+        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+        LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
+          LogicalProject(DEPTNO=[$7], $f0=[true])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableSort(sort0=[$1], dir0=[DESC])
-  EnumerableProject(DEPTNO=[$7], EXPR$1=[CAST($7):VARCHAR NOT NULL])
-    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+EnumerableCorrelate(correlation=[$cor2], joinType=[semi], requiredColumns=[{0}])
+  EnumerableSort(sort0=[$1], dir0=[ASC])
+    EnumerableTableScan(table=[[CATALOG, SALES, DEPT]])
+  EnumerableFilter(condition=[=($cor2.DEPTNO, $0)])
+    EnumerableProject(DEPTNO=[$7], $f0=[true])
+      EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortProjectDeriveWhenCastLeadingToNonMonotonic">
+  <TestCase name="testHashJoinFullOuterJoinNotPushDownSort">
     <Resource name="sql">
       <![CDATA[select * from
-(select ename, cast(job as numeric) as job, max_sal + 1 from
-(select ename, job, max(sal) as max_sal from sales.emp group by ename, job) t) r
-join sales.bonus s on r.job=s.job and r.ename=s.ename]]>
+sales.emp r full outer join sales.bonus s on r.ename=s.ename and r.job=s.job
+order by r.job desc nulls last, r.ename nulls first]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$4], JOB0=[$5], SAL=[$6], COMM=[$7])
-  LogicalJoin(condition=[AND(=($3, $8), =($0, $4))], joinType=[inner])
-    LogicalProject(ENAME=[$0], JOB=[CAST($1):DECIMAL(19, 0) NOT NULL], EXPR$2=[+($2, 1)], JOB0=[CAST(CAST($1):DECIMAL(19, 0) NOT NULL):DECIMAL(19, 9) NOT NULL])
-      LogicalAggregate(group=[{0, 1}], MAX_SAL=[MAX($2)])
-        LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], JOB0=[CAST($1):DECIMAL(19, 9) NOT NULL])
+LogicalSort(sort0=[$2], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENAME0=[$9], JOB0=[$10], SAL0=[$11], COMM0=[$12])
+    LogicalJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[full])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
       LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$4], JOB0=[$5], SAL=[$6], COMM=[$7])
-  EnumerableMergeJoin(condition=[AND(=($3, $8), =($0, $4))], joinType=[inner])
-    EnumerableSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[ASC])
-      EnumerableProject(ENAME=[$0], JOB=[CAST($1):DECIMAL(19, 0) NOT NULL], EXPR$2=[+($2, 1)], JOB0=[CAST(CAST($1):DECIMAL(19, 0) NOT NULL):DECIMAL(19, 9) NOT NULL])
-        EnumerableSortedAggregate(group=[{1, 2}], MAX_SAL=[MAX($5)])
-          EnumerableSort(sort0=[$1], sort1=[$2], dir0=[ASC], dir1=[ASC])
-            EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-    EnumerableSort(sort0=[$4], sort1=[$0], dir0=[ASC], dir1=[ASC])
-      EnumerableProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], JOB0=[CAST($1):DECIMAL(19, 9) NOT NULL])
-        EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+EnumerableSort(sort0=[$2], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first])
+  EnumerableHashJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[full])
+    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortProjectDeriveWhenCastLeadingToMonotonic">
+  <TestCase name="testHashJoinInnerJoinPushDownSort">
     <Resource name="sql">
       <![CDATA[select * from
-(select ename, cast(job as varchar) as job, max_sal + 1 from
-(select ename, job, max(sal) as max_sal from sales.emp group by ename, job) t) r
-join sales.bonus s on r.job=s.job and r.ename=s.ename]]>
+(select contactno, email from customer.contact_peek) r inner join
+(select acctno, type from customer.account) s
+on r.contactno=s.acctno and r.email=s.type
+order by r.contactno desc, r.email desc]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
-  LogicalJoin(condition=[AND(=($1, $7), =($0, $3))], joinType=[inner])
-    LogicalProject(ENAME=[$0], JOB=[CAST($1):VARCHAR NOT NULL], EXPR$2=[+($2, 1)])
-      LogicalAggregate(group=[{0, 1}], MAX_SAL=[MAX($2)])
-        LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], JOB0=[CAST($1):VARCHAR NOT NULL])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+LogicalSort(sort0=[$0], sort1=[$1], dir0=[DESC], dir1=[DESC])
+  LogicalProject(CONTACTNO=[$0], EMAIL=[$1], ACCTNO=[$2], TYPE=[$3])
+    LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[inner])
+      LogicalProject(CONTACTNO=[$0], EMAIL=[$3])
+        LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+      LogicalProject(ACCTNO=[$0], TYPE=[$1])
+        LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
-  EnumerableMergeJoin(condition=[AND(=($1, $7), =($0, $3))], joinType=[inner])
-    EnumerableProject(ENAME=[$0], JOB=[CAST($1):VARCHAR NOT NULL], EXPR$2=[+($2, 1)])
-      EnumerableSortedAggregate(group=[{1, 2}], MAX_SAL=[MAX($5)])
-        EnumerableSort(sort0=[$2], sort1=[$1], dir0=[ASC], dir1=[ASC])
-          EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-    EnumerableSort(sort0=[$4], sort1=[$0], dir0=[ASC], dir1=[ASC])
-      EnumerableProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], JOB0=[CAST($1):VARCHAR NOT NULL])
-        EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
-]]>
-    </Resource>
-  </TestCase>
-  <TestCase name="testSortProjectDerive3">
+EnumerableHashJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[inner])
+  EnumerableSort(sort0=[$0], sort1=[$1], dir0=[DESC], dir1=[DESC])
+    EnumerableProject(CONTACTNO=[$0], EMAIL=[$3])
+      EnumerableTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+  EnumerableProject(ACCTNO=[$0], TYPE=[$1])
+    EnumerableTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testHashJoinLeftOuterJoinPushDownSort">
     <Resource name="sql">
       <![CDATA[select * from
-(select ename, cast(job as varchar) as job, sal + 1 from
-(select ename, job, sal from sales.emp limit 100) t) r
-join sales.bonus s on r.job=s.job and r.ename=s.ename]]>
+(select contactno, email from customer.contact_peek) r left outer join
+(select acctno, type from customer.account) s
+on r.contactno=s.acctno and r.email=s.type
+order by r.contactno desc, r.email desc]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
-  LogicalJoin(condition=[AND(=($1, $7), =($0, $3))], joinType=[inner])
-    LogicalProject(ENAME=[$0], JOB=[CAST($1):VARCHAR NOT NULL], EXPR$2=[+($2, 1)])
-      LogicalSort(fetch=[100])
-        LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], JOB0=[CAST($1):VARCHAR NOT NULL])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+LogicalSort(sort0=[$0], sort1=[$1], dir0=[DESC], dir1=[DESC])
+  LogicalProject(CONTACTNO=[$0], EMAIL=[$1], ACCTNO=[$2], TYPE=[$3])
+    LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[left])
+      LogicalProject(CONTACTNO=[$0], EMAIL=[$3])
+        LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+      LogicalProject(ACCTNO=[$0], TYPE=[$1])
+        LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
-  EnumerableMergeJoin(condition=[AND(=($1, $7), =($0, $3))], joinType=[inner])
-    EnumerableProject(ENAME=[$0], JOB=[CAST($1):VARCHAR NOT NULL], EXPR$2=[+($2, 1)])
-      EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
-        EnumerableLimit(fetch=[100])
-          EnumerableProject(ENAME=[$1], JOB=[$2], SAL=[$5])
-            EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-    EnumerableSort(sort0=[$4], sort1=[$0], dir0=[ASC], dir1=[ASC])
-      EnumerableProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], JOB0=[CAST($1):VARCHAR NOT NULL])
-        EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+EnumerableHashJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[left])
+  EnumerableSort(sort0=[$0], sort1=[$1], dir0=[DESC], dir1=[DESC])
+    EnumerableProject(CONTACTNO=[$0], EMAIL=[$3])
+      EnumerableTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+  EnumerableProject(ACCTNO=[$0], TYPE=[$1])
+    EnumerableTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortProjectDerive4">
+  <TestCase name="testHashJoinLeftOuterJoinPushDownSort2">
     <Resource name="sql">
       <![CDATA[select * from
-(select ename, cast(job as bigint) as job, sal + 1 from
-(select ename, job, sal from sales.emp limit 100) t) r
-join sales.bonus s on r.job=s.job and r.ename=s.ename]]>
+customer.contact_peek r left outer join
+customer.account s
+on r.contactno=s.acctno and r.email=s.type
+order by r.fname desc]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
-  LogicalJoin(condition=[AND(=($1, $7), =($0, $3))], joinType=[inner])
-    LogicalProject(ENAME=[$0], JOB=[CAST($1):BIGINT NOT NULL], EXPR$2=[+($2, 1)])
-      LogicalSort(fetch=[100])
-        LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], JOB0=[CAST($1):BIGINT NOT NULL])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
+  LogicalSort(sort0=[$1], dir0=[DESC])
+    LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[$7], COORD_NE8=[$8], COORD_NE9=[$9], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
+      LogicalJoin(condition=[AND(=($0, $10), =($3, $11))], joinType=[left])
+        LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
+          LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+        LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
-  EnumerableMergeJoin(condition=[AND(=($1, $7), =($0, $3))], joinType=[inner])
-    EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
-      EnumerableProject(ENAME=[$0], JOB=[CAST($1):BIGINT NOT NULL], EXPR$2=[+($2, 1)])
-        EnumerableLimit(fetch=[100])
-          EnumerableProject(ENAME=[$1], JOB=[$2], SAL=[$5])
-            EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-    EnumerableSort(sort0=[$4], sort1=[$0], dir0=[ASC], dir1=[ASC])
-      EnumerableProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], JOB0=[CAST($1):BIGINT NOT NULL])
-        EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
+  EnumerableHashJoin(condition=[AND(=($0, $10), =($3, $11))], joinType=[left])
+    EnumerableSort(sort0=[$1], dir0=[DESC])
+      EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
+        EnumerableTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+    EnumerableTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortProjectDerive5">
+  <TestCase name="testHashJoinRightOuterJoinPushDownSort">
     <Resource name="sql">
-      <![CDATA[select ename, empno*-1, job from
-(select * from sales.emp order by ename, empno, job limit 10) order by ename, job]]>
+      <![CDATA[select * from
+(select contactno, email from customer.contact_peek) r right outer join
+(select acctno, type from customer.account) s
+on r.contactno=s.acctno and r.email=s.type
+order by s.acctno desc, s.type desc]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$0], sort1=[$2], dir0=[ASC], dir1=[ASC])
-  LogicalProject(ENAME=[$1], EXPR$1=[*($0, -1)], JOB=[$2])
-    LogicalSort(sort0=[$1], sort1=[$0], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC], fetch=[10])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+LogicalSort(sort0=[$2], sort1=[$3], dir0=[DESC], dir1=[DESC])
+  LogicalProject(CONTACTNO=[$0], EMAIL=[$1], ACCTNO=[$2], TYPE=[$3])
+    LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[right])
+      LogicalProject(CONTACTNO=[$0], EMAIL=[$3])
+        LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+      LogicalProject(ACCTNO=[$0], TYPE=[$1])
+        LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableProject(ENAME=[$1], EXPR$1=[*($0, -1)], JOB=[$2])
-  EnumerableSort(sort0=[$1], sort1=[$2], dir0=[ASC], dir1=[ASC])
-    EnumerableLimit(fetch=[10])
-      EnumerableSort(sort0=[$1], sort1=[$0], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC])
-        EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+EnumerableSort(sort0=[$2], sort1=[$3], dir0=[DESC], dir1=[DESC])
+  EnumerableHashJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[right])
+    EnumerableProject(CONTACTNO=[$0], EMAIL=[$3])
+      EnumerableTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+    EnumerableProject(ACCTNO=[$0], TYPE=[$1])
+      EnumerableTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortProjectDerive">
+  <TestCase name="testHashJoinTraitDerivation">
     <Resource name="sql">
       <![CDATA[select * from
-(select ename, job, max_sal + 1 from
-(select ename, job, max(sal) as max_sal from sales.emp group by ename, job) t) r
-join sales.bonus s on r.job=s.job and r.ename=s.ename]]>
+(select ename, job, mgr from sales.emp order by ename desc, job desc, mgr limit 10) r
+join sales.bonus s on r.ename=s.ename and r.job=s.job
+order by r.ename desc, r.job desc]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
-  LogicalJoin(condition=[AND(=($1, $4), =($0, $3))], joinType=[inner])
-    LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[+($2, 1)])
-      LogicalAggregate(group=[{0, 1}], MAX_SAL=[MAX($2)])
-        LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
+LogicalSort(sort0=[$0], sort1=[$1], dir0=[DESC], dir1=[DESC])
+  LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
+    LogicalJoin(condition=[AND(=($0, $3), =($1, $4))], joinType=[inner])
+      LogicalSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[DESC], dir2=[ASC], fetch=[10])
+        LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableMergeJoin(condition=[AND(=($1, $4), =($0, $3))], joinType=[inner])
-  EnumerableProject(ENAME=[$0], JOB=[$1], EXPR$2=[+($2, 1)])
-    EnumerableSortedAggregate(group=[{1, 2}], MAX_SAL=[MAX($5)])
-      EnumerableSort(sort0=[$2], sort1=[$1], dir0=[ASC], dir1=[ASC])
+EnumerableHashJoin(condition=[AND(=($0, $3), =($1, $4))], joinType=[inner])
+  EnumerableLimit(fetch=[10])
+    EnumerableSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[DESC], dir2=[ASC])
+      EnumerableProject(ENAME=[$1], JOB=[$2], MGR=[$3])
         EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
-    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+  EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortProjectDerive6">
+  <TestCase name="testHashJoinTraitDerivation2">
     <Resource name="sql">
-      <![CDATA[select comm, deptno, slacker from
-(select * from sales.emp order by comm, deptno, slacker limit 10) t
-order by comm, slacker]]>
+      <![CDATA[select * from
+(select ename, job, mgr from sales.emp order by mgr desc limit 10) r
+join sales.bonus s on r.ename=s.ename and r.job=s.job
+order by r.mgr desc]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$0], sort1=[$2], dir0=[ASC], dir1=[ASC])
-  LogicalProject(COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-    LogicalSort(sort0=[$6], sort1=[$7], sort2=[$8], dir0=[ASC], dir1=[ASC], dir2=[ASC], fetch=[10])
-      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+LogicalSort(sort0=[$2], dir0=[DESC])
+  LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
+    LogicalJoin(condition=[AND(=($0, $3), =($1, $4))], joinType=[inner])
+      LogicalSort(sort0=[$2], dir0=[DESC], fetch=[10])
+        LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableProject(COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
-  EnumerableSort(sort0=[$6], sort1=[$8], dir0=[ASC], dir1=[ASC])
-    EnumerableLimit(fetch=[10])
-      EnumerableSort(sort0=[$6], sort1=[$7], sort2=[$8], dir0=[ASC], dir1=[ASC], dir2=[ASC])
+EnumerableHashJoin(condition=[AND(=($0, $3), =($1, $4))], joinType=[inner])
+  EnumerableLimit(fetch=[10])
+    EnumerableSort(sort0=[$2], dir0=[DESC])
+      EnumerableProject(ENAME=[$1], JOB=[$2], MGR=[$3])
         EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+  EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortFilter">
+  <TestCase name="testHashJoinTraitDerivationNegativeCase">
     <Resource name="sql">
-      <![CDATA[select ename, job, mgr, max_sal from
-(select ename, job, mgr, max(sal) as max_sal from sales.emp group by ename, job, mgr) as t
-where max_sal > 1000
-order by mgr desc, ename]]>
+      <![CDATA[select * from
+(select ename, job, mgr from sales.emp order by mgr desc limit 10) r
+join sales.bonus s on r.ename=s.ename and r.job=s.job
+order by r.mgr]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$2], sort1=[$0], dir0=[DESC], dir1=[ASC])
-  LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], MAX_SAL=[$3])
-    LogicalFilter(condition=[>($3, 1000)])
-      LogicalAggregate(group=[{0, 1, 2}], MAX_SAL=[MAX($3)])
-        LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3], SAL=[$5])
+LogicalSort(sort0=[$2], dir0=[ASC])
+  LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
+    LogicalJoin(condition=[AND(=($0, $3), =($1, $4))], joinType=[inner])
+      LogicalSort(sort0=[$2], dir0=[DESC], fetch=[10])
+        LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableFilter(condition=[>($3, 1000)])
-  EnumerableSortedAggregate(group=[{1, 2, 3}], MAX_SAL=[MAX($5)])
-    EnumerableSort(sort0=[$3], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[ASC], dir2=[ASC])
-      EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+EnumerableSort(sort0=[$2], dir0=[ASC])
+  EnumerableHashJoin(condition=[AND(=($0, $3), =($1, $4))], joinType=[inner])
+    EnumerableLimit(fetch=[10])
+      EnumerableSort(sort0=[$2], dir0=[DESC])
+        EnumerableProject(ENAME=[$1], JOB=[$2], MGR=[$3])
+          EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortFilterDerive">
+  <TestCase name="testMergeJoinDeriveLeft1">
     <Resource name="sql">
       <![CDATA[select * from
-(select ename, job, max_sal from
-(select ename, job, max(sal) as max_sal from sales.emp group by ename, job) t where job > 1000) r
+(select ename, job, max(sal) from sales.emp group by ename, job) r
 join sales.bonus s on r.job=s.job and r.ename=s.ename]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(ENAME=[$0], JOB=[$1], MAX_SAL=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
+LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
   LogicalJoin(condition=[AND(=($1, $4), =($0, $3))], joinType=[inner])
-    LogicalProject(ENAME=[$0], JOB=[$1], MAX_SAL=[$2])
-      LogicalFilter(condition=[>(CAST($1):INTEGER NOT NULL, 1000)])
-        LogicalAggregate(group=[{0, 1}], MAX_SAL=[MAX($2)])
-          LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[MAX($2)])
+      LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
 EnumerableMergeJoin(condition=[AND(=($1, $4), =($0, $3))], joinType=[inner])
-  EnumerableSortedAggregate(group=[{1, 2}], MAX_SAL=[MAX($5)])
+  EnumerableSortedAggregate(group=[{1, 2}], EXPR$2=[MAX($5)])
     EnumerableSort(sort0=[$2], sort1=[$1], dir0=[ASC], dir1=[ASC])
-      EnumerableFilter(condition=[>(CAST($2):INTEGER NOT NULL, 1000)])
-        EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+      EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
   EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
     EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortAggPartialKey">
+  <TestCase name="testMergeJoinDeriveLeft2">
     <Resource name="sql">
-      <![CDATA[select mgr,deptno,comm,count(*) from sales.emp
-group by mgr,deptno,comm
-order by comm desc nulls last, deptno nulls first]]>
+      <![CDATA[select * from
+(select ename, job, mgr, max(sal) from sales.emp group by ename, job, mgr) r
+join sales.bonus s on r.job=s.job and r.ename=s.ename]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$2], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first])
-  LogicalAggregate(group=[{0, 1, 2}], EXPR$3=[COUNT()])
-    LogicalProject(MGR=[$3], DEPTNO=[$7], COMM=[$6])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], EXPR$3=[$3], ENAME0=[$4], JOB0=[$5], SAL=[$6], COMM=[$7])
+  LogicalJoin(condition=[AND(=($1, $5), =($0, $4))], joinType=[inner])
+    LogicalAggregate(group=[{0, 1, 2}], EXPR$3=[MAX($3)])
+      LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3], SAL=[$5])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableProject(MGR=[$0], DEPTNO=[$2], COMM=[$1], EXPR$3=[$3])
-  EnumerableSortedAggregate(group=[{3, 6, 7}], EXPR$3=[COUNT()])
-    EnumerableSort(sort0=[$6], sort1=[$7], sort2=[$3], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first], dir2=[ASC])
-      EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+EnumerableMergeJoin(condition=[AND(=($1, $5), =($0, $4))], joinType=[inner])
+  EnumerableSortedAggregate(group=[{1, 2, 3}], EXPR$3=[MAX($5)])
+    EnumerableSort(sort0=[$2], sort1=[$1], sort2=[$3], dir0=[ASC], dir1=[ASC], dir2=[ASC])
+      EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
+    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortMergeJoin">
+  <TestCase name="testMergeJoinDeriveRight1">
     <Resource name="sql">
-      <![CDATA[select * from
-sales.emp r join sales.bonus s on r.ename=s.ename and r.job=s.job
-order by r.job desc nulls last, r.ename nulls first]]>
+      <![CDATA[select * from sales.bonus s join
+(select ename, job, max(sal) from sales.emp group by ename, job) r
+on r.job=s.job and r.ename=s.ename]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$2], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENAME0=[$9], JOB0=[$10], SAL0=[$11], COMM0=[$12])
-    LogicalJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], ENAME0=[$4], JOB0=[$5], EXPR$2=[$6])
+  LogicalJoin(condition=[AND(=($5, $1), =($4, $0))], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+    LogicalAggregate(group=[{0, 1}], EXPR$2=[MAX($2)])
+      LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableMergeJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
-  EnumerableSort(sort0=[$2], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first])
-    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first])
+EnumerableMergeJoin(condition=[AND(=($1, $5), =($0, $4))], joinType=[inner])
+  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
     EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+  EnumerableSortedAggregate(group=[{1, 2}], EXPR$2=[MAX($5)])
+    EnumerableSort(sort0=[$2], sort1=[$1], dir0=[ASC], dir1=[ASC])
+      EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
-    <TestCase name="testSortMergeJoinSubsetKey">
-        <Resource name="sql">
-            <![CDATA[select * from
-        sales.emp r join sales.bonus s on r.ename=s.ename and r.job=s.job
-        order by r.job desc nulls last]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$2], dir0=[DESC-nulls-last])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENAME0=[$9], JOB0=[$10], SAL0=[$11], COMM0=[$12])
-    LogicalJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-EnumerableMergeJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
-  EnumerableSort(sort0=[$2], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC])
-    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[DESC-nulls-last], dir1=[ASC])
-    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortMergeJoinSubsetKey2">
-        <Resource name="sql">
-            <![CDATA[select * from
-        sales.emp r join sales.bonus s on r.ename=s.ename and r.job=s.job and r.sal = s.sal
-        order by r.sal, r.ename desc nulls last]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$5], sort1=[$1], dir0=[ASC], dir1=[DESC-nulls-last])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENAME0=[$9], JOB0=[$10], SAL0=[$11], COMM0=[$12])
-    LogicalJoin(condition=[AND(=($1, $9), =($2, $10), =($5, $11))], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-EnumerableMergeJoin(condition=[AND(=($1, $9), =($2, $10), =($5, $11))], joinType=[inner])
-  EnumerableSort(sort0=[$5], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[DESC-nulls-last], dir2=[ASC])
-    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableSort(sort0=[$2], sort1=[$0], sort2=[$1], dir0=[ASC], dir1=[DESC-nulls-last], dir2=[ASC])
-    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
-]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortMergeJoinSupersetKey">
-        <Resource name="sql">
-            <![CDATA[select * from
-        sales.emp r join sales.bonus s on r.ename=s.ename and r.job=s.job
-        order by r.job desc nulls last, r.ename, r.sal desc]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$2], sort1=[$1], sort2=[$5], dir0=[DESC-nulls-last], dir1=[ASC], dir2=[DESC])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENAME0=[$9], JOB0=[$10], SAL0=[$11], COMM0=[$12])
-    LogicalJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+  <TestCase name="testMergeJoinDeriveRight2">
+    <Resource name="sql">
+      <![CDATA[select * from sales.bonus s join
+(select ename, job, mgr, max(sal) from sales.emp group by ename, job, mgr) r
+on r.job=s.job and r.ename=s.ename]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], ENAME0=[$4], JOB0=[$5], MGR=[$6], EXPR$3=[$7])
+  LogicalJoin(condition=[AND(=($5, $1), =($4, $0))], joinType=[inner])
+    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+    LogicalAggregate(group=[{0, 1, 2}], EXPR$3=[MAX($3)])
+      LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3], SAL=[$5])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-EnumerableMergeJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
-  EnumerableSort(sort0=[$2], sort1=[$1], sort2=[$5], dir0=[DESC-nulls-last], dir1=[ASC], dir2=[DESC])
-    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[DESC-nulls-last], dir1=[ASC])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+EnumerableMergeJoin(condition=[AND(=($1, $5), =($0, $4))], joinType=[inner])
+  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
     EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+  EnumerableSortedAggregate(group=[{1, 2, 3}], EXPR$3=[MAX($5)])
+    EnumerableSort(sort0=[$2], sort1=[$1], sort2=[$3], dir0=[ASC], dir1=[ASC], dir2=[ASC])
+      EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
-        </Resource>
-    </TestCase>
-  <TestCase name="testSortMergeJoinRight">
+    </Resource>
+  </TestCase>
+  <TestCase name="testNestedLoopJoinLeftOuterJoinPushDownSort">
     <Resource name="sql">
       <![CDATA[select * from
-sales.emp r join sales.bonus s on r.ename=s.ename and r.job=s.job
-order by s.job desc nulls last, s.ename nulls first]]>
+ customer.contact_peek r left outer join
+customer.account s
+on r.contactno>s.acctno and r.email<s.type
+order by r.contactno desc, r.email desc]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$10], sort1=[$9], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENAME0=[$9], JOB0=[$10], SAL0=[$11], COMM0=[$12])
-    LogicalJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
+  LogicalSort(sort0=[$0], sort1=[$3], dir0=[DESC], dir1=[DESC])
+    LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[$7], COORD_NE8=[$8], COORD_NE9=[$9], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
+      LogicalJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[left])
+        LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
+          LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+        LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableMergeJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
-  EnumerableSort(sort0=[$2], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first])
-    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first])
-    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
+  EnumerableNestedLoopJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[left])
+    EnumerableSort(sort0=[$0], sort1=[$3], dir0=[DESC], dir1=[DESC])
+      EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
+        EnumerableTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+    EnumerableTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
     </Resource>
   </TestCase>
-    <TestCase name="testSortMergeJoinRightSubsetKey">
-        <Resource name="sql">
-            <![CDATA[select * from
-        sales.emp r join sales.bonus s on r.ename=s.ename and r.job=s.job
-        order by s.job desc nulls last]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$10], dir0=[DESC-nulls-last])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENAME0=[$9], JOB0=[$10], SAL0=[$11], COMM0=[$12])
-    LogicalJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+  <TestCase name="testNestedLoopJoinLeftOuterJoinPushDownSort2">
+    <Resource name="sql">
+      <![CDATA[select * from
+ customer.contact_peek r left outer join
+customer.account s
+on r.contactno>s.acctno and r.email<s.type
+order by r.fname desc]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
+  LogicalSort(sort0=[$1], dir0=[DESC])
+    LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[$7], COORD_NE8=[$8], COORD_NE9=[$9], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
+      LogicalJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[left])
+        LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
+          LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+        LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-EnumerableMergeJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
-  EnumerableSort(sort0=[$2], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC])
-    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[DESC-nulls-last], dir1=[ASC])
-    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
+  EnumerableNestedLoopJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[left])
+    EnumerableSort(sort0=[$1], dir0=[DESC])
+      EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
+        EnumerableTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+    EnumerableTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortMergeJoinRightSubsetKey2">
-        <Resource name="sql">
-            <![CDATA[select * from
-        sales.emp r join sales.bonus s on r.ename=s.ename and r.job=s.job and r.sal = s.sal
-        order by s.sal, s.ename desc nulls last]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$11], sort1=[$9], dir0=[ASC], dir1=[DESC-nulls-last])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENAME0=[$9], JOB0=[$10], SAL0=[$11], COMM0=[$12])
-    LogicalJoin(condition=[AND(=($1, $9), =($2, $10), =($5, $11))], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testNestedLoopJoinLeftOuterJoinSortKeyOnRightInput">
+    <Resource name="sql">
+      <![CDATA[select * from
+ customer.contact_peek r left outer join
+customer.account s
+on r.contactno>s.acctno and r.email<s.type
+order by s.acctno desc, s.type desc]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
+  LogicalSort(sort0=[$10], sort1=[$11], dir0=[DESC], dir1=[DESC])
+    LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[$7], COORD_NE8=[$8], COORD_NE9=[$9], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
+      LogicalJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[left])
+        LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
+          LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+        LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-EnumerableMergeJoin(condition=[AND(=($1, $9), =($2, $10), =($5, $11))], joinType=[inner])
-  EnumerableSort(sort0=[$5], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[DESC-nulls-last], dir2=[ASC])
-    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableSort(sort0=[$2], sort1=[$0], sort2=[$1], dir0=[ASC], dir1=[DESC-nulls-last], dir2=[ASC])
-    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
+  EnumerableSort(sort0=[$10], sort1=[$11], dir0=[DESC], dir1=[DESC])
+    EnumerableNestedLoopJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[left])
+      EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
+        EnumerableTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+      EnumerableTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
-        </Resource>
-    </TestCase>
-    <TestCase name="testSortMergeJoinRightSupersetKey">
-        <Resource name="sql">
-            <![CDATA[select * from
-        sales.emp r join sales.bonus s on r.ename=s.ename and r.job=s.job
-        order by s.job desc nulls last, s.ename, s.sal desc]]>
-        </Resource>
-        <Resource name="planBefore">
-            <![CDATA[
-LogicalSort(sort0=[$10], sort1=[$9], sort2=[$11], dir0=[DESC-nulls-last], dir1=[ASC], dir2=[DESC])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENAME0=[$9], JOB0=[$10], SAL0=[$11], COMM0=[$12])
-    LogicalJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+    </Resource>
+  </TestCase>
+  <TestCase name="testNestedLoopJoinRightOuterJoinSortPushDown">
+    <Resource name="sql">
+      <![CDATA[select r.contactno, r.email, s.acctno, s.type from
+ customer.contact_peek r right outer join
+customer.account s
+on r.contactno>s.acctno and r.email<s.type
+order by s.acctno desc, s.type desc]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalSort(sort0=[$2], sort1=[$3], dir0=[DESC], dir1=[DESC])
+  LogicalProject(CONTACTNO=[$0], EMAIL=[$3], ACCTNO=[$10], TYPE=[$11])
+    LogicalJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[right])
+      LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
+        LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+      LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
-        </Resource>
-        <Resource name="planAfter">
-            <![CDATA[
-EnumerableMergeJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
-  EnumerableSort(sort0=[$2], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC])
-    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableSort(sort0=[$1], sort1=[$0], sort2=[$2], dir0=[DESC-nulls-last], dir1=[ASC], dir2=[DESC])
-    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+EnumerableSort(sort0=[$2], sort1=[$3], dir0=[DESC], dir1=[DESC])
+  EnumerableProject(CONTACTNO=[$0], EMAIL=[$3], ACCTNO=[$10], TYPE=[$11])
+    EnumerableNestedLoopJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[right])
+      EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
+        EnumerableTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
+      EnumerableTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
 ]]>
-        </Resource>
-    </TestCase>
-  <TestCase name="testMergeJoinDeriveLeft1">
+    </Resource>
+  </TestCase>
+  <TestCase name="testNestedLoopJoinTraitDerivation">
     <Resource name="sql">
       <![CDATA[select * from
-(select ename, job, max(sal) from sales.emp group by ename, job) r
-join sales.bonus s on r.job=s.job and r.ename=s.ename]]>
+(select ename, job, mgr from sales.emp order by ename desc, job desc, mgr limit 10) r
+join sales.bonus s on r.ename>s.ename and r.job<s.job
+order by r.ename desc, r.job desc]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
-  LogicalJoin(condition=[AND(=($1, $4), =($0, $3))], joinType=[inner])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[MAX($2)])
-      LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+LogicalSort(sort0=[$0], sort1=[$1], dir0=[DESC], dir1=[DESC])
+  LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
+    LogicalJoin(condition=[AND(>($0, $3), <($1, $4))], joinType=[inner])
+      LogicalSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[DESC], dir2=[ASC], fetch=[10])
+        LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableMergeJoin(condition=[AND(=($1, $4), =($0, $3))], joinType=[inner])
-  EnumerableSortedAggregate(group=[{1, 2}], EXPR$2=[MAX($5)])
-    EnumerableSort(sort0=[$2], sort1=[$1], dir0=[ASC], dir1=[ASC])
-      EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
-    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+EnumerableNestedLoopJoin(condition=[AND(>($0, $3), <($1, $4))], joinType=[inner])
+  EnumerableLimit(fetch=[10])
+    EnumerableSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[DESC], dir2=[ASC])
+      EnumerableProject(ENAME=[$1], JOB=[$2], MGR=[$3])
+        EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+  EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testMergeJoinDeriveLeft2">
+  <TestCase name="testNestedLoopJoinTraitDerivation2">
     <Resource name="sql">
       <![CDATA[select * from
-(select ename, job, mgr, max(sal) from sales.emp group by ename, job, mgr) r
-join sales.bonus s on r.job=s.job and r.ename=s.ename]]>
+(select ename, job, mgr from sales.emp order by mgr limit 10) r
+join sales.bonus s on r.ename>s.ename and r.job<s.job
+order by r.mgr]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], EXPR$3=[$3], ENAME0=[$4], JOB0=[$5], SAL=[$6], COMM=[$7])
-  LogicalJoin(condition=[AND(=($1, $5), =($0, $4))], joinType=[inner])
-    LogicalAggregate(group=[{0, 1, 2}], EXPR$3=[MAX($3)])
-      LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3], SAL=[$5])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+LogicalSort(sort0=[$2], dir0=[ASC])
+  LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
+    LogicalJoin(condition=[AND(>($0, $3), <($1, $4))], joinType=[inner])
+      LogicalSort(sort0=[$2], dir0=[ASC], fetch=[10])
+        LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableMergeJoin(condition=[AND(=($1, $5), =($0, $4))], joinType=[inner])
-  EnumerableSortedAggregate(group=[{1, 2, 3}], EXPR$3=[MAX($5)])
-    EnumerableSort(sort0=[$2], sort1=[$1], sort2=[$3], dir0=[ASC], dir1=[ASC], dir2=[ASC])
-      EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
-    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+EnumerableNestedLoopJoin(condition=[AND(>($0, $3), <($1, $4))], joinType=[inner])
+  EnumerableLimit(fetch=[10])
+    EnumerableSort(sort0=[$2], dir0=[ASC])
+      EnumerableProject(ENAME=[$1], JOB=[$2], MGR=[$3])
+        EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+  EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testMergeJoinDeriveRight1">
+  <TestCase name="testNestedLoopJoinTraitDerivationNegativeCase">
     <Resource name="sql">
-      <![CDATA[select * from sales.bonus s join
-(select ename, job, max(sal) from sales.emp group by ename, job) r
-on r.job=s.job and r.ename=s.ename]]>
+      <![CDATA[select * from
+(select ename, job, mgr from sales.emp order by mgr limit 10) r
+join sales.bonus s on r.ename>s.ename and r.job<s.job
+order by r.mgr desc]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], ENAME0=[$4], JOB0=[$5], EXPR$2=[$6])
-  LogicalJoin(condition=[AND(=($5, $1), =($4, $0))], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-    LogicalAggregate(group=[{0, 1}], EXPR$2=[MAX($2)])
-      LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+LogicalSort(sort0=[$2], dir0=[DESC])
+  LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
+    LogicalJoin(condition=[AND(>($0, $3), <($1, $4))], joinType=[inner])
+      LogicalSort(sort0=[$2], dir0=[ASC], fetch=[10])
+        LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableMergeJoin(condition=[AND(=($1, $5), =($0, $4))], joinType=[inner])
-  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
+EnumerableSort(sort0=[$2], dir0=[DESC])
+  EnumerableNestedLoopJoin(condition=[AND(>($0, $3), <($1, $4))], joinType=[inner])
+    EnumerableLimit(fetch=[10])
+      EnumerableSort(sort0=[$2], dir0=[ASC])
+        EnumerableProject(ENAME=[$1], JOB=[$2], MGR=[$3])
+          EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
     EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
-  EnumerableSortedAggregate(group=[{1, 2}], EXPR$2=[MAX($5)])
-    EnumerableSort(sort0=[$2], sort1=[$1], dir0=[ASC], dir1=[ASC])
-      EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testMergeJoinDeriveRight2">
+  <TestCase name="testSortAgg">
     <Resource name="sql">
-      <![CDATA[select * from sales.bonus s join
-(select ename, job, mgr, max(sal) from sales.emp group by ename, job, mgr) r
-on r.job=s.job and r.ename=s.ename]]>
+      <![CDATA[select mgr, count(*) from sales.emp
+group by mgr order by mgr desc nulls last limit 5]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], ENAME0=[$4], JOB0=[$5], MGR=[$6], EXPR$3=[$7])
-  LogicalJoin(condition=[AND(=($5, $1), =($4, $0))], joinType=[inner])
-    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
-    LogicalAggregate(group=[{0, 1, 2}], EXPR$3=[MAX($3)])
-      LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3], SAL=[$5])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+LogicalSort(sort0=[$0], dir0=[DESC-nulls-last], fetch=[5])
+  LogicalAggregate(group=[{0}], EXPR$1=[COUNT()])
+    LogicalProject(MGR=[$3])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableMergeJoin(condition=[AND(=($1, $5), =($0, $4))], joinType=[inner])
-  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
-    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
-  EnumerableSortedAggregate(group=[{1, 2, 3}], EXPR$3=[MAX($5)])
-    EnumerableSort(sort0=[$2], sort1=[$1], sort2=[$3], dir0=[ASC], dir1=[ASC], dir2=[ASC])
+EnumerableLimit(fetch=[5])
+  EnumerableSortedAggregate(group=[{3}], EXPR$1=[COUNT()])
+    EnumerableSort(sort0=[$3], dir0=[DESC-nulls-last])
       EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testHashJoinFullOuterJoinNotPushDownSort">
+  <TestCase name="testSortAggPartialKey">
     <Resource name="sql">
-      <![CDATA[select * from
-sales.emp r full outer join sales.bonus s on r.ename=s.ename and r.job=s.job
-order by r.job desc nulls last, r.ename nulls first]]>
+      <![CDATA[select mgr,deptno,comm,count(*) from sales.emp
+group by mgr,deptno,comm
+order by comm desc nulls last, deptno nulls first]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
 LogicalSort(sort0=[$2], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENAME0=[$9], JOB0=[$10], SAL0=[$11], COMM0=[$12])
-    LogicalJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[full])
+  LogicalAggregate(group=[{0, 1, 2}], EXPR$3=[COUNT()])
+    LogicalProject(MGR=[$3], DEPTNO=[$7], COMM=[$6])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableSort(sort0=[$2], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first])
-  EnumerableHashJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[full])
-    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+EnumerableProject(MGR=[$0], DEPTNO=[$2], COMM=[$1], EXPR$3=[$3])
+  EnumerableSortedAggregate(group=[{3, 6, 7}], EXPR$3=[COUNT()])
+    EnumerableSort(sort0=[$6], sort1=[$7], sort2=[$3], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first], dir2=[ASC])
+      EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testHashJoinLeftOuterJoinPushDownSort">
+  <TestCase name="testSortCalc">
     <Resource name="sql">
-      <![CDATA[select * from
-(select contactno, email from customer.contact_peek) r left outer join
-(select acctno, type from customer.account) s
-on r.contactno=s.acctno and r.email=s.type
-order by r.contactno desc, r.email desc]]>
+      <![CDATA[select mgr from sales.emp order by mgr desc nulls last]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$0], sort1=[$1], dir0=[DESC], dir1=[DESC])
-  LogicalProject(CONTACTNO=[$0], EMAIL=[$1], ACCTNO=[$2], TYPE=[$3])
-    LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[left])
-      LogicalProject(CONTACTNO=[$0], EMAIL=[$3])
-        LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-      LogicalProject(ACCTNO=[$0], TYPE=[$1])
-        LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+LogicalSort(sort0=[$0], dir0=[DESC-nulls-last])
+  LogicalProject(MGR=[$3])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableHashJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[left])
-  EnumerableSort(sort0=[$0], sort1=[$1], dir0=[DESC], dir1=[DESC])
-    EnumerableProject(CONTACTNO=[$0], EMAIL=[$3])
-      EnumerableTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-  EnumerableProject(ACCTNO=[$0], TYPE=[$1])
-    EnumerableTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+EnumerableSort(sort0=[$0], dir0=[DESC-nulls-last])
+  EnumerableCalc(expr#0..8=[{inputs}], MGR=[$t3])
+    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testHashJoinLeftOuterJoinPushDownSort2">
+  <TestCase name="testSortCalcDerive1">
     <Resource name="sql">
       <![CDATA[select * from
-customer.contact_peek r left outer join
-customer.account s
-on r.contactno=s.acctno and r.email=s.type
-order by r.fname desc]]>
+(select ename, job, max_sal + 1 from
+(select ename, job, max(sal) as max_sal from sales.emp group by ename, job) t) r
+join sales.bonus s on r.job=s.job and r.ename=s.ename]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
-  LogicalSort(sort0=[$1], dir0=[DESC])
-    LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[$7], COORD_NE8=[$8], COORD_NE9=[$9], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
-      LogicalJoin(condition=[AND(=($0, $10), =($3, $11))], joinType=[left])
-        LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
-          LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-        LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
+  LogicalJoin(condition=[AND(=($1, $4), =($0, $3))], joinType=[inner])
+    LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[+($2, 1)])
+      LogicalAggregate(group=[{0, 1}], MAX_SAL=[MAX($2)])
+        LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
-  EnumerableHashJoin(condition=[AND(=($0, $10), =($3, $11))], joinType=[left])
-    EnumerableSort(sort0=[$1], dir0=[DESC])
-      EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
-        EnumerableTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-    EnumerableTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+EnumerableMergeJoin(condition=[AND(=($1, $4), =($0, $3))], joinType=[inner])
+  EnumerableCalc(expr#0..2=[{inputs}], expr#3=[1], expr#4=[+($t2, $t3)], proj#0..1=[{exprs}], EXPR$2=[$t4])
+    EnumerableSortedAggregate(group=[{1, 2}], MAX_SAL=[MAX($5)])
+      EnumerableSort(sort0=[$2], sort1=[$1], dir0=[ASC], dir1=[ASC])
+        EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
+    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testHashJoinInnerJoinPushDownSort">
+  <TestCase name="testSortCalcDerive2">
     <Resource name="sql">
-      <![CDATA[select * from
-(select contactno, email from customer.contact_peek) r inner join
-(select acctno, type from customer.account) s
-on r.contactno=s.acctno and r.email=s.type
-order by r.contactno desc, r.email desc]]>
+      <![CDATA[select distinct ename, sal*-2, mgr
+from (select ename, mgr, sal from sales.emp order by ename, mgr, sal limit 100) t]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$0], sort1=[$1], dir0=[DESC], dir1=[DESC])
-  LogicalProject(CONTACTNO=[$0], EMAIL=[$1], ACCTNO=[$2], TYPE=[$3])
-    LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[inner])
-      LogicalProject(CONTACTNO=[$0], EMAIL=[$3])
-        LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-      LogicalProject(ACCTNO=[$0], TYPE=[$1])
-        LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+LogicalAggregate(group=[{0, 1, 2}])
+  LogicalProject(ENAME=[$0], EXPR$1=[*($2, -2)], MGR=[$1])
+    LogicalSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC], fetch=[100])
+      LogicalProject(ENAME=[$1], MGR=[$3], SAL=[$5])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableHashJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[inner])
-  EnumerableSort(sort0=[$0], sort1=[$1], dir0=[DESC], dir1=[DESC])
-    EnumerableProject(CONTACTNO=[$0], EMAIL=[$3])
-      EnumerableTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-  EnumerableProject(ACCTNO=[$0], TYPE=[$1])
-    EnumerableTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+EnumerableSortedAggregate(group=[{0, 1, 2}])
+  EnumerableSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC])
+    EnumerableCalc(expr#0..2=[{inputs}], expr#3=[-2], expr#4=[*($t2, $t3)], ENAME=[$t0], EXPR$1=[$t4], MGR=[$t1])
+      EnumerableLimit(fetch=[100])
+        EnumerableSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC])
+          EnumerableCalc(expr#0..8=[{inputs}], ENAME=[$t1], MGR=[$t3], SAL=[$t5])
+            EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testSortCalcDerive3">
+    <Resource name="sql">
+      <![CDATA[select * from
+(select ename, cast(job as varchar) as job, sal + 1 from
+(select ename, job, sal from sales.emp limit 100) t) r
+join sales.bonus s on r.job=s.job and r.ename=s.ename]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
+  LogicalJoin(condition=[AND(=($1, $7), =($0, $3))], joinType=[inner])
+    LogicalProject(ENAME=[$0], JOB=[CAST($1):VARCHAR NOT NULL], EXPR$2=[+($2, 1)])
+      LogicalSort(fetch=[100])
+        LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], JOB0=[CAST($1):VARCHAR NOT NULL])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+EnumerableCalc(expr#0..7=[{inputs}], proj#0..6=[{exprs}])
+  EnumerableMergeJoin(condition=[AND(=($1, $7), =($0, $3))], joinType=[inner])
+    EnumerableCalc(expr#0..2=[{inputs}], expr#3=[CAST($t1):VARCHAR NOT NULL], expr#4=[1], expr#5=[+($t2, $t4)], ENAME=[$t0], JOB=[$t3], EXPR$2=[$t5])
+      EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
+        EnumerableLimit(fetch=[100])
+          EnumerableCalc(expr#0..8=[{inputs}], ENAME=[$t1], JOB=[$t2], SAL=[$t5])
+            EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+    EnumerableSort(sort0=[$4], sort1=[$0], dir0=[ASC], dir1=[ASC])
+      EnumerableCalc(expr#0..3=[{inputs}], expr#4=[CAST($t1):VARCHAR NOT NULL], proj#0..4=[{exprs}])
+        EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testHashJoinRightOuterJoinPushDownSort">
+  <TestCase name="testSortCalcOnRexCall">
     <Resource name="sql">
-      <![CDATA[select * from
-(select contactno, email from customer.contact_peek) r right outer join
-(select acctno, type from customer.account) s
-on r.contactno=s.acctno and r.email=s.type
-order by s.acctno desc, s.type desc]]>
+      <![CDATA[select ename, sal * -1 as sal, mgr from
+sales.emp order by ename desc, sal desc, mgr desc nulls last]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$2], sort1=[$3], dir0=[DESC], dir1=[DESC])
-  LogicalProject(CONTACTNO=[$0], EMAIL=[$1], ACCTNO=[$2], TYPE=[$3])
-    LogicalJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[right])
-      LogicalProject(CONTACTNO=[$0], EMAIL=[$3])
-        LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-      LogicalProject(ACCTNO=[$0], TYPE=[$1])
-        LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+LogicalSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[DESC], dir2=[DESC-nulls-last])
+  LogicalProject(ENAME=[$1], SAL=[*($5, -1)], MGR=[$3])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableSort(sort0=[$2], sort1=[$3], dir0=[DESC], dir1=[DESC])
-  EnumerableHashJoin(condition=[AND(=($0, $2), =($1, $3))], joinType=[right])
-    EnumerableProject(CONTACTNO=[$0], EMAIL=[$3])
-      EnumerableTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-    EnumerableProject(ACCTNO=[$0], TYPE=[$1])
-      EnumerableTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+EnumerableSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[DESC], dir2=[DESC-nulls-last])
+  EnumerableCalc(expr#0..8=[{inputs}], expr#9=[-1], expr#10=[*($t5, $t9)], ENAME=[$t1], SAL=[$t10], MGR=[$t3])
+    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testHashJoinTraitDerivation">
+  <TestCase name="testSortCalcWhenCastLeadingToMonotonic">
     <Resource name="sql">
-      <![CDATA[select * from
-(select ename, job, mgr from sales.emp order by ename desc, job desc, mgr limit 10) r
-join sales.bonus s on r.ename=s.ename and r.job=s.job
-order by r.ename desc, r.job desc]]>
+      <![CDATA[select cast(deptno as float) from sales.emp order by deptno desc]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$0], sort1=[$1], dir0=[DESC], dir1=[DESC])
-  LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
-    LogicalJoin(condition=[AND(=($0, $3), =($1, $4))], joinType=[inner])
-      LogicalSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[DESC], dir2=[ASC], fetch=[10])
-        LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+LogicalSort(sort0=[$1], dir0=[DESC])
+  LogicalProject(EXPR$0=[CAST($7):FLOAT NOT NULL], DEPTNO=[$7])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableHashJoin(condition=[AND(=($0, $3), =($1, $4))], joinType=[inner])
-  EnumerableLimit(fetch=[10])
-    EnumerableSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[DESC], dir2=[ASC])
-      EnumerableProject(ENAME=[$1], JOB=[$2], MGR=[$3])
-        EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+EnumerableSort(sort0=[$1], dir0=[DESC])
+  EnumerableCalc(expr#0..8=[{inputs}], expr#9=[CAST($t7):FLOAT NOT NULL], EXPR$0=[$t9], DEPTNO=[$t7])
+    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testHashJoinTraitDerivation2">
+  <TestCase name="testSortCalcWhenCastLeadingToNonMonotonic">
     <Resource name="sql">
-      <![CDATA[select * from
-(select ename, job, mgr from sales.emp order by mgr desc limit 10) r
-join sales.bonus s on r.ename=s.ename and r.job=s.job
-order by r.mgr desc]]>
+      <![CDATA[select deptno from sales.emp order by cast(deptno as varchar) desc]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$2], dir0=[DESC])
-  LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
-    LogicalJoin(condition=[AND(=($0, $3), =($1, $4))], joinType=[inner])
-      LogicalSort(sort0=[$2], dir0=[DESC], fetch=[10])
-        LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+LogicalSort(sort0=[$1], dir0=[DESC])
+  LogicalProject(DEPTNO=[$7], EXPR$1=[CAST($7):VARCHAR NOT NULL])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableHashJoin(condition=[AND(=($0, $3), =($1, $4))], joinType=[inner])
-  EnumerableLimit(fetch=[10])
-    EnumerableSort(sort0=[$2], dir0=[DESC])
-      EnumerableProject(ENAME=[$1], JOB=[$2], MGR=[$3])
-        EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+EnumerableSort(sort0=[$1], dir0=[DESC])
+  EnumerableCalc(expr#0..8=[{inputs}], expr#9=[CAST($t7):VARCHAR NOT NULL], DEPTNO=[$t7], EXPR$1=[$t9])
+    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testHashJoinTraitDerivationNegativeCase">
+  <TestCase name="testSortCalcWithFilter">
     <Resource name="sql">
-      <![CDATA[select * from
-(select ename, job, mgr from sales.emp order by mgr desc limit 10) r
-join sales.bonus s on r.ename=s.ename and r.job=s.job
-order by r.mgr]]>
+      <![CDATA[select ename, job, mgr, max_sal from
+(select ename, job, mgr, max(sal) as max_sal from sales.emp group by ename, job, mgr) as t
+where max_sal > 1000
+order by mgr desc, ename]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$2], dir0=[ASC])
-  LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
-    LogicalJoin(condition=[AND(=($0, $3), =($1, $4))], joinType=[inner])
-      LogicalSort(sort0=[$2], dir0=[DESC], fetch=[10])
-        LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3])
+LogicalSort(sort0=[$2], sort1=[$0], dir0=[DESC], dir1=[ASC])
+  LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], MAX_SAL=[$3])
+    LogicalFilter(condition=[>($3, 1000)])
+      LogicalAggregate(group=[{0, 1, 2}], MAX_SAL=[MAX($3)])
+        LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3], SAL=[$5])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableSort(sort0=[$2], dir0=[ASC])
-  EnumerableHashJoin(condition=[AND(=($0, $3), =($1, $4))], joinType=[inner])
-    EnumerableLimit(fetch=[10])
-      EnumerableSort(sort0=[$2], dir0=[DESC])
-        EnumerableProject(ENAME=[$1], JOB=[$2], MGR=[$3])
-          EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+EnumerableCalc(expr#0..3=[{inputs}], expr#4=[1000], expr#5=[>($t3, $t4)], proj#0..3=[{exprs}], $condition=[$t5])
+  EnumerableSortedAggregate(group=[{1, 2, 3}], MAX_SAL=[MAX($5)])
+    EnumerableSort(sort0=[$3], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[ASC], dir2=[ASC])
+      EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testNestedLoopJoinTraitDerivation">
+  <TestCase name="testSortFilter">
     <Resource name="sql">
-      <![CDATA[select * from
-(select ename, job, mgr from sales.emp order by ename desc, job desc, mgr limit 10) r
-join sales.bonus s on r.ename>s.ename and r.job<s.job
-order by r.ename desc, r.job desc]]>
+      <![CDATA[select ename, job, mgr, max_sal from
+(select ename, job, mgr, max(sal) as max_sal from sales.emp group by ename, job, mgr) as t
+where max_sal > 1000
+order by mgr desc, ename]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$0], sort1=[$1], dir0=[DESC], dir1=[DESC])
-  LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
-    LogicalJoin(condition=[AND(>($0, $3), <($1, $4))], joinType=[inner])
-      LogicalSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[DESC], dir2=[ASC], fetch=[10])
-        LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3])
+LogicalSort(sort0=[$2], sort1=[$0], dir0=[DESC], dir1=[ASC])
+  LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], MAX_SAL=[$3])
+    LogicalFilter(condition=[>($3, 1000)])
+      LogicalAggregate(group=[{0, 1, 2}], MAX_SAL=[MAX($3)])
+        LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3], SAL=[$5])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableNestedLoopJoin(condition=[AND(>($0, $3), <($1, $4))], joinType=[inner])
-  EnumerableLimit(fetch=[10])
-    EnumerableSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[DESC], dir2=[ASC])
-      EnumerableProject(ENAME=[$1], JOB=[$2], MGR=[$3])
-        EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+EnumerableFilter(condition=[>($3, 1000)])
+  EnumerableSortedAggregate(group=[{1, 2, 3}], MAX_SAL=[MAX($5)])
+    EnumerableSort(sort0=[$3], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[ASC], dir2=[ASC])
+      EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testNestedLoopJoinTraitDerivation2">
+  <TestCase name="testSortFilterDerive">
     <Resource name="sql">
       <![CDATA[select * from
-(select ename, job, mgr from sales.emp order by mgr limit 10) r
-join sales.bonus s on r.ename>s.ename and r.job<s.job
-order by r.mgr]]>
+(select ename, job, max_sal from
+(select ename, job, max(sal) as max_sal from sales.emp group by ename, job) t where job > 1000) r
+join sales.bonus s on r.job=s.job and r.ename=s.ename]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$2], dir0=[ASC])
-  LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
-    LogicalJoin(condition=[AND(>($0, $3), <($1, $4))], joinType=[inner])
-      LogicalSort(sort0=[$2], dir0=[ASC], fetch=[10])
-        LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
+LogicalProject(ENAME=[$0], JOB=[$1], MAX_SAL=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
+  LogicalJoin(condition=[AND(=($1, $4), =($0, $3))], joinType=[inner])
+    LogicalProject(ENAME=[$0], JOB=[$1], MAX_SAL=[$2])
+      LogicalFilter(condition=[>(CAST($1):INTEGER NOT NULL, 1000)])
+        LogicalAggregate(group=[{0, 1}], MAX_SAL=[MAX($2)])
+          LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
+            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableNestedLoopJoin(condition=[AND(>($0, $3), <($1, $4))], joinType=[inner])
-  EnumerableLimit(fetch=[10])
-    EnumerableSort(sort0=[$2], dir0=[ASC])
-      EnumerableProject(ENAME=[$1], JOB=[$2], MGR=[$3])
+EnumerableMergeJoin(condition=[AND(=($1, $4), =($0, $3))], joinType=[inner])
+  EnumerableSortedAggregate(group=[{1, 2}], MAX_SAL=[MAX($5)])
+    EnumerableSort(sort0=[$2], sort1=[$1], dir0=[ASC], dir1=[ASC])
+      EnumerableFilter(condition=[>(CAST($2):INTEGER NOT NULL, 1000)])
         EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
+    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testNestedLoopJoinTraitDerivationNegativeCase">
+  <TestCase name="testSortMergeJoin">
     <Resource name="sql">
       <![CDATA[select * from
-(select ename, job, mgr from sales.emp order by mgr limit 10) r
-join sales.bonus s on r.ename>s.ename and r.job<s.job
-order by r.mgr desc]]>
+sales.emp r join sales.bonus s on r.ename=s.ename and r.job=s.job
+order by r.job desc nulls last, r.ename nulls first]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$2], dir0=[DESC])
-  LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
-    LogicalJoin(condition=[AND(>($0, $3), <($1, $4))], joinType=[inner])
-      LogicalSort(sort0=[$2], dir0=[ASC], fetch=[10])
-        LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+LogicalSort(sort0=[$2], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENAME0=[$9], JOB0=[$10], SAL0=[$11], COMM0=[$12])
+    LogicalJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
       LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableSort(sort0=[$2], dir0=[DESC])
-  EnumerableNestedLoopJoin(condition=[AND(>($0, $3), <($1, $4))], joinType=[inner])
-    EnumerableLimit(fetch=[10])
-      EnumerableSort(sort0=[$2], dir0=[ASC])
-        EnumerableProject(ENAME=[$1], JOB=[$2], MGR=[$3])
-          EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+EnumerableMergeJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
+  EnumerableSort(sort0=[$2], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first])
+    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first])
     EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testNestedLoopJoinLeftOuterJoinPushDownSort">
+  <TestCase name="testSortMergeJoinRight">
     <Resource name="sql">
       <![CDATA[select * from
- customer.contact_peek r left outer join
-customer.account s
-on r.contactno>s.acctno and r.email<s.type
-order by r.contactno desc, r.email desc]]>
+sales.emp r join sales.bonus s on r.ename=s.ename and r.job=s.job
+order by s.job desc nulls last, s.ename nulls first]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
-  LogicalSort(sort0=[$0], sort1=[$3], dir0=[DESC], dir1=[DESC])
-    LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[$7], COORD_NE8=[$8], COORD_NE9=[$9], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
-      LogicalJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[left])
-        LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
-          LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-        LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+LogicalSort(sort0=[$10], sort1=[$9], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENAME0=[$9], JOB0=[$10], SAL0=[$11], COMM0=[$12])
+    LogicalJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
-  EnumerableNestedLoopJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[left])
-    EnumerableSort(sort0=[$0], sort1=[$3], dir0=[DESC], dir1=[DESC])
-      EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
-        EnumerableTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-    EnumerableTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+EnumerableMergeJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
+  EnumerableSort(sort0=[$2], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first])
+    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[DESC-nulls-last], dir1=[ASC-nulls-first])
+    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testNestedLoopJoinLeftOuterJoinPushDownSort2">
+  <TestCase name="testSortMergeJoinRightSubsetKey">
     <Resource name="sql">
-      <![CDATA[select * from
- customer.contact_peek r left outer join
-customer.account s
-on r.contactno>s.acctno and r.email<s.type
-order by r.fname desc]]>
+      <![CDATA[select * from
+sales.emp r join sales.bonus s on r.ename=s.ename and r.job=s.job
+order by s.job desc nulls last]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
-  LogicalSort(sort0=[$1], dir0=[DESC])
-    LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[$7], COORD_NE8=[$8], COORD_NE9=[$9], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
-      LogicalJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[left])
-        LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
-          LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-        LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+LogicalSort(sort0=[$10], dir0=[DESC-nulls-last])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENAME0=[$9], JOB0=[$10], SAL0=[$11], COMM0=[$12])
+    LogicalJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
-  EnumerableNestedLoopJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[left])
-    EnumerableSort(sort0=[$1], dir0=[DESC])
-      EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
-        EnumerableTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-    EnumerableTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+EnumerableMergeJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
+  EnumerableSort(sort0=[$2], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC])
+    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[DESC-nulls-last], dir1=[ASC])
+    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testNestedLoopJoinLeftOuterJoinSortKeyOnRightInput">
+  <TestCase name="testSortMergeJoinRightSubsetKey2">
     <Resource name="sql">
       <![CDATA[select * from
- customer.contact_peek r left outer join
-customer.account s
-on r.contactno>s.acctno and r.email<s.type
-order by s.acctno desc, s.type desc]]>
+sales.emp r join sales.bonus s on r.ename=s.ename and r.job=s.job and r.sal = s.sal
+order by s.sal, s.ename desc nulls last]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
-  LogicalSort(sort0=[$10], sort1=[$11], dir0=[DESC], dir1=[DESC])
-    LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[$7], COORD_NE8=[$8], COORD_NE9=[$9], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
-      LogicalJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[left])
-        LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
-          LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-        LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+LogicalSort(sort0=[$11], sort1=[$9], dir0=[ASC], dir1=[DESC-nulls-last])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENAME0=[$9], JOB0=[$10], SAL0=[$11], COMM0=[$12])
+    LogicalJoin(condition=[AND(=($1, $9), =($2, $10), =($5, $11))], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
-  EnumerableSort(sort0=[$10], sort1=[$11], dir0=[DESC], dir1=[DESC])
-    EnumerableNestedLoopJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[left])
-      EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
-        EnumerableTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-      EnumerableTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+EnumerableMergeJoin(condition=[AND(=($1, $9), =($2, $10), =($5, $11))], joinType=[inner])
+  EnumerableSort(sort0=[$5], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[DESC-nulls-last], dir2=[ASC])
+    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+  EnumerableSort(sort0=[$2], sort1=[$0], sort2=[$1], dir0=[ASC], dir1=[DESC-nulls-last], dir2=[ASC])
+    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testNestedLoopJoinRightOuterJoinSortPushDown">
+  <TestCase name="testSortMergeJoinRightSupersetKey">
     <Resource name="sql">
-      <![CDATA[select r.contactno, r.email, s.acctno, s.type from
- customer.contact_peek r right outer join
-customer.account s
-on r.contactno>s.acctno and r.email<s.type
-order by s.acctno desc, s.type desc]]>
+      <![CDATA[select * from
+sales.emp r join sales.bonus s on r.ename=s.ename and r.job=s.job
+order by s.job desc nulls last, s.ename, s.sal desc]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$2], sort1=[$3], dir0=[DESC], dir1=[DESC])
-  LogicalProject(CONTACTNO=[$0], EMAIL=[$3], ACCTNO=[$10], TYPE=[$11])
-    LogicalJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[right])
-      LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
-        LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-      LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+LogicalSort(sort0=[$10], sort1=[$9], sort2=[$11], dir0=[DESC-nulls-last], dir1=[ASC], dir2=[DESC])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENAME0=[$9], JOB0=[$10], SAL0=[$11], COMM0=[$12])
+    LogicalJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
+      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableSort(sort0=[$2], sort1=[$3], dir0=[DESC], dir1=[DESC])
-  EnumerableProject(CONTACTNO=[$0], EMAIL=[$3], ACCTNO=[$10], TYPE=[$11])
-    EnumerableNestedLoopJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[right])
-      EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
-        EnumerableTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-      EnumerableTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+EnumerableMergeJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
+  EnumerableSort(sort0=[$2], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC])
+    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+  EnumerableSort(sort0=[$1], sort1=[$0], sort2=[$2], dir0=[DESC-nulls-last], dir1=[ASC], dir2=[DESC])
+    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testCorrelateInnerJoinDeriveLeft">
+  <TestCase name="testSortMergeJoinSubsetKey">
     <Resource name="sql">
-      <![CDATA[select * from emp e
-join dept d on e.deptno=d.deptno
-order by e.ename]]>
+      <![CDATA[select * from
+sales.emp r join sales.bonus s on r.ename=s.ename and r.job=s.job
+order by r.job desc nulls last]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$1], dir0=[ASC])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+LogicalSort(sort0=[$2], dir0=[DESC-nulls-last])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENAME0=[$9], JOB0=[$10], SAL0=[$11], COMM0=[$12])
+    LogicalJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{7}])
-  EnumerableSort(sort0=[$1], dir0=[ASC])
+EnumerableMergeJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
+  EnumerableSort(sort0=[$2], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC])
     EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableFilter(condition=[=($cor0.DEPTNO, $0)])
-    EnumerableTableScan(table=[[CATALOG, SALES, DEPT]])
+  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[DESC-nulls-last], dir1=[ASC])
+    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testCorrelateInnerJoinNoDerive">
+  <TestCase name="testSortMergeJoinSubsetKey2">
     <Resource name="sql">
-      <![CDATA[select * from emp e
-join dept d on e.deptno=d.deptno
-order by e.ename, d.name]]>
+      <![CDATA[select * from
+sales.emp r join sales.bonus s on r.ename=s.ename and r.job=s.job and r.sal = s.sal
+order by r.sal, r.ename desc nulls last]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$1], sort1=[$10], dir0=[ASC], dir1=[ASC])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-    LogicalJoin(condition=[=($7, $9)], joinType=[inner])
+LogicalSort(sort0=[$5], sort1=[$1], dir0=[ASC], dir1=[DESC-nulls-last])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENAME0=[$9], JOB0=[$10], SAL0=[$11], COMM0=[$12])
+    LogicalJoin(condition=[AND(=($1, $9), =($2, $10), =($5, $11))], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableSort(sort0=[$1], sort1=[$10], dir0=[ASC], dir1=[ASC])
-  EnumerableCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{7}])
+EnumerableMergeJoin(condition=[AND(=($1, $9), =($2, $10), =($5, $11))], joinType=[inner])
+  EnumerableSort(sort0=[$5], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[DESC-nulls-last], dir2=[ASC])
     EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-    EnumerableFilter(condition=[=($cor0.DEPTNO, $0)])
-      EnumerableTableScan(table=[[CATALOG, SALES, DEPT]])
+  EnumerableSort(sort0=[$2], sort1=[$0], sort2=[$1], dir0=[ASC], dir1=[DESC-nulls-last], dir2=[ASC])
+    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testCorrelateLeftJoinDeriveLeft">
+  <TestCase name="testSortMergeJoinSupersetKey">
     <Resource name="sql">
-      <![CDATA[select * from emp e
-left join dept d on e.deptno=d.deptno
-order by e.ename]]>
+      <![CDATA[select * from
+sales.emp r join sales.bonus s on r.ename=s.ename and r.job=s.job
+order by r.job desc nulls last, r.ename, r.sal desc]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$1], dir0=[ASC])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-    LogicalJoin(condition=[=($7, $9)], joinType=[left])
+LogicalSort(sort0=[$2], sort1=[$1], sort2=[$5], dir0=[DESC-nulls-last], dir1=[ASC], dir2=[DESC])
+  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], ENAME0=[$9], JOB0=[$10], SAL0=[$11], COMM0=[$12])
+    LogicalJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
       LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
-  EnumerableSort(sort0=[$1], dir0=[ASC])
+EnumerableMergeJoin(condition=[AND(=($1, $9), =($2, $10))], joinType=[inner])
+  EnumerableSort(sort0=[$2], sort1=[$1], sort2=[$5], dir0=[DESC-nulls-last], dir1=[ASC], dir2=[DESC])
     EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableFilter(condition=[=($cor0.DEPTNO, $0)])
-    EnumerableTableScan(table=[[CATALOG, SALES, DEPT]])
+  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[DESC-nulls-last], dir1=[ASC])
+    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testCorrelateLeftJoinNoDerive">
+  <TestCase name="testSortProject">
     <Resource name="sql">
-      <![CDATA[select * from emp e
-left join dept d on e.deptno=d.deptno
-order by e.ename, d.name]]>
+      <![CDATA[select mgr from sales.emp order by mgr desc nulls last]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$1], sort1=[$10], dir0=[ASC], dir1=[ASC])
-  LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8], DEPTNO0=[$9], NAME=[$10])
-    LogicalJoin(condition=[=($7, $9)], joinType=[left])
-      LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-      LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
+LogicalSort(sort0=[$0], dir0=[DESC-nulls-last])
+  LogicalProject(MGR=[$3])
+    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableSort(sort0=[$1], sort1=[$10], dir0=[ASC], dir1=[ASC])
-  EnumerableCorrelate(correlation=[$cor0], joinType=[left], requiredColumns=[{7}])
+EnumerableSort(sort0=[$0], dir0=[DESC-nulls-last])
+  EnumerableProject(MGR=[$3])
     EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-    EnumerableFilter(condition=[=($cor0.DEPTNO, $0)])
-      EnumerableTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testCorrelateSemiJoinDeriveLeft">
+  <TestCase name="testSortProjectDerive">
     <Resource name="sql">
-      <![CDATA[select * from dept d
-where exists (select 1 from emp e where e.deptno=d.deptno)
-order by d.name]]>
+      <![CDATA[select * from
+(select ename, job, max_sal + 1 from
+(select ename, job, max(sal) as max_sal from sales.emp group by ename, job) t) r
+join sales.bonus s on r.job=s.job and r.ename=s.ename]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$1], dir0=[ASC])
-  LogicalProject(DEPTNO=[$0], NAME=[$1])
-    LogicalProject(DEPTNO=[$0], NAME=[$1], DEPTNO0=[CAST($2):INTEGER], $f1=[CAST($3):BOOLEAN])
-      LogicalJoin(condition=[=($0, $2)], joinType=[inner])
-        LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-        LogicalAggregate(group=[{0}], agg#0=[MIN($1)])
-          LogicalProject(DEPTNO=[$7], $f0=[true])
-            LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
+  LogicalJoin(condition=[AND(=($1, $4), =($0, $3))], joinType=[inner])
+    LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[+($2, 1)])
+      LogicalAggregate(group=[{0, 1}], MAX_SAL=[MAX($2)])
+        LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableCorrelate(correlation=[$cor2], joinType=[semi], requiredColumns=[{0}])
-  EnumerableSort(sort0=[$1], dir0=[ASC])
-    EnumerableTableScan(table=[[CATALOG, SALES, DEPT]])
-  EnumerableFilter(condition=[=($cor2.DEPTNO, $0)])
-    EnumerableProject(DEPTNO=[$7], $f0=[true])
-      EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+EnumerableMergeJoin(condition=[AND(=($1, $4), =($0, $3))], joinType=[inner])
+  EnumerableProject(ENAME=[$0], JOB=[$1], EXPR$2=[+($2, 1)])
+    EnumerableSortedAggregate(group=[{1, 2}], MAX_SAL=[MAX($5)])
+      EnumerableSort(sort0=[$2], sort1=[$1], dir0=[ASC], dir1=[ASC])
+        EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+  EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
+    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testBatchNestedLoopJoinLeftOuterJoinPushDownSort">
+  <TestCase name="testSortProjectDerive2">
     <Resource name="sql">
-      <![CDATA[select * from
- customer.contact_peek r left outer join
-customer.account s
-on r.contactno>s.acctno and r.email<s.type
-order by r.contactno desc, r.email desc]]>
+      <![CDATA[select distinct ename, sal*-2, mgr
+from (select ename, mgr, sal from sales.emp order by ename, mgr, sal limit 100) t]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
-  LogicalSort(sort0=[$0], sort1=[$3], dir0=[DESC], dir1=[DESC])
-    LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[$7], COORD_NE8=[$8], COORD_NE9=[$9], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
-      LogicalJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[left])
-        LogicalProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
-          LogicalTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-        LogicalTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+LogicalAggregate(group=[{0, 1, 2}])
+  LogicalProject(ENAME=[$0], EXPR$1=[*($2, -2)], MGR=[$1])
+    LogicalSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC], fetch=[100])
+      LogicalProject(ENAME=[$1], MGR=[$3], SAL=[$5])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4], Y=[$5], unit=[$6], COORD_NE=[ROW($7, ROW($8, $9))], ACCTNO=[$10], TYPE=[$11], BALANCE=[$12])
-  EnumerableBatchNestedLoopJoin(condition=[AND(>($0, $10), <($3, $11))], joinType=[left], batchSize=[100])
-    EnumerableSort(sort0=[$0], sort1=[$3], dir0=[DESC], dir1=[DESC])
-      EnumerableProject(CONTACTNO=[$0], FNAME=[$1], LNAME=[$2], EMAIL=[$3], X=[$4.X], Y=[$4.Y], unit=[$4.unit], M=[$5.M], A=[$5.SUB.A], B=[$5.SUB.B])
-        EnumerableTableScan(table=[[CATALOG, CUSTOMER, CONTACT_PEEK]])
-    EnumerableFilter(condition=[OR(AND(>($cor0.CONTACTNO, $0), <($cor0.EMAIL, $1)), AND(>($cor1.CONTACTNO, $0), <($cor1.EMAIL, $1)), AND(>($cor2.CONTACTNO, $0), <($cor2.EMAIL, $1)), AND(>($cor3.CONTACTNO, $0), <($cor3.EMAIL, $1)), AND(>($cor4.CONTACTNO, $0), <($cor4.EMAIL, $1)), AND(>($cor5.CONTACTNO, $0), <($cor5.EMAIL, $1)), AND(>($cor6.CONTACTNO, $0), <($cor6.EMAIL, $1)), AND(>($cor7.CONTACTNO, $0), <($cor7.EMAIL, $1)), AND(>($cor8.CONTACTNO, $0), <($cor8.EMAIL, $1)), AND(>($cor9.CONTACTNO, $0), <($cor9.EMAIL, $1)), AND(>($cor10.CONTACTNO, $0), <($cor10.EMAIL, $1)), AND(>($cor11.CONTACTNO, $0), <($cor11.EMAIL, $1)), AND(>($cor12.CONTACTNO, $0), <($cor12.EMAIL, $1)), AND(>($cor13.CONTACTNO, $0), <($cor13.EMAIL, $1)), AND(>($cor14.CONTACTNO, $0), <($cor14.EMAIL, $1)), AND(>($cor15.CONTACTNO, $0), <($cor15.EMAIL, $1)), AND(>($cor16.CONTACTNO, $0), <($cor16.EMAIL, $1)), AND(>($cor17.CONTACTNO, $0), <($cor17.EMAIL, $1)), AND(>($cor18.CONTACTNO, $0), <($cor18.EMAIL, $1)), AND(>($cor19.CONTACTNO, $0), <($cor19.EMAIL, $1)), AND(>($cor20.CONTACTNO, $0), <($cor20.EMAIL, $1)), AND(>($cor21.CONTACTNO, $0), <($cor21.EMAIL, $1)), AND(>($cor22.CONTACTNO, $0), <($cor22.EMAIL, $1)), AND(>($cor23.CONTACTNO, $0), <($cor23.EMAIL, $1)), AND(>($cor24.CONTACTNO, $0), <($cor24.EMAIL, $1)), AND(>($cor25.CONTACTNO, $0), <($cor25.EMAIL, $1)), AND(>($cor26.CONTACTNO, $0), <($cor26.EMAIL, $1)), AND(>($cor27.CONTACTNO, $0), <($cor27.EMAIL, $1)), AND(>($cor28.CONTACTNO, $0), <($cor28.EMAIL, $1)), AND(>($cor29.CONTACTNO, $0), <($cor29.EMAIL, $1)), AND(>($cor30.CONTACTNO, $0), <($cor30.EMAIL, $1)), AND(>($cor31.CONTACTNO, $0), <($cor31.EMAIL, $1)), AND(>($cor32.CONTACTNO, $0), <($cor32.EMAIL, $1)), AND(>($cor33.CONTACTNO, $0), <($cor33.EMAIL, $1)), AND(>($cor34.CONTACTNO, $0), <($cor34.EMAIL, $1)), AND(>($cor35.CONTACTNO, $0), <($cor35.EMAIL, $1)), AND(>($cor36.CONTACTNO, $0), <($cor36.EMAIL, $1)), AND(>($cor37.CONTACTNO, $0), <($cor37.EMAIL, $1)), AND(>($cor38.CONTACTNO, $0), <($cor38.EMAIL, $1)), AND(>($cor39.CONTACTNO, $0), <($cor39.EMAIL, $1)), AND(>($cor40.CONTACTNO, $0), <($cor40.EMAIL, $1)), AND(>($cor41.CONTACTNO, $0), <($cor41.EMAIL, $1)), AND(>($cor42.CONTACTNO, $0), <($cor42.EMAIL, $1)), AND(>($cor43.CONTACTNO, $0), <($cor43.EMAIL, $1)), AND(>($cor44.CONTACTNO, $0), <($cor44.EMAIL, $1)), AND(>($cor45.CONTACTNO, $0), <($cor45.EMAIL, $1)), AND(>($cor46.CONTACTNO, $0), <($cor46.EMAIL, $1)), AND(>($cor47.CONTACTNO, $0), <($cor47.EMAIL, $1)), AND(>($cor48.CONTACTNO, $0), <($cor48.EMAIL, $1)), AND(>($cor49.CONTACTNO, $0), <($cor49.EMAIL, $1)), AND(>($cor50.CONTACTNO, $0), <($cor50.EMAIL, $1)), AND(>($cor51.CONTACTNO, $0), <($cor51.EMAIL, $1)), AND(>($cor52.CONTACTNO, $0), <($cor52.EMAIL, $1)), AND(>($cor53.CONTACTNO, $0), <($cor53.EMAIL, $1)), AND(>($cor54.CONTACTNO, $0), <($cor54.EMAIL, $1)), AND(>($cor55.CONTACTNO, $0), <($cor55.EMAIL, $1)), AND(>($cor56.CONTACTNO, $0), <($cor56.EMAIL, $1)), AND(>($cor57.CONTACTNO, $0), <($cor57.EMAIL, $1)), AND(>($cor58.CONTACTNO, $0), <($cor58.EMAIL, $1)), AND(>($cor59.CONTACTNO, $0), <($cor59.EMAIL, $1)), AND(>($cor60.CONTACTNO, $0), <($cor60.EMAIL, $1)), AND(>($cor61.CONTACTNO, $0), <($cor61.EMAIL, $1)), AND(>($cor62.CONTACTNO, $0), <($cor62.EMAIL, $1)), AND(>($cor63.CONTACTNO, $0), <($cor63.EMAIL, $1)), AND(>($cor64.CONTACTNO, $0), <($cor64.EMAIL, $1)), AND(>($cor65.CONTACTNO, $0), <($cor65.EMAIL, $1)), AND(>($cor66.CONTACTNO, $0), <($cor66.EMAIL, $1)), AND(>($cor67.CONTACTNO, $0), <($cor67.EMAIL, $1)), AND(>($cor68.CONTACTNO, $0), <($cor68.EMAIL, $1)), AND(>($cor69.CONTACTNO, $0), <($cor69.EMAIL, $1)), AND(>($cor70.CONTACTNO, $0), <($cor70.EMAIL, $1)), AND(>($cor71.CONTACTNO, $0), <($cor71.EMAIL, $1)), AND(>($cor72.CONTACTNO, $0), <($cor72.EMAIL, $1)), AND(>($cor73.CONTACTNO, $0), <($cor73.EMAIL, $1)), AND(>($cor74.CONTACTNO, $0), <($cor74.EMAIL, $1)), AND(>($cor75.CONTACTNO, $0), <($cor75.EMAIL, $1)), AND(>($cor76.CONTACTNO, $0), <($cor76.EMAIL, $1)), AND(>($cor77.CONTACTNO, $0), <($cor77.EMAIL, $1)), AND(>($cor78.CONTACTNO, $0), <($cor78.EMAIL, $1)), AND(>($cor79.CONTACTNO, $0), <($cor79.EMAIL, $1)), AND(>($cor80.CONTACTNO, $0), <($cor80.EMAIL, $1)), AND(>($cor81.CONTACTNO, $0), <($cor81.EMAIL, $1)), AND(>($cor82.CONTACTNO, $0), <($cor82.EMAIL, $1)), AND(>($cor83.CONTACTNO, $0), <($cor83.EMAIL, $1)), AND(>($cor84.CONTACTNO, $0), <($cor84.EMAIL, $1)), AND(>($cor85.CONTACTNO, $0), <($cor85.EMAIL, $1)), AND(>($cor86.CONTACTNO, $0), <($cor86.EMAIL, $1)), AND(>($cor87.CONTACTNO, $0), <($cor87.EMAIL, $1)), AND(>($cor88.CONTACTNO, $0), <($cor88.EMAIL, $1)), AND(>($cor89.CONTACTNO, $0), <($cor89.EMAIL, $1)), AND(>($cor90.CONTACTNO, $0), <($cor90.EMAIL, $1)), AND(>($cor91.CONTACTNO, $0), <($cor91.EMAIL, $1)), AND(>($cor92.CONTACTNO, $0), <($cor92.EMAIL, $1)), AND(>($cor93.CONTACTNO, $0), <($cor93.EMAIL, $1)), AND(>($cor94.CONTACTNO, $0), <($cor94.EMAIL, $1)), AND(>($cor95.CONTACTNO, $0), <($cor95.EMAIL, $1)), AND(>($cor96.CONTACTNO, $0), <($cor96.EMAIL, $1)), AND(>($cor97.CONTACTNO, $0), <($cor97.EMAIL, $1)), AND(>($cor98.CONTACTNO, $0), <($cor98.EMAIL, $1)), AND(>($cor99.CONTACTNO, $0), <($cor99.EMAIL, $1)))])
-      EnumerableTableScan(table=[[CATALOG, CUSTOMER, ACCOUNT]])
+EnumerableSortedAggregate(group=[{0, 1, 2}])
+  EnumerableSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC])
+    EnumerableProject(ENAME=[$0], EXPR$1=[*($2, -2)], MGR=[$1])
+      EnumerableLimit(fetch=[100])
+        EnumerableSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC])
+          EnumerableProject(ENAME=[$1], MGR=[$3], SAL=[$5])
+            EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testBatchNestedLoopJoinTraitDerivation">
+  <TestCase name="testSortProjectDerive3">
     <Resource name="sql">
       <![CDATA[select * from
-(select ename, job, mgr from sales.emp order by ename desc, job desc, mgr limit 10) r
-join sales.bonus s on r.ename>s.ename and r.job<s.job
-order by r.ename desc, r.job desc]]>
-    </Resource>
-    <Resource name="planBefore">
-      <![CDATA[
-LogicalSort(sort0=[$0], sort1=[$1], dir0=[DESC], dir1=[DESC])
-  LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
-    LogicalJoin(condition=[AND(>($0, $3), <($1, $4))], joinType=[inner])
-      LogicalSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[DESC], dir2=[ASC], fetch=[10])
-        LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3])
+(select ename, cast(job as varchar) as job, sal + 1 from
+(select ename, job, sal from sales.emp limit 100) t) r
+join sales.bonus s on r.job=s.job and r.ename=s.ename]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
+  LogicalJoin(condition=[AND(=($1, $7), =($0, $3))], joinType=[inner])
+    LogicalProject(ENAME=[$0], JOB=[CAST($1):VARCHAR NOT NULL], EXPR$2=[+($2, 1)])
+      LogicalSort(fetch=[100])
+        LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], JOB0=[CAST($1):VARCHAR NOT NULL])
       LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableBatchNestedLoopJoin(condition=[AND(>($0, $3), <($1, $4))], joinType=[inner], batchSize=[100])
-  EnumerableLimit(fetch=[10])
-    EnumerableSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[DESC], dir2=[ASC])
-      EnumerableProject(ENAME=[$1], JOB=[$2], MGR=[$3])
-        EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
-  EnumerableFilter(condition=[OR(AND(>($cor0.ENAME, $0), <($cor0.JOB, $1)), AND(>($cor1.ENAME, $0), <($cor1.JOB, $1)), AND(>($cor2.ENAME, $0), <($cor2.JOB, $1)), AND(>($cor3.ENAME, $0), <($cor3.JOB, $1)), AND(>($cor4.ENAME, $0), <($cor4.JOB, $1)), AND(>($cor5.ENAME, $0), <($cor5.JOB, $1)), AND(>($cor6.ENAME, $0), <($cor6.JOB, $1)), AND(>($cor7.ENAME, $0), <($cor7.JOB, $1)), AND(>($cor8.ENAME, $0), <($cor8.JOB, $1)), AND(>($cor9.ENAME, $0), <($cor9.JOB, $1)), AND(>($cor10.ENAME, $0), <($cor10.JOB, $1)), AND(>($cor11.ENAME, $0), <($cor11.JOB, $1)), AND(>($cor12.ENAME, $0), <($cor12.JOB, $1)), AND(>($cor13.ENAME, $0), <($cor13.JOB, $1)), AND(>($cor14.ENAME, $0), <($cor14.JOB, $1)), AND(>($cor15.ENAME, $0), <($cor15.JOB, $1)), AND(>($cor16.ENAME, $0), <($cor16.JOB, $1)), AND(>($cor17.ENAME, $0), <($cor17.JOB, $1)), AND(>($cor18.ENAME, $0), <($cor18.JOB, $1)), AND(>($cor19.ENAME, $0), <($cor19.JOB, $1)), AND(>($cor20.ENAME, $0), <($cor20.JOB, $1)), AND(>($cor21.ENAME, $0), <($cor21.JOB, $1)), AND(>($cor22.ENAME, $0), <($cor22.JOB, $1)), AND(>($cor23.ENAME, $0), <($cor23.JOB, $1)), AND(>($cor24.ENAME, $0), <($cor24.JOB, $1)), AND(>($cor25.ENAME, $0), <($cor25.JOB, $1)), AND(>($cor26.ENAME, $0), <($cor26.JOB, $1)), AND(>($cor27.ENAME, $0), <($cor27.JOB, $1)), AND(>($cor28.ENAME, $0), <($cor28.JOB, $1)), AND(>($cor29.ENAME, $0), <($cor29.JOB, $1)), AND(>($cor30.ENAME, $0), <($cor30.JOB, $1)), AND(>($cor31.ENAME, $0), <($cor31.JOB, $1)), AND(>($cor32.ENAME, $0), <($cor32.JOB, $1)), AND(>($cor33.ENAME, $0), <($cor33.JOB, $1)), AND(>($cor34.ENAME, $0), <($cor34.JOB, $1)), AND(>($cor35.ENAME, $0), <($cor35.JOB, $1)), AND(>($cor36.ENAME, $0), <($cor36.JOB, $1)), AND(>($cor37.ENAME, $0), <($cor37.JOB, $1)), AND(>($cor38.ENAME, $0), <($cor38.JOB, $1)), AND(>($cor39.ENAME, $0), <($cor39.JOB, $1)), AND(>($cor40.ENAME, $0), <($cor40.JOB, $1)), AND(>($cor41.ENAME, $0), <($cor41.JOB, $1)), AND(>($cor42.ENAME, $0), <($cor42.JOB, $1)), AND(>($cor43.ENAME, $0), <($cor43.JOB, $1)), AND(>($cor44.ENAME, $0), <($cor44.JOB, $1)), AND(>($cor45.ENAME, $0), <($cor45.JOB, $1)), AND(>($cor46.ENAME, $0), <($cor46.JOB, $1)), AND(>($cor47.ENAME, $0), <($cor47.JOB, $1)), AND(>($cor48.ENAME, $0), <($cor48.JOB, $1)), AND(>($cor49.ENAME, $0), <($cor49.JOB, $1)), AND(>($cor50.ENAME, $0), <($cor50.JOB, $1)), AND(>($cor51.ENAME, $0), <($cor51.JOB, $1)), AND(>($cor52.ENAME, $0), <($cor52.JOB, $1)), AND(>($cor53.ENAME, $0), <($cor53.JOB, $1)), AND(>($cor54.ENAME, $0), <($cor54.JOB, $1)), AND(>($cor55.ENAME, $0), <($cor55.JOB, $1)), AND(>($cor56.ENAME, $0), <($cor56.JOB, $1)), AND(>($cor57.ENAME, $0), <($cor57.JOB, $1)), AND(>($cor58.ENAME, $0), <($cor58.JOB, $1)), AND(>($cor59.ENAME, $0), <($cor59.JOB, $1)), AND(>($cor60.ENAME, $0), <($cor60.JOB, $1)), AND(>($cor61.ENAME, $0), <($cor61.JOB, $1)), AND(>($cor62.ENAME, $0), <($cor62.JOB, $1)), AND(>($cor63.ENAME, $0), <($cor63.JOB, $1)), AND(>($cor64.ENAME, $0), <($cor64.JOB, $1)), AND(>($cor65.ENAME, $0), <($cor65.JOB, $1)), AND(>($cor66.ENAME, $0), <($cor66.JOB, $1)), AND(>($cor67.ENAME, $0), <($cor67.JOB, $1)), AND(>($cor68.ENAME, $0), <($cor68.JOB, $1)), AND(>($cor69.ENAME, $0), <($cor69.JOB, $1)), AND(>($cor70.ENAME, $0), <($cor70.JOB, $1)), AND(>($cor71.ENAME, $0), <($cor71.JOB, $1)), AND(>($cor72.ENAME, $0), <($cor72.JOB, $1)), AND(>($cor73.ENAME, $0), <($cor73.JOB, $1)), AND(>($cor74.ENAME, $0), <($cor74.JOB, $1)), AND(>($cor75.ENAME, $0), <($cor75.JOB, $1)), AND(>($cor76.ENAME, $0), <($cor76.JOB, $1)), AND(>($cor77.ENAME, $0), <($cor77.JOB, $1)), AND(>($cor78.ENAME, $0), <($cor78.JOB, $1)), AND(>($cor79.ENAME, $0), <($cor79.JOB, $1)), AND(>($cor80.ENAME, $0), <($cor80.JOB, $1)), AND(>($cor81.ENAME, $0), <($cor81.JOB, $1)), AND(>($cor82.ENAME, $0), <($cor82.JOB, $1)), AND(>($cor83.ENAME, $0), <($cor83.JOB, $1)), AND(>($cor84.ENAME, $0), <($cor84.JOB, $1)), AND(>($cor85.ENAME, $0), <($cor85.JOB, $1)), AND(>($cor86.ENAME, $0), <($cor86.JOB, $1)), AND(>($cor87.ENAME, $0), <($cor87.JOB, $1)), AND(>($cor88.ENAME, $0), <($cor88.JOB, $1)), AND(>($cor89.ENAME, $0), <($cor89.JOB, $1)), AND(>($cor90.ENAME, $0), <($cor90.JOB, $1)), AND(>($cor91.ENAME, $0), <($cor91.JOB, $1)), AND(>($cor92.ENAME, $0), <($cor92.JOB, $1)), AND(>($cor93.ENAME, $0), <($cor93.JOB, $1)), AND(>($cor94.ENAME, $0), <($cor94.JOB, $1)), AND(>($cor95.ENAME, $0), <($cor95.JOB, $1)), AND(>($cor96.ENAME, $0), <($cor96.JOB, $1)), AND(>($cor97.ENAME, $0), <($cor97.JOB, $1)), AND(>($cor98.ENAME, $0), <($cor98.JOB, $1)), AND(>($cor99.ENAME, $0), <($cor99.JOB, $1)))])
-    EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
+EnumerableProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
+  EnumerableMergeJoin(condition=[AND(=($1, $7), =($0, $3))], joinType=[inner])
+    EnumerableProject(ENAME=[$0], JOB=[CAST($1):VARCHAR NOT NULL], EXPR$2=[+($2, 1)])
+      EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
+        EnumerableLimit(fetch=[100])
+          EnumerableProject(ENAME=[$1], JOB=[$2], SAL=[$5])
+            EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+    EnumerableSort(sort0=[$4], sort1=[$0], dir0=[ASC], dir1=[ASC])
+      EnumerableProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], JOB0=[CAST($1):VARCHAR NOT NULL])
+        EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testValuesTraitRequest">
+  <TestCase name="testSortProjectDerive4">
     <Resource name="sql">
-      <![CDATA[SELECT * from (values (1, 1), (2, 1), (1, 2), (2, 2))
-as t(a, b) order by b, a]]>
+      <![CDATA[select * from
+(select ename, cast(job as bigint) as job, sal + 1 from
+(select ename, job, sal from sales.emp limit 100) t) r
+join sales.bonus s on r.job=s.job and r.ename=s.ename]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
-  LogicalProject(A=[$0], B=[$1])
-    LogicalValues(tuples=[[{ 1, 1 }, { 2, 1 }, { 1, 2 }, { 2, 2 }]])
+LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
+  LogicalJoin(condition=[AND(=($1, $7), =($0, $3))], joinType=[inner])
+    LogicalProject(ENAME=[$0], JOB=[CAST($1):BIGINT NOT NULL], EXPR$2=[+($2, 1)])
+      LogicalSort(fetch=[100])
+        LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], JOB0=[CAST($1):BIGINT NOT NULL])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableValues(tuples=[[{ 1, 1 }, { 2, 1 }, { 1, 2 }, { 2, 2 }]])
+EnumerableProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
+  EnumerableMergeJoin(condition=[AND(=($1, $7), =($0, $3))], joinType=[inner])
+    EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
+      EnumerableProject(ENAME=[$0], JOB=[CAST($1):BIGINT NOT NULL], EXPR$2=[+($2, 1)])
+        EnumerableLimit(fetch=[100])
+          EnumerableProject(ENAME=[$1], JOB=[$2], SAL=[$5])
+            EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+    EnumerableSort(sort0=[$4], sort1=[$0], dir0=[ASC], dir1=[ASC])
+      EnumerableProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], JOB0=[CAST($1):BIGINT NOT NULL])
+        EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testValuesTraitRequestNeg">
+  <TestCase name="testSortProjectDerive5">
     <Resource name="sql">
-      <![CDATA[SELECT * from (values (1, 1), (2, 1), (3, 2), (2, 2))
-as t(a, b) order by b, a]]>
+      <![CDATA[select ename, empno*-1, job from
+(select * from sales.emp order by ename, empno, job limit 10) order by ename, job]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
-  LogicalProject(A=[$0], B=[$1])
-    LogicalValues(tuples=[[{ 1, 1 }, { 2, 1 }, { 3, 2 }, { 2, 2 }]])
+LogicalSort(sort0=[$0], sort1=[$2], dir0=[ASC], dir1=[ASC])
+  LogicalProject(ENAME=[$1], EXPR$1=[*($0, -1)], JOB=[$2])
+    LogicalSort(sort0=[$1], sort1=[$0], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC], fetch=[10])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
-  EnumerableValues(tuples=[[{ 1, 1 }, { 2, 1 }, { 3, 2 }, { 2, 2 }]])
+EnumerableProject(ENAME=[$1], EXPR$1=[*($0, -1)], JOB=[$2])
+  EnumerableSort(sort0=[$1], sort1=[$2], dir0=[ASC], dir1=[ASC])
+    EnumerableLimit(fetch=[10])
+      EnumerableSort(sort0=[$1], sort1=[$0], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC])
+        EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortCalc">
+  <TestCase name="testSortProjectDerive6">
     <Resource name="sql">
-      <![CDATA[select mgr from sales.emp order by mgr desc nulls last]]>
+      <![CDATA[select comm, deptno, slacker from
+(select * from sales.emp order by comm, deptno, slacker limit 10) t
+order by comm, slacker]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$0], dir0=[DESC-nulls-last])
-  LogicalProject(MGR=[$3])
-    LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+LogicalSort(sort0=[$0], sort1=[$2], dir0=[ASC], dir1=[ASC])
+  LogicalProject(COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+    LogicalSort(sort0=[$6], sort1=[$7], sort2=[$8], dir0=[ASC], dir1=[ASC], dir2=[ASC], fetch=[10])
+      LogicalProject(EMPNO=[$0], ENAME=[$1], JOB=[$2], MGR=[$3], HIREDATE=[$4], SAL=[$5], COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableSort(sort0=[$0], dir0=[DESC-nulls-last])
-  EnumerableCalc(expr#0..8=[{inputs}], MGR=[$t3])
-    EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+EnumerableProject(COMM=[$6], DEPTNO=[$7], SLACKER=[$8])
+  EnumerableSort(sort0=[$6], sort1=[$8], dir0=[ASC], dir1=[ASC])
+    EnumerableLimit(fetch=[10])
+      EnumerableSort(sort0=[$6], sort1=[$7], sort2=[$8], dir0=[ASC], dir1=[ASC], dir2=[ASC])
+        EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortCalcDerive1">
+  <TestCase name="testSortProjectDeriveOnRexCall">
     <Resource name="sql">
       <![CDATA[select * from
-(select ename, job, max_sal + 1 from
-(select ename, job, max(sal) as max_sal from sales.emp group by ename, job) t) r
-join sales.bonus s on r.job=s.job and r.ename=s.ename]]>
+(select ename, sal * -1 as sal, max_job from
+(select ename, sal, max(job) as max_job from sales.emp group by ename, sal) t) r
+join sales.bonus s on r.sal=s.sal and r.ename=s.ename]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
-  LogicalJoin(condition=[AND(=($1, $4), =($0, $3))], joinType=[inner])
-    LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[+($2, 1)])
-      LogicalAggregate(group=[{0, 1}], MAX_SAL=[MAX($2)])
-        LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
+LogicalProject(ENAME=[$0], SAL=[$1], MAX_JOB=[$2], ENAME0=[$3], JOB=[$4], SAL0=[$5], COMM=[$6])
+  LogicalJoin(condition=[AND(=($1, $5), =($0, $3))], joinType=[inner])
+    LogicalProject(ENAME=[$0], SAL=[*($1, -1)], MAX_JOB=[$2])
+      LogicalAggregate(group=[{0, 1}], MAX_JOB=[MAX($2)])
+        LogicalProject(ENAME=[$1], SAL=[$5], JOB=[$2])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
     LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableMergeJoin(condition=[AND(=($1, $4), =($0, $3))], joinType=[inner])
-  EnumerableCalc(expr#0..2=[{inputs}], expr#3=[1], expr#4=[+($t2, $t3)], proj#0..1=[{exprs}], EXPR$2=[$t4])
-    EnumerableSortedAggregate(group=[{1, 2}], MAX_SAL=[MAX($5)])
-      EnumerableSort(sort0=[$2], sort1=[$1], dir0=[ASC], dir1=[ASC])
-        EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+EnumerableMergeJoin(condition=[AND(=($1, $5), =($0, $3))], joinType=[inner])
   EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
+    EnumerableProject(ENAME=[$0], SAL=[*($1, -1)], MAX_JOB=[$2])
+      EnumerableSortedAggregate(group=[{1, 5}], MAX_JOB=[MAX($2)])
+        EnumerableSort(sort0=[$1], sort1=[$5], dir0=[ASC], dir1=[ASC])
+          EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+  EnumerableSort(sort0=[$2], sort1=[$0], dir0=[ASC], dir1=[ASC])
     EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortCalcDerive2">
+  <TestCase name="testSortProjectDeriveWhenCastLeadingToMonotonic">
     <Resource name="sql">
-      <![CDATA[select distinct ename, sal*-2, mgr
-from (select ename, mgr, sal from sales.emp order by ename, mgr, sal limit 100) t]]>
+      <![CDATA[select * from
+(select ename, cast(job as varchar) as job, max_sal + 1 from
+(select ename, job, max(sal) as max_sal from sales.emp group by ename, job) t) r
+join sales.bonus s on r.job=s.job and r.ename=s.ename]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalAggregate(group=[{0, 1, 2}])
-  LogicalProject(ENAME=[$0], EXPR$1=[*($2, -2)], MGR=[$1])
-    LogicalSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC], fetch=[100])
-      LogicalProject(ENAME=[$1], MGR=[$3], SAL=[$5])
-        LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
+  LogicalJoin(condition=[AND(=($1, $7), =($0, $3))], joinType=[inner])
+    LogicalProject(ENAME=[$0], JOB=[CAST($1):VARCHAR NOT NULL], EXPR$2=[+($2, 1)])
+      LogicalAggregate(group=[{0, 1}], MAX_SAL=[MAX($2)])
+        LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
+          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+    LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], JOB0=[CAST($1):VARCHAR NOT NULL])
+      LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableSortedAggregate(group=[{0, 1, 2}])
-  EnumerableSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC])
-    EnumerableCalc(expr#0..2=[{inputs}], expr#3=[-2], expr#4=[*($t2, $t3)], ENAME=[$t0], EXPR$1=[$t4], MGR=[$t1])
-      EnumerableLimit(fetch=[100])
-        EnumerableSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[ASC], dir1=[ASC], dir2=[ASC])
-          EnumerableCalc(expr#0..8=[{inputs}], ENAME=[$t1], MGR=[$t3], SAL=[$t5])
-            EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+EnumerableProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
+  EnumerableMergeJoin(condition=[AND(=($1, $7), =($0, $3))], joinType=[inner])
+    EnumerableProject(ENAME=[$0], JOB=[CAST($1):VARCHAR NOT NULL], EXPR$2=[+($2, 1)])
+      EnumerableSortedAggregate(group=[{1, 2}], MAX_SAL=[MAX($5)])
+        EnumerableSort(sort0=[$2], sort1=[$1], dir0=[ASC], dir1=[ASC])
+          EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+    EnumerableSort(sort0=[$4], sort1=[$0], dir0=[ASC], dir1=[ASC])
+      EnumerableProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], JOB0=[CAST($1):VARCHAR NOT NULL])
+        EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortCalcDerive3">
+  <TestCase name="testSortProjectDeriveWhenCastLeadingToNonMonotonic">
     <Resource name="sql">
       <![CDATA[select * from
-(select ename, cast(job as varchar) as job, sal + 1 from
-(select ename, job, sal from sales.emp limit 100) t) r
+(select ename, cast(job as numeric) as job, max_sal + 1 from
+(select ename, job, max(sal) as max_sal from sales.emp group by ename, job) t) r
 join sales.bonus s on r.job=s.job and r.ename=s.ename]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$3], JOB0=[$4], SAL=[$5], COMM=[$6])
-  LogicalJoin(condition=[AND(=($1, $7), =($0, $3))], joinType=[inner])
-    LogicalProject(ENAME=[$0], JOB=[CAST($1):VARCHAR NOT NULL], EXPR$2=[+($2, 1)])
-      LogicalSort(fetch=[100])
+LogicalProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$4], JOB0=[$5], SAL=[$6], COMM=[$7])
+  LogicalJoin(condition=[AND(=($3, $8), =($0, $4))], joinType=[inner])
+    LogicalProject(ENAME=[$0], JOB=[CAST($1):DECIMAL(19, 0) NOT NULL], EXPR$2=[+($2, 1)], JOB0=[CAST(CAST($1):DECIMAL(19, 0) NOT NULL):DECIMAL(19, 9) NOT NULL])
+      LogicalAggregate(group=[{0, 1}], MAX_SAL=[MAX($2)])
         LogicalProject(ENAME=[$1], JOB=[$2], SAL=[$5])
           LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-    LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], JOB0=[CAST($1):VARCHAR NOT NULL])
+    LogicalProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], JOB0=[CAST($1):DECIMAL(19, 9) NOT NULL])
       LogicalTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableCalc(expr#0..7=[{inputs}], proj#0..6=[{exprs}])
-  EnumerableMergeJoin(condition=[AND(=($1, $7), =($0, $3))], joinType=[inner])
-    EnumerableCalc(expr#0..2=[{inputs}], expr#3=[CAST($t1):VARCHAR NOT NULL], expr#4=[1], expr#5=[+($t2, $t4)], ENAME=[$t0], JOB=[$t3], EXPR$2=[$t5])
-      EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
-        EnumerableLimit(fetch=[100])
-          EnumerableCalc(expr#0..8=[{inputs}], ENAME=[$t1], JOB=[$t2], SAL=[$t5])
+EnumerableProject(ENAME=[$0], JOB=[$1], EXPR$2=[$2], ENAME0=[$4], JOB0=[$5], SAL=[$6], COMM=[$7])
+  EnumerableMergeJoin(condition=[AND(=($3, $8), =($0, $4))], joinType=[inner])
+    EnumerableSort(sort0=[$3], sort1=[$0], dir0=[ASC], dir1=[ASC])
+      EnumerableProject(ENAME=[$0], JOB=[CAST($1):DECIMAL(19, 0) NOT NULL], EXPR$2=[+($2, 1)], JOB0=[CAST(CAST($1):DECIMAL(19, 0) NOT NULL):DECIMAL(19, 9) NOT NULL])
+        EnumerableSortedAggregate(group=[{1, 2}], MAX_SAL=[MAX($5)])
+          EnumerableSort(sort0=[$1], sort1=[$2], dir0=[ASC], dir1=[ASC])
             EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
     EnumerableSort(sort0=[$4], sort1=[$0], dir0=[ASC], dir1=[ASC])
-      EnumerableCalc(expr#0..3=[{inputs}], expr#4=[CAST($t1):VARCHAR NOT NULL], proj#0..4=[{exprs}])
+      EnumerableProject(ENAME=[$0], JOB=[$1], SAL=[$2], COMM=[$3], JOB0=[CAST($1):DECIMAL(19, 9) NOT NULL])
         EnumerableTableScan(table=[[CATALOG, SALES, BONUS]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortCalcOnRexCall">
+  <TestCase name="testSortProjectOnRexCall">
     <Resource name="sql">
       <![CDATA[select ename, sal * -1 as sal, mgr from
 sales.emp order by ename desc, sal desc, mgr desc nulls last]]>
@@ -1564,72 +1553,83 @@ LogicalSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[DESC], dir2=[
     <Resource name="planAfter">
       <![CDATA[
 EnumerableSort(sort0=[$0], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[DESC], dir2=[DESC-nulls-last])
-  EnumerableCalc(expr#0..8=[{inputs}], expr#9=[-1], expr#10=[*($t5, $t9)], ENAME=[$t1], SAL=[$t10], MGR=[$t3])
+  EnumerableProject(ENAME=[$1], SAL=[*($5, -1)], MGR=[$3])
     EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortCalcWhenCastLeadingToNonMonotonic">
+  <TestCase name="testSortProjectWhenCastLeadingToMonotonic">
     <Resource name="sql">
-      <![CDATA[select deptno from sales.emp order by cast(deptno as varchar) desc]]>
+      <![CDATA[select deptno from sales.emp order by cast(deptno as float) desc]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
 LogicalSort(sort0=[$1], dir0=[DESC])
-  LogicalProject(DEPTNO=[$7], EXPR$1=[CAST($7):VARCHAR NOT NULL])
+  LogicalProject(DEPTNO=[$7], EXPR$1=[CAST($7):FLOAT NOT NULL])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
 EnumerableSort(sort0=[$1], dir0=[DESC])
-  EnumerableCalc(expr#0..8=[{inputs}], expr#9=[CAST($t7):VARCHAR NOT NULL], DEPTNO=[$t7], EXPR$1=[$t9])
+  EnumerableProject(DEPTNO=[$7], EXPR$1=[CAST($7):FLOAT NOT NULL])
     EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortCalcWhenCastLeadingToMonotonic">
+  <TestCase name="testSortProjectWhenCastLeadingToNonMonotonic">
     <Resource name="sql">
-      <![CDATA[select cast(deptno as float) from sales.emp order by deptno desc]]>
+      <![CDATA[select deptno from sales.emp order by cast(deptno as varchar) desc]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
 LogicalSort(sort0=[$1], dir0=[DESC])
-  LogicalProject(EXPR$0=[CAST($7):FLOAT NOT NULL], DEPTNO=[$7])
+  LogicalProject(DEPTNO=[$7], EXPR$1=[CAST($7):VARCHAR NOT NULL])
     LogicalTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
 EnumerableSort(sort0=[$1], dir0=[DESC])
-  EnumerableCalc(expr#0..8=[{inputs}], expr#9=[CAST($t7):FLOAT NOT NULL], EXPR$0=[$t9], DEPTNO=[$t7])
+  EnumerableProject(DEPTNO=[$7], EXPR$1=[CAST($7):VARCHAR NOT NULL])
     EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testSortCalcWithFilter">
+  <TestCase name="testValuesTraitRequest">
     <Resource name="sql">
-      <![CDATA[select ename, job, mgr, max_sal from
-(select ename, job, mgr, max(sal) as max_sal from sales.emp group by ename, job, mgr) as t
-where max_sal > 1000
-order by mgr desc, ename]]>
+      <![CDATA[SELECT * from (values (1, 1), (2, 1), (1, 2), (2, 2))
+as t(a, b) order by b, a]]>
     </Resource>
     <Resource name="planBefore">
       <![CDATA[
-LogicalSort(sort0=[$2], sort1=[$0], dir0=[DESC], dir1=[ASC])
-  LogicalProject(ENAME=[$0], JOB=[$1], MGR=[$2], MAX_SAL=[$3])
-    LogicalFilter(condition=[>($3, 1000)])
-      LogicalAggregate(group=[{0, 1, 2}], MAX_SAL=[MAX($3)])
-        LogicalProject(ENAME=[$1], JOB=[$2], MGR=[$3], SAL=[$5])
-          LogicalTableScan(table=[[CATALOG, SALES, EMP]])
+LogicalSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
+  LogicalProject(A=[$0], B=[$1])
+    LogicalValues(tuples=[[{ 1, 1 }, { 2, 1 }, { 1, 2 }, { 2, 2 }]])
 ]]>
     </Resource>
     <Resource name="planAfter">
       <![CDATA[
-EnumerableCalc(expr#0..3=[{inputs}], expr#4=[1000], expr#5=[>($t3, $t4)], proj#0..3=[{exprs}], $condition=[$t5])
-  EnumerableSortedAggregate(group=[{1, 2, 3}], MAX_SAL=[MAX($5)])
-    EnumerableSort(sort0=[$3], sort1=[$1], sort2=[$2], dir0=[DESC], dir1=[ASC], dir2=[ASC])
-      EnumerableTableScan(table=[[CATALOG, SALES, EMP]])
+EnumerableValues(tuples=[[{ 1, 1 }, { 2, 1 }, { 1, 2 }, { 2, 2 }]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testValuesTraitRequestNeg">
+    <Resource name="sql">
+      <![CDATA[SELECT * from (values (1, 1), (2, 1), (3, 2), (2, 2))
+as t(a, b) order by b, a]]>
+    </Resource>
+    <Resource name="planBefore">
+      <![CDATA[
+LogicalSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
+  LogicalProject(A=[$0], B=[$1])
+    LogicalValues(tuples=[[{ 1, 1 }, { 2, 1 }, { 3, 2 }, { 2, 2 }]])
+]]>
+    </Resource>
+    <Resource name="planAfter">
+      <![CDATA[
+EnumerableSort(sort0=[$1], sort1=[$0], dir0=[ASC], dir1=[ASC])
+  EnumerableValues(tuples=[[{ 1, 1 }, { 2, 1 }, { 3, 2 }, { 2, 2 }]])
 ]]>
     </Resource>
   </TestCase>
diff --git a/core/src/test/resources/org/apache/calcite/test/TypeCoercionConverterTest.xml b/core/src/test/resources/org/apache/calcite/test/TypeCoercionConverterTest.xml
index 2f06f7ca25bd..9aed98d28572 100644
--- a/core/src/test/resources/org/apache/calcite/test/TypeCoercionConverterTest.xml
+++ b/core/src/test/resources/org/apache/calcite/test/TypeCoercionConverterTest.xml
@@ -16,108 +16,118 @@
   ~ limitations under the License.
   -->
 <Root>
-  <TestCase name="testInOperation">
+  <TestCase name="testBinaryComparison">
     <Resource name="sql">
       <![CDATA[select
-1 in ('1', '2', '3') as f0,
-(1, 2) in (('1', '2')) as f1,
-(1, 2) in (('1', '2'), ('3', '4')) as f2
-from (values (true, true, true))]]>
+1<'1' as f0,
+1<='1' as f1,
+1>'1' as f2,
+1>='1' as f3,
+1='1' as f4,
+t1_date > t1_timestamp as f5,
+'2' is not distinct from 2 as f6,
+'2019-09-23' between t1_date and t1_timestamp as f7,
+cast('2019-09-23' as date) between t1_date and t1_timestamp as f8
+from t1]]>
     </Resource>
     <Resource name="plan">
       <![CDATA[
-LogicalValues(tuples=[[{ true, true, true }]])
+LogicalProject(F0=[false], F1=[true], F2=[false], F3=[true], F4=[true], F5=[>(CAST($8):TIMESTAMP(0) NOT NULL, $7)], F6=[true], F7=[AND(>=(2019-09-23 00:00:00, CAST($8):TIMESTAMP(0) NOT NULL), <=(2019-09-23 00:00:00, $7))], F8=[AND(>=(2019-09-23 00:00:00, CAST($8):TIMESTAMP(0) NOT NULL), <=(2019-09-23 00:00:00, $7))])
+  LogicalTableScan(table=[[CATALOG, SALES, T1]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testNotInOperation">
+  <TestCase name="testBooleanEquality">
     <Resource name="sql">
       <![CDATA[select
-1 not in ('1', '2', '3') as f0,
-(1, 2) not in (('1', '2')) as f1,
-(1, 2) not in (('1', '2'), ('3', '4')) as f2
-from (values (false, false, false))]]>
+1=true as f0,
+1.0=true as f1,
+0.0=true=true as f2,
+1.23=t1_boolean as f3,
+t1_smallint=t1_boolean as f4,
+10000000000=true as f5
+from t1]]>
     </Resource>
     <Resource name="plan">
       <![CDATA[
-LogicalValues(tuples=[[{ false, false, false }]])
+LogicalProject(F0=[true], F1=[true], F2=[false], F3=[NOT($10)], F4=[=($1, CASE($10, 1:SMALLINT, 0:SMALLINT))], F5=[false])
+  LogicalTableScan(table=[[CATALOG, SALES, T1]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testInDateTimestamp">
+  <TestCase name="testBuiltinFunctionCoercion">
     <Resource name="sql">
-      <![CDATA[select (t1_timestamp, t1_date)
-in ((DATE '2020-04-16', TIMESTAMP '2020-04-16 11:40:53'))
-from t1]]>
+      <![CDATA[select 1||'a' from (values true)]]>
     </Resource>
     <Resource name="plan">
       <![CDATA[
-LogicalProject(EXPR$0=[AND(=($7, 2020-04-16 00:00:00), =(CAST($8):TIMESTAMP(0) NOT NULL, 2020-04-16 11:40:53))])
-  LogicalTableScan(table=[[CATALOG, SALES, T1]])
+LogicalProject(EXPR$0=[||('1':VARCHAR, 'a')])
+  LogicalValues(tuples=[[{ true }]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testBooleanEquality">
+  <TestCase name="testCaseWhen">
     <Resource name="sql">
-      <![CDATA[select
-1=true as f0,
-1.0=true as f1,
-0.0=true=true as f2,
-1.23=t1_boolean as f3,
-t1_smallint=t1_boolean as f4,
-10000000000=true as f5
+      <![CDATA[select case when 1 > 0 then t2_bigint else t2_decimal end from t2]]>
+    </Resource>
+    <Resource name="plan">
+      <![CDATA[
+LogicalProject(EXPR$0=[CAST($3):DECIMAL(19, 0) NOT NULL])
+  LogicalTableScan(table=[[CATALOG, SALES, T2]])
+]]>
+    </Resource>
+  </TestCase>
+  <TestCase name="testInDateTimestamp">
+    <Resource name="sql">
+      <![CDATA[select (t1_timestamp, t1_date)
+in ((DATE '2020-04-16', TIMESTAMP '2020-04-16 11:40:53'))
 from t1]]>
     </Resource>
     <Resource name="plan">
       <![CDATA[
-LogicalProject(F0=[true], F1=[true], F2=[false], F3=[NOT($10)], F4=[=($1, CASE($10, 1:SMALLINT, 0:SMALLINT))], F5=[false])
+LogicalProject(EXPR$0=[AND(=($7, 2020-04-16 00:00:00), =(CAST($8):TIMESTAMP(0) NOT NULL, 2020-04-16 11:40:53))])
   LogicalTableScan(table=[[CATALOG, SALES, T1]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testBinaryComparison">
+  <TestCase name="testInOperation">
     <Resource name="sql">
       <![CDATA[select
-1<'1' as f0,
-1<='1' as f1,
-1>'1' as f2,
-1>='1' as f3,
-1='1' as f4,
-t1_date > t1_timestamp as f5,
-'2' is not distinct from 2 as f6,
-'2019-09-23' between t1_date and t1_timestamp as f7,
-cast('2019-09-23' as date) between t1_date and t1_timestamp as f8
-from t1]]>
+1 in ('1', '2', '3') as f0,
+(1, 2) in (('1', '2')) as f1,
+(1, 2) in (('1', '2'), ('3', '4')) as f2
+from (values (true, true, true))]]>
     </Resource>
     <Resource name="plan">
       <![CDATA[
-LogicalProject(F0=[false], F1=[true], F2=[false], F3=[true], F4=[true], F5=[>(CAST($8):TIMESTAMP(0) NOT NULL, $7)], F6=[true], F7=[AND(>=(2019-09-23 00:00:00, CAST($8):TIMESTAMP(0) NOT NULL), <=(2019-09-23 00:00:00, $7))], F8=[AND(>=(2019-09-23 00:00:00, CAST($8):TIMESTAMP(0) NOT NULL), <=(2019-09-23 00:00:00, $7))])
-  LogicalTableScan(table=[[CATALOG, SALES, T1]])
+LogicalValues(tuples=[[{ true, true, true }]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testBuiltinFunctionCoercion">
+  <TestCase name="testInsertQuerySourceCoercion">
     <Resource name="sql">
-      <![CDATA[select 1||'a' from (values true)]]>
+      <![CDATA[insert into t1 select t2_smallint, t2_int, t2_bigint, t2_float,
+t2_double, t2_decimal, t2_int, t2_date, t2_timestamp, t2_varchar20, t2_int from t2]]>
     </Resource>
     <Resource name="plan">
       <![CDATA[
-LogicalProject(EXPR$0=[||('1':VARCHAR, 'a')])
-  LogicalValues(tuples=[[{ true }]])
+LogicalTableModify(table=[[CATALOG, SALES, T1]], operation=[INSERT], flattened=[false])
+  LogicalProject(t1_varchar20=[CAST($1):VARCHAR(20) NOT NULL], t1_smallint=[CAST($2):SMALLINT NOT NULL], t1_int=[CAST($3):INTEGER NOT NULL], t1_bigint=[CAST($4):BIGINT NOT NULL], t1_float=[CAST($5):FLOAT NOT NULL], t1_double=[CAST($6):DOUBLE NOT NULL], t1_decimal=[CAST($2):DECIMAL(19, 0) NOT NULL], t1_timestamp=[CAST($8):TIMESTAMP(0) NOT NULL], t1_date=[CAST($7):DATE NOT NULL], t1_binary=[CAST($0):BINARY(1) NOT NULL], t1_boolean=[<>($2, 0)])
+    LogicalTableScan(table=[[CATALOG, SALES, T2]])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testStarImplicitTypeCoercion">
+  <TestCase name="testNotInOperation">
     <Resource name="sql">
-      <![CDATA[select * from (values(1, '3')) union select * from (values('2', 4))]]>
+      <![CDATA[select
+1 not in ('1', '2', '3') as f0,
+(1, 2) not in (('1', '2')) as f1,
+(1, 2) not in (('1', '2'), ('3', '4')) as f2
+from (values (false, false, false))]]>
     </Resource>
     <Resource name="plan">
       <![CDATA[
-LogicalUnion(all=[false])
-  LogicalProject(EXPR$0=[CAST($0):VARCHAR NOT NULL], EXPR$1=[$1])
-    LogicalValues(tuples=[[{ 1, '3' }]])
-  LogicalProject(EXPR$0=[$0], EXPR$1=[CAST($1):VARCHAR NOT NULL])
-    LogicalValues(tuples=[[{ '2', 4 }]])
+LogicalValues(tuples=[[{ false, false, false }]])
 ]]>
     </Resource>
   </TestCase>
@@ -141,27 +151,17 @@ LogicalUnion(all=[false])
 ]]>
     </Resource>
   </TestCase>
-  <TestCase name="testCaseWhen">
-    <Resource name="sql">
-      <![CDATA[select case when 1 > 0 then t2_bigint else t2_decimal end from t2]]>
-    </Resource>
-    <Resource name="plan">
-      <![CDATA[
-LogicalProject(EXPR$0=[CAST($3):DECIMAL(19, 0) NOT NULL])
-  LogicalTableScan(table=[[CATALOG, SALES, T2]])
-]]>
-    </Resource>
-  </TestCase>
-  <TestCase name="testInsertQuerySourceCoercion">
+  <TestCase name="testStarImplicitTypeCoercion">
     <Resource name="sql">
-      <![CDATA[insert into t1 select t2_smallint, t2_int, t2_bigint, t2_float,
-t2_double, t2_decimal, t2_int, t2_date, t2_timestamp, t2_varchar20, t2_int from t2]]>
+      <![CDATA[select * from (values(1, '3')) union select * from (values('2', 4))]]>
     </Resource>
     <Resource name="plan">
       <![CDATA[
-LogicalTableModify(table=[[CATALOG, SALES, T1]], operation=[INSERT], flattened=[false])
-  LogicalProject(t1_varchar20=[CAST($1):VARCHAR(20) NOT NULL], t1_smallint=[CAST($2):SMALLINT NOT NULL], t1_int=[CAST($3):INTEGER NOT NULL], t1_bigint=[CAST($4):BIGINT NOT NULL], t1_float=[CAST($5):FLOAT NOT NULL], t1_double=[CAST($6):DOUBLE NOT NULL], t1_decimal=[CAST($2):DECIMAL(19, 0) NOT NULL], t1_timestamp=[CAST($8):TIMESTAMP(0) NOT NULL], t1_date=[CAST($7):DATE NOT NULL], t1_binary=[CAST($0):BINARY(1) NOT NULL], t1_boolean=[<>($2, 0)])
-    LogicalTableScan(table=[[CATALOG, SALES, T2]])
+LogicalUnion(all=[false])
+  LogicalProject(EXPR$0=[CAST($0):VARCHAR NOT NULL], EXPR$1=[$1])
+    LogicalValues(tuples=[[{ 1, '3' }]])
+  LogicalProject(EXPR$0=[$0], EXPR$1=[CAST($1):VARCHAR NOT NULL])
+    LogicalValues(tuples=[[{ '2', 4 }]])
 ]]>
     </Resource>
   </TestCase>