From d6c37bdd18b2632ea9093f2422a0cfa723e36b96 Mon Sep 17 00:00:00 2001
From: Carl Yeksigian <carl@apache.org>
Date: Wed, 24 Jun 2015 11:27:07 -0400
Subject: [PATCH] Don't advance reader if column name not found

Patch by Carl Yeksigian; reviewed by Sam Tunnicliffe for CASSANDRA-9540
---
 CHANGES.txt                                   |  1 +
 .../columniterator/SSTableNamesIterator.java  |  3 --
 .../cassandra/cql3/LargeCompactValueTest.java | 50 +++++++++++++++++++
 3 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 test/unit/org/apache/cassandra/cql3/LargeCompactValueTest.java

diff --git a/CHANGES.txt b/CHANGES.txt
index b3c76edee8..e8ac3e7d4c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.7
+ * Fix incorrect result for IN queries where column not found (CASSANDRA-9540)
  * ColumnFamilyStore.selectAndReference may block during compaction (CASSANDRA-9637)
  * Fix bug in cardinality check when compacting (CASSANDRA-9580)
  * Fix memory leak in Ref due to ConcurrentLinkedQueue.remove() behaviour (CASSANDRA-9549)
diff --git a/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java b/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java
index 221f499356..eb5eed952b 100644
--- a/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java
+++ b/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java
@@ -235,10 +235,7 @@ public class SSTableNamesIterator extends AbstractIterator<OnDiskAtom> implement
                     result.add(deserializer.readNext());
                 }
                 else
-                {
-                    deserializer.skipNext();
                     nextToFetch = toFetch.hasNext() ? toFetch.next() : null;
-                }
             }
         }
     }
diff --git a/test/unit/org/apache/cassandra/cql3/LargeCompactValueTest.java b/test/unit/org/apache/cassandra/cql3/LargeCompactValueTest.java
new file mode 100644
index 0000000000..fe91650bee
--- /dev/null
+++ b/test/unit/org/apache/cassandra/cql3/LargeCompactValueTest.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.cql3;
+
+import java.nio.ByteBuffer;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.cassandra.io.util.RandomAccessReader;
+
+public class LargeCompactValueTest extends CQLTester
+{
+    @Before
+    public void before()
+    {
+        createTable("CREATE TABLE %s (key TEXT, column TEXT, value BLOB, PRIMARY KEY (key, column)) WITH COMPACT STORAGE");
+    }
+
+    @Test
+    public void testInsertAndQuery() throws Throwable
+    {
+        ByteBuffer largeBytes = ByteBuffer.wrap(new byte[100000]);
+        execute("INSERT INTO %s (key, column, value) VALUES (?, ?, ?)", "test", "a", largeBytes);
+        ByteBuffer smallBytes = ByteBuffer.wrap(new byte[10]);
+        execute("INSERT INTO %s (key, column, value) VALUES (?, ?, ?)", "test", "c", smallBytes);
+
+        flush();
+
+        assertRows(execute("SELECT column FROM %s WHERE key = ? AND column IN (?, ?, ?)", "test", "c", "a", "b"),
+                   row("a"),
+                   row("c"));
+    }
+}