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][CDC] Fix chunk start/end parameter type error #4777

Merged
merged 1 commit into from
May 21, 2023
Merged

[Hotfix][CDC] Fix chunk start/end parameter type error #4777

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
8 changes: 4 additions & 4 deletions ...ava/org/apache/seatunnel/connectors/cdc/base/source/split/CompletedSnapshotSplitInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ public class CompletedSnapshotSplitInfo implements Serializable {
private final String splitId;
private final TableId tableId;
private final SeaTunnelRowType splitKeyType;
private final Object splitStart;
private final Object splitEnd;
private final Object[] splitStart;
private final Object[] splitEnd;
private final Offset watermark;

public CompletedSnapshotSplitInfo(
String splitId,
TableId tableId,
SeaTunnelRowType splitKeyType,
Object splitStart,
Object splitEnd,
Object[] splitStart,
Object[] splitEnd,
Offset watermark) {
this.splitId = splitId;
this.tableId = tableId;
Expand Down
8 changes: 4 additions & 4 deletions ...se/src/main/java/org/apache/seatunnel/connectors/cdc/base/source/split/SnapshotSplit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ public class SnapshotSplit extends SourceSplitBase {
private static final long serialVersionUID = 1L;
private final TableId tableId;
private final SeaTunnelRowType splitKeyType;
private final Object splitStart;
private final Object splitEnd;
private final Object[] splitStart;
private final Object[] splitEnd;

private final Offset highWatermark;

public SnapshotSplit(
String splitId,
TableId tableId,
SeaTunnelRowType splitKeyType,
Object splitStart,
Object splitEnd,
Object[] splitStart,
Object[] splitEnd,
Offset highWatermark) {
super(splitId);
this.tableId = tableId;
Expand Down
4 changes: 3 additions & 1 deletion .../apache/seatunnel/connectors/seatunnel/cdc/mysql/source/eumerator/MySqlChunkSplitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,10 @@ private SnapshotSplit createSnapshotSplit(
Object chunkStart,
Object chunkEnd) {
// currently, we only support single split column
Object[] splitStart = chunkStart == null ? null : new Object[] {chunkStart};
Object[] splitEnd = chunkEnd == null ? null : new Object[] {chunkEnd};
return new SnapshotSplit(
splitId(tableId, chunkId), tableId, splitKeyType, chunkStart, chunkEnd, null);
splitId(tableId, chunkId), tableId, splitKeyType, splitStart, splitEnd, null);
}

// ------------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions ...l/connectors/seatunnel/cdc/mysql/source/reader/fetch/scan/MySqlSnapshotSplitReadTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ private void createDataEventsForTable(
selectSql,
snapshotSplit.getSplitStart() == null,
snapshotSplit.getSplitEnd() == null,
new Object[] {snapshotSplit.getSplitStart()},
new Object[] {snapshotSplit.getSplitEnd()},
snapshotSplit.getSplitStart(),
snapshotSplit.getSplitEnd(),
snapshotSplit.getSplitKeyType().getTotalFields(),
connectorConfig.getSnapshotFetchSize());
ResultSet rs = selectStatement.executeQuery()) {
Expand Down
4 changes: 3 additions & 1 deletion ...el/connectors/seatunnel/cdc/sqlserver/source/source/eumerator/SqlServerChunkSplitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,10 @@ private SnapshotSplit createSnapshotSplit(
Object chunkStart,
Object chunkEnd) {
// currently, we only support single split column
Object[] splitStart = chunkStart == null ? null : new Object[] {chunkStart};
Object[] splitEnd = chunkEnd == null ? null : new Object[] {chunkEnd};
return new SnapshotSplit(
splitId(tableId, chunkId), tableId, splitKeyType, chunkStart, chunkEnd, null);
splitId(tableId, chunkId), tableId, splitKeyType, splitStart, splitEnd, null);
}

// ------------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions ...atunnel/cdc/sqlserver/source/source/reader/fetch/scan/SqlServerSnapshotSplitReadTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ private void createDataEventsForTable(
selectSql,
snapshotSplit.getSplitStart() == null,
snapshotSplit.getSplitEnd() == null,
new Object[] {snapshotSplit.getSplitStart()},
new Object[] {snapshotSplit.getSplitEnd()},
snapshotSplit.getSplitStart(),
snapshotSplit.getSplitEnd(),
snapshotSplit.getSplitKeyType().getTotalFields(),
connectorConfig.getSnapshotFetchSize());
ResultSet rs = selectStatement.executeQuery()) {
Expand Down