hailin0 commented on code in PR #7131:
URL: https://github.com/apache/seatunnel/pull/7131#discussion_r1671557949
##########
seatunnel-connectors-v2/connector-doris/src/main/java/org/apache/seatunnel/connectors/doris/sink/DorisSinkFactory.java:
##########
@@ -95,17 +100,4 @@ private CatalogTable renameCatalogTable(ReadonlyConfig
options, CatalogTable cat
TableIdentifier.of(tableId.getCatalogName(), databaseName,
null, tableName);
return CatalogTable.of(newTableId, catalogTable);
}
-
- private String replaceName(String original, TableIdentifier tableId) {
- if (tableId.getTableName() != null) {
- original = original.replace(REPLACE_TABLE_NAME_KEY,
tableId.getTableName());
- }
- if (tableId.getSchemaName() != null) {
- original = original.replace(REPLACE_SCHEMA_NAME_KEY,
tableId.getSchemaName());
- }
- if (tableId.getDatabaseName() != null) {
- original = original.replace(REPLACE_DATABASE_NAME_KEY,
tableId.getDatabaseName());
- }
- return original;
Review Comment:
@Hisoka-X Please check this change
##########
seatunnel-connectors-v2/connector-paimon/src/main/java/org/apache/seatunnel/connectors/seatunnel/paimon/sink/PaimonSinkFactory.java:
##########
@@ -36,12 +36,6 @@
@AutoService(Factory.class)
public class PaimonSinkFactory implements TableSinkFactory {
- public static final String REPLACE_TABLE_NAME_KEY = "${table_name}";
-
- public static final String REPLACE_SCHEMA_NAME_KEY = "${schema_name}";
-
- public static final String REPLACE_DATABASE_NAME_KEY = "${database_name}";
-
Review Comment:
@dailai please check this change
##########
seatunnel-connectors-v2/connector-hive/src/main/java/org/apache/seatunnel/connectors/seatunnel/hive/sink/HiveSinkFactory.java:
##########
@@ -63,57 +58,11 @@ public OptionRule optionRule() {
createSink(TableSinkFactoryContext context) {
ReadonlyConfig readonlyConfig = context.getOptions();
CatalogTable catalogTable = context.getCatalogTable();
-
- ReadonlyConfig finalReadonlyConfig =
- generateCurrentReadonlyConfig(readonlyConfig, catalogTable);
- return () -> new HiveSink(finalReadonlyConfig, catalogTable);
Review Comment:
@ruanwenjun please check this change
##########
seatunnel-connectors-v2/connector-iceberg/src/main/java/org/apache/seatunnel/connectors/seatunnel/iceberg/sink/IcebergSinkFactory.java:
##########
@@ -35,12 +35,6 @@
@AutoService(Factory.class)
public class IcebergSinkFactory implements TableSinkFactory {
- public static final String REPLACE_TABLE_NAME_KEY = "${table_name}";
-
- public static final String REPLACE_SCHEMA_NAME_KEY = "${schema_name}";
-
- public static final String REPLACE_DATABASE_NAME_KEY = "${database_name}";
-
Review Comment:
@sunxiaojian please check this change
##########
seatunnel-connectors-v2/connector-druid/src/main/java/org/apache/seatunnel/connectors/druid/sink/DruidSinkFactory.java:
##########
@@ -52,46 +47,6 @@ public OptionRule optionRule() {
public TableSink createSink(TableSinkFactoryContext context) {
ReadonlyConfig readonlyConfig = context.getOptions();
CatalogTable catalogTable = context.getCatalogTable();
-
- ReadonlyConfig finalReadonlyConfig =
- generateCurrentReadonlyConfig(readonlyConfig, catalogTable);
- return () -> new DruidSink(finalReadonlyConfig, catalogTable);
- }
-
- private ReadonlyConfig generateCurrentReadonlyConfig(
- ReadonlyConfig readonlyConfig, CatalogTable catalogTable) {
-
- Map<String, String> configMap = readonlyConfig.toMap();
-
- readonlyConfig
- .getOptional(DATASOURCE)
- .ifPresent(
- tableName -> {
- String replacedPath =
- replaceCatalogTableInPath(tableName,
catalogTable);
- configMap.put(DATASOURCE.key(), replacedPath);
- });
-
- return ReadonlyConfig.fromMap(new HashMap<>(configMap));
- }
-
- private String replaceCatalogTableInPath(String originTableName,
CatalogTable catalogTable) {
Review Comment:
@TaoZex please check this change
##########
seatunnel-connectors-v2/connector-file/connector-file-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/file/factory/BaseMultipleTableFileSinkFactory.java:
##########
@@ -17,76 +17,12 @@
package org.apache.seatunnel.connectors.seatunnel.file.factory;
-import org.apache.seatunnel.shade.com.typesafe.config.Config;
-import org.apache.seatunnel.shade.com.typesafe.config.ConfigValueFactory;
-
-import org.apache.seatunnel.api.configuration.ReadonlyConfig;
-import org.apache.seatunnel.api.sink.SinkReplaceNameConstant;
-import org.apache.seatunnel.api.table.catalog.CatalogTable;
-import org.apache.seatunnel.api.table.catalog.TableIdentifier;
import org.apache.seatunnel.api.table.factory.TableSinkFactory;
import org.apache.seatunnel.api.table.type.SeaTunnelRow;
-import org.apache.seatunnel.connectors.seatunnel.file.config.BaseSinkConfig;
import
org.apache.seatunnel.connectors.seatunnel.file.sink.commit.FileAggregatedCommitInfo;
import
org.apache.seatunnel.connectors.seatunnel.file.sink.commit.FileCommitInfo;
import org.apache.seatunnel.connectors.seatunnel.file.sink.state.FileSinkState;
public abstract class BaseMultipleTableFileSinkFactory
implements TableSinkFactory<
- SeaTunnelRow, FileSinkState, FileCommitInfo,
FileAggregatedCommitInfo> {
-
- // replace the table name in sink config's path
- public ReadonlyConfig generateCurrentReadonlyConfig(
- ReadonlyConfig readonlyConfig, CatalogTable catalogTable) {
- // Copy the config to avoid modifying the original config
- Config config = readonlyConfig.toConfig();
-
- if (config.hasPath(BaseSinkConfig.FILE_PATH.key())) {
- String replacedPath =
- replaceCatalogTableInPath(
- config.getString(BaseSinkConfig.FILE_PATH.key()),
catalogTable);
Review Comment:
@EricJoy2048 please check this change
##########
seatunnel-connectors-v2/connector-elasticsearch/src/main/java/org/apache/seatunnel/connectors/seatunnel/elasticsearch/sink/ElasticsearchSinkFactory.java:
##########
@@ -81,55 +76,14 @@ public OptionRule optionRule() {
@Override
public TableSink createSink(TableSinkFactoryContext context) {
ReadonlyConfig readonlyConfig = context.getOptions();
- CatalogTable catalogTable = context.getCatalogTable();
-
- ReadonlyConfig finalReadonlyConfig =
- generateCurrentReadonlyConfig(readonlyConfig, catalogTable);
-
- String original = finalReadonlyConfig.get(INDEX);
Review Comment:
@CosmosNi @Hisoka-X please check this change
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
