svn commit: r1358234 - /accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java

[ecn]

Author: ecn
Date: Fri Jul  6 14:27:38 2012
New Revision: 1358234

URL: http://svn.apache.org/viewvc?rev=1358234&view=rev
Log:
ACCUMULO-665 pass the appropriate column families down to the underlying 
iterators so they stay out of document locality group

Modified:
    
accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java

Modified: 
accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java?rev=1358234&r1=1358233&r2=1358234&view=diff
==============================================================================
--- 
accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java
 (original)
+++ 
accumulo/branches/1.4/src/examples/wikisearch/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java
 Fri Jul  6 14:27:38 2012
@@ -47,7 +47,6 @@ public class AndIterator implements Sort
   private Text currentRow = null;
   private Text currentTerm = new Text(emptyByteArray);
   private Text currentDocID = new Text(emptyByteArray);
-  private Collection<ByteSequence> seekColumnFamilies;
   private Text parentEndRow;
   private static boolean SEEK_INCLUSIVE = true;
   
@@ -870,7 +869,7 @@ public class AndIterator implements Sort
         }
         Key sKey = new Key(jumpKey.getRow());
         Range fake = new Range(sKey, true, endKey, false);
-        this.seek(fake, this.seekColumnFamilies, false);
+        this.seek(fake, null, false);
         return hasTop();
       } else {
         // need to check uid