You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by ka...@apache.org on 2024/11/12 08:57:05 UTC

(druid) branch master updated: ScanQuery should not ignore columnTypes in equals/hashCode (#17463)

This is an automated email from the ASF dual-hosted git repository.

karan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git


The following commit(s) were added to refs/heads/master by this push:
     new f296102f054 ScanQuery should not ignore columnTypes in equals/hashCode (#17463)
f296102f054 is described below

commit f296102f0546bb4c6b8158ee8232419f70bb9ed6
Author: Zoltan Haindrich <ki...@rxd.hu>
AuthorDate: Tue Nov 12 09:56:59 2024 +0100

    ScanQuery should not ignore columnTypes in equals/hashCode (#17463)
    
    * ScanQuery: equals/hashCode/toString
    * DruidQuery: changes of Align ScanQuery column order with its desired signature #17457
    * ScanQueryTest: add equalsverifer test
---
 .../hll/sql/HllSketchSqlAggregatorTest.java        |   2 +
 .../sql/DoublesSketchSqlAggregatorTest.java        |   3 +-
 .../theta/sql/ThetaSketchSqlAggregatorTest.java    |   1 +
 .../org/apache/druid/msq/exec/MSQArraysTest.java   |  26 +-
 .../druid/msq/exec/MSQComplexGroupByTest.java      |   1 +
 .../druid/msq/exec/MSQLoadedSegmentTests.java      |   2 +
 .../druid/msq/exec/MSQParseExceptionsTest.java     |   6 +-
 .../org/apache/druid/msq/exec/MSQSelectTest.java   |  58 ++-
 .../org/apache/druid/msq/exec/MSQWindowTest.java   |  44 ++-
 .../resources/SqlMSQStatementResourcePostTest.java |   2 +-
 .../org/apache/druid/query/sql/SleepSqlTest.java   |   1 +
 .../org/apache/druid/query/scan/ScanQuery.java     |   9 +-
 .../query/scan/ScanQueryLimitRowIteratorTest.java  |   3 +-
 .../org/apache/druid/query/scan/ScanQueryTest.java |  13 +
 .../apache/druid/sql/calcite/rel/DruidQuery.java   |   7 +-
 .../druid/sql/calcite/CalciteArraysQueryTest.java  | 387 +++++++++++++--------
 .../calcite/CalciteCatalogIngestionDmlTest.java    |  55 ++-
 .../sql/calcite/CalciteCorrelatedQueryTest.java    |   3 +-
 .../druid/sql/calcite/CalciteExplainQueryTest.java |   2 +-
 .../druid/sql/calcite/CalciteExportTest.java       |   5 +
 .../druid/sql/calcite/CalciteInsertDmlTest.java    |  47 ++-
 .../druid/sql/calcite/CalciteJoinQueryTest.java    | 194 +++++++++--
 .../calcite/CalciteLookupFunctionQueryTest.java    |   5 +-
 .../calcite/CalciteMultiValueStringQueryTest.java  |  19 +
 .../sql/calcite/CalciteNestedDataQueryTest.java    |  95 +++--
 .../sql/calcite/CalciteParameterQueryTest.java     |   6 +-
 .../apache/druid/sql/calcite/CalciteQueryTest.java |  91 ++++-
 .../druid/sql/calcite/CalciteReplaceDmlTest.java   |  47 ++-
 .../sql/calcite/CalciteScanSignatureTest.java      |   2 +
 .../druid/sql/calcite/CalciteSelectQueryTest.java  | 144 +++++---
 .../druid/sql/calcite/CalciteStrictInsertTest.java |   4 +-
 .../druid/sql/calcite/CalciteSubqueryTest.java     |  46 ++-
 .../druid/sql/calcite/CalciteTableAppendTest.java  |  10 +-
 .../sql/calcite/CalciteTimeBoundaryQueryTest.java  |   1 +
 .../druid/sql/calcite/IngestTableFunctionTest.java |  20 +-
 .../apache/druid/sql/calcite/QueryTestRunner.java  |  10 +-
 .../org.apache.druid.quidem.SqlQuidemTest/join.iq  |   4 +-
 .../testUnnestWithFilters@NullHandling=default.iq  |   4 +-
 .../testUnnestWithFilters@NullHandling=sql.iq      |   4 +-
 ...stWithFiltersInnerLimit@NullHandling=default.iq |   4 +-
 ...UnnestWithFiltersInnerLimit@NullHandling=sql.iq |   4 +-
 ...FiltersInsideAndOutside@NullHandling=default.iq |   4 +-
 ...WithFiltersInsideAndOutside@NullHandling=sql.iq |   4 +-
 ...hExpressionInInnerQuery@NullHandling=default.iq |   6 +-
 ...sWithExpressionInInnerQuery@NullHandling=sql.iq |   6 +-
 ...hExpressionInInnerQuery@NullHandling=default.iq |   6 +-
 ...sWithExpressionInInnerQuery@NullHandling=sql.iq |   6 +-
 ...ataSources@all_disabled@NullHandling=default.iq |   4 +-
 ...ineDataSources@all_disabled@NullHandling=sql.iq |   4 +-
 ...DataSources@all_enabled@NullHandling=default.iq |   4 +-
 ...lineDataSources@all_enabled@NullHandling=sql.iq |   4 +-
 ...lineDataSources@default@NullHandling=default.iq |   4 +-
 ...woInlineDataSources@default@NullHandling=sql.iq |   4 +-
 ...n-value-column_disabled@NullHandling=default.iq |   4 +-
 ...er-on-value-column_disabled@NullHandling=sql.iq |   4 +-
 ...ilter-rewrites-disabled@NullHandling=default.iq |   4 +-
 ...es@filter-rewrites-disabled@NullHandling=sql.iq |   4 +-
 ...Sources@filter-rewrites@NullHandling=default.iq |   4 +-
 ...DataSources@filter-rewrites@NullHandling=sql.iq |   4 +-
 ...aSources@join-to-filter@NullHandling=default.iq |   4 +-
 ...eDataSources@join-to-filter@NullHandling=sql.iq |   4 +-
 ...inCastLeft@all_disabled@NullHandling=default.iq |   4 +-
 ...erJoinCastLeft@all_disabled@NullHandling=sql.iq |   4 +-
 ...oinCastLeft@all_enabled@NullHandling=default.iq |   4 +-
 ...nerJoinCastLeft@all_enabled@NullHandling=sql.iq |   4 +-
 ...nerJoinCastLeft@default@NullHandling=default.iq |   4 +-
 ...stInnerJoinCastLeft@default@NullHandling=sql.iq |   4 +-
 ...n-value-column_disabled@NullHandling=default.iq |   4 +-
 ...er-on-value-column_disabled@NullHandling=sql.iq |   4 +-
 ...ilter-rewrites-disabled@NullHandling=default.iq |   4 +-
 ...ft@filter-rewrites-disabled@NullHandling=sql.iq |   4 +-
 ...astLeft@filter-rewrites@NullHandling=default.iq |   4 +-
 ...oinCastLeft@filter-rewrites@NullHandling=sql.iq |   4 +-
 ...CastLeft@join-to-filter@NullHandling=default.iq |   4 +-
 ...JoinCastLeft@join-to-filter@NullHandling=sql.iq |   4 +-
 ...rectAccess@all_disabled@NullHandling=default.iq |   8 +-
 ...ftDirectAccess@all_disabled@NullHandling=sql.iq |   8 +-
 ...irectAccess@all_enabled@NullHandling=default.iq |   8 +-
 ...eftDirectAccess@all_enabled@NullHandling=sql.iq |   8 +-
 ...eftDirectAccess@default@NullHandling=default.iq |   8 +-
 ...ithLeftDirectAccess@default@NullHandling=sql.iq |   8 +-
 ...n-value-column_disabled@NullHandling=default.iq |   8 +-
 ...er-on-value-column_disabled@NullHandling=sql.iq |   8 +-
 ...ilter-rewrites-disabled@NullHandling=default.iq |   8 +-
 ...ss@filter-rewrites-disabled@NullHandling=sql.iq |   8 +-
 ...tAccess@filter-rewrites@NullHandling=default.iq |   8 +-
 ...irectAccess@filter-rewrites@NullHandling=sql.iq |   8 +-
 ...ctAccess@join-to-filter@NullHandling=default.iq |   8 +-
 ...DirectAccess@join-to-filter@NullHandling=sql.iq |   8 +-
 ...rectAccess@all_disabled@NullHandling=default.iq |   8 +-
 ...ftDirectAccess@all_disabled@NullHandling=sql.iq |   8 +-
 ...irectAccess@all_enabled@NullHandling=default.iq |   8 +-
 ...eftDirectAccess@all_enabled@NullHandling=sql.iq |   8 +-
 ...eftDirectAccess@default@NullHandling=default.iq |   8 +-
 ...ithLeftDirectAccess@default@NullHandling=sql.iq |   8 +-
 ...n-value-column_disabled@NullHandling=default.iq |   8 +-
 ...er-on-value-column_disabled@NullHandling=sql.iq |   8 +-
 ...ilter-rewrites-disabled@NullHandling=default.iq |   8 +-
 ...ss@filter-rewrites-disabled@NullHandling=sql.iq |   8 +-
 ...tAccess@filter-rewrites@NullHandling=default.iq |   8 +-
 ...irectAccess@filter-rewrites@NullHandling=sql.iq |   8 +-
 ...ctAccess@join-to-filter@NullHandling=default.iq |   8 +-
 ...DirectAccess@join-to-filter@NullHandling=sql.iq |   8 +-
 ...ptyResults@all_disabled@NullHandling=default.iq |   2 +-
 ...rsEmptyResults@all_disabled@NullHandling=sql.iq |   2 +-
 ...mptyResults@all_enabled@NullHandling=default.iq |   2 +-
 ...ersEmptyResults@all_enabled@NullHandling=sql.iq |   2 +-
 ...ersEmptyResults@default@NullHandling=default.iq |   2 +-
 ...FiltersEmptyResults@default@NullHandling=sql.iq |   2 +-
 ...n-value-column_disabled@NullHandling=default.iq |   2 +-
 ...er-on-value-column_disabled@NullHandling=sql.iq |   2 +-
 ...ilter-rewrites-disabled@NullHandling=default.iq |   2 +-
 ...ts@filter-rewrites-disabled@NullHandling=sql.iq |   2 +-
 ...Results@filter-rewrites@NullHandling=default.iq |   2 +-
 ...mptyResults@filter-rewrites@NullHandling=sql.iq |   2 +-
 ...yResults@join-to-filter@NullHandling=default.iq |   2 +-
 ...EmptyResults@join-to-filter@NullHandling=sql.iq |   2 +-
 ...ptyResults@all_disabled@NullHandling=default.iq |   2 +-
 ...onEmptyResults@all_disabled@NullHandling=sql.iq |   2 +-
 ...mptyResults@all_enabled@NullHandling=default.iq |   2 +-
 ...NonEmptyResults@all_enabled@NullHandling=sql.iq |   2 +-
 ...NonEmptyResults@default@NullHandling=default.iq |   2 +-
 ...tersNonEmptyResults@default@NullHandling=sql.iq |   2 +-
 ...n-value-column_disabled@NullHandling=default.iq |   2 +-
 ...er-on-value-column_disabled@NullHandling=sql.iq |   2 +-
 ...ilter-rewrites-disabled@NullHandling=default.iq |   2 +-
 ...ts@filter-rewrites-disabled@NullHandling=sql.iq |   2 +-
 ...Results@filter-rewrites@NullHandling=default.iq |   2 +-
 ...mptyResults@filter-rewrites@NullHandling=sql.iq |   2 +-
 ...yResults@join-to-filter@NullHandling=default.iq |   2 +-
 ...EmptyResults@join-to-filter@NullHandling=sql.iq |   2 +-
 ...upByAndSubqueryHasLimit@NullHandling=default.iq |   4 +-
 ...rGroupByAndSubqueryHasLimit@NullHandling=sql.iq |   4 +-
 ...rectAccess@all_disabled@NullHandling=default.iq |   8 +-
 ...ftDirectAccess@all_disabled@NullHandling=sql.iq |   8 +-
 ...irectAccess@all_enabled@NullHandling=default.iq |   8 +-
 ...eftDirectAccess@all_enabled@NullHandling=sql.iq |   8 +-
 ...eftDirectAccess@default@NullHandling=default.iq |   8 +-
 ...ithLeftDirectAccess@default@NullHandling=sql.iq |   8 +-
 ...n-value-column_disabled@NullHandling=default.iq |   8 +-
 ...er-on-value-column_disabled@NullHandling=sql.iq |   8 +-
 ...ilter-rewrites-disabled@NullHandling=default.iq |   8 +-
 ...ss@filter-rewrites-disabled@NullHandling=sql.iq |   8 +-
 ...tAccess@filter-rewrites@NullHandling=default.iq |   8 +-
 ...irectAccess@filter-rewrites@NullHandling=sql.iq |   8 +-
 ...ctAccess@join-to-filter@NullHandling=default.iq |   8 +-
 ...DirectAccess@join-to-filter@NullHandling=sql.iq |   8 +-
 ...rectAccess@all_disabled@NullHandling=default.iq |   8 +-
 ...ftDirectAccess@all_disabled@NullHandling=sql.iq |   8 +-
 ...irectAccess@all_enabled@NullHandling=default.iq |   8 +-
 ...eftDirectAccess@all_enabled@NullHandling=sql.iq |   8 +-
 ...eftDirectAccess@default@NullHandling=default.iq |   8 +-
 ...ithLeftDirectAccess@default@NullHandling=sql.iq |   8 +-
 ...n-value-column_disabled@NullHandling=default.iq |   8 +-
 ...er-on-value-column_disabled@NullHandling=sql.iq |   8 +-
 ...ilter-rewrites-disabled@NullHandling=default.iq |   8 +-
 ...ss@filter-rewrites-disabled@NullHandling=sql.iq |   8 +-
 ...tAccess@filter-rewrites@NullHandling=default.iq |   8 +-
 ...irectAccess@filter-rewrites@NullHandling=sql.iq |   8 +-
 ...ctAccess@join-to-filter@NullHandling=default.iq |   8 +-
 ...DirectAccess@join-to-filter@NullHandling=sql.iq |   8 +-
 ...rectAccess@all_disabled@NullHandling=default.iq |   8 +-
 ...ftDirectAccess@all_disabled@NullHandling=sql.iq |   8 +-
 ...irectAccess@all_enabled@NullHandling=default.iq |   8 +-
 ...eftDirectAccess@all_enabled@NullHandling=sql.iq |   8 +-
 ...eftDirectAccess@default@NullHandling=default.iq |   8 +-
 ...ithLeftDirectAccess@default@NullHandling=sql.iq |   8 +-
 ...n-value-column_disabled@NullHandling=default.iq |   8 +-
 ...er-on-value-column_disabled@NullHandling=sql.iq |   8 +-
 ...ilter-rewrites-disabled@NullHandling=default.iq |   8 +-
 ...ss@filter-rewrites-disabled@NullHandling=sql.iq |   8 +-
 ...tAccess@filter-rewrites@NullHandling=default.iq |   8 +-
 ...irectAccess@filter-rewrites@NullHandling=sql.iq |   8 +-
 ...ctAccess@join-to-filter@NullHandling=default.iq |   8 +-
 ...DirectAccess@join-to-filter@NullHandling=sql.iq |   8 +-
 ...mnOnMVFilterMultiJoinExpression@all_disabled.iq |   4 +-
 ...umnOnMVFilterMultiJoinExpression@all_enabled.iq |   4 +-
 ...lColumnOnMVFilterMultiJoinExpression@default.iq |   4 +-
 ...inExpression@filter-on-value-column_disabled.iq |   4 +-
 ...MultiJoinExpression@filter-rewrites-disabled.iq |   4 +-
 ...nMVFilterMultiJoinExpression@filter-rewrites.iq |   4 +-
 ...OnMVFilterMultiJoinExpression@join-to-filter.iq |   4 +-
 ...herAggregatorsUsingJoin@NullHandling=default.iq |   4 +-
 ...ndOtherAggregatorsUsingJoin@NullHandling=sql.iq |   4 +-
 ...estTimeFilterOnSubquery@NullHandling=default.iq |   4 +-
 .../testTimeFilterOnSubquery@NullHandling=sql.iq   |   4 +-
 ...indowingWithScanAndSort@NullHandling=default.iq |   6 +-
 ...estWindowingWithScanAndSort@NullHandling=sql.iq |   6 +-
 188 files changed, 1360 insertions(+), 855 deletions(-)

diff --git a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/hll/sql/HllSketchSqlAggregatorTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/hll/sql/HllSketchSqlAggregatorTest.java
index 02359a50b62..074955625a6 100644
--- a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/hll/sql/HllSketchSqlAggregatorTest.java
+++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/hll/sql/HllSketchSqlAggregatorTest.java
@@ -1051,6 +1051,7 @@ public class HllSketchSqlAggregatorTest extends BaseCalciteQueryTest
                 )
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .columns("v0", "v1", "v2", "v3")
+                .columnTypes(ColumnType.DOUBLE, ColumnType.DOUBLE, ColumnType.DOUBLE, ColumnType.DOUBLE)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),
@@ -1089,6 +1090,7 @@ public class HllSketchSqlAggregatorTest extends BaseCalciteQueryTest
                 ))
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .columns("v0", "v1")
+                .columnTypes(ColumnType.DOUBLE, ColumnType.DOUBLE)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),
diff --git a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/sql/DoublesSketchSqlAggregatorTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/sql/DoublesSketchSqlAggregatorTest.java
index a85d508a879..ba1eb347fe7 100644
--- a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/sql/DoublesSketchSqlAggregatorTest.java
+++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/sql/DoublesSketchSqlAggregatorTest.java
@@ -398,7 +398,8 @@ public class DoublesSketchSqlAggregatorTest extends BaseCalciteQueryTest
                     new ExpressionVirtualColumn("v0", "946684800000", ColumnType.LONG, TestExprMacroTable.INSTANCE),
                     new ExpressionVirtualColumn("v1", "case_searched((\"j0.a0\" < \"_a0\"),'val2',((\"j0.a0\" >= \"_a0\") && (\"j0.a0\" < \"_a1\")),'val3',(\"j0.a0\" >= \"_a1\"),'val1',null)", ColumnType.STRING, TestExprMacroTable.INSTANCE)
                 )
-                .columns("j0.a0", "j0.d0", "v0", "v1")
+                .columns("v0", "j0.d0", "j0.a0", "v1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.LONG, ColumnType.STRING)
                 .build()
         ),
         expectedResults
diff --git a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/sql/ThetaSketchSqlAggregatorTest.java b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/sql/ThetaSketchSqlAggregatorTest.java
index d82863a8bf1..809c0c95003 100644
--- a/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/sql/ThetaSketchSqlAggregatorTest.java
+++ b/extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/sql/ThetaSketchSqlAggregatorTest.java
@@ -1108,6 +1108,7 @@ public class ThetaSketchSqlAggregatorTest extends BaseCalciteQueryTest
                 ))
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .columns("v0")
+                .columnTypes(ColumnType.DOUBLE)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQArraysTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQArraysTest.java
index 03890d7a326..9e323b52577 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQArraysTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQArraysTest.java
@@ -758,13 +758,13 @@ public class MSQArraysTest extends MSQTestBase
                                             .build();
 
     RowSignature scanSignature = RowSignature.builder()
-                                             .add("arrayDouble", ColumnType.DOUBLE_ARRAY)
-                                             .add("arrayDoubleNulls", ColumnType.DOUBLE_ARRAY)
-                                             .add("arrayLong", ColumnType.LONG_ARRAY)
-                                             .add("arrayLongNulls", ColumnType.LONG_ARRAY)
+                                             .add("v0", ColumnType.LONG)
                                              .add("arrayString", ColumnType.STRING_ARRAY)
                                              .add("arrayStringNulls", ColumnType.STRING_ARRAY)
-                                             .add("v0", ColumnType.LONG)
+                                             .add("arrayLong", ColumnType.LONG_ARRAY)
+                                             .add("arrayLongNulls", ColumnType.LONG_ARRAY)
+                                             .add("arrayDouble", ColumnType.DOUBLE_ARRAY)
+                                             .add("arrayDoubleNulls", ColumnType.DOUBLE_ARRAY)
                                              .build();
 
     final Map<String, Object> adjustedContext = new HashMap<>(context);
@@ -773,15 +773,8 @@ public class MSQArraysTest extends MSQTestBase
     Query<?> expectedQuery = newScanQueryBuilder()
         .dataSource(dataFileExternalDataSource)
         .intervals(querySegmentSpec(Filtration.eternity()))
-        .columns(
-            "arrayDouble",
-            "arrayDoubleNulls",
-            "arrayLong",
-            "arrayLongNulls",
-            "arrayString",
-            "arrayStringNulls",
-            "v0"
-        )
+        .columns(scanSignature.getColumnNames())
+        .columnTypes(scanSignature.getColumnTypes())
         .virtualColumns(new ExpressionVirtualColumn(
             "v0",
             "timestamp_parse(\"timestamp\",null,'UTC')",
@@ -862,6 +855,7 @@ public class MSQArraysTest extends MSQTestBase
         .dataSource(dataFileExternalDataSource)
         .intervals(querySegmentSpec(Filtration.eternity()))
         .columns("arrayString")
+        .columnTypes(scanSignature.getColumnTypes())
         .orderBy(Collections.singletonList(OrderBy.descending("arrayString")))
         .context(defaultScanQueryContext(context, scanSignature))
         .build();
@@ -925,6 +919,7 @@ public class MSQArraysTest extends MSQTestBase
         .dataSource(dataFileExternalDataSource)
         .intervals(querySegmentSpec(Filtration.eternity()))
         .columns("arrayLong")
+        .columnTypes(scanSignature.getColumnTypes())
         .orderBy(Collections.singletonList(OrderBy.ascending("arrayLong")))
         .context(defaultScanQueryContext(context, scanSignature))
         .build();
@@ -988,6 +983,7 @@ public class MSQArraysTest extends MSQTestBase
         .dataSource(dataFileExternalDataSource)
         .intervals(querySegmentSpec(Filtration.eternity()))
         .columns("arrayDouble")
+        .columnTypes(scanSignature.getColumnTypes())
         .orderBy(Collections.singletonList(OrderBy.ascending("arrayDouble")))
         .context(defaultScanQueryContext(context, scanSignature))
         .build();
@@ -1040,6 +1036,7 @@ public class MSQArraysTest extends MSQTestBase
         )
         .intervals(querySegmentSpec(Filtration.eternity()))
         .columns("a_bool")
+        .columnTypes(scanSignature.getColumnTypes())
         .context(defaultScanQueryContext(context, scanSignature))
         .build();
 
@@ -1088,6 +1085,7 @@ public class MSQArraysTest extends MSQTestBase
         )
         .intervals(querySegmentSpec(Filtration.eternity()))
         .columns("a_bool")
+        .columnTypes(scanSignature.getColumnTypes())
         .context(defaultScanQueryContext(context, scanSignature))
         .build();
 
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQComplexGroupByTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQComplexGroupByTest.java
index e498b5bb268..6322410aa78 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQComplexGroupByTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQComplexGroupByTest.java
@@ -409,6 +409,7 @@ public class MSQComplexGroupByTest extends MSQTestBase
                                                         .dataSource(dataFileExternalDataSource)
                                                         .intervals(querySegmentSpec(Filtration.eternity()))
                                                         .columns("obj")
+                                                        .columnTypes(ColumnType.NESTED_DATA)
                                                         .context(defaultScanQueryContext(context, rowSignature))
                                                         .orderBy(Collections.singletonList(OrderBy.ascending("obj")))
                                                         .build()
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQLoadedSegmentTests.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQLoadedSegmentTests.java
index 4ea4cb0344f..ff7ca696bed 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQLoadedSegmentTests.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQLoadedSegmentTests.java
@@ -127,6 +127,7 @@ public class MSQLoadedSegmentTests extends MSQTestBase
                            .dataSource(CalciteTests.DATASOURCE1)
                            .intervals(querySegmentSpec(Filtration.eternity()))
                            .columns("cnt", "dim1")
+                           .columnTypes(resultSignature.getColumnTypes())
                            .context(defaultScanQueryContext(REALTIME_QUERY_CTX, resultSignature))
                            .build()
                    )
@@ -190,6 +191,7 @@ public class MSQLoadedSegmentTests extends MSQTestBase
                            .dataSource(CalciteTests.DATASOURCE1)
                            .intervals(querySegmentSpec(Filtration.eternity()))
                            .columns("cnt", "dim1")
+                           .columnTypes(resultSignature.getColumnTypes())
                            .orderBy(ImmutableList.of(OrderBy.ascending("dim1")))
                            .context(defaultScanQueryContext(REALTIME_QUERY_CTX, resultSignature))
                            .build()
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQParseExceptionsTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQParseExceptionsTest.java
index 8577dcd18d4..9801ea225c0 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQParseExceptionsTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQParseExceptionsTest.java
@@ -180,6 +180,7 @@ public class MSQParseExceptionsTest extends MSQTestBase
                 )
             )
             .columns("v0", "v1")
+            .columnTypes(ColumnType.LONG, ColumnType.STRING)
             .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
             .context(defaultScanQueryContext(
                 context,
@@ -272,13 +273,14 @@ public class MSQParseExceptionsTest extends MSQTestBase
                     ColumnType.LONG
                 )
             )
-            .columns("agent_category", "v0")
+            .columns("v0", "agent_category")
+            .columnTypes(ColumnType.LONG, ColumnType.STRING)
             .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
             .context(defaultScanQueryContext(
                 context,
                 RowSignature.builder()
-                            .add("agent_category", ColumnType.STRING)
                             .add("v0", ColumnType.LONG)
+                            .add("agent_category", ColumnType.STRING)
                             .build()
             ))
             .build();
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQSelectTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQSelectTest.java
index 91a1983bfd6..09dcbfcda14 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQSelectTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQSelectTest.java
@@ -164,6 +164,7 @@ public class MSQSelectTest extends MSQTestBase
                            )
                            .intervals(querySegmentSpec(Filtration.eternity()))
                            .columns("EXPR$0")
+                           .columnTypes(ColumnType.LONG)
                            .context(defaultScanQueryContext(context, resultSignature))
                            .build()
                    )
@@ -197,6 +198,7 @@ public class MSQSelectTest extends MSQTestBase
                            .dataSource(CalciteTests.DATASOURCE1)
                            .intervals(querySegmentSpec(Filtration.eternity()))
                            .columns("cnt", "dim1")
+                           .columnTypes(ColumnType.LONG, ColumnType.STRING)
                            .context(defaultScanQueryContext(context, resultSignature))
                            .build()
                    )
@@ -254,12 +256,13 @@ public class MSQSelectTest extends MSQTestBase
                    .query(newScanQueryBuilder()
                               .dataSource(CalciteTests.DATASOURCE2)
                               .intervals(querySegmentSpec(Filtration.eternity()))
-                              .columns("dim2", "m1")
+                              .columns("m1", "dim2")
+                              .columnTypes(ColumnType.LONG, ColumnType.STRING)
                               .context(defaultScanQueryContext(
                                   context,
                                   RowSignature.builder()
-                                              .add("dim2", ColumnType.STRING)
                                               .add("m1", ColumnType.LONG)
+                                              .add("dim2", ColumnType.STRING)
                                               .build()
                               ))
                               .build())
@@ -331,6 +334,7 @@ public class MSQSelectTest extends MSQTestBase
                            .dataSource(CalciteTests.DATASOURCE1)
                            .intervals(querySegmentSpec(Filtration.eternity()))
                            .columns("cnt", "dim1")
+                           .columnTypes(ColumnType.LONG, ColumnType.STRING)
                            .context(defaultScanQueryContext(context, expectedScanSignature))
                            .build()
                    )
@@ -395,6 +399,7 @@ public class MSQSelectTest extends MSQTestBase
                                )
                            )
                            .columns("cnt", "dim1")
+                           .columnTypes(ColumnType.LONG, ColumnType.STRING)
                            .context(defaultScanQueryContext(context, resultSignature))
                            .build()
                    )
@@ -437,6 +442,7 @@ public class MSQSelectTest extends MSQTestBase
                                )
                            )
                            .columns("cnt", "dim1")
+                           .columnTypes(ColumnType.LONG, ColumnType.STRING)
                            .context(defaultScanQueryContext(context, resultSignature))
                            .build()
                    )
@@ -476,6 +482,7 @@ public class MSQSelectTest extends MSQTestBase
                            .dataSource(CalciteTests.DATASOURCE1)
                            .intervals(querySegmentSpec(Intervals.ETERNITY))
                            .columns("cnt", "dim1")
+                           .columnTypes(ColumnType.LONG, ColumnType.STRING)
                            .filters(equality("dim2", "nonexistent", ColumnType.STRING))
                            .context(defaultScanQueryContext(context, resultSignature))
                            .build()
@@ -511,6 +518,7 @@ public class MSQSelectTest extends MSQTestBase
                            .dataSource(CalciteTests.DATASOURCE1)
                            .intervals(querySegmentSpec(Intervals.ETERNITY))
                            .columns("cnt", "dim1")
+                           .columnTypes(ColumnType.LONG, ColumnType.STRING)
                            .filters(equality("dim2", "nonexistent", ColumnType.STRING))
                            .context(defaultScanQueryContext(context, resultSignature))
                            .orderBy(ImmutableList.of(OrderBy.ascending("dim1")))
@@ -693,6 +701,7 @@ public class MSQSelectTest extends MSQTestBase
                            .dataSource(CalciteTests.DATASOURCE1)
                            .intervals(querySegmentSpec(Filtration.eternity()))
                            .columns("cnt", "dim1")
+                           .columnTypes(ColumnType.LONG, ColumnType.STRING)
                            .context(defaultScanQueryContext(context, resultSignature))
                            .limit(10)
                            .build()
@@ -998,6 +1007,7 @@ public class MSQSelectTest extends MSQTestBase
                                     .dataSource(CalciteTests.DATASOURCE1)
                                     .intervals(querySegmentSpec(Filtration.eternity()))
                                     .columns("dim2", "m1", "m2")
+                                    .columnTypes(ColumnType.STRING, ColumnType.FLOAT, ColumnType.DOUBLE)
                                     .context(
                                         defaultScanQueryContext(
                                             queryContext,
@@ -1016,7 +1026,8 @@ public class MSQSelectTest extends MSQTestBase
                                 newScanQueryBuilder()
                                     .dataSource(CalciteTests.DATASOURCE1)
                                     .intervals(querySegmentSpec(Filtration.eternity()))
-                                    .columns(ImmutableList.of("m1"))
+                                    .columns("m1")
+                                    .columnTypes(ColumnType.FLOAT)
                                     .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                     .context(
                                         defaultScanQueryContext(
@@ -1475,17 +1486,17 @@ public class MSQSelectTest extends MSQTestBase
                                      ColumnType.LONG,
                                      CalciteTests.createExprMacroTable()
                                  )
-                             ).columns("user", "v0").filters(new LikeDimFilter("user", "%ot%", null, null))
-                             .context(defaultScanQueryContext(multipleWorkerContext, RowSignature.builder()
-                                                                                                 .add(
-                                                                                                     "user",
-                                                                                                     ColumnType.STRING
-                                                                                                 )
-                                                                                                 .add(
-                                                                                                     "v0",
-                                                                                                     ColumnType.LONG
-                                                                                                 )
-                                                                                                 .build()))
+                             )
+                             .columns("v0", "user")
+                             .columnTypes(ColumnType.LONG, ColumnType.STRING)
+                             .filters(new LikeDimFilter("user", "%ot%", null, null))
+                             .context(defaultScanQueryContext(
+                                 multipleWorkerContext,
+                                 RowSignature.builder()
+                                     .add("v0", ColumnType.LONG)
+                                     .add("user", ColumnType.STRING)
+                                     .build()
+                             ))
                              .build();
 
     SelectTester selectTester = testSelectQuery()
@@ -1670,12 +1681,13 @@ public class MSQSelectTest extends MSQTestBase
                        newScanQueryBuilder()
                            .dataSource(CalciteTests.DATASOURCE2)
                            .intervals(querySegmentSpec(Filtration.eternity()))
-                           .columns("dim2", "m1")
+                           .columns("m1", "dim2")
+                           .columnTypes(ColumnType.LONG, ColumnType.STRING)
                            .context(defaultScanQueryContext(
                                context,
                                RowSignature.builder()
-                                           .add("dim2", ColumnType.STRING)
                                            .add("m1", ColumnType.LONG)
+                                           .add("dim2", ColumnType.STRING)
                                            .build()
                            ))
                            .build()
@@ -1742,6 +1754,7 @@ public class MSQSelectTest extends MSQTestBase
                                                   )
                                               )
                                               .columns("dim3", "v0")
+                                              .columnTypes(ColumnType.STRING, ColumnType.STRING_ARRAY)
                                               .context(defaultScanQueryContext(context, expectedScanSignature))
                                               .build())
                                    .columnMappings(
@@ -2430,6 +2443,7 @@ public class MSQSelectTest extends MSQTestBase
                            ))
                            .intervals(querySegmentSpec(Filtration.eternity()))
                            .columns("v0")
+                           .columnTypes(ColumnType.LONG)
                            .virtualColumns(new ExpressionVirtualColumn("v0", ExprEval.of(1L).toExpr(), ColumnType.LONG))
                            .context(defaultScanQueryContext(
                                context,
@@ -2480,6 +2494,7 @@ public class MSQSelectTest extends MSQTestBase
                         .dataSource("foo")
                         .virtualColumns(expressionVirtualColumn("v0", "0", ColumnType.LONG))
                         .columns("v0")
+                        .columnTypes(ColumnType.LONG)
                         .context(defaultScanQueryContext(
                             queryContext,
                             RowSignature.builder().add("v0", ColumnType.LONG).build()
@@ -2591,6 +2606,7 @@ public class MSQSelectTest extends MSQTestBase
                               )
                               .intervals(querySegmentSpec(Filtration.eternity()))
                               .columns("EXPR$0")
+                              .columnTypes(ColumnType.LONG)
                               .context(defaultScanQueryContext(
                                   context,
                                   resultSignature
@@ -2648,7 +2664,8 @@ public class MSQSelectTest extends MSQTestBase
                                   context,
                                   resultSignature
                               ))
-                              .columns(ImmutableList.of("j0.unnest"))
+                              .columns("j0.unnest")
+                              .columnTypes(ColumnType.STRING)
                               .build())
                    .columnMappings(expectedColumnMappings)
                    .tuningConfig(MSQTuningConfig.defaultConfig())
@@ -2719,6 +2736,7 @@ public class MSQSelectTest extends MSQTestBase
                                           .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                           .filters(equality("dim2", "a", ColumnType.STRING))
                                           .columns("dim3")
+                                          .columnTypes(ColumnType.STRING)
                                           .context(defaultScanQueryContext(
                                               context,
                                               resultSignature1
@@ -2735,7 +2753,8 @@ public class MSQSelectTest extends MSQTestBase
                                   context,
                                   resultSignature
                               ))
-                              .columns(ImmutableList.of("j0.unnest"))
+                              .columns("j0.unnest")
+                              .columnTypes(ColumnType.STRING)
                               .build())
                    .columnMappings(expectedColumnMappings)
                    .tuningConfig(MSQTuningConfig.defaultConfig())
@@ -2802,7 +2821,8 @@ public class MSQSelectTest extends MSQTestBase
                                   context,
                                   rowSignature
                               ))
-                              .columns(ImmutableList.of("__time", "dim1"))
+                              .columns("__time", "dim1")
+                              .columnTypes(ColumnType.LONG, ColumnType.STRING)
                               .build())
                    .columnMappings(ColumnMappings.identity(rowSignature))
                    .tuningConfig(MSQTuningConfig.defaultConfig())
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQWindowTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQWindowTest.java
index aa258859b50..a3351d1e059 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQWindowTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQWindowTest.java
@@ -591,6 +591,7 @@ public class MSQWindowTest extends MSQTestBase
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("m1")
+                .columnTypes(ColumnType.FLOAT)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(contextWithRowSignature)
                 .build()),
@@ -658,6 +659,7 @@ public class MSQWindowTest extends MSQTestBase
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("m1", "m2")
+                .columnTypes(ColumnType.FLOAT, ColumnType.DOUBLE)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(contextWithRowSignature)
                 .build()),
@@ -728,6 +730,7 @@ public class MSQWindowTest extends MSQTestBase
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("m1", "m2")
+                .columnTypes(ColumnType.FLOAT, ColumnType.DOUBLE)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(contextWithRowSignature)
                 .build()),
@@ -870,6 +873,7 @@ public class MSQWindowTest extends MSQTestBase
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("m1", "v0")
+                .columnTypes(ColumnType.FLOAT, ColumnType.LONG)
                 .virtualColumns(expressionVirtualColumn("v0", "strlen(\"dim1\")", ColumnType.LONG))
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(contextWithRowSignature)
@@ -942,6 +946,7 @@ public class MSQWindowTest extends MSQTestBase
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("m1")
+                .columnTypes(ColumnType.FLOAT)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(contextWithRowSignature)
                 .build()),
@@ -987,7 +992,7 @@ public class MSQWindowTest extends MSQTestBase
                     .putAll(DEFAULT_MSQ_CONTEXT)
                     .put(
                         DruidQuery.CTX_SCAN_SIGNATURE,
-                        "[{\"name\":\"j0.m2\",\"type\":\"DOUBLE\"},{\"name\":\"m1\",\"type\":\"FLOAT\"}]"
+                        "[{\"name\":\"m1\",\"type\":\"FLOAT\"},{\"name\":\"j0.m2\",\"type\":\"DOUBLE\"}]"
                     )
                     .build();
 
@@ -1024,6 +1029,7 @@ public class MSQWindowTest extends MSQTestBase
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .virtualColumns(expressionVirtualColumn("v0", "\"m2\"", ColumnType.FLOAT))
                                 .columns("m2", "v0")
+                                .columnTypes(ColumnType.DOUBLE, ColumnType.FLOAT)
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .context(contextWithRowSignature1)
                                 .build()
@@ -1037,7 +1043,8 @@ public class MSQWindowTest extends MSQTestBase
                     )
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("j0.m2", "m1")
+                .columns("m1", "j0.m2")
+                .columnTypes(ColumnType.FLOAT, ColumnType.DOUBLE)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(contextWithRowSignature)
                 .build()),
@@ -1090,7 +1097,7 @@ public class MSQWindowTest extends MSQTestBase
                     .putAll(DEFAULT_MSQ_CONTEXT)
                     .put(
                         DruidQuery.CTX_SCAN_SIGNATURE,
-                        "[{\"name\":\"j0.m2\",\"type\":\"DOUBLE\"},{\"name\":\"m1\",\"type\":\"FLOAT\"}]"
+                        "[{\"name\":\"m1\",\"type\":\"FLOAT\"},{\"name\":\"j0.m2\",\"type\":\"DOUBLE\"}]"
                     )
                     .build();
 
@@ -1127,6 +1134,7 @@ public class MSQWindowTest extends MSQTestBase
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .virtualColumns(expressionVirtualColumn("v0", "\"m2\"", ColumnType.FLOAT))
                                 .columns("m2", "v0")
+                                .columnTypes(ColumnType.DOUBLE, ColumnType.FLOAT)
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .context(contextWithRowSignature1)
                                 .build()
@@ -1140,7 +1148,8 @@ public class MSQWindowTest extends MSQTestBase
                     )
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("j0.m2", "m1")
+                .columns("m1", "j0.m2")
+                .columnTypes(ColumnType.FLOAT, ColumnType.DOUBLE)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(contextWithRowSignature)
                 .build()),
@@ -1213,6 +1222,7 @@ public class MSQWindowTest extends MSQTestBase
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim2", "m1")
+                .columnTypes(ColumnType.STRING, ColumnType.FLOAT)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(contextWithRowSignature)
                 .build()),
@@ -1269,7 +1279,7 @@ public class MSQWindowTest extends MSQTestBase
                     .putAll(DEFAULT_MSQ_CONTEXT)
                     .put(
                         DruidQuery.CTX_SCAN_SIGNATURE,
-                        "[{\"name\":\"j0.unnest\",\"type\":\"STRING\"},{\"name\":\"m1\",\"type\":\"FLOAT\"}]"
+                        "[{\"name\":\"m1\",\"type\":\"FLOAT\"},{\"name\":\"j0.unnest\",\"type\":\"STRING\"}]"
                     )
                     .build();
 
@@ -1297,7 +1307,8 @@ public class MSQWindowTest extends MSQTestBase
                     )
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("j0.unnest", "m1")
+                .columns("m1", "j0.unnest")
+                .columnTypes(ColumnType.FLOAT, ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(contextWithRowSignature)
                 .build()),
@@ -1351,7 +1362,7 @@ public class MSQWindowTest extends MSQTestBase
                     .putAll(DEFAULT_MSQ_CONTEXT)
                     .put(
                         DruidQuery.CTX_SCAN_SIGNATURE,
-                        "[{\"name\":\"j0.unnest\",\"type\":\"STRING\"},{\"name\":\"m1\",\"type\":\"FLOAT\"}]"
+                        "[{\"name\":\"m1\",\"type\":\"FLOAT\"},{\"name\":\"j0.unnest\",\"type\":\"STRING\"}]"
                     )
                     .build();
 
@@ -1379,7 +1390,8 @@ public class MSQWindowTest extends MSQTestBase
                     )
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("j0.unnest", "m1")
+                .columns("m1", "j0.unnest")
+                .columnTypes(ColumnType.FLOAT, ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(contextWithRowSignature)
                 .build()),
@@ -1740,7 +1752,7 @@ public class MSQWindowTest extends MSQTestBase
                     .putAll(DEFAULT_MSQ_CONTEXT)
                     .put(
                         DruidQuery.CTX_SCAN_SIGNATURE,
-                        "[{\"name\":\"added\",\"type\":\"LONG\"},{\"name\":\"cityName\",\"type\":\"STRING\"}]"
+                        "[{\"name\":\"cityName\",\"type\":\"STRING\"},{\"name\":\"added\",\"type\":\"LONG\"}]"
                     )
                     .build();
 
@@ -1750,7 +1762,8 @@ public class MSQWindowTest extends MSQTestBase
                 .dataSource(CalciteTests.WIKIPEDIA)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .filters(in("cityName", ImmutableList.of("Ahmedabad", "Albuquerque")))
-                .columns("added", "cityName")
+                .columns("cityName", "added")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(contextWithRowSignature)
                 .build()),
@@ -1829,7 +1842,7 @@ public class MSQWindowTest extends MSQTestBase
                     .putAll(DEFAULT_MSQ_CONTEXT)
                     .put(
                         DruidQuery.CTX_SCAN_SIGNATURE,
-                        "[{\"name\":\"added\",\"type\":\"LONG\"},{\"name\":\"cityName\",\"type\":\"STRING\"},{\"name\":\"countryIsoCode\",\"type\":\"STRING\"}]"
+                        "[{\"name\":\"cityName\",\"type\":\"STRING\"},{\"name\":\"countryIsoCode\",\"type\":\"STRING\"},{\"name\":\"added\",\"type\":\"LONG\"}]"
                     )
                     .build();
 
@@ -1839,7 +1852,8 @@ public class MSQWindowTest extends MSQTestBase
                 .dataSource(CalciteTests.WIKIPEDIA)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .filters(notNull("cityName"))
-                .columns("added", "cityName", "countryIsoCode")
+                .columns("cityName", "countryIsoCode", "added")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(innerContextWithRowSignature)
                 .build()),
@@ -1861,13 +1875,14 @@ public class MSQWindowTest extends MSQTestBase
                     .putAll(DEFAULT_MSQ_CONTEXT)
                     .put(
                         DruidQuery.CTX_SCAN_SIGNATURE,
-                        "[{\"name\":\"added\",\"type\":\"LONG\"},{\"name\":\"cityName\",\"type\":\"STRING\"},{\"name\":\"w0\",\"type\":\"LONG\"}]"
+                        "[{\"name\":\"cityName\",\"type\":\"STRING\"},{\"name\":\"added\",\"type\":\"LONG\"},{\"name\":\"w0\",\"type\":\"LONG\"}]"
                     )
                     .build();
     final Query scanQuery = Druids.newScanQueryBuilder()
                                   .dataSource(new QueryDataSource(query))
                                   .intervals(querySegmentSpec(Filtration.eternity()))
-                                  .columns("added", "cityName", "w0")
+                                  .columns("cityName", "added", "w0")
+                                  .columnTypes(ColumnType.STRING, ColumnType.LONG, ColumnType.LONG)
                                   .limit(5)
                                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                   .context(outerContextWithRowSignature)
@@ -2087,6 +2102,7 @@ public class MSQWindowTest extends MSQTestBase
                                   .dataSource(new QueryDataSource(windowQuery))
                                   .intervals(querySegmentSpec(Filtration.eternity()))
                                   .columns("d0", "d1", "d2", "w0", "w1")
+                                  .columnTypes(ColumnType.STRING, ColumnType.DOUBLE, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                                   .orderBy(
                                       ImmutableList.of(
                                           OrderBy.ascending("d0"),
diff --git a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/resources/SqlMSQStatementResourcePostTest.java b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/resources/SqlMSQStatementResourcePostTest.java
index 656086cef43..302a9951cc8 100644
--- a/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/resources/SqlMSQStatementResourcePostTest.java
+++ b/extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/sql/resources/SqlMSQStatementResourcePostTest.java
@@ -300,7 +300,7 @@ public class SqlMSQStatementResourcePostTest extends MSQTestBase
     ), SqlStatementResourceTest.makeOkRequest());
 
     Assert.assertEquals(
-        "{PLAN=[{\"query\":{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"resultFormat\":\"compactedList\",\"columns\":[\"__time\",\"cnt\",\"dim1\",\"dim2\",\"dim3\",\"m1\",\"m2\",\"unique_dim1\"],\"context\":{\"__resultFormat\":\"object\",\"executionMode\":\"ASYNC\",\"scanSignature\":\"[{\\\"name\\\":\\\"__time\\\",\\\"type\\\":\\\"LONG\ [...]
+        "{PLAN=[{\"query\":{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"resultFormat\":\"compactedList\",\"columns\":[\"__time\",\"dim1\",\"dim2\",\"dim3\",\"cnt\",\"m1\",\"m2\",\"unique_dim1\"],\"context\":{\"__resultFormat\":\"object\",\"executionMode\":\"ASYNC\",\"scanSignature\":\"[{\\\"name\\\":\\\"__time\\\",\\\"type\\\":\\\"LONG\ [...]
         String.valueOf(SqlStatementResourceTest.getResultRowsFromResponse(response).get(0))
     );
   }
diff --git a/extensions-core/testing-tools/src/test/java/org/apache/druid/query/sql/SleepSqlTest.java b/extensions-core/testing-tools/src/test/java/org/apache/druid/query/sql/SleepSqlTest.java
index 528d82bd965..0b6125d8e3d 100644
--- a/extensions-core/testing-tools/src/test/java/org/apache/druid/query/sql/SleepSqlTest.java
+++ b/extensions-core/testing-tools/src/test/java/org/apache/druid/query/sql/SleepSqlTest.java
@@ -72,6 +72,7 @@ public class SleepSqlTest extends BaseCalciteQueryTest
                       )
                   )
                   .columns("v0")
+                  .columnTypes(ColumnType.STRING)
                   .filters(range("m1", ColumnType.DOUBLE, null, 2.0, false, true))
                   .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_DEFAULT)
diff --git a/processing/src/main/java/org/apache/druid/query/scan/ScanQuery.java b/processing/src/main/java/org/apache/druid/query/scan/ScanQuery.java
index be3d4fa2d5e..57f3a8772fc 100644
--- a/processing/src/main/java/org/apache/druid/query/scan/ScanQuery.java
+++ b/processing/src/main/java/org/apache/druid/query/scan/ScanQuery.java
@@ -463,7 +463,9 @@ public class ScanQuery extends BaseQuery<ScanResultValue>
            Objects.equals(resultFormat, scanQuery.resultFormat) &&
            Objects.equals(dimFilter, scanQuery.dimFilter) &&
            Objects.equals(columns, scanQuery.columns) &&
-           Objects.equals(orderBys, scanQuery.orderBys);
+           Objects.equals(columnTypes, scanQuery.columnTypes) &&
+           Objects.equals(orderBys, scanQuery.orderBys) &&
+           Objects.equals(timeOrder, scanQuery.timeOrder);
   }
 
   @Override
@@ -478,7 +480,9 @@ public class ScanQuery extends BaseQuery<ScanResultValue>
         scanRowsLimit,
         dimFilter,
         columns,
-        orderBys
+        columnTypes,
+        orderBys,
+        timeOrder
     );
   }
 
@@ -495,6 +499,7 @@ public class ScanQuery extends BaseQuery<ScanResultValue>
            ", limit=" + scanRowsLimit +
            ", dimFilter=" + dimFilter +
            ", columns=" + columns +
+           ", columnTypes=" + columnTypes +
            (orderBys.isEmpty() ? "" : ", orderBy=" + orderBys) +
            ", context=" + getContext() +
            '}';
diff --git a/processing/src/test/java/org/apache/druid/query/scan/ScanQueryLimitRowIteratorTest.java b/processing/src/test/java/org/apache/druid/query/scan/ScanQueryLimitRowIteratorTest.java
index e187ddfd630..c4dccff2b3c 100644
--- a/processing/src/test/java/org/apache/druid/query/scan/ScanQueryLimitRowIteratorTest.java
+++ b/processing/src/test/java/org/apache/druid/query/scan/ScanQueryLimitRowIteratorTest.java
@@ -27,6 +27,7 @@ import org.apache.druid.query.Order;
 import org.apache.druid.query.QueryPlus;
 import org.apache.druid.query.QueryRunnerTestHelper;
 import org.apache.druid.query.context.ResponseContext;
+import org.apache.druid.testing.InitializedNullHandlingTest;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -39,7 +40,7 @@ import java.util.Map;
 import java.util.concurrent.ThreadLocalRandom;
 
 @RunWith(Parameterized.class)
-public class ScanQueryLimitRowIteratorTest
+public class ScanQueryLimitRowIteratorTest extends InitializedNullHandlingTest
 {
   private static final int NUM_ELEMENTS = 1000;
   private final int batchSize;
diff --git a/processing/src/test/java/org/apache/druid/query/scan/ScanQueryTest.java b/processing/src/test/java/org/apache/druid/query/scan/ScanQueryTest.java
index f5a784b3841..847226ccb0d 100644
--- a/processing/src/test/java/org/apache/druid/query/scan/ScanQueryTest.java
+++ b/processing/src/test/java/org/apache/druid/query/scan/ScanQueryTest.java
@@ -23,6 +23,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Warning;
 import org.apache.druid.java.util.common.DateTimes;
 import org.apache.druid.java.util.common.ISE;
 import org.apache.druid.java.util.common.guava.Sequence;
@@ -449,4 +451,15 @@ public class ScanQueryTest extends InitializedNullHandlingTest
     Assert.assertNull(buildSpec.getAggregators());
     Assert.assertEquals(virtualColumns, buildSpec.getVirtualColumns());
   }
+
+  @Test
+  public void testEquals()
+  {
+    EqualsVerifier.forClass(ScanQuery.class)
+        .suppress(Warning.NULL_FIELDS, Warning.NONFINAL_FIELDS)
+        // these fields are derived from the context
+        .withIgnoredFields("maxRowsQueuedForOrdering", "maxSegmentPartitionsOrderedInMemory")
+        .usingGetClass()
+        .verify();
+  }
 }
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java
index f8d33f55895..4470ebde361 100644
--- a/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java
+++ b/sql/src/main/java/org/apache/druid/sql/calcite/rel/DruidQuery.java
@@ -113,12 +113,11 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -1673,8 +1672,8 @@ public class DruidQuery
       }
     }
 
-    // Compute the list of columns to select, sorted and deduped.
-    final SortedSet<String> scanColumns = new TreeSet<>(outputRowSignature.getColumnNames());
+    // Deduplicate column list
+    final Set<String> scanColumns = new LinkedHashSet<>(outputRowSignature.getColumnNames());
     orderByColumns.forEach(column -> scanColumns.add(column.getColumnName()));
 
     final VirtualColumns virtualColumns = getVirtualColumns(true);
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteArraysQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteArraysQueryTest.java
index f2ef6941fc3..93b2fc526e4 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteArraysQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteArraysQueryTest.java
@@ -129,7 +129,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "array(1,2)", ColumnType.LONG_ARRAY))
-                .columns("dim1", "v0")
+                .columns("v0", "dim1")
+                .columnTypes(ColumnType.LONG_ARRAY, ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(1)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -214,7 +215,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                     "array(concat(\"dim1\",'word'),'up')",
                     ColumnType.STRING_ARRAY
                 ))
-                .columns("dim1", "v0")
+                .columns("v0", "dim1")
+                .columnTypes(ColumnType.STRING_ARRAY, ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -240,7 +242,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
         .dataSource(CalciteTests.DATASOURCE1)
         .intervals(querySegmentSpec(Filtration.eternity()))
         .virtualColumns(expressionVirtualColumn("v0", "array(concat(\"dim3\",'word'),'up')", ColumnType.STRING_ARRAY))
-        .columns("dim1", "v0")
+        .columns("v0", "dim1")
+        .columnTypes(ColumnType.STRING_ARRAY, ColumnType.STRING)
         .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
         .limit(5)
         .context(QUERY_CONTEXT_DEFAULT)
@@ -329,6 +332,31 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
           }
       );
     }
+    RowSignature resultSignature = RowSignature.builder()
+                .add("dim1", ColumnType.STRING)
+                .add("dim2", ColumnType.STRING)
+                .add("dim3", ColumnType.STRING)
+                .add("l1", ColumnType.LONG)
+                .add("l2", ColumnType.LONG)
+                .add("d1", ColumnType.DOUBLE)
+                .add("d2", ColumnType.DOUBLE)
+                .add("EXPR$7", ColumnType.STRING_ARRAY)
+                .add("EXPR$8", ColumnType.LONG_ARRAY)
+                .add("EXPR$9", ColumnType.DOUBLE_ARRAY)
+                .add("EXPR$10", ColumnType.STRING_ARRAY)
+                .add("EXPR$11", ColumnType.STRING_ARRAY)
+                .add("EXPR$12", ColumnType.LONG_ARRAY)
+                .add("EXPR$13", ColumnType.LONG_ARRAY)
+                .add("EXPR$14", ColumnType.DOUBLE_ARRAY)
+                .add("EXPR$15", ColumnType.DOUBLE_ARRAY)
+                .add("EXPR$16", ColumnType.STRING_ARRAY)
+                .add("EXPR$17", ColumnType.LONG_ARRAY)
+                .add("EXPR$18", ColumnType.DOUBLE_ARRAY)
+                .add("EXPR$19", ColumnType.LONG)
+                .add("EXPR$20", ColumnType.DOUBLE)
+                .add("EXPR$21", ColumnType.LONG)
+                .add("EXPR$22", ColumnType.DOUBLE)
+                .build();
     testQuery(
         "SELECT"
         + " dim1,"
@@ -384,21 +412,15 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                     expressionVirtualColumn("v9", "array_concat(\"dim2\",\"dim3\")", ColumnType.STRING_ARRAY)
                 )
                 .columns(
-                    "d1",
-                    "d2",
                     "dim1",
                     "dim2",
                     "dim3",
                     "l1",
                     "l2",
+                    "d1",
+                    "d2",
                     "v0",
                     "v1",
-                    "v10",
-                    "v11",
-                    "v12",
-                    "v13",
-                    "v14",
-                    "v15",
                     "v2",
                     "v3",
                     "v4",
@@ -406,39 +428,22 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                     "v6",
                     "v7",
                     "v8",
-                    "v9"
+                    "v9",
+                    "v10",
+                    "v11",
+                    "v12",
+                    "v13",
+                    "v14",
+                    "v15"
                 )
+                .columnTypes(resultSignature.getColumnTypes())
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(1)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),
         expectedResults,
-        RowSignature.builder()
-                    .add("dim1", ColumnType.STRING)
-                    .add("dim2", ColumnType.STRING)
-                    .add("dim3", ColumnType.STRING)
-                    .add("l1", ColumnType.LONG)
-                    .add("l2", ColumnType.LONG)
-                    .add("d1", ColumnType.DOUBLE)
-                    .add("d2", ColumnType.DOUBLE)
-                    .add("EXPR$7", ColumnType.STRING_ARRAY)
-                    .add("EXPR$8", ColumnType.LONG_ARRAY)
-                    .add("EXPR$9", ColumnType.DOUBLE_ARRAY)
-                    .add("EXPR$10", ColumnType.STRING_ARRAY)
-                    .add("EXPR$11", ColumnType.STRING_ARRAY)
-                    .add("EXPR$12", ColumnType.LONG_ARRAY)
-                    .add("EXPR$13", ColumnType.LONG_ARRAY)
-                    .add("EXPR$14", ColumnType.DOUBLE_ARRAY)
-                    .add("EXPR$15", ColumnType.DOUBLE_ARRAY)
-                    .add("EXPR$16", ColumnType.STRING_ARRAY)
-                    .add("EXPR$17", ColumnType.LONG_ARRAY)
-                    .add("EXPR$18", ColumnType.DOUBLE_ARRAY)
-                    .add("EXPR$19", ColumnType.LONG)
-                    .add("EXPR$20", ColumnType.DOUBLE)
-                    .add("EXPR$21", ColumnType.LONG)
-                    .add("EXPR$22", ColumnType.DOUBLE)
-                    .build()
+        resultSignature
     );
   }
 
@@ -481,6 +486,26 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
           new Object[]{"[null,\"b\"]", null, "[999.0,null,5.5]", "[null,\"b\",\"foo\"]", "[\"foo\",null,\"b\"]", null, null, "[999.0,null,5.5,1.1]", "[2.2,999.0,null,5.5]", "[\"a\",\"b\",\"c\",null,\"b\"]", null, "[3.3,4.4,5.5,999.0,null,5.5]", null, null, 999.0D, null, null, 999.0D}
       );
     }
+    RowSignature resultSignature = RowSignature.builder()
+                .add("arrayStringNulls", ColumnType.STRING_ARRAY)
+                .add("arrayLongNulls", ColumnType.LONG_ARRAY)
+                .add("arrayDoubleNulls", ColumnType.DOUBLE_ARRAY)
+                .add("EXPR$3", ColumnType.STRING_ARRAY)
+                .add("EXPR$4", ColumnType.STRING_ARRAY)
+                .add("EXPR$5", ColumnType.LONG_ARRAY)
+                .add("EXPR$6", ColumnType.LONG_ARRAY)
+                .add("EXPR$7", ColumnType.DOUBLE_ARRAY)
+                .add("EXPR$8", ColumnType.DOUBLE_ARRAY)
+                .add("EXPR$9", ColumnType.STRING_ARRAY)
+                .add("EXPR$10", ColumnType.LONG_ARRAY)
+                .add("EXPR$11", ColumnType.DOUBLE_ARRAY)
+                .add("EXPR$12", ColumnType.STRING)
+                .add("EXPR$13", ColumnType.LONG)
+                .add("EXPR$14", ColumnType.DOUBLE)
+                .add("EXPR$15", ColumnType.STRING)
+                .add("EXPR$16", ColumnType.LONG)
+                .add("EXPR$17", ColumnType.DOUBLE)
+                .build();
     testQuery(
         "SELECT"
         + " arrayStringNulls,"
@@ -525,16 +550,11 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                     expressionVirtualColumn("v9", "array_offset(\"arrayStringNulls\",0)", ColumnType.STRING)
                 )
                 .columns(
-                    "arrayDoubleNulls",
-                    "arrayLongNulls",
                     "arrayStringNulls",
+                    "arrayLongNulls",
+                    "arrayDoubleNulls",
                     "v0",
                     "v1",
-                    "v10",
-                    "v11",
-                    "v12",
-                    "v13",
-                    "v14",
                     "v2",
                     "v3",
                     "v4",
@@ -542,33 +562,20 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                     "v6",
                     "v7",
                     "v8",
-                    "v9"
+                    "v9",
+                    "v10",
+                    "v11",
+                    "v12",
+                    "v13",
+                    "v14"
                 )
+                .columnTypes(resultSignature.getColumnTypes())
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),
         expectedResults,
-        RowSignature.builder()
-                    .add("arrayStringNulls", ColumnType.STRING_ARRAY)
-                    .add("arrayLongNulls", ColumnType.LONG_ARRAY)
-                    .add("arrayDoubleNulls", ColumnType.DOUBLE_ARRAY)
-                    .add("EXPR$3", ColumnType.STRING_ARRAY)
-                    .add("EXPR$4", ColumnType.STRING_ARRAY)
-                    .add("EXPR$5", ColumnType.LONG_ARRAY)
-                    .add("EXPR$6", ColumnType.LONG_ARRAY)
-                    .add("EXPR$7", ColumnType.DOUBLE_ARRAY)
-                    .add("EXPR$8", ColumnType.DOUBLE_ARRAY)
-                    .add("EXPR$9", ColumnType.STRING_ARRAY)
-                    .add("EXPR$10", ColumnType.LONG_ARRAY)
-                    .add("EXPR$11", ColumnType.DOUBLE_ARRAY)
-                    .add("EXPR$12", ColumnType.STRING)
-                    .add("EXPR$13", ColumnType.LONG)
-                    .add("EXPR$14", ColumnType.DOUBLE)
-                    .add("EXPR$15", ColumnType.STRING)
-                    .add("EXPR$16", ColumnType.LONG)
-                    .add("EXPR$17", ColumnType.DOUBLE)
-                    .build()
+        resultSignature
     );
   }
 
@@ -670,8 +677,6 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                     "dim3",
                     "v0",
                     "v1",
-                    "v10",
-                    "v11",
                     "v2",
                     "v3",
                     "v4",
@@ -679,8 +684,11 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                     "v6",
                     "v7",
                     "v8",
-                    "v9"
+                    "v9",
+                    "v10",
+                    "v11"
                 )
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.ofArray(ColumnType.STRING), ColumnType.ofArray(ColumnType.LONG), ColumnType.ofArray(ColumnType.DOUBLE), ColumnType.ofArray(ColumnType.STRING), ColumnType.ofArray(ColumnType.STRING), ColumnType.ofArray(ColumnType.LONG), ColumnType.ofArray(ColumnType.LONG), ColumnType.ofArray(ColumnType.DOUBLE), ColumnType.ofArray(ColumnType.DOUBLE), ColumnType.ofArray(ColumnType.STRING), ColumnType.ofArray(Col [...]
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(1)
                 .context(QUERY_CONTEXT_NO_STRINGIFY_ARRAY)
@@ -701,6 +709,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .filters(in("dim3", ImmutableList.of("a", "b")))
                 .columns("dim3")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -729,6 +738,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("arrayStringNulls")
+                .columnTypes(ColumnType.STRING_ARRAY)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -760,6 +770,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("arrayLongNulls")
+                .columnTypes(ColumnType.LONG_ARRAY)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -791,6 +802,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("arrayDoubleNulls")
+                .columnTypes(ColumnType.DOUBLE_ARRAY)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -819,6 +831,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                     new InDimFilter("dim3", ImmutableList.of("a", "b"), new SubstringDimExtractionFn(0, 1))
                 )
                 .columns("dim3")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -842,6 +855,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .filters(expressionFilter("array_overlap(\"dim3\",array(\"dim2\"))"))
                 .columns("dim3")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -863,7 +877,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.ARRAYS_DATASOURCE)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .filters(expressionFilter("array_overlap(\"arrayStringNulls\",\"arrayString\")"))
-                .columns("arrayString", "arrayStringNulls")
+                .columns("arrayStringNulls", "arrayString")
+                .columnTypes(ColumnType.STRING_ARRAY, ColumnType.STRING_ARRAY)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -889,7 +904,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.ARRAYS_DATASOURCE)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .filters(expressionFilter("array_overlap(\"arrayLongNulls\",\"arrayLong\")"))
-                .columns("arrayLong", "arrayLongNulls")
+                .columns("arrayLongNulls", "arrayLong")
+                .columnTypes(ColumnType.LONG_ARRAY, ColumnType.LONG_ARRAY)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -915,7 +931,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.ARRAYS_DATASOURCE)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .filters(expressionFilter("array_overlap(\"arrayDoubleNulls\",\"arrayDouble\")"))
-                .columns("arrayDouble", "arrayDoubleNulls")
+                .columns("arrayDoubleNulls", "arrayDouble")
+                .columnTypes(ColumnType.DOUBLE_ARRAY, ColumnType.DOUBLE_ARRAY)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -938,6 +955,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
             .intervals(querySegmentSpec(Filtration.eternity()))
             .filters(expressionFilter("array_overlap(array(1.0,1.7,null),array(\"d1\"))"))
             .columns("dim3")
+            .columnTypes(ColumnType.STRING)
             .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
             .limit(5)
             .context(QUERY_CONTEXT_DEFAULT);
@@ -980,6 +998,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("dim3")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -1008,6 +1027,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
 
                 )
                 .columns("arrayStringNulls")
+                .columnTypes(ColumnType.STRING_ARRAY)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -1037,6 +1057,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("arrayLongNulls")
+                .columnTypes(ColumnType.LONG_ARRAY)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -1065,6 +1086,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("arrayDoubleNulls")
+                .columnTypes(ColumnType.DOUBLE_ARRAY)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -1085,6 +1107,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
         .dataSource(CalciteTests.DATASOURCE3)
         .intervals(querySegmentSpec(Filtration.eternity()))
         .columns("dim3")
+        .columnTypes(ColumnType.STRING)
         .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
         .limit(5)
         .context(QUERY_CONTEXT_DEFAULT);
@@ -1125,6 +1148,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .filters(equality("dim3", "a", ColumnType.STRING))
                 .columns("dim3")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -1148,6 +1172,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .filters(expressionFilter("array_contains(\"dim3\",array(\"dim2\"))"))
                 .columns("dim3")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_NO_STRINGIFY_ARRAY)
@@ -1171,7 +1196,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                 .filters(
                     expressionFilter("array_contains(\"arrayStringNulls\",\"arrayString\")")
                 )
-                .columns("arrayString", "arrayStringNulls")
+                .columns("arrayStringNulls", "arrayString")
+                .columnTypes(ColumnType.STRING_ARRAY, ColumnType.STRING_ARRAY)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -1193,6 +1219,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.ARRAYS_DATASOURCE)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("v0", "v1")
+                .columnTypes(ColumnType.LONG, ColumnType.LONG)
                 .virtualColumns(
                     expressionVirtualColumn("v0", "array_contains(\"arrayStringNulls\",array('a','b'))", ColumnType.LONG),
                     expressionVirtualColumn("v1", "array_contains(\"arrayStringNulls\",\"arrayString\")", ColumnType.LONG)
@@ -1225,6 +1252,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                     expressionFilter("array_contains(\"arrayLong\",\"arrayLongNulls\")")
                 )
                 .columns("arrayLong", "arrayLongNulls")
+                .columnTypes(ColumnType.LONG_ARRAY, ColumnType.LONG_ARRAY)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -1251,7 +1279,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                 .filters(
                     expressionFilter("array_contains(\"arrayDoubleNulls\",\"arrayDouble\")")
                 )
-                .columns("arrayDouble", "arrayDoubleNulls")
+                .columns("arrayDoubleNulls", "arrayDouble")
+                .columnTypes(ColumnType.DOUBLE_ARRAY, ColumnType.DOUBLE_ARRAY)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -1277,6 +1306,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("EXPR$0")
+                .columnTypes(ColumnType.LONG)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -1290,6 +1320,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                 .virtualColumns(expressionVirtualColumn("v0", "0", ColumnType.LONG))
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("v0")
+                .columnTypes(ColumnType.LONG)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -1308,6 +1339,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
             .intervals(querySegmentSpec(Filtration.eternity()))
             .filters(expressionFilter("array_contains(array(1,null),array((\"d1\" > 1)))"))
             .columns("dim3")
+            .columnTypes(ColumnType.STRING)
             .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
             .limit(5)
             .context(QUERY_CONTEXT_DEFAULT);
@@ -1371,6 +1403,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("dim2")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -1394,6 +1427,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .filters(not(in("dim2", Arrays.asList("a", "d"))))
                 .columns("dim2")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -1441,6 +1475,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                         )
                     )
                     .columns("dim3", "v0")
+                    .columnTypes(ColumnType.STRING, ColumnType.STRING)
                     .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                     .context(QUERY_CONTEXT_DEFAULT)
                     .build()
@@ -1470,7 +1505,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.DATASOURCE3)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "array_slice(\"dim3\",1)", ColumnType.STRING_ARRAY))
-                .columns(ImmutableList.of("v0"))
+                .columns("v0")
+                .columnTypes(ColumnType.STRING_ARRAY)
                 .context(QUERY_CONTEXT_NO_STRINGIFY_ARRAY)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .build()
@@ -1502,6 +1538,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                     expressionVirtualColumn("v2", "array_slice(\"arrayDoubleNulls\",1)", ColumnType.DOUBLE_ARRAY)
                 )
                 .columns("v0", "v1", "v2")
+                .columnTypes(ColumnType.STRING_ARRAY, ColumnType.LONG_ARRAY, ColumnType.DOUBLE_ARRAY)
                 .context(QUERY_CONTEXT_NO_STRINGIFY_ARRAY)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .build()
@@ -3458,6 +3495,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   )
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("dim4", "j0.a0", "v0")
+                  .columnTypes(ColumnType.STRING, ColumnType.STRING_ARRAY, ColumnType.STRING)
                   .context(QUERY_CONTEXT_DEFAULT)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
@@ -3804,6 +3842,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                       )
                   )
                   .columns("dim1", "dim2")
+                  .columnTypes(ColumnType.STRING, ColumnType.STRING)
                   .context(QUERY_CONTEXT_DEFAULT)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
@@ -3917,9 +3956,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of(
-                      "EXPR$0"
-                  ))
+                  .columns("EXPR$0")
+                  .columnTypes(ColumnType.LONG)
                   .build()
         ),
         ImmutableList.of(
@@ -3978,7 +4016,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         useDefault ?
@@ -4021,7 +4060,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -4068,7 +4108,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .virtualColumns(expressionVirtualColumn("v0", "concat(\"j0.unnest\",'.txt')", ColumnType.STRING))
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("v0"))
+                  .columns("v0")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -4114,7 +4155,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -4159,7 +4201,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.LONG)
                   .build()
         ),
         ImmutableList.of(
@@ -4211,7 +4254,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.LONG)
                   .build()
         ),
         ImmutableList.of(
@@ -4259,7 +4303,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.DOUBLE)
                   .build()
         ),
         ImmutableList.of(
@@ -4311,7 +4356,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.DOUBLE)
                   .build()
         ),
         ImmutableList.of(
@@ -4389,7 +4435,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   )
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("_j0.unnest", "dim1", "j0.unnest", "v0", "v1"))
+                  .columns("dim1", "v0", "v1", "j0.unnest", "_j0.unnest")
+                  .columnTypes(ColumnType.STRING, ColumnType.STRING_ARRAY, ColumnType.STRING_ARRAY, ColumnType.STRING, ColumnType.STRING)
                   .build()
         ),
         NullHandling.replaceWithDefault() ?
@@ -4452,7 +4499,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("_j0.unnest", "arrayLongNulls", "arrayStringNulls", "j0.unnest"))
+                  .columns("arrayStringNulls", "arrayLongNulls", "j0.unnest", "_j0.unnest")
+                  .columnTypes(ColumnType.STRING_ARRAY, ColumnType.LONG_ARRAY, ColumnType.STRING, ColumnType.LONG)
                   .build()
         ),
         ImmutableList.of(
@@ -4547,7 +4595,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   )
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("dim1", "j0.unnest", "v0", "v1", "v2"))
+                  .columns("dim1", "v0", "v1", "j0.unnest", "v2")
+                  .columnTypes(ColumnType.STRING, ColumnType.STRING_ARRAY, ColumnType.STRING_ARRAY, ColumnType.STRING, ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -4601,7 +4650,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   "'Baz'",
                   ColumnType.STRING
               ))
-              .columns(ImmutableList.of("__j0.unnest", "_j0.unnest", "dimZipf", "v0"))
+              .columns("dimZipf", "v0", "_j0.unnest", "__j0.unnest")
+              .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
               .build()
     );
     testQuery(
@@ -4699,7 +4749,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   ColumnType.STRING
               ))
               .context(QUERY_CONTEXT_UNNEST)
-              .columns(ImmutableList.of("__j0.unnest", "_j0.unnest", "dimZipf", "v0"))
+              .columns("dimZipf", "v0", "_j0.unnest", "__j0.unnest")
+              .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
               .build()
     );
     testQuery(
@@ -4766,7 +4817,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   expressionVirtualColumn("v1", "1", ColumnType.LONG)
               )
               .context(QUERY_CONTEXT_UNNEST)
-              .columns(ImmutableList.of("__j0.unnest", "_j0.unnest", "v0", "v1"))
+              .columns("v0", "v1", "_j0.unnest", "__j0.unnest")
+              .columnTypes(ColumnType.STRING_ARRAY, ColumnType.LONG, ColumnType.DOUBLE, ColumnType.STRING)
               .build()
     );
     testQuery(
@@ -4824,12 +4876,14 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
               .intervals(querySegmentSpec(Filtration.eternity()))
               .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
               .context(QUERY_CONTEXT_UNNEST)
-              .columns(ImmutableList.of("__j0.unnest", "_j0.unnest", "dimZipf", "j0.unnest"))
+              .columns("dimZipf", "j0.unnest", "_j0.unnest", "__j0.unnest")
+              .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
               .build()
     );
     testQuery(
         sql,
-        QUERY_CONTEXT_UNNEST, expectedQuerySqlCom,
+        QUERY_CONTEXT_UNNEST,
+        expectedQuerySqlCom,
         ImmutableList.of(
             new Object[]{"27", "Baz", "Baz", "World"},
             new Object[]{"27", "Baz", "Baz", "World"},
@@ -4900,7 +4954,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   expressionVirtualColumn("v0", "array('a','b')", ColumnType.STRING_ARRAY)
               )
               .context(QUERY_CONTEXT_UNNEST)
-              .columns(ImmutableList.of("__j0.unnest", "_j0.unnest", "j0.unnest", "v0"))
+              .columns("v0", "j0.unnest", "_j0.unnest", "__j0.unnest")
+              .columnTypes(ColumnType.STRING_ARRAY, ColumnType.LONG, ColumnType.DOUBLE, ColumnType.STRING)
               .build()
     );
     testQuery(
@@ -5132,7 +5187,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .limit(3)
                   .build()
         ),
@@ -5161,7 +5217,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         useDefault ?
@@ -5217,7 +5274,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                                    equality("j0.unnest", "b", ColumnType.STRING)
                                ))
                                .context(QUERY_CONTEXT_UNNEST)
-                               .columns(ImmutableList.of("j0.unnest", "m1"))
+                               .columns("j0.unnest", "m1")
+                               .columnTypes(ColumnType.STRING, ColumnType.FLOAT)
                                .build()),
         ImmutableList.of(new Object[]{"a", 1.0f})
     );
@@ -5248,7 +5306,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                                    )
                                ))
                                .context(QUERY_CONTEXT_UNNEST)
-                               .columns(ImmutableList.of("j0.unnest", "m1"))
+                               .columns("j0.unnest", "m1")
+                               .columnTypes(ColumnType.STRING, ColumnType.FLOAT)
                                .build()),
         ImmutableList.of(
             new Object[]{"a", 1.0f},
@@ -5277,7 +5336,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -5313,7 +5373,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   ))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest", "v0"))
+                  .columns("v0", "j0.unnest")
+                  .columnTypes(ColumnType.LONG, ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -5347,7 +5408,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                                                           ColumnType.LONG))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest", "v0"))
+                  .columns("v0", "j0.unnest")
+                  .columnTypes(ColumnType.LONG, ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -5377,6 +5439,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                               .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                               .filters(equality("dim2", "a", ColumnType.STRING))
                               .columns("dim3")
+                              .columnTypes(ColumnType.STRING)
                               .limit(2)
                               .context(QUERY_CONTEXT_UNNEST)
                               .build()
@@ -5387,7 +5450,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         NullHandling.replaceWithDefault() ?
@@ -5430,7 +5494,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -5470,7 +5535,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -5511,7 +5577,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -5541,7 +5608,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -5570,7 +5638,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -5667,6 +5736,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                   .filters(in("dim2", ImmutableList.of("a", "b", "ab", "abc")))
                                   .columns("dim2")
+                                  .columnTypes(ColumnType.STRING)
                                   .context(QUERY_CONTEXT_UNNEST)
                                   .build()
                           ),
@@ -5680,7 +5750,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("_j0.unnest"))
+                  .columns("_j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         useDefault ?
@@ -5736,7 +5807,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.EXPR$0"))
+                  .columns("j0.EXPR$0")
+                  .columnTypes(ColumnType.LONG)
                   .build()
         ),
         ImmutableList.of(
@@ -5780,7 +5852,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .virtualColumns(expressionVirtualColumn("v0", "strlen(\"j0.unnest\")", ColumnType.LONG))
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("v0"))
+                  .columns("v0")
+                  .columnTypes(ColumnType.LONG)
                   .build()
         ),
         useDefault ?
@@ -5826,7 +5899,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -5853,7 +5927,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -5883,7 +5958,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of()
@@ -5907,7 +5983,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         useDefault ?
@@ -5946,7 +6023,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -5974,7 +6052,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.FLOAT)
                   .build()
         ),
         ImmutableList.of(
@@ -6000,7 +6079,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -6035,7 +6115,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -6067,7 +6148,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                           range("m1", ColumnType.LONG, null, 2L, false, true)
                       )
                   )
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -6094,7 +6176,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -6121,7 +6204,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -6152,7 +6236,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         useDefault ?
@@ -6199,7 +6284,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -6231,7 +6317,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                           range("m1", ColumnType.LONG, null, 2L, false, true)
                       )
                   )
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -6266,7 +6353,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                       )
                   )
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -6299,7 +6387,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                       )
                   )
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("dim3", "j0.unnest"))
+                  .columns("dim3", "j0.unnest")
+                  .columnTypes(ColumnType.STRING, ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -6592,7 +6681,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                       )
                   )
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest", "m2"))
+                  .columns("j0.unnest", "m2")
+                  .columnTypes(ColumnType.FLOAT, ColumnType.DOUBLE)
                   .build()
         ),
         ImmutableList.of(
@@ -6632,7 +6722,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Intervals.of("2000-01-02T00:00:00.000Z/2000-01-03T00:10:00.001Z")))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -6663,7 +6754,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Intervals.of("2023-01-02T00:00:00.000Z/2023-01-03T00:10:00.001Z")))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -6706,7 +6798,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Intervals.of("2000-01-02T00:00:00.000Z/2000-01-03T00:10:00.001Z")))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -6740,7 +6833,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -6775,7 +6869,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Intervals.of("2000-01-02T00:00:00.000Z/2000-01-03T00:10:00.001Z")))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("_j0.unnest"))
+                  .columns("_j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -6818,7 +6913,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Intervals.of("2000-01-02T00:00:00.000Z/2000-01-03T00:10:00.001Z")))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("__j0.unnest"))
+                  .columns("__j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -6865,7 +6961,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                               .intervals(querySegmentSpec(Intervals.of(
                                   "2000-01-02T00:00:00.000Z/2000-01-03T00:10:00.001Z")))
                               .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
-                              .columns("j0.unnest", "m1")
+                              .columns("m1", "j0.unnest")
+                              .columnTypes(ColumnType.FLOAT, ColumnType.STRING)
                               .limit(2)
                               .context(QUERY_CONTEXT_UNNEST)
                               .build()
@@ -6879,7 +6976,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   )
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -6917,6 +7015,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                                   "2023-01-02T00:00:00.000Z/2023-01-03T00:10:00.001Z")))
                               .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                               .columns("arrayLongNulls", "j0.unnest")
+                              .columnTypes(ColumnType.LONG_ARRAY, ColumnType.LONG)
                               .limit(2)
                               .context(QUERY_CONTEXT_UNNEST)
                               .build()
@@ -6928,7 +7027,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   )
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest"))
+                  .columns("j0.unnest")
+                  .columnTypes(ColumnType.LONG)
                   .build()
         ),
         ImmutableList.of(
@@ -7009,7 +7109,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .virtualColumns(expressionVirtualColumn("v0", "2.0", ColumnType.FLOAT))
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("__j0.unnest", "_j0.unnest", "j0.unnest", "v0"))
+                  .columns("v0", "j0.unnest", "_j0.unnest", "__j0.unnest")
+                  .columnTypes(ColumnType.FLOAT, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -7040,7 +7141,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .virtualColumns(expressionVirtualColumn("v0", "'a'", ColumnType.STRING))
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("j0.unnest", "v", "v0"))
+                  .columns("v0", "v", "j0.unnest")
+                  .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -7097,6 +7199,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   )
                   .eternityInterval()
                   .columns("d0", "j0.unnest")
+                  .columnTypes(ColumnType.LONG_ARRAY, ColumnType.LONG)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_DEFAULT)
                   .build()
@@ -7220,7 +7323,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("v0"))
+                  .columns("v0")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         useDefault ?
@@ -7259,7 +7363,8 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_UNNEST)
-                  .columns(ImmutableList.of("v0"))
+                  .columns("v0")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -7289,6 +7394,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                     ColumnType.LONG_ARRAY
                 ))
                 .columns("v0")
+                .columnTypes(ColumnType.LONG_ARRAY)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(1)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -7471,6 +7577,7 @@ public class CalciteArraysQueryTest extends BaseCalciteQueryTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "(\"arrayLongNulls\" == array(null,null))", ColumnType.LONG))
                 .columns("v0")
+                .columnTypes(ColumnType.LONG)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(1)
                 .context(QUERY_CONTEXT_DEFAULT)
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteCatalogIngestionDmlTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteCatalogIngestionDmlTest.java
index 3a60386dbc6..d89d618bda1 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteCatalogIngestionDmlTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteCatalogIngestionDmlTest.java
@@ -392,9 +392,8 @@ public abstract class CalciteCatalogIngestionDmlTest extends CalciteIngestionDml
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                // Scan query lists columns in alphabetical order independent of the
-                // SQL project list or the defined schema.
-                .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .context(queryContextWithGranularity(Granularities.HOUR))
                 .build()
         )
@@ -419,9 +418,8 @@ public abstract class CalciteCatalogIngestionDmlTest extends CalciteIngestionDml
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                // Scan query lists columns in alphabetical order independent of the
-                // SQL project list or the defined schema.
-                .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .context(queryContextWithGranularity(Granularities.DAY))
                 .build()
         )
@@ -465,9 +463,8 @@ public abstract class CalciteCatalogIngestionDmlTest extends CalciteIngestionDml
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                // Scan query lists columns in alphabetical order independent of the
-                // SQL project list or the defined schema.
-                .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .context(queryContextWithGranularity(Granularities.DAY))
                 .build()
         )
@@ -526,9 +523,8 @@ public abstract class CalciteCatalogIngestionDmlTest extends CalciteIngestionDml
                     expressionVirtualColumn("v2", "CAST(\"c\", 'DOUBLE')", ColumnType.DOUBLE),
                     expressionVirtualColumn("v3", "CAST(\"d\", 'LONG')", ColumnType.LONG)
                 )
-                // Scan query lists columns in alphabetical order independent of the
-                // SQL project list or the defined schema.
-                .columns("b", "e", "v0", "v1", "v2", "v3")
+                .columns("v0", "b", "v1", "v2", "v3", "e")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.LONG, ColumnType.DOUBLE, ColumnType.LONG, ColumnType.STRING)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -588,9 +584,8 @@ public abstract class CalciteCatalogIngestionDmlTest extends CalciteIngestionDml
                         OrderBy.ascending("d")
                     )
                 )
-                // Scan query lists columns in alphabetical order independent of the
-                // SQL project list or the defined schema.
-                .columns("b", "d", "v0", "v1")
+                .columns("v0", "b", "d", "v1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -649,9 +644,8 @@ public abstract class CalciteCatalogIngestionDmlTest extends CalciteIngestionDml
                         OrderBy.ascending("b")
                     )
                 )
-                // Scan query lists columns in alphabetical order independent of the
-                // SQL project list or the defined schema.
-                .columns("b", "d", "v0", "v1")
+                .columns("v0", "b", "d", "v1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -714,9 +708,8 @@ public abstract class CalciteCatalogIngestionDmlTest extends CalciteIngestionDml
                         OrderBy.ascending("e")
                     )
                 )
-                // Scan query lists columns in alphabetical order independent of the
-                // SQL project list or the defined schema.
-                .columns("b", "d", "e", "v0", "v1")
+                .columns("v0", "b", "d", "e", "v1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -911,8 +904,6 @@ public abstract class CalciteCatalogIngestionDmlTest extends CalciteIngestionDml
                     expressionPostAgg("p0", "1", ColumnType.LONG),
                     expressionPostAgg("p1", "CAST(\"d3\", 'DOUBLE')", ColumnType.DOUBLE)
                 )
-                // Scan query lists columns in alphabetical order independent of the
-                // SQL project list or the defined schema.
                 .setContext(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -997,9 +988,8 @@ public abstract class CalciteCatalogIngestionDmlTest extends CalciteIngestionDml
                     expressionVirtualColumn("v0", "timestamp_parse(\"a\",null,'UTC')", ColumnType.LONG),
                     expressionVirtualColumn("v1", "1", ColumnType.LONG)
                 )
-                // Scan query lists columns in alphabetical order independent of the
-                // SQL project list or the defined schema.
-                .columns("b", "c", "d", "v0", "v1")
+                .columns("v0", "b", "v1", "c", "d")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.LONG, ColumnType.LONG, ColumnType.STRING)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -1063,9 +1053,8 @@ public abstract class CalciteCatalogIngestionDmlTest extends CalciteIngestionDml
                     expressionVirtualColumn("v2", "CAST(\"c\", 'DOUBLE')", ColumnType.DOUBLE),
                     expressionVirtualColumn("v3", "CAST(\"d\", 'LONG')", ColumnType.LONG)
                 )
-                // Scan query lists columns in alphabetical order independent of the
-                // SQL project list or the defined schema.
-                .columns("b", "e", "v0", "v1", "v2", "v3")
+                .columns("v0", "b", "v1", "v2", "v3", "e")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.LONG, ColumnType.DOUBLE, ColumnType.LONG, ColumnType.STRING)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -1158,8 +1147,6 @@ public abstract class CalciteCatalogIngestionDmlTest extends CalciteIngestionDml
                     expressionPostAgg("p0", "1", ColumnType.LONG),
                     expressionPostAgg("p1", "CAST(\"d3\", 'DOUBLE')", ColumnType.DOUBLE)
                 )
-                // Scan query lists columns in alphabetical order independent of the
-                // SQL project list or the defined schema.
                 .setContext(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -1226,9 +1213,8 @@ public abstract class CalciteCatalogIngestionDmlTest extends CalciteIngestionDml
                 .virtualColumns(
                     expressionVirtualColumn("v0", "array(\"dim1\")", ColumnType.STRING_ARRAY)
                 )
-                // Scan query lists columns in alphabetical order independent of the
-                // SQL project list or the defined schema.
                 .columns("__time", "v0")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING_ARRAY)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -1284,9 +1270,8 @@ public abstract class CalciteCatalogIngestionDmlTest extends CalciteIngestionDml
                 .virtualColumns(
                     expressionVirtualColumn("v0", "array(\"dim1\")", ColumnType.STRING_ARRAY)
                 )
-                // Scan query lists columns in alphabetical order independent of the
-                // SQL project list or the defined schema.
                 .columns("__time", "v0")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING_ARRAY)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteCorrelatedQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteCorrelatedQueryTest.java
index ef442ecac43..bcb7759c981 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteCorrelatedQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteCorrelatedQueryTest.java
@@ -288,7 +288,8 @@ public class CalciteCorrelatedQueryTest extends BaseCalciteQueryTest
                                                                              "B",
                                                                              ColumnType.STRING
                                                                          ))
-                                                                         .columns("__time", "city", "country")
+                                                                         .columns("__time", "country", "city")
+                                                                         .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING)
                                                                          .build()),
                                 new QueryDataSource(
                                     GroupByQuery.builder()
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteExplainQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteExplainQueryTest.java
index 7964bca842c..946f597c477 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteExplainQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteExplainQueryTest.java
@@ -144,7 +144,7 @@ public class CalciteExplainQueryTest extends BaseCalciteQueryTest
   {
     // Skip vectorization since otherwise the "context" will change for each subtest.
     skipVectorize();
-    String explanation = "[{\"query\":{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"resultFormat\":\"compactedList\",\"columns\":[\"__time\",\"cnt\",\"dim1\",\"dim2\",\"dim3\",\"m1\",\"m2\",\"unique_dim1\"],\"context\":{\"defaultTimeout\":300000,\"maxScatterGatherBytes\":9223372036854775807,\"sqlCurrentTimestamp\":\"2000-01-01T00:00:00Z\ [...]
+    String explanation = "[{\"query\":{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"resultFormat\":\"compactedList\",\"columns\":[\"__time\",\"dim1\",\"dim2\",\"dim3\",\"cnt\",\"m1\",\"m2\",\"unique_dim1\"],\"context\":{\"defaultTimeout\":300000,\"maxScatterGatherBytes\":9223372036854775807,\"sqlCurrentTimestamp\":\"2000-01-01T00:00:00Z\ [...]
 
     String sql = "EXPLAIN PLAN FOR SELECT * FROM druid.foo";
     String resources = "[{\"name\":\"foo\",\"type\":\"DATASOURCE\"}]";
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteExportTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteExportTest.java
index af77671cee4..a69ac873567 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteExportTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteExportTest.java
@@ -122,6 +122,7 @@ public class CalciteExportTest extends CalciteIngestionDmlTest
                   )
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("dim2")
+                  .columnTypes(ColumnType.STRING)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         )
@@ -196,6 +197,7 @@ public class CalciteExportTest extends CalciteIngestionDmlTest
                   )
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("dim2")
+                  .columnTypes(ColumnType.STRING)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         )
@@ -221,6 +223,7 @@ public class CalciteExportTest extends CalciteIngestionDmlTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .filters(equality("dim2", "val", ColumnType.STRING))
                 .columns("dim2")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .build()
         )
@@ -247,6 +250,7 @@ public class CalciteExportTest extends CalciteIngestionDmlTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .filters(equality("dim2", "val", ColumnType.STRING))
                 .columns("dim2")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .build()
         )
@@ -301,6 +305,7 @@ public class CalciteExportTest extends CalciteIngestionDmlTest
                   .dataSource("foo")
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("dim2")
+                  .columnTypes(ColumnType.STRING)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         )
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteInsertDmlTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteInsertDmlTest.java
index 61d955c3be7..73b4b45c30c 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteInsertDmlTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteInsertDmlTest.java
@@ -88,7 +88,8 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .context(PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -109,6 +110,7 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
                 .virtualColumns(expressionVirtualColumn("v0", "substring(\"dim1\", 0, 1)", ColumnType.STRING))
                 .filters(equality("dim2", "a", ColumnType.STRING))
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .context(PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -139,6 +141,7 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .filters(equality("dim2", "a", ColumnType.STRING))
                                 .columns("dim1", "dim2")
+                                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                                 .context(PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                                 .build()
                         ),
@@ -147,6 +150,7 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
                                 .dataSource("numfoo")
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .columns("dim2", "l2")
+                                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                                 .context(PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                                 .build()
                         ),
@@ -160,7 +164,8 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
                     expressionVirtualColumn("v0", "substring(\"dim1\", 0, 1)", ColumnType.STRING),
                     expressionVirtualColumn("v1", "'a'", ColumnType.STRING)
                 )
-                .columns("j0.l2", "v0", "v1")
+                .columns("v0", "v1", "j0.l2")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -178,7 +183,8 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .context(PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -196,7 +202,8 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .context(PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -314,6 +321,7 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
                 .dataSource(externalDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -335,6 +343,7 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
                 .dataSource(externalDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -392,6 +401,7 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
                 .dataSource(externalDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -437,6 +447,7 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
                 .dataSource(externalDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -480,6 +491,7 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
                 .dataSource(externalDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -532,6 +544,7 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
                 .dataSource(externalDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -596,7 +609,8 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "dim1", "v0")
+                .columns("__time", "v0", "dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.FLOAT, ColumnType.STRING)
                 .virtualColumns(expressionVirtualColumn("v0", "floor(\"m1\")", ColumnType.FLOAT))
                 .context(queryContextWithGranularity(Granularities.HOUR))
                 .build()
@@ -650,6 +664,7 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
                   .dataSource("foo")
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("__time", "dim1")
+                  .columnTypes(ColumnType.LONG, ColumnType.STRING)
                   .context(queryContext)
                   .build()
           )
@@ -696,6 +711,7 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
                   .dataSource("foo")
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("__time", "dim1")
+                  .columnTypes(ColumnType.LONG, ColumnType.STRING)
                   .context(queryContext)
                   .build()
           )
@@ -744,7 +760,7 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
 
     // Test correctness of the query when only the CLUSTERED BY clause is present
     final String explanation =
-        "[{\"query\":{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"virtualColumns\":[{\"type\":\"expression\",\"name\":\"v0\",\"expression\":\"floor(\\\"m1\\\")\",\"outputType\":\"FLOAT\"},{\"type\":\"expression\",\"name\":\"v1\",\"expression\":\"ceil(\\\"m2\\\")\",\"outputType\":\"DOUBLE\"}],\"resultFormat\":\"compactedList\",\"orderBy\ [...]
+        "[{\"query\":{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"virtualColumns\":[{\"type\":\"expression\",\"name\":\"v0\",\"expression\":\"floor(\\\"m1\\\")\",\"outputType\":\"FLOAT\"},{\"type\":\"expression\",\"name\":\"v1\",\"expression\":\"ceil(\\\"m2\\\")\",\"outputType\":\"DOUBLE\"}],\"resultFormat\":\"compactedList\",\"orderBy\ [...]
 
     testQuery(
         PLANNER_CONFIG_NATIVE_QUERY_EXPLAIN,
@@ -797,7 +813,7 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
                        + "CLUSTERED BY 2, 3";
 
     // Test correctness of the query when only the CLUSTERED BY clause is present
-    final String explanation = "[{\"query\":{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"external\",\"inputSource\":{\"type\":\"inline\",\"data\":\"{\\\" \\\": 1681794225551, \\\"namespace\\\": \\\"day1\\\", \\\"country\\\": \\\"one\\\"}\\n{\\\"__time\\\": 1681794225558, \\\"namespace\\\": \\\"day2\\\", \\\"country\\\": \\\"two\\\"}\"},\"inputFormat\":{\"type\":\"json\"},\"signature\":[{\"name\":\"__time\",\"type\":\"LONG\"},{\"name\":\"namespace\",\"type\":\"STRING\"},{\"name\":\" [...]
+    final String explanation = "[{\"query\":{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"external\",\"inputSource\":{\"type\":\"inline\",\"data\":\"{\\\" \\\": 1681794225551, \\\"namespace\\\": \\\"day1\\\", \\\"country\\\": \\\"one\\\"}\\n{\\\"__time\\\": 1681794225558, \\\"namespace\\\": \\\"day2\\\", \\\"country\\\": \\\"two\\\"}\"},\"inputFormat\":{\"type\":\"json\"},\"signature\":[{\"name\":\"__time\",\"type\":\"LONG\"},{\"name\":\"namespace\",\"type\":\"STRING\"},{\"name\":\" [...]
 
     testQuery(
         PLANNER_CONFIG_NATIVE_QUERY_EXPLAIN,
@@ -860,7 +876,7 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
 
 
     // Test correctness of the query when only the CLUSTERED BY clause is present
-    final String explanation = "[{\"query\":{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"join\",\"left\":{\"type\":\"external\",\"inputSource\":{\"type\":\"http\",\"uris\":[\"https://boo.gz\"],\"requestHeaders\":{}},\"inputFormat\":{\"type\":\"json\"},\"signature\":[{\"name\":\"isRobot\",\"type\":\"STRING\"},{\"name\":\"timestamp\",\"type\":\"STRING\"},{\"name\":\"cityName\",\"type\":\"STRING\"},{\"name\":\"countryIsoCode\",\"type\":\"STRING\"},{\"name\":\"regionName\",\"type\":\"S [...]
+    final String explanation = "[{\"query\":{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"join\",\"left\":{\"type\":\"external\",\"inputSource\":{\"type\":\"http\",\"uris\":[\"https://boo.gz\"],\"requestHeaders\":{}},\"inputFormat\":{\"type\":\"json\"},\"signature\":[{\"name\":\"isRobot\",\"type\":\"STRING\"},{\"name\":\"timestamp\",\"type\":\"STRING\"},{\"name\":\"cityName\",\"type\":\"STRING\"},{\"name\":\"countryIsoCode\",\"type\":\"STRING\"},{\"name\":\"regionName\",\"type\":\"S [...]
 
     testQuery(
         PLANNER_CONFIG_NATIVE_QUERY_EXPLAIN,
@@ -924,7 +940,8 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "dim1", "v0", "v1")
+                .columns("__time", "v0", "dim1", "v1")
+                .columnTypes(ColumnType.LONG, ColumnType.FLOAT, ColumnType.STRING, ColumnType.DOUBLE)
                 .virtualColumns(
                     expressionVirtualColumn("v0", "floor(\"m1\")", ColumnType.FLOAT),
                     expressionVirtualColumn("v1", "ceil(\"m2\")", ColumnType.DOUBLE)
@@ -965,7 +982,8 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "dim1", "v0", "v1")
+                .columns("__time", "v0", "dim1", "v1")
+                .columnTypes(ColumnType.LONG, ColumnType.FLOAT, ColumnType.STRING, ColumnType.DOUBLE)
                 .virtualColumns(
                     expressionVirtualColumn("v0", "floor(\"m1\")", ColumnType.FLOAT),
                     expressionVirtualColumn("v1", "ceil(\"m2\")", ColumnType.DOUBLE)
@@ -1018,7 +1036,8 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "dim1", "v0")
+                .columns("__time", "v0", "dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.FLOAT, ColumnType.STRING)
                 .virtualColumns(expressionVirtualColumn("v0", "floor(\"m1\")", ColumnType.FLOAT))
                 .orderBy(
                     ImmutableList.of(
@@ -1050,7 +1069,8 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "dim1", "v0")
+                .columns("__time", "v0", "dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.FLOAT, ColumnType.STRING)
                 .virtualColumns(expressionVirtualColumn("v0", "floor(\"m1\")", ColumnType.FLOAT))
                 .limit(10)
                 .offset(20)
@@ -1226,7 +1246,7 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
         .build();
 
     final String explanation =
-        "[{\"query\":{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"virtualColumns\":[{\"type\":\"expression\",\"name\":\"v0\",\"expression\":\"floor(\\\"m1\\\")\",\"outputType\":\"FLOAT\"},{\"type\":\"expression\",\"name\":\"v1\",\"expression\":\"ceil(\\\"m2\\\")\",\"outputType\":\"DOUBLE\"}],\"resultFormat\":\"compactedList\",\"orderBy\ [...]
+        "[{\"query\":{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"virtualColumns\":[{\"type\":\"expression\",\"name\":\"v0\",\"expression\":\"floor(\\\"m1\\\")\",\"outputType\":\"FLOAT\"},{\"type\":\"expression\",\"name\":\"v1\",\"expression\":\"ceil(\\\"m2\\\")\",\"outputType\":\"DOUBLE\"}],\"resultFormat\":\"compactedList\",\"orderBy\ [...]
 
     final String resources = "[{\"name\":\"dst\",\"type\":\"DATASOURCE\"},{\"name\":\"foo\",\"type\":\"DATASOURCE\"}]";
     final String attributes = "{\"statementType\":\"INSERT\",\"targetDataSource\":\"dst\",\"partitionedBy\":\"DAY\",\"clusteredBy\":[\"floor_m1\",\"dim1\",\"CEIL(\\\"m2\\\")\"]}";
@@ -1324,6 +1344,7 @@ public class CalciteInsertDmlTest extends CalciteIngestionDmlTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "concat(\"x\",\"y\")", ColumnType.STRING))
                 .columns("v0", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                 .orderBy(
                     ImmutableList.of(
                         OrderBy.ascending("v0"),
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteJoinQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteJoinQueryTest.java
index 68db3805275..95a1b2102dc 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteJoinQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteJoinQueryTest.java
@@ -167,6 +167,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("_d0")
+                .columnTypes(ColumnType.LONG)
                 .context(context)
                 .build()
         ),
@@ -254,6 +255,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                                 .dataSource(CalciteTests.DATASOURCE1)
                                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                                 .columns(ImmutableList.of("m1"))
+                                                .columnTypes(ColumnType.FLOAT)
                                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                                 .context(QUERY_CONTEXT_DEFAULT)
                                                 .build()
@@ -269,6 +271,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .limit(10)
                                 .columns("dim2", "m2")
+                                .columnTypes(ColumnType.STRING, ColumnType.DOUBLE)
                                 .context(QUERY_CONTEXT_DEFAULT)
                                 .build()
                         )
@@ -342,6 +345,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                         .dataSource(CalciteTests.DATASOURCE1)
                                         .intervals(querySegmentSpec(Filtration.eternity()))
                                         .columns(ImmutableList.of("m1"))
+                                        .columnTypes(ColumnType.FLOAT)
                                         .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                         .context(QUERY_CONTEXT_DEFAULT)
                                         .build()
@@ -421,6 +425,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                         .dataSource(CalciteTests.DATASOURCE1)
                                         .intervals(querySegmentSpec(Filtration.eternity()))
                                         .columns("dim2", "m1", "m2")
+                                        .columnTypes(ColumnType.STRING, ColumnType.FLOAT, ColumnType.DOUBLE)
                                         .context(QUERY_CONTEXT_DEFAULT)
                                         .limit(10)
                                         .build()
@@ -429,7 +434,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                     newScanQueryBuilder()
                                         .dataSource(CalciteTests.DATASOURCE1)
                                         .intervals(querySegmentSpec(Filtration.eternity()))
-                                        .columns(ImmutableList.of("m1"))
+                                        .columns("m1")
+                                        .columnTypes(ColumnType.FLOAT)
                                         .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                         .context(QUERY_CONTEXT_DEFAULT)
                                         .build()
@@ -790,6 +796,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                         .dataSource(CalciteTests.DATASOURCE1)
                                         .intervals(querySegmentSpec(Filtration.eternity()))
                                         .columns("dim2")
+                                        .columnTypes(ColumnType.STRING)
                                         .context(QUERY_CONTEXT_DEFAULT)
                                         .build()
                                 ),
@@ -998,7 +1005,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
 
                     )
                 )
-                .columns("a0", "d0", "j0.v")
+                .columns("d0", "j0.v", "a0")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),
@@ -1071,6 +1079,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim2", "j0.k", "j0.v")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -1110,7 +1119,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("_j0.v", "dim1", "dim2", "j0.v")
+                .columns("dim1", "dim2", "j0.v", "_j0.v")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -1162,6 +1172,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 .limit(100)
                 .filters(equality("j0.v", "xa", ColumnType.STRING))
                 .columns("dim1")
+                .columnTypes(ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -1204,6 +1215,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .filters(equality("j0.v", "xa", ColumnType.STRING))
                 .columns("dim1")
+                .columnTypes(ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -1249,6 +1261,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 .limit(100)
                 .filters(equality("j0.v", "xa", ColumnType.STRING))
                 .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .context(queryContext)
                 .build()
         ),
@@ -1291,6 +1304,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .filters(equality("j0.v", "xa", ColumnType.STRING))
                 .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .context(queryContext)
                 .build()
         ),
@@ -1521,6 +1535,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .filters(equality("j0.v", "xa", ColumnType.STRING))
                 .columns("dim1")
+                .columnTypes(ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -1573,6 +1588,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim1", "dim2", "j0.a0")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -1638,6 +1654,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "substring(\"j0.v\", 0, 3)", ColumnType.STRING))
                 .columns("dim1", "dim2", "v0")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -1682,6 +1699,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                           )
                                       )
                                       .columns("k", "v0")
+                                      .columnTypes(ColumnType.STRING, ColumnType.FLOAT)
                                       .context(QUERY_CONTEXT_DEFAULT)
                                       .build()
                               ),
@@ -1745,6 +1763,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                   .dataSource(CalciteTests.DATASOURCE1)
                                   .intervals(querySegmentSpec(Filtration.eternity()))
                                   .columns("m1")
+                                  .columnTypes(ColumnType.FLOAT)
                                   .context(QUERY_CONTEXT_DEFAULT)
                                   .build()
                           ),
@@ -1795,6 +1814,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                             .dataSource(CalciteTests.DATASOURCE1)
                                             .intervals(querySegmentSpec(Filtration.eternity()))
                                             .columns("dim1", "m1")
+                                            .columnTypes(ColumnType.STRING, ColumnType.FLOAT)
                                             .context(QUERY_CONTEXT_DEFAULT)
                                             .build()
                                     ),
@@ -1810,6 +1830,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                         .dataSource(CalciteTests.DATASOURCE3)
                                         .intervals(querySegmentSpec(Filtration.eternity()))
                                         .columns("dim1", "m1")
+                                        .columnTypes(ColumnType.STRING, ColumnType.FLOAT)
                                         .context(QUERY_CONTEXT_DEFAULT)
                                         .build()
                                 ),
@@ -1875,6 +1896,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                             .dataSource(CalciteTests.DATASOURCE1)
                                             .intervals(querySegmentSpec(Filtration.eternity()))
                                             .columns("dim1", "m1")
+                                            .columnTypes(ColumnType.STRING, ColumnType.FLOAT)
                                             .context(QUERY_CONTEXT_DEFAULT)
                                             .build()
                                     ),
@@ -1890,6 +1912,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                         .dataSource(CalciteTests.DATASOURCE3)
                                         .intervals(querySegmentSpec(Filtration.eternity()))
                                         .columns("dim1", "m1")
+                                        .columnTypes(ColumnType.STRING, ColumnType.FLOAT)
                                         .context(QUERY_CONTEXT_DEFAULT)
                                         .build()
                                 ),
@@ -1965,7 +1988,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 .virtualColumns(
                     expressionVirtualColumn("v0", "null", ColumnType.STRING)
                 )
-                .columns("__time", "cnt", "dim2", "dim3", "m1", "m2", "unique_dim1", "v0")
+                .columns("__time", "v0", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),
@@ -1997,6 +2021,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim1", "dim2", "j0.k", "j0.v")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),
@@ -2046,6 +2071,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                   .intervals(querySegmentSpec(Filtration.eternity()))
                                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                   .columns("cnt")
+                                  .columnTypes(ColumnType.LONG)
                                   .context(QUERY_CONTEXT_DEFAULT)
                                   .build()
                           ),
@@ -2110,6 +2136,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                       )
                                       .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                       .columns("k", "v0")
+                                      .columnTypes(ColumnType.STRING, ColumnType.LONG)
                                       .context(queryContext)
                                       .build()
                               ),
@@ -2126,6 +2153,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                   .intervals(querySegmentSpec(Filtration.eternity()))
                                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                   .columns("cnt")
+                                  .columnTypes(ColumnType.LONG)
                                   .context(queryContext)
                                   .build()
                           ),
@@ -2176,7 +2204,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("j0.k", "j0.v", "m1")
+                .columns("m1", "j0.k", "j0.v")
+                .columnTypes(ColumnType.FLOAT, ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -2209,6 +2238,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 )
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .columns("k", "v", "v0")
+                                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.FLOAT)
                                 .context(queryContext)
                                 .build()
                         ),
@@ -2221,7 +2251,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("j0.k", "j0.v", "m1")
+                .columns("m1", "j0.k", "j0.v")
+                .columnTypes(ColumnType.FLOAT, ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -2256,6 +2287,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 )
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .columns("k", "v", "v0")
+                                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.FLOAT)
                                 .context(queryContext)
                                 .build()
                         ),
@@ -2268,7 +2300,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("j0.k", "j0.v", "m1")
+                .columns("m1", "j0.k", "j0.v")
+                .columnTypes(ColumnType.FLOAT, ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -2304,6 +2337,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim1", "dim2", "j0.k", "j0.v")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -2338,6 +2372,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 )
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .columns("k", "v", "v0")
+                                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                                 .context(queryContext)
                                 .build()
                         ),
@@ -2348,6 +2383,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim1", "dim2", "j0.k", "j0.v")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -2386,7 +2422,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("_j0.v", "dim2", "j0.v")
+                .columns("dim2", "j0.v", "_j0.v")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -2439,7 +2476,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__j0.v", "_j0.v", "dim1", "dim2", "j0.v")
+                .columns("dim1", "dim2", "j0.v", "_j0.v", "__j0.v")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -2486,6 +2524,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("dim1", "j0.k", "j0.v")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -2535,6 +2574,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("dim1", "j0.k", "j0.v")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -2577,7 +2617,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                         not(equality("j0.v", "xxx", ColumnType.STRING))
                     )
                 )
-                .columns("cnt", "dim1", "j0.k", "j0.v", "m1")
+                .columns("dim1", "m1", "cnt", "j0.k", "j0.v")
+                .columnTypes(ColumnType.STRING, ColumnType.FLOAT, ColumnType.LONG, ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -2818,6 +2859,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .filters(isNull("dim2"))
                 .columns("dim1", "j0.v")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                 .build()
         ),
         ImmutableList.of(
@@ -2895,7 +2937,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 )
                                 .filters(equality("dim1", "10.1", ColumnType.STRING))
                                 .virtualColumns(expressionVirtualColumn("v0", "'10.1'", ColumnType.STRING))
-                                .columns(ImmutableList.of("__time", "v0"))
+                                .columns(ImmutableList.of("v0", "__time"))
+                                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .context(queryContext)
                                 .build()
@@ -2914,6 +2957,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .filters(equality("dim1", "10.1", ColumnType.STRING))
                                 .virtualColumns(expressionVirtualColumn("v0", "'10.1'", ColumnType.STRING))
                                 .columns(ImmutableList.of("v0"))
+                                .columnTypes(ColumnType.STRING)
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .context(queryContext)
                                 .build()
@@ -2926,7 +2970,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 .virtualColumns(expressionVirtualColumn("_v0", "'10.1'", ColumnType.STRING))
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("_v0", "'10.1'", ColumnType.STRING))
-                .columns("__time", "_v0")
+                .columns("_v0", "__time")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                 .context(queryContext)
                 .build()
         ),
@@ -2968,6 +3013,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .filters(equality("dim1", "10.1", ColumnType.STRING))
                                 .virtualColumns(expressionVirtualColumn("v0", "\'10.1\'", ColumnType.STRING))
                                 .columns(ImmutableList.of("v0"))
+                                .columnTypes(ColumnType.STRING)
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .context(queryContext)
                                 .build()
@@ -2985,7 +3031,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     )
                 ))
                 .virtualColumns(expressionVirtualColumn("v0", "\'10.1\'", ColumnType.STRING))
-                .columns("__time", "v0")
+                .columns("v0", "__time")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                 .context(queryContext)
                 .build()
         ),
@@ -3016,7 +3063,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .filters(equality("dim1", "10.1", ColumnType.STRING))
                                 .virtualColumns(expressionVirtualColumn("v0", "'10.1'", ColumnType.STRING))
-                                .columns(ImmutableList.of("__time", "v0"))
+                                .columns(ImmutableList.of("v0", "__time"))
+                                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .context(queryContext)
                                 .build()
@@ -3027,6 +3075,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .filters(equality("dim1", "10.1", ColumnType.STRING))
                                 .columns(ImmutableList.of("dim1"))
+                                .columnTypes(ColumnType.STRING)
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .context(queryContext)
                                 .build()
@@ -3038,7 +3087,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .virtualColumns(expressionVirtualColumn("_v0", "'10.1'", ColumnType.STRING))
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "_v0")
+                .columns("_v0", "__time")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                 .context(queryContext)
                 .build()
         ),
@@ -3071,7 +3121,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .dataSource(CalciteTests.DATASOURCE1)
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .filters(equality("dim1", "10.1", ColumnType.STRING))
-                                .columns(ImmutableList.of("dim1"))
+                                .columns("dim1")
+                                .columnTypes(ColumnType.STRING)
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .context(queryContext)
                                 .build()
@@ -3087,7 +3138,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "\'10.1\'", ColumnType.STRING))
-                .columns("__time", "v0")
+                .columns("v0", "__time")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                 .context(queryContext)
                 .build()
         ),
@@ -3118,7 +3170,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .filters(equality("dim1", "10.1", ColumnType.STRING))
                                 .virtualColumns(expressionVirtualColumn("v0", "\'10.1\'", ColumnType.STRING))
-                                .columns(ImmutableList.of("__time", "v0"))
+                                .columns(ImmutableList.of("v0", "__time"))
+                                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .context(queryContext)
                                 .build()
@@ -3129,6 +3182,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .filters(equality("dim1", "10.1", ColumnType.STRING))
                                 .columns(ImmutableList.of("dim1"))
+                                .columnTypes(ColumnType.STRING)
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .context(queryContext)
                                 .build()
@@ -3140,7 +3194,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("_v0", "\'10.1\'", ColumnType.STRING))
-                .columns("__time", "_v0")
+                .columns("_v0", "__time")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                 .context(queryContext)
                 .build()
         ),
@@ -3174,6 +3229,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .filters(equality("dim1", "10.1", ColumnType.STRING))
                                 .columns(ImmutableList.of("dim1"))
+                                .columnTypes(ColumnType.STRING)
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .context(queryContext)
                                 .build()
@@ -3189,7 +3245,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "\'10.1\'", ColumnType.STRING))
-                .columns("__time", "v0")
+                .columns("v0", "__time")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                 .context(queryContext)
                 .build()
         ),
@@ -3212,7 +3269,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                         .eternityInterval()
                         .filters(equality("dim1", "10.1", ColumnType.STRING))
                         .virtualColumns(expressionVirtualColumn("v0", "'10.1'", ColumnType.STRING))
-                        .columns(ImmutableList.of("__time", "v0"))
+                        .columns("v0", "__time")
+                        .columnTypes(ColumnType.STRING, ColumnType.LONG)
                         .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                         .context(queryContext)
                         .build()
@@ -3222,7 +3280,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                         .dataSource(CalciteTests.DATASOURCE1)
                         .eternityInterval()
                         .filters(equality("dim1", "10.1", ColumnType.STRING))
-                        .columns(ImmutableList.of("dim1"))
+                        .columns("dim1")
+                        .columnTypes(ColumnType.STRING)
                         .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                         .context(queryContext)
                         .build()
@@ -3234,7 +3293,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
         )
         .virtualColumns(expressionVirtualColumn("_v0", "'10.1'", ColumnType.STRING))
         .intervals(querySegmentSpec(Filtration.eternity()))
-        .columns("__time", "_v0")
+        .columns("_v0", "__time")
+        .columnTypes(ColumnType.STRING, ColumnType.LONG)
         .context(queryContext);
 
     testQuery(
@@ -3276,6 +3336,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .filters(equality("dim1", "10.1", ColumnType.STRING))
                                 .columns(ImmutableList.of("dim1"))
+                                .columnTypes(ColumnType.STRING)
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .context(queryContext)
                                 .build()
@@ -3291,7 +3352,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "\'10.1\'", ColumnType.STRING))
-                .columns("__time", "v0")
+                .columns("v0", "__time")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                 .context(queryContext)
                 .build()
         ),
@@ -3322,7 +3384,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .filters(equality("dim1", "10.1", ColumnType.STRING))
                                 .virtualColumns(expressionVirtualColumn("v0", "\'10.1\'", ColumnType.STRING))
-                                .columns(ImmutableList.of("__time", "v0"))
+                                .columns(ImmutableList.of("v0", "__time"))
+                                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .context(queryContext)
                                 .build()
@@ -3333,6 +3396,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .filters(equality("dim1", "10.1", ColumnType.STRING))
                                 .columns(ImmutableList.of("dim1"))
+                                .columnTypes(ColumnType.STRING)
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .context(queryContext)
                                 .build()
@@ -3344,7 +3408,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("_v0", "\'10.1\'", ColumnType.STRING))
-                .columns("__time", "_v0")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG)
+                .columns("_v0", "__time")
                 .context(queryContext)
                 .build()
         ),
@@ -3384,7 +3449,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                                         "\'10.1\'",
                                                         ColumnType.STRING
                                                     ))
-                                                    .columns(ImmutableList.of("__time", "v0"))
+                                                    .columns(ImmutableList.of("v0", "__time"))
+                                                    .columnTypes(ColumnType.STRING, ColumnType.LONG)
                                                     .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                                     .context(queryContext)
                                                     .build()
@@ -3395,6 +3461,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                                     .intervals(querySegmentSpec(Filtration.eternity()))
                                                     .filters(equality("dim1", "10.1", ColumnType.STRING))
                                                     .columns(ImmutableList.of("dim1"))
+                                                    .columnTypes(ColumnType.STRING)
                                                     .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                                     .context(queryContext)
                                                     .build()
@@ -3463,6 +3530,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .filters(equality("dim1", "10.1", ColumnType.STRING))
                                 .columns(ImmutableList.of("dim1"))
+                                .columnTypes(ColumnType.STRING)
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .context(queryContext)
                                 .build()
@@ -3478,7 +3546,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "\'10.1\'", ColumnType.STRING))
-                .columns("__time", "v0")
+                .columns("v0", "__time")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                 .context(queryContext)
                 .build()
         ),
@@ -3516,6 +3585,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
               .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
               .filters(equality("m2", "1000", ColumnType.DOUBLE))
               .columns("dim2")
+              .columnTypes(ColumnType.STRING)
               .build()
     );
 
@@ -3545,6 +3615,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                       false
                                   ))
                                   .columns("dim2")
+                                  .columnTypes(ColumnType.STRING)
                                   .build()
                         ),
                         rightTable,
@@ -3619,6 +3690,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
         )
         .intervals(querySegmentSpec(Filtration.eternity()))
         .columns("dim1", "j0.d0")
+        .columnTypes(ColumnType.STRING, ColumnType.STRING)
         .context(queryContext)
         .build();
 
@@ -3645,6 +3717,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
         )
         .intervals(querySegmentSpec(Filtration.eternity()))
         .columns("dim1", "j0.d0")
+        .columnTypes(ColumnType.STRING, ColumnType.STRING)
         .filters(notNull("j0.d0"))
         .context(queryContext)
         .build();
@@ -3716,6 +3789,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim1", "j0.d0")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                 .filters(equality("j0.d0", "abc", ColumnType.STRING))
                 .context(queryContext)
                 .build()
@@ -3746,6 +3820,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                                 .dataSource(CalciteTests.DATASOURCE1)
                                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                                 .columns(ImmutableList.of("dim1"))
+                                                .columnTypes(ColumnType.STRING)
                                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                                 .context(QUERY_CONTEXT_DEFAULT)
                                                 .build()),
@@ -3756,6 +3831,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim1", "j0.dim1")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -3792,6 +3868,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                                 .dataSource(CalciteTests.DATASOURCE1)
                                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                                 .columns(ImmutableList.of("dim1"))
+                                                .columnTypes(ColumnType.STRING)
                                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                                 .context(QUERY_CONTEXT_DEFAULT)
                                                 .build()),
@@ -3802,6 +3879,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim1", "j0.dim1")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -3848,6 +3926,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                                 .dataSource(CalciteTests.DATASOURCE1)
                                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                                 .columns(ImmutableList.of("dim1"))
+                                                .columnTypes(ColumnType.STRING)
                                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                                 .context(QUERY_CONTEXT_DEFAULT)
                                                 .build()),
@@ -3858,6 +3937,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim1", "j0.dim1")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -3922,6 +4002,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim1", "j0.d0")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -3970,6 +4051,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     not(equality("dim1", "", ColumnType.STRING))
                 )
                 .columns("dim1", "v0")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),
@@ -4713,6 +4795,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .dataSource(CalciteTests.DATASOURCE1)
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .columns("m1")
+                                .columnTypes(ColumnType.FLOAT)
                                 .context(queryContext)
                                 .build()
                         ),
@@ -4723,7 +4806,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .filters(expressionFilter("(\"m1\" > \"j0.m1\")"))
-                .columns("j0.m1", "m1")
+                .columns("m1", "j0.m1")
+                .columnTypes(ColumnType.FLOAT, ColumnType.FLOAT)
                 .context(queryContext)
                 .build()
         ),
@@ -4774,6 +4858,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .dataSource(CalciteTests.DATASOURCE1)
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .columns("m1")
+                                .columnTypes(ColumnType.FLOAT)
                                 .context(queryContext)
                                 .build()
                         ),
@@ -4787,7 +4872,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 .filters(
                     equality("v0", 6.0, ColumnType.DOUBLE)
                 )
-                .columns("j0.m1", "m1")
+                .columns("m1", "j0.m1")
+                .columnTypes(ColumnType.FLOAT, ColumnType.FLOAT)
                 .context(queryContext)
                 .build()
         ),
@@ -4989,6 +5075,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                         .intervals(querySegmentSpec(Intervals.of(
                                             "2001-01-02T00:00:00.000Z/146140482-04-24T15:36:27.903Z")))
                                         .columns("dim1")
+                                        .columnTypes(ColumnType.STRING)
                                         .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                         .context(queryContext)
                                         .build()
@@ -4999,6 +5086,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                         .intervals(querySegmentSpec(Intervals.of(
                                             "2001-01-02T00:00:00.000Z/146140482-04-24T15:36:27.903Z")))
                                         .columns("dim1", "m2")
+                                        .columnTypes(ColumnType.STRING, ColumnType.DOUBLE)
                                         .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                         .context(queryContext)
                                         .build()
@@ -5063,6 +5151,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                         .intervals(querySegmentSpec(Intervals.of(
                             "2001-01-02T00:00:00.000Z/146140482-04-24T15:36:27.903Z")))
                         .columns("dim1")
+                        .columnTypes(ColumnType.STRING)
                         .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                         .context(queryContext)
                         .build()
@@ -5073,6 +5162,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                         .intervals(querySegmentSpec(Intervals.of(
                             "2001-01-02T00:00:00.000Z/146140482-04-24T15:36:27.903Z")))
                         .columns("dim1", "m2")
+                        .columnTypes(ColumnType.STRING, ColumnType.LONG)
                         .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                         .context(queryContext)
                         .build()
@@ -5137,6 +5227,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "\'10.1\'", ColumnType.STRING))
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -5261,6 +5352,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                     true
                                 ))
                                 .columns("dim3", "v0")
+                                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                 .context(queryContext)
                                 .build()
@@ -5278,6 +5370,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     true
                 ))
                 .columns("dim3", "j0.dim3")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -5325,6 +5418,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                                     true
                                                 ))
                                                 .columns("v0")
+                                                .columnTypes(ColumnType.STRING)
                                                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                                 .context(queryContext)
                                                 .build()
@@ -5342,6 +5436,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                     true
                                 ))
                                 .columns("dim3", "v0")
+                                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                                 .context(queryContext)
                                 .build()
                         ),
@@ -5357,7 +5452,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     ImmutableSet.of("a"),
                     true
                 ))
-                .columns("_j0.dim3", "dim3")
+                .columns("dim3", "_j0.dim3")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                 .context(queryContext)
                 .build()
         ),
@@ -5381,6 +5477,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                         .intervals(querySegmentSpec(Filtration.eternity()))
                         .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                         .columns("m1")
+                        .columnTypes(ColumnType.FLOAT)
                         .context(queryContext)
                         .build()
                 ),
@@ -5393,7 +5490,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
             )
         )
         .intervals(querySegmentSpec(Filtration.eternity()))
-        .columns("j0.m1", "m1")
+        .columns("m1", "j0.m1")
+        .columnTypes(ColumnType.FLOAT, ColumnType.FLOAT)
         .filters(or(
             and(
                 equality("dim2", "D", ColumnType.STRING),
@@ -5489,6 +5587,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                         .intervals(querySegmentSpec(Filtration.eternity()))
                         .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                         .columns("m1")
+                        .columnTypes(ColumnType.FLOAT)
                         .context(queryContext)
                         .build()
                 ),
@@ -5501,7 +5600,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
             )
         )
         .intervals(querySegmentSpec(Filtration.eternity()))
-        .columns("j0.m1", "m1")
+        .columns("m1", "j0.m1")
+        .columnTypes(ColumnType.FLOAT, ColumnType.FLOAT)
         .filters(or(
             and(
                 equality("dim2", "D", ColumnType.STRING),
@@ -5629,6 +5729,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                       )
                   )
                   .columns("l1")
+                  .columnTypes(ColumnType.LONG)
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .context(queryContext)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
@@ -5863,6 +5964,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .dataSource(CalciteTests.DATASOURCE3)
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .columns("dim2")
+                                .columnTypes(ColumnType.STRING)
                                 .context(context)
                                 .build()
                         ),
@@ -5875,6 +5977,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("__time")
+                .columnTypes(ColumnType.LONG)
                 .order(Order.ASCENDING)
                 .context(context)
                 .build()
@@ -5958,6 +6061,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("__time", "m1")
+                .columnTypes(ColumnType.LONG, ColumnType.FLOAT)
                 .context(context)
                 .build()
         ),
@@ -6014,6 +6118,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("__time", "m1", "m2")
+                .columnTypes(ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE)
                 .context(context)
                 .build()
         ),
@@ -6172,6 +6277,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .dataSource(CalciteTests.DATASOURCE3)
                                 .columns("dim2")
+                                .columnTypes(ColumnType.STRING)
                                 .context(context)
                                 .build()
                         ),
@@ -6181,7 +6287,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("_j0.dim2", "dim3", "j0.unnest")
+                .columns("dim3", "j0.unnest", "_j0.dim2")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .context(context)
                 .build()
         ),
@@ -6230,6 +6337,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .dataSource(CalciteTests.DATASOURCE3)
                                 .columns("dim2")
+                                .columnTypes(ColumnType.STRING)
                                 .context(context)
                                 .build()
                         ),
@@ -6239,7 +6347,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("_j0.dim2", "dim3", "j0.unnest")
+                .columns("dim3", "j0.unnest", "_j0.dim2")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .context(context)
                 .build()
         ),
@@ -6285,6 +6394,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                         .filters(in("dim2", ImmutableList.of("a", "b", "ab", "abc")))
                                         .context(context)
                                         .columns("dim2")
+                                        .columnTypes(ColumnType.STRING)
                                         .build()
                                 ),
                                 "j0.",
@@ -6299,6 +6409,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .dataSource(CalciteTests.DATASOURCE3)
                                 .columns("dim2")
+                                .columnTypes(ColumnType.STRING)
                                 .context(context)
                                 .build()
                         ),
@@ -6308,7 +6419,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__j0.dim2", "_j0.unnest", "dim3")
+                .columns("dim3", "_j0.unnest", "__j0.dim2")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .context(context)
                 .build()
         ),
@@ -6372,6 +6484,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                     null
                                 ))
                                 .columns("dim2", "j0.unnest")
+                                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                                 .context(context)
                                 .build()
                         ),
@@ -6381,7 +6494,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("_j0.dim2", "dim3", "j0.unnest")
+                .columns("dim3", "j0.unnest", "_j0.dim2")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .context(context)
                 .build()
         ),
@@ -6437,6 +6551,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                             .intervals(querySegmentSpec(Filtration.eternity()))
                                             .dataSource(CalciteTests.DATASOURCE1)
                                             .columns("dim2")
+                                            .columnTypes(ColumnType.STRING)
                                             .filters(
                                                 in(
                                                     "dim2",
@@ -6462,6 +6577,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .dataSource(CalciteTests.DATASOURCE3)
                                 .columns("dim2")
+                                .columnTypes(ColumnType.STRING)
                                 .context(context)
                                 .build()
                         ),
@@ -6471,7 +6587,8 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__j0.dim2", "_j0.unnest", "dim3", "m1")
+                .columns("dim3", "_j0.unnest", "__j0.dim2", "m1")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.FLOAT)
                 .context(context)
                 .build()
         ),
@@ -6554,6 +6671,7 @@ public class CalciteJoinQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("v0")
+                .columnTypes(ColumnType.LONG)
                 .virtualColumns(expressionVirtualColumn("v0", "(\"p0\" - \"j0.p0\")", ColumnType.LONG))
                 .context(context)
                 .build()
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteLookupFunctionQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteLookupFunctionQueryTest.java
index 2c8920fb531..b2146225e7e 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteLookupFunctionQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteLookupFunctionQueryTest.java
@@ -1747,6 +1747,7 @@ public class CalciteLookupFunctionQueryTest extends BaseCalciteQueryTest
                 .virtualColumns(
                     expressionVirtualColumn("v0", "null", ColumnType.STRING)
                 )
+                .columnTypes(ColumnType.STRING)
                 .columns("v0")
                 .filters(isNull("dim2"))
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
@@ -1783,6 +1784,7 @@ public class CalciteLookupFunctionQueryTest extends BaseCalciteQueryTest
                 .virtualColumns(
                     expressionVirtualColumn("v0", "null", ColumnType.STRING)
                 )
+                .columnTypes(ColumnType.STRING)
                 .columns("v0")
                 .filters(isNull("dim2"))
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
@@ -2138,7 +2140,8 @@ public class CalciteLookupFunctionQueryTest extends BaseCalciteQueryTest
                               .build()
               ))
               .intervals(querySegmentSpec(Filtration.eternity()))
-              .columns("$f1", "EXPR$0")
+              .columns("EXPR$0", "$f1")
+              .columnTypes(ColumnType.STRING, ColumnType.LONG)
               .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
               .context(QUERY_CONTEXT)
               .build()
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteMultiValueStringQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteMultiValueStringQueryTest.java
index 4ce75b6270d..8c76d6f9da6 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteMultiValueStringQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteMultiValueStringQueryTest.java
@@ -193,6 +193,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
                 .eternityInterval()
                 .virtualColumns(expressionVirtualColumn("v0", "concat(\"dim3\",'foo')", ColumnType.STRING))
                 .columns(ImmutableList.of("v0"))
+                .columnTypes(ColumnType.STRING)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .build()
@@ -220,6 +221,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
                 .eternityInterval()
                 .virtualColumns(expressionVirtualColumn("v0", "concat(\"dim3\",'-lol-',\"dim3\")", ColumnType.STRING))
                 .columns(ImmutableList.of("v0"))
+                .columnTypes(ColumnType.STRING)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .build()
@@ -248,6 +250,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
                 .virtualColumns(expressionVirtualColumn("v0", "concat(\"dim3\",'','foo')", ColumnType.STRING))
                 .filters(equality("v0", "bfoo", ColumnType.STRING))
                 .columns(ImmutableList.of("v0"))
+                .columnTypes(ColumnType.STRING)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .build()
@@ -271,6 +274,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
                 .eternityInterval()
                 .filters(in("dim3", ImmutableList.of("a", "b")))
                 .columns("dim3")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -296,6 +300,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
                     NullHandling.sqlCompatible() ? NullFilter.forColumn("dim3") : selector("dim3", null)
                 )
                 .columns("dim3")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -325,6 +330,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
                 .eternityInterval()
                 .filters(expressionFilter("array_overlap(mv_harmonize_nulls(\"dim3\"),array(\"dim2\"))"))
                 .columns("dim3")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -353,6 +359,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("dim3")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -377,6 +384,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
                     NullHandling.sqlCompatible() ? NullFilter.forColumn("dim3") : selector("dim3", null)
                 )
                 .columns("dim3")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -406,6 +414,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
                 .eternityInterval()
                 .filters(equality("dim3", "a", ColumnType.STRING))
                 .columns("dim3")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -428,6 +437,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
                 .eternityInterval()
                 .filters(expressionFilter("array_contains(mv_harmonize_nulls(\"dim3\"),array(\"dim2\"))"))
                 .columns("dim3")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -451,6 +461,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
                 .eternityInterval()
                 .virtualColumns(expressionVirtualColumn("v0", "array_slice(\"dim3\",1)", ColumnType.STRING))
                 .columns(ImmutableList.of("v0"))
+                .columnTypes(ColumnType.STRING)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .build()
@@ -1121,6 +1132,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
                 .filters(expressionFilter(
                     "array_contains(string_to_array(concat(array_to_string(\"dim3\",','),',d'),','),'d')"))
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         )
@@ -1330,6 +1342,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),
@@ -1417,6 +1430,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),
@@ -2159,6 +2173,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
                 .filters(expressionFilter(
                     "array_overlap(nvl(mv_to_array(\"dim3\"),array('other')),array('a','b','other'))"))
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -2205,6 +2220,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -2258,6 +2274,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(5)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -2329,6 +2346,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
         .dataSource(CalciteTests.DATASOURCE3)
         .intervals(querySegmentSpec(Filtration.eternity()))
         .columns("dim3")
+        .columnTypes(ColumnType.STRING)
         .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
         .limit(5)
         .context(QUERY_CONTEXT_DEFAULT);
@@ -2368,6 +2386,7 @@ public class CalciteMultiValueStringQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.DATASOURCE3)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("v0", "v1")
+                .columnTypes(ColumnType.LONG, ColumnType.LONG)
                 .virtualColumns(
                     expressionVirtualColumn("v0", "array_contains(mv_harmonize_nulls(\"dim3\"),array('a','b'))", ColumnType.LONG),
                     expressionVirtualColumn("v1", "array_overlap(mv_harmonize_nulls(\"dim3\"),array('a','b'))", ColumnType.LONG)
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteNestedDataQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteNestedDataQueryTest.java
index ec4d5812dd5..328e9cbdd5b 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteNestedDataQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteNestedDataQueryTest.java
@@ -1183,6 +1183,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                           new NestedFieldVirtualColumn("arrayNestedLong", "$[0]", "v3", ColumnType.LONG_ARRAY)
                       )
                       .columns("v0", "v1", "v2", "v3")
+                      .columnTypes(ColumnType.STRING_ARRAY, ColumnType.LONG_ARRAY, ColumnType.DOUBLE_ARRAY, ColumnType.LONG_ARRAY)
                       .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                       .build()
             )
@@ -1270,6 +1271,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                       )
                       .intervals(querySegmentSpec(Filtration.eternity()))
                       .columns("j0.unnest")
+                      .columnTypes(ColumnType.LONG)
                       .context(QUERY_CONTEXT_NO_STRINGIFY_ARRAY)
                       .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                       .build()
@@ -1329,6 +1331,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                       )
                       .intervals(querySegmentSpec(Filtration.eternity()))
                       .columns("j0.unnest")
+                      .columnTypes(ColumnType.STRING)
                       .context(QUERY_CONTEXT_NO_STRINGIFY_ARRAY)
                       .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                       .build()
@@ -1385,6 +1388,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                       )
                       .intervals(querySegmentSpec(Filtration.eternity()))
                       .columns("j0.unnest")
+                      .columnTypes(ColumnType.DOUBLE)
                       .context(QUERY_CONTEXT_NO_STRINGIFY_ARRAY)
                       .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                       .build()
@@ -4856,6 +4860,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                       )
                   )
                   .columns("v0", "v1")
+                  .columnTypes(ColumnType.NESTED_DATA, ColumnType.NESTED_DATA)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         ),
@@ -4905,6 +4910,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                       new NestedFieldVirtualColumn("nest", "$.x", "v2", ColumnType.STRING)
                   )
                   .columns("v0")
+                  .columnTypes(ColumnType.NESTED_DATA)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         ),
@@ -4954,6 +4960,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                       )
                   )
                   .columns("v0")
+                  .columnTypes(ColumnType.ofComplex("json"))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         ),
@@ -5001,6 +5008,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                       )
                   )
                   .columns("v0")
+                  .columnTypes(ColumnType.LONG)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         ),
@@ -5051,6 +5059,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                       )
                   )
                   .columns("string", "v0", "v1", "v2")
+                  .columnTypes(ColumnType.STRING, ColumnType.NESTED_DATA, ColumnType.NESTED_DATA, ColumnType.NESTED_DATA)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         ),
@@ -5146,6 +5155,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                       expressionVirtualColumn("v2", "json_keys(\"nester\",'$.array[-1]')", ColumnType.STRING_ARRAY)
                   )
                   .columns("v0", "v1", "v2")
+                  .columnTypes(ColumnType.STRING, ColumnType.NESTED_DATA, ColumnType.STRING_ARRAY)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         ),
@@ -5182,6 +5192,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                       expressionVirtualColumn("v1", "array('$')", ColumnType.STRING_ARRAY)
                   )
                   .columns("v0", "v1")
+                  .columnTypes(ColumnType.STRING_ARRAY, ColumnType.STRING_ARRAY)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         ),
@@ -5220,6 +5231,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                       expressionVirtualColumn("v1", "null", ColumnType.STRING_ARRAY)
                   )
                   .columns("v0", "v1")
+                  .columnTypes(ColumnType.STRING_ARRAY, ColumnType.STRING_ARRAY)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         ),
@@ -5343,9 +5355,8 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                       new NestedFieldVirtualColumn("nester", "$.n.x", "v0", ColumnType.LONG),
                       new NestedFieldVirtualColumn("nest", "$.x", "v1", ColumnType.STRING)
                   )
-                  .columns(
-                      "v0", "v1"
-                  )
+                  .columns("v1", "v0")
+                  .columnTypes(ColumnType.STRING, ColumnType.LONG)
                   .filters(isNull("v0"))
                   .context(QUERY_CONTEXT_DEFAULT)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
@@ -5551,6 +5562,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                   )
                   .filters(notNull("v0"))
                   .columns("v0")
+                  .columnTypes(ColumnType.LONG)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         ),
@@ -6020,42 +6032,43 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns(
                       "__time",
-                      "arrayBool",
-                      "arrayDouble",
-                      "arrayDoubleNulls",
+                      "str",
+                      "long",
+                      "double",
+                      "bool",
+                      "variant",
+                      "variantNumeric",
+                      "variantEmptyObj",
+                      "variantEmtpyArray",
+                      "variantWithArrays",
+                      "obj",
+                      "complexObj",
+                      "arrayString",
+                      "arrayStringNulls",
                       "arrayLong",
                       "arrayLongNulls",
+                      "arrayDouble",
+                      "arrayDoubleNulls",
+                      "arrayVariant",
+                      "arrayBool",
                       "arrayNestedLong",
                       "arrayObject",
-                      "arrayString",
-                      "arrayStringNulls",
-                      "arrayVariant",
-                      "bool",
+                      "null",
+                      "cstr",
+                      "clong",
+                      "cdouble",
+                      "cObj",
+                      "cstringArray",
+                      "cLongArray",
                       "cDoubleArray",
                       "cEmptyArray",
                       "cEmptyObj",
-                      "cEmptyObjectArray",
-                      "cLongArray",
                       "cNullArray",
-                      "cObj",
+                      "cEmptyObjectArray",
                       "cObjectArray",
-                      "cdouble",
-                      "clong",
-                      "cnt",
-                      "complexObj",
-                      "cstr",
-                      "cstringArray",
-                      "double",
-                      "long",
-                      "null",
-                      "obj",
-                      "str",
-                      "variant",
-                      "variantEmptyObj",
-                      "variantEmtpyArray",
-                      "variantNumeric",
-                      "variantWithArrays"
+                      "cnt"
                   )
+                  .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.LONG, ColumnType.DOUBLE, ColumnType.LONG, ColumnType.STRING, ColumnType.DOUBLE, ColumnType.ofComplex("json"), ColumnType.LONG_ARRAY, ColumnType.STRING_ARRAY, ColumnType.ofComplex("json"), ColumnType.ofComplex("json"), ColumnType.STRING_ARRAY, ColumnType.STRING_ARRAY, ColumnType.LONG_ARRAY, ColumnType.LONG_ARRAY, ColumnType.DOUBLE_ARRAY, ColumnType.DOUBLE_ARRAY, ColumnType.STRING_ARRAY, ColumnType.LONG_ARRAY, Co [...]
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         ),
@@ -6648,6 +6661,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                   .dataSource(DATA_SOURCE)
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("nest")
+                  .columnTypes(ColumnType.NESTED_DATA)
                   .filters(notNull("nest"))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
@@ -6677,6 +6691,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                   .dataSource(DATA_SOURCE)
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("nest", "nester")
+                  .columnTypes(ColumnType.ofComplex("json"), ColumnType.ofComplex("json"))
                   .filters(isNull("nest"))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
@@ -6733,6 +6748,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                     .virtualColumns(expressionVirtualColumn("v0", "nvl(\"j0.unnest\",\"long\")", ColumnType.LONG))
                     .intervals(querySegmentSpec(Filtration.eternity()))
                     .columns("j0.unnest", "long", "v0")
+                    .columnTypes(ColumnType.LONG, ColumnType.LONG, ColumnType.LONG)
                     .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                     .context(QUERY_CONTEXT_DEFAULT)
                     .build()
@@ -6780,6 +6796,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                   ))
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("long")
+                  .columnTypes(ColumnType.LONG)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_DEFAULT)
                   .build()
@@ -6794,6 +6811,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .virtualColumns(expressionVirtualColumn("v0", "nvl(\"long\",\"j0.unnest\")", ColumnType.LONG))
                   .columns("v0")
+                  .columnTypes(ColumnType.LONG)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_DEFAULT)
                   .build()
@@ -6879,6 +6897,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                       )
                   )
                   .columns("v0", "v1")
+                  .columnTypes(ColumnType.STRING_ARRAY, ColumnType.ofComplex("json"))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         ),
@@ -6919,6 +6938,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                           )
                       )
                       .columns("v0")
+                      .columnTypes(ColumnType.ofArray(ColumnType.NESTED_DATA))
                       .context(QUERY_CONTEXT_DEFAULT)
                       .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                       .build()
@@ -6972,6 +6992,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                       )
                       .filters(isNull("arrayObject"))
                       .columns("v0")
+                      .columnTypes(ColumnType.ofArray(ColumnType.NESTED_DATA))
                       .limit(1)
                       .context(QUERY_CONTEXT_DEFAULT)
                       .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
@@ -7012,6 +7033,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                       )
                       .intervals(querySegmentSpec(Filtration.eternity()))
                       .columns("j0.unnest")
+                      .columnTypes(ColumnType.ofComplex("json"))
                       .context(QUERY_CONTEXT_NO_STRINGIFY_ARRAY)
                       .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                       .build()
@@ -7182,9 +7204,8 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
             Druids.newScanQueryBuilder()
                   .dataSource(DATA_SOURCE_ALL)
                   .intervals(querySegmentSpec(Filtration.eternity()))
-                  .columns(
-                      "v0"
-                  )
+                  .columns("v0")
+                  .columnTypes(ColumnType.STRING)
                   .virtualColumns(
                       new NestedFieldVirtualColumn(
                           "cObj",
@@ -7238,7 +7259,8 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                 )
                 .filters(range("v0", ColumnType.LONG, NullHandling.sqlCompatible() ? 0.0 : "0", null, true, false))
                 .limit(1)
-                .columns("v0", "v1", "v2")
+                .columns("v1", "v0", "v2")
+                .columnTypes(ColumnType.DOUBLE, ColumnType.DOUBLE, ColumnType.LONG)
                 .build()
         ),
         NullHandling.sqlCompatible()
@@ -7273,6 +7295,7 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                     expressionVirtualColumn("v3", "(nvl(\"v0\",1.0) == 1.0)", ColumnType.LONG)
                 )
                 .columns("v0", "v1", "v2", "v3")
+                .columnTypes(ColumnType.DOUBLE, ColumnType.DOUBLE, ColumnType.LONG, ColumnType.LONG)
                 .build()
         ),
         NullHandling.sqlCompatible()
@@ -7323,7 +7346,8 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                     expressionVirtualColumn("v2", "notnull(nvl(\"v1\",1.0))", ColumnType.LONG)
                 )
                 .filters(range("v0", ColumnType.LONG, NullHandling.sqlCompatible() ? 0.0 : "0", null, true, false))
-                .columns("v0", "v1", "v2")
+                .columns("v1", "v0", "v2")
+                .columnTypes(ColumnType.DOUBLE, ColumnType.DOUBLE, ColumnType.LONG)
                 .build()
         ),
         NullHandling.sqlCompatible()
@@ -7397,7 +7421,8 @@ public class CalciteNestedDataQueryTest extends BaseCalciteQueryTest
                     expressionVirtualColumn("v2", "notnull(nvl(\"v1\",1.0))", ColumnType.LONG)
                 )
                 .filters(equality("v0", 1.0, ColumnType.DOUBLE))
-                .columns("v0", "v1", "v2")
+                .columns("v1", "v0", "v2")
+                .columnTypes(ColumnType.DOUBLE, ColumnType.DOUBLE, ColumnType.LONG)
                 .build()
         ),
         NullHandling.sqlCompatible()
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteParameterQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteParameterQueryTest.java
index bd9c5649df1..a023e731e58 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteParameterQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteParameterQueryTest.java
@@ -74,6 +74,7 @@ public class CalciteParameterQueryTest extends BaseCalciteQueryTest
                   )
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("EXPR$0")
+                  .columnTypes(ColumnType.LONG)
                   .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         ),
@@ -94,7 +95,8 @@ public class CalciteParameterQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "2", ColumnType.LONG))
-                .columns("dim1", "v0")
+                .columns("v0", "dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(1)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -246,6 +248,7 @@ public class CalciteParameterQueryTest extends BaseCalciteQueryTest
                     expressionVirtualColumn("v0", "substring(\"dim2\", 0, 1)", ColumnType.STRING)
                 )
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .limit(2)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -684,6 +687,7 @@ public class CalciteParameterQueryTest extends BaseCalciteQueryTest
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .columns("EXPR$0")
+                  .columnTypes(ColumnType.LONG)
                   .context(QUERY_CONTEXT_DEFAULT)
                   .build()
         ),
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
index 791e5bf4bb7..68fd0770143 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
@@ -624,7 +624,8 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                     expressionVirtualColumn("v0", "div(\"m1\",2)", ColumnType.LONG),
                     expressionVirtualColumn("v1", "div((\"cnt\" + 2),(\"cnt\" + 1))", ColumnType.LONG)
                 )
-                .columns(ImmutableList.of("cnt", "m1", "v0", "v1"))
+                .columns("cnt", "m1", "v0", "v1")
+                .columnTypes(ColumnType.LONG, ColumnType.FLOAT, ColumnType.LONG, ColumnType.LONG)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),
@@ -1354,6 +1355,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                   ))
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("EXPR$0", "dim2")
+                  .columnTypes(ColumnType.STRING, ColumnType.STRING)
                   .context(QUERY_CONTEXT_DEFAULT)
                   .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
@@ -1378,6 +1380,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                   ))
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("EXPR$0", "dim2")
+                  .columnTypes(ColumnType.STRING, ColumnType.STRING)
                   .context(QUERY_CONTEXT_DEFAULT)
                   .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
@@ -2529,7 +2532,8 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                       )
                   )
                   .limit(1)
-                  .columns(ImmutableList.of("v0"))
+                  .columns("v0")
+                  .columnTypes(ColumnType.STRING)
                   .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_DEFAULT)
                   .build()
@@ -3347,6 +3351,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("dim1", "dim2", "v0")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .build()
         ),
         ImmutableList.of(
@@ -3380,6 +3385,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("v0", "v1")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                 .build()
         ),
         ImmutableList.of(
@@ -3480,6 +3486,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                   )
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("EXPR$0")
+                  .columnTypes(ColumnType.LONG)
                   .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         )
@@ -3517,6 +3524,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                   )
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("EXPR$0")
+                  .columnTypes(ColumnType.LONG)
                   .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         )
@@ -3554,6 +3562,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                   )
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("EXPR$0")
+                  .columnTypes(ColumnType.LONG)
                   .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         )
@@ -3816,6 +3825,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.DATASOURCE3)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("v0")
+                .columnTypes(ColumnType.LONG)
                 .virtualColumns(
                     expressionVirtualColumn(
                         "v0",
@@ -3972,6 +3982,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                   )
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("EXPR$0")
+                  .columnTypes(ColumnType.LONG)
                   .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         ),
@@ -4181,6 +4192,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("EXPR$0")
+                .columnTypes(ColumnType.LONG)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -4225,6 +4237,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("EXPR$0")
+                .columnTypes(ColumnType.LONG)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -4249,6 +4262,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                   )
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("EXPR$0", "EXPR$1")
+                  .columnTypes(ColumnType.LONG, ColumnType.LONG)
                   .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         ),
@@ -4321,6 +4335,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                   )
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("EXPR$0", "EXPR$1")
+                  .columnTypes(ColumnType.LONG, ColumnType.LONG)
                   .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         ),
@@ -6389,6 +6404,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                   )
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("EXPR$0")
+                  .columnTypes(ColumnType.LONG)
                   .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
         ),
@@ -6814,6 +6830,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                             .intervals(querySegmentSpec(Filtration.eternity()))
                             .virtualColumns(new ExpressionVirtualColumn("v0", ExprEval.of(1L).toExpr(), ColumnType.LONG))
                             .columns("v0")
+                            .columnTypes(ColumnType.LONG)
                             .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                             .context(QUERY_CONTEXT_LOS_ANGELES)
                             .build()
@@ -7775,7 +7792,8 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                 )
                 .context(QUERY_CONTEXT_DEFAULT)
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns(ImmutableList.of("_j0.a0", "a0", "d0", "j0.a0"))
+                .columns("d0", "a0", "j0.a0", "_j0.a0")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG, ColumnType.LONG, ColumnType.LONG)
                 .build()
         ),
         NullHandling.sqlCompatible()
@@ -7807,6 +7825,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                         .dataSource(CalciteTests.DATASOURCE1)
                         .intervals(querySegmentSpec(Filtration.eternity()))
                         .columns("__time", "m1")
+                        .columnTypes(ColumnType.LONG, ColumnType.FLOAT)
                         .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                         .limit(100)
                         .context(QUERY_CONTEXT_DEFAULT)
@@ -7832,6 +7851,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                     )
                 ))
                 .columns("__time", "m1")
+                .columnTypes(ColumnType.LONG, ColumnType.FLOAT)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -12669,6 +12689,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                     ColumnType.STRING
                 ))
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -12700,6 +12721,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                     ColumnType.STRING
                 ))
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -12806,6 +12828,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                     equality("dim2", "4", ColumnType.STRING)
                 ))
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -12856,6 +12879,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -12897,6 +12921,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                 ))
                 .filters(or(isNull("dim1"), isNull("dim2")))
                 .columns("dim1", "dim2", "v0")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -12913,6 +12938,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                     )
                     .intervals(querySegmentSpec(Filtration.eternity()))
                     .columns("dim1", "dim2", "dimX")
+                    .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                     .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                     .build()
 
@@ -12943,6 +12969,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                     and(equality("dim1", "3", ColumnType.STRING), equality("dim2", "4", ColumnType.STRING))
                 ))
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -12964,6 +12991,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "concat(\"dim1\",\"dim1\")", ColumnType.STRING))
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -12977,7 +13005,11 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
             new Object[]{"abcabc"}
         )
     );
+  }
 
+  @Test
+  public void testTextcat2()
+  {
     testQuery(
         "SELECT textcat(dim1, CAST(m2 as VARCHAR)) as dimX FROM foo",
         ImmutableList.of(
@@ -12990,6 +13022,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                     ColumnType.STRING
                 ))
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -13169,6 +13202,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                     RowSignature.builder().add("a", ColumnType.LONG).build()
                 ))
                 .columns("a")
+                .columnTypes(ColumnType.LONG)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -13248,6 +13282,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.DATASOURCE3)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim1")
+                .columnTypes(ColumnType.STRING)
                 .filters(equality("f1", 0.1, ColumnType.DOUBLE))
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(1)
@@ -13270,6 +13305,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.DATASOURCE3)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim1")
+                .columnTypes(ColumnType.STRING)
                 .filters(equality("d1", 1.7, ColumnType.DOUBLE))
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(1)
@@ -13292,6 +13328,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.DATASOURCE3)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim1")
+                .columnTypes(ColumnType.STRING)
                 .filters(equality("l1", 7L, ColumnType.LONG))
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(1)
@@ -13367,6 +13404,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                     expressionVirtualColumn("v0", "(toRadians((\"m1\" * 15)) / toDegrees(\"m2\"))", ColumnType.DOUBLE)
                 )
                 .columns("v0")
+                .columnTypes(ColumnType.DOUBLE)
                 .filters(equality("dim1", "1", ColumnType.STRING))
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -13417,6 +13455,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                     expressionVirtualColumn("v8", "div(div((\"__time\" - 907200000000),1000),604800)", ColumnType.LONG)
                 )
                 .columns("v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v8")
+                .columnTypes(ColumnType.LONG, ColumnType.LONG, ColumnType.LONG, ColumnType.LONG, ColumnType.LONG, ColumnType.LONG, ColumnType.LONG, ColumnType.LONG, ColumnType.LONG)
                 .limit(2)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -13447,6 +13486,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                     expressionVirtualColumn("v1", "946771200000", ColumnType.LONG)
                 )
                 .columns("v0", "v1")
+                .columnTypes(ColumnType.LONG, ColumnType.LONG)
                 .limit(1)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -13768,6 +13808,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                                  expressionVirtualColumn("v0", "(\"__time\" + 0)", ColumnType.LONG)
                              )
                              .columns("v0")
+                             .columnTypes(ColumnType.LONG)
                              .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                              .context(QUERY_CONTEXT_DEFAULT)
                              .build()),
@@ -13797,6 +13838,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                                  )
                              )
                              .columns("v0")
+                             .columnTypes(ColumnType.LONG)
                              .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                              .context(QUERY_CONTEXT_DEFAULT)
                              .build()),
@@ -13826,6 +13868,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                                  )
                              )
                              .columns("v0")
+                             .columnTypes(ColumnType.LONG)
                              .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                              .context(QUERY_CONTEXT_DEFAULT)
                              .build()),
@@ -13864,6 +13907,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                                  )
                              )
                              .columns("v0")
+                             .columnTypes(ColumnType.LONG)
                              .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                              .context(QUERY_CONTEXT_DEFAULT)
                              .build()),
@@ -13892,6 +13936,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                                  )
                              )
                              .columns("v0")
+                             .columnTypes(ColumnType.LONG)
                              .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                              .context(QUERY_CONTEXT_DEFAULT)
                              .build()),
@@ -14055,6 +14100,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                     expressionVirtualColumn("v0", "round(\"f1\")", ColumnType.FLOAT)
                 )
                 .columns("f1", "v0")
+                .columnTypes(ColumnType.FLOAT, ColumnType.FLOAT)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -14915,6 +14961,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                     expressionVirtualColumn("v7", "human_readable_decimal_format(\"l1\")", ColumnType.STRING)
                 )
                 .columns("m1", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7")
+                .columnTypes(ColumnType.FLOAT, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .filters(equality("dim1", "1", ColumnType.STRING))
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(1)
@@ -15134,6 +15181,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
             Druids.newScanQueryBuilder()
                   .dataSource(CalciteTests.DATASOURCE3)
                   .columns("l1")
+                  .columnTypes(ColumnType.LONG)
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .context(QUERY_CONTEXT_DEFAULT)
                   .filters(
@@ -15377,6 +15425,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                     .dataSource(CalciteTests.DATASOURCE1)
                     .intervals(querySegmentSpec(Filtration.eternity()))
                     .columns("v0")
+                    .columnTypes(ColumnType.ofComplex("hyperUnique"))
                     .virtualColumns(
                         expressionVirtualColumn(
                             "v0",
@@ -15502,7 +15551,8 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                 .intervals(querySegmentSpec(Intervals.of(
                     "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z")))
                 .limit(1)
-                .columns(ImmutableList.of("__time", "m1"))
+                .columns("__time", "m1")
+                .columnTypes(ColumnType.LONG, ColumnType.FLOAT)
                 .order(Order.ASCENDING)
                 .build()
         ),
@@ -15544,7 +15594,8 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                 .intervals(querySegmentSpec(Intervals.of(
                     "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z")))
                 .limit(1)
-                .columns(ImmutableList.of("__time", "m1"))
+                .columns("__time", "m1")
+                .columnTypes(ColumnType.LONG, ColumnType.FLOAT)
                 .order(Order.DESCENDING)
                 .build()
         ),
@@ -15566,7 +15617,8 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                 .context(QUERY_CONTEXT_DEFAULT)
                 .intervals(querySegmentSpec(Intervals.of(
                     "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z")))
-                .columns(ImmutableList.of("__time", "dim1"))
+                .columns("__time", "dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING)
                 .filters(not(in("dim1", Arrays.asList("", "a"))))
                 .build()
         ),
@@ -15592,7 +15644,8 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                 .context(QUERY_CONTEXT_DEFAULT)
                 .intervals(querySegmentSpec(Intervals.of(
                     "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z")))
-                .columns(ImmutableList.of("__time", "dim1"))
+                .columns("__time", "dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING)
                 .filters(not(in("dim1", Arrays.asList("", "a"))))
                 .build()
         ),
@@ -15618,7 +15671,8 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                 .context(QUERY_CONTEXT_DEFAULT)
                 .intervals(querySegmentSpec(Intervals.of(
                     "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z")))
-                .columns(ImmutableList.of("__time", "dim1"))
+                .columns("__time", "dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING)
                 .filters(not(in("dim1", Arrays.asList("", "a"))))
                 .build()
         ),
@@ -15644,7 +15698,8 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                 .context(QUERY_CONTEXT_DEFAULT)
                 .intervals(querySegmentSpec(Intervals.of(
                     "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z")))
-                .columns(ImmutableList.of("__time", "dim1"))
+                .columns("__time", "dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING)
                 .filters(not(in("dim1", Arrays.asList("", "a"))))
                 .build()
         ),
@@ -15874,7 +15929,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                                 false
                             )
                         )
-                        .setProjectedColumns("a0", "d0")
+                        .setProjectedColumns("d0", "a0")
                         .build()
                 )
                 .build()
@@ -15956,7 +16011,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                                 false
                             )
                         )
-                        .setProjectedColumns("a0", "d0")
+                        .setProjectedColumns("d0", "a0")
                         .build()
                 )
                 .build()
@@ -16052,7 +16107,8 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                                 .build()
                         )
                         .intervals(querySegmentSpec(Filtration.eternity()))
-                        .columns("a0", "w0")
+                        .columns("w0", "a0")
+                        .columnTypes(ColumnType.LONG, ColumnType.LONG)
                         .context(QUERY_CONTEXT_DEFAULT)
                         .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                         .limit(10)
@@ -16070,7 +16126,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                 .setLeafOperators(
                     OperatorFactoryBuilders.scanOperatorFactoryBuilder()
                         .setOffsetLimit(0, Long.MAX_VALUE)
-                        .setProjectedColumns("a0", "w0")
+                        .setProjectedColumns("w0", "a0")
                         .build()
                 )
                 .build()
@@ -16225,9 +16281,8 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                   )
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
-                  .columns(ImmutableList.of(
-                      "EXPR$0"
-                  ))
+                  .columns("EXPR$0")
+                  .columnTypes(ColumnType.STRING)
                   .build()
         ),
         ImmutableList.of(
@@ -16307,6 +16362,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                   ))
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("EXPR$0")
+                  .columnTypes(ColumnType.LONG)
                   .context(QUERY_CONTEXT_DEFAULT)
                   .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .build()
@@ -16321,6 +16377,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                   ))
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("v0")
+                  .columnTypes(ColumnType.LONG)
                   .virtualColumns(expressionVirtualColumn("v0", "0", ColumnType.LONG))
                   .context(QUERY_CONTEXT_DEFAULT)
                   .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
@@ -16345,6 +16402,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                   ))
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("v0")
+                  .columnTypes(ColumnType.LONG)
                   .virtualColumns(expressionVirtualColumn("v0", "3232235521", ColumnType.LONG))
                   .context(QUERY_CONTEXT_DEFAULT)
                   .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
@@ -16455,6 +16513,7 @@ public class CalciteQueryTest extends BaseCalciteQueryTest
                                       )
                               )
                               .columns("v0", "v1")
+                              .columnTypes(ColumnType.LONG, ColumnType.STRING)
                               .filters(isNull("dim3"))
                               .limit(1)
                               .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteReplaceDmlTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteReplaceDmlTest.java
index cb819c3634a..1e544cfda28 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteReplaceDmlTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteReplaceDmlTest.java
@@ -91,7 +91,8 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .context(REPLACE_ALL_TIME_CHUNKS)
                 .build()
         )
@@ -110,7 +111,8 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .context(
                     addReplaceTimeChunkToQueryContext(
                         queryContextWithGranularity(Granularities.DAY),
@@ -137,7 +139,8 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .context(
                     addReplaceTimeChunkToQueryContext(
                         queryContextWithGranularity(Granularities.DAY),
@@ -162,7 +165,8 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .context(
                     addReplaceTimeChunkToQueryContext(
                         queryContextWithGranularity(Granularities.MONTH),
@@ -188,7 +192,8 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .context(
                     addReplaceTimeChunkToQueryContext(
                         queryContextWithGranularity(Granularities.MONTH),
@@ -213,7 +218,8 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .context(
                     addReplaceTimeChunkToQueryContext(
                         queryContextWithGranularity(Granularities.MONTH),
@@ -342,6 +348,7 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
                 .virtualColumns(expressionVirtualColumn("v0", "substring(\"dim1\", 0, 1)", ColumnType.STRING))
                 .filters(equality("dim2", "a", ColumnType.STRING))
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .context(REPLACE_ALL_TIME_CHUNKS)
                 .build()
         )
@@ -359,7 +366,8 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .context(REPLACE_ALL_TIME_CHUNKS)
                 .build()
         )
@@ -383,6 +391,7 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim1", "dim3")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                 .context(REPLACE_ALL_TIME_CHUNKS)
                 .build()
         )
@@ -524,6 +533,7 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
                 .dataSource(externalDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(REPLACE_ALL_TIME_CHUNKS)
                 .build()
         )
@@ -548,7 +558,8 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "dim1", "v0")
+                .columns("__time", "v0", "dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.FLOAT, ColumnType.STRING)
                 .virtualColumns(expressionVirtualColumn("v0", "floor(\"m1\")", ColumnType.FLOAT))
                 .limit(10)
                 .offset(20)
@@ -582,7 +593,8 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "dim1", "v0")
+                .columns("__time", "v0", "dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.FLOAT, ColumnType.STRING)
                 .virtualColumns(expressionVirtualColumn("v0", "floor(\"m1\")", ColumnType.FLOAT))
                 .orderBy(
                     ImmutableList.of(
@@ -637,6 +649,7 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
                   .dataSource("foo")
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("__time", "dim1")
+                  .columnTypes(ColumnType.LONG, ColumnType.STRING)
                   .context(queryContext)
                   .build()
           )
@@ -686,6 +699,7 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
         .dataSource(externalDataSource)
         .intervals(querySegmentSpec(Filtration.eternity()))
         .columns("x", "y", "z")
+        .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
         .context(
             queryJsonMapper.readValue(
                 "{\"defaultTimeout\":300000,\"maxScatterGatherBytes\":9223372036854775807,\"sqlCurrentTimestamp\":\"2000-01-01T00:00:00Z\",\"sqlInsertSegmentGranularity\":\"{\\\"type\\\":\\\"all\\\"}\",\"sqlQueryId\":\"dummy\",\"sqlReplaceTimeChunks\":\"all\",\"vectorize\":\"false\",\"vectorizeVirtualColumns\":\"false\"}",
@@ -757,9 +771,10 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
     final ScanQuery expectedQuery = newScanQueryBuilder()
         .dataSource("foo")
         .intervals(querySegmentSpec(Filtration.eternity()))
-        .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+        .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+        .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
         .orderBy(ImmutableList.of(OrderBy.ascending("dim1")))
-        .columnTypes(LONG, LONG, STRING, STRING, STRING, FLOAT, DOUBLE, ofComplex("hyperUnique"))
+        .columnTypes(LONG, STRING, STRING, STRING, LONG, FLOAT, DOUBLE, ofComplex("hyperUnique"))
         .context(
             queryJsonMapper.readValue(
                 "{\"defaultTimeout\":300000,\"maxScatterGatherBytes\":9223372036854775807,\"sqlCurrentTimestamp\":\"2000-01-01T00:00:00Z\",\"sqlInsertSegmentGranularity\":\"\\\"DAY\\\"\",\"sqlQueryId\":\"dummy\",\"sqlReplaceTimeChunks\":\"2000-01-01T00:00:00.000Z/2000-01-02T00:00:00.000Z\",\"vectorize\":\"false\",\"vectorizeVirtualColumns\":\"false\"}",
@@ -774,7 +789,7 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
         + "], signature=[{__time:LONG, dim1:STRING, dim2:STRING, dim3:STRING, cnt:LONG, m1:FLOAT, m2:DOUBLE, unique_dim1:COMPLEX<hyperUnique>}])\n";
 
 
-    final String explanation = "[{\"query\":{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"resultFormat\":\"compactedList\",\"orderBy\":[{\"columnName\":\"dim1\",\"order\":\"ascending\"}],\"columns\":[\"__time\",\"cnt\",\"dim1\",\"dim2\",\"dim3\",\"m1\",\"m2\",\"unique_dim1\"],\"context\":{\"defaultTimeout\":300000,\"maxScatterGatherBytes [...]
+    final String explanation = "[{\"query\":{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"resultFormat\":\"compactedList\",\"orderBy\":[{\"columnName\":\"dim1\",\"order\":\"ascending\"}],\"columns\":[\"__time\",\"dim1\",\"dim2\",\"dim3\",\"cnt\",\"m1\",\"m2\",\"unique_dim1\"],\"context\":{\"defaultTimeout\":300000,\"maxScatterGatherBytes [...]
     final String resources = "[{\"name\":\"dst\",\"type\":\"DATASOURCE\"},{\"name\":\"foo\",\"type\":\"DATASOURCE\"}]";
     final String attributes = "{\"statementType\":\"REPLACE\",\"targetDataSource\":\"dst\",\"partitionedBy\":\"DAY\",\"clusteredBy\":[\"dim1\"],\"replaceTimeChunks\":\"2000-01-01T00:00:00.000Z/2000-01-02T00:00:00.000Z\"}";
 
@@ -835,7 +850,8 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
     final ScanQuery expectedQuery = newScanQueryBuilder()
         .dataSource("foo")
         .intervals(querySegmentSpec(Filtration.eternity()))
-        .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+        .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+        .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
         .limit(10)
         .orderBy(
             ImmutableList.of(
@@ -845,7 +861,7 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
                 OrderBy.ascending("dim2")
             )
         )
-        .columnTypes(LONG, LONG, STRING, STRING, STRING, FLOAT, DOUBLE, ColumnType.ofComplex("hyperUnique"))
+        .columnTypes(LONG, STRING, STRING, STRING, LONG, FLOAT, DOUBLE, ColumnType.ofComplex("hyperUnique"))
         .context(
             queryJsonMapper.readValue(
                 "{\"defaultTimeout\":300000,\"maxScatterGatherBytes\":9223372036854775807,\"sqlCurrentTimestamp\":\"2000-01-01T00:00:00Z\",\"sqlInsertSegmentGranularity\":\"\\\"HOUR\\\"\",\"sqlQueryId\":\"dummy\",\"sqlReplaceTimeChunks\":\"2000-01-01T00:00:00.000Z/2000-01-02T00:00:00.000Z\",\"vectorize\":\"false\",\"vectorizeVirtualColumns\":\"false\"}",
@@ -859,7 +875,7 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
         + queryJsonMapper.writeValueAsString(expectedQuery)
         + "], signature=[{__time:LONG, dim1:STRING, dim2:STRING, dim3:STRING, cnt:LONG, m1:FLOAT, m2:DOUBLE, unique_dim1:COMPLEX<hyperUnique>}])\n";
 
-    final String explanation = "[{\"query\":{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"resultFormat\":\"compactedList\",\"limit\":10,\"orderBy\":[{\"columnName\":\"__time\",\"order\":\"ascending\"},{\"columnName\":\"dim1\",\"order\":\"ascending\"},{\"columnName\":\"dim3\",\"order\":\"ascending\"},{\"columnName\":\"dim2\",\"order\":\"a [...]
+    final String explanation = "[{\"query\":{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"resultFormat\":\"compactedList\",\"limit\":10,\"orderBy\":[{\"columnName\":\"__time\",\"order\":\"ascending\"},{\"columnName\":\"dim1\",\"order\":\"ascending\"},{\"columnName\":\"dim3\",\"order\":\"ascending\"},{\"columnName\":\"dim2\",\"order\":\"a [...]
     final String resources = "[{\"name\":\"dst\",\"type\":\"DATASOURCE\"},{\"name\":\"foo\",\"type\":\"DATASOURCE\"}]";
     final String attributes = "{\"statementType\":\"REPLACE\",\"targetDataSource\":\"dst\",\"partitionedBy\":\"HOUR\","
                               + "\"clusteredBy\":[\"__time\",\"dim1\",\"dim3\",\"dim2\"],\"replaceTimeChunks\":\"2000-01-01T00:00:00.000Z/2000-01-02T00:00:00.000Z\"}";
@@ -1013,6 +1029,7 @@ public class CalciteReplaceDmlTest extends CalciteIngestionDmlTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "concat(\"x\",\"y\")", ColumnType.STRING))
                 .columns("v0", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                 .context(REPLACE_ALL_TIME_CHUNKS)
                 .build()
         )
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteScanSignatureTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteScanSignatureTest.java
index 80a9dde9b4c..f4562190cde 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteScanSignatureTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteScanSignatureTest.java
@@ -65,6 +65,7 @@ public class CalciteScanSignatureTest extends BaseCalciteQueryTest
                     ColumnType.STRING
                 ))
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(context)
                 .build()
@@ -91,6 +92,7 @@ public class CalciteScanSignatureTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.DATASOURCE2)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("v0")
+                .columnTypes(ColumnType.LONG)
                 .virtualColumns(expressionVirtualColumn(
                     "v0",
                     "CAST(\"dim1\", 'LONG')",
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSelectQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSelectQueryTest.java
index e053da4d744..040445b0070 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSelectQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSelectQueryTest.java
@@ -93,6 +93,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -126,6 +127,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .columns("v0")
+                .columnTypes(ColumnType.STRING_ARRAY)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -175,6 +177,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("EXPR$0", "EXPR$1")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -202,6 +205,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("EXPR$0", "EXPR$1")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -229,6 +233,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("EXPR$0", "EXPR$1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -266,6 +271,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("EXPR$0", "EXPR$1", "EXPR$2", "EXPR$3", "EXPR$4")
+                .columnTypes(ColumnType.LONG, ColumnType.LONG, ColumnType.LONG, ColumnType.LONG, ColumnType.LONG)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .build()
         ),
@@ -299,7 +305,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                                 .build()
                 ))
                 .intervals(new MultipleIntervalSegmentSpec(ImmutableList.of(Intervals.ETERNITY)))
-                .columns(ImmutableList.of("EXPR$0", "EXPR$1", "EXPR$2"))
+                .columns("EXPR$0", "EXPR$1", "EXPR$2")
+                .columnTypes(ColumnType.LONG, ColumnType.LONG, ColumnType.LONG)
                 .build()
         ),
         ImmutableList.of(
@@ -322,7 +329,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "2", ColumnType.LONG))
-                .columns("dim1", "v0")
+                .columns("v0", "dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .limit(1)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -481,6 +489,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.DATASOURCE3)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7")
+                .columnTypes(ColumnType.LONG, ColumnType.LONG, ColumnType.LONG, ColumnType.LONG, ColumnType.LONG, ColumnType.LONG, ColumnType.LONG, ColumnType.DOUBLE)
                 .virtualColumns(
                     expressionVirtualColumn("v0", "bitwiseAnd(\"l1\",\"l2\")", ColumnType.LONG),
                     expressionVirtualColumn("v1", "bitwiseOr(\"l1\",\"l2\")", ColumnType.LONG),
@@ -520,6 +529,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                   )
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("v0", "v1", "v2", "v3", "v4")
+                  .columnTypes(ColumnType.LONG, ColumnType.DOUBLE, ColumnType.DOUBLE, ColumnType.DOUBLE, ColumnType.LONG)
                   .virtualColumns(
                       expressionVirtualColumn("v0", NullHandling.sqlCompatible() ? "null" : "0", ColumnType.LONG),
                       expressionVirtualColumn("v1", "4.0", ColumnType.DOUBLE),
@@ -577,6 +587,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.DATASOURCE3)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("v0", "v1", "v2", "v3")
+                .columnTypes(ColumnType.FLOAT, ColumnType.LONG, ColumnType.DOUBLE, ColumnType.FLOAT)
                 .virtualColumns(
                     expressionVirtualColumn("v0", "safe_divide(\"f1\",\"f2\")", ColumnType.FLOAT),
                     expressionVirtualColumn("v1", "safe_divide(\"l1\",\"l2\")", ColumnType.LONG),
@@ -634,7 +645,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                         equality("dim2", "a", ColumnType.STRING)
                     )
                 )
-                .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -866,6 +878,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim2")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -891,6 +904,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim2")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .build()
         ),
@@ -915,6 +929,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim2")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .build()
         ),
@@ -978,7 +993,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("CURRENT_DATE", "CURRENT_TIMESTAMP", "EXPR$1", "EXPR$2", "EXPR$3", "EXPR$4", "EXPR$6")
+                .columns("CURRENT_TIMESTAMP", "EXPR$1", "EXPR$2", "EXPR$3", "EXPR$4", "CURRENT_DATE", "EXPR$6")
+                .columnTypes(ColumnType.LONG, ColumnType.LONG, ColumnType.LONG, ColumnType.LONG, ColumnType.LONG, ColumnType.LONG, ColumnType.LONG)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(context)
                 .build()
@@ -1107,6 +1123,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 .dataSource(new LookupDataSource("lookyloo"))
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("k", "v")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),
@@ -1131,7 +1148,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
             newScanQueryBuilder()
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -1163,7 +1181,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
             newScanQueryBuilder()
                 .dataSource(CalciteTests.FORBIDDEN_DATASOURCE)
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "cnt", "dim1", "dim2", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -1213,6 +1232,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 )
                 .filters(equality("dim2", "a", ColumnType.STRING))
                 .columns("__time", "v0", "v1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -1245,6 +1265,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 .filters(equality("dim2", "a", ColumnType.STRING))
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("__time", "dim1", "dim2", "m1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.FLOAT)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -1269,6 +1290,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .filters(equality("dim2", "a", ColumnType.STRING))
                 .columns("__time", "dim1", "dim2", "m1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.FLOAT)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -1311,7 +1333,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
     skipVectorize();
 
     final String query = "EXPLAIN PLAN FOR SELECT * FROM druid.foo";
-    final String explanation = "[{\"query\":{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"resultFormat\":\"compactedList\",\"columns\":[\"__time\",\"cnt\",\"dim1\",\"dim2\",\"dim3\",\"m1\",\"m2\",\"unique_dim1\"],\"context\":{\"defaultTimeout\":300000,\"maxScatterGatherBytes\":9223372036854775807,\"sqlCurrentTimestamp\":\"2000-01-01T00:0 [...]
+    final String explanation = "[{\"query\":{\"queryType\":\"scan\",\"dataSource\":{\"type\":\"table\",\"name\":\"foo\"},\"intervals\":{\"type\":\"intervals\",\"intervals\":[\"-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z\"]},\"resultFormat\":\"compactedList\",\"columns\":[\"__time\",\"dim1\",\"dim2\",\"dim3\",\"cnt\",\"m1\",\"m2\",\"unique_dim1\"],\"context\":{\"defaultTimeout\":300000,\"maxScatterGatherBytes\":9223372036854775807,\"sqlCurrentTimestamp\":\"2000-01-01T00:0 [...]
     final String resources = "[{\"name\":\"foo\",\"type\":\"DATASOURCE\"}]";
     final String attributes = "{\"statementType\":\"SELECT\"}";
 
@@ -1342,7 +1364,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
             newScanQueryBuilder()
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .limit(2)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -1367,7 +1390,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
             newScanQueryBuilder()
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .offset(1)
                 .limit(2)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
@@ -1394,6 +1418,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                     expressionVirtualColumn("v0", "substring(\"dim2\", 0, 1)", ColumnType.STRING)
                 )
                 .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .limit(2)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -1424,6 +1449,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                     : equality("v0", 7.0, ColumnType.FLOAT)
                 )
                 .columns("dim1")
+                .columnTypes(ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -1446,7 +1472,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
             newScanQueryBuilder()
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns(ImmutableList.of("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1"))
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .limit(2)
                 .order(Order.DESCENDING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
@@ -1472,7 +1499,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
             newScanQueryBuilder()
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns(ImmutableList.of("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1"))
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .limit(Long.MAX_VALUE)
                 .order(Order.ASCENDING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
@@ -1501,6 +1529,7 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim2")
+                .columnTypes(ColumnType.STRING)
                 .limit(2)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -1522,7 +1551,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
             newScanQueryBuilder()
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns(ImmutableList.of("__time", "dim1"))
+                .columns("dim1", "__time")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                 .limit(2)
                 .order(Order.DESCENDING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
@@ -1548,7 +1578,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
             newScanQueryBuilder()
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns(ImmutableList.of("dim1"))
+                .columns("dim1")
+                .columnTypes(ColumnType.STRING)
                 .limit(2)
                 .order(Order.NONE)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
@@ -1572,7 +1603,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
             newScanQueryBuilder()
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns(ImmutableList.of("__time", "dim1"))
+                .columns("dim1", "__time")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                 .limit(2)
                 .order(Order.DESCENDING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
@@ -1596,7 +1628,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
             newScanQueryBuilder()
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns(ImmutableList.of("__time", "dim1"))
+                .columns("dim1", "__time")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                 .offset(1)
                 .limit(2)
                 .order(Order.DESCENDING)
@@ -1621,7 +1654,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
             newScanQueryBuilder()
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns(ImmutableList.of("__time", "dim1"))
+                .columns("dim1", "__time")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                 .offset(1)
                 .limit(1)
                 .order(Order.DESCENDING)
@@ -1645,7 +1679,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
             newScanQueryBuilder()
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns(ImmutableList.of("__time", "dim1"))
+                .columns("dim1", "__time")
+                .columnTypes(ColumnType.STRING, ColumnType.LONG)
                 .offset(1)
                 .limit(2)
                 .order(Order.DESCENDING)
@@ -1682,22 +1717,21 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.DATASOURCE5)
                 .intervals(querySegmentSpec(Intervals.of("1990-01-01T00:00:00.000Z/146140482-04-24T15:36:27.903Z")))
                 .columns(
-                    ImmutableList.<String>builder()
-                        .add("__time")
-                        .add("count")
-                        .add("dimHyperUnique")
-                        .add("dimMultivalEnumerated")
-                        .add("dimMultivalEnumerated2")
-                        .add("dimMultivalSequentialWithNulls")
-                        .add("dimSequential")
-                        .add("dimSequentialHalfNull")
-                        .add("dimUniform")
-                        .add("dimZipf")
-                        .add("metFloatNormal")
-                        .add("metFloatZipf")
-                        .add("metLongSequential")
-                        .build()
+                    "__time",
+                    "count",
+                    "dimHyperUnique",
+                    "dimMultivalEnumerated",
+                    "dimMultivalEnumerated2",
+                    "dimMultivalSequentialWithNulls",
+                    "dimSequential",
+                    "dimSequentialHalfNull",
+                    "dimUniform",
+                    "dimZipf",
+                    "metFloatNormal",
+                    "metFloatZipf",
+                    "metLongSequential"
                 )
+                .columnTypes(ColumnType.LONG, ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .limit(2)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(OUTER_LIMIT_CONTEXT)
@@ -1749,23 +1783,22 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.DATASOURCE5)
                 .intervals(querySegmentSpec(Intervals.of("1990-01-01T00:00:00.000Z/146140482-04-24T15:36:27.903Z")))
                 .columns(
-                    ImmutableList.<String>builder()
-                        .add("__time")
-                        .add("count")
-                        .add("dimHyperUnique")
-                        .add("dimMultivalEnumerated")
-                        .add("dimMultivalEnumerated2")
-                        .add("dimMultivalSequentialWithNulls")
-                        .add("dimSequential")
-                        .add("dimSequentialHalfNull")
-                        .add("dimUniform")
-                        .add("dimZipf")
-                        .add("metFloatNormal")
-                        .add("metFloatZipf")
-                        .add("metLongSequential")
-                        .add("metLongUniform")
-                        .build()
+                    "__time",
+                    "count",
+                    "dimHyperUnique",
+                    "dimMultivalEnumerated",
+                    "dimMultivalEnumerated2",
+                    "dimMultivalSequentialWithNulls",
+                    "dimSequential",
+                    "dimSequentialHalfNull",
+                    "dimUniform",
+                    "dimZipf",
+                    "metFloatNormal",
+                    "metFloatZipf",
+                    "metLongSequential",
+                    "metLongUniform"
                 )
+                .columnTypes(ColumnType.LONG, ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .limit(2)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(OUTER_LIMIT_CONTEXT)
@@ -1818,7 +1851,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "concat('beep ',\"dim1\")", ColumnType.STRING))
-                .columns(ImmutableList.of("__time", "v0"))
+                .columns("v0", "__time")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                 .limit(2)
                 .order(Order.DESCENDING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
@@ -1847,7 +1881,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "concat('beep ',\"dim1\")", ColumnType.STRING))
-                .columns(ImmutableList.of("v0"))
+                .columns("v0")
+                .columnTypes(ColumnType.STRING)
                 .order(Order.NONE)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
@@ -1874,7 +1909,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                 .dataSource(CalciteTests.DATASOURCE1)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "concat('beep ',\"dim1\")", ColumnType.STRING))
-                .columns(ImmutableList.of("__time", "v0"))
+                .columns("v0", "__time")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                 .limit(2)
                 .order(Order.DESCENDING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
@@ -1902,7 +1938,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                         newScanQueryBuilder()
                             .dataSource(CalciteTests.DATASOURCE1)
                             .intervals(querySegmentSpec(Filtration.eternity()))
-                            .columns(ImmutableList.of("__time", "dim1"))
+                            .columns("__time", "dim1")
+                            .columnTypes(ColumnType.LONG, ColumnType.STRING)
                             .limit(4)
                             .order(Order.DESCENDING)
                             .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
@@ -1911,7 +1948,8 @@ public class CalciteSelectQueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns(ImmutableList.of("dim1"))
+                .columns("dim1")
+                .columnTypes(ColumnType.STRING)
                 .filters(in("dim1", Arrays.asList("abc", "def")))
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteStrictInsertTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteStrictInsertTest.java
index b47dc70ddc6..8b088f5dd59 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteStrictInsertTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteStrictInsertTest.java
@@ -20,6 +20,7 @@
 package org.apache.druid.sql.calcite;
 
 import org.apache.druid.error.DruidException;
+import org.apache.druid.segment.column.ColumnType;
 import org.apache.druid.sql.calcite.CalciteStrictInsertTest.StrictInsertComponentSupplier;
 import org.apache.druid.sql.calcite.filtration.Filtration;
 import org.apache.druid.sql.calcite.planner.CatalogResolver;
@@ -74,7 +75,8 @@ public class CalciteStrictInsertTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource("foo")
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1")
+                .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                 .context(PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSubqueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSubqueryTest.java
index b8d638e59ca..8117e6ff02b 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSubqueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteSubqueryTest.java
@@ -201,6 +201,7 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                                     .dataSource("dsMissingCol")
                                     .intervals(querySegmentSpec(Filtration.eternity()))
                                     .columns("__time", "col1", "col2", "col3")
+                                    .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                                     .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                     .limit(10)
                                     .build()
@@ -371,6 +372,7 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("a0", "j0.a0")
+                .columnTypes(ColumnType.LONG, ColumnType.LONG)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -400,6 +402,7 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                                   newScanQueryBuilder().dataSource(CalciteTests.DATASOURCE3)
                                                        .intervals(querySegmentSpec(Filtration.eternity()))
                                                        .columns("dim2")
+                                                       .columnTypes(ColumnType.STRING)
                                                        .context(queryContextModified)
                                                        .build()
                               ),
@@ -412,6 +415,7 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                               newScanQueryBuilder().dataSource(CalciteTests.DATASOURCE1)
                                                    .intervals(querySegmentSpec(Filtration.eternity()))
                                                    .columns("dim2")
+                                                   .columnTypes(ColumnType.STRING)
                                                    .context(queryContextModified)
                                                    .build()
                           ),
@@ -535,6 +539,7 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim1", "dim2")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),
@@ -604,6 +609,7 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "'abc'", ColumnType.STRING))
                 .columns("__time", "cnt", "dim1", "v0")
+                .columnTypes(ColumnType.LONG, ColumnType.LONG, ColumnType.STRING, ColumnType.STRING)
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
@@ -737,6 +743,7 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                   )
                   .intervals(querySegmentSpec(Filtration.eternity()))
                   .columns("a0", "j0.a0")
+                  .columnTypes(ColumnType.LONG, ColumnType.LONG)
                   .limit(10)
                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                   .context(QUERY_CONTEXT_DEFAULT)
@@ -881,6 +888,7 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                                         .dataSource(CalciteTests.DATASOURCE1)
                                         .intervals(querySegmentSpec(Intervals.ETERNITY))
                                         .columns("__time", "dim1")
+                                        .columnTypes(ColumnType.LONG, ColumnType.STRING)
                                         .limit(2)
                                         .build()
                                 ),
@@ -892,6 +900,7 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                                                             .dataSource(CalciteTests.DATASOURCE1)
                                                             .intervals(querySegmentSpec(Intervals.ETERNITY))
                                                             .columns("dim1")
+                                                            .columnTypes(ColumnType.STRING)
                                                             .limit(2)
                                                             .build()
                                                     )
@@ -960,6 +969,7 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                                              .intervals(querySegmentSpec(Filtration.eternity()))
                                              .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                              .columns("__time")
+                                             .columnTypes(ColumnType.LONG)
                                              .context(queryContext)
                                              .build()),
                                    "j0.",
@@ -996,6 +1006,7 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                                 .intervals(querySegmentSpec(Filtration.eternity()))
                                 .virtualColumns(expressionVirtualColumn("v0", "0", ColumnType.LONG))
                                 .columns("v0")
+                                .columnTypes(ColumnType.LONG)
                                 .limit(10)
                                 .context(queryContext)
                                 .build()
@@ -1030,18 +1041,8 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                               newScanQueryBuilder()
                                   .dataSource(CalciteTests.DATASOURCE1)
                                   .intervals(querySegmentSpec(Filtration.eternity()))
-                                  .columns(
-                                      ImmutableList.of(
-                                          "__time",
-                                          "cnt",
-                                          "dim1",
-                                          "dim2",
-                                          "dim3",
-                                          "m1",
-                                          "m2",
-                                          "unique_dim1"
-                                      )
-                                  )
+                                  .columns("__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1")
+                                  .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.LONG, ColumnType.FLOAT, ColumnType.DOUBLE, ColumnType.ofComplex("hyperUnique"))
                                   .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                                   .context(queryContext)
                                   .build()
@@ -1098,6 +1099,7 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                                 newScanQueryBuilder()
                                     .dataSource("foo2")
                                     .columns("dim1")
+                                    .columnTypes(ColumnType.STRING)
                                     .eternityInterval()
                                     .build()
                             ),
@@ -1117,6 +1119,7 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                                             newScanQueryBuilder()
                                                 .dataSource("foo2")
                                                 .columns("dim1", "dim2")
+                                                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                                                 .eternityInterval()
                                                 .build()
                                         ),
@@ -1129,6 +1132,7 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                                     )
                                 )
                                 .columns("dim1", "j0.dim2")
+                                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                                 .eternityInterval()
                                 .build()
                         ),
@@ -1140,7 +1144,8 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                         CalciteTests.createJoinableFactoryWrapper()
                     )
                 )
-                .columns("_j0.j0.dim2", "dim1")
+                .columns("dim1", "_j0.j0.dim2")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                 .eternityInterval()
                 .build()
         ),
@@ -1313,7 +1318,8 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                                 .offset(6L)
                                 .limit(1L)
                                 .order(Order.DESCENDING)
-                                .columns("__time", "channel")
+                                .columns("channel", "__time")
+                                .columnTypes(ColumnType.STRING, ColumnType.STRING)
                                 .context(QUERY_CONTEXT_DEFAULT)
                                 .build()
                         ),
@@ -1454,6 +1460,7 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                                 .dataSource("foo")
                                 .intervals(querySegmentSpec(Intervals.ETERNITY))
                                 .columns("dim1")
+                                .columnTypes(ColumnType.STRING)
                                 .build()
                         ),
                         "j0.",
@@ -1465,7 +1472,8 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .intervals(querySegmentSpec(Intervals.ETERNITY))
-                .columns("a0", "d0", "d1", "j0.dim1")
+                .columns("d0", "d1", "a0", "j0.dim1")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),
@@ -1529,6 +1537,7 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                                 .dataSource("foo")
                                 .intervals(querySegmentSpec(Intervals.ETERNITY))
                                 .columns("dim1")
+                                .columnTypes(ColumnType.STRING)
                                 .build()
                         ),
                         "j0.",
@@ -1540,7 +1549,8 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .intervals(querySegmentSpec(Intervals.ETERNITY))
-                .columns("a0", "d0", "j0.dim1")
+                .columns("d0", "a0", "j0.dim1")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.STRING)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),
@@ -1582,6 +1592,7 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                                 .dataSource("foo")
                                 .intervals(querySegmentSpec(Intervals.ETERNITY))
                                 .columns("__time")
+                                .columnTypes(ColumnType.LONG)
                                 .build()
                         ),
                         "j0.",
@@ -1593,7 +1604,8 @@ public class CalciteSubqueryTest extends BaseCalciteQueryTest
                     )
                 )
                 .intervals(querySegmentSpec(Intervals.ETERNITY))
-                .columns("a0", "d0", "j0.__time")
+                .columns("d0", "a0", "j0.__time")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING, ColumnType.LONG)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteTableAppendTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteTableAppendTest.java
index 02b8787df23..33478e2630b 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteTableAppendTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteTableAppendTest.java
@@ -44,6 +44,7 @@ public class CalciteTableAppendTest extends BaseCalciteQueryTest
                     .dataSource(CalciteTests.DATASOURCE1)
                     .intervals(querySegmentSpec(Filtration.eternity()))
                     .columns("dim1", "v0")
+                    .columnTypes(ColumnType.STRING, ColumnType.STRING)
                     .context(QUERY_CONTEXT_DEFAULT)
                     .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                     .virtualColumns(
@@ -54,6 +55,7 @@ public class CalciteTableAppendTest extends BaseCalciteQueryTest
                     .dataSource(CalciteTests.DATASOURCE3)
                     .intervals(querySegmentSpec(Filtration.eternity()))
                     .columns("dim1", "dim4")
+                    .columnTypes(ColumnType.STRING, ColumnType.STRING)
                     .context(QUERY_CONTEXT_DEFAULT)
                     .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                     .build()
@@ -89,7 +91,8 @@ public class CalciteTableAppendTest extends BaseCalciteQueryTest
                     unionDataSource(CalciteTests.DATASOURCE1, CalciteTests.DATASOURCE3)
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("d1", "dim1", "dim4", "f1")
+                .columns("dim1", "dim4", "d1", "f1")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.DOUBLE, ColumnType.FLOAT)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .build()
@@ -130,7 +133,8 @@ public class CalciteTableAppendTest extends BaseCalciteQueryTest
                     unionDataSource(CalciteTests.DATASOURCE1, CalciteTests.DATASOURCE3, CalciteTests.DATASOURCE1)
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("d1", "dim1", "dim4", "f1")
+                .columns("dim1", "dim4", "d1", "f1")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.DOUBLE, ColumnType.FLOAT)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .filters(equality("dim1", "2", ColumnType.STRING))
@@ -159,6 +163,7 @@ public class CalciteTableAppendTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim1")
+                .columnTypes(ColumnType.STRING)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .build()
@@ -189,6 +194,7 @@ public class CalciteTableAppendTest extends BaseCalciteQueryTest
                 )
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("dim3")
+                .columnTypes(ColumnType.STRING)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .resultFormat(ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .build()
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteTimeBoundaryQueryTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteTimeBoundaryQueryTest.java
index 75b786d1f18..e555ab65a96 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/CalciteTimeBoundaryQueryTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/CalciteTimeBoundaryQueryTest.java
@@ -220,6 +220,7 @@ public class CalciteTimeBoundaryQueryTest extends BaseCalciteQueryTest
                                       .dataSource(CalciteTests.DATASOURCE1)
                                       .intervals(querySegmentSpec(Filtration.eternity()))
                                       .columns("cnt")
+                                      .columnTypes(ColumnType.LONG)
                                       .context(context)
                                       .build()
                               ),
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/IngestTableFunctionTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/IngestTableFunctionTest.java
index c5caa3258ce..34189e28df1 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/IngestTableFunctionTest.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/IngestTableFunctionTest.java
@@ -144,6 +144,7 @@ public class IngestTableFunctionTest extends CalciteIngestionDmlTest
                 .dataSource(httpDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
          )
@@ -173,6 +174,7 @@ public class IngestTableFunctionTest extends CalciteIngestionDmlTest
                 .dataSource(httpDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -203,6 +205,7 @@ public class IngestTableFunctionTest extends CalciteIngestionDmlTest
                 .dataSource(httpDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
         )
@@ -245,6 +248,7 @@ public class IngestTableFunctionTest extends CalciteIngestionDmlTest
                 .dataSource(httpDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
          )
@@ -275,6 +279,7 @@ public class IngestTableFunctionTest extends CalciteIngestionDmlTest
                 .dataSource(httpDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
          )
@@ -326,7 +331,8 @@ public class IngestTableFunctionTest extends CalciteIngestionDmlTest
                 .dataSource(httpDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .virtualColumns(expressionVirtualColumn("v0", "timestamp_parse(\"timestamp\",null,'UTC')", ColumnType.LONG))
-                .columns("isRobot", "v0")
+                .columns("v0", "isRobot")
+                .columnTypes(ColumnType.LONG, ColumnType.STRING)
                 .build()
          )
         .verify();
@@ -408,6 +414,7 @@ public class IngestTableFunctionTest extends CalciteIngestionDmlTest
                 .dataSource(httpDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
          )
@@ -453,7 +460,8 @@ public class IngestTableFunctionTest extends CalciteIngestionDmlTest
             newScanQueryBuilder()
                 .dataSource(httpDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
-                .columns("a", "b", "c", "d", "x", "y", "z")
+                .columns("x", "y", "z", "a", "b", "c", "d")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.ofComplex("json"), ColumnType.ofArray(ColumnType.STRING), ColumnType.ofArray(ColumnType.LONG), ColumnType.ofArray(ColumnType.FLOAT), ColumnType.ofArray(ColumnType.DOUBLE))
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
          )
@@ -476,6 +484,7 @@ public class IngestTableFunctionTest extends CalciteIngestionDmlTest
                 .dataSource(externalDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
          )
@@ -544,6 +553,7 @@ public class IngestTableFunctionTest extends CalciteIngestionDmlTest
                 .dataSource(externalDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
          )
@@ -572,6 +582,7 @@ public class IngestTableFunctionTest extends CalciteIngestionDmlTest
                 .dataSource(externalDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
          )
@@ -595,6 +606,7 @@ public class IngestTableFunctionTest extends CalciteIngestionDmlTest
                 .dataSource(localDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
          )
@@ -623,6 +635,7 @@ public class IngestTableFunctionTest extends CalciteIngestionDmlTest
                 .dataSource(localDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
          )
@@ -651,6 +664,7 @@ public class IngestTableFunctionTest extends CalciteIngestionDmlTest
                 .dataSource(localDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
          )
@@ -681,6 +695,7 @@ public class IngestTableFunctionTest extends CalciteIngestionDmlTest
                 .dataSource(localDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
          )
@@ -711,6 +726,7 @@ public class IngestTableFunctionTest extends CalciteIngestionDmlTest
                 .dataSource(localDataSource)
                 .intervals(querySegmentSpec(Filtration.eternity()))
                 .columns("x", "y", "z")
+                .columnTypes(ColumnType.STRING, ColumnType.STRING, ColumnType.LONG)
                 .context(CalciteIngestionDmlTest.PARTITIONED_BY_ALL_TIME_QUERY_CONTEXT)
                 .build()
          )
diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/QueryTestRunner.java b/sql/src/test/java/org/apache/druid/sql/calcite/QueryTestRunner.java
index 1d1593e96ed..27071dcf7b2 100644
--- a/sql/src/test/java/org/apache/druid/sql/calcite/QueryTestRunner.java
+++ b/sql/src/test/java/org/apache/druid/sql/calcite/QueryTestRunner.java
@@ -443,19 +443,21 @@ public class QueryTestRunner
           recordedQueries.size()
       );
       for (int i = 0; i < expectedQueries.size(); i++) {
+        Query<?> expectedQuery = expectedQueries.get(i);
+        Query<?> actualQuery = recordedQueries.get(i);
         Assert.assertEquals(
             StringUtils.format("query #%d: %s", i + 1, builder.sql),
-            expectedQueries.get(i),
-            recordedQueries.get(i)
+            expectedQuery,
+            actualQuery
         );
 
         try {
           // go through some JSON serde and back, round tripping both queries and comparing them to each other, because
           // Assert.assertEquals(recordedQueries.get(i), stringAndBack) is a failure due to a sorted map being present
           // in the recorded queries, but it is a regular map after deserialization
-          final String recordedString = queryJsonMapper.writeValueAsString(recordedQueries.get(i));
+          final String recordedString = queryJsonMapper.writeValueAsString(actualQuery);
           final Query<?> stringAndBack = queryJsonMapper.readValue(recordedString, Query.class);
-          final String expectedString = queryJsonMapper.writeValueAsString(expectedQueries.get(i));
+          final String expectedString = queryJsonMapper.writeValueAsString(expectedQuery);
           final Query<?> expectedStringAndBack = queryJsonMapper.readValue(expectedString, Query.class);
           Assert.assertEquals(expectedStringAndBack, stringAndBack);
         }
diff --git a/sql/src/test/quidem/org.apache.druid.quidem.SqlQuidemTest/join.iq b/sql/src/test/quidem/org.apache.druid.quidem.SqlQuidemTest/join.iq
index 05f67289ab5..e8318d5ec1d 100644
--- a/sql/src/test/quidem/org.apache.druid.quidem.SqlQuidemTest/join.iq
+++ b/sql/src/test/quidem/org.apache.druid.quidem.SqlQuidemTest/join.iq
@@ -100,8 +100,8 @@ select v.*,e.* from v inner join e on (e.cityName = v.cityName);
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "a0", "d0", "j0.a0", "j0.d0" ],
-  "columnTypes" : [ "LONG", "STRING", "LONG", "STRING" ],
+  "columns" : [ "d0", "a0", "j0.d0", "j0.a0" ],
+  "columnTypes" : [ "STRING", "LONG", "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFilters@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFilters@NullHandling=default.iq
index 64963f6fc24..bc69ff5d369 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFilters@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFilters@NullHandling=default.iq
@@ -61,8 +61,8 @@ DruidProject(d3=[$18], druid=[logical])
           "dimension" : "dim2",
           "value" : "a"
         },
-        "columns" : [ "__time", "cnt", "d1", "d2", "dim1", "dim3", "dim4", "dim5", "dim6", "f1", "f2", "l1", "l2", "m1", "m2", "unique_dim1", "v0" ],
-        "columnTypes" : [ "LONG", "LONG", "DOUBLE", "DOUBLE", "STRING", "STRING", "STRING", "STRING", "STRING", "FLOAT", "FLOAT", "LONG", "LONG", "FLOAT", "DOUBLE", "COMPLEX<hyperUnique>", "STRING" ],
+        "columns" : [ "__time", "dim1", "v0", "dim3", "dim4", "dim5", "dim6", "d1", "d2", "f1", "f2", "l1", "l2", "cnt", "m1", "m2", "unique_dim1" ],
+        "columnTypes" : [ "LONG", "STRING", "STRING", "STRING", "STRING", "STRING", "STRING", "DOUBLE", "DOUBLE", "FLOAT", "FLOAT", "LONG", "LONG", "LONG", "FLOAT", "DOUBLE", "COMPLEX<hyperUnique>" ],
         "granularity" : {
           "type" : "all"
         },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFilters@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFilters@NullHandling=sql.iq
index f032fc5c14d..75bbd7ac254 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFilters@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFilters@NullHandling=sql.iq
@@ -63,8 +63,8 @@ DruidProject(d3=[$18], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "a"
         },
-        "columns" : [ "__time", "cnt", "d1", "d2", "dim1", "dim3", "dim4", "dim5", "dim6", "f1", "f2", "l1", "l2", "m1", "m2", "unique_dim1", "v0" ],
-        "columnTypes" : [ "LONG", "LONG", "DOUBLE", "DOUBLE", "STRING", "STRING", "STRING", "STRING", "STRING", "FLOAT", "FLOAT", "LONG", "LONG", "FLOAT", "DOUBLE", "COMPLEX<hyperUnique>", "STRING" ],
+        "columns" : [ "__time", "dim1", "v0", "dim3", "dim4", "dim5", "dim6", "d1", "d2", "f1", "f2", "l1", "l2", "cnt", "m1", "m2", "unique_dim1" ],
+        "columnTypes" : [ "LONG", "STRING", "STRING", "STRING", "STRING", "STRING", "STRING", "DOUBLE", "DOUBLE", "FLOAT", "FLOAT", "LONG", "LONG", "LONG", "FLOAT", "DOUBLE", "COMPLEX<hyperUnique>" ],
         "granularity" : {
           "type" : "all"
         },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersInnerLimit@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersInnerLimit@NullHandling=default.iq
index 0d98641f389..cedfdd6fc78 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersInnerLimit@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersInnerLimit@NullHandling=default.iq
@@ -64,8 +64,8 @@ DruidProject(d3=[$3], druid=[logical])
           "dimension" : "dim2",
           "value" : "a"
         },
-        "columns" : [ "__time", "dim3", "v0" ],
-        "columnTypes" : [ "LONG", "STRING", "STRING" ],
+        "columns" : [ "v0", "dim3", "__time" ],
+        "columnTypes" : [ "STRING", "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersInnerLimit@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersInnerLimit@NullHandling=sql.iq
index 878106d9ac9..8c9c334e27f 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersInnerLimit@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersInnerLimit@NullHandling=sql.iq
@@ -66,8 +66,8 @@ DruidProject(d3=[$3], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "a"
         },
-        "columns" : [ "__time", "dim3", "v0" ],
-        "columnTypes" : [ "LONG", "STRING", "STRING" ],
+        "columns" : [ "v0", "dim3", "__time" ],
+        "columnTypes" : [ "STRING", "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersInsideAndOutside@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersInsideAndOutside@NullHandling=default.iq
index ca22c18ff45..9c9ec871547 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersInsideAndOutside@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersInsideAndOutside@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(d3=[$18], druid=[logical])
             }
           } ]
         },
-        "columns" : [ "__time", "cnt", "d1", "d2", "dim1", "dim3", "dim4", "dim5", "dim6", "f1", "f2", "l1", "l2", "m1", "m2", "unique_dim1", "v0" ],
-        "columnTypes" : [ "LONG", "LONG", "DOUBLE", "DOUBLE", "STRING", "STRING", "STRING", "STRING", "STRING", "FLOAT", "FLOAT", "LONG", "LONG", "FLOAT", "DOUBLE", "COMPLEX<hyperUnique>", "STRING" ],
+        "columns" : [ "__time", "dim1", "v0", "dim3", "dim4", "dim5", "dim6", "d1", "d2", "f1", "f2", "l1", "l2", "cnt", "m1", "m2", "unique_dim1" ],
+        "columnTypes" : [ "LONG", "STRING", "STRING", "STRING", "STRING", "STRING", "STRING", "DOUBLE", "DOUBLE", "FLOAT", "FLOAT", "LONG", "LONG", "LONG", "FLOAT", "DOUBLE", "COMPLEX<hyperUnique>" ],
         "granularity" : {
           "type" : "all"
         },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersInsideAndOutside@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersInsideAndOutside@NullHandling=sql.iq
index 45c21b71c3f..13c8044dad7 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersInsideAndOutside@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersInsideAndOutside@NullHandling=sql.iq
@@ -77,8 +77,8 @@ DruidProject(d3=[$18], druid=[logical])
             }
           } ]
         },
-        "columns" : [ "__time", "cnt", "d1", "d2", "dim1", "dim3", "dim4", "dim5", "dim6", "f1", "f2", "l1", "l2", "m1", "m2", "unique_dim1", "v0" ],
-        "columnTypes" : [ "LONG", "LONG", "DOUBLE", "DOUBLE", "STRING", "STRING", "STRING", "STRING", "STRING", "FLOAT", "FLOAT", "LONG", "LONG", "FLOAT", "DOUBLE", "COMPLEX<hyperUnique>", "STRING" ],
+        "columns" : [ "__time", "dim1", "v0", "dim3", "dim4", "dim5", "dim6", "d1", "d2", "f1", "f2", "l1", "l2", "cnt", "m1", "m2", "unique_dim1" ],
+        "columnTypes" : [ "LONG", "STRING", "STRING", "STRING", "STRING", "STRING", "STRING", "DOUBLE", "DOUBLE", "FLOAT", "FLOAT", "LONG", "LONG", "LONG", "FLOAT", "DOUBLE", "COMPLEX<hyperUnique>" ],
         "granularity" : {
           "type" : "all"
         },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersWithExpressionInInnerQuery@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersWithExpressionInInnerQuery@NullHandling=default.iq
index 6ca74e44339..05790207aa9 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersWithExpressionInInnerQuery@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersWithExpressionInInnerQuery@NullHandling=default.iq
@@ -61,7 +61,7 @@ DruidProject(t=[$0], d3=[$3], druid=[logical])
           "dimension" : "dim2",
           "value" : "a"
         },
-        "columns" : [ "__time", "dim3", "v0" ],
+        "columns" : [ "v0", "dim3", "__time" ],
         "columnTypes" : [ "LONG", "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
@@ -82,8 +82,8 @@ DruidProject(t=[$0], d3=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.unnest", "v0" ],
-  "columnTypes" : [ "STRING", "LONG" ],
+  "columns" : [ "v0", "j0.unnest" ],
+  "columnTypes" : [ "LONG", "STRING" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersWithExpressionInInnerQuery@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersWithExpressionInInnerQuery@NullHandling=sql.iq
index 1f523a13de1..dd3771f4b3b 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersWithExpressionInInnerQuery@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithFiltersWithExpressionInInnerQuery@NullHandling=sql.iq
@@ -63,7 +63,7 @@ DruidProject(t=[$0], d3=[$3], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "a"
         },
-        "columns" : [ "__time", "dim3", "v0" ],
+        "columns" : [ "v0", "dim3", "__time" ],
         "columnTypes" : [ "LONG", "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
@@ -84,8 +84,8 @@ DruidProject(t=[$0], d3=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.unnest", "v0" ],
-  "columnTypes" : [ "STRING", "LONG" ],
+  "columns" : [ "v0", "j0.unnest" ],
+  "columnTypes" : [ "LONG", "STRING" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithInFiltersWithExpressionInInnerQuery@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithInFiltersWithExpressionInInnerQuery@NullHandling=default.iq
index 6c203130987..9b9802c0645 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithInFiltersWithExpressionInInnerQuery@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithInFiltersWithExpressionInInnerQuery@NullHandling=default.iq
@@ -61,7 +61,7 @@ DruidProject(t=[$0], d3=[$3], druid=[logical])
           "dimension" : "dim2",
           "values" : [ "a", "b" ]
         },
-        "columns" : [ "__time", "dim3", "v0" ],
+        "columns" : [ "v0", "dim3", "__time" ],
         "columnTypes" : [ "LONG", "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
@@ -82,8 +82,8 @@ DruidProject(t=[$0], d3=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.unnest", "v0" ],
-  "columnTypes" : [ "STRING", "LONG" ],
+  "columns" : [ "v0", "j0.unnest" ],
+  "columnTypes" : [ "LONG", "STRING" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithInFiltersWithExpressionInInnerQuery@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithInFiltersWithExpressionInInnerQuery@NullHandling=sql.iq
index 35e883c0784..494dc9dc9d2 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithInFiltersWithExpressionInInnerQuery@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteArraysQueryTest/testUnnestWithInFiltersWithExpressionInInnerQuery@NullHandling=sql.iq
@@ -63,7 +63,7 @@ DruidProject(t=[$0], d3=[$3], druid=[logical])
           "matchValueType" : "STRING",
           "sortedValues" : [ "a", "b" ]
         },
-        "columns" : [ "__time", "dim3", "v0" ],
+        "columns" : [ "v0", "dim3", "__time" ],
         "columnTypes" : [ "LONG", "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
@@ -84,8 +84,8 @@ DruidProject(t=[$0], d3=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.unnest", "v0" ],
-  "columnTypes" : [ "STRING", "LONG" ],
+  "columns" : [ "v0", "j0.unnest" ],
+  "columnTypes" : [ "LONG", "STRING" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@all_disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@all_disabled@NullHandling=default.iq
index 794195713ed..699b9c23052 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@all_disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@all_disabled@NullHandling=default.iq
@@ -81,8 +81,8 @@ DruidAggregate(group=[{0}], druid=[logical])
               "dimension" : "dim1",
               "value" : "10.1"
             },
-            "columns" : [ "__time", "v0" ],
-            "columnTypes" : [ "LONG", "STRING" ],
+            "columns" : [ "v0", "__time" ],
+            "columnTypes" : [ "STRING", "LONG" ],
             "granularity" : {
               "type" : "all"
             },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@all_disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@all_disabled@NullHandling=sql.iq
index 188abdd4e4c..52087ed6276 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@all_disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@all_disabled@NullHandling=sql.iq
@@ -82,8 +82,8 @@ DruidAggregate(group=[{0}], druid=[logical])
               "matchValueType" : "STRING",
               "matchValue" : "10.1"
             },
-            "columns" : [ "__time", "v0" ],
-            "columnTypes" : [ "LONG", "STRING" ],
+            "columns" : [ "v0", "__time" ],
+            "columnTypes" : [ "STRING", "LONG" ],
             "granularity" : {
               "type" : "all"
             },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@all_enabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@all_enabled@NullHandling=default.iq
index 37a87f4a74c..559eadb3632 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@all_enabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@all_enabled@NullHandling=default.iq
@@ -81,8 +81,8 @@ DruidAggregate(group=[{0}], druid=[logical])
               "dimension" : "dim1",
               "value" : "10.1"
             },
-            "columns" : [ "__time", "v0" ],
-            "columnTypes" : [ "LONG", "STRING" ],
+            "columns" : [ "v0", "__time" ],
+            "columnTypes" : [ "STRING", "LONG" ],
             "granularity" : {
               "type" : "all"
             },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@all_enabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@all_enabled@NullHandling=sql.iq
index b1bca799e36..33556cd485f 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@all_enabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@all_enabled@NullHandling=sql.iq
@@ -82,8 +82,8 @@ DruidAggregate(group=[{0}], druid=[logical])
               "matchValueType" : "STRING",
               "matchValue" : "10.1"
             },
-            "columns" : [ "__time", "v0" ],
-            "columnTypes" : [ "LONG", "STRING" ],
+            "columns" : [ "v0", "__time" ],
+            "columnTypes" : [ "STRING", "LONG" ],
             "granularity" : {
               "type" : "all"
             },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@default@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@default@NullHandling=default.iq
index dbc1d7eaf96..b6c55a471df 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@default@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@default@NullHandling=default.iq
@@ -78,8 +78,8 @@ DruidAggregate(group=[{0}], druid=[logical])
               "dimension" : "dim1",
               "value" : "10.1"
             },
-            "columns" : [ "__time", "v0" ],
-            "columnTypes" : [ "LONG", "STRING" ],
+            "columns" : [ "v0", "__time" ],
+            "columnTypes" : [ "STRING", "LONG" ],
             "granularity" : {
               "type" : "all"
             },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@default@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@default@NullHandling=sql.iq
index 0f5d1b8fe12..09785d5c178 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@default@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@default@NullHandling=sql.iq
@@ -79,8 +79,8 @@ DruidAggregate(group=[{0}], druid=[logical])
               "matchValueType" : "STRING",
               "matchValue" : "10.1"
             },
-            "columns" : [ "__time", "v0" ],
-            "columnTypes" : [ "LONG", "STRING" ],
+            "columns" : [ "v0", "__time" ],
+            "columnTypes" : [ "STRING", "LONG" ],
             "granularity" : {
               "type" : "all"
             },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-on-value-column_disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-on-value-column_disabled@NullHandling=default.iq
index fe58d1e4ebe..fd3f5b44f81 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-on-value-column_disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-on-value-column_disabled@NullHandling=default.iq
@@ -81,8 +81,8 @@ DruidAggregate(group=[{0}], druid=[logical])
               "dimension" : "dim1",
               "value" : "10.1"
             },
-            "columns" : [ "__time", "v0" ],
-            "columnTypes" : [ "LONG", "STRING" ],
+            "columns" : [ "v0", "__time" ],
+            "columnTypes" : [ "STRING", "LONG" ],
             "granularity" : {
               "type" : "all"
             },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-on-value-column_disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-on-value-column_disabled@NullHandling=sql.iq
index 5fe30d6b657..8ce84d69e39 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-on-value-column_disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-on-value-column_disabled@NullHandling=sql.iq
@@ -82,8 +82,8 @@ DruidAggregate(group=[{0}], druid=[logical])
               "matchValueType" : "STRING",
               "matchValue" : "10.1"
             },
-            "columns" : [ "__time", "v0" ],
-            "columnTypes" : [ "LONG", "STRING" ],
+            "columns" : [ "v0", "__time" ],
+            "columnTypes" : [ "STRING", "LONG" ],
             "granularity" : {
               "type" : "all"
             },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-rewrites-disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-rewrites-disabled@NullHandling=default.iq
index 57accf2fbc3..05bc33e2070 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-rewrites-disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-rewrites-disabled@NullHandling=default.iq
@@ -81,8 +81,8 @@ DruidAggregate(group=[{0}], druid=[logical])
               "dimension" : "dim1",
               "value" : "10.1"
             },
-            "columns" : [ "__time", "v0" ],
-            "columnTypes" : [ "LONG", "STRING" ],
+            "columns" : [ "v0", "__time" ],
+            "columnTypes" : [ "STRING", "LONG" ],
             "granularity" : {
               "type" : "all"
             },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-rewrites-disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-rewrites-disabled@NullHandling=sql.iq
index 4883e3b9894..82d7dcdee5c 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-rewrites-disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-rewrites-disabled@NullHandling=sql.iq
@@ -82,8 +82,8 @@ DruidAggregate(group=[{0}], druid=[logical])
               "matchValueType" : "STRING",
               "matchValue" : "10.1"
             },
-            "columns" : [ "__time", "v0" ],
-            "columnTypes" : [ "LONG", "STRING" ],
+            "columns" : [ "v0", "__time" ],
+            "columnTypes" : [ "STRING", "LONG" ],
             "granularity" : {
               "type" : "all"
             },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-rewrites@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-rewrites@NullHandling=default.iq
index 072fac7ae75..f554299bc8b 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-rewrites@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-rewrites@NullHandling=default.iq
@@ -81,8 +81,8 @@ DruidAggregate(group=[{0}], druid=[logical])
               "dimension" : "dim1",
               "value" : "10.1"
             },
-            "columns" : [ "__time", "v0" ],
-            "columnTypes" : [ "LONG", "STRING" ],
+            "columns" : [ "v0", "__time" ],
+            "columnTypes" : [ "STRING", "LONG" ],
             "granularity" : {
               "type" : "all"
             },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-rewrites@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-rewrites@NullHandling=sql.iq
index f874137e09f..eb38a3c33f0 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-rewrites@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@filter-rewrites@NullHandling=sql.iq
@@ -82,8 +82,8 @@ DruidAggregate(group=[{0}], druid=[logical])
               "matchValueType" : "STRING",
               "matchValue" : "10.1"
             },
-            "columns" : [ "__time", "v0" ],
-            "columnTypes" : [ "LONG", "STRING" ],
+            "columns" : [ "v0", "__time" ],
+            "columnTypes" : [ "STRING", "LONG" ],
             "granularity" : {
               "type" : "all"
             },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@join-to-filter@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@join-to-filter@NullHandling=default.iq
index b3b0e2a346c..ede90bee602 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@join-to-filter@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@join-to-filter@NullHandling=default.iq
@@ -81,8 +81,8 @@ DruidAggregate(group=[{0}], druid=[logical])
               "dimension" : "dim1",
               "value" : "10.1"
             },
-            "columns" : [ "__time", "v0" ],
-            "columnTypes" : [ "LONG", "STRING" ],
+            "columns" : [ "v0", "__time" ],
+            "columnTypes" : [ "STRING", "LONG" ],
             "granularity" : {
               "type" : "all"
             },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@join-to-filter@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@join-to-filter@NullHandling=sql.iq
index 8980b7c4160..5ae0e78c10c 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@join-to-filter@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testGroupByOverGroupByOverInnerJoinOnTwoInlineDataSources@join-to-filter@NullHandling=sql.iq
@@ -82,8 +82,8 @@ DruidAggregate(group=[{0}], druid=[logical])
               "matchValueType" : "STRING",
               "matchValue" : "10.1"
             },
-            "columns" : [ "__time", "v0" ],
-            "columnTypes" : [ "LONG", "STRING" ],
+            "columns" : [ "v0", "__time" ],
+            "columnTypes" : [ "STRING", "LONG" ],
             "granularity" : {
               "type" : "all"
             },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@all_disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@all_disabled@NullHandling=default.iq
index b834b63636a..c178c13cddb 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@all_disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@all_disabled@NullHandling=default.iq
@@ -80,8 +80,8 @@ DruidProject(m1=[$0], k=[$2], v=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.k", "j0.v", "m1" ],
-  "columnTypes" : [ "STRING", "STRING", "FLOAT" ],
+  "columns" : [ "m1", "j0.k", "j0.v" ],
+  "columnTypes" : [ "FLOAT", "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@all_disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@all_disabled@NullHandling=sql.iq
index 2449b942774..c9644e43b2e 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@all_disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@all_disabled@NullHandling=sql.iq
@@ -80,8 +80,8 @@ DruidProject(m1=[$0], k=[$2], v=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.k", "j0.v", "m1" ],
-  "columnTypes" : [ "STRING", "STRING", "FLOAT" ],
+  "columns" : [ "m1", "j0.k", "j0.v" ],
+  "columnTypes" : [ "FLOAT", "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@all_enabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@all_enabled@NullHandling=default.iq
index b898d2f1c0d..11b8ada4085 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@all_enabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@all_enabled@NullHandling=default.iq
@@ -80,8 +80,8 @@ DruidProject(m1=[$0], k=[$2], v=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.k", "j0.v", "m1" ],
-  "columnTypes" : [ "STRING", "STRING", "FLOAT" ],
+  "columns" : [ "m1", "j0.k", "j0.v" ],
+  "columnTypes" : [ "FLOAT", "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@all_enabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@all_enabled@NullHandling=sql.iq
index fb1f9aa9151..e662c85f705 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@all_enabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@all_enabled@NullHandling=sql.iq
@@ -80,8 +80,8 @@ DruidProject(m1=[$0], k=[$2], v=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.k", "j0.v", "m1" ],
-  "columnTypes" : [ "STRING", "STRING", "FLOAT" ],
+  "columns" : [ "m1", "j0.k", "j0.v" ],
+  "columnTypes" : [ "FLOAT", "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@default@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@default@NullHandling=default.iq
index 41c9b0393aa..6ef633d9977 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@default@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@default@NullHandling=default.iq
@@ -77,8 +77,8 @@ DruidProject(m1=[$0], k=[$2], v=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.k", "j0.v", "m1" ],
-  "columnTypes" : [ "STRING", "STRING", "FLOAT" ],
+  "columns" : [ "m1", "j0.k", "j0.v" ],
+  "columnTypes" : [ "FLOAT", "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@default@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@default@NullHandling=sql.iq
index b0a97e2b299..18b7b1a29f8 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@default@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@default@NullHandling=sql.iq
@@ -77,8 +77,8 @@ DruidProject(m1=[$0], k=[$2], v=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.k", "j0.v", "m1" ],
-  "columnTypes" : [ "STRING", "STRING", "FLOAT" ],
+  "columns" : [ "m1", "j0.k", "j0.v" ],
+  "columnTypes" : [ "FLOAT", "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-on-value-column_disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-on-value-column_disabled@NullHandling=default.iq
index 3b58962a142..6b97e9055c7 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-on-value-column_disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-on-value-column_disabled@NullHandling=default.iq
@@ -80,8 +80,8 @@ DruidProject(m1=[$0], k=[$2], v=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.k", "j0.v", "m1" ],
-  "columnTypes" : [ "STRING", "STRING", "FLOAT" ],
+  "columns" : [ "m1", "j0.k", "j0.v" ],
+  "columnTypes" : [ "FLOAT", "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-on-value-column_disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-on-value-column_disabled@NullHandling=sql.iq
index 2f250bce5b9..7b9352b740e 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-on-value-column_disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-on-value-column_disabled@NullHandling=sql.iq
@@ -80,8 +80,8 @@ DruidProject(m1=[$0], k=[$2], v=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.k", "j0.v", "m1" ],
-  "columnTypes" : [ "STRING", "STRING", "FLOAT" ],
+  "columns" : [ "m1", "j0.k", "j0.v" ],
+  "columnTypes" : [ "FLOAT", "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-rewrites-disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-rewrites-disabled@NullHandling=default.iq
index 0c6f38cfafb..f5b22aebce9 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-rewrites-disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-rewrites-disabled@NullHandling=default.iq
@@ -80,8 +80,8 @@ DruidProject(m1=[$0], k=[$2], v=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.k", "j0.v", "m1" ],
-  "columnTypes" : [ "STRING", "STRING", "FLOAT" ],
+  "columns" : [ "m1", "j0.k", "j0.v" ],
+  "columnTypes" : [ "FLOAT", "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-rewrites-disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-rewrites-disabled@NullHandling=sql.iq
index 1dbe2ef067f..c11d79f00bf 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-rewrites-disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-rewrites-disabled@NullHandling=sql.iq
@@ -80,8 +80,8 @@ DruidProject(m1=[$0], k=[$2], v=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.k", "j0.v", "m1" ],
-  "columnTypes" : [ "STRING", "STRING", "FLOAT" ],
+  "columns" : [ "m1", "j0.k", "j0.v" ],
+  "columnTypes" : [ "FLOAT", "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-rewrites@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-rewrites@NullHandling=default.iq
index 8783d7b3734..e0c05e78194 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-rewrites@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-rewrites@NullHandling=default.iq
@@ -80,8 +80,8 @@ DruidProject(m1=[$0], k=[$2], v=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.k", "j0.v", "m1" ],
-  "columnTypes" : [ "STRING", "STRING", "FLOAT" ],
+  "columns" : [ "m1", "j0.k", "j0.v" ],
+  "columnTypes" : [ "FLOAT", "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-rewrites@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-rewrites@NullHandling=sql.iq
index bdc92546763..651d9c50d74 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-rewrites@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@filter-rewrites@NullHandling=sql.iq
@@ -80,8 +80,8 @@ DruidProject(m1=[$0], k=[$2], v=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.k", "j0.v", "m1" ],
-  "columnTypes" : [ "STRING", "STRING", "FLOAT" ],
+  "columns" : [ "m1", "j0.k", "j0.v" ],
+  "columnTypes" : [ "FLOAT", "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@join-to-filter@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@join-to-filter@NullHandling=default.iq
index 517a5e8f148..e2f29d5f632 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@join-to-filter@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@join-to-filter@NullHandling=default.iq
@@ -80,8 +80,8 @@ DruidProject(m1=[$0], k=[$2], v=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.k", "j0.v", "m1" ],
-  "columnTypes" : [ "STRING", "STRING", "FLOAT" ],
+  "columns" : [ "m1", "j0.k", "j0.v" ],
+  "columnTypes" : [ "FLOAT", "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@join-to-filter@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@join-to-filter@NullHandling=sql.iq
index 9593087abad..91b896f8e98 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@join-to-filter@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinCastLeft@join-to-filter@NullHandling=sql.iq
@@ -80,8 +80,8 @@ DruidProject(m1=[$0], k=[$2], v=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.k", "j0.v", "m1" ],
-  "columnTypes" : [ "STRING", "STRING", "FLOAT" ],
+  "columns" : [ "m1", "j0.k", "j0.v" ],
+  "columnTypes" : [ "FLOAT", "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_disabled@NullHandling=default.iq
index e0132c50e97..6a7c709365b 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_disabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_disabled@NullHandling=sql.iq
index e95f2f14e85..e553be29d9f 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_disabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_enabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_enabled@NullHandling=default.iq
index b7fe7b9911f..4829e939815 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_enabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_enabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_enabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_enabled@NullHandling=sql.iq
index f5cf5cd53aa..fa054c16225 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_enabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_enabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@default@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@default@NullHandling=default.iq
index a1a9eb3a74e..587178dde59 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@default@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@default@NullHandling=default.iq
@@ -71,8 +71,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -120,8 +120,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@default@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@default@NullHandling=sql.iq
index 4f1a6c50e7d..9f04823844c 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@default@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@default@NullHandling=sql.iq
@@ -72,8 +72,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -122,8 +122,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq
index e499257505e..d33427702e8 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq
index 047a0d9f3d6..8ab934aa38b 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq
index 2ed19caa6dd..3a5f5625990 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq
index 6e1a7ec7603..68861b993c7 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq
index 7ba1e5e14d7..5cfae3e4b94 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq
index d5e130f03a5..3b35adf2a12 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@join-to-filter@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@join-to-filter@NullHandling=default.iq
index 609ae044013..758f4c48bf4 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@join-to-filter@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@join-to-filter@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq
index 1753c081a4b..154056ddf06 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@all_disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@all_disabled@NullHandling=default.iq
index 20e69c705a2..24f52e8a1c0 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@all_disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@all_disabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@all_disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@all_disabled@NullHandling=sql.iq
index 2d034cb9200..bd2b636c01d 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@all_disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@all_disabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@all_enabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@all_enabled@NullHandling=default.iq
index 9d96525fbea..8151cc91a3a 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@all_enabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@all_enabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@all_enabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@all_enabled@NullHandling=sql.iq
index b5533f93632..246e608caa5 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@all_enabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@all_enabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@default@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@default@NullHandling=default.iq
index 1c782f5f394..87d1ef730e7 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@default@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@default@NullHandling=default.iq
@@ -71,8 +71,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -120,8 +120,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@default@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@default@NullHandling=sql.iq
index 62cc25dc99d..c8506ace31d 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@default@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@default@NullHandling=sql.iq
@@ -72,8 +72,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -122,8 +122,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq
index e2d47b9b815..2c622d5977f 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq
index 27133219625..fced12990b8 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq
index db70d749d5b..d5d73892fc1 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq
index f2d6e9b0a0b..610260e4e65 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq
index d17043dbd49..3efe170e808 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq
index ef9aff735e4..9ebbc7e18d3 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@join-to-filter@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@join-to-filter@NullHandling=default.iq
index eebc5217765..1bd6a87b9a0 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@join-to-filter@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@join-to-filter@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq
index 8578eedb067..50484dab8b9 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinOnTwoInlineDataSources_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@all_disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@all_disabled@NullHandling=default.iq
index 910efe62429..aa37bd300ef 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@all_disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@all_disabled@NullHandling=default.iq
@@ -265,7 +265,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@all_disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@all_disabled@NullHandling=sql.iq
index 01ad3ca130e..a67633991e4 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@all_disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@all_disabled@NullHandling=sql.iq
@@ -295,7 +295,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@all_enabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@all_enabled@NullHandling=default.iq
index 541186def46..f157cad2924 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@all_enabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@all_enabled@NullHandling=default.iq
@@ -265,7 +265,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@all_enabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@all_enabled@NullHandling=sql.iq
index 30d480efebb..362c59a2d5f 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@all_enabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@all_enabled@NullHandling=sql.iq
@@ -295,7 +295,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@default@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@default@NullHandling=default.iq
index 2b24b70d779..ba86267509c 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@default@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@default@NullHandling=default.iq
@@ -262,7 +262,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@default@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@default@NullHandling=sql.iq
index c5df737ee4b..b9f8ae2b6cf 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@default@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@default@NullHandling=sql.iq
@@ -292,7 +292,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-on-value-column_disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-on-value-column_disabled@NullHandling=default.iq
index a1554d1216e..76bfe6dcd33 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-on-value-column_disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-on-value-column_disabled@NullHandling=default.iq
@@ -265,7 +265,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-on-value-column_disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-on-value-column_disabled@NullHandling=sql.iq
index ad0ff57854a..94fe9ca1953 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-on-value-column_disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-on-value-column_disabled@NullHandling=sql.iq
@@ -295,7 +295,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-rewrites-disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-rewrites-disabled@NullHandling=default.iq
index 875f6397d10..03b29f1cd24 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-rewrites-disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-rewrites-disabled@NullHandling=default.iq
@@ -265,7 +265,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-rewrites-disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-rewrites-disabled@NullHandling=sql.iq
index 6005240994a..d3ac1b35a61 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-rewrites-disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-rewrites-disabled@NullHandling=sql.iq
@@ -295,7 +295,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-rewrites@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-rewrites@NullHandling=default.iq
index 2c24f9fd43a..5d5cdf00e57 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-rewrites@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-rewrites@NullHandling=default.iq
@@ -265,7 +265,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-rewrites@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-rewrites@NullHandling=sql.iq
index 2c0f5acd75d..32543d4b310 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-rewrites@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@filter-rewrites@NullHandling=sql.iq
@@ -295,7 +295,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@join-to-filter@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@join-to-filter@NullHandling=default.iq
index 95f337e744d..206049e87fe 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@join-to-filter@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@join-to-filter@NullHandling=default.iq
@@ -265,7 +265,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@join-to-filter@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@join-to-filter@NullHandling=sql.iq
index 33b928001a9..a90c49a5c08 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@join-to-filter@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersEmptyResults@join-to-filter@NullHandling=sql.iq
@@ -295,7 +295,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@all_disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@all_disabled@NullHandling=default.iq
index 27c694d3761..8190d2d01e3 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@all_disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@all_disabled@NullHandling=default.iq
@@ -266,7 +266,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@all_disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@all_disabled@NullHandling=sql.iq
index 6ad76f4adfe..97cebac6335 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@all_disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@all_disabled@NullHandling=sql.iq
@@ -296,7 +296,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@all_enabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@all_enabled@NullHandling=default.iq
index f178bb77913..f465747dcb1 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@all_enabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@all_enabled@NullHandling=default.iq
@@ -266,7 +266,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@all_enabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@all_enabled@NullHandling=sql.iq
index 16631807596..8dece7f89ea 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@all_enabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@all_enabled@NullHandling=sql.iq
@@ -296,7 +296,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@default@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@default@NullHandling=default.iq
index 8bcef0971a3..9a6d6b99c77 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@default@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@default@NullHandling=default.iq
@@ -263,7 +263,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@default@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@default@NullHandling=sql.iq
index 5e06a06055a..d927029ea2c 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@default@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@default@NullHandling=sql.iq
@@ -293,7 +293,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-on-value-column_disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-on-value-column_disabled@NullHandling=default.iq
index c9ec614dd6c..4b34d9f112b 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-on-value-column_disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-on-value-column_disabled@NullHandling=default.iq
@@ -266,7 +266,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-on-value-column_disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-on-value-column_disabled@NullHandling=sql.iq
index 2b0a91f52ee..02455d8a278 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-on-value-column_disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-on-value-column_disabled@NullHandling=sql.iq
@@ -296,7 +296,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-rewrites-disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-rewrites-disabled@NullHandling=default.iq
index 244271ad3f5..69a3f68d7a4 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-rewrites-disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-rewrites-disabled@NullHandling=default.iq
@@ -266,7 +266,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-rewrites-disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-rewrites-disabled@NullHandling=sql.iq
index b317aac1707..aec779732b7 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-rewrites-disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-rewrites-disabled@NullHandling=sql.iq
@@ -296,7 +296,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-rewrites@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-rewrites@NullHandling=default.iq
index 5e79404a0b5..a917edeea1b 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-rewrites@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-rewrites@NullHandling=default.iq
@@ -266,7 +266,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-rewrites@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-rewrites@NullHandling=sql.iq
index 79dc2bbc12e..3d5da0011b2 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-rewrites@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@filter-rewrites@NullHandling=sql.iq
@@ -296,7 +296,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@join-to-filter@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@join-to-filter@NullHandling=default.iq
index b905026fcc5..5d596d102bd 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@join-to-filter@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@join-to-filter@NullHandling=default.iq
@@ -266,7 +266,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@join-to-filter@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@join-to-filter@NullHandling=sql.iq
index f1249ac37bc..7d01bbbc163 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@join-to-filter@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testInnerJoinWithFilterPushdownAndManyFiltersNonEmptyResults@join-to-filter@NullHandling=sql.iq
@@ -296,7 +296,7 @@ DruidProject(m1=[$2], m10=[$3], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "j0.m1", "m1" ],
+  "columns" : [ "m1", "j0.m1" ],
   "columnTypes" : [ "FLOAT", "FLOAT" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testJoinOuterGroupByAndSubqueryHasLimit@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testJoinOuterGroupByAndSubqueryHasLimit@NullHandling=default.iq
index b96238832d5..0cd12b64c22 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testJoinOuterGroupByAndSubqueryHasLimit@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testJoinOuterGroupByAndSubqueryHasLimit@NullHandling=default.iq
@@ -80,8 +80,8 @@ DruidAggregate(group=[{0}], EXPR$1=[AVG($2)], druid=[logical])
       },
       "resultFormat" : "compactedList",
       "limit" : 10,
-      "columns" : [ "dim2", "j0.m1", "m1", "m2" ],
-      "columnTypes" : [ "STRING", "FLOAT", "FLOAT", "DOUBLE" ],
+      "columns" : [ "dim2", "m1", "m2", "j0.m1" ],
+      "columnTypes" : [ "STRING", "FLOAT", "DOUBLE", "FLOAT" ],
       "granularity" : {
         "type" : "all"
       },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testJoinOuterGroupByAndSubqueryHasLimit@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testJoinOuterGroupByAndSubqueryHasLimit@NullHandling=sql.iq
index ec8a580d34c..f8829b31e1f 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testJoinOuterGroupByAndSubqueryHasLimit@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testJoinOuterGroupByAndSubqueryHasLimit@NullHandling=sql.iq
@@ -81,8 +81,8 @@ DruidAggregate(group=[{0}], EXPR$1=[AVG($2)], druid=[logical])
       },
       "resultFormat" : "compactedList",
       "limit" : 10,
-      "columns" : [ "dim2", "j0.m1", "m1", "m2" ],
-      "columnTypes" : [ "STRING", "FLOAT", "FLOAT", "DOUBLE" ],
+      "columns" : [ "dim2", "m1", "m2", "j0.m1" ],
+      "columnTypes" : [ "STRING", "FLOAT", "DOUBLE", "FLOAT" ],
       "granularity" : {
         "type" : "all"
       },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_disabled@NullHandling=default.iq
index 5df8aeeaff3..2f4290fed6d 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_disabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_disabled@NullHandling=sql.iq
index d43b5711444..93293e3f7e8 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_disabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_enabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_enabled@NullHandling=default.iq
index 76955adfbeb..27d860eb9f0 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_enabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_enabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_enabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_enabled@NullHandling=sql.iq
index 05f624ac37a..90f37d025af 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_enabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@all_enabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@default@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@default@NullHandling=default.iq
index 4d2b6332c5b..845d81b6a3f 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@default@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@default@NullHandling=default.iq
@@ -71,8 +71,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -120,8 +120,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@default@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@default@NullHandling=sql.iq
index 31c46ccc3b2..ab43f9604a6 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@default@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@default@NullHandling=sql.iq
@@ -72,8 +72,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -122,8 +122,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq
index 05a49528a40..8f772867018 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq
index 07d5d256b61..0d4e75093b9 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq
index 61e0354cd15..eaf39cc2e5a 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq
index d764e7d5e3c..602e7082595 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq
index 2103374735d..fe73169674d 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq
index ae6924c1b87..e719d27e6df 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@join-to-filter@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@join-to-filter@NullHandling=default.iq
index b86beedd9ab..0e75a816828 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@join-to-filter@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@join-to-filter@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq
index 904f6fec8d8..c74c2744c54 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithOuterWhere_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@all_disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@all_disabled@NullHandling=default.iq
index bfdea514aa3..9856d6880d7 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@all_disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@all_disabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -129,8 +129,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@all_disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@all_disabled@NullHandling=sql.iq
index 4e6d825da40..5682326c03e 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@all_disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@all_disabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -131,8 +131,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@all_enabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@all_enabled@NullHandling=default.iq
index dd9ac1e021d..dd18a691b26 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@all_enabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@all_enabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -129,8 +129,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@all_enabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@all_enabled@NullHandling=sql.iq
index ea1bcd75f44..098f6a50bc9 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@all_enabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@all_enabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -131,8 +131,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@default@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@default@NullHandling=default.iq
index 10f1c84c330..dd0fe8341b5 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@default@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@default@NullHandling=default.iq
@@ -71,8 +71,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -126,8 +126,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@default@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@default@NullHandling=sql.iq
index ebe0fbc3f71..a27da638639 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@default@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@default@NullHandling=sql.iq
@@ -72,8 +72,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -128,8 +128,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq
index ea5fdff6a88..22719f86aea 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -129,8 +129,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq
index dcd84462bbe..295802c7230 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -131,8 +131,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq
index d870dc637b8..de427c4ece0 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -129,8 +129,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq
index 11442bae8a5..8815732fe58 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -131,8 +131,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq
index 560f7c30f74..7973786f10e 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -129,8 +129,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq
index 4f254f1976b..d5e5d614e3d 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -131,8 +131,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@join-to-filter@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@join-to-filter@NullHandling=default.iq
index ff2df59c513..c1b280b3803 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@join-to-filter@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@join-to-filter@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -129,8 +129,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq
index 5d8f487a780..0a1b6a66606 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSourcesWithTimeFilter_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -131,8 +131,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@all_disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@all_disabled@NullHandling=default.iq
index d13c86ab395..9149b1cebb6 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@all_disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@all_disabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@all_disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@all_disabled@NullHandling=sql.iq
index aa4220f4f42..7dbc2ff6923 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@all_disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@all_disabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@all_enabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@all_enabled@NullHandling=default.iq
index aec23daced0..ba5ed17c9e7 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@all_enabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@all_enabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@all_enabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@all_enabled@NullHandling=sql.iq
index 844b53dccc3..e4c05ae03b3 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@all_enabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@all_enabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@default@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@default@NullHandling=default.iq
index 4c84575901e..fd632f52846 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@default@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@default@NullHandling=default.iq
@@ -71,8 +71,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -120,8 +120,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@default@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@default@NullHandling=sql.iq
index ccbdf92c457..40515f8b62d 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@default@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@default@NullHandling=sql.iq
@@ -72,8 +72,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -122,8 +122,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq
index c22c33b3ea4..eb287c5eeed 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq
index 68f6a9250e6..54427093b15 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-on-value-column_disabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq
index aa6d4b632ac..e36e08bdf07 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq
index 9c1a8d23796..9227fb31b5e 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites-disabled@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq
index 993c14f6869..6d586cb7eeb 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq
index 76ee90cd877..580ed669472 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@filter-rewrites@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@join-to-filter@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@join-to-filter@NullHandling=default.iq
index cf7cdcc09f3..e108a87115d 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@join-to-filter@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@join-to-filter@NullHandling=default.iq
@@ -74,8 +74,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "dimension" : "dim1",
           "value" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -123,8 +123,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq
index ecd48b65d91..800a422b8f0 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testLeftJoinOnTwoInlineDataSources_withLeftDirectAccess@join-to-filter@NullHandling=sql.iq
@@ -75,8 +75,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
           "matchValueType" : "STRING",
           "matchValue" : "10.1"
         },
-        "columns" : [ "__time", "v0" ],
-        "columnTypes" : [ "LONG", "STRING" ],
+        "columns" : [ "v0", "__time" ],
+        "columnTypes" : [ "STRING", "LONG" ],
         "granularity" : {
           "type" : "all"
         },
@@ -125,8 +125,8 @@ DruidProject(dim1=[CAST('10.1':VARCHAR):VARCHAR], __time=[$1], druid=[logical])
     "outputType" : "STRING"
   } ],
   "resultFormat" : "compactedList",
-  "columns" : [ "__time", "_v0" ],
-  "columnTypes" : [ "LONG", "STRING" ],
+  "columns" : [ "_v0", "__time" ],
+  "columnTypes" : [ "STRING", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@all_disabled.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@all_disabled.iq
index af6c617d6d6..2b57678c375 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@all_disabled.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@all_disabled.iq
@@ -175,7 +175,7 @@ DruidProject(dim3=[$0], dim30=[$2], druid=[logical])
           "isAllowList" : true
         } ],
         "resultFormat" : "compactedList",
-        "columns" : [ "_v0", "dim3" ],
+        "columns" : [ "dim3", "_v0" ],
         "columnTypes" : [ "STRING", "STRING" ],
         "granularity" : {
           "type" : "all"
@@ -192,7 +192,7 @@ DruidProject(dim3=[$0], dim30=[$2], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "_j0.dim3", "dim3" ],
+  "columns" : [ "dim3", "_j0.dim3" ],
   "columnTypes" : [ "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@all_enabled.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@all_enabled.iq
index e82f708d2bb..df9ecf85c1d 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@all_enabled.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@all_enabled.iq
@@ -175,7 +175,7 @@ DruidProject(dim3=[$0], dim30=[$2], druid=[logical])
           "isAllowList" : true
         } ],
         "resultFormat" : "compactedList",
-        "columns" : [ "_v0", "dim3" ],
+        "columns" : [ "dim3", "_v0" ],
         "columnTypes" : [ "STRING", "STRING" ],
         "granularity" : {
           "type" : "all"
@@ -192,7 +192,7 @@ DruidProject(dim3=[$0], dim30=[$2], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "_j0.dim3", "dim3" ],
+  "columns" : [ "dim3", "_j0.dim3" ],
   "columnTypes" : [ "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@default.iq
index 5c154e61c29..fb32e0c6130 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@default.iq
@@ -172,7 +172,7 @@ DruidProject(dim3=[$0], dim30=[$2], druid=[logical])
           "isAllowList" : true
         } ],
         "resultFormat" : "compactedList",
-        "columns" : [ "_v0", "dim3" ],
+        "columns" : [ "dim3", "_v0" ],
         "columnTypes" : [ "STRING", "STRING" ],
         "granularity" : {
           "type" : "all"
@@ -189,7 +189,7 @@ DruidProject(dim3=[$0], dim30=[$2], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "_j0.dim3", "dim3" ],
+  "columns" : [ "dim3", "_j0.dim3" ],
   "columnTypes" : [ "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@filter-on-value-column_disabled.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@filter-on-value-column_disabled.iq
index 8e960092276..9290f7f5adf 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@filter-on-value-column_disabled.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@filter-on-value-column_disabled.iq
@@ -175,7 +175,7 @@ DruidProject(dim3=[$0], dim30=[$2], druid=[logical])
           "isAllowList" : true
         } ],
         "resultFormat" : "compactedList",
-        "columns" : [ "_v0", "dim3" ],
+        "columns" : [ "dim3", "_v0" ],
         "columnTypes" : [ "STRING", "STRING" ],
         "granularity" : {
           "type" : "all"
@@ -192,7 +192,7 @@ DruidProject(dim3=[$0], dim30=[$2], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "_j0.dim3", "dim3" ],
+  "columns" : [ "dim3", "_j0.dim3" ],
   "columnTypes" : [ "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@filter-rewrites-disabled.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@filter-rewrites-disabled.iq
index a258e98d01f..290acad460a 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@filter-rewrites-disabled.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@filter-rewrites-disabled.iq
@@ -175,7 +175,7 @@ DruidProject(dim3=[$0], dim30=[$2], druid=[logical])
           "isAllowList" : true
         } ],
         "resultFormat" : "compactedList",
-        "columns" : [ "_v0", "dim3" ],
+        "columns" : [ "dim3", "_v0" ],
         "columnTypes" : [ "STRING", "STRING" ],
         "granularity" : {
           "type" : "all"
@@ -192,7 +192,7 @@ DruidProject(dim3=[$0], dim30=[$2], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "_j0.dim3", "dim3" ],
+  "columns" : [ "dim3", "_j0.dim3" ],
   "columnTypes" : [ "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@filter-rewrites.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@filter-rewrites.iq
index 63ea77bfbbe..20de420259e 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@filter-rewrites.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@filter-rewrites.iq
@@ -175,7 +175,7 @@ DruidProject(dim3=[$0], dim30=[$2], druid=[logical])
           "isAllowList" : true
         } ],
         "resultFormat" : "compactedList",
-        "columns" : [ "_v0", "dim3" ],
+        "columns" : [ "dim3", "_v0" ],
         "columnTypes" : [ "STRING", "STRING" ],
         "granularity" : {
           "type" : "all"
@@ -192,7 +192,7 @@ DruidProject(dim3=[$0], dim30=[$2], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "_j0.dim3", "dim3" ],
+  "columns" : [ "dim3", "_j0.dim3" ],
   "columnTypes" : [ "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@join-to-filter.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@join-to-filter.iq
index 8f9b506aa1a..c6a483ee560 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@join-to-filter.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteJoinQueryTest/testVirtualColumnOnMVFilterMultiJoinExpression@join-to-filter.iq
@@ -175,7 +175,7 @@ DruidProject(dim3=[$0], dim30=[$2], druid=[logical])
           "isAllowList" : true
         } ],
         "resultFormat" : "compactedList",
-        "columns" : [ "_v0", "dim3" ],
+        "columns" : [ "dim3", "_v0" ],
         "columnTypes" : [ "STRING", "STRING" ],
         "granularity" : {
           "type" : "all"
@@ -192,7 +192,7 @@ DruidProject(dim3=[$0], dim30=[$2], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "_j0.dim3", "dim3" ],
+  "columns" : [ "dim3", "_j0.dim3" ],
   "columnTypes" : [ "STRING", "STRING" ],
   "granularity" : {
     "type" : "all"
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testMultipleExactCountDistinctWithGroupingAndOtherAggregatorsUsingJoin@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testMultipleExactCountDistinctWithGroupingAndOtherAggregatorsUsingJoin@NullHandling=default.iq
index 8bc6869aff8..2fe7189d611 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testMultipleExactCountDistinctWithGroupingAndOtherAggregatorsUsingJoin@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testMultipleExactCountDistinctWithGroupingAndOtherAggregatorsUsingJoin@NullHandling=default.iq
@@ -221,8 +221,8 @@ DruidProject(dim2=[$0], EXPR$1=[$1], EXPR$2=[$3], EXPR$3=[$5], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "_j0.a0", "a0", "d0", "j0.a0" ],
-  "columnTypes" : [ "LONG", "LONG", "STRING", "LONG" ],
+  "columns" : [ "d0", "a0", "j0.a0", "_j0.a0" ],
+  "columnTypes" : [ "STRING", "LONG", "LONG", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testMultipleExactCountDistinctWithGroupingAndOtherAggregatorsUsingJoin@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testMultipleExactCountDistinctWithGroupingAndOtherAggregatorsUsingJoin@NullHandling=sql.iq
index 0f899348f83..31501310943 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testMultipleExactCountDistinctWithGroupingAndOtherAggregatorsUsingJoin@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testMultipleExactCountDistinctWithGroupingAndOtherAggregatorsUsingJoin@NullHandling=sql.iq
@@ -232,8 +232,8 @@ DruidProject(dim2=[$0], EXPR$1=[$1], EXPR$2=[$3], EXPR$3=[$5], druid=[logical])
     "intervals" : [ "-146136543-09-08T08:23:32.096Z/146140482-04-24T15:36:27.903Z" ]
   },
   "resultFormat" : "compactedList",
-  "columns" : [ "_j0.a0", "a0", "d0", "j0.a0" ],
-  "columnTypes" : [ "LONG", "LONG", "STRING", "LONG" ],
+  "columns" : [ "d0", "a0", "j0.a0", "_j0.a0" ],
+  "columnTypes" : [ "STRING", "LONG", "LONG", "LONG" ],
   "granularity" : {
     "type" : "all"
   },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testTimeFilterOnSubquery@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testTimeFilterOnSubquery@NullHandling=default.iq
index 9f63bc9a222..c864ecb8df1 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testTimeFilterOnSubquery@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testTimeFilterOnSubquery@NullHandling=default.iq
@@ -47,8 +47,8 @@ DruidProject(__time=[$0], m1=[$5], druid=[logical])
       },
       "resultFormat" : "compactedList",
       "limit" : 100,
-      "columns" : [ "__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1" ],
-      "columnTypes" : [ "LONG", "LONG", "STRING", "STRING", "STRING", "FLOAT", "DOUBLE", "COMPLEX<hyperUnique>" ],
+      "columns" : [ "__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1" ],
+      "columnTypes" : [ "LONG", "STRING", "STRING", "STRING", "LONG", "FLOAT", "DOUBLE", "COMPLEX<hyperUnique>" ],
       "granularity" : {
         "type" : "all"
       },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testTimeFilterOnSubquery@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testTimeFilterOnSubquery@NullHandling=sql.iq
index 40b9d874777..7906b3d4c0f 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testTimeFilterOnSubquery@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testTimeFilterOnSubquery@NullHandling=sql.iq
@@ -47,8 +47,8 @@ DruidProject(__time=[$0], m1=[$5], druid=[logical])
       },
       "resultFormat" : "compactedList",
       "limit" : 100,
-      "columns" : [ "__time", "cnt", "dim1", "dim2", "dim3", "m1", "m2", "unique_dim1" ],
-      "columnTypes" : [ "LONG", "LONG", "STRING", "STRING", "STRING", "FLOAT", "DOUBLE", "COMPLEX<hyperUnique>" ],
+      "columns" : [ "__time", "dim1", "dim2", "dim3", "cnt", "m1", "m2", "unique_dim1" ],
+      "columnTypes" : [ "LONG", "STRING", "STRING", "STRING", "LONG", "FLOAT", "DOUBLE", "COMPLEX<hyperUnique>" ],
       "granularity" : {
         "type" : "all"
       },
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testWindowingWithScanAndSort@NullHandling=default.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testWindowingWithScanAndSort@NullHandling=default.iq
index 17ca58cf2a2..a893185365e 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testWindowingWithScanAndSort@NullHandling=default.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testWindowingWithScanAndSort@NullHandling=default.iq
@@ -137,8 +137,8 @@ DruidProject(ranking=[$2], trend_score=[$1], druid=[logical])
       },
       "resultFormat" : "compactedList",
       "limit" : 10,
-      "columns" : [ "a0", "d1", "w0" ],
-      "columnTypes" : [ "LONG", "DOUBLE", "LONG" ],
+      "columns" : [ "d1", "a0", "w0" ],
+      "columnTypes" : [ "DOUBLE", "LONG", "LONG" ],
       "granularity" : {
         "type" : "all"
       },
@@ -179,7 +179,7 @@ DruidProject(ranking=[$2], trend_score=[$1], druid=[logical])
       "offset" : 0,
       "limit" : 9223372036854775807
     },
-    "projectedColumns" : [ "a0", "w0" ],
+    "projectedColumns" : [ "w0", "a0" ],
     "virtualColumns" : null,
     "ordering" : null
   } ],
diff --git a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testWindowingWithScanAndSort@NullHandling=sql.iq b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testWindowingWithScanAndSort@NullHandling=sql.iq
index b18827be5b0..3eb700c018f 100644
--- a/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testWindowingWithScanAndSort@NullHandling=sql.iq
+++ b/sql/src/test/quidem/org.apache.druid.sql.calcite.DecoupledPlanningCalciteQueryTest/testWindowingWithScanAndSort@NullHandling=sql.iq
@@ -148,8 +148,8 @@ DruidProject(ranking=[$2], trend_score=[$1], druid=[logical])
       },
       "resultFormat" : "compactedList",
       "limit" : 10,
-      "columns" : [ "a0", "d1", "w0" ],
-      "columnTypes" : [ "LONG", "DOUBLE", "LONG" ],
+      "columns" : [ "d1", "a0", "w0" ],
+      "columnTypes" : [ "DOUBLE", "LONG", "LONG" ],
       "granularity" : {
         "type" : "all"
       },
@@ -190,7 +190,7 @@ DruidProject(ranking=[$2], trend_score=[$1], druid=[logical])
       "offset" : 0,
       "limit" : 9223372036854775807
     },
-    "projectedColumns" : [ "a0", "w0" ],
+    "projectedColumns" : [ "w0", "a0" ],
     "virtualColumns" : null,
     "ordering" : null
   } ],


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org