1

apache · Jul 18, 2024 · f55c017 · f55c017
1 parent 1d7f959
commit f55c017
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 175 deletions.
diff --git a/.../src/main/java/org/apache/seatunnel/connectors/doris/serialize/SeaTunnelRowConverter.java b/.../src/main/java/org/apache/seatunnel/connectors/doris/serialize/SeaTunnelRowConverter.java
diff --git a/...src/main/java/org/apache/seatunnel/connectors/doris/serialize/SeaTunnelRowSerializer.java b/...src/main/java/org/apache/seatunnel/connectors/doris/serialize/SeaTunnelRowSerializer.java
@@ -34,7 +34,7 @@
 import static org.apache.seatunnel.connectors.doris.sink.writer.LoadConstants.JSON;
 import static org.apache.seatunnel.connectors.doris.sink.writer.LoadConstants.NULL_VALUE;
 
-public class SeaTunnelRowSerializer extends SeaTunnelRowConverter implements DorisSerializer {
+public class SeaTunnelRowSerializer implements DorisSerializer {
     String type;
     private final SeaTunnelRowType seaTunnelRowType;
     private final String fieldDelimiter;

diff --git a/.../test/java/org/apache/seatunnel/connectors/doris/serialize/SeaTunnelRowConverterTest.java b/.../test/java/org/apache/seatunnel/connectors/doris/serialize/SeaTunnelRowConverterTest.java
diff --git a/...unnel-format-json/src/main/java/org/apache/seatunnel/format/json/RowToJsonConverters.java b/...unnel-format-json/src/main/java/org/apache/seatunnel/format/json/RowToJsonConverters.java
@@ -187,8 +187,7 @@ public JsonNode convert(ObjectMapper mapper, JsonNode reuse, Object value) {
                 return createArrayConverter((ArrayType) type);
             case MAP:
                 MapType mapType = (MapType) type;
-                return createMapConverter(
-                        mapType.toString(), mapType.getKeyType(), mapType.getValueType());
+                return createMapConverter(mapType.getKeyType(), mapType.getValueType());
             default:
                 throw new SeaTunnelJsonFormatException(
                         CommonErrorCodeDeprecated.UNSUPPORTED_DATA_TYPE,
@@ -270,15 +269,10 @@ public JsonNode convert(ObjectMapper mapper, JsonNode reuse, Object value) {
     }
 
     private RowToJsonConverter createMapConverter(
-            String typeSummary, SeaTunnelDataType<?> keyType, SeaTunnelDataType<?> valueType) {
-        if (!SqlType.STRING.equals(keyType.getSqlType())) {
-            throw new SeaTunnelJsonFormatException(
-                    CommonErrorCodeDeprecated.UNSUPPORTED_DATA_TYPE,
-                    "JSON format doesn't support non-string as key type of map. The type is: "
-                            + typeSummary);
-        }
-
+            SeaTunnelDataType<?> keyType, SeaTunnelDataType<?> valueType) {
+        final RowToJsonConverter keyConverter = createConverter(keyType);
         final RowToJsonConverter valueConverter = createConverter(valueType);
+
         return new RowToJsonConverter() {
             @Override
             public JsonNode convert(ObjectMapper mapper, JsonNode reuse, Object value) {
@@ -292,9 +286,12 @@ public JsonNode convert(ObjectMapper mapper, JsonNode reuse, Object value) {
                     node.removeAll();
                 }
 
-                Map<String, ?> mapData = (Map) value;
-                for (Map.Entry<String, ?> entry : mapData.entrySet()) {
-                    String fieldName = entry.getKey();
+                Map<?, ?> mapData = (Map) value;
+                for (Map.Entry<?, ?> entry : mapData.entrySet()) {
+                    // Convert the key to a string using the key converter
+                    JsonNode keyNode = keyConverter.convert(mapper, null, entry.getKey());
+                    String fieldName = keyNode.isTextual() ? keyNode.asText() : keyNode.toString();
+
                     node.set(
                             fieldName,
                             valueConverter.convert(mapper, node.get(fieldName), entry.getValue()));