You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/04/25 05:27:53 UTC
[1/3] git commit: remove dead local vars
Repository: cassandra
Updated Branches:
refs/heads/trunk bd6431323 -> bcb3f4713
remove dead local vars
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/86382f64
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86382f64
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86382f64
Branch: refs/heads/trunk
Commit: 86382f6427803854e24e7ae198f2292e1b9edf09
Parents: 871a603
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Thu Apr 24 23:25:29 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Thu Apr 24 23:25:29 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/86382f64/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 2652b29..60ed763 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -1451,8 +1451,6 @@ public class SelectStatement implements CQLStatement, MeasurableForPreparedCache
// 1) we're in the special case of the 'tuple' notation from #4851 which we expand as multiple
// consecutive slices: in which case we're good with this restriction and we continue
// 2) we have a 2ndary index, in which case we have to use it but can skip more validation
- boolean hasTuple = false;
- boolean hasRestrictedNotTuple = false;
if (!(previousIsSlice && restriction.isSlice() && ((Restriction.Slice)restriction).isPartOfTuple()))
{
if (hasQueriableIndex)
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@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/bcb3f471
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcb3f471
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcb3f471
Branch: refs/heads/trunk
Commit: bcb3f4713bbae10906a4ffead0b8e80c181a9af6
Parents: bd64313 159e6da
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Thu Apr 24 23:27:05 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Thu Apr 24 23:27:05 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by db...@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/159e6dab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/159e6dab
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/159e6dab
Branch: refs/heads/trunk
Commit: 159e6dabbbec4850fe23d54923b3ffc12d75ef58
Parents: f5fd02f 86382f6
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Thu Apr 24 23:26:30 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Thu Apr 24 23:26:30 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/159e6dab/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------