X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FEndlessConsumer.java;h=7e243a9837f4b13d023a7f20c976fdc3a23c9817;hb=34d37c55d7cf830c6d2bdaf747f0938eb557bef3;hp=a21dd86c925b028c8ac094f1e78713c2beb52405;hpb=83a4bf324f5a7ec6010a7921118ec7d6e8f997cf;p=demos%2Fkafka%2Ftraining

diff --git a/src/main/java/de/juplo/kafka/EndlessConsumer.java b/src/main/java/de/juplo/kafka/EndlessConsumer.java
index a21dd86..7e243a9 100644
--- a/src/main/java/de/juplo/kafka/EndlessConsumer.java
+++ b/src/main/java/de/juplo/kafka/EndlessConsumer.java
@@ -35,7 +35,6 @@ public class EndlessConsumer<K, V> implements ConsumerRebalanceListener, Runnabl
   private long consumed = 0;
 
   private final Map<Integer, Map<String, Long>> seen = new HashMap<>();
-  private final Map<Integer, Long> offsets = new HashMap<>();
 
 
   @Override
@@ -45,13 +44,10 @@ public class EndlessConsumer<K, V> implements ConsumerRebalanceListener, Runnabl
     {
       Integer partition = tp.partition();
       Long newOffset = consumer.position(tp);
-      Long oldOffset = offsets.remove(partition);
       log.info(
-          "{} - removing partition: {}, consumed {} records (offset {} -> {})",
+          "{} - removing partition: {}, offset of next message {})",
           id,
           partition,
-          newOffset - oldOffset,
-          oldOffset,
           newOffset);
       Map<String, Long> removed = seen.remove(partition);
       for (String key : removed.keySet())
@@ -63,7 +59,7 @@ public class EndlessConsumer<K, V> implements ConsumerRebalanceListener, Runnabl
             partition,
             key);
       }
-      repository.save(new StatisticsDocument(partition, removed));
+      repository.save(new StatisticsDocument(partition, removed, consumer.position(tp)));
     });
   }
 
@@ -75,13 +71,12 @@ public class EndlessConsumer<K, V> implements ConsumerRebalanceListener, Runnabl
       Integer partition = tp.partition();
       Long offset = consumer.position(tp);
       log.info("{} - adding partition: {}, offset={}", id, partition, offset);
-      offsets.put(partition, offset);
-      seen.put(
-          partition,
+      StatisticsDocument document =
           repository
-              .findById(Integer.toString(tp.partition()))
-              .map(document -> document.statistics)
-              .orElse(new HashMap<>()));
+              .findById(Integer.toString(partition))
+              .orElse(new StatisticsDocument(partition));
+      consumer.seek(tp, document.offset);
+      seen.put(partition, document.statistics);
     });
   }
 
@@ -128,12 +123,17 @@ public class EndlessConsumer<K, V> implements ConsumerRebalanceListener, Runnabl
           seenByKey++;
           byKey.put(key, seenByKey);
         }
+
+        seen.forEach((partiton, statistics) -> repository.save(
+            new StatisticsDocument(
+                partiton,
+                statistics,
+                consumer.position(new TopicPartition(topic, partiton)))));
       }
     }
     catch(WakeupException e)
     {
       log.info("{} - RIIING! Request to stop consumption - commiting current offsets!", id);
-      consumer.commitSync();
       shutdown();
     }
     catch(RecordDeserializationException e)
@@ -147,7 +147,6 @@ public class EndlessConsumer<K, V> implements ConsumerRebalanceListener, Runnabl
           offset,
           e.getCause().toString());
 
-      consumer.commitSync();
       shutdown(e);
     }
     catch(Exception e)