This is an automated email from the ASF dual-hosted git repository.
chia7712 pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6596ba3a783 MINOR: Remove unnecessary test conditions where
ListOffsetsRequest version is 0 (#19738)
6596ba3a783 is described below
commit 6596ba3a783c91da2687aaceda91be2510321a60
Author: Yunchi Pang <yunchip...@gmail.com>
AuthorDate: Sun May 18 09:20:24 2025 -0700
MINOR: Remove unnecessary test conditions where ListOffsetsRequest version
is 0 (#19738)
Reviewers: Ken Huang <s7133...@gmail.com>, TengYao Chi
<kiting...@gmail.com>, Chia-Ping Tsai <chia7...@gmail.com>
---
.../unit/kafka/server/ListOffsetsRequestTest.scala | 63 ++++++++++------------
1 file changed, 29 insertions(+), 34 deletions(-)
diff --git a/core/src/test/scala/unit/kafka/server/ListOffsetsRequestTest.scala
b/core/src/test/scala/unit/kafka/server/ListOffsetsRequestTest.scala
index 7b86baa3f5f..304e63602a3 100644
--- a/core/src/test/scala/unit/kafka/server/ListOffsetsRequestTest.scala
+++ b/core/src/test/scala/unit/kafka/server/ListOffsetsRequestTest.scala
@@ -21,10 +21,12 @@ import
org.apache.kafka.common.message.ListOffsetsRequestData.{ListOffsetsPartit
import
org.apache.kafka.common.message.ListOffsetsResponseData.ListOffsetsPartitionResponse
import org.apache.kafka.common.protocol.{ApiKeys, Errors}
import org.apache.kafka.common.requests.{ListOffsetsRequest,
ListOffsetsResponse}
+import org.apache.kafka.common.utils.annotation.ApiKeyVersionsSource
import org.apache.kafka.common.{IsolationLevel, TopicPartition}
import org.apache.kafka.server.config.ServerConfigs
import org.junit.jupiter.api.Assertions._
import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
import java.util.{Optional, Properties}
import scala.collection.Seq
@@ -205,46 +207,39 @@ class ListOffsetsRequestTest extends BaseRequestTest {
assertEquals((9L, firstLeaderEpoch, Errors.NONE.code),
fetchOffsetAndEpochWithError(secondLeaderId, ListOffsetsRequest.MAX_TIMESTAMP,
-1))
}
- @Test
- def testResponseDefaultOffsetAndLeaderEpochForAllVersions(): Unit = {
+ @ParameterizedTest
+ @ApiKeyVersionsSource(apiKey = ApiKeys.LIST_OFFSETS)
+ def testResponseDefaultOffsetAndLeaderEpochForAllVersions(version: Short):
Unit = {
val partitionToLeader = createTopic(numPartitions = 1, replicationFactor =
3)
val firstLeaderId = partitionToLeader(partition.partition)
TestUtils.generateAndProduceMessages(brokers, topic, 9)
TestUtils.produceMessage(brokers, topic, "test-10",
System.currentTimeMillis() + 10L)
- for (version <- ApiKeys.LIST_OFFSETS.oldestVersion to
ApiKeys.LIST_OFFSETS.latestVersion) {
- if (version == 0) {
- assertEquals((-1L, -1), fetchOffsetAndEpoch(firstLeaderId, 0L,
version.toShort))
- assertEquals((0L, -1), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.EARLIEST_TIMESTAMP, version.toShort))
- assertEquals((10L, -1), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.LATEST_TIMESTAMP, version.toShort))
- assertEquals((-1L, -1, Errors.UNSUPPORTED_VERSION.code()),
fetchOffsetAndEpochWithError(firstLeaderId, ListOffsetsRequest.MAX_TIMESTAMP,
version.toShort))
- assertEquals((-1L, -1, Errors.UNSUPPORTED_VERSION.code()),
fetchOffsetAndEpochWithError(firstLeaderId,
ListOffsetsRequest.EARLIEST_LOCAL_TIMESTAMP, version.toShort))
- } else if (version >= 1 && version <= 3) {
- assertEquals((0L, -1), fetchOffsetAndEpoch(firstLeaderId, 0L,
version.toShort))
- assertEquals((0L, -1), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.EARLIEST_TIMESTAMP, version.toShort))
- assertEquals((10L, -1), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.LATEST_TIMESTAMP, version.toShort))
- assertEquals((-1L, -1, Errors.UNSUPPORTED_VERSION.code()),
fetchOffsetAndEpochWithError(firstLeaderId, ListOffsetsRequest.MAX_TIMESTAMP,
version.toShort))
- assertEquals((-1L, -1, Errors.UNSUPPORTED_VERSION.code()),
fetchOffsetAndEpochWithError(firstLeaderId,
ListOffsetsRequest.EARLIEST_LOCAL_TIMESTAMP, version.toShort))
- } else if (version >= 4 && version <= 6) {
- assertEquals((0L, 0), fetchOffsetAndEpoch(firstLeaderId, 0L,
version.toShort))
- assertEquals((0L, 0), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.EARLIEST_TIMESTAMP, version.toShort))
- assertEquals((10L, 0), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.LATEST_TIMESTAMP, version.toShort))
- assertEquals((-1L, -1, Errors.UNSUPPORTED_VERSION.code()),
fetchOffsetAndEpochWithError(firstLeaderId, ListOffsetsRequest.MAX_TIMESTAMP,
version.toShort))
- assertEquals((-1L, -1, Errors.UNSUPPORTED_VERSION.code()),
fetchOffsetAndEpochWithError(firstLeaderId,
ListOffsetsRequest.EARLIEST_LOCAL_TIMESTAMP, version.toShort))
- } else if (version == 7) {
- assertEquals((0L, 0), fetchOffsetAndEpoch(firstLeaderId, 0L,
version.toShort))
- assertEquals((0L, 0), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.EARLIEST_TIMESTAMP, version.toShort))
- assertEquals((10L, 0), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.LATEST_TIMESTAMP, version.toShort))
- assertEquals((9L, 0), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.MAX_TIMESTAMP, version.toShort))
- assertEquals((-1L, -1, Errors.UNSUPPORTED_VERSION.code()),
fetchOffsetAndEpochWithError(firstLeaderId,
ListOffsetsRequest.EARLIEST_LOCAL_TIMESTAMP, version.toShort))
- } else if (version >= 8) {
- assertEquals((0L, 0), fetchOffsetAndEpoch(firstLeaderId, 0L,
version.toShort))
- assertEquals((0L, 0), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.EARLIEST_TIMESTAMP, version.toShort))
- assertEquals((10L, 0), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.LATEST_TIMESTAMP, version.toShort))
- assertEquals((9L, 0), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.MAX_TIMESTAMP, version.toShort))
- assertEquals((0L, 0), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.EARLIEST_LOCAL_TIMESTAMP, version.toShort))
- }
+ if (version >= 1 && version <= 3) {
+ assertEquals((0L, -1), fetchOffsetAndEpoch(firstLeaderId, 0L, version))
+ assertEquals((0L, -1), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.EARLIEST_TIMESTAMP, version))
+ assertEquals((10L, -1), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.LATEST_TIMESTAMP, version))
+ assertEquals((-1L, -1, Errors.UNSUPPORTED_VERSION.code()),
fetchOffsetAndEpochWithError(firstLeaderId, ListOffsetsRequest.MAX_TIMESTAMP,
version))
+ assertEquals((-1L, -1, Errors.UNSUPPORTED_VERSION.code()),
fetchOffsetAndEpochWithError(firstLeaderId,
ListOffsetsRequest.EARLIEST_LOCAL_TIMESTAMP, version))
+ } else if (version >= 4 && version <= 6) {
+ assertEquals((0L, 0), fetchOffsetAndEpoch(firstLeaderId, 0L, version))
+ assertEquals((0L, 0), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.EARLIEST_TIMESTAMP, version))
+ assertEquals((10L, 0), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.LATEST_TIMESTAMP, version))
+ assertEquals((-1L, -1, Errors.UNSUPPORTED_VERSION.code()),
fetchOffsetAndEpochWithError(firstLeaderId, ListOffsetsRequest.MAX_TIMESTAMP,
version))
+ assertEquals((-1L, -1, Errors.UNSUPPORTED_VERSION.code()),
fetchOffsetAndEpochWithError(firstLeaderId,
ListOffsetsRequest.EARLIEST_LOCAL_TIMESTAMP, version))
+ } else if (version == 7) {
+ assertEquals((0L, 0), fetchOffsetAndEpoch(firstLeaderId, 0L, version))
+ assertEquals((0L, 0), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.EARLIEST_TIMESTAMP, version))
+ assertEquals((10L, 0), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.LATEST_TIMESTAMP, version))
+ assertEquals((9L, 0), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.MAX_TIMESTAMP, version))
+ assertEquals((-1L, -1, Errors.UNSUPPORTED_VERSION.code()),
fetchOffsetAndEpochWithError(firstLeaderId,
ListOffsetsRequest.EARLIEST_LOCAL_TIMESTAMP, version))
+ } else if (version >= 8) {
+ assertEquals((0L, 0), fetchOffsetAndEpoch(firstLeaderId, 0L, version))
+ assertEquals((0L, 0), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.EARLIEST_TIMESTAMP, version))
+ assertEquals((10L, 0), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.LATEST_TIMESTAMP, version))
+ assertEquals((9L, 0), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.MAX_TIMESTAMP, version))
+ assertEquals((0L, 0), fetchOffsetAndEpoch(firstLeaderId,
ListOffsetsRequest.EARLIEST_LOCAL_TIMESTAMP, version))
}
}
