-
Notifications
You must be signed in to change notification settings - Fork 0
KAFKA-17747: [2/N] Add compute topic and group hash (wip) #2
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
base: trunk
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -19,11 +19,21 @@ | |||||||||||||||||||||||||||||||||
import org.apache.kafka.common.KafkaException; | ||||||||||||||||||||||||||||||||||
import org.apache.kafka.common.message.ListGroupsResponseData; | ||||||||||||||||||||||||||||||||||
import org.apache.kafka.coordinator.common.runtime.CoordinatorRecord; | ||||||||||||||||||||||||||||||||||
import org.apache.kafka.image.ClusterImage; | ||||||||||||||||||||||||||||||||||
import org.apache.kafka.image.TopicImage; | ||||||||||||||||||||||||||||||||||
import org.apache.kafka.metadata.BrokerRegistration; | ||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||
import com.google.common.hash.HashCode; | ||||||||||||||||||||||||||||||||||
import com.google.common.hash.HashFunction; | ||||||||||||||||||||||||||||||||||
import com.google.common.hash.Hasher; | ||||||||||||||||||||||||||||||||||
import com.google.common.hash.Hashing; | ||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||
import java.nio.charset.StandardCharsets; | ||||||||||||||||||||||||||||||||||
import java.util.Arrays; | ||||||||||||||||||||||||||||||||||
import java.util.List; | ||||||||||||||||||||||||||||||||||
import java.util.Locale; | ||||||||||||||||||||||||||||||||||
import java.util.Map; | ||||||||||||||||||||||||||||||||||
import java.util.Objects; | ||||||||||||||||||||||||||||||||||
import java.util.Optional; | ||||||||||||||||||||||||||||||||||
import java.util.Set; | ||||||||||||||||||||||||||||||||||
import java.util.function.Function; | ||||||||||||||||||||||||||||||||||
|
@@ -209,4 +219,50 @@ void validateOffsetFetch( | |||||||||||||||||||||||||||||||||
default boolean shouldExpire() { | ||||||||||||||||||||||||||||||||||
return true; | ||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||
/** | ||||||||||||||||||||||||||||||||||
* Computes the hash of the topics in a group. | ||||||||||||||||||||||||||||||||||
* | ||||||||||||||||||||||||||||||||||
* @param topicHashes The map of topic hashes. Key is topic name and value is the topic hash. | ||||||||||||||||||||||||||||||||||
* @return The hash of the group. | ||||||||||||||||||||||||||||||||||
*/ | ||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Suggestion: Consider adding a brief JavaDoc comment explaining the purpose of this method and when it should be used. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maintainability Issue: Magic byte value in hash computation The magic byte Suggestion: // Define a named constant for the hash algorithm version
private static final byte TOPIC_HASH_VERSION = (byte) 0;
static long computeTopicHash(TopicImage topicImage, ClusterImage clusterImage) {
HashFunction hf = Hashing.murmur3_128();
Hasher topicHasher = hf.newHasher()
.putByte(TOPIC_HASH_VERSION) // Hash algorithm version identifier
.putLong(topicImage.id().hashCode()) // topic Id
// rest of the method unchanged
} |
||||||||||||||||||||||||||||||||||
static long computeGroupHash(Map<String, Long> topicHashes) { | ||||||||||||||||||||||||||||||||||
return Hashing.combineOrdered( | ||||||||||||||||||||||||||||||||||
topicHashes.entrySet() | ||||||||||||||||||||||||||||||||||
.stream() | ||||||||||||||||||||||||||||||||||
.sorted(Map.Entry.comparingByKey()) | ||||||||||||||||||||||||||||||||||
.map(e -> HashCode.fromLong(e.getValue())) | ||||||||||||||||||||||||||||||||||
.toList() | ||||||||||||||||||||||||||||||||||
).asLong(); | ||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||
Comment on lines
+230
to
+237
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Inconsistent Sorting LogicThe computeGroupHash method sorts entries by key (topic name) but the test in testComputeGroupHashWithDifferentOrder expects order sensitivity. This creates a logical inconsistency as the test expects the hash to change when entry order changes, but the implementation explicitly sorts entries, making order irrelevant.
Suggested change
Standards
|
||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||
/** | ||||||||||||||||||||||||||||||||||
* Computes the hash of the topic id, name, number of partitions, and partition racks by Murmur3. | ||||||||||||||||||||||||||||||||||
* | ||||||||||||||||||||||||||||||||||
* @param topicImage The topic image. | ||||||||||||||||||||||||||||||||||
* @param clusterImage The cluster image. | ||||||||||||||||||||||||||||||||||
* @return The hash of the topic. | ||||||||||||||||||||||||||||||||||
*/ | ||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Improvement: The |
||||||||||||||||||||||||||||||||||
static long computeTopicHash(TopicImage topicImage, ClusterImage clusterImage) { | ||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Security Note: Be cautious when using Murmur3 for security-sensitive hashing. It's designed for speed and distribution quality, not cryptographic security. If this hash is used for any security purposes, consider using a cryptographic hash function instead. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Dependency Injection OpportunityStatic method tightly couples hash computation to specific image types. Consider introducing a strategy or dependency injection pattern to enhance flexibility and testability of hash computation. Standards
|
||||||||||||||||||||||||||||||||||
HashFunction hf = Hashing.murmur3_128(); | ||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Reuse Hash FunctionCreating a new HashFunction instance for each computeTopicHash call is inefficient. Consider making this a static final constant since Murmur3_128 is thread-safe and immutable, reducing object creation overhead when computing hashes for multiple topics. Standards
Comment on lines
+246
to
+247
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Null Handling MissingNo explicit null checks for topicImage or clusterImage parameters. This could potentially cause NullPointerException during hash computation if invalid inputs are provided. Standards
|
||||||||||||||||||||||||||||||||||
Hasher topicHasher = hf.newHasher() | ||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maintainability: The magic byte |
||||||||||||||||||||||||||||||||||
.putByte((byte) 0) // magic byte | ||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Extract Hash ConstantsMagic numbers like '(byte) 0' reduce code maintainability as their purpose is unclear. Extracting this as a named constant would document its purpose and make future changes safer if the magic byte value needs modification. Standards
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Magic Number UsageMagic number 0 is used directly in the code without a named constant. This reduces code readability and makes future modifications error-prone if the magic byte value needs to change across multiple locations. Standards
|
||||||||||||||||||||||||||||||||||
.putLong(topicImage.id().hashCode()) // topic Id | ||||||||||||||||||||||||||||||||||
.putString(topicImage.name(), StandardCharsets.UTF_8) // topic name | ||||||||||||||||||||||||||||||||||
.putInt(topicImage.partitions().size()); // number of partitions | ||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Performance: The stream operation here creates intermediate collections and could be optimized. Consider using a more direct approach if this is in a performance-critical path. |
||||||||||||||||||||||||||||||||||
topicImage.partitions().entrySet().stream().sorted(Map.Entry.comparingByKey()).forEach(entry -> { | ||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Murmur3 Hash ComplexityStream sorting for partition entries introduces O(n log n) complexity during hash computation. For large partition sets, this could create unnecessary computational overhead during metadata processing. Standards
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Topic Hash Ordering SensitivityTopic hash computation relies on sorted partition entries to ensure consistent hash generation. Sorting prevents hash variations from different partition order inputs, maintaining logical integrity of hash computation. Standards
|
||||||||||||||||||||||||||||||||||
topicHasher.putInt(entry.getKey()); // partition id | ||||||||||||||||||||||||||||||||||
String racks = Arrays.stream(entry.getValue().replicas) | ||||||||||||||||||||||||||||||||||
.mapToObj(clusterImage::broker) | ||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Suggestion: Consider extracting the rack string generation into a separate method for better readability and potential reuse. |
||||||||||||||||||||||||||||||||||
.filter(Objects::nonNull) | ||||||||||||||||||||||||||||||||||
.map(BrokerRegistration::rack) | ||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Missing Null CheckThe code calls Optional::get without verifying if the Optional is present, which can throw NoSuchElementException if a broker has no rack information. This breaks the hash computation logic when brokers without rack information exist. Standards
|
||||||||||||||||||||||||||||||||||
.filter(Optional::isPresent) | ||||||||||||||||||||||||||||||||||
.map(Optional::get) | ||||||||||||||||||||||||||||||||||
.sorted() | ||||||||||||||||||||||||||||||||||
Comment on lines
+254
to
+262
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Complex Hash Computation LogicComplex stream processing for rack extraction introduces cognitive complexity. Consider extracting this logic into a separate method with clear, single responsibility to improve readability and maintainability. Standards
|
||||||||||||||||||||||||||||||||||
.collect(Collectors.joining(";")); | ||||||||||||||||||||||||||||||||||
topicHasher.putString(racks, StandardCharsets.UTF_8); // sorted racks with separator ";" | ||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Missing Import ValidationThe code uses Collectors.joining() but lacks a corresponding import for java.util.stream.Collectors. This will cause compilation failure, preventing the hash computation functionality from working correctly. Standards
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Missing Import StatementThe code uses Collectors.joining() but lacks the required import for java.util.stream.Collectors. This will cause compilation failure, preventing the hash computation functionality from working at all.
Suggested change
Standards
|
||||||||||||||||||||||||||||||||||
}); | ||||||||||||||||||||||||||||||||||
return topicHasher.hash().asLong(); | ||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||
Comment on lines
+261
to
268
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Optimize String ConcatenationString concatenation in a loop using Collectors.joining creates intermediate String objects. For large numbers of replicas, this can cause unnecessary memory allocation and garbage collection pressure. Consider using a StringBuilder for better memory efficiency. Standards
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,189 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package org.apache.kafka.coordinator.group; | ||
|
||
import org.apache.kafka.common.Uuid; | ||
import org.apache.kafka.image.MetadataImage; | ||
|
||
import com.google.common.hash.HashCode; | ||
import com.google.common.hash.HashFunction; | ||
import com.google.common.hash.Hasher; | ||
import com.google.common.hash.Hashing; | ||
|
||
import org.junit.jupiter.api.Test; | ||
import org.junit.jupiter.params.ParameterizedTest; | ||
import org.junit.jupiter.params.provider.Arguments; | ||
import org.junit.jupiter.params.provider.MethodSource; | ||
|
||
import java.nio.charset.StandardCharsets; | ||
import java.util.List; | ||
import java.util.Map; | ||
import java.util.stream.Stream; | ||
|
||
import static org.junit.jupiter.api.Assertions.assertEquals; | ||
import static org.junit.jupiter.api.Assertions.assertNotEquals; | ||
|
||
public class GroupTest { | ||
private static final Uuid FOO_TOPIC_ID = Uuid.randomUuid(); | ||
private static final String FOO_TOPIC_NAME = "foo"; | ||
private static final String BAR_TOPIC_NAME = "bar"; | ||
private static final int FOO_NUM_PARTITIONS = 2; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Testing: This test class is missing |
||
private static final MetadataImage FOO_METADATA_IMAGE = new MetadataImageBuilder() | ||
.addTopic(FOO_TOPIC_ID, FOO_TOPIC_NAME, FOO_NUM_PARTITIONS) | ||
.addRacks() | ||
.build(); | ||
|
||
@Test | ||
void testComputeTopicHash() { | ||
long result = Group.computeTopicHash(FOO_METADATA_IMAGE.topics().getTopic(FOO_TOPIC_ID), FOO_METADATA_IMAGE.cluster()); | ||
|
||
HashFunction hf = Hashing.murmur3_128(); | ||
Hasher topicHasher = hf.newHasher() | ||
.putByte((byte) 0) // magic byte | ||
.putLong(FOO_TOPIC_ID.hashCode()) // topic Id | ||
.putString(FOO_TOPIC_NAME, StandardCharsets.UTF_8) // topic name | ||
.putInt(FOO_NUM_PARTITIONS) // number of partitions | ||
.putInt(0) // partition 0 | ||
.putString("rack0;rack1", StandardCharsets.UTF_8) // rack of partition 0 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Improvement: Consider using a constant for the rack separator string ( |
||
.putInt(1) // partition 1 | ||
.putString("rack1;rack2", StandardCharsets.UTF_8); // rack of partition 1 | ||
assertEquals(topicHasher.hash().asLong(), result); | ||
} | ||
|
||
@Test | ||
void testComputeTopicHashWithDifferentMagicByte() { | ||
long result = Group.computeTopicHash(FOO_METADATA_IMAGE.topics().getTopic(FOO_TOPIC_ID), FOO_METADATA_IMAGE.cluster()); | ||
|
||
HashFunction hf = Hashing.murmur3_128(); | ||
Hasher topicHasher = hf.newHasher() | ||
.putByte((byte) 1) // different magic byte | ||
.putLong(FOO_TOPIC_ID.hashCode()) // topic Id | ||
.putString(FOO_TOPIC_NAME, StandardCharsets.UTF_8) // topic name | ||
.putInt(FOO_NUM_PARTITIONS) // number of partitions | ||
.putInt(0) // partition 0 | ||
.putString("rack0;rack1", StandardCharsets.UTF_8) // rack of partition 0 | ||
.putInt(1) // partition 1 | ||
.putString("rack1;rack2", StandardCharsets.UTF_8); // rack of partition 1 | ||
assertNotEquals(topicHasher.hash().asLong(), result); | ||
} | ||
|
||
@Test | ||
void testComputeTopicHashWithDifferentPartitionOrder() { | ||
long result = Group.computeTopicHash(FOO_METADATA_IMAGE.topics().getTopic(FOO_TOPIC_ID), FOO_METADATA_IMAGE.cluster()); | ||
|
||
HashFunction hf = Hashing.murmur3_128(); | ||
Hasher topicHasher = hf.newHasher() | ||
.putByte((byte) 0) // magic byte | ||
.putLong(FOO_TOPIC_ID.hashCode()) // topic Id | ||
.putString(FOO_TOPIC_NAME, StandardCharsets.UTF_8) // topic name | ||
.putInt(FOO_NUM_PARTITIONS) // number of partitions | ||
// different partition order | ||
.putInt(1) // partition 1 | ||
.putString("rack1;rack2", StandardCharsets.UTF_8) // rack of partition 1 | ||
.putInt(0) // partition 0 | ||
.putString("rack0;rack1", StandardCharsets.UTF_8); // rack of partition 0 | ||
assertNotEquals(topicHasher.hash().asLong(), result); | ||
} | ||
|
||
@Test | ||
void testComputeTopicHashWithDifferentRackOrder() { | ||
long result = Group.computeTopicHash(FOO_METADATA_IMAGE.topics().getTopic(FOO_TOPIC_ID), FOO_METADATA_IMAGE.cluster()); | ||
|
||
HashFunction hf = Hashing.murmur3_128(); | ||
Hasher topicHasher = hf.newHasher() | ||
.putByte((byte) 0) // magic byte | ||
.putLong(FOO_TOPIC_ID.hashCode()) // topic Id | ||
.putString(FOO_TOPIC_NAME, StandardCharsets.UTF_8) // topic name | ||
.putInt(FOO_NUM_PARTITIONS) // number of partitions | ||
.putInt(0) // partition 0 | ||
.putString("rack1;rack0", StandardCharsets.UTF_8) // different rack order of partition 0 | ||
.putInt(1) // partition 1 | ||
.putString("rack1;rack2", StandardCharsets.UTF_8); // rack of partition 1 | ||
assertNotEquals(topicHasher.hash().asLong(), result); | ||
} | ||
|
||
@ParameterizedTest | ||
@MethodSource("differentFieldGenerator") | ||
void testComputeTopicHashWithDifferentField(MetadataImage differentImage, Uuid topicId) { | ||
long result = Group.computeTopicHash(FOO_METADATA_IMAGE.topics().getTopic(FOO_TOPIC_ID), FOO_METADATA_IMAGE.cluster()); | ||
|
||
assertNotEquals( | ||
Group.computeTopicHash( | ||
differentImage.topics().getTopic(topicId), | ||
differentImage.cluster() | ||
), | ||
result | ||
); | ||
} | ||
|
||
private static Stream<Arguments> differentFieldGenerator() { | ||
Uuid differentTopicId = Uuid.randomUuid(); | ||
return Stream.of( | ||
Arguments.of(new MetadataImageBuilder() // different topic id | ||
.addTopic(differentTopicId, FOO_TOPIC_NAME, FOO_NUM_PARTITIONS) | ||
.addRacks() | ||
.build(), | ||
differentTopicId | ||
), | ||
Arguments.of(new MetadataImageBuilder() // different topic name | ||
.addTopic(FOO_TOPIC_ID, "bar", FOO_NUM_PARTITIONS) | ||
.addRacks() | ||
.build(), | ||
FOO_TOPIC_ID | ||
), | ||
Arguments.of(new MetadataImageBuilder() // different partitions | ||
.addTopic(FOO_TOPIC_ID, FOO_TOPIC_NAME, 1) | ||
.addRacks() | ||
.build(), | ||
FOO_TOPIC_ID | ||
), | ||
Arguments.of(new MetadataImageBuilder() // different racks | ||
.addTopic(FOO_TOPIC_ID, FOO_TOPIC_NAME, FOO_NUM_PARTITIONS) | ||
.build(), | ||
FOO_TOPIC_ID | ||
) | ||
); | ||
} | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Testing: Consider adding a test case for an empty map of topic hashes to ensure proper handling of edge cases. |
||
@Test | ||
void testComputeGroupHash() { | ||
long result = Group.computeGroupHash(Map.of( | ||
BAR_TOPIC_NAME, 123L, | ||
FOO_TOPIC_NAME, 456L | ||
)); | ||
|
||
long expected = Hashing.combineOrdered(List.of( | ||
HashCode.fromLong(123L), | ||
HashCode.fromLong(456L) | ||
)).asLong(); | ||
assertEquals(expected, result); | ||
} | ||
|
||
@Test | ||
void testComputeGroupHashWithDifferentOrder() { | ||
long result = Group.computeGroupHash(Map.of( | ||
BAR_TOPIC_NAME, 123L, | ||
FOO_TOPIC_NAME, 456L | ||
)); | ||
|
||
long unexpected = Hashing.combineOrdered(List.of( | ||
HashCode.fromLong(456L), | ||
HashCode.fromLong(123L) | ||
)).asLong(); | ||
assertNotEquals(unexpected, result); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maintainability Issue: Missing documentation for hash algorithm design decisions
The implementation uses specific hashing algorithms (Murmur3 for topic hash and ordered combination for group hash) without documenting why these choices were made. This makes it difficult for future developers to understand the requirements and constraints when they need to modify the hashing logic.
Suggestion: Add documentation explaining the rationale behind the hash algorithm choices: