honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adapt bwc versions after backporting #31045 to 6.x

This commit is contained in:
Boaz Leskes 2018-06-03 21:55:34 +02:00
parent 146965f3ec
commit ccb78c2fdf
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/main/java/org/elasticsearch/persistent/PersistentTasksCustomMetaData.java
View File

@ -313,7 +313,7 @@ public final class PersistentTasksCustomMetaData extends AbstractNamedDiffable<M
id = in.readString(); id = in.readString();
allocationId = in.readLong(); allocationId = in.readLong();
taskName = in.readString(); taskName = in.readString();
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (in.getVersion().onOrAfter(Version.V_6_4_0)) {
params = (P) in.readNamedWriteable(PersistentTaskParams.class); params = (P) in.readNamedWriteable(PersistentTaskParams.class);
} else { } else {
params = (P) in.readOptionalNamedWriteable(PersistentTaskParams.class); params = (P) in.readOptionalNamedWriteable(PersistentTaskParams.class);
@ -328,7 +328,7 @@ public final class PersistentTasksCustomMetaData extends AbstractNamedDiffable<M
out.writeString(id); out.writeString(id);
out.writeLong(allocationId); out.writeLong(allocationId);
out.writeString(taskName); out.writeString(taskName);
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_6_4_0)) {
out.writeNamedWriteable(params); out.writeNamedWriteable(params);
} else { } else {
out.writeOptionalNamedWriteable(params); out.writeOptionalNamedWriteable(params);

4
server/src/main/java/org/elasticsearch/persistent/StartPersistentTaskAction.java
View File

@ -86,7 +86,7 @@ public class StartPersistentTaskAction extends Action<StartPersistentTaskAction.
super.readFrom(in); super.readFrom(in);
taskId = in.readString(); taskId = in.readString();
taskName = in.readString(); taskName = in.readString();
if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (in.getVersion().onOrAfter(Version.V_6_4_0)) {
params = in.readNamedWriteable(PersistentTaskParams.class); params = in.readNamedWriteable(PersistentTaskParams.class);
} else { } else {
params = in.readOptionalNamedWriteable(PersistentTaskParams.class); params = in.readOptionalNamedWriteable(PersistentTaskParams.class);
@ -98,7 +98,7 @@ public class StartPersistentTaskAction extends Action<StartPersistentTaskAction.
super.writeTo(out); super.writeTo(out);
out.writeString(taskId); out.writeString(taskId);
out.writeString(taskName); out.writeString(taskName);
if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { if (out.getVersion().onOrAfter(Version.V_6_4_0)) {
out.writeNamedWriteable(params); out.writeNamedWriteable(params);
} else { } else {
out.writeOptionalNamedWriteable(params); out.writeOptionalNamedWriteable(params);

2
server/src/test/java/org/elasticsearch/cluster/ClusterStateIT.java
View File

@ -33,7 +33,6 @@ import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.Writeable; import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.NamedXContentRegistry; import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
@ -43,7 +42,6 @@ import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.script.ScriptService; import org.elasticsearch.script.ScriptService;
import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase;
import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TcpTransport;
import org.elasticsearch.watcher.ResourceWatcherService; import org.elasticsearch.watcher.ResourceWatcherService;
import java.io.IOException; import java.io.IOException;