forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix BWC issues for x_pack/usage (elastic#55181)
Fixes several BWC issues in x_pack/usage discovered after introduction of the bwc test. Relates to elastic#54847
- Loading branch information
Showing
14 changed files
with
351 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
.../plugin/core/src/main/java/org/elasticsearch/xpack/core/enrich/EnrichFeatureSetUsage.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.core.enrich; | ||
|
|
||
| import org.elasticsearch.Version; | ||
| import org.elasticsearch.common.io.stream.StreamInput; | ||
| import org.elasticsearch.xpack.core.XPackFeatureSet; | ||
| import org.elasticsearch.xpack.core.XPackField; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| public class EnrichFeatureSetUsage extends XPackFeatureSet.Usage { | ||
|
|
||
| public EnrichFeatureSetUsage(boolean available, boolean enabled) { | ||
| super(XPackField.ENRICH, available, enabled); | ||
| } | ||
|
|
||
| public EnrichFeatureSetUsage(StreamInput input) throws IOException { | ||
| super(input); | ||
| } | ||
|
|
||
| @Override | ||
| public Version getMinimalSupportedVersion() { | ||
| return Version.V_7_5_0; | ||
| } | ||
| } |
71 changes: 71 additions & 0 deletions
71
...n/core/src/main/java/org/elasticsearch/xpack/core/flattened/FlattenedFeatureSetUsage.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License; | ||
| * you may not use this file except in compliance with the Elastic License. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.core.flattened; | ||
|
|
||
| import org.elasticsearch.Version; | ||
| import org.elasticsearch.common.io.stream.StreamInput; | ||
| import org.elasticsearch.common.io.stream.StreamOutput; | ||
| import org.elasticsearch.common.xcontent.XContentBuilder; | ||
| import org.elasticsearch.xpack.core.XPackFeatureSet; | ||
| import org.elasticsearch.xpack.core.XPackField; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Objects; | ||
|
|
||
| /** | ||
| * @deprecated used for backward compatibility with 7.x only | ||
| */ | ||
| @Deprecated | ||
| public class FlattenedFeatureSetUsage extends XPackFeatureSet.Usage { | ||
| private final int fieldCount; | ||
|
|
||
| public FlattenedFeatureSetUsage(StreamInput input) throws IOException { | ||
| super(input); | ||
| this.fieldCount = input.getVersion().onOrAfter(Version.V_7_6_0) ? input.readInt() : 0; | ||
| } | ||
|
|
||
| public FlattenedFeatureSetUsage(boolean available, boolean enabled, int fieldCount) { | ||
| super(XPackField.FLATTENED, available, enabled); | ||
| this.fieldCount = fieldCount; | ||
| } | ||
|
|
||
| int fieldCount() { | ||
| return fieldCount; | ||
| } | ||
|
|
||
| @Override | ||
| public Version getMinimalSupportedVersion() { | ||
| return Version.V_7_3_0; | ||
| } | ||
|
|
||
| @Override | ||
| public void writeTo(StreamOutput out) throws IOException { | ||
| super.writeTo(out); | ||
| if (out.getVersion().onOrAfter(Version.V_7_6_0)) { | ||
| out.writeInt(fieldCount); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected void innerXContent(XContentBuilder builder, Params params) throws IOException { | ||
| super.innerXContent(builder, params); | ||
| builder.field("field_count", fieldCount); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
| FlattenedFeatureSetUsage that = (FlattenedFeatureSetUsage) o; | ||
| return available == that.available && enabled == that.enabled && fieldCount == that.fieldCount; | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(available, enabled, fieldCount); | ||
| } | ||
| } |
Oops, something went wrong.