svn commit: r1332737 - in /accumulo/trunk: ./ core/ core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrepCommand.java server/ src/

[billie]

Author: billie
Date: Tue May  1 16:23:20 2012
New Revision: 1332737

URL: http://svn.apache.org/viewvc?rev=1332737&view=rev
Log:
ACCUMULO-562 changed priority of GrepIterators when grepping for multiple terms 
- merged to trunk

Modified:
    accumulo/trunk/   (props changed)
    accumulo/trunk/core/   (props changed)
    
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrepCommand.java
    accumulo/trunk/server/   (props changed)
    accumulo/trunk/src/   (props changed)

Propchange: accumulo/trunk/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1332224,1332278,1332347
  Merged /accumulo/branches/1.4/src:r1330268-1331387,1331457-1332719
  Merged /accumulo/branches/1.3:r1330246
  Merged /accumulo/branches/1.3/src:r1330246
  Merged /accumulo/branches/1.4:r1330268-1331387,1331389-1331455,1331457-1332719

Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src/core:r1332224,1332278,1332347
  Merged /accumulo/branches/1.3/src/core:r1330246
  Merged 
/accumulo/branches/1.4/core:r1330268-1331387,1331389-1331455,1331457-1332719
  Merged /accumulo/branches/1.4/src/core:r1330268-1331387,1331457-1332719

Modified: 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrepCommand.java
URL: 
http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrepCommand.java?rev=1332737&r1=1332736&r2=1332737&view=diff
==============================================================================
--- 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrepCommand.java
 (original)
+++ 
accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/commands/GrepCommand.java
 Tue May  1 16:23:20 2012
@@ -66,7 +66,7 @@ public class GrepCommand extends ScanCom
     scanner.setRanges(Collections.singletonList(getRange(cl)));
     
     for (int i = 0; i < cl.getArgs().length; i++)
-      setUpIterator(Integer.MAX_VALUE, "grep" + i, cl.getArgs()[i], scanner);
+      setUpIterator(Integer.MAX_VALUE - cl.getArgs().length + i, "grep" + i, 
cl.getArgs()[i], scanner);
     
     try {
       // handle columns

Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
  Merged /accumulo/branches/1.3/src/server:r1330246
  Merged 
/accumulo/branches/1.4/server:r1330268-1331387,1331389-1331455,1331457-1332719
  Merged /accumulo/trunk/src/server:r1332224,1332278,1332347
  Merged /accumulo/branches/1.4/src/server:r1330268-1331387,1331457-1332719

Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue May  1 16:23:20 2012
@@ -0,0 +1,3 @@
+/accumulo/branches/1.3/src:1330246
+/accumulo/branches/1.4/src/src:1330268-1331387,1331457-1332719
+/accumulo/trunk:1332347