Skip to content

Update TransportVersion to support a new model #131488

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

Open
wants to merge 36 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
340136c
add primary patch version to transport version
jdconrad Jul 17, 2025
46cf098
add loading for new transport version model
jdconrad Jul 17, 2025
a4ec0d6
update transport versions holder
jdconrad Jul 17, 2025
dc9cfe9
fix bugs
jdconrad Jul 17, 2025
a20dfd7
Merge branch 'main' into transport0
jdconrad Jul 18, 2025
b772a3a
update name
jdconrad Jul 21, 2025
3182209
Merge branch 'main' into transport0
jdconrad Jul 21, 2025
8aa55ca
fix equals/hashcode/toString
jdconrad Jul 21, 2025
f13e723
spotless
jdconrad Jul 21, 2025
ead340b
Merge branch 'main' into transport0
jdconrad Jul 21, 2025
be9d70b
migrate version with multiple patches
jdconrad Jul 21, 2025
01511ff
spotless
jdconrad Jul 21, 2025
cba38b1
fix names
jdconrad Jul 21, 2025
f9bebe8
Merge branch 'main' into transport0
jdconrad Jul 21, 2025
b02cb1a
name fixes
jdconrad Jul 22, 2025
a19caac
Merge branch 'main' into transport0
jdconrad Jul 22, 2025
c56ec3a
move examples to tests
jdconrad Jul 22, 2025
75fbbe4
fix new instances
jdconrad Jul 22, 2025
c42bfc2
add versions to test files
jdconrad Jul 22, 2025
1b272b6
Merge branch 'main' into transport0
jdconrad Jul 22, 2025
da5491c
update tests
jdconrad Jul 22, 2025
c80f8fb
Merge branch 'main' into transport0
jdconrad Jul 22, 2025
19b1923
add java docs
jdconrad Jul 23, 2025
ac02157
move latest
jdconrad Jul 23, 2025
71d2cc4
Merge branch 'main' into transport0
jdconrad Jul 23, 2025
6f4dd0d
move latest
jdconrad Jul 23, 2025
38d5710
more pr responses
jdconrad Jul 23, 2025
eb0a94f
fix ij refactoring
jdconrad Jul 23, 2025
518ed4b
more fixed files
jdconrad Jul 23, 2025
14e2539
add latest placeholder files for backport versions
jdconrad Jul 23, 2025
ec39480
Merge branch 'main' into transport0
jdconrad Jul 23, 2025
18d2206
switch to loading versions with txt files instead of json
jdconrad Jul 23, 2025
aa7a4bc
revert lazy change
jdconrad Jul 23, 2025
5da94f9
Merge branch 'main' into transport0
jdconrad Jul 23, 2025
e097c7a
Merge branch 'main' into transport0
jdconrad Jul 24, 2025
8c8ecfc
update to use csv files and remove names from files when possible
jdconrad Jul 24, 2025
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
265 changes: 252 additions & 13 deletions server/src/main/java/org/elasticsearch/TransportVersion.java

Large diffs are not rendered by default.

13 changes: 0 additions & 13 deletions server/src/main/java/org/elasticsearch/TransportVersions.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import java.util.function.IntFunction;

/**
* <p>Transport version is used to coordinate compatible wire protocol communication between nodes, at a fine-grained level. This replaces
Expand Down Expand Up @@ -426,16 +425,6 @@ static TransportVersion def(int id) {
*/
static final List<TransportVersion> DEFINED_VERSIONS = collectAllVersionIdsDefinedInClass(TransportVersions.class);

// the highest transport version constant defined
static final TransportVersion LATEST_DEFINED;
static {
LATEST_DEFINED = DEFINED_VERSIONS.getLast();

// see comment on IDS field
// now we're registered all the transport versions, we can clear the map
IDS = null;
}

public static List<TransportVersion> collectAllVersionIdsDefinedInClass(Class<?> cls) {
Map<Integer, String> versionIdFields = new HashMap<>();
List<TransportVersion> definedTransportVersions = new ArrayList<>();
Expand Down Expand Up @@ -477,8 +466,6 @@ public static List<TransportVersion> collectAllVersionIdsDefinedInClass(Class<?>
return List.copyOf(definedTransportVersions);
}

static final IntFunction<String> VERSION_LOOKUP = ReleaseVersions.generateVersionsLookup(TransportVersions.class, LATEST_DEFINED.id());

// no instance
private TransportVersions() {}
}
1 change: 1 addition & 0 deletions server/src/main/resources/transport/latest/8.18.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
placeholder,8840007
1 change: 1 addition & 0 deletions server/src/main/resources/transport/latest/8.19.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
placeholder,8841064
1 change: 1 addition & 0 deletions server/src/main/resources/transport/latest/9.0.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
placeholder,9000014
1 change: 1 addition & 0 deletions server/src/main/resources/transport/latest/9.1.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
placeholder,9112003
1 change: 1 addition & 0 deletions server/src/main/resources/transport/latest/9.2.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
placeholder,9130000
108 changes: 108 additions & 0 deletions server/src/test/java/org/elasticsearch/TransportVersionTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -220,4 +220,112 @@ public void testDuplicateConstants() {
previous = next;
}
}

public void testFromName() {
assertThat(TransportVersion.fromName("test_0"), is(new TransportVersion("test_0", 3001000, null)));
assertThat(TransportVersion.fromName("test_1"), is(new TransportVersion("test_1", 3002000, null)));
assertThat(
TransportVersion.fromName("test_2"),
is(
new TransportVersion(
"test_2",
3003000,
new TransportVersion("test_2", 2001001, new TransportVersion("test_2", 1001001, null))
)
)
);
assertThat(
TransportVersion.fromName("test_3"),
is(new TransportVersion("test_3", 3003001, new TransportVersion("test_3", 2001002, null)))
);
assertThat(
TransportVersion.fromName("test_4"),
is(
new TransportVersion(
"test_4",
3003002,
new TransportVersion("test_4", 2001003, new TransportVersion("test_4", 1001002, null))
)
)
);
}

public void testSupports() {
TransportVersion test0 = TransportVersion.fromName("test_0");
assertThat(new TransportVersion(null, 2003000, null).supports(test0), is(false));
assertThat(new TransportVersion(null, 3001000, null).supports(test0), is(true));
assertThat(new TransportVersion(null, 100001001, null).supports(test0), is(true));

TransportVersion test1 = TransportVersion.fromName("test_1");
assertThat(new TransportVersion(null, 2003000, null).supports(test1), is(false));
assertThat(new TransportVersion(null, 3001000, null).supports(test1), is(false));
assertThat(new TransportVersion(null, 3001001, null).supports(test1), is(false));
assertThat(new TransportVersion(null, 3002000, null).supports(test1), is(true));
assertThat(new TransportVersion(null, 100001000, null).supports(test1), is(true));
assertThat(new TransportVersion(null, 100001001, null).supports(test1), is(true));

TransportVersion test2 = TransportVersion.fromName("test_2");
assertThat(new TransportVersion(null, 1001000, null).supports(test2), is(false));
assertThat(new TransportVersion(null, 1001001, null).supports(test2), is(true));
assertThat(new TransportVersion(null, 1001002, null).supports(test2), is(true));
assertThat(new TransportVersion(null, 1002000, null).supports(test2), is(false));
assertThat(new TransportVersion(null, 1002001, null).supports(test2), is(false));
assertThat(new TransportVersion(null, 2001000, null).supports(test2), is(false));
assertThat(new TransportVersion(null, 2001001, null).supports(test2), is(true));
assertThat(new TransportVersion(null, 2001002, null).supports(test2), is(true));
assertThat(new TransportVersion(null, 2003000, null).supports(test2), is(false));
assertThat(new TransportVersion(null, 2003001, null).supports(test2), is(false));
assertThat(new TransportVersion(null, 3001000, null).supports(test2), is(false));
assertThat(new TransportVersion(null, 3001001, null).supports(test2), is(false));
assertThat(new TransportVersion(null, 3003000, null).supports(test2), is(true));
assertThat(new TransportVersion(null, 3003001, null).supports(test2), is(true));
assertThat(new TransportVersion(null, 3003002, null).supports(test2), is(true));
assertThat(new TransportVersion(null, 3003003, null).supports(test2), is(true));
assertThat(new TransportVersion(null, 100001000, null).supports(test2), is(true));
assertThat(new TransportVersion(null, 100001001, null).supports(test2), is(true));

TransportVersion test3 = TransportVersion.fromName("test_3");
assertThat(new TransportVersion(null, 1001001, null).supports(test3), is(false));
assertThat(new TransportVersion(null, 1001002, null).supports(test3), is(false));
assertThat(new TransportVersion(null, 1001003, null).supports(test3), is(false));
assertThat(new TransportVersion(null, 1002001, null).supports(test3), is(false));
assertThat(new TransportVersion(null, 1002002, null).supports(test3), is(false));
assertThat(new TransportVersion(null, 2001001, null).supports(test3), is(false));
assertThat(new TransportVersion(null, 2001002, null).supports(test3), is(true));
assertThat(new TransportVersion(null, 2001003, null).supports(test3), is(true));
assertThat(new TransportVersion(null, 2003000, null).supports(test3), is(false));
assertThat(new TransportVersion(null, 2003001, null).supports(test3), is(false));
assertThat(new TransportVersion(null, 3001000, null).supports(test3), is(false));
assertThat(new TransportVersion(null, 3001001, null).supports(test3), is(false));
assertThat(new TransportVersion(null, 3003000, null).supports(test3), is(false));
assertThat(new TransportVersion(null, 3003001, null).supports(test3), is(true));
assertThat(new TransportVersion(null, 3003002, null).supports(test3), is(true));
assertThat(new TransportVersion(null, 3003003, null).supports(test3), is(true));
assertThat(new TransportVersion(null, 3004000, null).supports(test3), is(true));
assertThat(new TransportVersion(null, 100001000, null).supports(test3), is(true));
assertThat(new TransportVersion(null, 100001001, null).supports(test3), is(true));

TransportVersion test4 = TransportVersion.fromName("test_4");
assertThat(new TransportVersion(null, 1001001, null).supports(test4), is(false));
assertThat(new TransportVersion(null, 1001002, null).supports(test4), is(true));
assertThat(new TransportVersion(null, 1001003, null).supports(test4), is(true));
assertThat(new TransportVersion(null, 1002001, null).supports(test4), is(false));
assertThat(new TransportVersion(null, 1002002, null).supports(test4), is(false));
assertThat(new TransportVersion(null, 1002003, null).supports(test3), is(false));
assertThat(new TransportVersion(null, 2001002, null).supports(test4), is(false));
assertThat(new TransportVersion(null, 2001003, null).supports(test4), is(true));
assertThat(new TransportVersion(null, 2001004, null).supports(test4), is(true));
assertThat(new TransportVersion(null, 2003000, null).supports(test4), is(false));
assertThat(new TransportVersion(null, 2003001, null).supports(test4), is(false));
assertThat(new TransportVersion(null, 3001000, null).supports(test4), is(false));
assertThat(new TransportVersion(null, 3001001, null).supports(test4), is(false));
assertThat(new TransportVersion(null, 3003000, null).supports(test4), is(false));
assertThat(new TransportVersion(null, 3003001, null).supports(test4), is(false));
assertThat(new TransportVersion(null, 3003002, null).supports(test4), is(true));
assertThat(new TransportVersion(null, 3003003, null).supports(test4), is(true));
assertThat(new TransportVersion(null, 3003004, null).supports(test4), is(true));
assertThat(new TransportVersion(null, 3004000, null).supports(test4), is(true));
assertThat(new TransportVersion(null, 100001000, null).supports(test4), is(true));
assertThat(new TransportVersion(null, 100001001, null).supports(test4), is(true));
}
}
5 changes: 5 additions & 0 deletions server/src/test/resources/transport/constant/manifest.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
test_0.csv
test_1.csv
test_2.csv
test_3.csv
test_4.csv
1 change: 1 addition & 0 deletions server/src/test/resources/transport/constant/test_0.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
100001000,3001000
2 changes: 2 additions & 0 deletions server/src/test/resources/transport/constant/test_1.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
3002000

1 change: 1 addition & 0 deletions server/src/test/resources/transport/constant/test_2.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3003000,2001001,1001001
1 change: 1 addition & 0 deletions server/src/test/resources/transport/constant/test_3.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
100002000,3003001,2001002
1 change: 1 addition & 0 deletions server/src/test/resources/transport/constant/test_4.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
100002000,3003002,2001003,1001002