You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2011/11/16 20:40:35 UTC
svn commit: r1202855 - in /incubator/accumulo/trunk/src:
core/src/main/java/org/apache/accumulo/core/client/
core/src/main/java/org/apache/accumulo/core/client/admin/
core/src/main/java/org/apache/accumulo/core/client/impl/
core/src/main/java/org/apach...
Author: vines
Date: Wed Nov 16 19:40:34 2011
New Revision: 1202855
URL: http://svn.apache.org/viewvc?rev=1202855&view=rev
Log:
re ACCUMULO-150 - begun purge. Filter is gone. PerColumnIteratorConfig is pending on the discussion about aggregators, etc.
Removed:
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/NoLabelIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/RegExIterator.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/filter/
incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/FilteringIteratorTest.java
incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/RegExIteratorTest.java
Modified:
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.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/IteratorUtil.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/EGrepCommand.java
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java
incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfigurationTest.java
incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/filter/ColumnFilterTest.java
incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/QueryUtil.java
incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/mapreduce/RegexExample.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/NullScanner.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousStatsCollector.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/bulk/Setup.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/DeleteSomeDocs.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/Grep.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/trace/TraceFileSystem.java
incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/util/OfflineMetadataScanner.java
incubator/accumulo/trunk/src/trace/src/main/java/cloudtrace/instrument/receivers/ZooSpanClient.java
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java Wed Nov 16 19:40:34 2011
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.core.client;
-import java.io.IOException;
import java.util.Iterator;
import java.util.Map.Entry;
@@ -62,100 +61,6 @@ public interface ScannerBase extends Ite
public void updateScanIteratorOption(String iteratorName, String key, String value);
/**
- * @deprecated since 1.4
- * @see {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator(int, IteratorSetting)}
- * @see {@link org.apache.accumulo.core.iterators.RegExIterator}
- */
- public void setScanIterators(int priority, String iteratorClass, String iteratorName);
-
- /**
- * @deprecated since 1.4
- * @see {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator(int, IteratorSetting)}
- * @see {@link org.apache.accumulo.core.iterators.RegExIterator}
- */
- public void setScanIteratorOption(String iteratorName, String key, String value);
-
- /**
- * Call this method to initialize regular expressions on a scanner. If it is not called, reasonable defaults will be used.
- *
- * @param iteratorName
- * a nickname for the iterator
- * @param iteratorPriority
- * determines the order in which iterators are applied (system iterators are always applied first, then per-table and scan-time, lowest first)
- * @throws IOException
- * if an exception occurs reading from the iterator stack
- *
- * @deprecated since 1.4
- * @see {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator(int, IteratorSetting)}
- * @see {@link org.apache.accumulo.core.iterators.RegExIterator}
- */
- public void setupRegex(String iteratorName, int iteratorPriority) throws IOException;
-
- /**
- *
- * Set a row regular expression that filters non matching entries server side.
- *
- * @param regex
- * java regular expression to match
- *
- * @deprecated since 1.4
- * @see {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator(int, IteratorSetting)}
- * @see {@link org.apache.accumulo.core.iterators.RegExIterator}
- * @see {@link org.apache.accumulo.core.iterators.filter.RegExFilter#ROW_REGEX}
- *
- * <pre>
- * // Use the more flexible addScanIterator method:
- * ScanIterator cfg = new ScanIterator("regex", RegexIterator.class);
- * RegexIterator.setRegexs(cfg, row, null, null, null, false);
- * scanner.addScanIterator(priority, cfg);
- * </pre>
- */
- public void setRowRegex(String regex);
-
- /**
- *
- * Set a column family regular expression that filters non matching entries server side.
- *
- * @param regex
- * java regular expression to match
- *
- * @deprecated since 1.4
- * @see {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator(int, IteratorSetting)}
- * @see {@link org.apache.accumulo.core.iterators.RegExIterator}
- * @see {@link org.apache.accumulo.core.iterators.filter.RegExFilter#COLF_REGEX}
- */
- public void setColumnFamilyRegex(String regex);
-
- /**
- * Use addScanIterator(int, ScanIterator);
- *
- * Set a column qualifier regular expression that filters non matching entries server side.
- *
- * @param regex
- * java regular expression to match
- *
- * @deprecated since 1.4
- * @see {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator(int, IteratorSetting)}
- * @see {@link org.apache.accumulo.core.iterators.RegExIterator}
- * @see {@link org.apache.accumulo.core.iterators.filter.RegExFilter#COLQ_REGEX}.
- *
- */
- public void setColumnQualifierRegex(String regex);
-
- /**
- * Set a value regular expression that filters non matching entries server side.
- *
- * @param regex
- * java regular expression to match
- *
- * @deprecated since 1.4
- * @see {@link org.apache.accumulo.core.client.ScannerBase#addScanIterator(int, IteratorSetting)}
- * @see {@link org.apache.accumulo.core.iterators.RegExIterator}
- * @see {@link org.apache.accumulo.core.iterators.filter.RegExFilter#VALUE_REGEX}
- */
- public void setValueRegex(String regex);
-
- /**
* @param col
* limit the scan to only this column family (multiple calls appends to the list of column families to limit)
*/
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java Wed Nov 16 19:40:34 2011
@@ -40,7 +40,6 @@ import org.apache.hadoop.io.Text;
*
*/
-@SuppressWarnings("deprecation")
public interface TableOperations {
public SortedSet<String> list();
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java Wed Nov 16 19:40:34 2011
@@ -93,7 +93,6 @@ import org.apache.thrift.transport.TTran
* Provides a class for administering tables
*
*/
-@SuppressWarnings("deprecation")
public class TableOperationsImpl extends TableOperationsHelper {
private Instance instance;
private AuthInfo credentials;
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java Wed Nov 16 19:40:34 2011
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.core.client.impl;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -34,7 +33,6 @@ import org.apache.accumulo.core.data.Col
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.data.thrift.IterInfo;
-import org.apache.accumulo.core.iterators.user.RegExFilter;
import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.accumulo.core.util.TextUtil;
import org.apache.hadoop.io.Text;
@@ -98,23 +96,7 @@ public class ScannerOptions implements S
serverSideIteratorOptions.remove(iteratorName);
}
-
- /**
- * @deprecated since 1.4, use {@link #addScanIterator(IteratorSetting)}
- */
- @Override
- public void setScanIterators(int priority, String iteratorClass, String iteratorName) {
- addScanIterator(new IteratorSetting(priority, iteratorClass, iteratorName));
- }
-
- /**
- * @deprecated since 1.4, use {@link #updateScanIteratorOption(String, String, String)}
- */
- @Override
- public synchronized void setScanIteratorOption(String iteratorName, String key, String value) {
- updateScanIteratorOption(iteratorName, key, value);
- }
-
+
/**
* Override any existing options on the given named iterator
*/
@@ -134,86 +116,6 @@ public class ScannerOptions implements S
}
/**
- * Must call this method to initialize regular expresions on a scanner.
- *
- * @deprecated since 1.4, use {@link #addScanIterator(IteratorSetting)}
- * @see RegExIterator
- */
- @Override
- public synchronized void setupRegex(String iteratorName, int iteratorPriority) throws IOException {
- ArgumentChecker.notNull(iteratorName);
- if (regexIterName != null)
- throw new RuntimeException("regex already setup");
-
- addScanIterator(new IteratorSetting(iteratorPriority, iteratorName, RegExFilter.class));
- regexIterName = iteratorName;
- }
-
- private synchronized void setupDefaultRegex() {
- try {
- setupRegex("regExAuto", Integer.MAX_VALUE);
- } catch (Exception e) {
- throw new RuntimeException("Failed to setup default regex");
- }
- }
-
- /**
- * Set a row regular expression that filters non matching entries server side.
- *
- * @deprecated since 1.4, use {@link #addScanIterator(IteratorSetting)}
- * @see RegExIterator
- */
- @Override
- public synchronized void setRowRegex(String regex) {
- ArgumentChecker.notNull(regex);
- if (regexIterName == null)
- setupDefaultRegex();
- setScanIteratorOption(regexIterName, RegExFilter.ROW_REGEX, regex);
- }
-
- /**
- * Set a column family regular expression that filters non matching entries server side.
- *
- * @deprecated since 1.4, use{@link #addScanIterator(IteratorSetting)}
- * @see RegExIterator
- */
- @Override
- public synchronized void setColumnFamilyRegex(String regex) {
- ArgumentChecker.notNull(regex);
- if (regexIterName == null)
- setupDefaultRegex();
- setScanIteratorOption(regexIterName, RegExFilter.COLF_REGEX, regex);
- }
-
- /**
- * Set a column qualifier regular expression that filters non matching entries server side.
- *
- * @deprecated since 1.4, use {@link #addScanIterator(IteratorSetting)}
- * @see RegExIterator
- */
- @Override
- public synchronized void setColumnQualifierRegex(String regex) {
- ArgumentChecker.notNull(regex);
- if (regexIterName == null)
- setupDefaultRegex();
- setScanIteratorOption(regexIterName, RegExFilter.COLQ_REGEX, regex);
- }
-
- /**
- * Set a value regular expression that filters non matching entries server side.
- *
- * @deprecated since 1.4, use {@link #addScanIterator(IteratorSetting)}
- * @see RegExIterator
- */
- @Override
- public synchronized void setValueRegex(String regex) {
- ArgumentChecker.notNull(regex);
- if (regexIterName == null)
- setupDefaultRegex();
- setScanIteratorOption(regexIterName, RegExFilter.VALUE_REGEX, regex);
- }
-
- /**
* Limit a scan to the specified column family. This can limit which locality groups are read on the server side.
*
* To fetch multiple column families call this function multiple times.
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java Wed Nov 16 19:40:34 2011
@@ -55,11 +55,6 @@ public class TabletServerBatchDeleter ex
}
@Override
- public synchronized void setValueRegex(String regex) {
- throw new UnsupportedOperationException("Cannot filter on value with deleter; Write your own deleter");
- }
-
- @Override
public void delete() throws MutationsRejectedException, TableNotFoundException {
BatchWriter bw = null;
try {
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Wed Nov 16 19:40:34 2011
@@ -1,18 +1,12 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
*/
package org.apache.accumulo.core.client.mapreduce;
@@ -24,7 +18,6 @@ import java.io.DataOutput;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
-import java.lang.reflect.InvocationTargetException;
import java.math.BigInteger;
import java.net.URLDecoder;
import java.net.URLEncoder;
@@ -37,7 +30,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.NoSuchElementException;
import java.util.Set;
import java.util.StringTokenizer;
@@ -62,7 +54,6 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.data.PartialKey;
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.SortedKeyValueIterator;
import org.apache.accumulo.core.iterators.VersioningIterator;
import org.apache.accumulo.core.security.Authorizations;
@@ -119,11 +110,6 @@ public abstract class InputFormatBase<K,
private static final String RANGES = PREFIX + ".ranges";
private static final String AUTO_ADJUST_RANGES = PREFIX + ".ranges.autoAdjust";
- private static final String ROW_REGEX = PREFIX + ".regex.row";
- private static final String COLUMN_FAMILY_REGEX = PREFIX + ".regex.cf";
- private static final String COLUMN_QUALIFIER_REGEX = PREFIX + ".regex.cq";
- private static final String VALUE_REGEX = PREFIX + ".regex.value";
-
private static final String COLUMNS = PREFIX + ".columns";
private static final String LOGLEVEL = PREFIX + ".loglevel";
@@ -212,44 +198,6 @@ public abstract class InputFormatBase<K,
job.getConfiguration().setBoolean(AUTO_ADJUST_RANGES, false);
}
- public static enum RegexType {
- ROW, COLUMN_FAMILY, COLUMN_QUALIFIER, VALUE
- }
-
- /**
- * @deprecated since 1.4 {@link #addIterator(JobContext, IteratorSetting)}
- * @see RegExIterator#setRegexs(IteratorSetting, String, String, String, String, boolean)
- * @param job
- * @param type
- * @param regex
- */
- public static void setRegex(JobContext job, RegexType type, String regex) {
- ArgumentChecker.notNull(type, regex);
- String key = null;
- switch (type) {
- case ROW:
- key = ROW_REGEX;
- break;
- case COLUMN_FAMILY:
- key = COLUMN_FAMILY_REGEX;
- break;
- case COLUMN_QUALIFIER:
- key = COLUMN_QUALIFIER_REGEX;
- break;
- case VALUE:
- key = VALUE_REGEX;
- break;
- default:
- throw new NoSuchElementException();
- }
- try {
- job.getConfiguration().set(key, URLEncoder.encode(regex, "UTF-8"));
- } catch (UnsupportedEncodingException e) {
- log.error("Failedd to encode regular expression", e);
- throw new RuntimeException(e);
- }
- }
-
/**
* Sets the max # of values that may be returned for an individual Accumulo cell. By default, applied before all other Accumulo iterators (highest priority)
* leveraged in the scan by the record reader. To adjust priority use setIterator() & setIteratorOptions() w/ the VersioningIterator type explicitly.
@@ -456,35 +404,6 @@ public abstract class InputFormatBase<K,
return ranges;
}
- protected static String getRegex(JobContext job, RegexType type) {
- String key = null;
- switch (type) {
- case ROW:
- key = ROW_REGEX;
- break;
- case COLUMN_FAMILY:
- key = COLUMN_FAMILY_REGEX;
- break;
- case COLUMN_QUALIFIER:
- key = COLUMN_QUALIFIER_REGEX;
- break;
- case VALUE:
- key = VALUE_REGEX;
- break;
- default:
- throw new NoSuchElementException();
- }
- try {
- String s = job.getConfiguration().get(key);
- if (s == null)
- return null;
- return URLDecoder.decode(s, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- log.error("Failed to decode regular expression", e);
- throw new RuntimeException(e);
- }
- }
-
protected static Set<Pair<Text,Text>> getFetchedColumns(JobContext job) {
Set<Pair<Text,Text>> columns = new HashSet<Pair<Text,Text>>();
for (String col : job.getConfiguration().getStringCollection(COLUMNS)) {
@@ -580,34 +499,8 @@ public abstract class InputFormatBase<K,
protected abstract static class RecordReaderBase<K,V> extends RecordReader<K,V> {
protected long numKeysRead;
protected Iterator<Entry<Key,Value>> scannerIterator;
- private boolean scannerRegexEnabled = false;
protected RangeInputSplit split;
-
- @SuppressWarnings("deprecation")
- private void checkAndEnableRegex(String regex, Scanner scanner, String methodName) throws IllegalArgumentException, SecurityException,
- IllegalAccessException, InvocationTargetException, NoSuchMethodException, IOException {
- if (regex != null) {
- if (scannerRegexEnabled == false) {
- scanner.setupRegex(PREFIX + ".regex.iterator", 50);
- scannerRegexEnabled = true;
- }
- scanner.getClass().getMethod(methodName, String.class).invoke(scanner, regex);
- log.info("Setting " + methodName + " to " + regex);
- }
- }
-
- protected boolean setupRegex(TaskAttemptContext attempt, Scanner scanner) throws AccumuloException {
- try {
- checkAndEnableRegex(getRegex(attempt, RegexType.ROW), scanner, "setRowRegex");
- checkAndEnableRegex(getRegex(attempt, RegexType.COLUMN_FAMILY), scanner, "setColumnFamilyRegex");
- checkAndEnableRegex(getRegex(attempt, RegexType.COLUMN_QUALIFIER), scanner, "setColumnQualifierRegex");
- checkAndEnableRegex(getRegex(attempt, RegexType.VALUE), scanner, "setValueRegex");
- return true;
- } catch (Exception e) {
- throw new AccumuloException("Can't set up regex for scanner");
- }
- }
-
+
// Apply the configured iterators from the job to the scanner
protected void setupIterators(TaskAttemptContext attempt, Scanner scanner) throws AccumuloException {
List<AccumuloIterator> iterators = getIterators(attempt);
@@ -660,7 +553,6 @@ public abstract class InputFormatBase<K,
scanner = new ClientSideIteratorScanner(scanner);
}
setupMaxVersions(attempt, scanner);
- setupRegex(attempt, scanner);
setupIterators(attempt, scanner);
} catch (Exception e) {
throw new IOException(e);
@@ -733,12 +625,7 @@ public abstract class InputFormatBase<K,
while (!tl.binRanges(ranges, binnedRanges).isEmpty()) {
log.warn("Unable to locate bins for specified ranges. Retrying.");
UtilWaitThread.sleep(100 + (int) (Math.random() * 100)); // sleep
- // randomly
- // between
- // 100
- // and
- // 200
- // ms
+ // randomly between 100 and 200 ms
}
} catch (Exception e) {
throw new IOException(e);
@@ -756,8 +643,7 @@ public abstract class InputFormatBase<K,
Range ke = extentRanges.getKey().toDataRange();
for (Range r : extentRanges.getValue()) {
if (autoAdjust) {
- // divide ranges into smaller ranges, based on the
- // tablets
+ // divide ranges into smaller ranges, based on the tablets
splits.add(new RangeInputSplit(tableName, ke.clip(r), new String[] {location}));
} else {
// don't divide ranges
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockAccumulo.java Wed Nov 16 19:40:34 2011
@@ -30,7 +30,6 @@ import org.apache.accumulo.core.security
import org.apache.accumulo.core.security.SystemPermission;
import org.apache.accumulo.core.security.TablePermission;
-@SuppressWarnings("deprecation")
public class MockAccumulo {
final Map<String,MockTable> tables = new HashMap<String,MockTable>();
final Map<String,String> systemProperties = new HashMap<String,String>();
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java Wed Nov 16 19:40:34 2011
@@ -39,6 +39,7 @@ public class MockConnector extends Conne
}
@SuppressWarnings("deprecation")
+ // Not really deprecated, just discouraging client use.
MockConnector(String username, MockAccumulo acu) {
this.username = username;
this.acu = acu;
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTable.java Wed Nov 16 19:40:34 2011
@@ -36,7 +36,6 @@ import org.apache.accumulo.core.iterator
import org.apache.accumulo.core.iterators.conf.PerColumnIteratorConfig;
import org.apache.accumulo.core.security.TablePermission;
-@SuppressWarnings("deprecation")
public class MockTable {
static class MockMemKey extends Key {
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java Wed Nov 16 19:40:34 2011
@@ -42,7 +42,6 @@ import org.apache.accumulo.core.util.Bul
import org.apache.commons.lang.NotImplementedException;
import org.apache.hadoop.io.Text;
-@SuppressWarnings("deprecation")
public class MockTableOperations extends TableOperationsHelper {
final private MockAccumulo acu;
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/map/MyMapFile.java Wed Nov 16 19:40:34 2011
@@ -113,7 +113,6 @@ public class MyMapFile {
private WritableComparable lastKey;
/** Create the named map for keys of the named class. */
- @SuppressWarnings("deprecation")
public Writer(Configuration conf, FileSystem fs, String dirName, Class keyClass, Class valClass) throws IOException {
this(conf, fs, dirName, WritableComparator.get(keyClass), valClass, MySequenceFile.getCompressionType(conf));
}
@@ -136,7 +135,6 @@ public class MyMapFile {
}
/** Create the named map using the named key comparator. */
- @SuppressWarnings("deprecation")
public Writer(Configuration conf, FileSystem fs, String dirName, WritableComparator comparator, Class valClass) throws IOException {
this(conf, fs, dirName, comparator, valClass, MySequenceFile.getCompressionType(conf));
}
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/rfile/PrintInfo.java Wed Nov 16 19:40:34 2011
@@ -38,6 +38,7 @@ public class PrintInfo {
public static void main(String[] args) throws Exception {
Configuration conf = new Configuration();
@SuppressWarnings("deprecation")
+ //Not for client use
FileSystem fs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration());
Options opts = new Options();
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/PrintInfo.java Wed Nov 16 19:40:34 2011
@@ -48,6 +48,7 @@ public class PrintInfo {
public static void main(String[] args) throws Exception {
Configuration conf = new Configuration();
@SuppressWarnings("deprecation")
+ // Not for client use
FileSystem fs = FileUtil.getFileSystem(conf, AccumuloConfiguration.getSiteConfiguration());
Path path = new Path(args[0]);
printMetaBlockInfo(conf, fs, path);
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java Wed Nov 16 19:40:34 2011
@@ -37,6 +37,7 @@ import org.apache.accumulo.core.iterator
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
+
/*
* A SortedKeyValueIterator that combines the Values for different versions of a Key into a single Value.
* Combiner will replace one or more versions of a Key and their Values with the most recent Key and a Value which is the result of the reduce method.
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=1202855&r1=1202854&r2=1202855&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 Wed Nov 16 19:40:34 2011
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.accumulo.core.client.IteratorSetting;
-import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.data.ByteSequence;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.PartialKey;
@@ -45,16 +44,6 @@ public class FirstEntryInRowIterator ext
private int numscans;
/**
- * @deprecated since 1.4, use {@link #setNumScansBeforeSeek(IteratorSetting, int)}
- * @param scanner
- * @param iteratorName
- * @param num
- */
- public static void setNumScansBeforeSeek(Scanner scanner, String iteratorName, int num) {
- scanner.setScanIteratorOption(iteratorName, NUM_SCANS_STRING_NAME, Integer.toString(num));
- }
-
- /**
* convenience method to set the option to optimize the frequency of scans vs. seeks
*/
public static void setNumScansBeforeSeek(IteratorSetting cfg, int num) {
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java Wed Nov 16 19:40:34 2011
@@ -38,8 +38,6 @@ import org.apache.accumulo.start.classlo
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
import org.apache.log4j.Logger;
-
-@SuppressWarnings("deprecation")
public class IteratorUtil {
private static final Logger log = Logger.getLogger(IteratorUtil.class);
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnSet.java Wed Nov 16 19:40:34 2011
@@ -24,8 +24,6 @@ import org.apache.accumulo.core.data.Key
import org.apache.accumulo.core.iterators.conf.ColumnUtil.ColFamHashKey;
import org.apache.accumulo.core.iterators.conf.ColumnUtil.ColHashKey;
import org.apache.hadoop.io.Text;
-
-@SuppressWarnings("deprecation")
public class ColumnSet {
private Set<ColFamHashKey> objectsCF;
private Set<ColHashKey> objectsCol;
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnToClassMapping.java Wed Nov 16 19:40:34 2011
@@ -26,7 +26,6 @@ import org.apache.accumulo.core.iterator
import org.apache.accumulo.start.classloader.AccumuloClassLoader;
import org.apache.hadoop.io.Text;
-@SuppressWarnings("deprecation")
public class ColumnToClassMapping<K> {
private HashMap<ColFamHashKey,K> objectsCF;
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/user/ColumnAgeOffFilter.java Wed Nov 16 19:40:34 2011
@@ -28,7 +28,6 @@ import org.apache.accumulo.core.iterator
import org.apache.accumulo.core.iterators.conf.ColumnToClassMapping;
import org.apache.accumulo.core.iterators.conf.PerColumnIteratorConfig;
-@SuppressWarnings("deprecation")
public class ColumnAgeOffFilter extends Filter {
public ColumnAgeOffFilter() {}
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/iterators/user/RegExFilter.java Wed Nov 16 19:40:34 2011
@@ -21,6 +21,7 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.data.ByteSequence;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
@@ -156,4 +157,33 @@ public class RegExFilter extends Filter
return true;
}
+ /**
+ * Encode the terms to match against in the iterator
+ *
+ * @param si
+ * ScanIterator config to be updated
+ * @param rowTerm
+ * the pattern to match against the Key's row. Not used if null.
+ * @param cfTerm
+ * the pattern to match against the Key's column family. Not used if null.
+ * @param cqTerm
+ * the pattern to match against the Key's column qualifier. Not used if null.
+ * @param valueTerm
+ * the pattern to match against the Key's value. Not used if null.
+ * @param orFields
+ * if true, any of the non-null terms can match to return the entry
+ */
+ public static void setRegexs(IteratorSetting si, String rowTerm, String cfTerm, String cqTerm, String valueTerm, boolean orFields) {
+ if (rowTerm != null)
+ si.addOption(RegExFilter.ROW_REGEX, rowTerm);
+ if (cfTerm != null)
+ si.addOption(RegExFilter.COLF_REGEX, cfTerm);
+ if (cqTerm != null)
+ si.addOption(RegExFilter.COLQ_REGEX, cqTerm);
+ if (valueTerm != null)
+ si.addOption(RegExFilter.VALUE_REGEX, valueTerm);
+ if (orFields) {
+ si.addOption(RegExFilter.OR_FIELDS, "true");
+ }
+ }
}
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Wed Nov 16 19:40:34 2011
@@ -122,6 +122,7 @@ public class Shell {
private long lastUserActivity = System.currentTimeMillis();
@SuppressWarnings("deprecation")
+ // Not for client use
public void config(String... args) {
Options opts = new Options();
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java Wed Nov 16 19:40:34 2011
@@ -46,7 +46,6 @@ import org.apache.commons.cli.Options;
import org.apache.commons.codec.binary.Base64;
import org.apache.hadoop.io.Text;
-@SuppressWarnings("deprecation")
public class CreateTableCommand extends Command {
private Option createTableOptCopySplits;
private Option createTableOptCopyConfig;
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/EGrepCommand.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/EGrepCommand.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/EGrepCommand.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/EGrepCommand.java Wed Nov 16 19:40:34 2011
@@ -20,7 +20,7 @@ import java.io.IOException;
import org.apache.accumulo.core.client.BatchScanner;
import org.apache.accumulo.core.client.IteratorSetting;
-import org.apache.accumulo.core.iterators.RegExIterator;
+import org.apache.accumulo.core.iterators.user.RegExFilter;
public class EGrepCommand extends GrepCommand {
@Override
@@ -28,8 +28,8 @@ public class EGrepCommand extends GrepCo
if (prio < 0)
throw new IllegalArgumentException("Priority < 0 " + prio);
- IteratorSetting si = new IteratorSetting(prio, name, RegExIterator.class);
- RegExIterator.setRegexs(si, term, term, term, term, true);
+ IteratorSetting si = new IteratorSetting(prio, name, RegExFilter.class);
+ RegExFilter.setRegexs(si, term, term, term, term, true);
scanner.addScanIterator(si);
}
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java Wed Nov 16 19:40:34 2011
@@ -29,18 +29,18 @@ import org.apache.accumulo.core.client.A
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.iterators.AggregatingIterator;
-import org.apache.accumulo.core.iterators.NoLabelIterator;
+import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
import org.apache.accumulo.core.iterators.OptionDescriber;
-import org.apache.accumulo.core.iterators.RegExIterator;
+import org.apache.accumulo.core.iterators.OptionDescriber.IteratorOptions;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
import org.apache.accumulo.core.iterators.VersioningIterator;
-import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
-import org.apache.accumulo.core.iterators.OptionDescriber.IteratorOptions;
import org.apache.accumulo.core.iterators.aggregation.Aggregator;
import org.apache.accumulo.core.iterators.user.AgeOffFilter;
+import org.apache.accumulo.core.iterators.user.NoVisFilter;
+import org.apache.accumulo.core.iterators.user.RegExFilter;
import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.core.util.shell.ShellCommandException;
import org.apache.accumulo.core.util.shell.Shell.Command;
+import org.apache.accumulo.core.util.shell.ShellCommandException;
import org.apache.accumulo.core.util.shell.ShellCommandException.ErrorCode;
import org.apache.accumulo.start.classloader.AccumuloClassLoader;
import org.apache.commons.cli.CommandLine;
@@ -76,13 +76,13 @@ public class SetIterCommand extends Comm
if (cl.hasOption(aggTypeOpt.getOpt())) {
classname = AggregatingIterator.class.getName();
} else if (cl.hasOption(regexTypeOpt.getOpt()))
- classname = RegExIterator.class.getName();
+ classname = RegExFilter.class.getName();
else if (cl.hasOption(ageoffTypeOpt.getOpt()))
classname = AgeOffFilter.class.getName();
else if (cl.hasOption(versionTypeOpt.getOpt()))
classname = VersioningIterator.class.getName();
else if (cl.hasOption(nolabelTypeOpt.getOpt()))
- classname = NoLabelIterator.class.getName();
+ classname = NoVisFilter.class.getName();
if (!shellState.getConnector().instanceOperations().testClassLoad(classname, SortedKeyValueIterator.class.getName()))
throw new ShellCommandException(ErrorCode.INITIALIZATION_FAILURE, "Servers are unable to load " + classname + " as type "
Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/admin/TableOperationsHelperTest.java Wed Nov 16 19:40:34 2011
@@ -43,7 +43,6 @@ import org.apache.hadoop.io.Text;
import org.junit.Assert;
import org.junit.Test;
-@SuppressWarnings("deprecation")
public class TableOperationsHelperTest {
static class Tester extends TableOperationsHelper {
Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java Wed Nov 16 19:40:34 2011
@@ -28,12 +28,12 @@ import org.apache.accumulo.core.client.I
import org.apache.accumulo.core.client.mapreduce.InputFormatBase.AccumuloIterator;
import org.apache.accumulo.core.client.mapreduce.InputFormatBase.AccumuloIteratorOption;
import org.apache.accumulo.core.client.mapreduce.InputFormatBase.RangeInputSplit;
-import org.apache.accumulo.core.client.mapreduce.InputFormatBase.RegexType;
import org.apache.accumulo.core.client.mock.MockInstance;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.WholeRowIterator;
+import org.apache.accumulo.core.iterators.user.RegExFilter;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.Text;
@@ -91,12 +91,11 @@ public class AccumuloInputFormatTest {
/**
* Check that the iterator configuration is getting stored in the Job conf correctly.
*/
- @SuppressWarnings("deprecation")
@Test
public void testSetIterator() {
JobContext job = new JobContext(new Configuration(), new JobID());
- AccumuloInputFormat.setIterator(job, 1, "org.apache.accumulo.core.iterators.WholeRowIterator", "WholeRow");
+ AccumuloInputFormat.addIterator(job, new IteratorSetting(1, "WholeRow", "org.apache.accumulo.core.iterators.WholeRowIterator"));
Configuration conf = job.getConfiguration();
String iterators = conf.get("AccumuloInputFormat.iterators");
assertEquals("1:org.apache.accumulo.core.iterators.WholeRowIterator:WholeRow", iterators);
@@ -147,14 +146,13 @@ public class AccumuloInputFormatTest {
/**
* Test getting iterator settings for multiple iterators set
*/
- @SuppressWarnings("deprecation")
@Test
public void testGetIteratorSettings() {
JobContext job = new JobContext(new Configuration(), new JobID());
- AccumuloInputFormat.setIterator(job, 1, "org.apache.accumulo.core.iterators.WholeRowIterator", "WholeRow");
- AccumuloInputFormat.setIterator(job, 2, "org.apache.accumulo.core.iterators.VersioningIterator", "Versions");
- AccumuloInputFormat.setIterator(job, 3, "org.apache.accumulo.core.iterators.CountingIterator", "Count");
+ AccumuloInputFormat.addIterator(job, new IteratorSetting(1, "WholeRow", "org.apache.accumulo.core.iterators.WholeRowIterator"));
+ AccumuloInputFormat.addIterator(job, new IteratorSetting(2, "Versions", "org.apache.accumulo.core.iterators.VersioningIterator"));
+ AccumuloInputFormat.addIterator(job, new IteratorSetting(3, "Count", "org.apache.accumulo.core.iterators.CountingIterator"));
List<AccumuloIterator> list = AccumuloInputFormat.getIterators(job);
@@ -179,64 +177,17 @@ public class AccumuloInputFormatTest {
}
- /**
- * Check that the iterator options are getting stored in the Job conf correctly.
- */
- @SuppressWarnings("deprecation")
- @Test
- public void testSetIteratorOption() {
- JobContext job = new JobContext(new Configuration(), new JobID());
- AccumuloInputFormat.setIteratorOption(job, "someIterator", "aKey", "aValue");
-
- Configuration conf = job.getConfiguration();
- String options = conf.get("AccumuloInputFormat.iterators.options");
- assertEquals(new String("someIterator:aKey:aValue"), options);
- }
-
- /**
- * Test getting iterator options for multiple options set
- */
- @SuppressWarnings("deprecation")
- @Test
- public void testGetIteratorOption() {
- JobContext job = new JobContext(new Configuration(), new JobID());
-
- AccumuloInputFormat.setIteratorOption(job, "iterator1", "key1", "value1");
- AccumuloInputFormat.setIteratorOption(job, "iterator2", "key2", "value2");
- AccumuloInputFormat.setIteratorOption(job, "iterator3", "key3", "value3");
-
- List<AccumuloIteratorOption> list = AccumuloInputFormat.getIteratorOptions(job);
-
- // Check the list size
- assertEquals(3, list.size());
-
- // Walk the list and make sure all the options are correct
- AccumuloIteratorOption option = list.get(0);
- assertEquals("iterator1", option.getIteratorName());
- assertEquals("key1", option.getKey());
- assertEquals("value1", option.getValue());
-
- option = list.get(1);
- assertEquals("iterator2", option.getIteratorName());
- assertEquals("key2", option.getKey());
- assertEquals("value2", option.getValue());
-
- option = list.get(2);
- assertEquals("iterator3", option.getIteratorName());
- assertEquals("key3", option.getKey());
- assertEquals("value3", option.getValue());
- }
-
- @SuppressWarnings("deprecation")
@Test
public void testSetRegex() {
JobContext job = new JobContext(new Configuration(), new JobID());
String regex = ">\"*%<>\'\\";
- AccumuloInputFormat.setRegex(job, RegexType.ROW, regex);
+ IteratorSetting is = new IteratorSetting(50, regex, RegExFilter.class);
+ RegExFilter.setRegexs(is, regex, null, null, null, false);
+ AccumuloInputFormat.addIterator(job, is);
- assertTrue(regex.equals(AccumuloInputFormat.getRegex(job, RegexType.ROW)));
+ assertTrue(regex.equals(AccumuloInputFormat.getIterators(job).get(0).getIteratorName()));
}
static class TestMapper extends Mapper<Key,Value,Key,Value> {
Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfigurationTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfigurationTest.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfigurationTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorConfigurationTest.java Wed Nov 16 19:40:34 2011
@@ -21,7 +21,6 @@ import junit.framework.TestCase;
import org.apache.accumulo.core.iterators.conf.PerColumnIteratorConfig;
import org.apache.hadoop.io.Text;
-@SuppressWarnings("deprecation")
public class AggregatorConfigurationTest extends TestCase {
public void testBinary() {
Text colf = new Text();
Modified: incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/filter/ColumnFilterTest.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/filter/ColumnFilterTest.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/filter/ColumnFilterTest.java (original)
+++ incubator/accumulo/trunk/src/core/src/test/java/org/apache/accumulo/core/iterators/filter/ColumnFilterTest.java Wed Nov 16 19:40:34 2011
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
import org.apache.accumulo.core.data.Column;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.filter.ColumnQualifierFilter;
+import org.apache.accumulo.core.iterators.system.ColumnQualifierFilter;
import org.apache.hadoop.io.Text;
public class ColumnFilterTest extends TestCase {
@@ -45,7 +45,7 @@ public class ColumnFilterTest extends Te
columns.add(nc("cf1"));
- ColumnQualifierFilter cf = new ColumnQualifierFilter(columns);
+ ColumnQualifierFilter cf = new ColumnQualifierFilter(null, columns);
assertTrue(cf.accept(nk("r1", "cf1", "cq1"), new Value(new byte[0])));
assertTrue(cf.accept(nk("r1", "cf2", "cq1"), new Value(new byte[0])));
@@ -58,7 +58,7 @@ public class ColumnFilterTest extends Te
columns.add(nc("cf1"));
columns.add(nc("cf2", "cq1"));
- ColumnQualifierFilter cf = new ColumnQualifierFilter(columns);
+ ColumnQualifierFilter cf = new ColumnQualifierFilter(null, columns);
assertTrue(cf.accept(nk("r1", "cf1", "cq1"), new Value(new byte[0])));
assertTrue(cf.accept(nk("r1", "cf2", "cq1"), new Value(new byte[0])));
@@ -70,7 +70,7 @@ public class ColumnFilterTest extends Te
columns.add(nc("cf2", "cq1"));
- ColumnQualifierFilter cf = new ColumnQualifierFilter(columns);
+ ColumnQualifierFilter cf = new ColumnQualifierFilter(null, columns);
assertFalse(cf.accept(nk("r1", "cf1", "cq1"), new Value(new byte[0])));
assertTrue(cf.accept(nk("r1", "cf2", "cq1"), new Value(new byte[0])));
Modified: incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/QueryUtil.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/QueryUtil.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/QueryUtil.java (original)
+++ incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/dirlist/QueryUtil.java Wed Nov 16 19:40:34 2011
@@ -31,8 +31,8 @@ import org.apache.accumulo.core.client.Z
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.aggregation.LongSummation;
+import org.apache.accumulo.core.iterators.user.RegExFilter;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.hadoop.io.Text;
@@ -184,8 +184,8 @@ public class QueryUtil {
System.out.println("executing middle wildcard search for " + regexString + " from entries ending with " + lastPart);
scanner.setRange(Range.prefix(getReverseIndex(lastPart)));
}
- IteratorSetting regex = new IteratorSetting(50, "regex", RegExIterator.class);
- RegExIterator.setRegexs(regex, null, null, regexString, null, false);
+ IteratorSetting regex = new IteratorSetting(50, "regex", RegExFilter.class);
+ RegExFilter.setRegexs(regex, null, null, regexString, null, false);
scanner.addScanIterator(regex);
return scanner;
}
Modified: incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/mapreduce/RegexExample.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/mapreduce/RegexExample.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/mapreduce/RegexExample.java (original)
+++ incubator/accumulo/trunk/src/examples/src/main/java/org/apache/accumulo/examples/mapreduce/RegexExample.java Wed Nov 16 19:40:34 2011
@@ -22,7 +22,7 @@ import org.apache.accumulo.core.client.I
import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.RegExIterator;
+import org.apache.accumulo.core.iterators.user.RegExFilter;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.util.CachedConfiguration;
import org.apache.hadoop.conf.Configured;
@@ -48,8 +48,8 @@ public class RegexExample extends Config
AccumuloInputFormat.setZooKeeperInstance(job, args[0], args[1]);
AccumuloInputFormat.setInputInfo(job, args[2], args[3].getBytes(), args[4], new Authorizations());
- IteratorSetting regex = new IteratorSetting(50, "regex", RegExIterator.class);
- RegExIterator.setRegexs(regex, args[5], args[6], args[7], args[8], false);
+ IteratorSetting regex = new IteratorSetting(50, "regex", RegExFilter.class);
+ RegExFilter.setRegexs(regex, args[5], args[6], args[7], args[8], false);
AccumuloInputFormat.addIterator(job, regex);
job.setMapperClass(RegexMapper.class);
Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/client/HdfsZooInstance.java Wed Nov 16 19:40:34 2011
@@ -141,12 +141,14 @@ public class HdfsZooInstance implements
@SuppressWarnings("deprecation")
@Override
+ // Not really deprecated, just not for client use
public Connector getConnector(String user, byte[] pass) throws AccumuloException, AccumuloSecurityException {
return new ConnectorImpl(this, user, pass);
}
- @Override
@SuppressWarnings("deprecation")
+ @Override
+ // Not really deprecated, just not for client use
public Connector getConnector(String user, ByteBuffer pass) throws AccumuloException, AccumuloSecurityException {
return new ConnectorImpl(this, user, ByteBufferUtil.toBytes(pass));
}
Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/master/CoordinateRecoveryTask.java Wed Nov 16 19:40:34 2011
@@ -312,6 +312,7 @@ public class CoordinateRecoveryTask impl
try {
Configuration conf = CachedConfiguration.getInstance();
@SuppressWarnings("deprecation")
+ // No alternative api in hadoop 20
JobClient jc = new JobClient(new org.apache.hadoop.mapred.JobConf(conf));
for (JobStatus status : jc.getAllJobs()) {
if (!status.isJobComplete()) {
Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/DefaultServlet.java Wed Nov 16 19:40:34 2011
@@ -323,7 +323,9 @@ public class DefaultServlet extends Basi
sb.append("<table>\n");
try {
InetSocketAddress address = JobTracker.getAddress(conf);
+
@SuppressWarnings("deprecation")
+ // No alternative api in hadoop 20
JobClient jc = new JobClient(new org.apache.hadoop.mapred.JobConf(conf));
String httpAddress = conf.get("mapred.job.tracker.http.address");
String port = httpAddress.split(":")[1];
Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/NullScanner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/NullScanner.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/NullScanner.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/monitor/servlets/trace/NullScanner.java Wed Nov 16 19:40:34 2011
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.server.monitor.servlets.trace;
-import java.io.IOException;
import java.util.Iterator;
import java.util.Map.Entry;
@@ -30,33 +29,12 @@ import org.apache.hadoop.io.Text;
public class NullScanner implements Scanner {
@Override
- public void setScanIterators(int priority, String iteratorClass, String iteratorName) {}
-
- @Override
public void addScanIterator(IteratorSetting cfg) {}
-
- @Override
- public void setScanIteratorOption(String iteratorName, String key, String value) {}
-
+
@Override
public void updateScanIteratorOption(String iteratorName, String key, String value) {}
@Override
- public void setupRegex(String iteratorName, int iteratorPriority) throws IOException {}
-
- @Override
- public void setRowRegex(String regex) {}
-
- @Override
- public void setColumnFamilyRegex(String regex) {}
-
- @Override
- public void setColumnQualifierRegex(String regex) {}
-
- @Override
- public void setValueRegex(String regex) {}
-
- @Override
public void fetchColumnFamily(Text col) {}
@Override
Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousStatsCollector.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousStatsCollector.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousStatsCollector.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/continuous/ContinuousStatsCollector.java Wed Nov 16 19:40:34 2011
@@ -160,6 +160,7 @@ public class ContinuousStatsCollector {
private static String getMRStats() throws Exception {
Configuration conf = CachedConfiguration.getInstance();
@SuppressWarnings("deprecation")
+ // No alternatives for hadoop 20
JobClient jc = new JobClient(new org.apache.hadoop.mapred.JobConf(conf));
ClusterStatus cs = jc.getClusterStatus(false);
Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/bulk/Setup.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/bulk/Setup.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/bulk/Setup.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/bulk/Setup.java Wed Nov 16 19:40:34 2011
@@ -36,7 +36,6 @@ import org.apache.accumulo.server.test.r
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.io.Text;
-@SuppressWarnings("deprecation")
public class Setup extends Test {
private static final int CORE_POOL_SIZE = 8;
Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/DeleteSomeDocs.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/DeleteSomeDocs.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/DeleteSomeDocs.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/DeleteSomeDocs.java Wed Nov 16 19:40:34 2011
@@ -25,7 +25,7 @@ import org.apache.accumulo.core.Constant
import org.apache.accumulo.core.client.BatchDeleter;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.iterators.RegExIterator;
+import org.apache.accumulo.core.iterators.user.RegExFilter;
import org.apache.accumulo.server.test.randomwalk.State;
import org.apache.accumulo.server.test.randomwalk.Test;
@@ -52,8 +52,8 @@ public class DeleteSomeDocs extends Test
BatchDeleter ibd = state.getConnector().createBatchDeleter(indexTableName, Constants.NO_AUTHS, 8, 100000000, 60000, 3);
ibd.setRanges(Collections.singletonList(new Range()));
- IteratorSetting iterSettings = new IteratorSetting(100, RegExIterator.class);
- RegExIterator.setRegexs(iterSettings, null, null, pattern, null, false);
+ IteratorSetting iterSettings = new IteratorSetting(100, RegExFilter.class);
+ RegExFilter.setRegexs(iterSettings, null, null, pattern, null, false);
ibd.addScanIterator(iterSettings);
@@ -64,8 +64,8 @@ public class DeleteSomeDocs extends Test
BatchDeleter dbd = state.getConnector().createBatchDeleter(dataTableName, Constants.NO_AUTHS, 8, 100000000, 60000, 3);
dbd.setRanges(Collections.singletonList(new Range()));
- iterSettings = new IteratorSetting(100, RegExIterator.class);
- RegExIterator.setRegexs(iterSettings, pattern, null, null, null, false);
+ iterSettings = new IteratorSetting(100, RegExFilter.class);
+ RegExFilter.setRegexs(iterSettings, pattern, null, null, null, false);
dbd.addScanIterator(iterSettings);
Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/Grep.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/Grep.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/Grep.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/Grep.java Wed Nov 16 19:40:34 2011
@@ -30,7 +30,7 @@ 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.IntersectingIterator;
-import org.apache.accumulo.core.iterators.RegExIterator;
+import org.apache.accumulo.core.iterators.user.RegExFilter;
import org.apache.accumulo.server.test.randomwalk.State;
import org.apache.accumulo.server.test.randomwalk.Test;
import org.apache.hadoop.io.Text;
@@ -69,8 +69,8 @@ public class Grep extends Test {
bs = state.getConnector().createBatchScanner(dataTableName, Constants.NO_AUTHS, 16);
for (int i = 0; i < words.length; i++) {
- IteratorSetting more = new IteratorSetting(20 + i, "ii" + i, RegExIterator.class);
- RegExIterator.setRegexs(more, null, null, null, "(^|(.*\\s))" + words[i] + "($|(\\s.*))", false);
+ IteratorSetting more = new IteratorSetting(20 + i, "ii" + i, RegExFilter.class);
+ RegExFilter.setRegexs(more, null, null, null, "(^|(.*\\s))" + words[i] + "($|(\\s.*))", false);
bs.addScanIterator(more);
}
Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/trace/TraceFileSystem.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/trace/TraceFileSystem.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/trace/TraceFileSystem.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/trace/TraceFileSystem.java Wed Nov 16 19:40:34 2011
@@ -228,14 +228,13 @@ public class TraceFileSystem extends Fil
}
}
- @SuppressWarnings("deprecation")
@Override
public short getReplication(Path src) throws IOException {
Span span = Trace.start("getReplication");
if (Trace.isTracing())
span.data("path", src.toString());
try {
- return impl.getReplication(src);
+ return impl.getFileStatus(src).getReplication();
} finally {
span.stop();
}
Modified: incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/util/OfflineMetadataScanner.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/util/OfflineMetadataScanner.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/util/OfflineMetadataScanner.java (original)
+++ incubator/accumulo/trunk/src/server/src/main/java/org/apache/accumulo/server/util/OfflineMetadataScanner.java Wed Nov 16 19:40:34 2011
@@ -242,11 +242,6 @@ public class OfflineMetadataScanner exte
}
@Override
- public void setScanIterators(int priority, String iteratorClass, String iteratorName) {
- throw new UnsupportedOperationException();
- }
-
- @Override
public void enableIsolation() {
// should always give an isolated view since it is scanning immutable files
}
Modified: incubator/accumulo/trunk/src/trace/src/main/java/cloudtrace/instrument/receivers/ZooSpanClient.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/trace/src/main/java/cloudtrace/instrument/receivers/ZooSpanClient.java?rev=1202855&r1=1202854&r2=1202855&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/trace/src/main/java/cloudtrace/instrument/receivers/ZooSpanClient.java (original)
+++ incubator/accumulo/trunk/src/trace/src/main/java/cloudtrace/instrument/receivers/ZooSpanClient.java Wed Nov 16 19:40:34 2011
@@ -26,7 +26,6 @@ import org.apache.log4j.Logger;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.Watcher.Event.EventType;
import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.ZooKeeper.States;