0006057: fix conflict win marker from becoming a gap

JumpMind · Nov 2, 2023 · bfaccd0 · bfaccd0
1 parent 51bb9c6
commit bfaccd0
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 13 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/route/ChannelRouterContext.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/route/ChannelRouterContext.java
@@ -169,15 +169,6 @@ public void commit() {
         }
     }
 
-    public void commitOnlyPrerouted() {
-        dataIds.addAll(uncommittedDataIds);
-        clearState();
-    }
-
-    public List<Long> getUncommittedDataIds() {
-        return uncommittedDataIds;
-    }
-
     protected void clearState() {
         this.usedDataRouters.clear();
         this.timesByRouter.clear();

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/PurgeService.java
@@ -711,7 +711,7 @@ protected void saveContextLastId(MinMaxDeleteSql identifier, long lastId) {
      *            List of expired data gaps to avoid
      * @return
      */
-    protected long[] getMinMaxAvoidGaps(long minId, long maxId, List<DataGap> dataGapsExpired) {
+    public static long[] getMinMaxAvoidGaps(long minId, long maxId, List<DataGap> dataGapsExpired) {
         if (dataGapsExpired.size() > 0) {
             Iterator<DataGap> iter = dataGapsExpired.iterator();
             while (iter.hasNext()) {
@@ -730,8 +730,9 @@ protected long[] getMinMaxAvoidGaps(long minId, long maxId, List<DataGap> dataGa
                     // range is completely inside the gap
                     if (maxId <= gap.getEndId()) {
                         maxId = -(gap.getEndId() + 1);
+                        break;
                     }
-                    break;
+                    iter.remove();
                 }
             }
         }

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/RouterService.java
@@ -626,8 +626,6 @@ protected long routeDataForChannel(ProcessInfo processInfo, final NodeChannel no
                     // rolled back as exception, but let gap detector know about what was committed before halting
                     gapDetector.addDataIds(context.getDataIds());
                     gapDetector.setIsAllDataRead(false);
-                } else if (context.getUncommittedDataIds().size() > 0) {
-                    context.commitOnlyPrerouted();
                 }
             } catch (Exception e) {
                 if (context != null) {
@@ -765,6 +763,9 @@ protected long selectDataAndRoute(ProcessInfo processInfo, NodeCommunication nod
                         processInfo.incrementCurrentDataCount();
                         if (data.isPreRouted()) {
                             context.addData(data.getDataId());
+                            statsDataCount++;
+                            totalDataCount++;
+                            totalDataEventCount++;
                         } else {
                             boolean atTransactionBoundary = false;
                             if (nextData != null) {

diff --git a/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/PurgeServiceTest.java b/symmetric-core/src/test/java/org/jumpmind/symmetric/service/impl/PurgeServiceTest.java
@@ -0,0 +1,29 @@
+package org.jumpmind.symmetric.service.impl;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jumpmind.symmetric.model.DataGap;
+import org.junit.jupiter.api.Test;
+
+public class PurgeServiceTest {
+    @Test
+    public void testPurgeAroundSmallGaps() {
+        List<DataGap> gaps = new ArrayList<DataGap>();
+        gaps.add(new DataGap(1821, 1824));
+        gaps.add(new DataGap(1838, 1838));
+        long[] minMax = PurgeService.getMinMaxAvoidGaps(1821, 1846, gaps);
+        assertEquals(1825, minMax[0]);
+        assertEquals(1837, minMax[1]);
+        assertEquals(gaps.size(), 1);
+        minMax = PurgeService.getMinMaxAvoidGaps(1838, 1838, gaps);
+        assertEquals(-1839, minMax[1]);
+        assertEquals(gaps.size(), 1);
+        minMax = PurgeService.getMinMaxAvoidGaps(1838, 1846, gaps);
+        assertEquals(1839, minMax[0]);
+        assertEquals(1846, minMax[1]);
+        assertEquals(gaps.size(), 0);
+    }
+}