Skip to content

[minor][pipeline-connector/sqlserver] Fix SQL Server schema restore without per-record JDBC #4446

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

Open
leonardBang wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[minor][pipeline-connector/sqlserver] Fix SQL Server schema restore without per-record JDBC #4446

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
362c754
[minor][pipeline-connector/sqlserver] Fix SQL Server schema restore w…
leonardBang Jun 18, 2026
51bd2af
Address SQL Server pipeline review comments
leonardBang Jun 24, 2026
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
33 changes: 19 additions & 14 deletions ...g/apache/flink/cdc/connectors/sqlserver/source/reader/SqlServerPipelineRecordEmitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.flink.cdc.common.schema.Schema;
import org.apache.flink.cdc.connectors.base.options.StartupOptions;
import org.apache.flink.cdc.connectors.base.source.meta.offset.OffsetFactory;
import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitBase;
import org.apache.flink.cdc.connectors.base.source.meta.split.SourceSplitState;
import org.apache.flink.cdc.connectors.base.source.metrics.SourceReaderMetrics;
import org.apache.flink.cdc.connectors.base.source.reader.IncrementalSourceRecordEmitter;
Expand Down Expand Up @@ -91,8 +92,7 @@ protected void processElement(
SourceRecord element, SourceOutput<T> output, SourceSplitState splitState)
throws Exception {
if (isSchemaChangeEvent(element) && splitState.isStreamSplitState()) {
restoreCreateTableEventsFromSplitSchemas(
splitState.asStreamSplitState().getTableSchemas());
cacheCreateTableEventsFromSchemas(splitState.asStreamSplitState().getTableSchemas());
}

if (shouldEmitAllCreateTableEventsInSnapshotMode && isBounded) {
Expand All @@ -104,15 +104,20 @@ protected void processElement(
// to downstream to avoid checkpoint timeout.
io.debezium.relational.TableId tableId =
splitState.asSnapshotSplitState().toSourceSplit().getTableId();
emitCreateTableEventIfNeeded(tableId, output);
emitCreateTableEventIfNeeded(tableId, output, splitState);
} else if (isDataChangeRecord(element)) {
// Handle data change events, schema change events are handled downstream directly
io.debezium.relational.TableId tableId = getTableId(element);
emitCreateTableEventIfNeeded(tableId, output);
emitCreateTableEventIfNeeded(tableId, output, splitState);
}
super.processElement(element, output, splitState);
}

@Override
public void applySplit(SourceSplitBase split) {
cacheCreateTableEventsFromSchemas(split.getTableSchemas());
}

@SuppressWarnings("unchecked")
private void emitAllCreateTableEvents(SourceOutput<T> output) {
createTableEventCache.forEach(
Expand All @@ -124,33 +129,33 @@ private void emitAllCreateTableEvents(SourceOutput<T> output) {

@SuppressWarnings("unchecked")
private void emitCreateTableEventIfNeeded(
io.debezium.relational.TableId tableId, SourceOutput<T> output) {
io.debezium.relational.TableId tableId,
SourceOutput<T> output,
SourceSplitState splitState) {
if (alreadySendCreateTableTables.contains(tableId)) {
return;
}

cacheCreateTableEventsFromSchemas(splitState.toSourceSplit().getTableSchemas());
CreateTableEvent createTableEvent = createTableEventCache.get(tableId);
if (createTableEvent != null) {
output.collect((T) createTableEvent);
} else {
// Table not in cache, fetch schema from database
if (createTableEvent == null) {
// The schema should normally be restored from split state. Keep JDBC as a final
// fallback for old savepoints or unexpected cache misses.
try (SqlServerConnection jdbc =
createSqlServerConnection(sourceConfig.getDbzConnectorConfig())) {
createTableEvent = buildCreateTableEvent(jdbc, tableId);
output.collect((T) createTableEvent);
createTableEventCache.put(tableId, createTableEvent);
} catch (SQLException e) {
throw new RuntimeException("Failed to get table schema for " + tableId, e);
}
}
Comment thread
leonardBang marked this conversation as resolved.
output.collect((T) createTableEvent);
alreadySendCreateTableTables.add(tableId);
}

private void restoreCreateTableEventsFromSplitSchemas(
private void cacheCreateTableEventsFromSchemas(
Map<io.debezium.relational.TableId, TableChange> tableSchemas) {
if (!sourceConfig.isIncludeSchemaChanges()
|| tableSchemas == null
|| tableSchemas.isEmpty()) {
if (tableSchemas == null || tableSchemas.isEmpty()) {
return;
}
for (Map.Entry<io.debezium.relational.TableId, TableChange> entry :
Expand Down
Loading
Loading