X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fkafka%2FKeyCountingRebalanceListener.java;h=0ad1f319e15d0c53a91a13c547e1a4e6429d5405;hb=de0468e4db973312e61ad4894edc092e84655161;hp=4a2c036118e653e3fcd763e8ea1c42f68b4de86d;hpb=2da45caa1f9d32e3a5506d71cce7f06fa2e36523;p=demos%2Fkafka%2Ftraining

diff --git a/src/main/java/de/juplo/kafka/KeyCountingRebalanceListener.java b/src/main/java/de/juplo/kafka/KeyCountingRebalanceListener.java
index 4a2c036..0ad1f31 100644
--- a/src/main/java/de/juplo/kafka/KeyCountingRebalanceListener.java
+++ b/src/main/java/de/juplo/kafka/KeyCountingRebalanceListener.java
@@ -2,29 +2,20 @@ package de.juplo.kafka;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.consumer.ConsumerRebalanceListener;
 import org.apache.kafka.common.TopicPartition;
 
-import java.time.Clock;
-import java.time.Duration;
-import java.time.Instant;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 
 
 @RequiredArgsConstructor
 @Slf4j
-public class KeyCountingRebalanceListener implements PollIntervalAwareConsumerRebalanceListener
+public class KeyCountingRebalanceListener implements ConsumerRebalanceListener
 {
   private final KeyCountingRecordHandler handler;
-  private final PartitionStatisticsRepository repository;
   private final String id;
-  private final String topic;
-  private final Clock clock;
-  private final Duration commitInterval;
-  private final Consumer<String, Long> consumer;
-
-  private Instant lastCommit = Instant.EPOCH;
 
   @Override
   public void onPartitionsAssigned(Collection<TopicPartition> partitions)
@@ -32,19 +23,8 @@ public class KeyCountingRebalanceListener implements PollIntervalAwareConsumerRe
     partitions.forEach(tp ->
     {
       Integer partition = tp.partition();
-      Long offset = consumer.position(tp);
-      log.info("{} - adding partition: {}, offset={}", id, partition, offset);
-      StatisticsDocument document =
-          repository
-              .findById(Integer.toString(partition))
-              .orElse(new StatisticsDocument(partition));
-      if (document.offset >= 0)
-      {
-        // Only seek, if a stored offset was found
-        // Otherwise: Use initial offset, generated by Kafka
-        consumer.seek(tp, document.offset);
-      }
-      handler.addPartition(partition, document.statistics);
+      log.info("{} - adding partition: {}", id, partition);
+      handler.addPartition(partition, new HashMap<>());
     });
   }
 
@@ -54,30 +34,17 @@ public class KeyCountingRebalanceListener implements PollIntervalAwareConsumerRe
     partitions.forEach(tp ->
     {
       Integer partition = tp.partition();
-      Long newOffset = consumer.position(tp);
-      log.info(
-          "{} - removing partition: {}, offset of next message {})",
-          id,
-          partition,
-          newOffset);
+      log.info("{} - removing partition: {}", id, partition);
       Map<String, Long> removed = handler.removePartition(partition);
-      repository.save(new StatisticsDocument(partition, removed, consumer.position(tp)));
+      for (String key : removed.keySet())
+      {
+        log.info(
+            "{} - Seen {} messages for partition={}|key={}",
+            id,
+            removed.get(key),
+            partition,
+            key);
+      }
     });
   }
-
-
-  @Override
-  public void beforeNextPoll()
-  {
-    if (lastCommit.plus(commitInterval).isBefore(clock.instant()))
-    {
-      log.debug("Storing data and offsets, last commit: {}", lastCommit);
-      handler.getSeen().forEach((partiton, statistics) -> repository.save(
-          new StatisticsDocument(
-              partiton,
-              statistics,
-              consumer.position(new TopicPartition(topic, partiton)))));
-      lastCommit = clock.instant();
-    }
-  }
 }