0001478: Removing a node should remove incoming batches

JumpMind · Apr 10, 2014 · fbfc3c7 · fbfc3c7
1 parent a8b35fd
commit fbfc3c7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java
@@ -751,11 +751,11 @@ public NodeStatus getNodeStatus() {
     public void removeAndCleanupNode(String nodeId) {
         log.warn("Removing node {}", nodeId);
         nodeService.deleteNode(nodeId, false);
-        log.warn("Marking outgoing batch records as Ok for {}", nodeId);
+        log.warn("Marking outgoing batch records as OK for node ID {}", nodeId);
         outgoingBatchService.markAllAsSentForNode(nodeId, true);
-        log.warn("Marking incoming batch records as Ok for {}", nodeId);
-        incomingBatchService.markIncomingBatchesOk(nodeId);
-        log.warn("Done removing node {}", nodeId);        
+        log.warn("Removing incoming batch records for node ID {}", nodeId);
+        incomingBatchService.removingIncomingBatches(nodeId);
+        log.warn("Done removing node ID {}", nodeId);        
     }
 
     public RemoteNodeStatuses pull() {

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IIncomingBatchService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IIncomingBatchService.java
@@ -23,7 +23,7 @@
 
 import java.util.Date;
 import java.util.List;
-
+
 import org.jumpmind.db.sql.ISqlTransaction;
 import org.jumpmind.symmetric.model.IncomingBatch;
 
@@ -58,7 +58,9 @@ public List<Date> listIncomingBatchTimes(List<String> nodeIds, List<String> chan
     public List<IncomingBatch> listIncomingBatches(List<String> nodeIds, List<String> channels,
             List<IncomingBatch.Status> statuses, Date startAtCreateTime, int maxRowsToRetrieve, boolean ascending);
 
-    public void markIncomingBatchesOk(String nodeId);
+    public void markIncomingBatchesOk(String nodeId);
+
+    public void removingIncomingBatches(String nodeId);
 
     public List<IncomingBatch> listIncomingBatchesInErrorFor(String nodeId);
 

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/IncomingBatchService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/IncomingBatchService.java
@@ -90,6 +90,10 @@ public void markIncomingBatchesOk(String nodeId) {
         }
     }
 
+    public void removingIncomingBatches(String nodeId) {
+        sqlTemplate.update(getSql("deleteIncomingBatchByNodeSql"), nodeId);
+    }
+
     public List<IncomingBatch> listIncomingBatchesInErrorFor(String nodeId) {
         return sqlTemplate.query(
                 getSql("selectIncomingBatchPrefixSql", "listIncomingBatchesInErrorForNodeSql"),

diff --git a/...ic-core/src/main/java/org/jumpmind/symmetric/service/impl/IncomingBatchServiceSqlMap.java b/...ic-core/src/main/java/org/jumpmind/symmetric/service/impl/IncomingBatchServiceSqlMap.java
@@ -67,9 +67,8 @@ public IncomingBatchServiceSqlMap(IDatabasePlatform platform, Map<String, String
 
         putSql("deleteIncomingBatchSql" ,"" + 
 "delete from $(incoming_batch) where batch_id = ? and node_id = ?                                                                                     " );
-
+
+        putSql("deleteIncomingBatchByNodeSql" ,"delete from $(incoming_batch) where node_id = ?");
     }
-
-
 
 }