Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Hotfix][JDBC-SINK] Fix TiDBCatalog without open #4718

Merged
merged 2 commits into from
May 12, 2023
Merged

[Hotfix][JDBC-SINK] Fix TiDBCatalog without open #4718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54ba1ec
[Hotfix][JDBC-SINK] Fix TiDBCatalog without 'open'
ic4y May 8, 2023
bb8c19a
[hotfix][JDBC-SINK] Cancel checking table configuration
ic4y May 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions seatunnel-api/src/main/java/org/apache/seatunnel/api/common/SeaTunnelAPIErrorCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public enum SeaTunnelAPIErrorCode implements SeaTunnelErrorCode {
FACTORY_INITIALIZE_FAILED("API-06", "Factory initialize failed"),
DATABASE_ALREADY_EXISTED("API-07", "Database already existed"),
TABLE_ALREADY_EXISTED("API-08", "Table already existed"),
HANDLE_SAVE_MODE_FAILED("API-09", "Handle save mode failed"),
;

private final String code;
Expand Down
25 changes: 16 additions & 9 deletions ...ctor-jdbc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/sink/JdbcSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.apache.seatunnel.api.table.type.SeaTunnelRowType;
import org.apache.seatunnel.connectors.seatunnel.jdbc.catalog.tidb.TiDBCatalogFactory;
import org.apache.seatunnel.connectors.seatunnel.jdbc.config.JdbcSinkConfig;
import org.apache.seatunnel.connectors.seatunnel.jdbc.exception.JdbcConnectorException;
import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialect;
import org.apache.seatunnel.connectors.seatunnel.jdbc.internal.dialect.JdbcDialectLoader;
import org.apache.seatunnel.connectors.seatunnel.jdbc.state.JdbcAggregatedCommitInfo;
Expand All @@ -57,6 +58,8 @@
import java.util.Map;
import java.util.Optional;

import static org.apache.seatunnel.api.common.SeaTunnelAPIErrorCode.HANDLE_SAVE_MODE_FAILED;

@AutoService(SeaTunnelSink.class)
public class JdbcSink
implements SeaTunnelSink<SeaTunnelRow, JdbcSinkState, XidInfo, JdbcAggregatedCommitInfo>,
Expand Down Expand Up @@ -195,18 +198,22 @@ public void handleSaveMode(DataSaveMode saveMode) {
if (StringUtils.isBlank(jdbcSinkConfig.getDatabase())) {
return;
}
Catalog catalog =
try (Catalog catalog =
new TiDBCatalogFactory()
.createCatalog(
TiDBCatalogFactory.IDENTIFIER,
ReadonlyConfig.fromMap(new HashMap<>(catalogOptions)));
TablePath tablePath =
TablePath.of(jdbcSinkConfig.getDatabase(), jdbcSinkConfig.getTable());
if (!catalog.databaseExists(jdbcSinkConfig.getDatabase())) {
catalog.createDatabase(tablePath, true);
}
if (!catalog.tableExists(tablePath)) {
catalog.createTable(tablePath, catalogTable, true);
ReadonlyConfig.fromMap(new HashMap<>(catalogOptions)))) {
catalog.open();
TablePath tablePath =
TablePath.of(jdbcSinkConfig.getDatabase(), jdbcSinkConfig.getTable());
if (!catalog.databaseExists(jdbcSinkConfig.getDatabase())) {
catalog.createDatabase(tablePath, true);
}
if (!catalog.tableExists(tablePath)) {
catalog.createTable(tablePath, catalogTable, true);
}
} catch (Exception e) {
throw new JdbcConnectorException(HANDLE_SAVE_MODE_FAILED, e);
}
}
}
Expand Down
1 change: 0 additions & 1 deletion ...bc/src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/sink/JdbcSinkFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ public OptionRule optionRule() {
TRANSACTION_TIMEOUT_SEC)
.conditional(IS_EXACTLY_ONCE, false, MAX_RETRIES)
.conditional(GENERATE_SINK_SQL, true, DATABASE)
.conditional(GENERATE_SINK_SQL, true, TABLE)
.conditional(GENERATE_SINK_SQL, false, QUERY)
.build();
}
Expand Down