You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/04/07 17:39:07 UTC

accumulo git commit: ACCUMULO-2188 Use addScanIterator instead of modifying internal field

Repository: accumulo
Updated Branches:
  refs/heads/master 998a31cdc -> b2aa0f86e


ACCUMULO-2188 Use addScanIterator instead of modifying internal field


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

Branch: refs/heads/master
Commit: b2aa0f86e426809cf952aa914545cdfe1c8f7c2b
Parents: 998a31c
Author: Vikram Srivastava <vi...@cloudera.com>
Authored: Tue Apr 7 11:38:20 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Tue Apr 7 11:38:20 2015 -0400

----------------------------------------------------------------------
 .../apache/accumulo/core/metadata/MetadataLocationObtainer.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b2aa0f86/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java b/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
index 224aafd..20f2130 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
@@ -31,6 +31,7 @@ import java.util.TreeSet;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.impl.AccumuloServerException;
 import org.apache.accumulo.core.client.impl.ClientContext;
 import org.apache.accumulo.core.client.impl.ScannerOptions;
@@ -162,9 +163,8 @@ public class MetadataLocationObtainer implements TabletLocationObtainer {
     ScannerOptions opts = new ScannerOptions() {
       ScannerOptions setOpts() {
         this.fetchedColumns = locCols;
-        this.serverSideIteratorList = new ArrayList<IterInfo>();
         // see comment in lookupTablet about why iterator is used
-        this.serverSideIteratorList.add(new IterInfo(10000, WholeRowIterator.class.getName(), "WRI"));
+        addScanIterator(new IteratorSetting(10000, "WRI", WholeRowIterator.class.getName()));
         return this;
       }
     }.setOpts();