Revert "[CALCITE-6519] Non-aggregate query that uses measure in ORDER BY"

This reverts commit 27fd583.

Author: olivrlee

core/src/main/java/org/apache/calcite/sql/validate/SqlValidatorImpl.java

@@ -92,7 +92,6 @@
 import org.apache.calcite.sql.SqlWithItem;
 import org.apache.calcite.sql.TableCharacteristic;
 import org.apache.calcite.sql.fun.SqlCase;
-import org.apache.calcite.sql.fun.SqlInternalOperators;
 import org.apache.calcite.sql.fun.SqlStdOperatorTable;
 import org.apache.calcite.sql.parser.SqlParserPos;
 import org.apache.calcite.sql.type.AssignableOperandTypeChecker;
@@ -4867,31 +4866,15 @@ private void validateOrderItem(SqlSelect select, SqlNode orderItem) {
   }
 
   @Override public SqlNode expandOrderExpr(SqlSelect select, SqlNode orderExpr) {
-    final SqlNode orderExpr2 =
+    final SqlNode newSqlNode =
         new OrderExpressionExpander(select, orderExpr).go();
-    if (orderExpr2 == orderExpr) {
-      return orderExpr2;
+    if (newSqlNode != orderExpr) {
+      final SqlValidatorScope scope = getOrderScope(select);
+      inferUnknownTypes(unknownType, scope, newSqlNode);
+      final RelDataType type = deriveType(scope, newSqlNode);
+      setValidatedNodeType(newSqlNode, type);
     }
-
-    final SqlValidatorScope scope = getOrderScope(select);
-    inferUnknownTypes(unknownType, scope, orderExpr2);
-    final RelDataType type = deriveType(scope, orderExpr2);
-    setValidatedNodeType(orderExpr2, type);
-    if (!type.isMeasure()) {
-      return orderExpr2;
-    }
-
-    final SqlNode orderExpr3 = measureToValue(orderExpr2);
-    final RelDataType type3 = deriveType(scope, orderExpr3);
-    setValidatedNodeType(orderExpr3, type3);
-    return orderExpr3;
-  }
-
-  private static SqlNode measureToValue(SqlNode e) {
-    if (e.getKind() == SqlKind.V2M) {
-      return ((SqlCall) e).operand(0);
-    }
-    return SqlInternalOperators.M2V.createCall(e.getParserPosition(), e);
+    return newSqlNode;
   }
 
   /**

core/src/main/java/org/apache/calcite/sql2rel/SqlToRelConverter.java

@@ -3751,6 +3751,7 @@ protected RelFieldCollation convertOrderItem(
       SqlNode orderItem, List<SqlNode> extraExprs,
       RelFieldCollation.Direction direction,
       RelFieldCollation.NullDirection nullDirection) {
+    assert select != null;
     // Handle DESC keyword, e.g. 'select a, b from t order by a desc'.
     switch (orderItem.getKind()) {
     case DESCENDING:
@@ -3778,22 +3779,21 @@ protected RelFieldCollation convertOrderItem(
       break;
     }
 
-    final SqlValidator validator = validator();
+    SqlNode converted = validator().expandOrderExpr(select, orderItem);
+
     switch (nullDirection) {
     case UNSPECIFIED:
-      nullDirection = validator.config().defaultNullCollation().last(desc(direction))
+      nullDirection = validator().config().defaultNullCollation().last(desc(direction))
           ? RelFieldCollation.NullDirection.LAST
           : RelFieldCollation.NullDirection.FIRST;
       break;
     default:
       break;
     }
 
-    SqlNode converted = validator.expandOrderExpr(select, orderItem);
-
     // Scan the select list and order exprs for an identical expression.
     final SelectScope selectScope =
-        requireNonNull(validator.getRawSelectScope(select),
+        requireNonNull(validator().getRawSelectScope(select),
             () -> "getRawSelectScope is not found for " + select);
     int ordinal = -1;
     List<SqlNode> expandedSelectList = selectScope.getExpandedSelectList();

core/src/test/resources/org/apache/calcite/test/RelOptRulesTest.xml

@@ -756,28 +756,6 @@ LogicalAggregate(group=[{}], X=[SUM($0)], Z=[MIN($1)])
       <![CDATA[
 LogicalAggregate(group=[{}], X=[SUM($5)], Z=[MIN($5)])
   LogicalTableScan(table=[[CATALOG, SALES, EMP]])
-]]>
-    </Resource>
-  </TestCase>
-  <TestCase name="testAggregateMerge9">
-    <Resource name="sql">
-      <![CDATA[SELECT sum(deptno)
-FROM (
-    SELECT sum(deptno) AS deptno
-    FROM dept
-    GROUP BY name)]]>
-    </Resource>
-    <Resource name="planBefore">
-      <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($1)])
-  LogicalAggregate(group=[{1}], DEPTNO=[SUM($0)])
-    LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
-]]>
-    </Resource>
-    <Resource name="planAfter">
-      <![CDATA[
-LogicalAggregate(group=[{}], EXPR$0=[SUM($0)])
-  LogicalTableScan(table=[[CATALOG, SALES, DEPT]])
 ]]>
     </Resource>
   </TestCase>