You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/02/28 21:59:22 UTC
[1/2] git commit: Fix NPE when using static columns and IN
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 336a665a1 -> 1ebbaea3b
Fix NPE when using static columns and IN
patch by slebresne; reviewed by iamaleksey for CASSANDRA-6769
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fd609339
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd609339
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fd609339
Branch: refs/heads/cassandra-2.1
Commit: fd609339eebd13e2adc37969c8e0b439775a17af
Parents: 89da2c9
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Feb 28 21:56:08 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Feb 28 21:56:08 2014 +0100
----------------------------------------------------------------------
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/fd609339/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 9fbed03..5a9d3d9 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -508,7 +508,7 @@ public class SelectStatement implements CQLStatement, MeasurableForPreparedCache
slices = new ColumnSlice[l.size()+1];
slices[0] = staticSlice;
for (int i = 0; i < l.size(); i++)
- slices[i] = l.get(i);
+ slices[i+1] = l.get(i);
}
}
return sliceFilter(slices, limit, toGroup);
[2/2] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by sl...@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/1ebbaea3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ebbaea3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ebbaea3
Branch: refs/heads/cassandra-2.1
Commit: 1ebbaea3b65024b59a69678dc86f4cc4fafc6927
Parents: 336a665 fd60933
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Feb 28 21:57:20 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Feb 28 21:57:20 2014 +0100
----------------------------------------------------------------------
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/1ebbaea3/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------