This is an automated email from the ASF dual-hosted git repository.
wuchunfu pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new bb72d91770 Revert "[Fix][Connector-V2] Fix doris primary key order and
fields order are inconsistent (#7377)" (#7402)
bb72d91770 is described below
commit bb72d9177070e66581a96af7736336379842ea61
Author: Jia Fan <[email protected]>
AuthorDate: Fri Aug 16 15:40:03 2024 +0800
Revert "[Fix][Connector-V2] Fix doris primary key order and fields order
are inconsistent (#7377)" (#7402)
This reverts commit 464da8fb9bc4a01609f548b42fd15f2ba5ae7dae.
---
.../connectors/doris/util/DorisCatalogUtil.java | 8 ++---
.../doris/catalog/DorisCreateTableTest.java | 41 +---------------------
2 files changed, 5 insertions(+), 44 deletions(-)
diff --git
a/seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/util/DorisCatalogUtil.java
b/seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/util/DorisCatalogUtil.java
index dce94c0d0d..5025caed21 100644
---
a/seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/util/DorisCatalogUtil.java
+++
b/seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/util/DorisCatalogUtil.java
@@ -117,10 +117,10 @@ public class DorisCatalogUtil {
String primaryKey = "";
if (tableSchema.getPrimaryKey() != null) {
- 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(","));
+ primaryKey =
+ tableSchema.getPrimaryKey().getColumnNames().stream()
+ .map(r -> "`" + r + "`")
+ .collect(Collectors.joining(","));
}
String uniqueKey = "";
if (!tableSchema.getConstraintKeys().isEmpty()) {
diff --git
a/seatunnel-connectors-v2/connector-doris/src/test/java/org/apache/seatunnel/connectors/doris/catalog/DorisCreateTableTest.java
b/seatunnel-connectors-v2/connector-doris/src/test/java/org/apache/seatunnel/connectors/doris/catalog/DorisCreateTableTest.java
index 8dc508db7b..09a5b6a329 100644
---
a/seatunnel-connectors-v2/connector-doris/src/test/java/org/apache/seatunnel/connectors/doris/catalog/DorisCreateTableTest.java
+++
b/seatunnel-connectors-v2/connector-doris/src/test/java/org/apache/seatunnel/connectors/doris/catalog/DorisCreateTableTest.java
@@ -33,7 +33,6 @@ import org.apache.seatunnel.common.exception.CommonError;
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;
@@ -390,45 +389,7 @@ public class DorisCreateTableTest {
+ "`comment` VARCHAR(500) NULL ,\n"
+ "`description` STRING NULL \n"
+ " )\n"
- + " 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"
- + ")",
+ + " partitioned by `id`,`age`,`name`;",
result);
}
}
