Skip to content

[INLONG-8601][Sort] Fix NPE in schema.name of Oracle CDC #8605

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
EMsnap merged 2 commits into from
Jul 28, 2023
Merged

[INLONG-8601][Sort] Fix NPE in schema.name of Oracle CDC #8605

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
070ce04
[INLONG-8601][Sort] Fix NPE in schema.name of Oracle CDC
e-mhui Jul 27, 2023
e8e4b1f
[INLONG-8594][Sort] Fix checkstyle
e-mhui Jul 28, 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
12 changes: 7 additions & 5 deletions ...va/org/apache/inlong/sort/cdc/oracle/debezium/table/RowDataDebeziumDeserializeSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import io.debezium.time.NanoTimestamp;
import io.debezium.time.Timestamp;
import io.debezium.time.ZonedTimestamp;
import org.apache.commons.lang.StringUtils;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.table.data.DecimalData;
import org.apache.flink.table.data.GenericRowData;
Expand Down Expand Up @@ -292,7 +293,7 @@ private static DeserializationRuntimeConverter convertToTime() {

@Override
public Object convert(Object dbzObj, Schema schema) {
if (dbzObj instanceof Long) {
if (dbzObj instanceof Long && StringUtils.isNotBlank(schema.name())) {
// Because Oracle CDC has been shaded, the schema will have the prefix
// 'org.apache.inlong.sort.cdc.oracle.shaded' added,
// so we need to use `schemaName.endsWith()` to determine the Schema type.
Expand Down Expand Up @@ -327,7 +328,7 @@ private static DeserializationRuntimeConverter convertToTimestamp(ZoneId serverT

@Override
public Object convert(Object dbzObj, Schema schema) {
if (dbzObj instanceof Long) {
if (dbzObj instanceof Long && StringUtils.isNotBlank(schema.name())) {
// Because Oracle CDC has been shaded, the schema will have the prefix
// 'org.apache.inlong.sort.cdc.oracle.shaded' added,
// so we need to use `schemaName.endsWith()` to determine the Schema type.
Expand Down Expand Up @@ -462,7 +463,8 @@ public Object convert(Object dbzObj, Schema schema) {
// Because Oracle CDC has been shaded, the schema will have the prefix
// 'org.apache.inlong.sort.cdc.oracle.shaded' added,
// so we need to use `schemaName.endsWith()` to determine the Schema type.
if (schema.name().endsWith(VariableScaleDecimal.LOGICAL_NAME)) {
if (StringUtils.isNotBlank(schema.name())
&& schema.name().endsWith(VariableScaleDecimal.LOGICAL_NAME)) {
SpecialValueDecimal decimal =
VariableScaleDecimal.toLogical((Struct) dbzObj);
bigDecimal = decimal.getDecimalValue().orElse(BigDecimal.ZERO);
Expand Down Expand Up @@ -768,8 +770,8 @@ public Object convert(Object dbzObj, Schema schema, TableChange tableSchema) thr
* @return the extracted data with schema
*/
private Object getValueWithSchema(Object fieldValue, String schemaName) {
if (fieldValue == null) {
return null;
if (fieldValue == null || StringUtils.isBlank(schemaName)) {
return fieldValue;
}
// Because Oracle CDC has been shaded, the schema will have the prefix
// 'org.apache.inlong.sort.cdc.oracle.shaded' added,
Expand Down