chia7712 commented on code in PR #20248:
URL: https://github.com/apache/kafka/pull/20248#discussion_r2296249093
##########
server-common/src/test/java/org/apache/kafka/server/common/MetadataVersionTest.java:
##########
@@ -42,55 +43,65 @@ public void testFeatureLevels() {
@SuppressWarnings("checkstyle:JavaNCSS")
public void testFromVersionString() {
// 3.3-IV3 is the latest production version in the 3.3 line
- assertEquals(IBP_3_3_IV3, MetadataVersion.fromVersionString("3.3"));
- assertEquals(IBP_3_3_IV3,
MetadataVersion.fromVersionString("3.3-IV3"));
+ assertEquals(IBP_3_3_IV3, MetadataVersion.fromVersionString("3.3",
true));
+ assertEquals(IBP_3_3_IV3, MetadataVersion.fromVersionString("3.3-IV3",
true));
// 3.4-IV0 is the latest production version in the 3.4 line
- assertEquals(IBP_3_4_IV0, MetadataVersion.fromVersionString("3.4"));
- assertEquals(IBP_3_4_IV0,
MetadataVersion.fromVersionString("3.4-IV0"));
+ assertEquals(IBP_3_4_IV0, MetadataVersion.fromVersionString("3.4",
true));
+ assertEquals(IBP_3_4_IV0, MetadataVersion.fromVersionString("3.4-IV0",
true));
// 3.5-IV2 is the latest production version in the 3.5 line
- assertEquals(IBP_3_5_IV2, MetadataVersion.fromVersionString("3.5"));
- assertEquals(IBP_3_5_IV0,
MetadataVersion.fromVersionString("3.5-IV0"));
- assertEquals(IBP_3_5_IV1,
MetadataVersion.fromVersionString("3.5-IV1"));
- assertEquals(IBP_3_5_IV2,
MetadataVersion.fromVersionString("3.5-IV2"));
+ assertEquals(IBP_3_5_IV2, MetadataVersion.fromVersionString("3.5",
true));
+ assertEquals(IBP_3_5_IV0, MetadataVersion.fromVersionString("3.5-IV0",
true));
+ assertEquals(IBP_3_5_IV1, MetadataVersion.fromVersionString("3.5-IV1",
true));
+ assertEquals(IBP_3_5_IV2, MetadataVersion.fromVersionString("3.5-IV2",
true));
// 3.6-IV2 is the latest production version in the 3.6 line
- assertEquals(IBP_3_6_IV2, MetadataVersion.fromVersionString("3.6"));
- assertEquals(IBP_3_6_IV0,
MetadataVersion.fromVersionString("3.6-IV0"));
- assertEquals(IBP_3_6_IV1,
MetadataVersion.fromVersionString("3.6-IV1"));
- assertEquals(IBP_3_6_IV2,
MetadataVersion.fromVersionString("3.6-IV2"));
+ assertEquals(IBP_3_6_IV2, MetadataVersion.fromVersionString("3.6",
true));
+ assertEquals(IBP_3_6_IV0, MetadataVersion.fromVersionString("3.6-IV0",
true));
+ assertEquals(IBP_3_6_IV1, MetadataVersion.fromVersionString("3.6-IV1",
true));
+ assertEquals(IBP_3_6_IV2, MetadataVersion.fromVersionString("3.6-IV2",
true));
// 3.7-IV4 is the latest production version in the 3.7 line
- assertEquals(IBP_3_7_IV4, MetadataVersion.fromVersionString("3.7"));
- assertEquals(IBP_3_7_IV0,
MetadataVersion.fromVersionString("3.7-IV0"));
- assertEquals(IBP_3_7_IV1,
MetadataVersion.fromVersionString("3.7-IV1"));
- assertEquals(IBP_3_7_IV2,
MetadataVersion.fromVersionString("3.7-IV2"));
- assertEquals(IBP_3_7_IV3,
MetadataVersion.fromVersionString("3.7-IV3"));
- assertEquals(IBP_3_7_IV4,
MetadataVersion.fromVersionString("3.7-IV4"));
+ assertEquals(IBP_3_7_IV4, MetadataVersion.fromVersionString("3.7",
true));
+ assertEquals(IBP_3_7_IV0, MetadataVersion.fromVersionString("3.7-IV0",
true));
+ assertEquals(IBP_3_7_IV1, MetadataVersion.fromVersionString("3.7-IV1",
true));
+ assertEquals(IBP_3_7_IV2, MetadataVersion.fromVersionString("3.7-IV2",
true));
+ assertEquals(IBP_3_7_IV3, MetadataVersion.fromVersionString("3.7-IV3",
true));
+ assertEquals(IBP_3_7_IV4, MetadataVersion.fromVersionString("3.7-IV4",
true));
// 3.8-IV0 is the latest production version in the 3.8 line
- assertEquals(IBP_3_8_IV0, MetadataVersion.fromVersionString("3.8"));
- assertEquals(IBP_3_8_IV0,
MetadataVersion.fromVersionString("3.8-IV0"));
+ assertEquals(IBP_3_8_IV0, MetadataVersion.fromVersionString("3.8",
true));
+ assertEquals(IBP_3_8_IV0, MetadataVersion.fromVersionString("3.8-IV0",
true));
// 3.9-IV0 is the latest production version in the 3.9 line
- assertEquals(IBP_3_9_IV0, MetadataVersion.fromVersionString("3.9"));
- assertEquals(IBP_3_9_IV0,
MetadataVersion.fromVersionString("3.9-IV0"));
+ assertEquals(IBP_3_9_IV0, MetadataVersion.fromVersionString("3.9",
true));
+ assertEquals(IBP_3_9_IV0, MetadataVersion.fromVersionString("3.9-IV0",
true));
// 4.0-IV3 is the latest production version in the 4.0 line
- assertEquals(IBP_4_0_IV3, MetadataVersion.fromVersionString("4.0"));
- assertEquals(IBP_4_0_IV0,
MetadataVersion.fromVersionString("4.0-IV0"));
- assertEquals(IBP_4_0_IV1,
MetadataVersion.fromVersionString("4.0-IV1"));
- assertEquals(IBP_4_0_IV2,
MetadataVersion.fromVersionString("4.0-IV2"));
- assertEquals(IBP_4_0_IV3,
MetadataVersion.fromVersionString("4.0-IV3"));
+ assertEquals(IBP_4_0_IV3, MetadataVersion.fromVersionString("4.0",
true));
+ assertEquals(IBP_4_0_IV0, MetadataVersion.fromVersionString("4.0-IV0",
true));
+ assertEquals(IBP_4_0_IV1, MetadataVersion.fromVersionString("4.0-IV1",
true));
+ assertEquals(IBP_4_0_IV2, MetadataVersion.fromVersionString("4.0-IV2",
true));
+ assertEquals(IBP_4_0_IV3, MetadataVersion.fromVersionString("4.0-IV3",
true));
// 4.1-IV1 is the latest production version in the 4.1 line
- assertEquals(IBP_4_1_IV1, MetadataVersion.fromVersionString("4.1"));
- assertEquals(IBP_4_1_IV0,
MetadataVersion.fromVersionString("4.1-IV0"));
- assertEquals(IBP_4_1_IV1,
MetadataVersion.fromVersionString("4.1-IV1"));
+ assertEquals(IBP_4_1_IV1, MetadataVersion.fromVersionString("4.1",
true));
+ assertEquals(IBP_4_1_IV0, MetadataVersion.fromVersionString("4.1-IV0",
true));
+ assertEquals(IBP_4_1_IV1, MetadataVersion.fromVersionString("4.1-IV1",
true));
- assertEquals(IBP_4_2_IV0,
MetadataVersion.fromVersionString("4.2-IV0"));
- assertEquals(IBP_4_2_IV1,
MetadataVersion.fromVersionString("4.2-IV1"));
+ assertEquals(IBP_4_2_IV0, MetadataVersion.fromVersionString("4.2-IV0",
true));
+ assertEquals(IBP_4_2_IV1, MetadataVersion.fromVersionString("4.2-IV1",
true));
+
+ // Throws exception when unstableFeatureVersionsEnabled is false
+ assertThrows(IllegalArgumentException.class, () ->
MetadataVersion.fromVersionString("4.2-IV0", false));
Review Comment:
Please also check the error message
##########
core/src/main/scala/kafka/tools/StorageTool.scala:
##########
@@ -352,6 +347,7 @@ object StorageTool extends Logging {
"Using the command with no --release-version argument will return the
mapping for " +
"the latest stable metadata version"
)
+ addConfigArguments(versionMappingParser)
Review Comment:
this will cause breaking change, right?
##########
server-common/src/test/java/org/apache/kafka/server/common/MetadataVersionTest.java:
##########
@@ -42,55 +43,65 @@ public void testFeatureLevels() {
@SuppressWarnings("checkstyle:JavaNCSS")
public void testFromVersionString() {
// 3.3-IV3 is the latest production version in the 3.3 line
- assertEquals(IBP_3_3_IV3, MetadataVersion.fromVersionString("3.3"));
- assertEquals(IBP_3_3_IV3,
MetadataVersion.fromVersionString("3.3-IV3"));
+ assertEquals(IBP_3_3_IV3, MetadataVersion.fromVersionString("3.3",
true));
+ assertEquals(IBP_3_3_IV3, MetadataVersion.fromVersionString("3.3-IV3",
true));
// 3.4-IV0 is the latest production version in the 3.4 line
- assertEquals(IBP_3_4_IV0, MetadataVersion.fromVersionString("3.4"));
- assertEquals(IBP_3_4_IV0,
MetadataVersion.fromVersionString("3.4-IV0"));
+ assertEquals(IBP_3_4_IV0, MetadataVersion.fromVersionString("3.4",
true));
+ assertEquals(IBP_3_4_IV0, MetadataVersion.fromVersionString("3.4-IV0",
true));
// 3.5-IV2 is the latest production version in the 3.5 line
- assertEquals(IBP_3_5_IV2, MetadataVersion.fromVersionString("3.5"));
- assertEquals(IBP_3_5_IV0,
MetadataVersion.fromVersionString("3.5-IV0"));
- assertEquals(IBP_3_5_IV1,
MetadataVersion.fromVersionString("3.5-IV1"));
- assertEquals(IBP_3_5_IV2,
MetadataVersion.fromVersionString("3.5-IV2"));
+ assertEquals(IBP_3_5_IV2, MetadataVersion.fromVersionString("3.5",
true));
+ assertEquals(IBP_3_5_IV0, MetadataVersion.fromVersionString("3.5-IV0",
true));
+ assertEquals(IBP_3_5_IV1, MetadataVersion.fromVersionString("3.5-IV1",
true));
+ assertEquals(IBP_3_5_IV2, MetadataVersion.fromVersionString("3.5-IV2",
true));
// 3.6-IV2 is the latest production version in the 3.6 line
- assertEquals(IBP_3_6_IV2, MetadataVersion.fromVersionString("3.6"));
- assertEquals(IBP_3_6_IV0,
MetadataVersion.fromVersionString("3.6-IV0"));
- assertEquals(IBP_3_6_IV1,
MetadataVersion.fromVersionString("3.6-IV1"));
- assertEquals(IBP_3_6_IV2,
MetadataVersion.fromVersionString("3.6-IV2"));
+ assertEquals(IBP_3_6_IV2, MetadataVersion.fromVersionString("3.6",
true));
+ assertEquals(IBP_3_6_IV0, MetadataVersion.fromVersionString("3.6-IV0",
true));
+ assertEquals(IBP_3_6_IV1, MetadataVersion.fromVersionString("3.6-IV1",
true));
+ assertEquals(IBP_3_6_IV2, MetadataVersion.fromVersionString("3.6-IV2",
true));
// 3.7-IV4 is the latest production version in the 3.7 line
- assertEquals(IBP_3_7_IV4, MetadataVersion.fromVersionString("3.7"));
- assertEquals(IBP_3_7_IV0,
MetadataVersion.fromVersionString("3.7-IV0"));
- assertEquals(IBP_3_7_IV1,
MetadataVersion.fromVersionString("3.7-IV1"));
- assertEquals(IBP_3_7_IV2,
MetadataVersion.fromVersionString("3.7-IV2"));
- assertEquals(IBP_3_7_IV3,
MetadataVersion.fromVersionString("3.7-IV3"));
- assertEquals(IBP_3_7_IV4,
MetadataVersion.fromVersionString("3.7-IV4"));
+ assertEquals(IBP_3_7_IV4, MetadataVersion.fromVersionString("3.7",
true));
+ assertEquals(IBP_3_7_IV0, MetadataVersion.fromVersionString("3.7-IV0",
true));
+ assertEquals(IBP_3_7_IV1, MetadataVersion.fromVersionString("3.7-IV1",
true));
+ assertEquals(IBP_3_7_IV2, MetadataVersion.fromVersionString("3.7-IV2",
true));
+ assertEquals(IBP_3_7_IV3, MetadataVersion.fromVersionString("3.7-IV3",
true));
+ assertEquals(IBP_3_7_IV4, MetadataVersion.fromVersionString("3.7-IV4",
true));
// 3.8-IV0 is the latest production version in the 3.8 line
- assertEquals(IBP_3_8_IV0, MetadataVersion.fromVersionString("3.8"));
- assertEquals(IBP_3_8_IV0,
MetadataVersion.fromVersionString("3.8-IV0"));
+ assertEquals(IBP_3_8_IV0, MetadataVersion.fromVersionString("3.8",
true));
+ assertEquals(IBP_3_8_IV0, MetadataVersion.fromVersionString("3.8-IV0",
true));
// 3.9-IV0 is the latest production version in the 3.9 line
- assertEquals(IBP_3_9_IV0, MetadataVersion.fromVersionString("3.9"));
- assertEquals(IBP_3_9_IV0,
MetadataVersion.fromVersionString("3.9-IV0"));
+ assertEquals(IBP_3_9_IV0, MetadataVersion.fromVersionString("3.9",
true));
+ assertEquals(IBP_3_9_IV0, MetadataVersion.fromVersionString("3.9-IV0",
true));
// 4.0-IV3 is the latest production version in the 4.0 line
- assertEquals(IBP_4_0_IV3, MetadataVersion.fromVersionString("4.0"));
- assertEquals(IBP_4_0_IV0,
MetadataVersion.fromVersionString("4.0-IV0"));
- assertEquals(IBP_4_0_IV1,
MetadataVersion.fromVersionString("4.0-IV1"));
- assertEquals(IBP_4_0_IV2,
MetadataVersion.fromVersionString("4.0-IV2"));
- assertEquals(IBP_4_0_IV3,
MetadataVersion.fromVersionString("4.0-IV3"));
+ assertEquals(IBP_4_0_IV3, MetadataVersion.fromVersionString("4.0",
true));
+ assertEquals(IBP_4_0_IV0, MetadataVersion.fromVersionString("4.0-IV0",
true));
+ assertEquals(IBP_4_0_IV1, MetadataVersion.fromVersionString("4.0-IV1",
true));
+ assertEquals(IBP_4_0_IV2, MetadataVersion.fromVersionString("4.0-IV2",
true));
+ assertEquals(IBP_4_0_IV3, MetadataVersion.fromVersionString("4.0-IV3",
true));
// 4.1-IV1 is the latest production version in the 4.1 line
- assertEquals(IBP_4_1_IV1, MetadataVersion.fromVersionString("4.1"));
- assertEquals(IBP_4_1_IV0,
MetadataVersion.fromVersionString("4.1-IV0"));
- assertEquals(IBP_4_1_IV1,
MetadataVersion.fromVersionString("4.1-IV1"));
+ assertEquals(IBP_4_1_IV1, MetadataVersion.fromVersionString("4.1",
true));
+ assertEquals(IBP_4_1_IV0, MetadataVersion.fromVersionString("4.1-IV0",
true));
+ assertEquals(IBP_4_1_IV1, MetadataVersion.fromVersionString("4.1-IV1",
true));
- assertEquals(IBP_4_2_IV0,
MetadataVersion.fromVersionString("4.2-IV0"));
- assertEquals(IBP_4_2_IV1,
MetadataVersion.fromVersionString("4.2-IV1"));
+ assertEquals(IBP_4_2_IV0, MetadataVersion.fromVersionString("4.2-IV0",
true));
+ assertEquals(IBP_4_2_IV1, MetadataVersion.fromVersionString("4.2-IV1",
true));
+
+ // Throws exception when unstableFeatureVersionsEnabled is false
+ assertThrows(IllegalArgumentException.class, () ->
MetadataVersion.fromVersionString("4.2-IV0", false));
+ assertThrows(IllegalArgumentException.class, () ->
MetadataVersion.fromVersionString("4.2-IV1", false));
Review Comment:
the case `MetadataVersion.fromVersionString("4.2-IV1", true)` should be
included
--
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
