Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add persistedEndOffsetMap to KafkaQueryProcessor #71

Merged
merged 1 commit into from
Aug 22, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 31 additions & 12 deletions src/main/java/com/teragrep/pth_06/planner/KafkaQueryProcessor.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,14 @@ public class KafkaQueryProcessor implements KafkaQuery {
// NOTE, for Kafka: start is inclusive (GreaterOrEqualThan), end is exclusive
private final Logger LOGGER = LoggerFactory.getLogger(KafkaQueryProcessor.class);

private final boolean continuousProcessing;
private final Consumer<byte[], byte[]> kafkaConsumer;
private final Set<TopicPartition> topicPartitionSet;
private final Map<TopicPartition, Long> persistedEndOffsetMap;

public KafkaQueryProcessor(Config config) {
this.persistedEndOffsetMap = new HashMap<>();
this.continuousProcessing = config.kafkaConfig.kafkaContinuousProcessing;
Map<String, Object> executorKafkaProperties = config.kafkaConfig.driverOpts;
this.kafkaConsumer = new KafkaConsumer<>(executorKafkaProperties);

Expand Down Expand Up @@ -187,36 +191,51 @@ private void handleTopicAuthorizationException(String topicsRegexString, TopicAu

@VisibleForTesting
public KafkaQueryProcessor(Consumer<byte[],byte[]> consumer) {
this.persistedEndOffsetMap = new HashMap<>();
this.continuousProcessing = false;
kafkaConsumer = consumer;
topicPartitionSet = consumer.assignment();
LOGGER.debug("@VisibleForTesting KafkaQueryProcessor");
}

@Override
public Map<TopicPartition, Long> getInitialEndOffsets() {
Map<TopicPartition, Long> topicPartitionEndOffsetMap = new HashMap<>();
Map<TopicPartition, Long> endOffsets = kafkaConsumer.endOffsets(topicPartitionSet, Duration.ofSeconds(60));
if (persistedEndOffsetMap.isEmpty() || continuousProcessing) {

for (TopicPartition topicPartition : topicPartitionSet) {
long partitionEnd = endOffsets.get(topicPartition);
topicPartitionEndOffsetMap.put(topicPartition, partitionEnd);
Map<TopicPartition, Long> topicPartitionEndOffsetMap = new HashMap<>();
Map<TopicPartition, Long> endOffsets = kafkaConsumer.endOffsets(topicPartitionSet, Duration.ofSeconds(60));

for (TopicPartition topicPartition : topicPartitionSet) {
long partitionEnd = endOffsets.get(topicPartition);
topicPartitionEndOffsetMap.put(topicPartition, partitionEnd);

}
persistedEndOffsetMap.putAll(topicPartitionEndOffsetMap);
return topicPartitionEndOffsetMap;
}
else {
return persistedEndOffsetMap;
}
return topicPartitionEndOffsetMap;
}

@Override
public Map<TopicPartition, Long> getEndOffsets(KafkaOffset startOffset) {
Map<TopicPartition, Long> topicPartitionEndOffsetMap = new HashMap<>();
if (persistedEndOffsetMap.isEmpty() || continuousProcessing) {
Map<TopicPartition, Long> topicPartitionEndOffsetMap = new HashMap<>();

Map<TopicPartition, Long> endOffsets = kafkaConsumer.endOffsets(topicPartitionSet, Duration.ofSeconds(60)); // TODO parametrize
Map<TopicPartition, Long> endOffsets = kafkaConsumer.endOffsets(topicPartitionSet, Duration.ofSeconds(60)); // TODO parametrize

for (TopicPartition topicPartition : topicPartitionSet) {
long partitionEnd = endOffsets.get(topicPartition); // partition end becomes the current end
for (TopicPartition topicPartition : topicPartitionSet) {
long partitionEnd = endOffsets.get(topicPartition); // partition end becomes the current end

topicPartitionEndOffsetMap.put(topicPartition, partitionEnd);
topicPartitionEndOffsetMap.put(topicPartition, partitionEnd);
}
persistedEndOffsetMap.putAll(topicPartitionEndOffsetMap);
return topicPartitionEndOffsetMap;
}
else {
return persistedEndOffsetMap;
}
return topicPartitionEndOffsetMap;
}

@Override
Expand Down