Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Update version to 2.18.0 for CatShards request and response #16455

Merged
merged 4 commits into from
Oct 24, 2024
+6 −6
Merged

Update version to 2.18.0 for CatShards request and response #16455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e4ab14
Update version to 2.18.0 for CatShards request and response
Oct 23, 2024
fd2f9c0
Retry Build
Oct 23, 2024
6a67cff
Fix CatShardsRequestTests
Oct 23, 2024
87d7231
Retry Build
Oct 23, 2024
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
4 changes: 2 additions & 2 deletions server/src/main/java/org/opensearch/action/admin/cluster/shards/CatShardsRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public CatShardsRequest() {}

public CatShardsRequest(StreamInput in) throws IOException {
super(in);
if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
if (in.getVersion().onOrAfter(Version.V_2_18_0)) {
indices = in.readStringArray();
cancelAfterTimeInterval = in.readOptionalTimeValue();
if (in.readBoolean()) {
Expand All @@ -50,7 +50,7 @@ public CatShardsRequest(StreamInput in) throws IOException {
@Override
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
if (out.getVersion().onOrAfter(Version.V_2_18_0)) {
if (indices == null) {
out.writeVInt(0);
} else {
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/org/opensearch/action/admin/cluster/shards/CatShardsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public CatShardsResponse() {}
public CatShardsResponse(StreamInput in) throws IOException {
super(in);
indicesStatsResponse = new IndicesStatsResponse(in);
if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
if (in.getVersion().onOrAfter(Version.V_2_18_0)) {
nodes = DiscoveryNodes.readFrom(in, null);
responseShards = in.readList(ShardRouting::new);
if (in.readBoolean()) {
Expand All @@ -50,7 +50,7 @@ public CatShardsResponse(StreamInput in) throws IOException {
@Override
public void writeTo(StreamOutput out) throws IOException {
indicesStatsResponse.writeTo(out);
if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
if (out.getVersion().onOrAfter(Version.V_2_18_0)) {
nodes.writeToWithAttribute(out);
out.writeList(responseShards);
out.writeBoolean(pageToken != null);
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/action/pagination/PageParams.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*
* Class specific to paginated queries, which will contain common query params required by a paginated API.
*/
@PublicApi(since = "3.0.0")
@PublicApi(since = "2.18.0")
public class PageParams implements Writeable {

public static final String PARAM_SORT = "sort";
Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/org/opensearch/action/admin/cluster/shards/CatShardsRequestTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public void testSerializationWithOlderVersionsParametersNotSerialized() throws E
catShardsRequest.setCancelAfterTimeInterval(TimeValue.timeValueMillis(randomIntBetween(1, 5)));
catShardsRequest.setIndices(new String[2]);

Version version = VersionUtils.getPreviousVersion(Version.CURRENT);
Version version = VersionUtils.getPreviousVersion(Version.V_2_18_0);
try (BytesStreamOutput out = new BytesStreamOutput()) {
out.setVersion(version);
catShardsRequest.writeTo(out);
Expand Down
Loading