This is an automated email from the ASF dual-hosted git repository. github-merge-queue[bot] pushed a commit to branch gh-readonly-queue/dev/pr-13172-e800766f2fdc394824c055e962d1ee362d881531 in repository https://gitbox.apache.org/repos/asf/seatunnel.git
commit f5374addb396b3515fc2aff358b110ad35fe7874 Author: chovygo <[email protected]> AuthorDate: Tue Nov 10 15:44:38 2026 +0000 [Fix] [Connector-V2] Fix Doris source duplicate table detection and error code typo (#13172) Co-authored-by: zhaowei <[email protected]> --- docs/en/connectors/source/Doris.md | 2 +- docs/zh/connectors/source/Doris.md | 2 +- .../connectors/doris/config/DorisTableConfig.java | 2 +- .../doris/exception/DorisConnectorErrorCode.java | 2 +- .../doris/config/DorisTableConfigTest.java | 68 ++++++++++++++++++++++ 5 files changed, 72 insertions(+), 4 deletions(-) diff --git a/docs/en/connectors/source/Doris.md b/docs/en/connectors/source/Doris.md index cc885a6fec..f06136fd3a 100644 --- a/docs/en/connectors/source/Doris.md +++ b/docs/en/connectors/source/Doris.md @@ -94,7 +94,7 @@ Table list configuration: | doris.batch.size | int | no | 1024 | The maximum value that can be obtained by reading Doris BE once. | | doris.exec.mem.limit | long | no | 2147483648 | Maximum memory that can be used by a single be scan request. The default memory is 2G (2147483648). | -Note: When this configuration corresponds to a single table, you can flatten the configuration items in table_list to the outer layer. If `table_list` is not configured, `database` and `table` must be configured at the outer source level. +Note: When this configuration corresponds to a single table, you can flatten the configuration items in table_list to the outer layer. If `table_list` is not configured, `database` and `table` must be configured at the outer source level. Each `database`.`table` pair in `table_list` must be unique; duplicate entries are rejected at job submission. ### Tips diff --git a/docs/zh/connectors/source/Doris.md b/docs/zh/connectors/source/Doris.md index a6186b7662..19eb315c70 100644 --- a/docs/zh/connectors/source/Doris.md +++ b/docs/zh/connectors/source/Doris.md @@ -94,7 +94,7 @@ import ChangeLog from '../changelog/connector-doris.md'; | doris.batch.size | int | no | 1024 | 每次能够从BE中读取到的最大行数 | | doris.exec.mem.limit | long | no | 2147483648 | 单个be扫描请求可以使用的最大内存。默认内存为2G(2147483648) | -注意: 当此配置对应于单个表时,您可以将table_list中的配置项展平到外层。如果不配置 `table_list`,必须在 source 外层配置 `database` 和 `table`。 +注意: 当此配置对应于单个表时,您可以将table_list中的配置项展平到外层。如果不配置 `table_list`,必须在 source 外层配置 `database` 和 `table`。`table_list` 中的每个 `database`.`table` 必须唯一,重复配置会在作业提交时被拒绝。 ### 提示 diff --git a/seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/config/DorisTableConfig.java b/seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/config/DorisTableConfig.java index 8ca17864ae..af10bfc7e4 100644 --- a/seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/config/DorisTableConfig.java +++ b/seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/config/DorisTableConfig.java @@ -111,7 +111,7 @@ public class DorisTableConfig implements Serializable { .map(DorisTableConfig::getTableIdentifier) .collect(Collectors.toList()); Set<String> tableIdSet = new HashSet<>(tableIds); - if (tableIdSet.size() < tableList.size() - 1) { + if (tableIdSet.size() < tableList.size()) { throw new IllegalArgumentException( "Please configure unique `database`.`table`, not allow null/duplicate: " + tableIds); diff --git a/seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/exception/DorisConnectorErrorCode.java b/seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/exception/DorisConnectorErrorCode.java index a3df598222..0cb48b4742 100644 --- a/seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/exception/DorisConnectorErrorCode.java +++ b/seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/exception/DorisConnectorErrorCode.java @@ -27,7 +27,7 @@ public enum DorisConnectorErrorCode implements SeaTunnelErrorCode { ARROW_READ_FAILED("Doris-05", "arrow read error"), BACKEND_CLIENT_FAILED("Doris-06", "backend client error"), ROW_BATCH_GET_FAILED("Doris-07", "row batch get error"), - SCHEMA_FAILED("Doirs-08", "get schema error"), + SCHEMA_FAILED("Doris-08", "get schema error"), SCAN_BATCH_FAILED("Doris-09", "scan batch error"), RESOURCE_CLOSE_FAILED("Doris-10", "resource close failed"), SCHEMA_CHANGE_FAILED("Doris-11", "schema change failed"), diff --git a/seatunnel-connectors-v2/connector-doris/src/test/java/org/apache/seatunnel/connectors/doris/config/DorisTableConfigTest.java b/seatunnel-connectors-v2/connector-doris/src/test/java/org/apache/seatunnel/connectors/doris/config/DorisTableConfigTest.java new file mode 100644 index 0000000000..16a0d0e505 --- /dev/null +++ b/seatunnel-connectors-v2/connector-doris/src/test/java/org/apache/seatunnel/connectors/doris/config/DorisTableConfigTest.java @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.seatunnel.connectors.doris.config; + +import org.apache.seatunnel.api.configuration.ReadonlyConfig; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class DorisTableConfigTest { + + @Test + public void testDuplicateTableListRejected() { + Map<String, Object> options = new HashMap<>(); + options.put( + "table_list", + Arrays.asList(tableEntry("test_db", "table1"), tableEntry("test_db", "table1"))); + ReadonlyConfig config = ReadonlyConfig.fromMap(options); + + IllegalArgumentException exception = + Assertions.assertThrows( + IllegalArgumentException.class, () -> DorisTableConfig.of(config)); + + Assertions.assertTrue(exception.getMessage().contains("not allow null/duplicate")); + } + + @Test + public void testDistinctTableListReturnsTwoConfigs() { + Map<String, Object> options = new HashMap<>(); + options.put( + "table_list", + Arrays.asList(tableEntry("test_db", "table1"), tableEntry("test_db", "table2"))); + ReadonlyConfig config = ReadonlyConfig.fromMap(options); + + List<DorisTableConfig> result = DorisTableConfig.of(config); + + Assertions.assertEquals(2, result.size()); + Assertions.assertEquals("test_db.table1", result.get(0).getTableIdentifier()); + Assertions.assertEquals("test_db.table2", result.get(1).getTableIdentifier()); + } + + private static Map<String, Object> tableEntry(String database, String table) { + Map<String, Object> entry = new HashMap<>(); + entry.put("database", database); + entry.put("table", table); + return entry; + } +}
