You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2012/01/12 17:30:00 UTC
svn commit: r1230624 -
/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
Author: vines
Date: Thu Jan 12 16:30:00 2012
New Revision: 1230624
URL: http://svn.apache.org/viewvc?rev=1230624&view=rev
Log:
ACCUMULO-309 merging
Modified:
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java?rev=1230624&r1=1230623&r2=1230624&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java Thu Jan 12 16:30:00 2012
@@ -34,7 +34,7 @@ import org.apache.accumulo.core.security
public class MockBatchScanner extends MockScannerBase implements BatchScanner {
- final List<Range> ranges = new ArrayList<Range>();
+ List<Range> ranges = null;
public MockBatchScanner(MockTable mockTable, Authorizations authorizations) {
super(mockTable, authorizations);
@@ -42,8 +42,11 @@ public class MockBatchScanner extends Mo
@Override
public void setRanges(Collection<Range> ranges) {
- this.ranges.clear();
- this.ranges.addAll(ranges);
+ if (ranges == null || ranges.size() == 0) {
+ throw new IllegalArgumentException("ranges must be non null and contain at least 1 range");
+ }
+
+ this.ranges = new ArrayList<Range>(ranges);
}
static class RangesFilter extends Filter {
@@ -66,6 +69,10 @@ public class MockBatchScanner extends Mo
@Override
public Iterator<Entry<Key,Value>> iterator() {
+ if (ranges == null) {
+ throw new IllegalStateException("ranges not set");
+ }
+
SortedKeyValueIterator<Key,Value> i = new SortedMapIterator(table.table);
try {
i = new RangesFilter(createFilter(i), ranges);