cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [4/5] git commit: Fix missing results on query with IN clauses
Date Tue, 12 Nov 2013 18:23:26 GMT
Fix missing results on query with IN clauses

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6327


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

Branch: refs/heads/trunk
Commit: acea7160ed8eb1779b9830821ea5efe89040769c
Parents: c6af75a
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Nov 12 19:14:28 2013 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Nov 12 19:14:28 2013 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                 | 1 +
 src/java/org/apache/cassandra/db/marshal/CompositeType.java | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/acea7160/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 424a9f4..69b22a3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,6 +18,7 @@
  * Correctly throw error when frame too large (CASSANDRA-5981)
  * Fix serialization bug in PagedRange with 2ndary indexes (CASSANDRA-6299)
  * Fix CQL3 table validation in Thrift (CASSANDRA-6140)
+ * Fix bug missing results with IN clauses (CASSANDRA-6327)
 Merged from 1.2:
  * add non-jamm path for cached statements (CASSANDRA-6293)
  * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/acea7160/src/java/org/apache/cassandra/db/marshal/CompositeType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/CompositeType.java b/src/java/org/apache/cassandra/db/marshal/CompositeType.java
index 3110049..c9e2ab9 100644
--- a/src/java/org/apache/cassandra/db/marshal/CompositeType.java
+++ b/src/java/org/apache/cassandra/db/marshal/CompositeType.java
@@ -229,11 +229,11 @@ public class CompositeType extends AbstractCompositeType
                 AbstractType<?> t = types.get(i);
                 ByteBuffer s = i < start.length ? start[i] : ByteBufferUtil.EMPTY_BYTE_BUFFER;
                 ByteBuffer f = i < finish.length ? finish[i] : ByteBufferUtil.EMPTY_BYTE_BUFFER;
-                if (!t.intersects(minColumnNames.get(i), maxColumnNames.get(i), s, f))
-                    return false;
+                if (t.intersects(minColumnNames.get(i), maxColumnNames.get(i), s, f))
+                    return true;
             }
         }
-        return true;
+        return false;
     }
 
     private static class StaticParsedComparator implements ParsedComparator


Mime
View raw message