From e2029232256298d89022f5314ba8d174cf43a168 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Wed, 20 Jun 2018 21:42:15 +0300 Subject: [PATCH 1/3] [DOCS] Fix JDBC Maven client group/artifact ID --- x-pack/docs/en/sql/endpoints/jdbc.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/docs/en/sql/endpoints/jdbc.asciidoc b/x-pack/docs/en/sql/endpoints/jdbc.asciidoc index a980278810e..6959035bf09 100644 --- a/x-pack/docs/en/sql/endpoints/jdbc.asciidoc +++ b/x-pack/docs/en/sql/endpoints/jdbc.asciidoc @@ -14,8 +14,8 @@ The JDBC driver can be obtained either by downloading it from the https://www.el ["source","xml",subs="attributes"] ---- - org.elasticsearch.plugin.jdbc - jdbc + org.elasticsearch.plugin + x-pack-sql-jdbc {version} ---- From 4f850273b363aa6e7e93f778ae30038e34d70abb Mon Sep 17 00:00:00 2001 From: Tal Levy Date: Wed, 20 Jun 2018 13:00:18 -0700 Subject: [PATCH 2/3] extend is-write-index serialization support to 6.4 (#31415) --- .../org/elasticsearch/action/admin/indices/alias/Alias.java | 4 ++-- .../action/admin/indices/alias/IndicesAliasesRequest.java | 4 ++-- .../org/elasticsearch/cluster/metadata/AliasMetaData.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java index 10ee8877fc9..0f8439643b8 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/Alias.java @@ -202,7 +202,7 @@ public class Alias implements Streamable, ToXContentFragment { filter = in.readOptionalString(); indexRouting = in.readOptionalString(); searchRouting = in.readOptionalString(); - if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (in.getVersion().onOrAfter(Version.V_6_4_0)) { writeIndex = in.readOptionalBoolean(); } else { writeIndex = null; @@ -215,7 +215,7 @@ public class Alias implements Streamable, ToXContentFragment { out.writeOptionalString(filter); out.writeOptionalString(indexRouting); out.writeOptionalString(searchRouting); - if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (out.getVersion().onOrAfter(Version.V_6_4_0)) { out.writeOptionalBoolean(writeIndex); } } diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java index 00e3f7e32df..c7e7288e74f 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/indices/alias/IndicesAliasesRequest.java @@ -235,7 +235,7 @@ public class IndicesAliasesRequest extends AcknowledgedRequest implements To out.writeBoolean(false); } - if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (out.getVersion().onOrAfter(Version.V_6_4_0)) { out.writeOptionalBoolean(writeIndex()); } } @@ -210,7 +210,7 @@ public class AliasMetaData extends AbstractDiffable implements To searchRouting = null; searchRoutingValues = emptySet(); } - if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (in.getVersion().onOrAfter(Version.V_6_4_0)) { writeIndex = in.readOptionalBoolean(); } else { writeIndex = null; From 8bfb9aadd9ae277d72f9b683af781e4231130184 Mon Sep 17 00:00:00 2001 From: Tal Levy Date: Wed, 20 Jun 2018 13:00:36 -0700 Subject: [PATCH 3/3] lower rollover-info version bound to 6.4 (#31414) This feature is supported in 6.4, this commit reflects that --- .../org/elasticsearch/cluster/metadata/IndexMetaData.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java index 9e4f8497878..d978e214fc9 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetaData.java @@ -693,7 +693,7 @@ public class IndexMetaData implements Diffable, ToXContentFragmen }); inSyncAllocationIds = DiffableUtils.readImmutableOpenIntMapDiff(in, DiffableUtils.getVIntKeySerializer(), DiffableUtils.StringSetValueSerializer.getInstance()); - if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (in.getVersion().onOrAfter(Version.V_6_4_0)) { rolloverInfos = DiffableUtils.readImmutableOpenMapDiff(in, DiffableUtils.getStringKeySerializer(), RolloverInfo::new, RolloverInfo::readDiffFrom); } else { @@ -714,7 +714,7 @@ public class IndexMetaData implements Diffable, ToXContentFragmen aliases.writeTo(out); customs.writeTo(out); inSyncAllocationIds.writeTo(out); - if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (out.getVersion().onOrAfter(Version.V_6_4_0)) { rolloverInfos.writeTo(out); } } @@ -765,7 +765,7 @@ public class IndexMetaData implements Diffable, ToXContentFragmen Set allocationIds = DiffableUtils.StringSetValueSerializer.getInstance().read(in, key); builder.putInSyncAllocationIds(key, allocationIds); } - if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (in.getVersion().onOrAfter(Version.V_6_4_0)) { int rolloverAliasesSize = in.readVInt(); for (int i = 0; i < rolloverAliasesSize; i++) { builder.putRolloverInfo(new RolloverInfo(in)); @@ -800,7 +800,7 @@ public class IndexMetaData implements Diffable, ToXContentFragmen out.writeVInt(cursor.key); DiffableUtils.StringSetValueSerializer.getInstance().write(cursor.value, out); } - if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) { + if (out.getVersion().onOrAfter(Version.V_6_4_0)) { out.writeVInt(rolloverInfos.size()); for (ObjectCursor cursor : rolloverInfos.values()) { cursor.value.writeTo(out);