Skip to content

Commit f645590

Browse files
committed
Support TransportVersions for ViewMetadata serialization
1 parent 19ffdcb commit f645590

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9173000
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
index_reshard_shardcount_summary,9172000
1+
esql_views,9173000

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/EsqlPlugin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
import org.elasticsearch.xpack.esql.view.TransportGetViewAction;
9696
import org.elasticsearch.xpack.esql.view.TransportListViewsAction;
9797
import org.elasticsearch.xpack.esql.view.TransportPutViewAction;
98+
import org.elasticsearch.xpack.esql.view.ViewMetadata;
9899
import org.elasticsearch.xpack.esql.view.ViewService;
99100

100101
import java.lang.invoke.MethodHandles;
@@ -377,6 +378,7 @@ public List<NamedWriteableRegistry.Entry> getNamedWriteables() {
377378

378379
entries.add(ExpressionQueryBuilder.ENTRY);
379380
entries.add(PlanStreamWrapperQueryBuilder.ENTRY);
381+
entries.add(ViewMetadata.ENTRY);
380382

381383
entries.addAll(ExpressionWritables.getNamedWriteables());
382384
entries.addAll(PlanWritables.getNamedWriteables());

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/view/ViewMetadata.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
package org.elasticsearch.xpack.esql.view;
88

99
import org.elasticsearch.TransportVersion;
10-
import org.elasticsearch.TransportVersions;
1110
import org.elasticsearch.cluster.AbstractNamedDiffable;
1211
import org.elasticsearch.cluster.metadata.Metadata;
12+
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
1313
import org.elasticsearch.common.io.stream.StreamInput;
1414
import org.elasticsearch.common.io.stream.StreamOutput;
1515
import org.elasticsearch.common.xcontent.ChunkedToXContentHelper;
@@ -30,6 +30,8 @@
3030
*/
3131
public final class ViewMetadata extends AbstractNamedDiffable<Metadata.ClusterCustom> implements Metadata.ClusterCustom {
3232
public static final String TYPE = "esql_view";
33+
public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(ViewMetadata.class, TYPE, ViewMetadata::new);
34+
private static final TransportVersion ESQL_VIEWS = TransportVersion.fromName("esql_views");
3335

3436
static final ParseField VIEWS = new ParseField("views");
3537

@@ -65,8 +67,7 @@ public Map<String, View> views() {
6567

6668
@Override
6769
public TransportVersion getMinimalSupportedVersion() {
68-
// TODO set this to something sane, perhaps once the new TransportVersion mechanism is in place
69-
return TransportVersions.INDEX_SOURCE;
70+
return ESQL_VIEWS;
7071
}
7172

7273
@Override

0 commit comments

Comments
 (0)