X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FApplicationRecordHandler.java;h=bc18d59b6596507d9ebc03678ceb2b3f487512e4;hb=refs%2Ftags%2Fsumup-adder--drop-duplicates---lvm-2-tage;hp=0f5b982ccdda3e7d2cc84154ee8bb62754d2a03d;hpb=ad4ed61abeb48124f4db65687ede71f5bc943f27;p=demos%2Fkafka%2Ftraining

diff --git a/src/main/java/de/juplo/kafka/ApplicationRecordHandler.java b/src/main/java/de/juplo/kafka/ApplicationRecordHandler.java
index 0f5b982..bc18d59 100644
--- a/src/main/java/de/juplo/kafka/ApplicationRecordHandler.java
+++ b/src/main/java/de/juplo/kafka/ApplicationRecordHandler.java
@@ -16,8 +16,10 @@ public class ApplicationRecordHandler implements RecordHandler<String, String>
 {
   private final AdderResults results;
   private final Optional<Duration> throttle;
+  private final String id;
 
   private final Map<Integer, AdderBusinessLogic> state = new HashMap<>();
+  private final Map<Integer, Long> next = new HashMap<>();
 
 
   @Override
@@ -27,10 +29,20 @@ public class ApplicationRecordHandler implements RecordHandler<String, String>
     String user = record.key();
     String message = record.value();
 
+    if (record.offset() < next.get(partition))
+    {
+      log.warn(
+        "{}- Dropping duplicate message: offset={} < next={}",
+        id,
+        record.offset(),
+        next.get(partition));
+      return;
+    }
+
     if (message.equals("CALCULATE"))
     {
       AdderResult result = state.get(partition).calculate(user);
-      log.info("New result for {}: {}", user, result);
+      log.info("{} - New result for {}: {}", id, user, result);
       results.addResults(partition, user, result);
     }
     else
@@ -38,6 +50,8 @@ public class ApplicationRecordHandler implements RecordHandler<String, String>
       state.get(partition).addToSum(user, Integer.parseInt(message));
     }
 
+    next.put(partition, record.offset() + 1);
+
     if (throttle.isPresent())
     {
       try
@@ -46,19 +60,23 @@ public class ApplicationRecordHandler implements RecordHandler<String, String>
       }
       catch (InterruptedException e)
       {
-        log.warn("Intrerrupted while throttling: {}", e);
+        log.warn("{} - Intrerrupted while throttling: {}", id, e);
       }
     }
   }
 
-  protected void addPartition(Integer partition, Map<String, AdderResult> state)
+  protected void addPartition(Integer partition, Map<String, AdderResult> state, Long offset)
   {
     this.state.put(partition, new AdderBusinessLogic(state));
+    this.next.put(partition, offset);
   }
 
-  protected Map<String, AdderResult> removePartition(Integer partition)
+  protected ApplicationState removePartition(Integer partition)
   {
-    return this.state.remove(partition).getState();
+    ApplicationState state = getState(partition);
+    this.next.remove(partition);
+    this.state.remove(partition);
+    return state;
   }
 
 
@@ -67,8 +85,11 @@ public class ApplicationRecordHandler implements RecordHandler<String, String>
     return state;
   }
 
-  public AdderBusinessLogic getState(Integer partition)
+  public ApplicationState getState(Integer partition)
   {
-    return state.get(partition);
+    return
+      new ApplicationState(
+        this.next.get(partition),
+        this.state.get(partition).getState());
   }
 }