Skip to content

[CDAP-17402] Upgrade debizum version to 1.3.1.Final #110

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
sagarkapare merged 5 commits into from
Dec 15, 2020
Merged

[CDAP-17402] Upgrade debizum version to 1.3.1.Final #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
02e3104
CDAP-17402 Upgrade debezium to 1.3.1.Final version.
sagarkapare Dec 7, 2020
deaca3e
CDAP-17402 Fixed checkstyle issues in mysql.
sagarkapare Dec 7, 2020
e9ac2e4
CDAP-17402 Copied SqlServerConnection class from debezium 1.3.1.Final.
sagarkapare Dec 7, 2020
1a1d83b
CDAP-17402 Fixed checkstyle issues in the SqlServerConnection class t…
sagarkapare Dec 7, 2020
1b96f56
Fixed issues identified while testing.
sagarkapare Dec 14, 2020
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
5 changes: 5 additions & 0 deletions delta-plugins-common/src/main/java/io/cdap/delta/plugin/common/DBSchemaHistory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ public synchronized boolean exists() {
}
}

@Override
public boolean storageExists() {
return true;
}

// TODO: cache history, should only have to read once
private List<HistoryRecord> getHistory() {
List<HistoryRecord> history = new ArrayList<>();
Expand Down
3 changes: 2 additions & 1 deletion delta-plugins-common/src/main/java/io/cdap/delta/plugin/common/Records.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,8 @@ public static Schema convert(org.apache.kafka.connect.data.Schema schema) {
for (Field field : fields) {
cdapFields.add(Schema.Field.of(field.name(), convert(field.schema())));
}
converted = Schema.recordOf(schema.name(), cdapFields);

converted = Schema.recordOf(schema.name() == null ? "dummy.schema.name" : schema.name(), cdapFields);
break;
default:
// should never happen, all values are listed above
Expand Down
11 changes: 9 additions & 2 deletions mysql-delta-plugins/src/main/java/io/cdap/delta/mysql/MySqlEventReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,14 @@
import io.cdap.delta.api.SourceTable;
import io.cdap.delta.plugin.common.DBSchemaHistory;
import io.cdap.delta.plugin.common.NotifyingCompletionCallback;
import io.debezium.DebeziumException;
import io.debezium.config.CommonConnectorConfig;
import io.debezium.config.Configuration;
import io.debezium.connector.mysql.MySqlConnector;
import io.debezium.connector.mysql.MySqlConnectorConfig;
import io.debezium.connector.mysql.MySqlJdbcContext;
import io.debezium.connector.mysql.MySqlValueConverters;
import io.debezium.connector.mysql.antlr.MySqlAntlrDdlParser;
import io.debezium.embedded.EmbeddedEngine;
import io.debezium.jdbc.JdbcConnection;
import io.debezium.jdbc.JdbcValueConverters;
Expand Down Expand Up @@ -132,7 +135,7 @@ public void start(Offset offset) {
}

MySqlValueConverters mySqlValueConverters = getValueConverters(mysqlConf);
DdlParser ddlParser = mysqlConf.getDdlParsingMode().getNewParserInstance(mySqlValueConverters, tableId -> true);
DdlParser ddlParser = new MySqlAntlrDdlParser(mySqlValueConverters, tableId -> true);

ClassLoader oldCL = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
Expand Down Expand Up @@ -179,7 +182,11 @@ private static MySqlValueConverters getValueConverters(MySqlConnectorConfig conf

boolean timeAdjusterEnabled = configuration.getConfig().getBoolean(MySqlConnectorConfig.ENABLE_TIME_ADJUSTER);
return new MySqlValueConverters(decimalMode, timePrecisionMode, bigIntUnsignedMode,
timeAdjusterEnabled ? MySqlEventReader::adjustTemporal : x -> x);
CommonConnectorConfig.BinaryHandlingMode.BYTES,
timeAdjusterEnabled ? MySqlEventReader::adjustTemporal : x -> x,
(message, exception) -> {
throw new DebeziumException(message, exception);
});
}

private static Temporal adjustTemporal(Temporal temporal) {
Expand Down
Loading