From 709a50a65287cb06a3be647e7b2d4d734db91438 Mon Sep 17 00:00:00 2001 From: Chris Cranford Date: Thu, 29 Jul 2021 04:36:58 -0400 Subject: [PATCH] DBZ-3752 More suggested changes * Added `infinispan-buffer` profile for testing with infinispan * Made `online_catalog` the default for testing * Added protostream-processor back to the POM --- debezium-bom/pom.xml | 7 +++++++ debezium-connector-oracle/pom.xml | 16 ++++++++++++++++ .../connector/oracle/util/TestHelper.java | 9 +++++++++ 3 files changed, 32 insertions(+) diff --git a/debezium-bom/pom.xml b/debezium-bom/pom.xml index 8085d7740..3698b5599 100644 --- a/debezium-bom/pom.xml +++ b/debezium-bom/pom.xml @@ -42,6 +42,7 @@ 12.1.6.Final + 4.4.1.Final 0.33.0 @@ -442,6 +443,12 @@ infinispan-core ${version.infinispan} + + org.infinispan.protostream + protostream-processor + ${version.infinispan.protostream} + provided + diff --git a/debezium-connector-oracle/pom.xml b/debezium-connector-oracle/pom.xml index 587578326..1e3ce6033 100644 --- a/debezium-connector-oracle/pom.xml +++ b/debezium-connector-oracle/pom.xml @@ -43,6 +43,10 @@ org.infinispan infinispan-core + + org.infinispan.protostream + protostream-processor + @@ -103,6 +107,7 @@ logminer + memory @@ -138,6 +143,10 @@ database.connection.adapter ${adapter.name} + + log.mining.buffer.type + ${log.mining.buffer.type.name} + @@ -165,6 +174,7 @@ -Djava.library.path=${instantclient.dir} -Ddebezium.embedded.shutdown.pause.before.interrupt.ms=20000 ${adapter.name} + ${log.mining.buffer.type.name} @@ -307,5 +317,11 @@ + + infinispan-buffer + + infinispan + + 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 10f457361..146766860 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 @@ -12,6 +12,7 @@ import io.debezium.config.Configuration; import io.debezium.connector.oracle.OracleConnection; import io.debezium.connector.oracle.OracleConnectorConfig; +import io.debezium.connector.oracle.OracleConnectorConfig.LogMiningBufferType; import io.debezium.jdbc.JdbcConfiguration; import io.debezium.relational.history.FileDatabaseHistory; import io.debezium.util.Strings; @@ -108,6 +109,14 @@ public static Configuration.Builder defaultConfig() { builder.withDefault(OracleConnectorConfig.XSTREAM_SERVER_NAME, "dbzxout"); } else { + // Tests will always use the online catalog strategy due to speed. + builder.withDefault(OracleConnectorConfig.LOG_MINING_STRATEGY, "online_catalog"); + + final String bufferType = System.getProperty(OracleConnectorConfig.LOG_MINING_BUFFER_TYPE.name()); + if (LogMiningBufferType.parse(bufferType).equals(LogMiningBufferType.INFINISPAN)) { + builder.withDefault(OracleConnectorConfig.LOG_MINING_BUFFER_TYPE, "infinispan"); + builder.withDefault(OracleConnectorConfig.LOG_MINING_BUFFER_LOCATION, "./target/data"); + } builder.withDefault(OracleConnectorConfig.LOG_MINING_BUFFER_DROP_ON_STOP, true); }