diff --git a/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/OracleConnectorConfig.java b/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/OracleConnectorConfig.java index 05fe85af2..d2da3bd91 100644 --- a/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/OracleConnectorConfig.java +++ b/debezium-connector-oracle/src/main/java/io/debezium/connector/oracle/OracleConnectorConfig.java @@ -168,7 +168,7 @@ public static enum SnapshotMode implements EnumeratedValue { INITIAL("initial", true), /** - * Perform a snapshot of data and schema upon initial startup of a connector. + * Perform a snapshot of the schema but no data upon initial startup of a connector. */ INITIAL_SCHEMA_ONLY("initial_schema_only", false); diff --git a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SourceInfo.java b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SourceInfo.java index 59919a09d..c0786d7f4 100644 --- a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SourceInfo.java +++ b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SourceInfo.java @@ -37,6 +37,7 @@ public class SourceInfo extends AbstractSourceInfo { .build(); private final String serverName; + private Lsn changeLsn; private Lsn commitLsn; private boolean snapshot; @@ -81,7 +82,7 @@ public boolean isSnapshot() { } /** - * @param snapshot - true if the source of even is snapshot phase, nto the database log + * @param snapshot - true if the source of even is snapshot phase, not the database log */ public void setSnapshot(boolean snapshot) { this.snapshot = snapshot; diff --git a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerChangeRecordEmitter.java b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerChangeRecordEmitter.java index ea6b4a287..d828a1ada 100644 --- a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerChangeRecordEmitter.java +++ b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerChangeRecordEmitter.java @@ -17,6 +17,7 @@ * @author Jiri Pechanec */ public class SqlServerChangeRecordEmitter extends RelationalChangeRecordEmitter { + public static final int OP_DELETE = 1; public static final int OP_INSERT = 2; public static final int OP_UPDATE_BEFORE = 3; diff --git a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerConnectorConfig.java b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerConnectorConfig.java index 24510e321..7f28c2740 100644 --- a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerConnectorConfig.java +++ b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerConnectorConfig.java @@ -16,6 +16,8 @@ import io.debezium.config.EnumeratedValue; import io.debezium.config.Field; import io.debezium.config.Field.ValidationOutput; +import io.debezium.connector.sqlserver.SqlServerConnectorConfig.SnapshotLockingMode; +import io.debezium.connector.sqlserver.SqlServerConnectorConfig.SnapshotMode; import io.debezium.document.Document; import io.debezium.heartbeat.Heartbeat; import io.debezium.jdbc.JdbcConfiguration; @@ -30,7 +32,6 @@ * The list of configuration options for SQL Server connector * * @author Jiri Pechanec - * */ public class SqlServerConnectorConfig extends RelationalDatabaseConnectorConfig { @@ -45,7 +46,7 @@ public static enum SnapshotMode implements EnumeratedValue { INITIAL("initial", true), /** - * Perform a snapshot of data and schema upon initial startup of a connector. + * Perform a snapshot of the schema but no data upon initial startup of a connector. */ INITIAL_SCHEMA_ONLY("initial_schema_only", false); @@ -272,6 +273,7 @@ public String getDatabaseName() { /** * Returns a configured (but not yet started) instance of the database history. */ + @Override public DatabaseHistory getDatabaseHistory() { Configuration config = getConfig(); diff --git a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerDatabaseSchema.java b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerDatabaseSchema.java index fa1b91c30..a370538b9 100644 --- a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerDatabaseSchema.java +++ b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerDatabaseSchema.java @@ -69,7 +69,7 @@ public Set getCapturedTables() { return capturedTables; } - private Set determineCapturedTables(SqlServerConnectorConfig connectorConfig, SqlServerConnection connection) throws SQLException { + private static Set determineCapturedTables(SqlServerConnectorConfig connectorConfig, SqlServerConnection connection) throws SQLException { final Set allTableIds = connection.readTableNames(connectorConfig.getDatabaseName(), null, null, new String[] {"TABLE"} ); final Set capturedTables = new HashSet<>(); diff --git a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerSnapshotChangeEventSource.java b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerSnapshotChangeEventSource.java index 1b39ce22e..db62f6ba6 100644 --- a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerSnapshotChangeEventSource.java +++ b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerSnapshotChangeEventSource.java @@ -47,17 +47,17 @@ protected SnapshottingTask getSnapshottingTask(OffsetContext previousOffset) { // found a previous offset and the earlier snapshot has completed if (previousOffset != null && !previousOffset.isSnapshotRunning()) { - LOGGER.info("A previous offset indicating completed snapshot has been found. Neither schema nor data will be snapshotted."); + LOGGER.info("A previous offset indicating a completed snapshot has been found. Neither schema nor data will be snapshotted."); snapshotSchema = false; snapshotData = false; } else { LOGGER.info("No previous offset has been found"); if (connectorConfig.getSnapshotMode().includeData()) { - LOGGER.info("Accroding to the connector configuration both schema and data will be snapshotted"); + LOGGER.info("According to the connector configuration both schema and data will be snapshotted"); } else { - LOGGER.info("Accroding to the connector configuration only schema will be snapshotted"); + LOGGER.info("According to the connector configuration only schema will be snapshotted"); } snapshotData = connectorConfig.getSnapshotMode().includeData(); } @@ -122,7 +122,7 @@ protected void readTableStructure(ChangeEventSourceContext sourceContext, Snapsh throw new InterruptedException("Interrupted while reading structure of schema " + schema); } - LOGGER.info("Reading sturcture of schema '{}'", snapshotContext.catalogName); + LOGGER.info("Reading stucture of schema '{}'", snapshotContext.catalogName); jdbcConnection.readSchema( snapshotContext.tables, snapshotContext.catalogName, diff --git a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerStreamingChangeEventSource.java b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerStreamingChangeEventSource.java index 2f235052d..7edbeeee9 100644 --- a/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerStreamingChangeEventSource.java +++ b/debezium-connector-sqlserver/src/main/java/io/debezium/connector/sqlserver/SqlServerStreamingChangeEventSource.java @@ -215,5 +215,4 @@ public String toString() { return "ChangeTable [tableId=" + tableId + ", resultSet=" + resultSet + ", completed=" + completed + "]"; } } - }