Merge branch 'master' of http://git.navis.lan/scm/n4fra/debezium

AndreyIg · Jan 20, 2020 · 276c19b · 276c19b
2 parents 9b5a3f3 + bc8e4be
commit 276c19b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/...-connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/LogMinerHelper.java b/...-connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/LogMinerHelper.java
@@ -234,17 +234,17 @@ static void setSupplementalLoggingForWhitelistedTables(OracleConnection jdbcConn
             jdbcConnection.setSessionToPdb(pdbName);
         }
 
-        final String globalLevelLogging = "SUPPLEMENTAL_LOG_DATA_ALL";
-        String validateGlobalLogging = "SELECT '" + globalLevelLogging + "', " + globalLevelLogging + " from V$DATABASE";
-        String tableLevelLogging = "ALL_COLUMN_LOGGING";
-        String validateTableLevelLogging = "SELECT '" + tableLevelLogging + "', LOG_GROUP_TYPE FROM DBA_LOG_GROUPS WHERE TABLE_NAME = '";
+        final String key = "KEY";
+        String validateGlobalLogging = "SELECT '" + key + "', " + " SUPPLEMENTAL_LOG_DATA_ALL from V$DATABASE";
         Map<String, String> globalLogging = getMap(connection, validateGlobalLogging, "unknown");
-        if ("no".equalsIgnoreCase(globalLogging.get(globalLevelLogging))) {
+        if ("no".equalsIgnoreCase(globalLogging.get(key))) {
             tableIds.forEach(table -> {
                 String tableName = table.schema() + "." + table.table();
                 try {
-                    Map<String, String> tableLogging = getMap(connection, validateTableLevelLogging + tableName.toUpperCase() + "'", "unknown");
-                    if (tableLogging.get(tableLevelLogging) != null) {
+                    String validateTableLevelLogging = String.format("SELECT '%s', LOG_GROUP_TYPE FROM DBA_LOG_GROUPS WHERE LOG_GROUP_TYPE='ALL COLUMN LOGGING' AND OWNER ='%s' AND TABLE_NAME = '%s'", key,
+                            table.schema().toUpperCase(), table.table().toUpperCase());
+                    Map<String, String> tableLogging = getMap(connection, validateTableLevelLogging, "unknown");
+                    if (tableLogging.get(key) == null) {
                         String alterTableStatement = "ALTER TABLE " + tableName + " ADD SUPPLEMENTAL LOG DATA (ALL) COLUMNS";
                         LOGGER.info("altering table {} for supplemental logging", table.table());
                         executeCallableStatement(connection, alterTableStatement);

diff --git a/...connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/LogMinerMetrics.java b/...connector-oracle/src/main/java/io/debezium/connector/oracle/logminer/LogMinerMetrics.java
@@ -12,7 +12,6 @@
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;