very simple tests working

JumpMind · May 19, 2011 · db3e944 · db3e944
1 parent 0b78d8a
commit db3e944
Show file tree

Hide file tree

Showing 5 changed files with 199 additions and 86 deletions.
diff --git a/future/symmetric3-core/src/main/java/org/jumpmind/symmetric/core/model/AbstractCsvData.java b/future/symmetric3-core/src/main/java/org/jumpmind/symmetric/core/model/AbstractCsvData.java
@@ -16,7 +16,8 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.  */
+ * under the License. 
+ */
 
 package org.jumpmind.symmetric.core.model;
 
@@ -26,41 +27,48 @@
 import java.util.Map;
 
 import org.jumpmind.symmetric.core.common.StringUtils;
+import org.jumpmind.symmetric.core.io.IoException;
 import org.jumpmind.symmetric.csv.CsvReader;
 import org.jumpmind.symmetric.csv.CsvUtils;
 
-
 /**
  * 
  */
 abstract class AbstractCsvData {
 
     private Map<String, String[]> parsedCsvData = null;
 
+    protected void removeData(String key) {
+        parsedCsvData.remove(key);
+    }
+
+    protected void putData(String key, String[] data) {
+        if (parsedCsvData == null) {
+            parsedCsvData = new HashMap<String, String[]>(2);
+        }
+        parsedCsvData.put(key, data);
+    }
+
     protected String[] getData(String key, String data) {
-        if (!StringUtils.isBlank(data)) {
+        String[] values = null;
+        if (parsedCsvData != null && parsedCsvData.containsKey(key)) {
+            values = parsedCsvData.get(key);
+        } else if (!StringUtils.isBlank(data)) {
             try {
-                if (parsedCsvData == null) {
-                    parsedCsvData = new HashMap<String, String[]>(2);
-                }
-                if (parsedCsvData.containsKey(key)) {
-                    return parsedCsvData.get(key);
+                CsvReader csvReader = CsvUtils.getCsvReader(new StringReader(data));
+                if (csvReader.readRecord()) {
+                    values = csvReader.getValues();
+                    putData(key, values);
                 } else {
-                    CsvReader csvReader = CsvUtils.getCsvReader(new StringReader(data));
-                    if (csvReader.readRecord()) {
-                        String[] values = csvReader.getValues();
-                        parsedCsvData.put(key, values);
-                        return values;
-                    } else {
-                        throw new IllegalStateException(String.format("Could not parse the data passed in: %s", data));
-                    }
+                    throw new IllegalStateException(String.format(
+                            "Could not parse the data passed in: %s", data));
                 }
             } catch (IOException e) {
-                throw new RuntimeException(e);
+                throw new IoException(e);
             }
-        } else {
-            return null;
         }
+        return values;
+
     }
 
 }
diff --git a/future/symmetric3-core/src/main/java/org/jumpmind/symmetric/core/model/Batch.java b/future/symmetric3-core/src/main/java/org/jumpmind/symmetric/core/model/Batch.java
@@ -20,6 +20,7 @@ public class Batch {
     protected long otherCount;
     protected long fallbackInsertCount;
     protected long fallbackUpdateCount;
+    protected long fallbackUpdateWithNewKeysCount;
     protected long missingDeleteCount;
     protected long timerMillis;
 
@@ -34,6 +35,10 @@ public long incrementLineCount() {
     public long incrementFallbackInsertCount() {
         return ++fallbackInsertCount;
     }
+
+    public long incrementFallbackUpdateWithNewKeysCount() {
+        return ++fallbackUpdateWithNewKeysCount;
+    }
 
     public long incrementFallbackUpdateCount() {
         return ++fallbackUpdateCount;

diff --git a/future/symmetric3-core/src/main/java/org/jumpmind/symmetric/core/model/Data.java b/future/symmetric3-core/src/main/java/org/jumpmind/symmetric/core/model/Data.java
@@ -74,7 +74,7 @@ public Data(String tableName, DataEventType eventType, String rowData) {
         this(-1, null, rowData, eventType, tableName, null, null, null, null);
     }
 
-    public Data(String pkData, String rowData, DataEventType eventType, String tableName) {
+    public Data(String tableName, DataEventType eventType, String pkData, String rowData) {
         this(-1, pkData, rowData, eventType, tableName, null, null, null, null);
     }
 
@@ -118,6 +118,11 @@ public String[] toParsedOldData() {
     public String[] toParsedPkData() {
         return getData("pkData", pkData);
     }
+
+    public void clearPkData() {
+        this.pkData = null;
+        this.removeData("pkData");
+    }
 
     public long getDataId() {
         return dataId;
@@ -156,7 +161,7 @@ public String getPkData() {
     }
 
     public void setPkData(String pkData) {
-        this.pkData = pkData;
+        this.pkData = pkData;        
     }
 
     public String getOldData() {