cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r1036192 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Date Wed, 17 Nov 2010 20:10:39 GMT
Author: jbellis
Date: Wed Nov 17 20:10:38 2010
New Revision: 1036192

URL: http://svn.apache.org/viewvc?rev=1036192&view=rev
Log:
index scan treats missing columns as not matching secondary expressions
patch by jbellis; reviewed by Stu Hood for CASSANDRA-1745

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt
    cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1036192&r1=1036191&r2=1036192&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Wed Nov 17 20:10:38 2010
@@ -4,10 +4,9 @@ dev
  * reject range queries received during bootstrap (CASSANDRA-1739)
  * fix wrapping-range queries on non-minimum token (CASSANDRA-1700)
  * add nodetool cfhistogram (CASSANDRA-1698)
- * limit repaired ranges to what the nodes have in common (CASSAHDRA-1674)
-
-
-0.6.8
+ * limit repaired ranges to what the nodes have in common (CASSANDRA-1674)
+ * index scan treats missing columns as not matching secondary
+   expressions (CASSANDRA-1745)
  * Update windows .bat files to work outside of main Cassandra
    directory (CASSANDRA-1713)
  * log threshold causing memtable flush (CASSANDRA-1675)

Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1036192&r1=1036191&r2=1036192&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
(original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Wed Nov 17 20:10:38 2010
@@ -1435,7 +1435,7 @@ public class ColumnFamilyStore implement
             // check column data vs expression
             IColumn column = data.getColumn(expression.column_name);
             if (column == null)
-                continue;
+                return false;
             int v = data.getComparator().compare(column.value(), expression.value);
             if (!satisfies(v, expression.op))
                 return false;



Mime
View raw message