svn commit: r1210605 - in /incubator/accumulo/trunk/contrib/accumulo_sample: ./ ingest/ query/ query/src/main/java/logic/AbstractQueryLogic.java

[bi...@apache.org]

Author: billie
Date: Mon Dec  5 20:17:58 2011
New Revision: 1210605

URL: http://svn.apache.org/viewvc?rev=1210605&view=rev
Log:
ACCUMULO-208 fixed references to RegExFilter, ignored target and libs

Modified:
    incubator/accumulo/trunk/contrib/accumulo_sample/   (props changed)
    incubator/accumulo/trunk/contrib/accumulo_sample/ingest/   (props changed)
    incubator/accumulo/trunk/contrib/accumulo_sample/query/   (props changed)
    incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/logic/AbstractQueryLogic.java

Propchange: incubator/accumulo/trunk/contrib/accumulo_sample/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Dec  5 20:17:58 2011
@@ -1,2 +1,3 @@
 .settings
 .project
+target

Propchange: incubator/accumulo/trunk/contrib/accumulo_sample/ingest/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Dec  5 20:17:58 2011
@@ -2,3 +2,4 @@ target
 .settings
 .classpath
 .project
+lib

Propchange: incubator/accumulo/trunk/contrib/accumulo_sample/query/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Dec  5 20:17:58 2011
@@ -2,3 +2,4 @@ target
 .settings
 .classpath
 .project
+lib

Modified: incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/logic/AbstractQueryLogic.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/logic/AbstractQueryLogic.java?rev=1210605&r1=1210604&r2=1210605&view=diff
==============================================================================
--- incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/logic/AbstractQueryLogic.java (original)
+++ incubator/accumulo/trunk/contrib/accumulo_sample/query/src/main/java/logic/AbstractQueryLogic.java Mon Dec  5 20:17:58 2011
@@ -38,6 +38,16 @@ import java.util.TreeSet;
 import normalizer.LcNoDiacriticsNormalizer;
 import normalizer.Normalizer;
 
+import org.apache.accumulo.core.client.BatchScanner;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.iterators.user.RegExFilter;
+import org.apache.accumulo.core.security.Authorizations;
 import org.apache.commons.jexl2.parser.ParserTreeConstants;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.StopWatch;
@@ -46,25 +56,14 @@ import org.apache.log4j.Logger;
 
 import parser.EventFields;
 import parser.EventFields.FieldValue;
-import parser.JexlOperatorConstants;
 import parser.FieldIndexQueryReWriter;
+import parser.JexlOperatorConstants;
 import parser.QueryParser;
 import parser.QueryParser.QueryTerm;
 import parser.RangeCalculator;
 import sample.Document;
 import sample.Field;
 import sample.Results;
-import org.apache.accumulo.core.client.BatchScanner;
-import org.apache.accumulo.core.client.Connector;
-import org.apache.accumulo.core.client.IteratorSetting;
-import org.apache.accumulo.core.client.Scanner;
-import org.apache.accumulo.core.client.TableNotFoundException;
-import org.apache.accumulo.core.data.Key;
-import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.RegExIterator;
-import org.apache.accumulo.core.iterators.filter.RegExFilter;
-import org.apache.accumulo.core.security.Authorizations;
 
 import com.esotericsoftware.kryo.Kryo;
 import com.google.common.collect.HashMultimap;
@@ -846,8 +845,8 @@ public abstract class AbstractQueryLogic
           }
           if (log.isDebugEnabled())
             log.debug("Setting colf regex iterator to: " + buf.toString());
-          IteratorSetting ri = new IteratorSetting(21, "typeFilter", RegExIterator.class);
-          ri.addOption(RegExFilter.COLF_REGEX, buf.toString());
+          IteratorSetting ri = new IteratorSetting(21, "typeFilter", RegExFilter.class);
+          RegExFilter.setRegexs(ri, null, buf.toString(), null, null, false);
           bs.addScanIterator(ri);
         }
         if (log.isDebugEnabled()) {