From 7eefbf8b9d8602181acddb799103f64583c8a5ef Mon Sep 17 00:00:00 2001 From: Benedict Date: Sat, 17 May 2014 12:44:03 -0400 Subject: [PATCH] reduce garbage on codec flag deserialization patch by belliottsmith reviewed by dbrosius for cassandra-7244 --- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/QueryOptions.java | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index ab663eb9f2..4f84af1c91 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 diff --git a/src/java/org/apache/cassandra/cql3/QueryOptions.java b/src/java/org/apache/cassandra/cql3/QueryOptions.java index 72edfbf0d1..0f3e11bf5f 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 deserialize(int flags) { EnumSet 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; }