m1a2st commented on code in PR #19810: URL: https://github.com/apache/kafka/pull/19810#discussion_r2106233166
########## clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerWithLegacyMessageFormatIntegrationTest.java: ########## @@ -0,0 +1,250 @@ +/* + * 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.clients.consumer; + +import org.apache.kafka.clients.admin.Admin; +import org.apache.kafka.clients.admin.NewTopic; +import org.apache.kafka.clients.producer.Producer; +import org.apache.kafka.clients.producer.ProducerRecord; +import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.compress.Compression; +import org.apache.kafka.common.record.AbstractRecords; +import org.apache.kafka.common.record.CompressionType; +import org.apache.kafka.common.record.MemoryRecords; +import org.apache.kafka.common.record.MemoryRecordsBuilder; +import org.apache.kafka.common.record.RecordBatch; +import org.apache.kafka.common.record.RecordVersion; +import org.apache.kafka.common.record.SimpleRecord; +import org.apache.kafka.common.record.TimestampType; +import org.apache.kafka.common.test.ClusterInstance; +import org.apache.kafka.common.test.api.ClusterTest; +import org.apache.kafka.common.test.api.ClusterTestDefaults; +import org.apache.kafka.storage.internals.log.UnifiedLog; + +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + +import static org.apache.kafka.clients.consumer.ConsumerConfig.GROUP_PROTOCOL_CONFIG; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + + +@ClusterTestDefaults( + brokers = 3 +) +public class ConsumerWithLegacyMessageFormatIntegrationTest { + + private final ClusterInstance cluster; + + private final String topic1 = "part-test-topic-1"; + private final String topic2 = "part-test-topic-2"; + private final String topic3 = "part-test-topic-3"; + + private final TopicPartition t1p0 = new TopicPartition(topic1, 0); + private final TopicPartition t1p1 = new TopicPartition(topic1, 1); + private final TopicPartition t2p0 = new TopicPartition(topic2, 0); + private final TopicPartition t2p1 = new TopicPartition(topic2, 1); + private final TopicPartition t3p0 = new TopicPartition(topic3, 0); + private final TopicPartition t3p1 = new TopicPartition(topic3, 1); + + public ConsumerWithLegacyMessageFormatIntegrationTest(ClusterInstance cluster) { + this.cluster = cluster; + } + + private void appendLegacyRecords(int numRecords, TopicPartition tp, int brokerId, byte magicValue) { + List<SimpleRecord> records = new ArrayList<>(); + for (int i = 0; i < numRecords; i++) { + records.add(new SimpleRecord(i, ("key " + i).getBytes(), ("value " + i).getBytes())); + } + + ByteBuffer buffer = ByteBuffer.allocate(AbstractRecords.estimateSizeInBytes(magicValue, + CompressionType.NONE, records)); + MemoryRecordsBuilder builder = MemoryRecords.builder( + buffer, + magicValue, + Compression.of(CompressionType.NONE).build(), + TimestampType.CREATE_TIME, + 0L, + RecordBatch.NO_TIMESTAMP, + RecordBatch.NO_PRODUCER_ID, + RecordBatch.NO_PRODUCER_EPOCH, + 0, + false, + RecordBatch.NO_PARTITION_LEADER_EPOCH + ); + + records.forEach(builder::append); + + cluster.brokers().values().stream() + .filter(b -> b.config().brokerId() == brokerId) + .forEach(b -> { + UnifiedLog unifiedLog = b.replicaManager().logManager().getLog(tp, false).get(); + unifiedLog.appendAsLeaderWithRecordVersion(builder.build(), 0, RecordVersion.lookup(magicValue)); + // Default isolation.level is read_uncommitted. It makes Partition#fetchOffsetForTimestamp to return UnifiedLog#highWatermark, + // so increasing high watermark to make it return the correct offset. + assertDoesNotThrow(() -> unifiedLog.maybeIncrementHighWatermark(unifiedLog.logEndOffsetMetadata())); + }); + } + + private void createTopicWithAssignment(String topic, Map<Integer, List<Integer>> assignment) throws InterruptedException { + try (Admin admin = cluster.admin()) { + NewTopic newTopic = new NewTopic(topic, assignment); + admin.createTopics(Collections.singletonList(newTopic)); + cluster.waitForTopic(topic, assignment.size()); + } + } + + private void sendRecords(int numRecords, TopicPartition topicPartition, long startingTimestamp) { + try (Producer<byte[], byte[]> producer = cluster.producer()) { + for (int i = 0; i < numRecords; i++) { + long timestamp = startingTimestamp + i; + byte[] key = ("key " + i).getBytes(); + byte[] value = ("value " + i).getBytes(); + + ProducerRecord<byte[], byte[]> record = new ProducerRecord<>( + topicPartition.topic(), + topicPartition.partition(), + timestamp, + key, + value + ); + producer.send(record); + } + producer.flush(); + } Review Comment: Please use `ClientsTestUtils.sendRecords` ########## clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerWithLegacyMessageFormatIntegrationTest.java: ########## @@ -0,0 +1,250 @@ +/* + * 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.clients.consumer; + +import org.apache.kafka.clients.admin.Admin; +import org.apache.kafka.clients.admin.NewTopic; +import org.apache.kafka.clients.producer.Producer; +import org.apache.kafka.clients.producer.ProducerRecord; +import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.compress.Compression; +import org.apache.kafka.common.record.AbstractRecords; +import org.apache.kafka.common.record.CompressionType; +import org.apache.kafka.common.record.MemoryRecords; +import org.apache.kafka.common.record.MemoryRecordsBuilder; +import org.apache.kafka.common.record.RecordBatch; +import org.apache.kafka.common.record.RecordVersion; +import org.apache.kafka.common.record.SimpleRecord; +import org.apache.kafka.common.record.TimestampType; +import org.apache.kafka.common.test.ClusterInstance; +import org.apache.kafka.common.test.api.ClusterTest; +import org.apache.kafka.common.test.api.ClusterTestDefaults; +import org.apache.kafka.storage.internals.log.UnifiedLog; + +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + +import static org.apache.kafka.clients.consumer.ConsumerConfig.GROUP_PROTOCOL_CONFIG; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + + +@ClusterTestDefaults( + brokers = 3 +) +public class ConsumerWithLegacyMessageFormatIntegrationTest { + + private final ClusterInstance cluster; + + private final String topic1 = "part-test-topic-1"; + private final String topic2 = "part-test-topic-2"; + private final String topic3 = "part-test-topic-3"; + + private final TopicPartition t1p0 = new TopicPartition(topic1, 0); + private final TopicPartition t1p1 = new TopicPartition(topic1, 1); + private final TopicPartition t2p0 = new TopicPartition(topic2, 0); + private final TopicPartition t2p1 = new TopicPartition(topic2, 1); + private final TopicPartition t3p0 = new TopicPartition(topic3, 0); + private final TopicPartition t3p1 = new TopicPartition(topic3, 1); + + public ConsumerWithLegacyMessageFormatIntegrationTest(ClusterInstance cluster) { + this.cluster = cluster; + } + + private void appendLegacyRecords(int numRecords, TopicPartition tp, int brokerId, byte magicValue) { + List<SimpleRecord> records = new ArrayList<>(); + for (int i = 0; i < numRecords; i++) { + records.add(new SimpleRecord(i, ("key " + i).getBytes(), ("value " + i).getBytes())); + } + + ByteBuffer buffer = ByteBuffer.allocate(AbstractRecords.estimateSizeInBytes(magicValue, + CompressionType.NONE, records)); + MemoryRecordsBuilder builder = MemoryRecords.builder( + buffer, + magicValue, + Compression.of(CompressionType.NONE).build(), + TimestampType.CREATE_TIME, + 0L, + RecordBatch.NO_TIMESTAMP, + RecordBatch.NO_PRODUCER_ID, + RecordBatch.NO_PRODUCER_EPOCH, + 0, + false, + RecordBatch.NO_PARTITION_LEADER_EPOCH + ); + + records.forEach(builder::append); + + cluster.brokers().values().stream() + .filter(b -> b.config().brokerId() == brokerId) + .forEach(b -> { + UnifiedLog unifiedLog = b.replicaManager().logManager().getLog(tp, false).get(); + unifiedLog.appendAsLeaderWithRecordVersion(builder.build(), 0, RecordVersion.lookup(magicValue)); + // Default isolation.level is read_uncommitted. It makes Partition#fetchOffsetForTimestamp to return UnifiedLog#highWatermark, + // so increasing high watermark to make it return the correct offset. + assertDoesNotThrow(() -> unifiedLog.maybeIncrementHighWatermark(unifiedLog.logEndOffsetMetadata())); + }); + } + + private void createTopicWithAssignment(String topic, Map<Integer, List<Integer>> assignment) throws InterruptedException { + try (Admin admin = cluster.admin()) { + NewTopic newTopic = new NewTopic(topic, assignment); + admin.createTopics(Collections.singletonList(newTopic)); + cluster.waitForTopic(topic, assignment.size()); + } + } + + private void sendRecords(int numRecords, TopicPartition topicPartition, long startingTimestamp) { + try (Producer<byte[], byte[]> producer = cluster.producer()) { + for (int i = 0; i < numRecords; i++) { + long timestamp = startingTimestamp + i; + byte[] key = ("key " + i).getBytes(); + byte[] value = ("value " + i).getBytes(); + + ProducerRecord<byte[], byte[]> record = new ProducerRecord<>( + topicPartition.topic(), + topicPartition.partition(), + timestamp, + key, + value + ); + producer.send(record); + } + producer.flush(); + } + } + + + private void setupTopics() throws InterruptedException { + cluster.createTopic(topic1, 2, (short) 1); + createTopicWithAssignment(topic2, Map.of(0, List.of(0), 1, List.of(1))); + createTopicWithAssignment(topic3, Map.of(0, List.of(0), 1, List.of(1))); + + // v2 message format for topic1 + sendRecords(100, t1p0, 0); + sendRecords(100, t1p1, 0); + // v0 message format for topic2 + appendLegacyRecords(100, t2p0, 0, RecordBatch.MAGIC_VALUE_V0); + appendLegacyRecords(100, t2p1, 1, RecordBatch.MAGIC_VALUE_V0); + // v1 message format for topic3 + appendLegacyRecords(100, t3p0, 0, RecordBatch.MAGIC_VALUE_V1); + appendLegacyRecords(100, t3p1, 1, RecordBatch.MAGIC_VALUE_V1); + } + + @ClusterTest + public void testOffsetsForTimesClassicConsumer() throws InterruptedException { + testOffsetsForTimes(GroupProtocol.CLASSIC); + } + + @ClusterTest + public void testOffsetsForTimesWithAsyncConsumer() throws InterruptedException { + testOffsetsForTimes(GroupProtocol.CONSUMER); + } + + public void testOffsetsForTimes(GroupProtocol groupProtocol) throws InterruptedException { + setupTopics(); Review Comment: Use `@BeforeEach` instead of manually separating the setup logic. ########## clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerWithLegacyMessageFormatIntegrationTest.java: ########## @@ -0,0 +1,250 @@ +/* + * 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.clients.consumer; + +import org.apache.kafka.clients.admin.Admin; +import org.apache.kafka.clients.admin.NewTopic; +import org.apache.kafka.clients.producer.Producer; +import org.apache.kafka.clients.producer.ProducerRecord; +import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.compress.Compression; +import org.apache.kafka.common.record.AbstractRecords; +import org.apache.kafka.common.record.CompressionType; +import org.apache.kafka.common.record.MemoryRecords; +import org.apache.kafka.common.record.MemoryRecordsBuilder; +import org.apache.kafka.common.record.RecordBatch; +import org.apache.kafka.common.record.RecordVersion; +import org.apache.kafka.common.record.SimpleRecord; +import org.apache.kafka.common.record.TimestampType; +import org.apache.kafka.common.test.ClusterInstance; +import org.apache.kafka.common.test.api.ClusterTest; +import org.apache.kafka.common.test.api.ClusterTestDefaults; +import org.apache.kafka.storage.internals.log.UnifiedLog; + +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + +import static org.apache.kafka.clients.consumer.ConsumerConfig.GROUP_PROTOCOL_CONFIG; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + + +@ClusterTestDefaults( + brokers = 3 +) +public class ConsumerWithLegacyMessageFormatIntegrationTest { + + private final ClusterInstance cluster; + + private final String topic1 = "part-test-topic-1"; + private final String topic2 = "part-test-topic-2"; + private final String topic3 = "part-test-topic-3"; + + private final TopicPartition t1p0 = new TopicPartition(topic1, 0); + private final TopicPartition t1p1 = new TopicPartition(topic1, 1); + private final TopicPartition t2p0 = new TopicPartition(topic2, 0); + private final TopicPartition t2p1 = new TopicPartition(topic2, 1); + private final TopicPartition t3p0 = new TopicPartition(topic3, 0); + private final TopicPartition t3p1 = new TopicPartition(topic3, 1); + + public ConsumerWithLegacyMessageFormatIntegrationTest(ClusterInstance cluster) { + this.cluster = cluster; + } + + private void appendLegacyRecords(int numRecords, TopicPartition tp, int brokerId, byte magicValue) { + List<SimpleRecord> records = new ArrayList<>(); + for (int i = 0; i < numRecords; i++) { + records.add(new SimpleRecord(i, ("key " + i).getBytes(), ("value " + i).getBytes())); + } + + ByteBuffer buffer = ByteBuffer.allocate(AbstractRecords.estimateSizeInBytes(magicValue, + CompressionType.NONE, records)); + MemoryRecordsBuilder builder = MemoryRecords.builder( + buffer, + magicValue, + Compression.of(CompressionType.NONE).build(), + TimestampType.CREATE_TIME, + 0L, + RecordBatch.NO_TIMESTAMP, + RecordBatch.NO_PRODUCER_ID, + RecordBatch.NO_PRODUCER_EPOCH, + 0, + false, + RecordBatch.NO_PARTITION_LEADER_EPOCH + ); + + records.forEach(builder::append); + + cluster.brokers().values().stream() + .filter(b -> b.config().brokerId() == brokerId) + .forEach(b -> { + UnifiedLog unifiedLog = b.replicaManager().logManager().getLog(tp, false).get(); + unifiedLog.appendAsLeaderWithRecordVersion(builder.build(), 0, RecordVersion.lookup(magicValue)); + // Default isolation.level is read_uncommitted. It makes Partition#fetchOffsetForTimestamp to return UnifiedLog#highWatermark, + // so increasing high watermark to make it return the correct offset. + assertDoesNotThrow(() -> unifiedLog.maybeIncrementHighWatermark(unifiedLog.logEndOffsetMetadata())); + }); + } + + private void createTopicWithAssignment(String topic, Map<Integer, List<Integer>> assignment) throws InterruptedException { + try (Admin admin = cluster.admin()) { + NewTopic newTopic = new NewTopic(topic, assignment); + admin.createTopics(Collections.singletonList(newTopic)); + cluster.waitForTopic(topic, assignment.size()); + } + } + + private void sendRecords(int numRecords, TopicPartition topicPartition, long startingTimestamp) { + try (Producer<byte[], byte[]> producer = cluster.producer()) { + for (int i = 0; i < numRecords; i++) { + long timestamp = startingTimestamp + i; + byte[] key = ("key " + i).getBytes(); + byte[] value = ("value " + i).getBytes(); + + ProducerRecord<byte[], byte[]> record = new ProducerRecord<>( + topicPartition.topic(), + topicPartition.partition(), + timestamp, + key, + value + ); + producer.send(record); + } + producer.flush(); + } + } + + + private void setupTopics() throws InterruptedException { + cluster.createTopic(topic1, 2, (short) 1); + createTopicWithAssignment(topic2, Map.of(0, List.of(0), 1, List.of(1))); + createTopicWithAssignment(topic3, Map.of(0, List.of(0), 1, List.of(1))); + + // v2 message format for topic1 + sendRecords(100, t1p0, 0); + sendRecords(100, t1p1, 0); + // v0 message format for topic2 + appendLegacyRecords(100, t2p0, 0, RecordBatch.MAGIC_VALUE_V0); + appendLegacyRecords(100, t2p1, 1, RecordBatch.MAGIC_VALUE_V0); + // v1 message format for topic3 + appendLegacyRecords(100, t3p0, 0, RecordBatch.MAGIC_VALUE_V1); + appendLegacyRecords(100, t3p1, 1, RecordBatch.MAGIC_VALUE_V1); + } + + @ClusterTest + public void testOffsetsForTimesClassicConsumer() throws InterruptedException { Review Comment: ```suggestion public void testOffsetsForTimesWithClassicConsumer() throws InterruptedException { ``` ########## clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerWithLegacyMessageFormatIntegrationTest.java: ########## @@ -0,0 +1,250 @@ +/* + * 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.clients.consumer; + +import org.apache.kafka.clients.admin.Admin; +import org.apache.kafka.clients.admin.NewTopic; +import org.apache.kafka.clients.producer.Producer; +import org.apache.kafka.clients.producer.ProducerRecord; +import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.compress.Compression; +import org.apache.kafka.common.record.AbstractRecords; +import org.apache.kafka.common.record.CompressionType; +import org.apache.kafka.common.record.MemoryRecords; +import org.apache.kafka.common.record.MemoryRecordsBuilder; +import org.apache.kafka.common.record.RecordBatch; +import org.apache.kafka.common.record.RecordVersion; +import org.apache.kafka.common.record.SimpleRecord; +import org.apache.kafka.common.record.TimestampType; +import org.apache.kafka.common.test.ClusterInstance; +import org.apache.kafka.common.test.api.ClusterTest; +import org.apache.kafka.common.test.api.ClusterTestDefaults; +import org.apache.kafka.storage.internals.log.UnifiedLog; + +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + +import static org.apache.kafka.clients.consumer.ConsumerConfig.GROUP_PROTOCOL_CONFIG; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + + +@ClusterTestDefaults( + brokers = 3 +) +public class ConsumerWithLegacyMessageFormatIntegrationTest { + + private final ClusterInstance cluster; + + private final String topic1 = "part-test-topic-1"; + private final String topic2 = "part-test-topic-2"; + private final String topic3 = "part-test-topic-3"; + + private final TopicPartition t1p0 = new TopicPartition(topic1, 0); + private final TopicPartition t1p1 = new TopicPartition(topic1, 1); + private final TopicPartition t2p0 = new TopicPartition(topic2, 0); + private final TopicPartition t2p1 = new TopicPartition(topic2, 1); + private final TopicPartition t3p0 = new TopicPartition(topic3, 0); + private final TopicPartition t3p1 = new TopicPartition(topic3, 1); + + public ConsumerWithLegacyMessageFormatIntegrationTest(ClusterInstance cluster) { + this.cluster = cluster; + } + + private void appendLegacyRecords(int numRecords, TopicPartition tp, int brokerId, byte magicValue) { + List<SimpleRecord> records = new ArrayList<>(); + for (int i = 0; i < numRecords; i++) { + records.add(new SimpleRecord(i, ("key " + i).getBytes(), ("value " + i).getBytes())); + } + + ByteBuffer buffer = ByteBuffer.allocate(AbstractRecords.estimateSizeInBytes(magicValue, + CompressionType.NONE, records)); + MemoryRecordsBuilder builder = MemoryRecords.builder( + buffer, + magicValue, + Compression.of(CompressionType.NONE).build(), + TimestampType.CREATE_TIME, + 0L, + RecordBatch.NO_TIMESTAMP, + RecordBatch.NO_PRODUCER_ID, + RecordBatch.NO_PRODUCER_EPOCH, + 0, + false, + RecordBatch.NO_PARTITION_LEADER_EPOCH + ); + + records.forEach(builder::append); + + cluster.brokers().values().stream() + .filter(b -> b.config().brokerId() == brokerId) + .forEach(b -> { + UnifiedLog unifiedLog = b.replicaManager().logManager().getLog(tp, false).get(); + unifiedLog.appendAsLeaderWithRecordVersion(builder.build(), 0, RecordVersion.lookup(magicValue)); + // Default isolation.level is read_uncommitted. It makes Partition#fetchOffsetForTimestamp to return UnifiedLog#highWatermark, + // so increasing high watermark to make it return the correct offset. + assertDoesNotThrow(() -> unifiedLog.maybeIncrementHighWatermark(unifiedLog.logEndOffsetMetadata())); + }); + } + + private void createTopicWithAssignment(String topic, Map<Integer, List<Integer>> assignment) throws InterruptedException { + try (Admin admin = cluster.admin()) { + NewTopic newTopic = new NewTopic(topic, assignment); + admin.createTopics(Collections.singletonList(newTopic)); Review Comment: ```suggestion admin.createTopics(List.of(newTopic)); ``` ########## clients/clients-integration-tests/src/test/java/org/apache/kafka/clients/consumer/ConsumerWithLegacyMessageFormatIntegrationTest.java: ########## @@ -0,0 +1,250 @@ +/* + * 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.clients.consumer; + +import org.apache.kafka.clients.admin.Admin; +import org.apache.kafka.clients.admin.NewTopic; +import org.apache.kafka.clients.producer.Producer; +import org.apache.kafka.clients.producer.ProducerRecord; +import org.apache.kafka.common.TopicPartition; +import org.apache.kafka.common.compress.Compression; +import org.apache.kafka.common.record.AbstractRecords; +import org.apache.kafka.common.record.CompressionType; +import org.apache.kafka.common.record.MemoryRecords; +import org.apache.kafka.common.record.MemoryRecordsBuilder; +import org.apache.kafka.common.record.RecordBatch; +import org.apache.kafka.common.record.RecordVersion; +import org.apache.kafka.common.record.SimpleRecord; +import org.apache.kafka.common.record.TimestampType; +import org.apache.kafka.common.test.ClusterInstance; +import org.apache.kafka.common.test.api.ClusterTest; +import org.apache.kafka.common.test.api.ClusterTestDefaults; +import org.apache.kafka.storage.internals.log.UnifiedLog; + +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Optional; +import java.util.Set; + +import static org.apache.kafka.clients.consumer.ConsumerConfig.GROUP_PROTOCOL_CONFIG; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; + + +@ClusterTestDefaults( + brokers = 3 +) +public class ConsumerWithLegacyMessageFormatIntegrationTest { + + private final ClusterInstance cluster; + + private final String topic1 = "part-test-topic-1"; + private final String topic2 = "part-test-topic-2"; + private final String topic3 = "part-test-topic-3"; + + private final TopicPartition t1p0 = new TopicPartition(topic1, 0); + private final TopicPartition t1p1 = new TopicPartition(topic1, 1); + private final TopicPartition t2p0 = new TopicPartition(topic2, 0); + private final TopicPartition t2p1 = new TopicPartition(topic2, 1); + private final TopicPartition t3p0 = new TopicPartition(topic3, 0); + private final TopicPartition t3p1 = new TopicPartition(topic3, 1); + + public ConsumerWithLegacyMessageFormatIntegrationTest(ClusterInstance cluster) { + this.cluster = cluster; + } + + private void appendLegacyRecords(int numRecords, TopicPartition tp, int brokerId, byte magicValue) { + List<SimpleRecord> records = new ArrayList<>(); + for (int i = 0; i < numRecords; i++) { + records.add(new SimpleRecord(i, ("key " + i).getBytes(), ("value " + i).getBytes())); + } + + ByteBuffer buffer = ByteBuffer.allocate(AbstractRecords.estimateSizeInBytes(magicValue, + CompressionType.NONE, records)); + MemoryRecordsBuilder builder = MemoryRecords.builder( + buffer, + magicValue, + Compression.of(CompressionType.NONE).build(), + TimestampType.CREATE_TIME, + 0L, + RecordBatch.NO_TIMESTAMP, + RecordBatch.NO_PRODUCER_ID, + RecordBatch.NO_PRODUCER_EPOCH, + 0, + false, + RecordBatch.NO_PARTITION_LEADER_EPOCH + ); + + records.forEach(builder::append); + + cluster.brokers().values().stream() + .filter(b -> b.config().brokerId() == brokerId) + .forEach(b -> { + UnifiedLog unifiedLog = b.replicaManager().logManager().getLog(tp, false).get(); + unifiedLog.appendAsLeaderWithRecordVersion(builder.build(), 0, RecordVersion.lookup(magicValue)); + // Default isolation.level is read_uncommitted. It makes Partition#fetchOffsetForTimestamp to return UnifiedLog#highWatermark, + // so increasing high watermark to make it return the correct offset. + assertDoesNotThrow(() -> unifiedLog.maybeIncrementHighWatermark(unifiedLog.logEndOffsetMetadata())); + }); + } + + private void createTopicWithAssignment(String topic, Map<Integer, List<Integer>> assignment) throws InterruptedException { + try (Admin admin = cluster.admin()) { + NewTopic newTopic = new NewTopic(topic, assignment); + admin.createTopics(Collections.singletonList(newTopic)); + cluster.waitForTopic(topic, assignment.size()); + } + } + + private void sendRecords(int numRecords, TopicPartition topicPartition, long startingTimestamp) { + try (Producer<byte[], byte[]> producer = cluster.producer()) { + for (int i = 0; i < numRecords; i++) { + long timestamp = startingTimestamp + i; + byte[] key = ("key " + i).getBytes(); + byte[] value = ("value " + i).getBytes(); + + ProducerRecord<byte[], byte[]> record = new ProducerRecord<>( + topicPartition.topic(), + topicPartition.partition(), + timestamp, + key, + value + ); + producer.send(record); + } + producer.flush(); + } + } + + + private void setupTopics() throws InterruptedException { + cluster.createTopic(topic1, 2, (short) 1); + createTopicWithAssignment(topic2, Map.of(0, List.of(0), 1, List.of(1))); + createTopicWithAssignment(topic3, Map.of(0, List.of(0), 1, List.of(1))); + + // v2 message format for topic1 + sendRecords(100, t1p0, 0); + sendRecords(100, t1p1, 0); + // v0 message format for topic2 + appendLegacyRecords(100, t2p0, 0, RecordBatch.MAGIC_VALUE_V0); + appendLegacyRecords(100, t2p1, 1, RecordBatch.MAGIC_VALUE_V0); + // v1 message format for topic3 + appendLegacyRecords(100, t3p0, 0, RecordBatch.MAGIC_VALUE_V1); + appendLegacyRecords(100, t3p1, 1, RecordBatch.MAGIC_VALUE_V1); + } + + @ClusterTest + public void testOffsetsForTimesClassicConsumer() throws InterruptedException { + testOffsetsForTimes(GroupProtocol.CLASSIC); + } + + @ClusterTest + public void testOffsetsForTimesWithAsyncConsumer() throws InterruptedException { + testOffsetsForTimes(GroupProtocol.CONSUMER); + } + + public void testOffsetsForTimes(GroupProtocol groupProtocol) throws InterruptedException { + setupTopics(); + + try (Consumer<Object, Object> consumer = cluster.consumer(Map.of( + GROUP_PROTOCOL_CONFIG, groupProtocol.name.toLowerCase(Locale.ROOT))) + ) { + // Test negative target time + assertThrows(IllegalArgumentException.class, () -> + consumer.offsetsForTimes(Map.of(t1p0, -1L))); + + Map<TopicPartition, Long> timestampsToSearch = new HashMap<>(); + timestampsToSearch.put(t1p0, 0L); + timestampsToSearch.put(t1p1, 20L); + timestampsToSearch.put(t2p0, 40L); + timestampsToSearch.put(t2p1, 60L); + timestampsToSearch.put(t3p0, 80L); + timestampsToSearch.put(t3p1, 100L); Review Comment: ```suggestion Map<TopicPartition, Long> timestampsToSearch = Map.of( t1p0, 0L, t1p1, 20L, t2p0, 40L, t2p1, 60L, t3p0, 80L, t3p1, 100L ); ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: jira-unsubscr...@kafka.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
