honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-06 19:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change required version for Get Settings transport API changes to 6.4.0 (#30706)

Browse Source 
Get Settings API changes have now been backported to version 6.4, and
therefore the latest version must send and expect the extra fields when
communicating with 6.4+ code.

Relates #29229 #30494
This commit is contained in:
tomcallahan 2018-05-17 20:29:08 -04:00 committed by GitHub
parent a8b4a98ee5
commit 9be3fbd1b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsRequest.java
View File

@ -71,7 +71,7 @@ public class GetSettingsRequest extends MasterNodeReadRequest<GetSettingsRequest
indicesOptions = IndicesOptions.readIndicesOptions(in); indicesOptions = IndicesOptions.readIndicesOptions(in);
names = in.readStringArray(); names = in.readStringArray();
humanReadable = in.readBoolean(); humanReadable = in.readBoolean();
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (in.getVersion().onOrAfter(Version.V_6_4_0)) {
includeDefaults = in.readBoolean(); includeDefaults = in.readBoolean();
} }
} }
@ -83,7 +83,7 @@ public class GetSettingsRequest extends MasterNodeReadRequest<GetSettingsRequest
indicesOptions.writeIndicesOptions(out); indicesOptions.writeIndicesOptions(out);
out.writeStringArray(names); out.writeStringArray(names);
out.writeBoolean(humanReadable); out.writeBoolean(humanReadable);
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_6_4_0)) {
out.writeBoolean(includeDefaults); out.writeBoolean(includeDefaults);
} }
} }

4
server/src/main/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsResponse.java
View File

@ -114,7 +114,7 @@ public class GetSettingsResponse extends ActionResponse implements ToXContentObj
} }
ImmutableOpenMap.Builder<String, Settings> defaultSettingsBuilder = ImmutableOpenMap.builder(); ImmutableOpenMap.Builder<String, Settings> defaultSettingsBuilder = ImmutableOpenMap.builder();
if (in.getVersion().onOrAfter(org.elasticsearch.Version.V_7_0_0_alpha1)) { if (in.getVersion().onOrAfter(org.elasticsearch.Version.V_6_4_0)) {
int defaultSettingsSize = in.readVInt(); int defaultSettingsSize = in.readVInt();
for (int i = 0; i < defaultSettingsSize ; i++) { for (int i = 0; i < defaultSettingsSize ; i++) {
defaultSettingsBuilder.put(in.readString(), Settings.readSettingsFromStream(in)); defaultSettingsBuilder.put(in.readString(), Settings.readSettingsFromStream(in));
@ -132,7 +132,7 @@ public class GetSettingsResponse extends ActionResponse implements ToXContentObj
out.writeString(cursor.key); out.writeString(cursor.key);
Settings.writeSettingsToStream(cursor.value, out); Settings.writeSettingsToStream(cursor.value, out);
} }
if (out.getVersion().onOrAfter(org.elasticsearch.Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(org.elasticsearch.Version.V_6_4_0)) {
out.writeVInt(indexToDefaultSettings.size()); out.writeVInt(indexToDefaultSettings.size());
for (ObjectObjectCursor<String, Settings> cursor : indexToDefaultSettings) { for (ObjectObjectCursor<String, Settings> cursor : indexToDefaultSettings) {
out.writeString(cursor.key); out.writeString(cursor.key);