Skip to content
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

Do not serialize common stats flags using ordinal #29600

Merged
merged 3 commits into from
Apr 20, 2018
Merged

Do not serialize common stats flags using ordinal #29600

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c05328a
Do not serialize common stats flags using ordinal
jasontedor Apr 19, 2018
2ec7c9e
Accessibility
jasontedor Apr 19, 2018
cfef0e3
Merge branch 'master' into common-stats-flags-ordinal
jasontedor Apr 19, 2018
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
49 changes: 27 additions & 22 deletions server/src/main/java/org/elasticsearch/action/admin/indices/stats/CommonStatsFlags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public CommonStatsFlags(StreamInput in) throws IOException {
final long longFlags = in.readLong();
flags.clear();
for (Flag flag : Flag.values()) {
if ((longFlags & (1 << flag.ordinal())) != 0) {
if ((longFlags & (1 << flag.getIndex())) != 0) {
flags.add(flag);
}
}
Expand All @@ -68,7 +68,7 @@ public CommonStatsFlags(StreamInput in) throws IOException {
public void writeTo(StreamOutput out) throws IOException {
long longFlags = 0;
for (Flag flag : flags) {
longFlags |= (1 << flag.ordinal());
longFlags |= (1 << flag.getIndex());
}
out.writeLong(longFlags);

Expand Down Expand Up @@ -207,34 +207,39 @@ public CommonStatsFlags clone() {
}

public enum Flag {
// Do not change the order of these flags we use
// the ordinal for encoding! Only append to the end!
Store("store"),
Indexing("indexing"),
Get("get"),
Search("search"),
Merge("merge"),
Flush("flush"),
Refresh("refresh"),
QueryCache("query_cache"),
FieldData("fielddata"),
Docs("docs"),
Warmer("warmer"),
Completion("completion"),
Segments("segments"),
Translog("translog"),
Suggest("suggest"), // unused
RequestCache("request_cache"),
Recovery("recovery");
Store("store", 0),
Indexing("indexing", 1),
Get("get", 2),
Search("search", 3),
Merge("merge", 4),
Flush("flush", 5),
Refresh("refresh", 6),
QueryCache("query_cache", 7),
FieldData("fielddata", 8),
Docs("docs", 9),
Warmer("warmer", 10),
Completion("completion", 11),
Segments("segments", 12),
Translog("translog", 13),
Suggest("suggest", 14), // unused
RequestCache("request_cache", 15),
Recovery("recovery", 16);

private final String restName;
private final int index;

Flag(String restName) {
Flag(final String restName, final int index) {
this.restName = restName;
this.index = index;
}

public String getRestName() {
return restName;
}

private int getIndex() {
return index;
}

}
}