Skip to content

[FLINK-34990][cdc-connector][oracle] Oracle cdc support newly add table #3203

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

Merged
GOODBOY008 merged 3 commits into from
Jul 16, 2024
Merged

[FLINK-34990][cdc-connector][oracle] Oracle cdc support newly add table #3203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bed870
[cdc-connector][oracle] Oracle cdc support newly add table
gong Apr 2, 2024
befa663
[cdc-connector][oracle] Fix code style
gong Apr 2, 2024
0775a30
[cdc-connector][oracle] Address comment
gong Jun 12, 2024
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: 6 additions & 0 deletions ...-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/source/OracleSourceBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,12 @@ public OracleSourceBuilder<T> skipSnapshotBackfill(boolean skipSnapshotBackfill)
return this;
}

/** Whether the {@link OracleIncrementalSource} should scan the newly added tables or not. */
public OracleSourceBuilder<T> scanNewlyAddedTableEnabled(boolean scanNewlyAddedTableEnabled) {
this.configFactory.scanNewlyAddedTableEnabled(scanNewlyAddedTableEnabled);
return this;
}

/**
* Build the {@link OracleIncrementalSource}.
*
Expand Down
5 changes: 3 additions & 2 deletions ...rc/main/java/org/apache/flink/cdc/connectors/oracle/source/config/OracleSourceConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ public OracleSourceConfig(
int connectMaxRetries,
int connectionPoolSize,
String chunkKeyColumn,
boolean skipSnapshotBackfill) {
boolean skipSnapshotBackfill,
boolean scanNewlyAddedTableEnabled) {
super(
startupOptions,
databaseList,
Expand All @@ -89,7 +90,7 @@ public OracleSourceConfig(
connectionPoolSize,
chunkKeyColumn,
skipSnapshotBackfill,
false);
scanNewlyAddedTableEnabled);
this.url = url;
}

Expand Down
3 changes: 2 additions & 1 deletion .../java/org/apache/flink/cdc/connectors/oracle/source/config/OracleSourceConfigFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ public OracleSourceConfig create(int subtaskId) {
connectMaxRetries,
connectionPoolSize,
chunkKeyColumn,
skipSnapshotBackfill);
skipSnapshotBackfill,
scanNewlyAddedTableEnabled);
}
}
15 changes: 11 additions & 4 deletions ...cle-cdc/src/main/java/org/apache/flink/cdc/connectors/oracle/table/OracleTableSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public class OracleTableSource implements ScanTableSource, SupportsReadingMetada
private final String chunkKeyColumn;
private final boolean closeIdleReaders;
private final boolean skipSnapshotBackfill;
private final boolean scanNewlyAddedTableEnabled;

// --------------------------------------------------------------------------------------------
// Mutable attributes
Expand Down Expand Up @@ -113,7 +114,8 @@ public OracleTableSource(
double distributionFactorLower,
@Nullable String chunkKeyColumn,
boolean closeIdleReaders,
boolean skipSnapshotBackfill) {
boolean skipSnapshotBackfill,
boolean scanNewlyAddedTableEnabled) {
this.physicalSchema = physicalSchema;
this.url = url;
this.port = port;
Expand All @@ -139,6 +141,7 @@ public OracleTableSource(
this.chunkKeyColumn = chunkKeyColumn;
this.closeIdleReaders = closeIdleReaders;
this.skipSnapshotBackfill = skipSnapshotBackfill;
this.scanNewlyAddedTableEnabled = scanNewlyAddedTableEnabled;
}

@Override
Expand Down Expand Up @@ -187,6 +190,7 @@ public ScanRuntimeProvider getScanRuntimeProvider(ScanContext scanContext) {
.closeIdleReaders(closeIdleReaders)
.skipSnapshotBackfill(skipSnapshotBackfill)
.chunkKeyColumn(chunkKeyColumn)
.scanNewlyAddedTableEnabled(scanNewlyAddedTableEnabled)
.build();

return SourceProvider.of(oracleChangeEventSource);
Expand Down Expand Up @@ -252,7 +256,8 @@ public DynamicTableSource copy() {
distributionFactorLower,
chunkKeyColumn,
closeIdleReaders,
skipSnapshotBackfill);
skipSnapshotBackfill,
scanNewlyAddedTableEnabled);
source.metadataKeys = metadataKeys;
source.producedDataType = producedDataType;
return source;
Expand Down Expand Up @@ -291,7 +296,8 @@ public boolean equals(Object o) {
&& Objects.equals(distributionFactorLower, that.distributionFactorLower)
&& Objects.equals(chunkKeyColumn, that.chunkKeyColumn)
&& Objects.equals(closeIdleReaders, that.closeIdleReaders)
&& Objects.equals(skipSnapshotBackfill, that.skipSnapshotBackfill);
&& Objects.equals(skipSnapshotBackfill, that.skipSnapshotBackfill)
&& Objects.equals(scanNewlyAddedTableEnabled, that.scanNewlyAddedTableEnabled);
}

@Override
Expand Down Expand Up @@ -321,7 +327,8 @@ public int hashCode() {
distributionFactorLower,
chunkKeyColumn,
closeIdleReaders,
skipSnapshotBackfill);
skipSnapshotBackfill,
scanNewlyAddedTableEnabled);
}

@Override
Expand Down
6 changes: 5 additions & 1 deletion .../src/main/java/org/apache/flink/cdc/connectors/oracle/table/OracleTableSourceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP;
import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE;
import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_INCREMENTAL_SNAPSHOT_ENABLED;
import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_NEWLY_ADDED_TABLE_ENABLED;
import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_SNAPSHOT_FETCH_SIZE;
import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SCAN_STARTUP_MODE;
import static org.apache.flink.cdc.connectors.base.options.SourceOptions.SPLIT_KEY_EVEN_DISTRIBUTION_FACTOR_LOWER_BOUND;
Expand Down Expand Up @@ -106,6 +107,7 @@ public DynamicTableSource createDynamicTableSource(Context context) {

boolean closeIdlerReaders = config.get(SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED);
boolean skipSnapshotBackfill = config.get(SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP);
boolean scanNewlyAddedTableEnabled = config.get(SCAN_NEWLY_ADDED_TABLE_ENABLED);

if (enableParallelRead) {
validateIntegerOption(SCAN_INCREMENTAL_SNAPSHOT_CHUNK_SIZE, splitSize, 1);
Expand Down Expand Up @@ -142,7 +144,8 @@ public DynamicTableSource createDynamicTableSource(Context context) {
distributionFactorLower,
chunkKeyColumn,
closeIdlerReaders,
skipSnapshotBackfill);
skipSnapshotBackfill,
scanNewlyAddedTableEnabled);
}

@Override
Expand Down Expand Up @@ -180,6 +183,7 @@ public Set<ConfigOption<?>> optionalOptions() {
options.add(SCAN_INCREMENTAL_SNAPSHOT_CHUNK_KEY_COLUMN);
options.add(SCAN_INCREMENTAL_CLOSE_IDLE_READER_ENABLED);
options.add(SCAN_INCREMENTAL_SNAPSHOT_BACKFILL_SKIP);
options.add(SCAN_NEWLY_ADDED_TABLE_ENABLED);
return options;
}

Expand Down
Loading