0003825: Oracle bulk loader using SQL*Loader sqlldr

JumpMind · Dec 14, 2018 · afacba8 · afacba8
1 parent 151d5a2
commit afacba8
Showing 1 changed file with 25 additions and 8 deletions.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/io/OracleBulkDatabaseWriter.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/io/OracleBulkDatabaseWriter.java
@@ -116,7 +116,7 @@ public boolean start(Table table) {
                     }
                 }
             }
-            if (dataResource == null) {
+            if (dataResource == null && !isFallBackToDefault()) {
                 createStagingFile();
             }
             return true;
@@ -227,6 +227,7 @@ protected void bulkWrite(CsvData data) {
     }
 
     protected void flush() {
+        boolean inError = false;
         if (rows > 0) {
             dataResource.close();
             statistics.get(batch).startTimer(DataWriterStatisticConstants.LOADMILLIS);
@@ -259,22 +260,38 @@ protected void flush() {
                 } else if (rc != 0) {
                     throw new RuntimeException("Process builder returned " + rc);
                 }
-
-                dataResource.delete();
-                File absFile = controlResource.getFile().getAbsoluteFile();
-                new File(absFile.getPath().replace(".create", ".bad")).delete();
-                new File(absFile.getPath().replace(".create", ".log")).delete();
-                controlResource.delete();
             } catch (Exception e) {
+                inError = true;
                 if (e instanceof RuntimeException) {
                     throw (RuntimeException) e;
                 }
                 throw new RuntimeException(e);
             } finally {
                 statistics.get(batch).stopTimer(DataWriterStatisticConstants.LOADMILLIS);
-                dataResource = null;
+                cleanup(inError);
                 rows = 0;
             }
+        } else {
+            cleanup(inError);
+        }
+    }
+
+    protected void cleanup(boolean inError) {
+        if (dataResource != null) {
+            dataResource.delete();
+            dataResource = null;
+        }
+        if (controlResource != null) {
+            if (!inError) {
+                File absFile = controlResource.getFile().getAbsoluteFile();
+                try {
+                    new File(absFile.getPath().replace(".create", ".bad")).delete();
+                    new File(absFile.getPath().replace(".create", ".log")).delete();
+                } catch (Exception e) {
+                }
+                controlResource.delete();
+            }
+            controlResource = null;
         }
     }