This is an automated email from the ASF dual-hosted git repository. twalthr pushed a commit to branch release-1.11 in repository https://gitbox.apache.org/repos/asf/flink.git
commit 1b5fe3f8a0862aca98592308d7619a2956e466bb Author: Timo Walther <[email protected]> AuthorDate: Thu Jun 11 14:04:51 2020 +0200 [hotfix][table-runtime-blink] Allow subclasses of Map as input conversion class --- .../flink/table/data/conversion/DataStructureConverters.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/flink-table/flink-table-runtime-blink/src/main/java/org/apache/flink/table/data/conversion/DataStructureConverters.java b/flink-table/flink-table-runtime-blink/src/main/java/org/apache/flink/table/data/conversion/DataStructureConverters.java index 1d07d24..2548733 100644 --- a/flink-table/flink-table-runtime-blink/src/main/java/org/apache/flink/table/data/conversion/DataStructureConverters.java +++ b/flink-table/flink-table-runtime-blink/src/main/java/org/apache/flink/table/data/conversion/DataStructureConverters.java @@ -115,10 +115,8 @@ public final class DataStructureConverters { putConverter(LogicalTypeRoot.ARRAY, long[].class, constructor(ArrayLongArrayConverter::new)); putConverter(LogicalTypeRoot.ARRAY, float[].class, constructor(ArrayFloatArrayConverter::new)); putConverter(LogicalTypeRoot.ARRAY, double[].class, constructor(ArrayDoubleArrayConverter::new)); - putConverter(LogicalTypeRoot.MAP, Map.class, MapMapConverter::createForMapType); - putConverter(LogicalTypeRoot.MAP, MapData.class, identity()); - putConverter(LogicalTypeRoot.MULTISET, Map.class, MapMapConverter::createForMultisetType); putConverter(LogicalTypeRoot.MULTISET, MapData.class, identity()); + putConverter(LogicalTypeRoot.MAP, MapData.class, identity()); putConverter(LogicalTypeRoot.ROW, Row.class, RowRowConverter::create); putConverter(LogicalTypeRoot.ROW, RowData.class, identity()); putConverter(LogicalTypeRoot.STRUCTURED_TYPE, Row.class, RowRowConverter::create); @@ -149,6 +147,10 @@ public final class DataStructureConverters { switch (logicalType.getTypeRoot()) { case ARRAY: return ArrayObjectArrayConverter.create(dataType); + case MULTISET: + return MapMapConverter.createForMultisetType(dataType); + case MAP: + return MapMapConverter.createForMapType(dataType); case DISTINCT_TYPE: return getConverterInternal(dataType.getChildren().get(0)); case STRUCTURED_TYPE:
