You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/07/01 19:38:39 UTC
[1/3] git commit: Clone partition key for ReadCommands to avoid netty
corruption
Repository: cassandra
Updated Branches:
refs/heads/trunk 5b7798cd5 -> 9cfde473b
Clone partition key for ReadCommands to avoid netty corruption
patch by jake; reviewed by jason brown for CASSANDRA-7465
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c9afde7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c9afde7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c9afde7
Branch: refs/heads/trunk
Commit: 4c9afde7a8fdf85932d3a86b8c0ee6f1549d6e25
Parents: 39925d2
Author: Jake Luciani <ja...@apache.org>
Authored: Tue Jul 1 13:35:33 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Tue Jul 1 13:35:33 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c9afde7/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index a4a5553..b454ece 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -345,7 +345,7 @@ public class SelectStatement implements CQLStatement, MeasurableForPreparedCache
// We should not share the slice filter amongst the commands (hence the cloneShallow), due to
// SliceQueryFilter not being immutable due to its columnCounter used by the lastCounted() method
// (this is fairly ugly and we should change that but that's probably not a tiny refactor to do that cleanly)
- commands.add(ReadCommand.create(keyspace(), key, columnFamily(), now, filter.cloneShallow()));
+ commands.add(ReadCommand.create(keyspace(), ByteBufferUtil.clone(key), columnFamily(), now, filter.cloneShallow()));
}
return commands;
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ja...@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/9cfde473
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9cfde473
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9cfde473
Branch: refs/heads/trunk
Commit: 9cfde473bd5e86a23423ae78615d8e21c6bf6509
Parents: 5b7798c 5dc04e7
Author: Jake Luciani <ja...@apache.org>
Authored: Tue Jul 1 13:38:26 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Tue Jul 1 13:38:26 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by ja...@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/5dc04e74
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5dc04e74
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5dc04e74
Branch: refs/heads/trunk
Commit: 5dc04e741c9969d23210feb2e8f8cfd7b80be1ae
Parents: 2774758 4c9afde
Author: Jake Luciani <ja...@apache.org>
Authored: Tue Jul 1 13:37:50 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Tue Jul 1 13:37:50 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------