ScanQuery should not ignore columnTypes in equals/hashCode

extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/hll/sql/HllSketchSqlAggregatorTest.java

@@ -1051,6 +1051,7 @@ public void testHllEstimateAsVirtualColumn()
                 )
                 .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 void testHllEstimateAsVirtualColumnWithRound()
                 ))
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .columns("v0", "v1")
+                .columnTypes(ColumnType.DOUBLE, ColumnType.DOUBLE)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),

extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/quantiles/sql/DoublesSketchSqlAggregatorTest.java

@@ -398,7 +398,8 @@ public void testSubqueryWithNestedGroupBy()
                     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

extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/theta/sql/ThetaSketchSqlAggregatorTest.java

@@ -1108,6 +1108,7 @@ public void testThetaSketchEstimateAsVirtualColumn()
                 ))
                 .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
                 .columns("v0")
+                .columnTypes(ColumnType.DOUBLE)
                 .context(QUERY_CONTEXT_DEFAULT)
                 .build()
         ),

extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQArraysTest.java

@@ -758,13 +758,13 @@ public void testSelectOnArrays(String contextName, Map<String, Object> context,
                                             .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 void testSelectOnArrays(String contextName, Map<String, Object> context,
     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 void testScanWithOrderByOnStringArray(String contextName, Map<String, Obj
         .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 void testScanWithOrderByOnLongArray(String contextName, Map<String, Objec
         .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 void testScanWithOrderByOnDoubleArray(String contextName, Map<String, Obj
         .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 void testScanExternBooleanArray(String contextName, Map<String, Object> c
         )
         .intervals(querySegmentSpec(Filtration.eternity()))
         .columns("a_bool")
+        .columnTypes(scanSignature.getColumnTypes())
         .context(defaultScanQueryContext(context, scanSignature))
         .build();
 
@@ -1088,6 +1085,7 @@ public void testScanExternArrayWithNonConvertibleType(String contextName, Map<St
         )
         .intervals(querySegmentSpec(Filtration.eternity()))
         .columns("a_bool")
+        .columnTypes(scanSignature.getColumnTypes())
         .context(defaultScanQueryContext(context, scanSignature))
         .build();
 

extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQComplexGroupByTest.java

@@ -409,6 +409,7 @@ public void testSortingOnNestedData(String contextName, Map<String, Object> cont
                                                         .dataSource(dataFileExternalDataSource)
                                                         .intervals(querySegmentSpec(Filtration.eternity()))
                                                         .columns("obj")
+                                                        .columnTypes(ColumnType.NESTED_DATA)
                                                         .context(defaultScanQueryContext(context, rowSignature))
                                                         .orderBy(Collections.singletonList(OrderBy.ascending("obj")))
                                                         .build()

extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQLoadedSegmentTests.java

@@ -127,6 +127,7 @@ public void testSelectWithLoadedSegmentsOnFoo()
                            .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 void testSelectWithLoadedSegmentsOnFooWithOrderBy()
                            .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()

extensions-core/multi-stage-query/src/test/java/org/apache/druid/msq/exec/MSQParseExceptionsTest.java

@@ -180,6 +180,7 @@ public void testIngestWithSanitizedNullByte() throws IOException
                 )
             )
             .columns("v0", "v1")
+            .columnTypes(ColumnType.LONG, ColumnType.STRING)
             .resultFormat(ScanQuery.ResultFormat.RESULT_FORMAT_COMPACTED_LIST)
             .context(defaultScanQueryContext(
                 context,
@@ -272,13 +273,14 @@ public void testIngestWithSanitizedNullByteUsingContextParameter() throws IOExce
                     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();