peek ahead logic always evaluated to true because the transactionIds …

…were always being add to the compare to list prior to the compare to. Also fixed database timing stats for outgoing_batch_hist.
JumpMind · Apr 23, 2008 · 230c9a2 · 230c9a2
1 parent 12d4374
commit 230c9a2
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchService.java b/symmetric/src/main/java/org/jumpmind/symmetric/service/impl/OutgoingBatchService.java
@@ -130,14 +130,15 @@ public Object doInConnection(Connection conn) throws SQLException, DataAccessExc
 
                                 do {
                                     String trxId = results.getString(1);
-                                    if (trxId != null) {
-                                        transactionIds.add(trxId);
-                                    }
 
                                     if (!peekAheadMode
                                             || (peekAheadMode && (trxId != null && transactionIds
                                                     .contains(trxId)))) {
                                         peekAheadCountDown = batchSizePeekAhead;
+
+                                        if (trxId != null) {
+                                            transactionIds.add(trxId);
+                                        }
 
                                         int dataId = results.getInt(2);
 
@@ -167,7 +168,11 @@ public Object doInConnection(Connection conn) throws SQLException, DataAccessExc
                                     }
 
                                 } while (results.next() && peekAheadCountDown != 0);
-
+
+                                long startTime = System.currentTimeMillis();
+                                update.executeBatch();
+                                databaseMillis += (System.currentTimeMillis() - startTime);
+
                                 history.setEndTime(new Date());
                                 history.setDataEventCount(dataEventCount);
                                 history.setDatabaseMillis(databaseMillis);
@@ -180,7 +185,7 @@ public Object doInConnection(Connection conn) throws SQLException, DataAccessExc
                             JdbcUtils.closeStatement(select);
                         }
 
-                        update.executeBatch();
+
                     }
                 } finally {
                     JdbcUtils.closeStatement(update);