0002526: Improve performance of data gap detection

try to get unit tests working, which init engine differently
JumpMind · Jul 21, 2016 · 1f8632b · 1f8632b
1 parent 1eedbf6
commit 1f8632b
Showing 1 changed file with 11 additions and 10 deletions.
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
@@ -141,15 +141,7 @@ public RouterService(ISymmetricEngine engine) {
         extensionService.addExtensionPoint("dbf", new DBFRouter(engine));
 
         setSqlMap(new RouterServiceSqlMap(symmetricDialect.getPlatform(),
-                createSqlReplacementTokens()));
-
-        if (parameterService.is(ParameterConstants.ROUTING_USE_FAST_GAP_DETECTOR)) {
-            gapDetector = new DataGapFastDetector(engine.getDataService(), parameterService, engine.getContextService(), 
-                    symmetricDialect, this, engine.getStatisticManager(), engine.getNodeService());
-        } else {
-            gapDetector = new DataGapDetector(engine.getDataService(), parameterService, symmetricDialect, 
-                    this, engine.getStatisticManager(), engine.getNodeService());                        
-        }
+                createSqlReplacementTokens()));   
     }
 
     /**
@@ -190,7 +182,16 @@ synchronized public long routeData(boolean force) {
                         engine.getOutgoingBatchService().updateAbandonedRoutingBatches();
                         firstTimeCheckForAbandonedBatches = false;
                     }
-
+
+                    if (gapDetector == null) {
+                        if (parameterService.is(ParameterConstants.ROUTING_USE_FAST_GAP_DETECTOR)) {
+                            gapDetector = new DataGapFastDetector(engine.getDataService(), parameterService, engine.getContextService(), 
+                                    symmetricDialect, this, engine.getStatisticManager(), engine.getNodeService());
+                        } else {
+                            gapDetector = new DataGapDetector(engine.getDataService(), parameterService, symmetricDialect, 
+                                    this, engine.getStatisticManager(), engine.getNodeService());                        
+                        }
+                    }
                     insertInitialLoadEvents();
 
                     long ts = System.currentTimeMillis();