svn commit: r1434038 - in /accumulo/trunk/core/src/main/java/org/apache/accumulo/core: iterators/user/RegExFilter.java util/shell/commands/DeleteManyCommand.java

[ecn]

Author: ecn
Date: Wed Jan 16 17:02:54 2013
New Revision: 1434038

URL: http://svn.apache.org/viewvc?rev=1434038&view=rev
Log:
ACCUMULO-968 add scan-time iterators to the scanner

Modified:
    
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
    
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteManyCommand.java

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java?rev=1434038&r1=1434037&r2=1434038&view=diff
==============================================================================
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
 Wed Jan 16 17:02:54 2013
@@ -168,7 +168,7 @@ public class RegExFilter extends Filter 
     io.addNamedOption(RegExFilter.COLF_REGEX, "regular expression on column 
family");
     io.addNamedOption(RegExFilter.COLQ_REGEX, "regular expression on column 
qualifier");
     io.addNamedOption(RegExFilter.VALUE_REGEX, "regular expression on value");
-    io.addNamedOption(RegExFilter.OR_FIELDS, "use OR instread of AND when 
multiple regexes given");
+    io.addNamedOption(RegExFilter.OR_FIELDS, "use OR instead of AND when 
multiple regexes given");
     io.addNamedOption(RegExFilter.MATCH_SUBSTRING, "match on substrings");
     io.addNamedOption(RegExFilter.ENCODING, "character encoding of byte array 
value (default is " + ENCODING_DEFAULT + ")");
     return io;
@@ -192,6 +192,8 @@ public class RegExFilter extends Filter 
     if (options.containsKey(ENCODING)) {
       try {
         this.encoding = options.get(ENCODING);
+        if ("".equals(this.encoding))
+          encoding = ENCODING_DEFAULT;
         @SuppressWarnings("unused")
         String test = new String("test".getBytes(), encoding);
       } catch (UnsupportedEncodingException e) {

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteManyCommand.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteManyCommand.java?rev=1434038&r1=1434037&r2=1434038&view=diff
==============================================================================
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteManyCommand.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DeleteManyCommand.java
 Wed Jan 16 17:02:54 2013
@@ -46,6 +46,9 @@ public class DeleteManyCommand extends S
     
     scanner.addScanIterator(new IteratorSetting(Integer.MAX_VALUE, "NOVALUE", 
SortedKeyIterator.class));
     
+    // handle session-specific scan iterators
+    addScanIterators(shellState, scanner, tableName);
+    
     // handle remaining optional arguments
     scanner.setRange(getRange(cl, interpeter));