0003667: Bulk loads should not log errors while falling back to default

loader
JumpMind · Aug 9, 2018 · 5c3cdc1 · 5c3cdc1
1 parent 812f7f4
commit 5c3cdc1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/io/AbstractBulkDatabaseWriter.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/io/AbstractBulkDatabaseWriter.java
@@ -1,8 +1,8 @@
 package org.jumpmind.symmetric.io;
 
 import org.jumpmind.db.platform.IDatabasePlatform;
+import org.jumpmind.symmetric.common.ContextConstants;
 import org.jumpmind.symmetric.io.data.CsvData;
-import org.jumpmind.symmetric.io.data.IDataWriter;
 import org.jumpmind.symmetric.io.data.writer.DatabaseWriterSettings;
 import org.jumpmind.symmetric.io.data.writer.DynamicDefaultDatabaseWriter;
 
@@ -18,10 +18,10 @@ public AbstractBulkDatabaseWriter(IDatabasePlatform symmetricPlatform, IDatabase
     }
 
     public final void write(CsvData data) {
-        if (context.get(IDataWriter.CONTEXT_BULK_WRITER_TO_USE) != null && context.get(IDataWriter.CONTEXT_BULK_WRITER_TO_USE).equals("default")) {
+        if (context.get(ContextConstants.CONTEXT_BULK_WRITER_TO_USE) != null && context.get(ContextConstants.CONTEXT_BULK_WRITER_TO_USE).equals("default")) {
             writeDefault(data);
         }else{
-            context.put(IDataWriter.CONTEXT_BULK_WRITER_TO_USE, "bulk");
+            context.put(ContextConstants.CONTEXT_BULK_WRITER_TO_USE, "bulk");
             bulkWrite(data);
         }
     }

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/common/ContextConstants.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/common/ContextConstants.java
@@ -13,4 +13,7 @@ private ContextConstants() {
 
     public static final String FILE_SYNC_FAST_SCAN_TRACK_TIME = "file.sync.fast.scan.track.time";
 
+    public static final String CONTEXT_BULK_WRITER_TO_USE = "bulkWriterToUse";
+
+
 }
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataLoaderService.java
@@ -63,6 +63,7 @@
 import org.jumpmind.symmetric.SymmetricException;
 import org.jumpmind.symmetric.Version;
 import org.jumpmind.symmetric.common.Constants;
+import org.jumpmind.symmetric.common.ContextConstants;
 import org.jumpmind.symmetric.common.ErrorConstants;
 import org.jumpmind.symmetric.common.ParameterConstants;
 import org.jumpmind.symmetric.ext.INodeRegistrationListener;
@@ -1038,8 +1039,8 @@ protected IDataWriter chooseDataWriter(Batch batch) {
                                 loadInfo.setStatus(ProcessStatus.OK);
                             }
                         } catch (Exception e) {
-                            if (ctx.get(IDataWriter.CONTEXT_BULK_FALLBACK_TO_DEFAULT) != null && ctx.get(IDataWriter.CONTEXT_BULK_FALLBACK_TO_DEFAULT).equals("bulk")) {
-                                ctx.put(IDataWriter.CONTEXT_BULK_FALLBACK_TO_DEFAULT, "default");
+                            if (ctx.get(ContextConstants.CONTEXT_BULK_WRITER_TO_USE) != null && ctx.get(ContextConstants.CONTEXT_BULK_WRITER_TO_USE).equals("bulk")) {
+                                ctx.put(ContextConstants.CONTEXT_BULK_WRITER_TO_USE, "default");
                                 processor.setDataReader(buildDataReader(batchInStaging, resource));
                                 processor.process(ctx);
                             } else {

diff --git a/...c-core/src/main/java/org/jumpmind/symmetric/service/impl/ManageIncomingBatchListener.java b/...c-core/src/main/java/org/jumpmind/symmetric/service/impl/ManageIncomingBatchListener.java
@@ -34,14 +34,13 @@
 import org.jumpmind.exception.IoException;
 import org.jumpmind.symmetric.ISymmetricEngine;
 import org.jumpmind.symmetric.common.Constants;
+import org.jumpmind.symmetric.common.ContextConstants;
 import org.jumpmind.symmetric.common.ErrorConstants;
 import org.jumpmind.symmetric.common.ParameterConstants;
 import org.jumpmind.symmetric.db.ISymmetricDialect;
 import org.jumpmind.symmetric.io.data.Batch;
 import org.jumpmind.symmetric.io.data.DataContext;
-import org.jumpmind.symmetric.io.data.DataProcessor;
 import org.jumpmind.symmetric.io.data.IDataProcessorListener;
-import org.jumpmind.symmetric.io.data.IDataWriter;
 import org.jumpmind.symmetric.io.data.writer.Conflict;
 import org.jumpmind.symmetric.io.data.writer.ConflictException;
 import org.jumpmind.symmetric.io.data.writer.DefaultDatabaseWriter;
@@ -192,7 +191,7 @@ public void batchInError(DataContext context, Throwable ex) {
                 throw ex;
             }
 
-            if (context.get(IDataWriter.CONTEXT_BULK_WRITER_TO_USE) != null && context.get(IDataWriter.CONTEXT_BULK_WRITER_TO_USE).equals("bulk")) {
+            if (context.get(ContextConstants.CONTEXT_BULK_WRITER_TO_USE) != null && context.get(ContextConstants.CONTEXT_BULK_WRITER_TO_USE).equals("bulk")) {
                 log.info("Bulk loading failed for this batch " + context.getBatch().getBatchId() + ", falling back to default loading.");
                 log.debug("Bulk loading error.", ex);
             } else {

diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/IDataWriter.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/IDataWriter.java
@@ -25,8 +25,6 @@
 
 public interface IDataWriter extends IDataResource {
 
-    public static final String CONTEXT_BULK_WRITER_TO_USE = "bulkWriterToUse";
-
     public void start(Batch batch);
 
     public boolean start(Table table);