fix issue with segment metadata cache and complex types when doing ou…

…t of order upgrades from 0.22 (#14948)
apache · Sep 12, 2023 · 5cecf6c · 5cecf6c
1 parent 757603a
commit 5cecf6c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/sql/src/main/java/org/apache/druid/sql/calcite/schema/SegmentMetadataCache.java b/sql/src/main/java/org/apache/druid/sql/calcite/schema/SegmentMetadataCache.java
@@ -961,6 +961,9 @@ static RowSignature analysisToRowSignature(final SegmentAnalysis analysis)
         // likelyhood of upgrading from some version lower than 0.23 is low
         try {
           valueType = ColumnType.fromString(entry.getValue().getType());
+          if (valueType == null) {
+            valueType = ColumnType.ofComplex(entry.getValue().getType());
+          }
         }
         catch (IllegalArgumentException ignored) {
           valueType = ColumnType.UNKNOWN_COMPLEX;

diff --git a/sql/src/test/java/org/apache/druid/sql/calcite/schema/SegmentMetadataCacheTest.java b/sql/src/test/java/org/apache/druid/sql/calcite/schema/SegmentMetadataCacheTest.java
@@ -1417,9 +1417,21 @@ public void testSegmentMetadataFallbackType()
                         false,
                         true,
                         1234,
-                        26,
-                        "a",
-                        "z",
+                        null,
+                        null,
+                        null,
+                        null
+                    ),
+                    "distinct",
+                    new ColumnAnalysis(
+                        null,
+                        "hyperUnique",
+                        false,
+                        true,
+                        1234,
+                        null,
+                        null,
+                        null,
                         null
                     )
                 )
@@ -1433,7 +1445,7 @@ public void testSegmentMetadataFallbackType()
         )
     );
     Assert.assertEquals(
-        RowSignature.builder().add("a", ColumnType.STRING).add("count", ColumnType.LONG).build(),
+        RowSignature.builder().add("a", ColumnType.STRING).add("count", ColumnType.LONG).add("distinct", ColumnType.ofComplex("hyperUnique")).build(),
         signature
     );
   }