You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/05/17 18:49:53 UTC
[1/3] git commit: reduce garbage on codec flag deserialization
Repository: cassandra
Updated Branches:
refs/heads/trunk 6ac88ab16 -> cb50f62b0
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/trunk
Commit: 7eefbf8b9d8602181acddb799103f64583c8a5ef
Parents: 5d187fb
Author: Benedict <be...@datastax.com>
Authored: Sat May 17 12:44:03 2014 -0400
Committer: Dave Brosius <db...@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;
}
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by db...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3b8482a0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b8482a0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b8482a0
Branch: refs/heads/trunk
Commit: 3b8482a0163597e47c14a71b8eea8e5fb332ab26
Parents: c045690 7eefbf8
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat May 17 12:48:58 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat May 17 12:48:58 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/3b8482a0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d12acc9,4f84af1..3a9eb2b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -34,6 -13,26 +34,7 @@@ Merged from 2.0
* Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
* 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
- * Correctly delete scheduled range xfers (CASSANDRA-7143)
- * Make batchlog replica selection rack-aware (CASSANDRA-6551)
- * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
- * Set JMX RMI port to 7199 (CASSANDRA-7087)
- * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
- * Log a warning for large batches (CASSANDRA-6487)
- * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
- * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
- * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
- * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
- * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
- * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
- * Re-add parameter columns to tracing session (CASSANDRA-6942)
- * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
- * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b8482a0/src/java/org/apache/cassandra/cql3/QueryOptions.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/QueryOptions.java
index 5801d55,0f3e11b..9c28762
--- a/src/java/org/apache/cassandra/cql3/QueryOptions.java
+++ b/src/java/org/apache/cassandra/cql3/QueryOptions.java
@@@ -274,10 -152,10 +274,12 @@@ public abstract class QueryOption
SKIP_METADATA,
PAGE_SIZE,
PAGING_STATE,
- SERIAL_CONSISTENCY;
+ SERIAL_CONSISTENCY,
+ TIMESTAMP,
+ NAMES_FOR_VALUES;
+ private static final Flag[] ALL_VALUES = values();
+
public static EnumSet<Flag> deserialize(int flags)
{
EnumSet<Flag> set = EnumSet.noneOf(Flag.class);
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cb50f62b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cb50f62b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cb50f62b
Branch: refs/heads/trunk
Commit: cb50f62b03db5f76b6fe1366f96088eeccd2c6ff
Parents: 6ac88ab 3b8482a
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sat May 17 12:49:21 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sat May 17 12:49:21 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/cb50f62b/CHANGES.txt
----------------------------------------------------------------------