0001627: Add a cancel load feature to the load screen

JumpMind · Apr 28, 2014 · 0965773 · 0965773
1 parent 8466b65
commit 0965773
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IOutgoingBatchService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/IOutgoingBatchService.java
@@ -45,6 +45,8 @@ public interface IOutgoingBatchService {
 
     public OutgoingBatches getOutgoingBatchRange(long startBatchId, long endBatchId);
 
+    public int cancelLoadBatches(long loadId);
+
     public OutgoingBatches getOutgoingBatchRange(String nodeId, Date startDate, Date endDate, String... channels);
 
     public OutgoingBatches getOutgoingBatchErrors(int maxRows);

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchService.java
@@ -84,6 +84,11 @@ public OutgoingBatchService(IParameterService parameterService,
         setSqlMap(new OutgoingBatchServiceSqlMap(symmetricDialect.getPlatform(),
                 createSqlReplacementTokens()));
     }
+
+    @Override
+    public int cancelLoadBatches(long loadId) {
+        return sqlTemplate.update(getSql("cancelLoadBatchesSql"), loadId);
+    }
 
     public void markAllAsSentForNode(String nodeId, boolean includeConfigChannel) {
         OutgoingBatches batches = null;

diff --git a/...ic-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchServiceSqlMap.java b/...ic-core/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchServiceSqlMap.java
@@ -37,6 +37,8 @@ public OutgoingBatchServiceSqlMap(IDatabasePlatform platform, Map<String, String
 
         putSql("selectCountBatchesPrefixSql" ,"" + 
 "select count(*) from $(outgoing_batch)   " );
+
+        putSql("cancelLoadBatchesSql", "update $(outgoing_batch) set ignore_count=1, status='OK' where load_id=?");
 
         putSql("insertOutgoingBatchSql" ,"" + 
 "insert into $(outgoing_batch)                                                                                                                " +