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/11/16 19:01:20 UTC
svn commit: r1202815 - in
/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators:
./ user/
Author: billie
Date: Wed Nov 16 18:01:19 2011
New Revision: 1202815
URL: http://svn.apache.org/viewvc?rev=1202815&view=rev
Log:
ACCUMULO-151 cleaned up options validation
Modified:
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/AgeOffFilter.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/NoVisFilter.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.java
Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java?rev=1202815&r1=1202814&r2=1202815&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/LongCombiner.java Wed Nov 16 18:01:19 2011
@@ -76,6 +76,7 @@ public abstract class LongCombiner exten
@Override
public boolean validateOptions(Map<String,String> options) {
+ super.validateOptions(options);
if (options.get(TYPE) == null)
return false;
try {
Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/AgeOffFilter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/AgeOffFilter.java?rev=1202815&r1=1202814&r2=1202815&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/AgeOffFilter.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/AgeOffFilter.java Wed Nov 16 18:01:19 2011
@@ -23,10 +23,9 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.Filter;
import org.apache.accumulo.core.iterators.IteratorEnvironment;
-import org.apache.accumulo.core.iterators.OptionDescriber;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-public class AgeOffFilter extends Filter implements OptionDescriber {
+public class AgeOffFilter extends Filter {
private static final String TTL = "ttl";
private long threshold;
private long currentTime;
@@ -85,6 +84,7 @@ public class AgeOffFilter extends Filter
@Override
public boolean validateOptions(Map<String,String> options) {
+ super.validateOptions(options);
try {
Long.parseLong(options.get(TTL));
} catch (NumberFormatException e) {
Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java?rev=1202815&r1=1202814&r2=1202815&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java Wed Nov 16 18:01:19 2011
@@ -24,13 +24,12 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.Filter;
import org.apache.accumulo.core.iterators.IteratorEnvironment;
-import org.apache.accumulo.core.iterators.OptionDescriber;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
import org.apache.accumulo.core.iterators.conf.ColumnToClassMapping;
import org.apache.accumulo.core.iterators.conf.PerColumnIteratorConfig;
@SuppressWarnings("deprecation")
-public class ColumnAgeOffFilter extends Filter implements OptionDescriber {
+public class ColumnAgeOffFilter extends Filter {
public ColumnAgeOffFilter() {}
@@ -100,6 +99,7 @@ public class ColumnAgeOffFilter extends
@Override
public boolean validateOptions(Map<String,String> options) {
+ super.validateOptions(options);
this.ttls = new TTLSet(options);
return true;
}
Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/NoVisFilter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/NoVisFilter.java?rev=1202815&r1=1202814&r2=1202815&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/NoVisFilter.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/NoVisFilter.java Wed Nov 16 18:01:19 2011
@@ -19,11 +19,10 @@ package org.apache.accumulo.core.iterato
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.Filter;
-import org.apache.accumulo.core.iterators.OptionDescriber;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
import org.apache.accumulo.core.security.ColumnVisibility;
-public class NoVisFilter extends Filter implements OptionDescriber {
+public class NoVisFilter extends Filter {
public NoVisFilter() {}
@@ -41,7 +40,7 @@ public class NoVisFilter extends Filter
public IteratorOptions describeOptions() {
IteratorOptions io = super.describeOptions();
io.setName("novis");
- io.setDescription("NoLabelFilter hides entries without a visibility label");
+ io.setDescription("NoVisFilter hides entries without a visibility label");
return io;
}
}
Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java?rev=1202815&r1=1202814&r2=1202815&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java Wed Nov 16 18:01:19 2011
@@ -26,11 +26,10 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.Filter;
import org.apache.accumulo.core.iterators.IteratorEnvironment;
-import org.apache.accumulo.core.iterators.OptionDescriber;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
import org.apache.accumulo.core.util.ByteArrayBackedCharSequence;
-public class RegExFilter extends Filter implements OptionDescriber {
+public class RegExFilter extends Filter {
@Override
public SortedKeyValueIterator<Key,Value> deepCopy(IteratorEnvironment env) {
@@ -141,6 +140,7 @@ public class RegExFilter extends Filter
@Override
public boolean validateOptions(Map<String,String> options) {
+ super.validateOptions(options);
if (options.containsKey(ROW_REGEX))
Pattern.compile(options.get(ROW_REGEX)).matcher("");
Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java?rev=1202815&r1=1202814&r2=1202815&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/SummingArrayCombiner.java Wed Nov 16 18:01:19 2011
@@ -30,9 +30,9 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.IteratorEnvironment;
import org.apache.accumulo.core.iterators.LongCombiner;
+import org.apache.accumulo.core.iterators.LongCombiner.Type;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
import org.apache.accumulo.core.iterators.TypedValueCombiner;
-import org.apache.accumulo.core.iterators.LongCombiner.Type;
import org.apache.hadoop.io.WritableUtils;
public class SummingArrayCombiner extends TypedValueCombiner<List<Long>> {
@@ -90,6 +90,7 @@ public class SummingArrayCombiner extend
@Override
public boolean validateOptions(Map<String,String> options) {
+ super.validateOptions(options);
if (options.get(LongCombiner.TYPE) == null)
return false;
try {
Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.java?rev=1202815&r1=1202814&r2=1202815&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/iterators/user/TimestampFilter.java Wed Nov 16 18:01:19 2011
@@ -24,10 +24,9 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.Filter;
import org.apache.accumulo.core.iterators.IteratorEnvironment;
-import org.apache.accumulo.core.iterators.OptionDescriber;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-public class TimestampFilter extends Filter implements OptionDescriber {
+public class TimestampFilter extends Filter {
private final SimpleDateFormat dateParser = new SimpleDateFormat("yyyyMMddHHmmssz");
public static final String START = "start";
@@ -101,6 +100,7 @@ public class TimestampFilter extends Fil
@Override
public boolean validateOptions(Map<String,String> options) {
+ super.validateOptions(options);
try {
dateParser.parse(options.get(START));
dateParser.parse(options.get(END));