DSCON-117, DBConnector exception while incremental loading - revert

This reverts commit c3a6023.
AndreyIg · Feb 4, 2020 · 86f3f65 · 86f3f65
1 parent c3a6023
commit 86f3f65
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/...c/main/java/io/debezium/connector/oracle/logminer/LogMinerStreamingChangeEventSource.java b/...c/main/java/io/debezium/connector/oracle/logminer/LogMinerStreamingChangeEventSource.java
@@ -208,13 +208,10 @@ public void commitOffset(Map<String, ?> offset) {
     }
 
     private boolean connectionProblem (Throwable e){
-        if (e.getMessage() == null || e.getCause() == null) {
-            return false;
-        }
         return e.getMessage().startsWith("ORA-03135") ||
                 e.getMessage().startsWith("ORA-12543") ||
                 e.getCause() instanceof IOException ||
-                e.getCause().getCause() instanceof NetException;
+                (e.getCause() != null && e.getCause().getCause() instanceof NetException);
 
     }
 }
diff --git a/...ector-oracle/src/main/java/io/debezium/connector/oracle/logminer/TransactionalBuffer.java b/...ector-oracle/src/main/java/io/debezium/connector/oracle/logminer/TransactionalBuffer.java
@@ -178,7 +178,7 @@ private BigDecimal calculateSmallestScn() {
                 .map(transaction -> transaction.firstScn)
                 .min(BigDecimal::compareTo)
                 .orElseThrow(() -> new DataException("Cannot calculate smallest SCN"));
-        metrics.ifPresent(m -> m.setOldestScn(scn == null ? -1 : scn.longValue()));
+        metrics.ifPresent(m -> m.setOldestScn(scn == null ? null : scn.longValue()));
         return scn;
     }
 

diff --git a/...racle/src/main/java/io/debezium/connector/oracle/logminer/TransactionalBufferMetrics.java b/...racle/src/main/java/io/debezium/connector/oracle/logminer/TransactionalBufferMetrics.java
@@ -152,7 +152,7 @@ public long getMinLagFromSource() {
 
     @Override
     public long getAverageLagFromSource() {
-        return totalLagsFromTheSource.get().toMillis()/(capturedDmlCounter.get() == 0 ? 1 : capturedDmlCounter.get());
+        return totalLagsFromTheSource.get().toMillis()/capturedDmlCounter.get() == 0 ? 1 : capturedDmlCounter.get();
     }
 
     @Override