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

[Improve][Jdbc] Improve ddl write validate #8158

Merged
merged 1 commit into from
Nov 28, 2024
Merged

[Improve][Jdbc] Improve ddl write validate #8158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...ain/java/org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/JdbcDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ default boolean columnExists(Connection connection, TablePath tablePath, String
default void applySchemaChange(
Connection connection, TablePath tablePath, AlterTableAddColumnEvent event)
throws SQLException {
boolean sameCatalog = event.getSourceDialectName().equals(dialectName());
boolean sameCatalog = StringUtils.equals(dialectName(), event.getSourceDialectName());
BasicTypeDefine typeDefine = getTypeConverter().reconvert(event.getColumn());
String columnType =
sameCatalog ? event.getColumn().getSourceType() : typeDefine.getColumnType();
Expand Down Expand Up @@ -613,7 +613,7 @@ default void applySchemaChange(
return;
}

boolean sameCatalog = event.getSourceDialectName().equals(dialectName());
boolean sameCatalog = StringUtils.equals(dialectName(), event.getSourceDialectName());
BasicTypeDefine typeDefine = getTypeConverter().reconvert(event.getColumn());
String columnType =
sameCatalog ? event.getColumn().getSourceType() : typeDefine.getColumnType();
Expand Down Expand Up @@ -675,7 +675,7 @@ default void applySchemaChange(
Connection connection, TablePath tablePath, AlterTableModifyColumnEvent event)
throws SQLException {

boolean sameCatalog = event.getSourceDialectName().equals(dialectName());
boolean sameCatalog = StringUtils.equals(dialectName(), event.getSourceDialectName());
BasicTypeDefine typeDefine = getTypeConverter().reconvert(event.getColumn());
String columnType =
sameCatalog ? event.getColumn().getSourceType() : typeDefine.getColumnType();
Expand Down
2 changes: 1 addition & 1 deletion ...org/apache/seatunnel/connectors/seatunnel/jdbc/internal/dialect/oracle/OracleDialect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ private String buildUpdateColumnSQL(
throw new IllegalArgumentException("Unsupported AlterTableColumnEvent: " + event);
}

boolean sameCatalog = event.getSourceDialectName().equals(dialectName());
boolean sameCatalog = StringUtils.equals(dialectName(), event.getSourceDialectName());
BasicTypeDefine typeDefine = getTypeConverter().reconvert(column);
String columnType = sameCatalog ? column.getSourceType() : typeDefine.getColumnType();
StringBuilder sqlBuilder =
Expand Down
26 changes: 1 addition & 25 deletions ...main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/sink/AbstractJdbcSinkWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,9 @@
import org.apache.seatunnel.api.sink.SupportSchemaEvolutionSinkWriter;
import org.apache.seatunnel.api.table.catalog.TablePath;
import org.apache.seatunnel.api.table.catalog.TableSchema;
import org.apache.seatunnel.api.table.schema.event.AlterTableColumnEvent;
import org.apache.seatunnel.api.table.schema.event.AlterTableColumnsEvent;
import org.apache.seatunnel.api.table.schema.event.SchemaChangeEvent;
import org.apache.seatunnel.api.table.schema.handler.TableSchemaChangeEventDispatcher;
import org.apache.seatunnel.api.table.type.SeaTunnelRow;
import org.apache.seatunnel.common.utils.SeaTunnelException;
import org.apache.seatunnel.connectors.seatunnel.jdbc.config.JdbcSinkConfig;
import org.apache.seatunnel.connectors.seatunnel.jdbc.exception.JdbcConnectorErrorCode;
import org.apache.seatunnel.connectors.seatunnel.jdbc.exception.JdbcConnectorException;
Expand All @@ -39,13 +36,10 @@
import org.apache.seatunnel.connectors.seatunnel.jdbc.state.JdbcSinkState;
import org.apache.seatunnel.connectors.seatunnel.jdbc.state.XidInfo;

import org.apache.commons.lang3.StringUtils;

import lombok.extern.slf4j.Slf4j;

import java.io.IOException;
import java.sql.Connection;
import java.util.List;

@Slf4j
public abstract class AbstractJdbcSinkWriter<ResourceT>
Expand All @@ -65,29 +59,11 @@ public abstract class AbstractJdbcSinkWriter<ResourceT>

@Override
public void applySchemaChange(SchemaChangeEvent event) throws IOException {
if (event instanceof AlterTableColumnsEvent) {
AlterTableColumnsEvent alterTableColumnsEvent = (AlterTableColumnsEvent) event;
List<AlterTableColumnEvent> events = alterTableColumnsEvent.getEvents();
for (AlterTableColumnEvent alterTableColumnEvent : events) {
String sourceDialectName = alterTableColumnEvent.getSourceDialectName();
if (StringUtils.isBlank(sourceDialectName)) {
throw new SeaTunnelException(
"The sourceDialectName in AlterTableColumnEvent can not be empty. event: "
+ event);
}
processSchemaChangeEvent(alterTableColumnEvent);
}
} else {
log.warn("We only support AlterTableColumnsEvent, but actual event is " + event);
}
}

protected void processSchemaChangeEvent(AlterTableColumnEvent event) throws IOException {
this.tableSchema = tableSchemaChanger.reset(tableSchema).apply(event);
reOpenOutputFormat(event);
}

protected void reOpenOutputFormat(AlterTableColumnEvent event) throws IOException {
protected void reOpenOutputFormat(SchemaChangeEvent event) throws IOException {
this.prepareCommit();
JdbcConnectionProvider refreshTableSchemaConnectionProvider =
dialect.getJdbcConnectionProvider(jdbcSinkConfig.getJdbcConnectionConfig());
Expand Down