You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/05/19 20:59:48 UTC
[1/5] git commit: Always reallocate buffers with HSHA.
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 51583ad3d -> 606bc51e0
refs/heads/trunk 8c2d938ef -> 61084fb53
Always reallocate buffers with HSHA.
Patch by brandonwilliams, reviewed by Rick Branson for CASSANDRA-6285
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e141694e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e141694e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e141694e
Branch: refs/heads/cassandra-2.1
Commit: e141694e2bcaecf3c604f3c60b622f8cc63f3b46
Parents: 51583ad
Author: Brandon Williams <br...@apache.org>
Authored: Mon May 19 13:52:40 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon May 19 13:58:16 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 16 ++++++++++++++++
.../cassandra/thrift/THsHaDisruptorServer.java | 3 ++-
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e141694e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 860e8e2..ef678f1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,7 @@
* Limit user types to the keyspace they are defined in (CASSANDRA-6643)
* Add validate method to CollectionType (CASSANDRA-7208)
Merged from 2.0:
+ * Always reallocate buffers in HSHA (CASSANDRA-6285)
* (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
* (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
* Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
@@ -39,6 +40,21 @@ Merged from 2.0:
* Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818)
* Proper null handle for IF with map element access (CASSANDRA-7155)
* Improve compaction visibility (CASSANDRA-7242)
+ * 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/e141694e/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
index fb7ef35..e3b89d2 100644
--- a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
+++ b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
@@ -86,7 +86,8 @@ public class THsHaDisruptorServer extends TDisruptorServer
.inputProtocolFactory(protocolFactory)
.outputProtocolFactory(protocolFactory)
.processor(args.processor)
- .maxFrameSizeInBytes(DatabaseDescriptor.getThriftFramedTransportSize());
+ .maxFrameSizeInBytes(DatabaseDescriptor.getThriftFramedTransportSize())
+ .alwaysReallocateBuffers(true);
return new THsHaDisruptorServer(serverArgs);
}
[2/5] git commit: Always reallocate buffers with HSHA.
Posted by br...@apache.org.
Always reallocate buffers with HSHA.
Patch by brandonwilliams, reviewed by Rick Branson for CASSANDRA-6285
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e141694e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e141694e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e141694e
Branch: refs/heads/trunk
Commit: e141694e2bcaecf3c604f3c60b622f8cc63f3b46
Parents: 51583ad
Author: Brandon Williams <br...@apache.org>
Authored: Mon May 19 13:52:40 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon May 19 13:58:16 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 16 ++++++++++++++++
.../cassandra/thrift/THsHaDisruptorServer.java | 3 ++-
2 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e141694e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 860e8e2..ef678f1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,7 @@
* Limit user types to the keyspace they are defined in (CASSANDRA-6643)
* Add validate method to CollectionType (CASSANDRA-7208)
Merged from 2.0:
+ * Always reallocate buffers in HSHA (CASSANDRA-6285)
* (Hadoop) support authentication in CqlRecordReader (CASSANDRA-7221)
* (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
* Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
@@ -39,6 +40,21 @@ Merged from 2.0:
* Fix duplicated error messages on directory creation error at startup (CASSANDRA-5818)
* Proper null handle for IF with map element access (CASSANDRA-7155)
* Improve compaction visibility (CASSANDRA-7242)
+ * 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/e141694e/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
index fb7ef35..e3b89d2 100644
--- a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
+++ b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java
@@ -86,7 +86,8 @@ public class THsHaDisruptorServer extends TDisruptorServer
.inputProtocolFactory(protocolFactory)
.outputProtocolFactory(protocolFactory)
.processor(args.processor)
- .maxFrameSizeInBytes(DatabaseDescriptor.getThriftFramedTransportSize());
+ .maxFrameSizeInBytes(DatabaseDescriptor.getThriftFramedTransportSize())
+ .alwaysReallocateBuffers(true);
return new THsHaDisruptorServer(serverArgs);
}
[5/5] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@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/61084fb5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61084fb5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61084fb5
Branch: refs/heads/trunk
Commit: 61084fb53b92be987134028d796a6245fd3c1c0b
Parents: 8c2d938 606bc51
Author: Brandon Williams <br...@apache.org>
Authored: Mon May 19 13:59:20 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon May 19 13:59:20 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 16 ++++++++++++++++
build.xml | 2 +-
.../cassandra/thrift/THsHaDisruptorServer.java | 3 ++-
3 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61084fb5/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/61084fb5/build.xml
----------------------------------------------------------------------
[4/5] git commit: Switch disruptor to 0.3.5
Posted by br...@apache.org.
Switch disruptor to 0.3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/606bc51e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/606bc51e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/606bc51e
Branch: refs/heads/cassandra-2.1
Commit: 606bc51e0de9c25ab548b7a3f7a4d457fd3109ee
Parents: e141694
Author: Brandon Williams <br...@apache.org>
Authored: Mon May 19 13:58:57 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon May 19 13:58:57 2014 -0500
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/606bc51e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index c6dd55e..d7cddf6 100644
--- a/build.xml
+++ b/build.xml
@@ -363,7 +363,7 @@
<dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
<dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.6"/>
<dependency groupId="com.github.jbellis" artifactId="jamm" version="0.2.6"/>
- <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.3">
+ <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.5">
<exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
</dependency>
<dependency groupId="org.yaml" artifactId="snakeyaml" version="1.11"/>
[3/5] git commit: Switch disruptor to 0.3.5
Posted by br...@apache.org.
Switch disruptor to 0.3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/606bc51e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/606bc51e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/606bc51e
Branch: refs/heads/trunk
Commit: 606bc51e0de9c25ab548b7a3f7a4d457fd3109ee
Parents: e141694
Author: Brandon Williams <br...@apache.org>
Authored: Mon May 19 13:58:57 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Mon May 19 13:58:57 2014 -0500
----------------------------------------------------------------------
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/606bc51e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index c6dd55e..d7cddf6 100644
--- a/build.xml
+++ b/build.xml
@@ -363,7 +363,7 @@
<dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/>
<dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.6"/>
<dependency groupId="com.github.jbellis" artifactId="jamm" version="0.2.6"/>
- <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.3">
+ <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.5">
<exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/>
</dependency>
<dependency groupId="org.yaml" artifactId="snakeyaml" version="1.11"/>