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

[INLONG-7695][Sort] Fix NPE when running Oracle all database migration jobs #7696

Merged
merged 2 commits into from
Mar 27, 2023
Merged

[INLONG-7695][Sort] Fix NPE when running Oracle all database migration jobs #7696

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
1e9e2b1
[INLONG-7695][Sort] Fix the error of enabling incremental snapshots w…
e-mhui Mar 25, 2023
70eb1ed
[INLONG-7695][Sort] Modify comment
e-mhui Mar 25, 2023
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: 8 additions & 0 deletions ...ase/src/main/java/org/apache/inlong/sort/cdc/base/source/meta/split/SourceSplitState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package org.apache.inlong.sort.cdc.base.source.meta.split;

import org.apache.flink.annotation.Internal;

/** State of the reader, essentially a mutable version of the {@link SourceSplitBase}.
* Copy from com.ververica:flink-cdc-base:2.3.0.
* */
Expand Down Expand Up @@ -50,4 +52,10 @@ public final StreamSplitState asStreamSplitState() {

/** Use the current split state to create a new SourceSplit. */
public abstract SourceSplitBase toSourceSplit();

/** Get the current split. */
@Internal
public SourceSplitBase getSourceSplitBase() {
return split;
}
}
52 changes: 28 additions & 24 deletions ...dc/src/main/java/org/apache/inlong/sort/cdc/oracle/source/reader/OracleRecordEmitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@
import io.debezium.connector.AbstractSourceInfo;
import io.debezium.data.Envelope;
import io.debezium.document.Array;
import io.debezium.relational.TableId;
import io.debezium.relational.history.HistoryRecord;
import io.debezium.relational.history.TableChanges;
import io.debezium.relational.history.TableChanges.TableChange;
import java.util.Map;
import org.apache.flink.api.connector.source.SourceOutput;
import org.apache.flink.util.Collector;
import org.apache.inlong.sort.cdc.base.debezium.DebeziumDeserializationSchema;
Expand All @@ -37,6 +40,7 @@
import org.apache.inlong.sort.cdc.base.source.meta.split.SourceSplitState;
import org.apache.inlong.sort.cdc.base.source.metrics.SourceReaderMetrics;
import org.apache.inlong.sort.cdc.base.source.reader.IncrementalSourceRecordEmitter;
import org.apache.inlong.sort.cdc.base.util.RecordUtils;
import org.apache.kafka.connect.data.Struct;
import org.apache.kafka.connect.source.SourceRecord;
import org.slf4j.Logger;
Expand Down Expand Up @@ -76,41 +80,41 @@ protected void processElement(
splitState.asStreamSplitState().recordSchema(tableChange.getId(), tableChange);
}
if (includeSchemaChanges) {
emitElement(element, output, splitState);
emitElement(element, output);
}
} else if (isDataChangeRecord(element)) {
if (splitState.isStreamSplitState()) {
Offset position = getOffsetPosition(element);
splitState.asStreamSplitState().setStartingOffset(position);
}
reportMetrics(element);
emitElement(element, output, splitState);
final Map<TableId, TableChange> tableSchemas =
splitState.getSourceSplitBase().getTableSchemas();
final TableChange tableSchema =
tableSchemas.getOrDefault(RecordUtils.getTableId(element), null);
debeziumDeserializationSchema.deserialize(element, new Collector<T>() {

@Override
public void collect(T record) {
Struct value = (Struct) element.value();
Struct source = value.getStruct(Envelope.FieldName.SOURCE);
String dbName = source.getString(AbstractSourceInfo.DATABASE_NAME_KEY);
String schemaName = source.getString(AbstractSourceInfo.SCHEMA_NAME_KEY);
String tableName = source.getString(AbstractSourceInfo.TABLE_NAME_KEY);
sourceReaderMetrics
.outputMetrics(dbName, schemaName, tableName, splitState.isSnapshotSplitState(), value);
output.collect(record);
}

@Override
public void close() {

}
}, tableSchema);
} else {
// unknown element
LOG.info("Meet unknown element {}, just skip.", element);
}
}

protected void emitElement(SourceRecord element, SourceOutput<T> output,
SourceSplitState splitState) throws Exception {
debeziumDeserializationSchema.deserialize(element, new Collector<T>() {

@Override
public void collect(T record) {
Struct value = (Struct) element.value();
Struct source = value.getStruct(Envelope.FieldName.SOURCE);
String dbName = source.getString(AbstractSourceInfo.DATABASE_NAME_KEY);
String schemaName = source.getString(AbstractSourceInfo.SCHEMA_NAME_KEY);
String tableName = source.getString(AbstractSourceInfo.TABLE_NAME_KEY);
sourceReaderMetrics
.outputMetrics(dbName, schemaName, tableName, splitState.isSnapshotSplitState(), value);
output.collect(record);
}

@Override
public void close() {

}
});
}
}