ACCUMULO-665 pass the appropriate column families down to the underlying 
iterators so they stay out of document locality group

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.4@1358234 
13f79535-47bb-0310-9956-ffa450edef68


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

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: a286a8793e484a8b64b2d578341e939891522069
Parents: a3ca5a7
Author: Eric C. Newton <e...@apache.org>
Authored: Fri Jul 6 14:27:38 2012 +0000
Committer: Eric C. Newton <e...@apache.org>
Committed: Fri Jul 6 14:27:38 2012 +0000

----------------------------------------------------------------------
 .../apache/accumulo/examples/wikisearch/iterator/AndIterator.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo-wikisearch/blob/a286a879/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java
----------------------------------------------------------------------
diff --git 
a/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java
 
b/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java
index eafc4dd..734d423 100644
--- 
a/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java
+++ 
b/query/src/main/java/org/apache/accumulo/examples/wikisearch/iterator/AndIterator.java
@@ -47,7 +47,6 @@ public class AndIterator implements 
SortedKeyValueIterator<Key,Value> {
   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 
SortedKeyValueIterator<Key,Value> {
         }
         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

Reply via email to