You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/07/17 22:00:27 UTC
[1/3] git commit: Backport CASSANDRA-7454 to 2.1.0
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 e64c301dd -> 3d0e54e14
Backport CASSANDRA-7454 to 2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c1782d3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c1782d3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c1782d3
Branch: refs/heads/cassandra-2.1
Commit: 9c1782d39702b8bf8b8380faedc75048ef8bd9b7
Parents: e4b40c7
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Fri Jun 27 09:35:53 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Jul 17 14:58:09 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/transport/messages/ExecuteMessage.java | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c1782d3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 81a35cd..ff417b1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@
* Support conditional updates, tuple type, and the v3 protocol in cqlsh (CASSANDRA-7509)
* Handle queries on multiple secondary index types (CASSANDRA-7525)
* Fix cqlsh authentication with v3 native protocol (CASSANDRA-7564)
+ * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
Merged from 2.0:
* (Windows) force range-based repair to non-sequential mode (CASSANDRA-7541)
* Fix range merging when DES scores are zero (CASSANDRA-7535)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c1782d3/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java b/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java
index d618f43..78182b2 100644
--- a/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java
+++ b/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java
@@ -102,12 +102,12 @@ public class ExecuteMessage extends Message.Request
{
QueryHandler handler = state.getClientState().getCQLQueryHandler();
ParsedStatement.Prepared prepared = handler.getPrepared(statementId);
+ if (prepared == null)
+ throw new PreparedQueryNotFoundException(statementId);
+
options.prepare(prepared.boundNames);
CQLStatement statement = prepared.statement;
- if (statement == null)
- throw new PreparedQueryNotFoundException(statementId);
-
if (options.getPageSize() == 0)
throw new ProtocolException("The page size cannot be 0");
[3/3] git commit: Ninja: fix CASSANDRA-7454 placement in CHANGES.txt
Posted by ty...@apache.org.
Ninja: fix CASSANDRA-7454 placement in CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d0e54e1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d0e54e1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d0e54e1
Branch: refs/heads/cassandra-2.1
Commit: 3d0e54e14ba04420277964186614fc8dc57ccfb0
Parents: b9f03c8
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Jul 17 14:59:36 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Jul 17 14:59:36 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d0e54e1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index dbb160d..eb2a1a0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,7 +2,6 @@
* Add listen_interface and rpc_interface options (CASSANDRA-7417)
* Fail to start if commit log replay detects a problem (CASSANDRA-7125)
* Improve schema merge performance (CASSANDRA-7444)
- * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
* Adjust MT depth based on # of partition validating (CASSANDRA-5263)
* Optimise NativeCell comparisons (CASSANDRA-6755)
* Configurable client timeout for cqlsh (CASSANDRA-7516)
[2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1.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/b9f03c88
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9f03c88
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9f03c88
Branch: refs/heads/cassandra-2.1
Commit: b9f03c88dbb9a9ee1a865633874b0fb6ac1937ec
Parents: e64c301 9c1782d
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Jul 17 14:59:17 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Jul 17 14:59:17 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9f03c88/CHANGES.txt
----------------------------------------------------------------------