Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 c045690b1 -> 3b8482a01
reduce garbage on codec flag deserialization patch by belliottsmith reviewed by dbrosius for cassandra-7244 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7eefbf8b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7eefbf8b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7eefbf8b Branch: refs/heads/cassandra-2.1 Commit: 7eefbf8b9d8602181acddb799103f64583c8a5ef Parents: 5d187fb Author: Benedict <belliottsm...@datastax.com> Authored: Sat May 17 12:44:03 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sat May 17 12:44:03 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/QueryOptions.java | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7eefbf8b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index ab663eb..4f84af1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -14,6 +14,7 @@ * Fix the InvertedIndex trigger example (CASSANDRA-7211) * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210) * Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818) + * reduce garbage on codec flag deserialization (CASSANDRA-7244) 2.0.8 http://git-wip-us.apache.org/repos/asf/cassandra/blob/7eefbf8b/src/java/org/apache/cassandra/cql3/QueryOptions.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/QueryOptions.java b/src/java/org/apache/cassandra/cql3/QueryOptions.java index 72edfbf..0f3e11b 100644 --- a/src/java/org/apache/cassandra/cql3/QueryOptions.java +++ b/src/java/org/apache/cassandra/cql3/QueryOptions.java @@ -154,14 +154,15 @@ public class QueryOptions PAGING_STATE, SERIAL_CONSISTENCY; + private static final Flag[] ALL_VALUES = values(); + public static EnumSet<Flag> deserialize(int flags) { EnumSet<Flag> set = EnumSet.noneOf(Flag.class); - Flag[] values = Flag.values(); - for (int n = 0; n < values.length; n++) + for (int n = 0; n < ALL_VALUES.length; n++) { if ((flags & (1 << n)) != 0) - set.add(values[n]); + set.add(ALL_VALUES[n]); } return set; }