[Fix][Connector-V2] Fix doris primary key order and fields order are …

…inconsistent (#7377)
apache · Aug 13, 2024 · 464da8f · 464da8f
1 parent 527c7c7
commit 464da8f
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 5 deletions.
diff --git a/...ctor-doris/src/main/java/org/apache/seatunnel/connectors/doris/util/DorisCatalogUtil.java b/...ctor-doris/src/main/java/org/apache/seatunnel/connectors/doris/util/DorisCatalogUtil.java
@@ -117,10 +117,10 @@ public static String getCreateTableStatement(
 
         String primaryKey = "";
         if (tableSchema.getPrimaryKey() != null) {
-            primaryKey =
-                    tableSchema.getPrimaryKey().getColumnNames().stream()
-                            .map(r -> "`" + r + "`")
-                            .collect(Collectors.joining(","));
+            List<String> fields = Arrays.asList(catalogTable.getTableSchema().getFieldNames());
+            List<String> keys = tableSchema.getPrimaryKey().getColumnNames();
+            keys.sort(Comparator.comparingInt(fields::indexOf));
+            primaryKey = keys.stream().map(r -> "`" + r + "`").collect(Collectors.joining(","));
         }
         String uniqueKey = "";
         if (!tableSchema.getConstraintKeys().isEmpty()) {

diff --git a/...ris/src/test/java/org/apache/seatunnel/connectors/doris/catalog/DorisCreateTableTest.java b/...ris/src/test/java/org/apache/seatunnel/connectors/doris/catalog/DorisCreateTableTest.java
@@ -33,6 +33,7 @@
 import org.apache.seatunnel.common.exception.SeaTunnelRuntimeException;
 import org.apache.seatunnel.connectors.doris.config.DorisOptions;
 import org.apache.seatunnel.connectors.doris.datatype.DorisTypeConverterV1;
+import org.apache.seatunnel.connectors.doris.datatype.DorisTypeConverterV2;
 import org.apache.seatunnel.connectors.doris.util.DorisCatalogUtil;
 
 import org.apache.commons.lang3.StringUtils;
@@ -389,7 +390,45 @@ public void testWithThreePrimaryKeys() {
                         + "`comment` VARCHAR(500) NULL ,\n"
                         + "`description` STRING NULL \n"
                         + " )\n"
-                        + " partitioned by `id`,`age`,`name`;",
+                        + " partitioned by `id`,`name`,`age`;",
+                result);
+    }
+
+    @Test
+    public void testWithResortedMultiPrimaryKey() {
+        List<Column> columns = new ArrayList<>();
+
+        columns.add(PhysicalColumn.of("id", BasicType.LONG_TYPE, (Long) null, true, null, ""));
+        columns.add(PhysicalColumn.of("name", BasicType.STRING_TYPE, (Long) null, true, null, ""));
+        columns.add(PhysicalColumn.of("age", BasicType.INT_TYPE, (Long) null, true, null, ""));
+
+        String result =
+                DorisCatalogUtil.getCreateTableStatement(
+                        DorisOptions.SAVE_MODE_CREATE_TEMPLATE.defaultValue(),
+                        TablePath.of("test1", "test2"),
+                        CatalogTable.of(
+                                TableIdentifier.of("test", "test1", "test2"),
+                                TableSchema.builder()
+                                        .primaryKey(PrimaryKey.of("", Arrays.asList("age", "id")))
+                                        .columns(columns)
+                                        .build(),
+                                Collections.emptyMap(),
+                                Collections.emptyList(),
+                                ""),
+                        DorisTypeConverterV2.INSTANCE);
+        Assertions.assertEquals(
+                "CREATE TABLE IF NOT EXISTS `test1`.`test2` (\n"
+                        + "`id` BIGINT NULL ,`age` INT NULL ,\n"
+                        + "`name` STRING NULL \n"
+                        + ") ENGINE=OLAP\n"
+                        + " UNIQUE KEY (`id`,`age`)\n"
+                        + "DISTRIBUTED BY HASH (`id`,`age`)\n"
+                        + " PROPERTIES (\n"
+                        + "\"replication_allocation\" = \"tag.location.default: 1\",\n"
+                        + "\"in_memory\" = \"false\",\n"
+                        + "\"storage_format\" = \"V2\",\n"
+                        + "\"disable_auto_compaction\" = \"false\"\n"
+                        + ")",
                 result);
     }
 }