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][Oracle-CDC] Clean unused code #6212

Merged
merged 1 commit into from
Jan 16, 2024
Merged

[Improve][Oracle-CDC] Clean unused code #6212

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
28 changes: 1 addition & 27 deletions .../org/apache/seatunnel/connectors/seatunnel/cdc/oracle/source/OracleIncrementalSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,32 +37,25 @@
import org.apache.seatunnel.connectors.cdc.debezium.DeserializeFormat;
import org.apache.seatunnel.connectors.cdc.debezium.row.DebeziumJsonDeserializeSchema;
import org.apache.seatunnel.connectors.cdc.debezium.row.SeaTunnelRowDebeziumDeserializeSchema;
import org.apache.seatunnel.connectors.seatunnel.cdc.oracle.config.OracleSourceConfig;
import org.apache.seatunnel.connectors.seatunnel.cdc.oracle.config.OracleSourceConfigFactory;
import org.apache.seatunnel.connectors.seatunnel.cdc.oracle.source.offset.RedoLogOffsetFactory;
import org.apache.seatunnel.connectors.seatunnel.jdbc.catalog.JdbcCatalogOptions;

import org.apache.kafka.connect.data.Struct;

import com.google.auto.service.AutoService;
import io.debezium.connector.oracle.OracleConnection;
import io.debezium.jdbc.JdbcConnection;
import io.debezium.relational.Table;
import io.debezium.relational.TableId;
import io.debezium.relational.history.ConnectTableChangeSerializer;
import io.debezium.relational.history.TableChanges;
import lombok.NoArgsConstructor;

import java.sql.SQLException;
import java.time.ZoneId;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import java.util.stream.Collectors;

import static org.apache.seatunnel.connectors.seatunnel.cdc.oracle.utils.OracleConnectionUtils.createOracleConnection;
import static org.apache.seatunnel.connectors.seatunnel.cdc.oracle.utils.OracleTypeUtils.convertFromTable;

@NoArgsConstructor
@AutoService(SeaTunnelSource.class)
public class OracleIncrementalSource<T> extends IncrementalSource<T, JdbcSourceConfig>
Expand Down Expand Up @@ -116,26 +109,7 @@ public DebeziumDeserializationSchema<T> createDebeziumDeserializationSchema(
config.get(JdbcSourceOptions.DEBEZIUM_PROPERTIES));
}

SeaTunnelDataType<SeaTunnelRow> physicalRowType;
if (dataType == null) {
OracleSourceConfig oracleSourceConfig =
(OracleSourceConfig) this.configFactory.create(0);
TableId tableId =
this.dataSourceDialect.discoverDataCollections(oracleSourceConfig).get(0);
Table table;
try (OracleConnection oracleConnection =
createOracleConnection(oracleSourceConfig.getDbzConfiguration())) {
table =
((OracleDialect) dataSourceDialect)
.queryTableSchema(oracleConnection, tableId)
.getTable();
} catch (SQLException e) {
throw new SeaTunnelException(e);
}
physicalRowType = convertFromTable(table);
} else {
physicalRowType = dataType;
}
SeaTunnelDataType<SeaTunnelRow> physicalRowType = dataType;
String zoneId = config.get(JdbcSourceOptions.SERVER_TIME_ZONE);
return (DebeziumDeserializationSchema<T>)
SeaTunnelRowDebeziumDeserializeSchema.builder()
Expand Down
16 changes: 0 additions & 16 deletions ...main/java/org/apache/seatunnel/connectors/seatunnel/cdc/oracle/utils/OracleTypeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,11 @@
import org.apache.seatunnel.api.table.type.LocalTimeType;
import org.apache.seatunnel.api.table.type.PrimitiveByteArrayType;
import org.apache.seatunnel.api.table.type.SeaTunnelDataType;
import org.apache.seatunnel.api.table.type.SeaTunnelRowType;

import io.debezium.relational.Column;
import io.debezium.relational.Table;
import oracle.jdbc.OracleTypes;

import java.sql.Types;
import java.util.List;

/** Utilities for converting from oracle types to SeaTunnel types. */
public class OracleTypeUtils {
Expand Down Expand Up @@ -78,17 +75,4 @@ public static SeaTunnelDataType<?> convertFromColumn(Column column) {
column.typeName(), column.jdbcType()));
}
}

public static SeaTunnelRowType convertFromTable(Table table) {

List<Column> columns = table.columns();
String[] fieldNames = columns.stream().map(Column::name).toArray(String[]::new);

SeaTunnelDataType<?>[] fieldTypes =
columns.stream()
.map(OracleTypeUtils::convertFromColumn)
.toArray(SeaTunnelDataType[]::new);

return new SeaTunnelRowType(fieldNames, fieldTypes);
}
}