0002052: Remove transform when used on a primary key without the pk c…

…olumn checked fails 0002053: Fallback to insert fails when transform is configured as update first on the LOAD side. Data is retransformed as an update.
JumpMind · Nov 5, 2014 · c2786d8 · c2786d8
1 parent ded7dda
commit c2786d8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/TransformTable.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/TransformTable.java
@@ -284,7 +284,7 @@ public TransformTable enhanceWithImpliedColumns(String[] keyNames, String[] colu
                     boolean hasDelete = false;
 
                     if (primaryKeyColumns != null) {
-                        for (TransformColumn xCol : primaryKeyColumns) {
+                        for (TransformColumn xCol : transformColumns) {
                             if ((StringUtils.isNotBlank(xCol.getSourceColumnName()) && StringUtils.equalsIgnoreCase(xCol.getSourceColumnName(),column)) ||
                                     StringUtils.isNotBlank(xCol.getTargetColumnName()) && StringUtils.equalsIgnoreCase(xCol.getTargetColumnName(),column)) {
                                 if (xCol.includeOn == IncludeOnType.ALL) {

diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/TransformWriter.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/writer/TransformWriter.java
@@ -197,12 +197,17 @@ public void write(CsvData data) {
 
             List<TransformedData> dataThatHasBeenTransformed = new ArrayList<TransformedData>();
             TransformTable[] transformTables = activeTransforms.toArray(new TransformTable[activeTransforms.size()]);
-            if (data.getDataEventType() == DataEventType.DELETE) {
+            if (eventType == DataEventType.DELETE) {
                 CollectionUtils.reverseArray(transformTables);
             }
+
             for (TransformTable transformation : transformTables) {
-                transformation = transformation.enhanceWithImpliedColumns(this.sourceTable.getPrimaryKeyColumnNames(), 
+                transformation = transformation.enhanceWithImpliedColumns(
+                        this.sourceTable.getPrimaryKeyColumnNames(),
                         this.sourceTable.getColumnNames());
+                if (eventType == DataEventType.INSERT && transformation.isUpdateFirst()) {
+                    eventType = DataEventType.UPDATE;
+                }
                 dataThatHasBeenTransformed.addAll(transform(eventType, context, transformation,
                         sourceKeyValues, oldSourceValues, sourceValues));
             }
@@ -344,10 +349,6 @@ protected boolean perform(DataContext context, TransformedData data,
             // transformation
             if (data.getColumnNames().length > 0) {
                 if (data.getTargetDmlType() != DataEventType.DELETE) {
-                    if (data.getTargetDmlType() == DataEventType.INSERT
-                            && transformation.isUpdateFirst()) {
-                        data.setTargetDmlType(DataEventType.UPDATE);
-                    }
                     persistData = true;
                 } else {
                     // handle the delete action

diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/stage/StagingManager.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/stage/StagingManager.java
@@ -83,7 +83,7 @@ protected void refreshResourceList() {
      */
     public long clean(long ttlInMs) {
         synchronized (StagingManager.class) {
-            log.debug("Cleaning staging area");
+            log.trace("Cleaning staging area");
             Set<String> keys = new HashSet<String>(resourceList.keySet());
             long purgedFileCount = 0;
             long purgedFileSize = 0;