From b797201263aa6ee84cb8c1c3227261e32111c647 Mon Sep 17 00:00:00 2001 From: Vojtech Juranek Date: Tue, 6 Sep 2022 14:18:17 +0200 Subject: [PATCH] DBZ-5043 Rename DB_HISTORY_PATH to SCHEMA_HISTORY_PATH --- .../connector/mysql/BinlogReaderBufferIT.java | 18 +++---- .../mysql/IncrementalSnapshotIT.java | 6 +-- .../mysql/MultiTableStatementIT.java | 8 +-- .../connector/mysql/MySqlBinaryModeIT.java | 8 +-- .../connector/mysql/MySqlConnectorIT.java | 50 +++++++++---------- .../connector/mysql/MySqlConnectorJsonIT.java | 8 +-- .../mysql/MySqlConnectorRegressionIT.java | 8 +-- .../connector/mysql/MySqlDateTimeInKeyIT.java | 8 +-- .../connector/mysql/MySqlDecimalColumnIT.java | 8 +-- .../connector/mysql/MySqlDecimalIT.java | 8 +-- .../connector/mysql/MySqlEnumColumnIT.java | 8 +-- .../mysql/MySqlFixedLengthBinaryColumnIT.java | 8 +-- .../connector/mysql/MySqlFloatIT.java | 8 +-- .../connector/mysql/MySqlGeometryIT.java | 8 +-- .../connector/mysql/MySqlMetricsIT.java | 18 +++---- .../connector/mysql/MySqlNumericColumnIT.java | 8 +-- .../connector/mysql/MySqlRestartIT.java | 8 +-- .../connector/mysql/MySqlSchemaHistoryIT.java | 8 +-- .../mysql/MySqlSchemaMigrationIT.java | 8 +-- .../MySqlSchemaNameAdjustmentModeIT.java | 8 +-- .../mysql/MySqlSourceTypeInSchemaIT.java | 8 +-- .../mysql/MySqlTableAndColumnCommentIT.java | 8 +-- .../MySqlTableMaintenanceStatementsIT.java | 8 +-- .../mysql/MySqlTimestampColumnIT.java | 8 +-- .../connector/mysql/MySqlTinyIntIT.java | 8 +-- .../mysql/MySqlTopicNamingStrategyIT.java | 8 +-- .../mysql/MySqlUnsignedIntegerIT.java | 8 +-- .../debezium/connector/mysql/MySqlYearIT.java | 8 +-- .../mysql/MysqlDefaultDatabaseCharsetIT.java | 8 +-- .../mysql/MysqlDefaultGeneratedValueIT.java | 8 +-- .../mysql/MysqlDefaultValueAllZeroTimeIT.java | 8 +-- .../connector/mysql/MysqlDefaultValueIT.java | 8 +-- .../mysql/MysqlNonUtfDatabaseCharsetIT.java | 8 +-- .../connector/mysql/SnapshotSourceIT.java | 8 +-- .../connector/mysql/StreamingSourceIT.java | 16 +++--- .../mysql/TopicNameSanitizationIT.java | 8 +-- .../mysql/TransactionMetadataIT.java | 8 +-- .../connector/mysql/TransactionPayloadIT.java | 8 +-- .../connector/mysql/zzz/ZZZGtidSetIT.java | 20 ++++---- .../IncrementalSnapshotCaseSensitiveIT.java | 2 +- .../oracle/IncrementalSnapshotIT.java | 2 +- .../connector/oracle/LogMinerHelperIT.java | 2 +- .../connector/oracle/OracleBinaryModeIT.java | 2 +- .../oracle/OracleBlobDataTypesIT.java | 2 +- .../oracle/OracleClobDataTypeIT.java | 2 +- .../oracle/OracleConnectorFilterIT.java | 2 +- .../connector/oracle/OracleConnectorIT.java | 4 +- .../oracle/OracleDefaultValueIT.java | 2 +- .../connector/oracle/OracleNumberOneIT.java | 2 +- .../oracle/OracleRowIdDataTypeIT.java | 2 +- .../oracle/OracleSchemaMigrationIT.java | 2 +- .../connector/oracle/OutboxEventRouterIT.java | 2 +- .../oracle/SchemaHistoryTopicIT.java | 2 +- .../debezium/connector/oracle/SignalsIT.java | 2 +- .../connector/oracle/SnapshotDatatypesIT.java | 2 +- .../oracle/SnapshotSelectOverridesIT.java | 2 +- .../oracle/StreamingDatatypesIT.java | 2 +- .../oracle/TransactionMetadataIT.java | 2 +- .../oracle/logminer/FlushStrategyIT.java | 2 +- .../processor/AbstractProcessorTest.java | 2 +- .../connector/oracle/util/TestHelper.java | 4 +- .../AbstractSqlServerDatatypesTest.java | 2 +- .../sqlserver/CaseSensitivenessIT.java | 2 +- .../EventProcessingFailureHandlingIT.java | 2 +- .../sqlserver/IncrementalSnapshotIT.java | 2 +- .../IncrementalSnapshotWithRecompileIT.java | 2 +- .../sqlserver/SQLServerNumericColumnIT.java | 2 +- .../sqlserver/SchemaHistoryTopicIT.java | 2 +- .../connector/sqlserver/SnapshotIT.java | 4 +- .../SnapshotWithSelectOverridesIT.java | 2 +- .../sqlserver/SpecialCharsInNamesIT.java | 6 +-- .../sqlserver/SqlServerBinaryModeIT.java | 2 +- .../sqlserver/SqlServerChangeTableSetIT.java | 4 +- .../sqlserver/SqlServerConnectorIT.java | 6 +-- ...qlServerConnectorMultiPartitionModeIT.java | 2 +- .../SqlServerSchemaNameAdjustmentModeIT.java | 2 +- .../TablesWithUniqueIndexOnlyIT.java | 2 +- .../sqlserver/TablesWithoutPrimaryKeyIT.java | 2 +- .../sqlserver/TransactionMetadataIT.java | 2 +- .../connector/sqlserver/util/TestHelper.java | 4 +- .../AbstractIncrementalSnapshotTest.java | 2 +- 81 files changed, 247 insertions(+), 247 deletions(-) diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/BinlogReaderBufferIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/BinlogReaderBufferIT.java index c0d241cd1..58d5d93d2 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/BinlogReaderBufferIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/BinlogReaderBufferIT.java @@ -35,11 +35,11 @@ @SkipWhenDatabaseVersion(check = LESS_THAN, major = 5, minor = 6, reason = "DDL uses fractional second data types, not supported until MySQL 5.6") public class BinlogReaderBufferIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-connect.txt").toAbsolutePath(); + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-connect.txt").toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("myServer1", "connector_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private final UniqueDatabase RO_DATABASE = new UniqueDatabase("myServer2", "connector_test_ro", DATABASE) - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -49,7 +49,7 @@ public void beforeEach() { DATABASE.createAndInitialize(); RO_DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -58,7 +58,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } @@ -86,7 +86,7 @@ public void shouldCorrectlyManageRollback() throws SQLException, InterruptedExce .with(MySqlConnectorConfig.SCHEMA_HISTORY, FileSchemaHistory.class) .with(MySqlConnectorConfig.INCLUDE_SCHEMA_CHANGES, true) .with(MySqlConnectorConfig.BUFFER_SIZE_FOR_BINLOG_READER, 10_000) - .with(FileSchemaHistory.FILE_PATH, DB_HISTORY_PATH) + .with(FileSchemaHistory.FILE_PATH, SCHEMA_HISTORY_PATH) .build(); // Start the connector ... @@ -153,7 +153,7 @@ public void shouldProcessSavepoint() throws SQLException, InterruptedException { .with(MySqlConnectorConfig.DATABASE_INCLUDE_LIST, DATABASE.getDatabaseName()) .with(MySqlConnectorConfig.SCHEMA_HISTORY, FileSchemaHistory.class) .with(MySqlConnectorConfig.INCLUDE_SCHEMA_CHANGES, true) - .with(FileSchemaHistory.FILE_PATH, DB_HISTORY_PATH) + .with(FileSchemaHistory.FILE_PATH, SCHEMA_HISTORY_PATH) .build(); // Start the connector ... @@ -215,7 +215,7 @@ public void shouldProcessLargeTransaction() throws SQLException, InterruptedExce .with(MySqlConnectorConfig.SCHEMA_HISTORY, FileSchemaHistory.class) .with(MySqlConnectorConfig.INCLUDE_SCHEMA_CHANGES, true) .with(MySqlConnectorConfig.BUFFER_SIZE_FOR_BINLOG_READER, 9) - .with(FileSchemaHistory.FILE_PATH, DB_HISTORY_PATH) + .with(FileSchemaHistory.FILE_PATH, SCHEMA_HISTORY_PATH) .build(); // Start the connector ... @@ -285,7 +285,7 @@ public void shouldProcessRolledBackSavepoint() throws SQLException, InterruptedE .with(MySqlConnectorConfig.DATABASE_INCLUDE_LIST, DATABASE.getDatabaseName()) .with(MySqlConnectorConfig.SCHEMA_HISTORY, FileSchemaHistory.class) .with(MySqlConnectorConfig.INCLUDE_SCHEMA_CHANGES, true) - .with(FileSchemaHistory.FILE_PATH, DB_HISTORY_PATH) + .with(FileSchemaHistory.FILE_PATH, SCHEMA_HISTORY_PATH) .build(); // Start the connector ... diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/IncrementalSnapshotIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/IncrementalSnapshotIT.java index e932c2353..2fdb5c944 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/IncrementalSnapshotIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/IncrementalSnapshotIT.java @@ -42,14 +42,14 @@ public class IncrementalSnapshotIT extends AbstractIncrementalSnapshotWithSchemaChangesSupportTest { protected static final String SERVER_NAME = "is_test"; - protected final UniqueDatabase DATABASE = new UniqueDatabase(SERVER_NAME, "incremental_snapshot-test").withDbHistoryPath(DB_HISTORY_PATH); + protected final UniqueDatabase DATABASE = new UniqueDatabase(SERVER_NAME, "incremental_snapshot-test").withDbHistoryPath(SCHEMA_HISTORY_PATH); @Before public void before() throws SQLException { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -58,7 +58,7 @@ public void after() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MultiTableStatementIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MultiTableStatementIT.java index 9ef0c1b5f..2bc5d2b77 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MultiTableStatementIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MultiTableStatementIT.java @@ -26,7 +26,7 @@ */ public class MultiTableStatementIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-json.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-json.txt") .toAbsolutePath(); private UniqueDatabase DATABASE; @@ -36,11 +36,11 @@ public class MultiTableStatementIT extends AbstractConnectorTest { public void beforeEach() { stopConnector(); DATABASE = new UniqueDatabase("multitable", "multitable_dbz_871") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -49,7 +49,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlBinaryModeIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlBinaryModeIT.java index cb813fe79..7d1fc2cca 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlBinaryModeIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlBinaryModeIT.java @@ -30,10 +30,10 @@ */ public class MySqlBinaryModeIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-binary-mode.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-binary-mode.txt") .toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("binarymodeit", "binary_mode_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -42,7 +42,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -51,7 +51,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlConnectorIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlConnectorIT.java index bcd432706..2a21312d7 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlConnectorIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlConnectorIT.java @@ -66,11 +66,11 @@ @SkipWhenDatabaseVersion(check = LESS_THAN, major = 5, minor = 6, reason = "DDL uses fractional second data types, not supported until MySQL 5.6") public class MySqlConnectorIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-connect.txt").toAbsolutePath(); + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-connect.txt").toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("myServer1", "connector_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private final UniqueDatabase RO_DATABASE = new UniqueDatabase("myServer2", "connector_test_ro", DATABASE) - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); // Defines how many initial events are generated from loading the test databases. private static final int PRODUCTS_TABLE_EVENT_COUNT = 9; @@ -85,7 +85,7 @@ public void beforeEach() { DATABASE.createAndInitialize(); RO_DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -94,7 +94,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } @@ -107,7 +107,7 @@ public void shouldNotStartWithInvalidConfiguration() { .with(AbstractTopicNamingStrategy.TOPIC_PREFIX, "myserver") .with(KafkaSchemaHistory.TOPIC, "myserver") .with(MySqlConnectorConfig.SCHEMA_HISTORY, FileSchemaHistory.class) - .with(FileSchemaHistory.FILE_PATH, DB_HISTORY_PATH) + .with(FileSchemaHistory.FILE_PATH, SCHEMA_HISTORY_PATH) .build(); // we expect the engine will log at least one error, so preface it ... @@ -123,7 +123,7 @@ public void shouldNotStartWithInvalidConfiguration() { public void shouldFailToValidateInvalidConfiguration() { Configuration config = Configuration.create() .with(MySqlConnectorConfig.SCHEMA_HISTORY, FileSchemaHistory.class) - .with(FileSchemaHistory.FILE_PATH, DB_HISTORY_PATH) + .with(FileSchemaHistory.FILE_PATH, SCHEMA_HISTORY_PATH) .build(); MySqlConnector connector = new MySqlConnector(); Config result = connector.validate(config.asMap()); @@ -288,7 +288,7 @@ private void shouldConsumeAllEventsFromDatabaseUsingSnapshotByField(Field dbIncl .with(dbIncludeListField, DATABASE.getDatabaseName()) .with(MySqlConnectorConfig.SCHEMA_HISTORY, FileSchemaHistory.class) .with(MySqlConnectorConfig.INCLUDE_SCHEMA_CHANGES, true) - .with(FileSchemaHistory.FILE_PATH, DB_HISTORY_PATH) + .with(FileSchemaHistory.FILE_PATH, SCHEMA_HISTORY_PATH) .build(); // Start the connector ... @@ -704,7 +704,7 @@ public void shouldUseOverriddenSelectStatementDuringSnapshotting() throws SQLExc .with(SchemaHistory.STORE_ONLY_CAPTURED_TABLES_DDL, true) .with(MySqlConnectorConfig.SCHEMA_HISTORY, FileSchemaHistory.class) .with(MySqlConnectorConfig.INCLUDE_SCHEMA_CHANGES, true) - .with(FileSchemaHistory.FILE_PATH, DB_HISTORY_PATH) + .with(FileSchemaHistory.FILE_PATH, SCHEMA_HISTORY_PATH) .build(); // Start the connector ... @@ -754,7 +754,7 @@ public void shouldUseMultipleOverriddenSelectStatementsDuringSnapshotting() thro String.format("SELECT * from %s.products_on_hand where product_id>=108 order by product_id", DATABASE.getDatabaseName())) .with(MySqlConnectorConfig.SCHEMA_HISTORY, FileSchemaHistory.class) .with(MySqlConnectorConfig.INCLUDE_SCHEMA_CHANGES, true) - .with(FileSchemaHistory.FILE_PATH, DB_HISTORY_PATH) + .with(FileSchemaHistory.FILE_PATH, SCHEMA_HISTORY_PATH) .build(); // Start the connector ... @@ -783,7 +783,7 @@ public void shouldUseMultipleOverriddenSelectStatementsDuringSnapshotting() thro @Test @FixFor("DBZ-977") public void shouldIgnoreAlterTableForNonCapturedTablesNotStoredInHistory() throws SQLException, InterruptedException { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); final String tables = String.format("%s.customers", DATABASE.getDatabaseName(), DATABASE.getDatabaseName()); config = DATABASE.defaultConfig() @@ -820,7 +820,7 @@ public void shouldIgnoreAlterTableForNonCapturedTablesNotStoredInHistory() throw @Test @FixFor("DBZ-1201") public void shouldSaveSetCharacterSetWhenStoringOnlyCapturededTables() throws SQLException, InterruptedException { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); config = DATABASE.defaultConfig() .with(MySqlConnectorConfig.DATABASE_INCLUDE_LIST, "no_" + DATABASE.getDatabaseName()) @@ -843,7 +843,7 @@ public void shouldSaveSetCharacterSetWhenStoringOnlyCapturededTables() throws SQ @Test @FixFor("DBZ-1246") public void shouldProcessCreateUniqueIndex() throws SQLException, InterruptedException { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); final String tables = String.format("%s.migration_test", DATABASE.getDatabaseName(), DATABASE.getDatabaseName()); config = DATABASE.defaultConfig() @@ -894,7 +894,7 @@ public void shouldProcessCreateUniqueIndex() throws SQLException, InterruptedExc @Test @FixFor("DBZ-977") public void shouldIgnoreAlterTableForNonCapturedTablesStoredInHistory() throws SQLException, InterruptedException { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); final String tables = String.format("%s.customers", DATABASE.getDatabaseName(), DATABASE.getDatabaseName()); config = DATABASE.defaultConfig() @@ -932,7 +932,7 @@ public void shouldIgnoreAlterTableForNonCapturedTablesStoredInHistory() throws S @Test @FixFor("DBZ-1264") public void shouldIgnoreCreateIndexForNonCapturedTablesNotStoredInHistory() throws SQLException, InterruptedException { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); final String tables = String.format("%s.customers", DATABASE.getDatabaseName(), DATABASE.getDatabaseName()); config = DATABASE.defaultConfig() @@ -971,7 +971,7 @@ public void shouldIgnoreCreateIndexForNonCapturedTablesNotStoredInHistory() thro @Test @FixFor("DBZ-683") public void shouldReceiveSchemaForNonWhitelistedTablesAndDatabases() throws SQLException, InterruptedException { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); final String tables = String.format("%s.customers,%s.orders", DATABASE.getDatabaseName(), DATABASE.getDatabaseName()); config = DATABASE.defaultConfig() @@ -1009,7 +1009,7 @@ public void shouldReceiveSchemaForNonWhitelistedTablesAndDatabases() throws SQLE @Test @FixFor("DBZ-1546") public void shouldHandleIncludeListTables() throws SQLException, InterruptedException { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); final String tables = String.format("%s.customers, %s.orders", DATABASE.getDatabaseName(), DATABASE.getDatabaseName()); config = DATABASE.defaultConfig() @@ -1035,7 +1035,7 @@ public void shouldHandleIncludeListTables() throws SQLException, InterruptedExce @Test public void shouldHandleIncludedTables() throws SQLException, InterruptedException { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); final String tables = String.format("%s.customers, %s.orders", DATABASE.getDatabaseName(), DATABASE.getDatabaseName()); config = DATABASE.defaultConfig() @@ -1118,7 +1118,7 @@ private Struct getAfter(SourceRecord record) { @Test public void shouldConsumeEventsWithNoSnapshot() throws SQLException, InterruptedException { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); // Use the DB configuration to define the connector's configuration ... config = RO_DATABASE.defaultConfig() @@ -1164,7 +1164,7 @@ public void shouldConsumeEventsWithNoSnapshot() throws SQLException, Interrupted @Test @FixFor("DBZ-1962") public void shouldConsumeEventsWithIncludedColumns() throws SQLException, InterruptedException { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); // Use the DB configuration to define the connector's configuration ... config = RO_DATABASE.defaultConfig() @@ -1211,7 +1211,7 @@ public void shouldConsumeEventsWithIncludedColumns() throws SQLException, Interr @Test @FixFor("DBZ-2525") public void shouldConsumeEventsWithIncludedColumnsForKeywordNamedTable() throws SQLException, InterruptedException { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); try (MySqlTestConnection db = MySqlTestConnection.forTestDatabase(RO_DATABASE.getDatabaseName())) { try (JdbcConnection connection = db.connect()) { @@ -1269,7 +1269,7 @@ public void shouldConsumeEventsWithIncludedColumnsForKeywordNamedTable() throws @Test public void shouldConsumeEventsWithMaskedAndBlacklistedColumns() throws SQLException, InterruptedException { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); // Use the DB configuration to define the connector's configuration ... config = RO_DATABASE.defaultConfig() @@ -1325,7 +1325,7 @@ public void shouldConsumeEventsWithMaskedAndBlacklistedColumns() throws SQLExcep @Test @FixFor("DBZ-1692") public void shouldConsumeEventsWithMaskedHashedColumns() throws InterruptedException { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); // Use the DB configuration to define the connector's configuration ... config = RO_DATABASE.defaultConfig() @@ -1377,7 +1377,7 @@ public void shouldConsumeEventsWithMaskedHashedColumns() throws InterruptedExcep @Test @FixFor("DBZ-1972") public void shouldConsumeEventsWithTruncatedColumns() throws InterruptedException { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); // Use the DB configuration to define the connector's configuration ... config = RO_DATABASE.defaultConfig() @@ -2243,7 +2243,7 @@ public void shouldRewriteIdentityKeyWithMsgKeyColumnsFieldRegexValidation() thro @Test @FixFor("DBZ-1292") public void shouldOutputRecordsInCloudEventsFormat() throws Exception { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); final String tableName = "products"; diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlConnectorJsonIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlConnectorJsonIT.java index 9b6f361ab..1b78573a0 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlConnectorJsonIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlConnectorJsonIT.java @@ -34,9 +34,9 @@ @SkipWhenDatabaseVersion(check = LESS_THAN, major = 5, minor = 7, reason = "JSON data type was not added until MySQL 5.7") public class MySqlConnectorJsonIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-json.txt").toAbsolutePath(); + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-json.txt").toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("jsonit", "json_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -45,7 +45,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -54,7 +54,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlConnectorRegressionIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlConnectorRegressionIT.java index c98718e91..75e8b2763 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlConnectorRegressionIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlConnectorRegressionIT.java @@ -51,9 +51,9 @@ @SkipWhenDatabaseVersion(check = LESS_THAN, major = 5, minor = 6, reason = "DDL uses fractional second data types, not supported until MySQL 5.6") public class MySqlConnectorRegressionIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-regression.txt").toAbsolutePath(); + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-regression.txt").toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("regression", "regression_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private static final TemporalAdjuster ADJUSTER = MySqlValueConverters::adjustTemporal; @@ -64,7 +64,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -73,7 +73,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlDateTimeInKeyIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlDateTimeInKeyIT.java index 55f2742ed..963bc06b7 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlDateTimeInKeyIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlDateTimeInKeyIT.java @@ -25,10 +25,10 @@ public class MySqlDateTimeInKeyIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-decimal-column.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-decimal-column.txt") .toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("pkdb", "datetime_key_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -37,7 +37,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -46,7 +46,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlDecimalColumnIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlDecimalColumnIT.java index ad3ba5d09..03eb4d047 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlDecimalColumnIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlDecimalColumnIT.java @@ -32,10 +32,10 @@ public class MySqlDecimalColumnIT extends AbstractConnectorTest { private static final String PRECISION_PARAMETER_KEY = "connect.decimal.precision"; - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-decimal-column.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-decimal-column.txt") .toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("decimalcolumnit", "decimal_column_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -44,7 +44,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -53,7 +53,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlDecimalIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlDecimalIT.java index 66245f198..7ec3efbb2 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlDecimalIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlDecimalIT.java @@ -35,10 +35,10 @@ public class MySqlDecimalIT extends AbstractConnectorTest { private static final String TABLE_NAME = "DBZ730"; - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-decimal.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-decimal.txt") .toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("decimaldb", "decimal_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -47,7 +47,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); skipAvroValidation(); // https://github.com/confluentinc/schema-registry/issues/1693 } @@ -57,7 +57,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlEnumColumnIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlEnumColumnIT.java index b27f79321..9870e26c1 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlEnumColumnIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlEnumColumnIT.java @@ -36,8 +36,8 @@ public class MySqlEnumColumnIT extends AbstractConnectorTest { private static final String TYPE_LENGTH_PARAMETER_KEY = "__debezium.source.column.length"; private static final String TYPE_SCALE_PARAMETER_KEY = "__debezium.source.column.scale"; - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-enum-column.txt").toAbsolutePath(); - private final UniqueDatabase DATABASE = new UniqueDatabase("enumcolumnit", "enum_column_test").withDbHistoryPath(DB_HISTORY_PATH); + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-enum-column.txt").toAbsolutePath(); + private final UniqueDatabase DATABASE = new UniqueDatabase("enumcolumnit", "enum_column_test").withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -46,7 +46,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -55,7 +55,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlFixedLengthBinaryColumnIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlFixedLengthBinaryColumnIT.java index 15dc345be..cf109d2f8 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlFixedLengthBinaryColumnIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlFixedLengthBinaryColumnIT.java @@ -30,10 +30,10 @@ */ public class MySqlFixedLengthBinaryColumnIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-binary-column.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-binary-column.txt") .toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("binarycolumnit", "binary_column_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -42,7 +42,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -51,7 +51,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlFloatIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlFloatIT.java index 9c7ce3d75..a05f106aa 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlFloatIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlFloatIT.java @@ -33,10 +33,10 @@ */ public class MySqlFloatIT extends AbstractConnectorTest { private static final String TABLE_NAME = "DBZ3865"; - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-float.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-float.txt") .toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("floatit", "float_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -45,7 +45,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -54,7 +54,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlGeometryIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlGeometryIT.java index e1954e4e1..6744b55b0 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlGeometryIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlGeometryIT.java @@ -36,7 +36,7 @@ @SkipWhenDatabaseVersion(check = LESS_THAN, major = 5, minor = 6, reason = "Function ST_GeomFromText not added until MySQL 5.6") public class MySqlGeometryIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-json.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-json.txt") .toAbsolutePath(); private UniqueDatabase DATABASE; private DatabaseGeoDifferences databaseDifferences; @@ -49,11 +49,11 @@ public void beforeEach() { databaseDifferences = databaseGeoDifferences(MySqlTestConnection.isMySQL5()); DATABASE = new UniqueDatabase("geometryit", databaseDifferences.geometryDatabaseName()) - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -62,7 +62,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlMetricsIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlMetricsIT.java index f104e0759..22e4b2631 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlMetricsIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlMetricsIT.java @@ -40,9 +40,9 @@ */ public class MySqlMetricsIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-metrics.txt").toAbsolutePath(); + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-metrics.txt").toAbsolutePath(); private static final String SERVER_NAME = "myserver"; - private final UniqueDatabase DATABASE = new UniqueDatabase(SERVER_NAME, "connector_metrics_test").withDbHistoryPath(DB_HISTORY_PATH); + private final UniqueDatabase DATABASE = new UniqueDatabase(SERVER_NAME, "connector_metrics_test").withDbHistoryPath(SCHEMA_HISTORY_PATH); private static final String INSERT1 = "INSERT INTO simple (val) VALUES (25);"; private static final String INSERT2 = "INSERT INTO simple (val) VALUES (50);"; @@ -53,7 +53,7 @@ public void before() throws Exception { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -62,7 +62,7 @@ public void after() throws Exception { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } @@ -73,7 +73,7 @@ public void testLifecycle() throws Exception { DATABASE.defaultConfig() .with(MySqlConnectorConfig.SNAPSHOT_MODE, SnapshotMode.INITIAL) .with(MySqlConnectorConfig.SCHEMA_HISTORY, FileSchemaHistory.class) - .with(FileSchemaHistory.FILE_PATH, DB_HISTORY_PATH) + .with(FileSchemaHistory.FILE_PATH, SCHEMA_HISTORY_PATH) .with(MySqlConnectorConfig.TABLE_INCLUDE_LIST, DATABASE.qualifiedTableName("simple")) .with(MySqlConnectorConfig.TABLES_IGNORE_BUILTIN, Boolean.TRUE) .with(SchemaHistory.STORE_ONLY_CAPTURED_TABLES_DDL, Boolean.TRUE) @@ -121,7 +121,7 @@ public void testSnapshotOnlyMetrics() throws Exception { DATABASE.defaultConfig() .with(MySqlConnectorConfig.SNAPSHOT_MODE, SnapshotMode.INITIAL_ONLY) .with(MySqlConnectorConfig.SCHEMA_HISTORY, FileSchemaHistory.class) - .with(FileSchemaHistory.FILE_PATH, DB_HISTORY_PATH) + .with(FileSchemaHistory.FILE_PATH, SCHEMA_HISTORY_PATH) .with(MySqlConnectorConfig.TABLE_INCLUDE_LIST, DATABASE.qualifiedTableName("simple")) .with(MySqlConnectorConfig.TABLES_IGNORE_BUILTIN, Boolean.TRUE) .with(SchemaHistory.STORE_ONLY_CAPTURED_TABLES_DDL, Boolean.TRUE) @@ -148,7 +148,7 @@ public void testPauseResumeSnapshotMetrics() throws Exception { DATABASE.defaultConfig() .with(MySqlConnectorConfig.SNAPSHOT_MODE, SnapshotMode.INITIAL) .with(MySqlConnectorConfig.SCHEMA_HISTORY, FileSchemaHistory.class) - .with(FileSchemaHistory.FILE_PATH, DB_HISTORY_PATH) + .with(FileSchemaHistory.FILE_PATH, SCHEMA_HISTORY_PATH) .with(MySqlConnectorConfig.TABLE_INCLUDE_LIST, String.format("%s", TABLE_NAME)) .with(SchemaHistory.STORE_ONLY_CAPTURED_TABLES_DDL, Boolean.TRUE) .with(CommonConnectorConfig.INCREMENTAL_SNAPSHOT_CHUNK_SIZE, 1) @@ -199,7 +199,7 @@ public void testSnapshotAndStreamingMetrics() throws Exception { DATABASE.defaultConfig() .with(MySqlConnectorConfig.SNAPSHOT_MODE, SnapshotMode.INITIAL) .with(MySqlConnectorConfig.SCHEMA_HISTORY, FileSchemaHistory.class) - .with(FileSchemaHistory.FILE_PATH, DB_HISTORY_PATH) + .with(FileSchemaHistory.FILE_PATH, SCHEMA_HISTORY_PATH) .with(MySqlConnectorConfig.TABLE_INCLUDE_LIST, DATABASE.qualifiedTableName("simple")) .with(MySqlConnectorConfig.TABLES_IGNORE_BUILTIN, Boolean.TRUE) .with(SchemaHistory.STORE_ONLY_CAPTURED_TABLES_DDL, Boolean.TRUE) @@ -216,7 +216,7 @@ public void testStreamingOnlyMetrics() throws Exception { DATABASE.defaultConfig() .with(MySqlConnectorConfig.SNAPSHOT_MODE, SnapshotMode.NEVER) .with(MySqlConnectorConfig.SCHEMA_HISTORY, FileSchemaHistory.class) - .with(FileSchemaHistory.FILE_PATH, DB_HISTORY_PATH) + .with(FileSchemaHistory.FILE_PATH, SCHEMA_HISTORY_PATH) .with(MySqlConnectorConfig.TABLE_INCLUDE_LIST, DATABASE.qualifiedTableName("simple")) .with(MySqlConnectorConfig.TABLES_IGNORE_BUILTIN, Boolean.TRUE) .with(SchemaHistory.STORE_ONLY_CAPTURED_TABLES_DDL, Boolean.TRUE) diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlNumericColumnIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlNumericColumnIT.java index fb0148df8..70966822d 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlNumericColumnIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlNumericColumnIT.java @@ -32,10 +32,10 @@ public class MySqlNumericColumnIT extends AbstractConnectorTest { private static final String PRECISION_PARAMETER_KEY = "connect.decimal.precision"; - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-numeric-column.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-numeric-column.txt") .toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("numericcolumnit", "numeric_column_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -44,7 +44,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -53,7 +53,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlRestartIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlRestartIT.java index 290d074ea..9c735c1af 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlRestartIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlRestartIT.java @@ -26,8 +26,8 @@ * @author Jiri Pechanec */ public class MySqlRestartIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-restart.txt").toAbsolutePath(); - private final UniqueDatabase DATABASE = new UniqueDatabase("restart", "connector_test").withDbHistoryPath(DB_HISTORY_PATH); + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-restart.txt").toAbsolutePath(); + private final UniqueDatabase DATABASE = new UniqueDatabase("restart", "connector_test").withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -36,7 +36,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -45,7 +45,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSchemaHistoryIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSchemaHistoryIT.java index 413e9eb82..914067a0f 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSchemaHistoryIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSchemaHistoryIT.java @@ -29,7 +29,7 @@ */ public class MySqlSchemaHistoryIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-json.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-json.txt") .toAbsolutePath(); private static final int TABLE_COUNT = 2; @@ -42,11 +42,11 @@ public class MySqlSchemaHistoryIT extends AbstractConnectorTest { public void beforeEach() { stopConnector(); DATABASE = new UniqueDatabase("history", "history-dbz") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -55,7 +55,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSchemaMigrationIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSchemaMigrationIT.java index 0d19727da..d01438095 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSchemaMigrationIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSchemaMigrationIT.java @@ -26,10 +26,10 @@ */ public class MySqlSchemaMigrationIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-json.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-json.txt") .toAbsolutePath(); private UniqueDatabase DATABASE = new UniqueDatabase("migration", "empty") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -39,7 +39,7 @@ public void beforeEach() { DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -48,7 +48,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSchemaNameAdjustmentModeIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSchemaNameAdjustmentModeIT.java index 6e9960550..509c0ce3d 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSchemaNameAdjustmentModeIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSchemaNameAdjustmentModeIT.java @@ -25,10 +25,10 @@ public class MySqlSchemaNameAdjustmentModeIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-json.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-json.txt") .toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("adjustment1", "schema_name_adjustment") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); @Before public void beforeEach() throws SQLException { @@ -36,7 +36,7 @@ public void beforeEach() throws SQLException { DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -45,7 +45,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSourceTypeInSchemaIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSourceTypeInSchemaIT.java index b17043494..88fa81bc3 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSourceTypeInSchemaIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlSourceTypeInSchemaIT.java @@ -35,10 +35,10 @@ public class MySqlSourceTypeInSchemaIT extends AbstractConnectorTest { private static final String TYPE_LENGTH_PARAMETER_KEY = "__debezium.source.column.length"; private static final String TYPE_SCALE_PARAMETER_KEY = "__debezium.source.column.scale"; - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-schema-parameter.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-schema-parameter.txt") .toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("schemaparameterit", "source_type_as_schema_parameter_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -47,7 +47,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -56,7 +56,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTableAndColumnCommentIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTableAndColumnCommentIT.java index d3f2915f8..1de33eec4 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTableAndColumnCommentIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTableAndColumnCommentIT.java @@ -31,10 +31,10 @@ public class MySqlTableAndColumnCommentIT extends AbstractConnectorTest { private static final String COLUMN_COMMENT_PARAMETER_KEY = "__debezium.source.column.comment"; - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-comment.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-comment.txt") .toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("commentit", "table_column_comment_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -43,7 +43,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -52,7 +52,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTableMaintenanceStatementsIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTableMaintenanceStatementsIT.java index 07c5d8b7f..f7b3e193a 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTableMaintenanceStatementsIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTableMaintenanceStatementsIT.java @@ -24,10 +24,10 @@ */ public class MySqlTableMaintenanceStatementsIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-table-maintenance.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-table-maintenance.txt") .toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("tablemaintenanceit", "table_maintenance_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -36,7 +36,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -45,7 +45,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTimestampColumnIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTimestampColumnIT.java index cde3ffd07..71db902ba 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTimestampColumnIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTimestampColumnIT.java @@ -28,8 +28,8 @@ */ @SkipWhenDatabaseVersion(check = LESS_THAN, major = 5, minor = 6, patch = 5, reason = "MySQL 5.5 does not support CURRENT_TIMESTAMP on DATETIME and only a single column can specify default CURRENT_TIMESTAMP, lifted in MySQL 5.6.5") public class MySqlTimestampColumnIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-timestamp-column.txt").toAbsolutePath(); - private final UniqueDatabase DATABASE = new UniqueDatabase("timestampcolumnit", "timestamp_column_test").withDbHistoryPath(DB_HISTORY_PATH); + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-timestamp-column.txt").toAbsolutePath(); + private final UniqueDatabase DATABASE = new UniqueDatabase("timestampcolumnit", "timestamp_column_test").withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -38,7 +38,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -47,7 +47,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTinyIntIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTinyIntIT.java index c8fdbc60c..3e22d4559 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTinyIntIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTinyIntIT.java @@ -31,10 +31,10 @@ */ public class MySqlTinyIntIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-year.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-year.txt") .toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("tinyintit", "tinyint_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -43,7 +43,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -52,7 +52,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTopicNamingStrategyIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTopicNamingStrategyIT.java index fdbf36516..aea7f3d56 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTopicNamingStrategyIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlTopicNamingStrategyIT.java @@ -32,10 +32,10 @@ public class MySqlTopicNamingStrategyIT extends AbstractConnectorTest { private static final String TABLE_NAME = "dbz4180"; - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-comment.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-comment.txt") .toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("topic_strategy", "strategy_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -44,7 +44,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -53,7 +53,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlUnsignedIntegerIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlUnsignedIntegerIT.java index 81c0cd6ef..7e33dcc0c 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlUnsignedIntegerIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlUnsignedIntegerIT.java @@ -31,20 +31,20 @@ */ public class MySqlUnsignedIntegerIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-json.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-json.txt") .toAbsolutePath(); private Configuration config; private final UniqueDatabase DATABASE = new UniqueDatabase("unsignednumericit", "unsigned_integer_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); @Before public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -53,7 +53,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlYearIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlYearIT.java index 3b33a1d61..0b8649a28 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlYearIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MySqlYearIT.java @@ -28,10 +28,10 @@ */ public class MySqlYearIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-year.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-year.txt") .toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("yearit", "year_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -40,7 +40,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -49,7 +49,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultDatabaseCharsetIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultDatabaseCharsetIT.java index db18c20bd..c5861d2d1 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultDatabaseCharsetIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultDatabaseCharsetIT.java @@ -23,9 +23,9 @@ public class MysqlDefaultDatabaseCharsetIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-connect.txt").toAbsolutePath(); + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-connect.txt").toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("myServer1", "db_default_charset", "utf8mb4") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -34,7 +34,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -43,7 +43,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultGeneratedValueIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultGeneratedValueIT.java index 7d730c247..8a0dc51ed 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultGeneratedValueIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultGeneratedValueIT.java @@ -32,9 +32,9 @@ public class MysqlDefaultGeneratedValueIT extends AbstractConnectorTest { // 4 meta events (set character_set etc.) and then 15 tables with 3 events each (drop DDL, create DDL, insert) private static final int EVENT_COUNT = 4 + 15 * 3; - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-connect.txt").toAbsolutePath(); + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-connect.txt").toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("myServer1", "default_value_generated") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -43,7 +43,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -52,7 +52,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultValueAllZeroTimeIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultValueAllZeroTimeIT.java index 3ff65611b..60927111d 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultValueAllZeroTimeIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultValueAllZeroTimeIT.java @@ -26,9 +26,9 @@ */ public class MysqlDefaultValueAllZeroTimeIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-connect.txt").toAbsolutePath(); + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-connect.txt").toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("myServer1", "default_value_all_zero_time") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -37,7 +37,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(Collections.singletonMap("sessionVariables", "sql_mode=''")); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -46,7 +46,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultValueIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultValueIT.java index 567457bd7..6a62df2cc 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultValueIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlDefaultValueIT.java @@ -60,9 +60,9 @@ public class MysqlDefaultValueIT extends AbstractConnectorTest { // 4 meta events (set character_set etc.) and then 14 tables with 3 events each (drop DDL, create DDL, insert) private static final int EVENT_COUNT = 4 + 14 * 3; - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-connect.txt").toAbsolutePath(); + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-connect.txt").toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("myServer1", "default_value") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -71,7 +71,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); skipAvroValidation(); // https://github.com/confluentinc/schema-registry/issues/1693 } @@ -81,7 +81,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlNonUtfDatabaseCharsetIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlNonUtfDatabaseCharsetIT.java index e479d130d..cb7a7512f 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlNonUtfDatabaseCharsetIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/MysqlNonUtfDatabaseCharsetIT.java @@ -24,9 +24,9 @@ public class MysqlNonUtfDatabaseCharsetIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-connect.txt").toAbsolutePath(); + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-connect.txt").toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("myServer1", "db_default_charset_noutf", "latin2") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -35,7 +35,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -44,7 +44,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/SnapshotSourceIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/SnapshotSourceIT.java index 2bfa36812..4c221384f 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/SnapshotSourceIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/SnapshotSourceIT.java @@ -60,9 +60,9 @@ @SkipWhenDatabaseVersion(check = LESS_THAN, major = 5, minor = 6, reason = "DDL uses fractional second data types, not supported until MySQL 5.6") public class SnapshotSourceIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-snapshot.txt").toAbsolutePath(); + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-snapshot.txt").toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("logical_server_name", "connector_test_ro") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private final UniqueDatabase OTHER_DATABASE = new UniqueDatabase("logical_server_name", "connector_test", DATABASE); private final UniqueDatabase BINARY_FIELD_DATABASE = new UniqueDatabase("logical_server_name", "connector_read_binary_field_test"); @@ -73,7 +73,7 @@ public class SnapshotSourceIT extends AbstractConnectorTest { @Before public void beforeEach() { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); DATABASE.createAndInitialize(); OTHER_DATABASE.createAndInitialize(); BINARY_FIELD_DATABASE.createAndInitialize(); @@ -85,7 +85,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/StreamingSourceIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/StreamingSourceIT.java index 754eed41a..2b2e20b02 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/StreamingSourceIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/StreamingSourceIT.java @@ -66,9 +66,9 @@ @SkipWhenDatabaseVersion(check = LESS_THAN, major = 5, minor = 6, reason = "DDL uses fractional second data types, not supported until MySQL 5.6") public class StreamingSourceIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-binlog.txt").toAbsolutePath(); + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-binlog.txt").toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("logical_server_name", "connector_test_ro") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private static final String SET_TLS_PROTOCOLS = "database.enabledTLSProtocols"; @@ -84,7 +84,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); this.store = KeyValueStore.createForTopicsBeginningWith(DATABASE.getServerName() + "."); this.schemaChanges = new SchemaChangeHistory(DATABASE.getServerName()); @@ -96,7 +96,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } @@ -327,7 +327,7 @@ public void shouldFilterAllRecordsBasedOnDatabaseIncludeListFilter() throws Exce @FixFor("DBZ-183") public void shouldHandleTimestampTimezones() throws Exception { final UniqueDatabase REGRESSION_DATABASE = new UniqueDatabase("logical_server_name", "regression_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); REGRESSION_DATABASE.createAndInitialize(); String tableName = "dbz_85_fractest"; @@ -364,7 +364,7 @@ public void shouldHandleTimestampTimezones() throws Exception { @FixFor("DBZ-342") public void shouldHandleMySQLTimeCorrectly() throws Exception { final UniqueDatabase REGRESSION_DATABASE = new UniqueDatabase("logical_server_name", "regression_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); REGRESSION_DATABASE.createAndInitialize(); String tableName = "dbz_342_timetest"; @@ -458,7 +458,7 @@ public void shouldIgnoreOnSchemaInconsistency() throws Exception { @SkipWhenDatabaseVersion(check = LESS_THAN_OR_EQUAL, major = 5, minor = 6, reason = "MySQL 5.6 does not support SSL") public void shouldFailOnUnknownTlsProtocol() { final UniqueDatabase REGRESSION_DATABASE = new UniqueDatabase("logical_server_name", "regression_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); REGRESSION_DATABASE.createAndInitialize(); config = simpleConfig() @@ -478,7 +478,7 @@ public void shouldFailOnUnknownTlsProtocol() { @SkipWhenDatabaseVersion(check = LESS_THAN_OR_EQUAL, major = 5, minor = 6, reason = "MySQL 5.6 does not support SSL") public void shouldAcceptTls12() throws Exception { final UniqueDatabase REGRESSION_DATABASE = new UniqueDatabase("logical_server_name", "regression_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); REGRESSION_DATABASE.createAndInitialize(); config = simpleConfig() diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/TopicNameSanitizationIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/TopicNameSanitizationIT.java index 4094ec5b3..fbe55138d 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/TopicNameSanitizationIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/TopicNameSanitizationIT.java @@ -30,10 +30,10 @@ */ public class TopicNameSanitizationIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-topic-name-sanitization.txt") + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-topic-name-sanitization.txt") .toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("topic-name.sanitization-it", "topic_name_sanitization_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -42,7 +42,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -51,7 +51,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/TransactionMetadataIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/TransactionMetadataIT.java index 4ea6cd2bb..d3b24e48d 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/TransactionMetadataIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/TransactionMetadataIT.java @@ -38,10 +38,10 @@ public class TransactionMetadataIT extends AbstractConnectorTest { private static final String CUSTOMER_INSERT_STMT_2 = "INSERT INTO customers (first_name, last_name, email) VALUES ('Rajesh', 'Agarwal', 'test2@abc.com' ); "; private static final String ORDER_INSERT_STMT = "INSERT INTO orders (order_date, purchaser, quantity, product_id) VALUES ('2016-01-16', 1001, 1, 1); "; - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-tm.txt").toAbsolutePath(); + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-tm.txt").toAbsolutePath(); private static final String SERVER_NAME = "tm_test"; - private final UniqueDatabase DATABASE = new UniqueDatabase(SERVER_NAME, "transaction_metadata_test").withDbHistoryPath(DB_HISTORY_PATH); + private final UniqueDatabase DATABASE = new UniqueDatabase(SERVER_NAME, "transaction_metadata_test").withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -50,7 +50,7 @@ public void beforeEach() { stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -59,7 +59,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/TransactionPayloadIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/TransactionPayloadIT.java index c2a82a161..bc90c8c07 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/TransactionPayloadIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/TransactionPayloadIT.java @@ -41,10 +41,10 @@ public class TransactionPayloadIT extends AbstractConnectorTest { private static final String ORDER_UPDATE_STMT_1 = "UPDATE orders set order_date = '2017-01-16' where order_number = 10001; "; private static final String ORDER_DELETE_STMT_1 = "DELETE from orders where order_number = 10001; "; - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-tp.txt").toAbsolutePath(); + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-tp.txt").toAbsolutePath(); private static final String SERVER_NAME = "transactionpayload_it"; - private final UniqueDatabase DATABASE = new UniqueDatabase(SERVER_NAME, "transactionpayload_test").withDbHistoryPath(DB_HISTORY_PATH); + private final UniqueDatabase DATABASE = new UniqueDatabase(SERVER_NAME, "transactionpayload_test").withDbHistoryPath(SCHEMA_HISTORY_PATH); @Rule public SkipTestRule skipTest = new SkipTestRule(); private Configuration config; @@ -54,7 +54,7 @@ public void beforeEach() throws TimeoutException, IOException, SQLException, Int stopConnector(); DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -63,7 +63,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } diff --git a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/zzz/ZZZGtidSetIT.java b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/zzz/ZZZGtidSetIT.java index 326d8a321..323852dc7 100644 --- a/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/zzz/ZZZGtidSetIT.java +++ b/debezium-connector-mysql/src/test/java/io/debezium/connector/mysql/zzz/ZZZGtidSetIT.java @@ -42,11 +42,11 @@ @SkipWhenDatabaseVersion(check = LESS_THAN, major = 5, minor = 6, reason = "DDL uses fractional second data types, not supported until MySQL 5.6") public class ZZZGtidSetIT extends AbstractConnectorTest { - private static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-connect.txt").toAbsolutePath(); + private static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-connect.txt").toAbsolutePath(); private final UniqueDatabase DATABASE = new UniqueDatabase("myServer1", "connector_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private final UniqueDatabase RO_DATABASE = new UniqueDatabase("myServer2", "connector_test_ro", DATABASE) - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); private Configuration config; @@ -56,7 +56,7 @@ public void beforeEach() { DATABASE.createAndInitialize(); RO_DATABASE.createAndInitialize(); initializeConnectorTestFramework(); - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } @After @@ -65,7 +65,7 @@ public void afterEach() { stopConnector(); } finally { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); } } @@ -85,7 +85,7 @@ private boolean isGtidModeEnabled() throws SQLException { @Test @FixFor("DBZ-1184") public void shouldProcessPurgedGtidSet() throws SQLException, InterruptedException { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); if (!isGtidModeEnabled()) { logger.warn("GTID is not enabled, skipping shouldProcessPurgedGtidSet"); @@ -94,9 +94,9 @@ public void shouldProcessPurgedGtidSet() throws SQLException, InterruptedExcepti purgeDatabaseLogs(); final UniqueDatabase database = new UniqueDatabase("myServer1", "connector_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); final UniqueDatabase ro_database = new UniqueDatabase("myServer2", "connector_test_ro", database) - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); ro_database.createAndInitialize(); // Use the DB configuration to define the connector's configuration ... @@ -174,7 +174,7 @@ private List getBinlogs(JdbcConnection connection) throws SQLException { @Test @FixFor("DBZ-1244") public void shouldProcessPurgedLogsWhenDownAndSnapshotNeeded() throws SQLException, InterruptedException { - Testing.Files.delete(DB_HISTORY_PATH); + Testing.Files.delete(SCHEMA_HISTORY_PATH); if (!isGtidModeEnabled()) { logger.warn("GTID is not enabled, skipping shouldProcessPurgedLogsWhenDownAndSnapshotNeeded"); @@ -183,7 +183,7 @@ public void shouldProcessPurgedLogsWhenDownAndSnapshotNeeded() throws SQLExcepti purgeDatabaseLogs(); final UniqueDatabase database = new UniqueDatabase("myServer1", "connector_test") - .withDbHistoryPath(DB_HISTORY_PATH); + .withDbHistoryPath(SCHEMA_HISTORY_PATH); database.createAndInitialize(); // Use the DB configuration to define the connector's configuration ... diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/IncrementalSnapshotCaseSensitiveIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/IncrementalSnapshotCaseSensitiveIT.java index 31fbd0ab1..c02d23024 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/IncrementalSnapshotCaseSensitiveIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/IncrementalSnapshotCaseSensitiveIT.java @@ -50,7 +50,7 @@ public void before() throws Exception { setConsumeTimeout(TestHelper.defaultMessageConsumerPollTimeout(), TimeUnit.SECONDS); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/IncrementalSnapshotIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/IncrementalSnapshotIT.java index 1a08b88e3..7d5918c4b 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/IncrementalSnapshotIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/IncrementalSnapshotIT.java @@ -48,7 +48,7 @@ public void before() throws Exception { setConsumeTimeout(TestHelper.defaultMessageConsumerPollTimeout(), TimeUnit.SECONDS); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/LogMinerHelperIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/LogMinerHelperIT.java index d1efab75f..1489c41ad 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/LogMinerHelperIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/LogMinerHelperIT.java @@ -63,7 +63,7 @@ public static void closeConnection() throws SQLException { public void before() throws SQLException { setConsumeTimeout(TestHelper.defaultMessageConsumerPollTimeout(), TimeUnit.SECONDS); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @Test diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleBinaryModeIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleBinaryModeIT.java index 464792911..e8b7dd12d 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleBinaryModeIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleBinaryModeIT.java @@ -43,7 +43,7 @@ public void before() throws SQLException { setConsumeTimeout(TestHelper.defaultMessageConsumerPollTimeout(), TimeUnit.SECONDS); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleBlobDataTypesIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleBlobDataTypesIT.java index de3759c91..399fe8246 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleBlobDataTypesIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleBlobDataTypesIT.java @@ -63,7 +63,7 @@ public void before() { setConsumeTimeout(TestHelper.defaultMessageConsumerPollTimeout(), TimeUnit.SECONDS); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleClobDataTypeIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleClobDataTypeIT.java index 38b18e198..1f2b30dc7 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleClobDataTypeIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleClobDataTypeIT.java @@ -63,7 +63,7 @@ public void before() { setConsumeTimeout(TestHelper.defaultMessageConsumerPollTimeout(), TimeUnit.SECONDS); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleConnectorFilterIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleConnectorFilterIT.java index 700a60b61..68d21351f 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleConnectorFilterIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleConnectorFilterIT.java @@ -115,7 +115,7 @@ public void before() throws SQLException { connection.execute("ALTER TABLE debezium.table2 ADD SUPPLEMENTAL LOG DATA (ALL) COLUMNS"); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleConnectorIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleConnectorIT.java index c72f2f230..02861a7be 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleConnectorIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleConnectorIT.java @@ -193,7 +193,7 @@ public void before() throws SQLException { connection.execute("delete from debezium.dt_table"); setConsumeTimeout(TestHelper.defaultMessageConsumerPollTimeout(), TimeUnit.SECONDS); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @Test @@ -4209,7 +4209,7 @@ private void testTableWithForwardSlashes(String tableName, String topicTableName try { // Always want to make sure the offsets are cleared for each invocation of this sub-test Testing.Files.delete(OFFSET_STORE_PATH); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); connection.execute("CREATE TABLE " + quotedTableName + " (id numeric(9,0) primary key, data varchar2(50))"); connection.execute("INSERT INTO " + quotedTableName + " (id,data) values (1, 'Record1')"); diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleDefaultValueIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleDefaultValueIT.java index aaf33f2a8..be98ddd7e 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleDefaultValueIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleDefaultValueIT.java @@ -50,7 +50,7 @@ public void before() throws Exception { connection = TestHelper.testConnection(); setConsumeTimeout(TestHelper.defaultMessageConsumerPollTimeout(), TimeUnit.SECONDS); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); TestHelper.dropTable(connection, "default_value_test"); TestHelper.dropSequence(connection, "debezium_seq"); diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleNumberOneIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleNumberOneIT.java index 3ae72521b..3ea34c53a 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleNumberOneIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleNumberOneIT.java @@ -43,7 +43,7 @@ public void before() throws Exception { setConsumeTimeout(TestHelper.defaultMessageConsumerPollTimeout(), TimeUnit.SECONDS); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); connection.execute("CREATE TABLE NUMBER_ONE_TEST (id numeric primary key, data number(1) default 0, data2 number(1) default 1)"); TestHelper.streamTable(connection, "debezium.number_one_test"); diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleRowIdDataTypeIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleRowIdDataTypeIT.java index 56c050847..e058fe086 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleRowIdDataTypeIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleRowIdDataTypeIT.java @@ -69,7 +69,7 @@ public void before() throws Exception { connection.execute("delete from debezium.type_rowid"); setConsumeTimeout(TestHelper.defaultMessageConsumerPollTimeout(), TimeUnit.SECONDS); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @Test diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleSchemaMigrationIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleSchemaMigrationIT.java index aa75c00c3..ed950d522 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleSchemaMigrationIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OracleSchemaMigrationIT.java @@ -52,7 +52,7 @@ public void beforeEach() throws Exception { setConsumeTimeout(TestHelper.defaultMessageConsumerPollTimeout(), TimeUnit.SECONDS); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); TestHelper.dropAllTables(); } diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OutboxEventRouterIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OutboxEventRouterIT.java index ccd3ab3b6..d120181b4 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OutboxEventRouterIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/OutboxEventRouterIT.java @@ -43,7 +43,7 @@ public void beforeEach() throws Exception { setConsumeTimeout(TestHelper.defaultMessageConsumerPollTimeout(), TimeUnit.SECONDS); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); super.beforeEach(); } diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/SchemaHistoryTopicIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/SchemaHistoryTopicIT.java index 9df1d72c9..25fcde328 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/SchemaHistoryTopicIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/SchemaHistoryTopicIT.java @@ -55,7 +55,7 @@ public void before() throws SQLException { connection.execute("ALTER TABLE debezium.tablec ADD SUPPLEMENTAL LOG DATA (ALL) COLUMNS"); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/SignalsIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/SignalsIT.java index dce929f48..651803e6a 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/SignalsIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/SignalsIT.java @@ -88,7 +88,7 @@ public void before() throws SQLException { connection.execute("delete from debezium.debezium_signal"); setConsumeTimeout(TestHelper.defaultMessageConsumerPollTimeout(), TimeUnit.SECONDS); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @Test diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/SnapshotDatatypesIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/SnapshotDatatypesIT.java index 0e5491e5c..5f6201f55 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/SnapshotDatatypesIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/SnapshotDatatypesIT.java @@ -52,7 +52,7 @@ protected void init(TemporalPrecisionMode temporalPrecisionMode) throws Exceptio setConsumeTimeout(TestHelper.defaultMessageConsumerPollTimeout(), TimeUnit.SECONDS); initializeConnectorTestFramework(); Testing.Debug.enable(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); Configuration config = connectorConfig() .with(OracleConnectorConfig.TIME_PRECISION_MODE, temporalPrecisionMode) diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/SnapshotSelectOverridesIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/SnapshotSelectOverridesIT.java index ba72589b8..3830f4859 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/SnapshotSelectOverridesIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/SnapshotSelectOverridesIT.java @@ -65,7 +65,7 @@ public void before() throws SQLException { TestHelper.streamTable(connection, "debezium.table3"); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/StreamingDatatypesIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/StreamingDatatypesIT.java index 7a8fc7dc3..01428d918 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/StreamingDatatypesIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/StreamingDatatypesIT.java @@ -40,7 +40,7 @@ protected void init(TemporalPrecisionMode temporalPrecisionMode) throws Exceptio setConsumeTimeout(TestHelper.defaultMessageConsumerPollTimeout(), TimeUnit.SECONDS); dropTables(); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); Configuration config = connectorConfig() .with(OracleConnectorConfig.TIME_PRECISION_MODE, temporalPrecisionMode) diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/TransactionMetadataIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/TransactionMetadataIT.java index a50a04cf2..858a26a76 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/TransactionMetadataIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/TransactionMetadataIT.java @@ -85,7 +85,7 @@ public void before() throws SQLException { connection.execute("delete from debezium.orders"); setConsumeTimeout(TestHelper.defaultMessageConsumerPollTimeout(), TimeUnit.SECONDS); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @Test diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/logminer/FlushStrategyIT.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/logminer/FlushStrategyIT.java index 88eab9791..fe58c5e62 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/logminer/FlushStrategyIT.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/logminer/FlushStrategyIT.java @@ -62,7 +62,7 @@ public static void closeConnection() throws SQLException { public void before() throws SQLException { setConsumeTimeout(TestHelper.defaultMessageConsumerPollTimeout(), TimeUnit.SECONDS); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @Test diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/logminer/processor/AbstractProcessorTest.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/logminer/processor/AbstractProcessorTest.java index d79250f19..cec2ab5fe 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/logminer/processor/AbstractProcessorTest.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/logminer/processor/AbstractProcessorTest.java @@ -47,7 +47,7 @@ public void before() throws Exception { connection = TestHelper.testConnection(); setConsumeTimeout(TestHelper.defaultMessageConsumerPollTimeout(), TimeUnit.SECONDS); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); TestHelper.dropTable(connection, "dbz3752"); diff --git a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/util/TestHelper.java b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/util/TestHelper.java index 064d2caaf..0b62462e0 100644 --- a/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/util/TestHelper.java +++ b/debezium-connector-oracle/src/test/java/io/debezium/connector/oracle/util/TestHelper.java @@ -36,7 +36,7 @@ public class TestHelper { private static final String DATABASE_PREFIX = "database."; private static final String DATABASE_ADMIN_PREFIX = "database.admin."; - public static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-connect.txt").toAbsolutePath(); + public static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-connect.txt").toAbsolutePath(); public static final String CONNECTOR_USER = "c##dbzuser"; public static final String CONNECTOR_NAME = "oracle"; @@ -163,7 +163,7 @@ public static Configuration.Builder defaultConfig() { return builder.with(AbstractTopicNamingStrategy.TOPIC_PREFIX, SERVER_NAME) .with(OracleConnectorConfig.SCHEMA_HISTORY, FileSchemaHistory.class) - .with(FileSchemaHistory.FILE_PATH, DB_HISTORY_PATH) + .with(FileSchemaHistory.FILE_PATH, SCHEMA_HISTORY_PATH) .with(OracleConnectorConfig.INCLUDE_SCHEMA_CHANGES, false); } diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/AbstractSqlServerDatatypesTest.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/AbstractSqlServerDatatypesTest.java index 91d6a7819..8e69969b2 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/AbstractSqlServerDatatypesTest.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/AbstractSqlServerDatatypesTest.java @@ -307,7 +307,7 @@ private void assertRecord(Struct record, List expected) { public void init(TemporalPrecisionMode temporalPrecisionMode) throws Exception { initializeConnectorTestFramework(); Testing.Debug.enable(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); Configuration config = TestHelper.defaultConfig() .with(SqlServerConnectorConfig.SNAPSHOT_MODE, SnapshotMode.INITIAL) diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/CaseSensitivenessIT.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/CaseSensitivenessIT.java index f8830d85c..79c0f8671 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/CaseSensitivenessIT.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/CaseSensitivenessIT.java @@ -38,7 +38,7 @@ public void before() throws SQLException { connection = TestHelper.testConnection(); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/EventProcessingFailureHandlingIT.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/EventProcessingFailureHandlingIT.java index b67d67070..bece87a1e 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/EventProcessingFailureHandlingIT.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/EventProcessingFailureHandlingIT.java @@ -47,7 +47,7 @@ public void before() throws SQLException { TestHelper.enableTableCdc(connection, "tableb"); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/IncrementalSnapshotIT.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/IncrementalSnapshotIT.java index 0d2dd5f35..fdb764d0f 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/IncrementalSnapshotIT.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/IncrementalSnapshotIT.java @@ -40,7 +40,7 @@ public void before() throws SQLException { TestHelper.enableTableCdc(connection, "debezium_signal"); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/IncrementalSnapshotWithRecompileIT.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/IncrementalSnapshotWithRecompileIT.java index e585a7714..a76b7983e 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/IncrementalSnapshotWithRecompileIT.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/IncrementalSnapshotWithRecompileIT.java @@ -39,7 +39,7 @@ public void before() throws SQLException { TestHelper.enableTableCdc(connection, "debezium_signal"); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SQLServerNumericColumnIT.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SQLServerNumericColumnIT.java index 1bbb5ae86..cf69efd2b 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SQLServerNumericColumnIT.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SQLServerNumericColumnIT.java @@ -57,7 +57,7 @@ public void before() throws SQLException { TestHelper.enableTableCdc(connection, "tablenumd"); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SchemaHistoryTopicIT.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SchemaHistoryTopicIT.java index 4e1eebeaf..9c2ce20d7 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SchemaHistoryTopicIT.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SchemaHistoryTopicIT.java @@ -53,7 +53,7 @@ public void before() throws SQLException { TestHelper.enableTableCdc(connection, "tableb"); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SnapshotIT.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SnapshotIT.java index f4dfdc03f..4b47f469b 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SnapshotIT.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SnapshotIT.java @@ -76,7 +76,7 @@ public void before() throws SQLException { TestHelper.enableTableCdc(connection, "table1"); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After @@ -253,7 +253,7 @@ public void takeSnapshotFromTableWithReservedName() throws Exception { TestHelper.enableTableCdc(connection, "User"); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); final Configuration config = TestHelper.defaultConfig() .with(TABLE_INCLUDE_LIST, "dbo.User") diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SnapshotWithSelectOverridesIT.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SnapshotWithSelectOverridesIT.java index ba3a0a077..285784910 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SnapshotWithSelectOverridesIT.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SnapshotWithSelectOverridesIT.java @@ -79,7 +79,7 @@ public void before() throws SQLException { TestHelper.enableTableCdc(connection, "table3"); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SpecialCharsInNamesIT.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SpecialCharsInNamesIT.java index 8df1c4307..45415315f 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SpecialCharsInNamesIT.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SpecialCharsInNamesIT.java @@ -47,7 +47,7 @@ public void shouldParseWhitespaceChars() throws Exception { connection = TestHelper.testConnection(); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); final Configuration config = TestHelper.defaultConfig() .with(SqlServerConnectorConfig.SNAPSHOT_MODE, SnapshotMode.INITIAL) @@ -117,7 +117,7 @@ public void shouldParseSpecialChars() throws Exception { connection = TestHelper.testConnection(); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); final Configuration config = TestHelper.defaultConfig() .with(SqlServerConnectorConfig.SNAPSHOT_MODE, SnapshotMode.INITIAL) @@ -255,7 +255,7 @@ public void shouldHandleSpecialCharactersInDatabaseNames() throws Exception { connection = TestHelper.testConnection(databaseName); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); final Configuration config = TestHelper.defaultConfig(databaseName) .with(SqlServerConnectorConfig.SNAPSHOT_MODE, SnapshotMode.INITIAL) diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerBinaryModeIT.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerBinaryModeIT.java index 6c19154cb..81b19ad7a 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerBinaryModeIT.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerBinaryModeIT.java @@ -39,7 +39,7 @@ public void before() throws SQLException { TestHelper.enableTableCdc(connection, "binary_mode_test"); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerChangeTableSetIT.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerChangeTableSetIT.java index d95b915a3..59a54bcc9 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerChangeTableSetIT.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerChangeTableSetIT.java @@ -54,7 +54,7 @@ public void before() throws SQLException { TestHelper.enableTableCdc(connection, "tableb"); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); // Testing.Debug.enable(); } @@ -607,7 +607,7 @@ public void readHistoryAfterRestart() throws Exception { // Validate history change types final DocumentReader reader = DocumentReader.defaultReader(); final List changes = new ArrayList<>(); - IoUtil.readLines(TestHelper.DB_HISTORY_PATH, line -> { + IoUtil.readLines(TestHelper.SCHEMA_HISTORY_PATH, line -> { try { changes.add(reader.read(line)); } diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerConnectorIT.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerConnectorIT.java index 9d9645238..9e893b190 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerConnectorIT.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerConnectorIT.java @@ -91,7 +91,7 @@ public void before() throws SQLException { TestHelper.enableTableCdc(connection, "tableb"); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); // Testing.Print.enable(); } @@ -2068,7 +2068,7 @@ public void shouldDetectPurgedHistory() throws Exception { connection.execute("INSERT INTO tableb VALUES(" + id + ", 'b')"); } - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); final LogInterceptor logInterceptor = new LogInterceptor(SqlServerConnectorIT.class); start(SqlServerConnector.class, config); @@ -2622,7 +2622,7 @@ public static class PurgableFileSchemaHistory implements SchemaHistory { @Override public boolean exists() { try { - return storageExists() && java.nio.file.Files.size(TestHelper.DB_HISTORY_PATH) > 0; + return storageExists() && java.nio.file.Files.size(TestHelper.SCHEMA_HISTORY_PATH) > 0; } catch (IOException e) { throw new SchemaHistoryException("File should exist"); diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerConnectorMultiPartitionModeIT.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerConnectorMultiPartitionModeIT.java index 45bc445b4..2220eb24f 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerConnectorMultiPartitionModeIT.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerConnectorMultiPartitionModeIT.java @@ -48,7 +48,7 @@ public void before() throws SQLException { TestHelper.enableTableCdc(connection, "tableC"); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerSchemaNameAdjustmentModeIT.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerSchemaNameAdjustmentModeIT.java index 90350f8ce..09e7c8e00 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerSchemaNameAdjustmentModeIT.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/SqlServerSchemaNameAdjustmentModeIT.java @@ -37,7 +37,7 @@ public void before() throws SQLException { TestHelper.enableTableCdc(connection, "name-adjustment"); initializeConnectorTestFramework(); - Files.delete(TestHelper.DB_HISTORY_PATH); + Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/TablesWithUniqueIndexOnlyIT.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/TablesWithUniqueIndexOnlyIT.java index 6a0e39668..938c564a4 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/TablesWithUniqueIndexOnlyIT.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/TablesWithUniqueIndexOnlyIT.java @@ -43,7 +43,7 @@ public void before() throws SQLException { TestHelper.createTestDatabase(); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/TablesWithoutPrimaryKeyIT.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/TablesWithoutPrimaryKeyIT.java index 3243c3e93..7691a4112 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/TablesWithoutPrimaryKeyIT.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/TablesWithoutPrimaryKeyIT.java @@ -40,7 +40,7 @@ public void before() throws SQLException { TestHelper.createTestDatabase(); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); } @After diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/TransactionMetadataIT.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/TransactionMetadataIT.java index 5dc547018..b369b54f6 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/TransactionMetadataIT.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/TransactionMetadataIT.java @@ -64,7 +64,7 @@ public void before() throws SQLException { TestHelper.enableTableCdc(connection, "tableb"); initializeConnectorTestFramework(); - Testing.Files.delete(TestHelper.DB_HISTORY_PATH); + Testing.Files.delete(TestHelper.SCHEMA_HISTORY_PATH); // Testing.Print.enable(); } diff --git a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/util/TestHelper.java b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/util/TestHelper.java index ca8018258..b229df7be 100644 --- a/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/util/TestHelper.java +++ b/debezium-connector-sqlserver/src/test/java/io/debezium/connector/sqlserver/util/TestHelper.java @@ -55,7 +55,7 @@ public class TestHelper { private static final Logger LOGGER = LoggerFactory.getLogger(TestHelper.class); - public static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-connect.txt").toAbsolutePath(); + public static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-connect.txt").toAbsolutePath(); public static final String TEST_DATABASE_1 = "testDB1"; public static final String TEST_DATABASE_2 = "testDB2"; public static final String TEST_SERVER_NAME = "server1"; @@ -127,7 +127,7 @@ public static Configuration.Builder defaultConnectorConfig() { return builder.with(AbstractTopicNamingStrategy.TOPIC_PREFIX, "server1") .with(SqlServerConnectorConfig.SCHEMA_HISTORY, FileSchemaHistory.class) - .with(FileSchemaHistory.FILE_PATH, DB_HISTORY_PATH) + .with(FileSchemaHistory.FILE_PATH, SCHEMA_HISTORY_PATH) .with(RelationalDatabaseConnectorConfig.INCLUDE_SCHEMA_CHANGES, false); } diff --git a/debezium-embedded/src/test/java/io/debezium/pipeline/source/snapshot/incremental/AbstractIncrementalSnapshotTest.java b/debezium-embedded/src/test/java/io/debezium/pipeline/source/snapshot/incremental/AbstractIncrementalSnapshotTest.java index 5c3875bce..748d7f878 100644 --- a/debezium-embedded/src/test/java/io/debezium/pipeline/source/snapshot/incremental/AbstractIncrementalSnapshotTest.java +++ b/debezium-embedded/src/test/java/io/debezium/pipeline/source/snapshot/incremental/AbstractIncrementalSnapshotTest.java @@ -51,7 +51,7 @@ public abstract class AbstractIncrementalSnapshotTest protected static final int ROW_COUNT = 1_000; private static final int MAXIMUM_NO_RECORDS_CONSUMES = 5; - protected static final Path DB_HISTORY_PATH = Testing.Files.createTestingPath("file-db-history-is.txt") + protected static final Path SCHEMA_HISTORY_PATH = Testing.Files.createTestingPath("file-schema-history-is.txt") .toAbsolutePath(); protected abstract Class connectorClass();