Skip to content

Remove FieldStats version checks #71574

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.

Sign up for GitHub

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
Apr 13, 2021
Merged

Remove FieldStats version checks #71574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f560cd
Remove FieldStats version checks
javanna Apr 12, 2021
9417c1c
Merge branch 'master' into enhancement/field_stats_version_checks
javanna Apr 12, 2021
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
20 changes: 6 additions & 14 deletions server/src/main/java/org/elasticsearch/action/admin/cluster/stats/FieldStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

package org.elasticsearch.action.admin.cluster.stats;

import org.elasticsearch.Version;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.XContentBuilder;
Expand All @@ -34,24 +33,17 @@ public final class FieldStats extends IndexFeatureStats {

FieldStats(StreamInput in) throws IOException {
super(in);
if (in.getVersion().onOrAfter(Version.V_8_0_0)) {
scriptCount = in.readVInt();
scriptLangs = in.readSet(StreamInput::readString);
fieldScriptStats = new FieldScriptStats(in);
} else {
scriptLangs = new HashSet<>();
fieldScriptStats = new FieldScriptStats();
}
scriptCount = in.readVInt();
scriptLangs = in.readSet(StreamInput::readString);
fieldScriptStats = new FieldScriptStats(in);
}

@Override
public void writeTo(StreamOutput out) throws IOException {
super.writeTo(out);
if (out.getVersion().onOrAfter(Version.V_8_0_0)) {
out.writeVInt(scriptCount);
out.writeCollection(scriptLangs, StreamOutput::writeString);
fieldScriptStats.writeTo(out);
}
out.writeVInt(scriptCount);
out.writeCollection(scriptLangs, StreamOutput::writeString);
fieldScriptStats.writeTo(out);
}

@Override
Expand Down
28 changes: 6 additions & 22 deletions server/src/test/java/org/elasticsearch/action/admin/cluster/stats/MappingStatsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

import java.io.IOException;
import java.util.ArrayList;
import java.util.Base64;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
Expand Down Expand Up @@ -310,31 +309,16 @@ public void testChecksForCancellation() {
}));
}

public void testWriteToPre8_0() throws IOException {
FieldStats fieldStats = randomFieldStats("test");
MappingStats mappingStats = new MappingStats(Collections.singleton(fieldStats), Collections.emptyList());
Version version = VersionUtils.randomPreviousCompatibleVersion(random(), Version.V_8_0_0);
public void testWriteTo() throws IOException {
MappingStats instance = createTestInstance();
BytesStreamOutput out = new BytesStreamOutput();
Version version = VersionUtils.randomCompatibleVersion(random(), Version.CURRENT);
out.setVersion(version);
mappingStats.writeTo(out);
instance.writeTo(out);
StreamInput in = StreamInput.wrap(out.bytes().toBytesRef().bytes);
in.setVersion(version);
MappingStats deserialized = new MappingStats(in);
assertEquals("{\"mappings\":{\"field_types\":[" +
"{\"name\":\"test\",\"count\":" + fieldStats.count+ ",\"index_count\":" + fieldStats.indexCount +
",\"script_count\":0}],\"runtime_field_types\":[]}}",
Strings.toString(deserialized));
}

public void testReadFromPre8_0() throws IOException {
String base64EncodedFromPre8_0 = "AQR0ZXN0qebzzQGSg/HlBgAAAAAAAAAA";
byte[] bytes = Base64.getDecoder().decode(base64EncodedFromPre8_0);
Version version = VersionUtils.randomPreviousCompatibleVersion(random(), Version.V_8_0_0);
StreamInput in = StreamInput.wrap(bytes);
in.setVersion(version);
MappingStats deserialized = new MappingStats(in);
assertEquals("{\"mappings\":{\"field_types\":" +
"[{\"name\":\"test\",\"count\":431813417,\"index_count\":1824276882,\"script_count\":0}],\"runtime_field_types\":[]}}",
Strings.toString(deserialized));
assertEquals(instance.getFieldTypeStats(), deserialized.getFieldTypeStats());
assertEquals(instance.getRuntimeFieldStats(), deserialized.getRuntimeFieldStats());
}
}