You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bi...@apache.org on 2012/06/04 15:58:19 UTC
svn commit: r1345974 - in /accumulo/trunk: conf/
core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
Author: billie
Date: Mon Jun 4 13:58:18 2012
New Revision: 1345974
URL: http://svn.apache.org/viewvc?rev=1345974&view=rev
Log:
ACCUMULO-611 set initial options to match those of scanner
Modified:
accumulo/trunk/conf/ (props changed)
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
Propchange: accumulo/trunk/conf/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jun 4 13:58:18 2012
@@ -8,3 +8,6 @@ monitor
accumulo-env.sh
accumulo-site.xml
accumulo_user_manual.pdf
+log4j.properties
+generic_logger.xml
+monitor_logger.xml
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java?rev=1345974&r1=1345973&r2=1345974&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/ClientSideIteratorScanner.java Mon Jun 4 13:58:18 2012
@@ -25,7 +25,6 @@ import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.impl.ScannerOptions;
import org.apache.accumulo.core.client.mock.IteratorAdapter;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
@@ -134,9 +133,9 @@ public class ClientSideIteratorScanner e
*/
public ClientSideIteratorScanner(Scanner scanner) {
smi = new ScannerTranslator(scanner);
- this.range = new Range((Key) null, (Key) null);
- this.size = Constants.SCAN_BATCH_SIZE;
- this.timeOut = Integer.MAX_VALUE;
+ this.range = scanner.getRange();
+ this.size = scanner.getBatchSize();
+ this.timeOut = scanner.getTimeOut();
}
/**
Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java?rev=1345974&r1=1345973&r2=1345974&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/IsolatedScanner.java Mon Jun 4 13:58:18 2012
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.Map.Entry;
-import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.impl.IsolationException;
import org.apache.accumulo.core.client.impl.ScannerOptions;
import org.apache.accumulo.core.data.ByteSequence;
@@ -219,9 +218,9 @@ public class IsolatedScanner extends Sca
public IsolatedScanner(Scanner scanner, RowBufferFactory bufferFactory) {
this.scanner = scanner;
- this.range = new Range();
- this.timeOut = Integer.MAX_VALUE;
- this.batchSize = Constants.SCAN_BATCH_SIZE;
+ this.range = scanner.getRange();
+ this.timeOut = scanner.getTimeOut();
+ this.batchSize = scanner.getBatchSize();
this.bufferFactory = bufferFactory;
}