Skip to content

Commit a58bf6c

Browse files
committed
tests work on master
1 parent 480ff5a commit a58bf6c

File tree

3 files changed

+3
-14
lines changed

3 files changed

+3
-14
lines changed

kernel/kernel-api/src/main/java/io/delta/kernel/internal/TableFeatures.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public static void validateReadSupportedTable(
5151
break;
5252
case "deletionVectors": // fall through
5353
case "timestampNtz": // fall through
54-
case "variantType-dev": // fall through
54+
case "variantType-preview": // fall through
5555
case "vacuumProtocolCheck": // fall through
5656
case "v2Checkpoint":
5757
break;

kernel/kernel-defaults/src/main/java/io/delta/kernel/defaults/internal/expressions/DefaultExpressionEvaluator.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -665,22 +665,12 @@ private ColumnVector variantCoalesceImpl(ColumnVector inputVec, DataType dt) {
665665
mapType.getValueType()
666666
);
667667
}
668-
ColumnVector keyVec = mapVec.getKeyVector();
669-
if (mapType.getKeyType() instanceof ArrayType ||
670-
mapType.getKeyType() instanceof StructType ||
671-
mapType.getKeyType() instanceof MapType ||
672-
mapType.getKeyType() instanceof VariantType) {
673-
keyVec = variantCoalesceImpl(
674-
mapVec.getKeyVector(),
675-
mapType.getKeyType()
676-
);
677-
}
678668
return new DefaultMapVector(
679669
mapVec.getSize(),
680670
mapType,
681671
mapVec.getNullability(),
682672
mapVec.getOffsets(),
683-
keyVec,
673+
mapVec.getKeyVector(),
684674
valueVec
685675
);
686676
}

kernel/kernel-defaults/src/test/scala/io/delta/kernel/defaults/ScanSuite.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,8 +1670,7 @@ class ScanSuite extends AnyFunSuite with TestUtils with ExpressionTestUtils with
16701670
map('v', parse_json(cast(id as string)))
16711671
) as array_map_v""",
16721672
"map('test', parse_json(cast(id as string))) as map_value_v",
1673-
"map('test', named_struct('v', parse_json(cast(id as string)))) as map_struct_v",
1674-
"map(parse_json(cast(id as string)), parse_json(cast(id as string))) as map_key_v"
1673+
"map('test', named_struct('v', parse_json(cast(id as string)))) as map_struct_v"
16751674
)
16761675
}
16771676

0 commit comments

Comments
 (0)