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 2011/10/13 22:35:29 UTC
svn commit: r1183079 - in /incubator/accumulo/trunk:
contrib/accumulo_sample/ingest/src/main/java/iterator/
contrib/accumulo_sample/query/src/main/java/iterator/
src/core/src/main/java/org/apache/accumulo/core/iterators/
src/core/src/main/java/org/apac...
Author: billie
Date: Thu Oct 13 20:35:29 2011
New Revision: 1183079
URL: http://svn.apache.org/viewvc?rev=1183079&view=rev
Log:
ACCUMULO-15 removed extraneous findTops, changed WrappingIterator exceptions to IllegalStateException, made iterators take advantage of WrappingIterator exceptions
Modified:
incubator/accumulo/trunk/contrib/accumulo_sample/ingest/src/main/java/iterator/TotalAggregatingIterator.java
incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/iterator/AbstractEvaluatingIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/DebugIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/Filter.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FilteringIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/SkippingIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/WrappingIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/CountingIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/DeletingIterator.java
Modified: incubator/accumulo/trunk/contrib/accumulo_sample/ingest/src/main/java/iterator/TotalAggregatingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/accumulo_sample/ingest/src/main/java/iterator/TotalAggregatingIterator.java?rev=1183079&r1=1183078&r2=1183079&view=diff
==============================================================================
--- incubator/accumulo/trunk/contrib/accumulo_sample/ingest/src/main/java/iterator/TotalAggregatingIterator.java (original)
+++ incubator/accumulo/trunk/contrib/accumulo_sample/ingest/src/main/java/iterator/TotalAggregatingIterator.java Thu Oct 13 20:35:29 2011
@@ -78,8 +78,6 @@ public class TotalAggregatingIterator im
public TotalAggregatingIterator(SortedKeyValueIterator<Key, Value> iterator, ColumnToClassMapping<Aggregator> aggregators) throws IOException{
this.iterator = iterator;
-
- findTop();
}
@Override
@@ -147,7 +145,6 @@ public class TotalAggregatingIterator im
public void init(SortedKeyValueIterator<Key, Value> source, Map<String, String> options, IteratorEnvironment env) throws IOException {
agg = createAggregator(options);
this.iterator = source;
- findTop();
}
@Override
Modified: incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/iterator/AbstractEvaluatingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/iterator/AbstractEvaluatingIterator.java?rev=1183079&r1=1183078&r2=1183079&view=diff
==============================================================================
--- incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/iterator/AbstractEvaluatingIterator.java (original)
+++ incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/iterator/AbstractEvaluatingIterator.java Thu Oct 13 20:35:29 2011
@@ -280,10 +280,6 @@ public abstract class AbstractEvaluating
throw new IOException("Failed to parse query", e);
}
EventFields.initializeKryo(kryo);
-
- //Not sure we want to call findTop() here. In testing with the mock accumulo stack find top was getting called
- //twice before the scanner was finished initialization
- //findTop();
}
public IteratorOptions describeOptions() {
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java?rev=1183079&r1=1183078&r2=1183079&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java Thu Oct 13 20:35:29 2011
@@ -87,8 +87,6 @@ public class AggregatingIterator impleme
public AggregatingIterator(SortedKeyValueIterator<Key, Value> iterator, ColumnToClassMapping<Aggregator> aggregators) throws IOException{
this.iterator = iterator;
this.aggregators = aggregators;
-
- findTop();
}
@Override
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/DebugIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/DebugIterator.java?rev=1183079&r1=1183078&r2=1183079&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/DebugIterator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/DebugIterator.java Thu Oct 13 20:35:29 2011
@@ -37,21 +37,21 @@ public class DebugIterator extends Wrapp
@Override
public Key getTopKey() {
- Key wc = getSource().getTopKey();
+ Key wc = super.getTopKey();
log.debug(prefix+" getTopKey() --> "+wc);
return wc;
}
@Override
public Value getTopValue() {
- Value w = getSource().getTopValue();
+ Value w = super.getTopValue();
log.debug(prefix+" getTopValue() --> "+w);
return w;
}
@Override
public boolean hasTop() {
- boolean b = getSource().hasTop();
+ boolean b = super.hasTop();
log.debug(prefix+" hasTop() --> "+b);
return b;
}
@@ -59,7 +59,7 @@ public class DebugIterator extends Wrapp
@Override
public void seek(Range range, Collection<ByteSequence> columnFamilies, boolean inclusive) throws IOException {
log.debug(prefix+" seek("+range+", "+columnFamilies+", "+inclusive+")");
- getSource().seek(range, columnFamilies, inclusive);
+ super.seek(range, columnFamilies, inclusive);
}
@Override
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/Filter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/Filter.java?rev=1183079&r1=1183078&r2=1183079&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/Filter.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/Filter.java Thu Oct 13 20:35:29 2011
@@ -37,7 +37,7 @@ public abstract class Filter extends Wra
@Override
public void next() throws IOException {
- getSource().next();
+ super.next();
findTop();
}
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FilteringIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FilteringIterator.java?rev=1183079&r1=1183078&r2=1183079&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FilteringIterator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FilteringIterator.java Thu Oct 13 20:35:29 2011
@@ -44,13 +44,11 @@ public class FilteringIterator extends W
List<? extends Filter> filters) throws IOException{
this.setSource(iterator);
this.filters = filters;
-
- findTop();
}
@Override
public void next() throws IOException {
- getSource().next();
+ super.next();
findTop();
}
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java?rev=1183079&r1=1183078&r2=1183079&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/FirstEntryInRowIterator.java Thu Oct 13 20:35:29 2011
@@ -99,7 +99,7 @@ public class FirstEntryInRowIterator ext
latestInclusive = inclusive;
// seek to first possible pattern in range
- getSource().seek(range, columnFamilies, inclusive);
+ super.seek(range, columnFamilies, inclusive);
lastRowFound = getSource().hasTop() ? getSource().getTopKey().getRow() : null;
}
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/SkippingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/SkippingIterator.java?rev=1183079&r1=1183078&r2=1183079&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/SkippingIterator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/SkippingIterator.java Thu Oct 13 20:35:29 2011
@@ -11,7 +11,7 @@ public abstract class SkippingIterator e
@Override
public void next() throws IOException {
- getSource().next();
+ super.next();
consume();
}
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java?rev=1183079&r1=1183078&r2=1183079&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/VersioningIterator.java Thu Oct 13 20:35:29 2011
@@ -48,7 +48,7 @@ public class VersioningIterator extends
return;
}
- getSource().next();
+ super.next();
if (getSource().hasTop()) {
if (getSource().getTopKey().equals(currentKey, PartialKey.ROW_COLFAM_COLQUAL_COLVIS)) {
numVersions++;
@@ -89,14 +89,14 @@ public class VersioningIterator extends
}
private void resetVersionCount() {
- if (getSource().hasTop())
+ if (super.hasTop())
currentKey.set(getSource().getTopKey());
numVersions = 1;
}
private void skipRowColumn() throws IOException {
Key keyToSkip = currentKey;
- getSource().next();
+ super.next();
while(getSource().hasTop() && getSource().getTopKey().equals(keyToSkip, PartialKey.ROW_COLFAM_COLQUAL_COLVIS)){
getSource().next();
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/WrappingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/WrappingIterator.java?rev=1183079&r1=1183078&r2=1183079&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/WrappingIterator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/WrappingIterator.java Thu Oct 13 20:35:29 2011
@@ -20,6 +20,7 @@ public abstract class WrappingIterator i
}
protected SortedKeyValueIterator<Key, Value> getSource() {
+ if (source==null) throw new IllegalStateException("getting null source");
return source;
}
@@ -30,22 +31,22 @@ public abstract class WrappingIterator i
@Override
public Key getTopKey() {
- if (source==null) throw new RuntimeException("no source set");
- if (seenSeek==false) throw new RuntimeException("never been seeked");
+ if (source==null) throw new IllegalStateException("no source set");
+ if (seenSeek==false) throw new IllegalStateException("never been seeked");
return getSource().getTopKey();
}
@Override
public Value getTopValue() {
- if (source==null) throw new RuntimeException("no source set");
- if (seenSeek==false) throw new RuntimeException("never been seeked");
+ if (source==null) throw new IllegalStateException("no source set");
+ if (seenSeek==false) throw new IllegalStateException("never been seeked");
return getSource().getTopValue();
}
@Override
public boolean hasTop() {
- if (source==null) throw new RuntimeException("no source set");
- if (seenSeek==false) throw new RuntimeException("never been seeked");
+ if (source==null) throw new IllegalStateException("no source set");
+ if (seenSeek==false) throw new IllegalStateException("never been seeked");
return getSource().hasTop();
}
@@ -57,8 +58,8 @@ public abstract class WrappingIterator i
@Override
public void next() throws IOException {
- if (source==null) throw new RuntimeException("no source set");
- if (seenSeek==false) throw new RuntimeException("never been seeked");
+ if (source==null) throw new IllegalStateException("no source set");
+ if (seenSeek==false) throw new IllegalStateException("never been seeked");
getSource().next();
}
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java?rev=1183079&r1=1183078&r2=1183079&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnFamilySkippingIterator.java Thu Oct 13 20:35:29 2011
@@ -77,10 +77,10 @@ public class ColumnFamilySkippingIterato
private void reseek(Key key) throws IOException {
if(range.afterEndKey(key)){
range = new Range(range.getEndKey(), true, range.getEndKey(), range.isEndKeyInclusive());
- getSource().seek(range, EMPTY_SET, false);
+ super.seek(range, EMPTY_SET, false);
}else{
range = new Range(key, true, range.getEndKey(), range.isEndKeyInclusive());
- getSource().seek(range, EMPTY_SET, false);
+ super.seek(range, EMPTY_SET, false);
}
}
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/CountingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/CountingIterator.java?rev=1183079&r1=1183078&r2=1183079&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/CountingIterator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/CountingIterator.java Thu Oct 13 20:35:29 2011
@@ -37,7 +37,7 @@ public class CountingIterator extends Wr
@Override
public void next() throws IOException {
- getSource().next();
+ super.next();
count++;
}
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/DeletingIterator.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/DeletingIterator.java?rev=1183079&r1=1183078&r2=1183079&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/DeletingIterator.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/system/DeletingIterator.java Thu Oct 13 20:35:29 2011
@@ -40,7 +40,7 @@ public class DeletingIterator extends Wr
@Override
public void next() throws IOException {
- if (getSource().getTopKey().isDeleted())
+ if (super.getTopKey().isDeleted())
skipRowColumn();
else
getSource().next();