cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [5/7] git commit: merge from 2.0
Date Thu, 06 Feb 2014 16:20:33 GMT
merge from 2.0


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43ad56bd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43ad56bd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/43ad56bd

Branch: refs/heads/trunk
Commit: 43ad56bd496ed01b8153de3fe2209b211675120b
Parents: 3a82adb 0b6913e
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Feb 6 10:19:07 2014 -0600
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Feb 6 10:19:07 2014 -0600

----------------------------------------------------------------------
 CHANGES.txt                                             |  1 +
 .../cassandra/db/index/SecondaryIndexSearcher.java      |  2 +-
 .../db/index/composites/CompositesSearcher.java         |  1 +
 .../apache/cassandra/db/index/keys/KeysSearcher.java    |  1 +
 .../org/apache/cassandra/service/StorageService.java    | 12 ++++++++----
 5 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/43ad56bd/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/43ad56bd/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java
index a508a15,e93efd1..70c3d6b
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java
@@@ -63,11 -59,11 +63,11 @@@ public abstract class SecondaryIndexSea
          for (IndexExpression expression : clause)
          {
              // skip columns belonging to a different index type
 -            if (!columns.contains(expression.column_name))
 +            if (!columns.contains(expression.column))
                  continue;
  
 -            SecondaryIndex index = indexManager.getIndexForColumn(expression.column_name);
 -            if (index == null || index.getIndexCfs() == null || expression.op != IndexOperator.EQ)
 +            SecondaryIndex index = indexManager.getIndexForColumn(expression.column);
-             if (index == null || !expression.operator.allowsIndexQuery())
++            if (index == null || index.getIndexCfs() == null || !expression.operator.allowsIndexQuery())
                  continue;
              int columns = index.getIndexCfs().getMeanColumns();
              candidates.put(index, columns);

http://git-wip-us.apache.org/repos/asf/cassandra/blob/43ad56bd/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
index 7dba9b0,90e7089..b441ff1
--- a/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/composites/CompositesSearcher.java
@@@ -78,8 -78,9 +78,9 @@@ public class CompositesSearcher extend
          // to each row matching that clause.
          // TODO: allow merge join instead of just one index + loop
          final IndexExpression primary = highestSelectivityPredicate(filter.getClause());
 -        final CompositesIndex index = (CompositesIndex)indexManager.getIndexForColumn(primary.column_name);
 +        final CompositesIndex index = (CompositesIndex)indexManager.getIndexForColumn(primary.column);
          assert index != null;
+         assert index.getIndexCfs() != null;
          final DecoratedKey indexKey = index.getIndexKeyFor(primary.value);
  
          if (logger.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/cassandra/blob/43ad56bd/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
index 2ed888f,5d82ba0..d491c93
--- a/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/keys/KeysSearcher.java
@@@ -65,8 -61,9 +65,9 @@@ public class KeysSearcher extends Secon
          // to each row matching that clause.
          // TODO: allow merge join instead of just one index + loop
          final IndexExpression primary = highestSelectivityPredicate(filter.getClause());
 -        final SecondaryIndex index = indexManager.getIndexForColumn(primary.column_name);
 +        final SecondaryIndex index = indexManager.getIndexForColumn(primary.column);
          assert index != null;
+         assert index.getIndexCfs() != null;
          final DecoratedKey indexKey = index.getIndexKeyFor(primary.value);
  
          if (logger.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/cassandra/blob/43ad56bd/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------


Mime
View raw message