You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/12/20 21:39:54 UTC
[1/3] git commit: add IRE for invalid CF supplied to get_count patch
by Lyuben Todorov; reviewed by jbellis for CASSANDRA-5701
Updated Branches:
refs/heads/cassandra-2.0 9c17189b7 -> 7bf14648e
refs/heads/trunk 388cbfae0 -> 8614bea29
add IRE for invalid CF supplied to get_count
patch by Lyuben Todorov; reviewed by jbellis for CASSANDRA-5701
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bf14648
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bf14648
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bf14648
Branch: refs/heads/cassandra-2.0
Commit: 7bf14648ee6ed344acc0afe68e23d0b484826b24
Parents: 9c17189
Author: lyubent <lt...@dundee.ac.uk>
Authored: Fri Dec 20 13:11:31 2013 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Dec 20 14:39:36 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/thrift/CassandraServer.java | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bf14648/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 60f86c3..67036c5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.4
+ * add IRE for invalid CF supplied to get_count (CASSANDRA-5701)
* add client encryption support to sstableloader (CASSANDRA-6378)
* Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
* Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bf14648/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 07c271b..beaae78 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -561,6 +561,11 @@ public class CassandraServer implements Cassandra.Iface
pageSize,
timestamp);
}
+ catch (IllegalArgumentException e)
+ {
+ // CASSANDRA-5701
+ throw new InvalidRequestException(e.getMessage());
+ }
catch (RequestExecutionException e)
{
throw ThriftConversion.rethrow(e);
[2/3] git commit: add IRE for invalid CF supplied to get_count patch
by Lyuben Todorov; reviewed by jbellis for CASSANDRA-5701
Posted by jb...@apache.org.
add IRE for invalid CF supplied to get_count
patch by Lyuben Todorov; reviewed by jbellis for CASSANDRA-5701
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bf14648
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bf14648
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bf14648
Branch: refs/heads/trunk
Commit: 7bf14648ee6ed344acc0afe68e23d0b484826b24
Parents: 9c17189
Author: lyubent <lt...@dundee.ac.uk>
Authored: Fri Dec 20 13:11:31 2013 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Dec 20 14:39:36 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/thrift/CassandraServer.java | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bf14648/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 60f86c3..67036c5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.4
+ * add IRE for invalid CF supplied to get_count (CASSANDRA-5701)
* add client encryption support to sstableloader (CASSANDRA-6378)
* Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
* Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bf14648/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java
index 07c271b..beaae78 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -561,6 +561,11 @@ public class CassandraServer implements Cassandra.Iface
pageSize,
timestamp);
}
+ catch (IllegalArgumentException e)
+ {
+ // CASSANDRA-5701
+ throw new InvalidRequestException(e.getMessage());
+ }
catch (RequestExecutionException e)
{
throw ThriftConversion.rethrow(e);
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8614bea2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8614bea2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8614bea2
Branch: refs/heads/trunk
Commit: 8614bea2994501d4527307072e2ff3c46aa68d97
Parents: 388cbfa 7bf1464
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Dec 20 14:39:48 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Dec 20 14:39:48 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/thrift/CassandraServer.java | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8614bea2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index ac6c53a,67036c5..384e32d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,27 -1,5 +1,28 @@@
+2.1
+ * Multithreaded commitlog (CASSANDRA-3578)
+ * allocate fixed index summary memory pool and resample cold index summaries
+ to use less memory (CASSANDRA-5519)
+ * Removed multithreaded compaction (CASSANDRA-6142)
+ * Parallelize fetching rows for low-cardinality indexes (CASSANDRA-1337)
+ * change logging from log4j to logback (CASSANDRA-5883)
+ * switch to LZ4 compression for internode communication (CASSANDRA-5887)
+ * Stop using Thrift-generated Index* classes internally (CASSANDRA-5971)
+ * Remove 1.2 network compatibility code (CASSANDRA-5960)
+ * Remove leveled json manifest migration code (CASSANDRA-5996)
+ * Remove CFDefinition (CASSANDRA-6253)
+ * Use AtomicIntegerFieldUpdater in RefCountedMemory (CASSANDRA-6278)
+ * User-defined types for CQL3 (CASSANDRA-5590)
+ * Use of o.a.c.metrics in nodetool (CASSANDRA-5871, 6406)
+ * Batch read from OTC's queue and cleanup (CASSANDRA-1632)
+ * Secondary index support for collections (CASSANDRA-4511)
+ * SSTable metadata(Stats.db) format change (CASSANDRA-6356)
+ * Push composites support in the storage engine (CASSANDRA-5417)
+ * Add snapshot space used to cfstats (CASSANDRA-6231)
+ * Add cardinality estimator for key count estimation (CASSANDRA-5906)
+
+
2.0.4
+ * add IRE for invalid CF supplied to get_count (CASSANDRA-5701)
* add client encryption support to sstableloader (CASSANDRA-6378)
* Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468)
* Fix size-tiered compaction in LCS L0 (CASSANDRA-6496)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8614bea2/src/java/org/apache/cassandra/thrift/CassandraServer.java
----------------------------------------------------------------------