Skip to content

Move Pipeline aggs under VersionedNamedWriteable #83399

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.

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

Merged
merged 2 commits into from
Feb 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package org.elasticsearch.client.analytics;

import org.elasticsearch.Version;
import org.elasticsearch.client.ml.inference.trainedmodel.InferenceConfig;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.search.aggregations.PipelineAggregationBuilder;
Expand Down Expand Up @@ -129,4 +130,9 @@ public boolean equals(Object obj) {
&& Objects.equals(modelId, other.modelId)
&& Objects.equals(inferenceConfig, other.inferenceConfig);
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_7_9_0;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
*/
package org.elasticsearch.search.aggregations;

import org.elasticsearch.Version;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.action.ValidateActions;
import org.elasticsearch.common.Strings;
Expand Down Expand Up @@ -259,9 +258,4 @@ public String toString() {
public PipelineAggregationBuilder rewrite(QueryRewriteContext context) throws IOException {
return this;
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_EMPTY;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package org.elasticsearch.search.aggregations.pipeline;

import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.xcontent.XContentBuilder;
Expand Down Expand Up @@ -59,4 +60,9 @@ protected AvgBucketPipelineAggregationBuilder buildFactory(
public String getWriteableName() {
return NAME;
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_EMPTY;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package org.elasticsearch.search.aggregations.pipeline;

import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.util.Maps;
Expand Down Expand Up @@ -225,4 +226,9 @@ public boolean equals(Object obj) {
public String getWriteableName() {
return NAME;
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_EMPTY;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package org.elasticsearch.search.aggregations.pipeline;

import org.elasticsearch.Version;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -221,4 +222,9 @@ public boolean equals(Object obj) {
public String getWriteableName() {
return NAME;
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_EMPTY;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*/
package org.elasticsearch.search.aggregations.pipeline;

import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.search.aggregations.pipeline.BucketHelpers.GapPolicy;
Expand Down Expand Up @@ -188,4 +189,9 @@ public boolean equals(Object obj) {
public String getWriteableName() {
return NAME;
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_EMPTY;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package org.elasticsearch.search.aggregations.pipeline;

import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.search.DocValueFormat;
Expand Down Expand Up @@ -125,4 +126,9 @@ public boolean equals(Object obj) {
public String getWriteableName() {
return NAME;
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_7_4_0;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package org.elasticsearch.search.aggregations.pipeline;

import org.elasticsearch.Version;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.Rounding;
import org.elasticsearch.common.io.stream.StreamInput;
Expand Down Expand Up @@ -251,4 +252,9 @@ public int hashCode() {
public String getWriteableName() {
return NAME;
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_7_4_0;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package org.elasticsearch.search.aggregations.pipeline;

import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.xcontent.XContentBuilder;
Expand Down Expand Up @@ -96,4 +97,9 @@ public boolean equals(Object obj) {
public String getWriteableName() {
return NAME;
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_EMPTY;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package org.elasticsearch.search.aggregations.pipeline;

import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.xcontent.XContentBuilder;
Expand Down Expand Up @@ -59,4 +60,9 @@ protected MaxBucketPipelineAggregationBuilder buildFactory(
public String getWriteableName() {
return NAME;
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_EMPTY;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package org.elasticsearch.search.aggregations.pipeline;

import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.xcontent.XContentBuilder;
Expand Down Expand Up @@ -59,4 +60,9 @@ protected MinBucketPipelineAggregationBuilder buildFactory(
public String getWriteableName() {
return NAME;
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_EMPTY;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package org.elasticsearch.search.aggregations.pipeline;

import org.elasticsearch.Version;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -72,4 +73,9 @@ protected void validate(ValidationContext context) {
public final String getWriteableName() {
return null;
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_EMPTY;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package org.elasticsearch.search.aggregations.pipeline;

import org.elasticsearch.Version;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -234,4 +235,9 @@ public boolean equals(Object obj) {
public String getWriteableName() {
return NAME;
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_EMPTY;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import com.carrotsearch.hppc.DoubleArrayList;

import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.xcontent.ParseField;
Expand Down Expand Up @@ -116,6 +117,11 @@ protected XContentBuilder doXContentBody(XContentBuilder builder, Params params)
return builder;
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_EMPTY;
}

public static final PipelineAggregator.Parser PARSER = new BucketMetricsParser() {

@Override
Expand Down Expand Up @@ -179,4 +185,5 @@ public boolean equals(Object obj) {
public String getWriteableName() {
return NAME;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package org.elasticsearch.search.aggregations.pipeline;

import org.elasticsearch.Version;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
Expand Down Expand Up @@ -245,4 +246,9 @@ public boolean equals(Object obj) {
public String getWriteableName() {
return NAME;
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_EMPTY;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package org.elasticsearch.search.aggregations.pipeline;

import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.xcontent.XContentBuilder;
Expand Down Expand Up @@ -59,4 +60,9 @@ protected StatsBucketPipelineAggregationBuilder buildFactory(
public String getWriteableName() {
return NAME;
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_EMPTY;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

package org.elasticsearch.search.aggregations.pipeline;

import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.xcontent.XContentBuilder;
Expand Down Expand Up @@ -59,4 +60,9 @@ protected SumBucketPipelineAggregationBuilder buildFactory(
public String getWriteableName() {
return NAME;
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_EMPTY;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,11 @@ private static TestPipelineAggregationBuilder fromXContent(String name, XContent

@Override
protected void validate(ValidationContext context) {}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_EMPTY;
}
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
package org.elasticsearch.search.aggregations;

import org.apache.lucene.util.SetOnce;
import org.elasticsearch.Version;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.Strings;
Expand Down Expand Up @@ -345,6 +346,11 @@ public String getWriteableName() {
return "rewritten";
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_EMPTY;
}

@Override
protected void doWriteTo(StreamOutput out) throws IOException {
throw new UnsupportedOperationException();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/
package org.elasticsearch.xpack.analytics.cumulativecardinality;

import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.search.DocValueFormat;
Expand Down Expand Up @@ -128,4 +129,9 @@ public String getWriteableName() {
protected boolean overrideBucketsPath() {
return true;
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_7_4_0;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/
package org.elasticsearch.xpack.analytics.movingPercentiles;

import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.search.aggregations.pipeline.AbstractPipelineAggregationBuilder;
Expand Down Expand Up @@ -129,4 +130,9 @@ public String getWriteableName() {
protected boolean overrideBucketsPath() {
return true;
}

@Override
public Version getMinimalSupportedVersion() {
return Version.V_7_9_0;
}
}
Loading