You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by cj...@apache.org on 2013/10/15 23:07:19 UTC
[1/4] git commit: ACCUMULO-1776 Synchronizing methods that manipulate
the list of tablet server processes
Updated Branches:
refs/heads/master 5413543ae -> 611463972
ACCUMULO-1776 Synchronizing methods that manipulate the list of tablet server processes
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5d1e7b8b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5d1e7b8b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5d1e7b8b
Branch: refs/heads/master
Commit: 5d1e7b8b59c7ae6140b13f2deaa675e5a44187a7
Parents: 5413543
Author: Corey J. Nolet <cj...@gmail.com>
Authored: Sat Oct 12 21:12:56 2013 -0400
Committer: Corey J. Nolet <cj...@gmail.com>
Committed: Tue Oct 15 16:58:39 2013 -0400
----------------------------------------------------------------------
.../minicluster/MiniAccumuloCluster.java | 29 ++++++++++++--------
1 file changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d1e7b8b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
index a3bd8d5..1cb8f04 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/MiniAccumuloCluster.java
@@ -431,9 +431,10 @@ public class MiniAccumuloCluster {
}
initialized = true;
}
-
- for (int i = tabletServerProcesses.size(); i < config.getNumTservers(); i++) {
- tabletServerProcesses.add(exec(TabletServer.class, ServerType.TABLET_SERVER));
+ synchronized (tabletServerProcesses) {
+ for (int i = tabletServerProcesses.size(); i < config.getNumTservers(); i++) {
+ tabletServerProcesses.add(exec(TabletServer.class, ServerType.TABLET_SERVER));
+ }
}
int ret = 0;
for (int i = 0; i < 5; i++) {
@@ -495,12 +496,14 @@ public class MiniAccumuloCluster {
}
break;
case TABLET_SERVER:
- for (Process tserver : tabletServerProcesses) {
- if (proc.equals(tserver)) {
- tabletServerProcesses.remove(tserver);
- tserver.destroy();
- found = true;
- break;
+ synchronized (tabletServerProcesses) {
+ for (Process tserver : tabletServerProcesses) {
+ if (proc.equals(tserver)) {
+ tabletServerProcesses.remove(tserver);
+ tserver.destroy();
+ found = true;
+ break;
+ }
}
}
break;
@@ -552,9 +555,11 @@ public class MiniAccumuloCluster {
if (masterProcess != null) {
masterProcess.destroy();
}
- if (tabletServerProcesses != null) {
- for (Process tserver : tabletServerProcesses) {
- tserver.destroy();
+ synchronized (tabletServerProcesses) {
+ if (tabletServerProcesses != null) {
+ for (Process tserver : tabletServerProcesses) {
+ tserver.destroy();
+ }
}
}
if (gcProcess != null) {
[2/4] git commit: ACCUMULO-1751 Adding initial SimpleMacIT test for
AccumuloInputFormat
Posted by cj...@apache.org.
ACCUMULO-1751 Adding initial SimpleMacIT test for AccumuloInputFormat
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eb7d45ba
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eb7d45ba
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eb7d45ba
Branch: refs/heads/master
Commit: eb7d45ba28a054771818cd34fbd91e63f0604d35
Parents: 5d1e7b8
Author: Corey J. Nolet <cj...@gmail.com>
Authored: Sat Oct 12 22:50:38 2013 -0400
Committer: Corey J. Nolet <cj...@gmail.com>
Committed: Tue Oct 15 16:58:40 2013 -0400
----------------------------------------------------------------------
.../test/functional/AccumuloInputFormatIT.java | 75 ++++++++++++++++++++
1 file changed, 75 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/eb7d45ba/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
new file mode 100644
index 0000000..bfb7b86
--- /dev/null
+++ b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
@@ -0,0 +1,75 @@
+package org.apache.accumulo.test.functional;
+
+import static java.lang.System.currentTimeMillis;
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+import java.util.TreeSet;
+
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.BatchWriter;
+import org.apache.accumulo.core.client.TableExistsException;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
+import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.core.data.Mutation;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.mapreduce.InputSplit;
+import org.apache.hadoop.mapreduce.Job;
+import org.junit.Test;
+
+public class AccumuloInputFormatIT extends SimpleMacIT {
+
+ @Test
+ public void testGetSplits() throws IOException, AccumuloSecurityException, AccumuloException, TableNotFoundException, TableExistsException {
+
+ String table = getTableNames(1)[0];
+ getConnector().tableOperations().create(table);
+
+ // add data
+
+ // add splits
+
+ Job job = new Job();
+
+ // set up the job here
+ AccumuloInputFormat.setInputTableName(job, table);
+ AccumuloInputFormat.setZooKeeperInstance(job, getConnector().getInstance().getInstanceName(), getConnector().getInstance().getZooKeepers());
+ AccumuloInputFormat.setConnectorInfo(job, "root", new PasswordToken(ROOT_PASSWORD));
+
+ AccumuloInputFormat inputFormat = new AccumuloInputFormat();
+
+ insertData(table, currentTimeMillis());
+
+ TreeSet<Text> splitsToAdd = new TreeSet<Text>();
+ for (int i = 0; i < 10000; i += 1000)
+ splitsToAdd.add(new Text(String.format("%09d", i)));
+
+ getConnector().tableOperations().addSplits(table, splitsToAdd);
+
+ UtilWaitThread.sleep(5000);
+ Collection<Text> actualSplits = getConnector().tableOperations().listSplits(table);
+
+ List<InputSplit> splits = inputFormat.getSplits(job);
+ assertEquals(actualSplits.size(), splits.size());
+
+ }
+
+ private void insertData(String tableName, long ts) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
+ BatchWriter bw = getConnector().createBatchWriter(tableName, null);
+
+ for (int i = 0; i < 10000; i++) {
+ String row = String.format("%09d", i);
+
+ Mutation m = new Mutation(new Text(row));
+ m.put(new Text("cf1"), new Text("cq1"), ts, new Value(("" + i).getBytes()));
+ bw.addMutation(m);
+ }
+ bw.close();
+ }
+}
[4/4] git commit: ACCUMULO-1751 Fixing off by one error.
ACCUMULO-1730 Missing ) in test
Posted by cj...@apache.org.
ACCUMULO-1751 Fixing off by one error.
ACCUMULO-1730 Missing ) in test
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/61146397
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/61146397
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/61146397
Branch: refs/heads/master
Commit: 611463972a52feab96156012c4a9d75c8df3d882
Parents: d399fc2
Author: Corey J. Nolet <cj...@gmail.com>
Authored: Tue Oct 15 17:04:54 2013 -0400
Committer: Corey J. Nolet <cj...@gmail.com>
Committed: Tue Oct 15 17:04:54 2013 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/security/ColumnVisibilityTest.java | 2 +-
.../org/apache/accumulo/test/functional/AccumuloInputFormatIT.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/61146397/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java b/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
index b5f08a2..c963688 100644
--- a/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
@@ -151,7 +151,7 @@ public class ColumnVisibilityTest {
@Test
public void testParseTree() {
- Node node = parse("(W)|(U&V)";
+ Node node = parse("(W)|(U&V)");
assertNode(node, NodeType.OR, 3, 4);
assertNode(node.getChildren().get(0), NodeType.TERM, 1, 2);
assertNode(node.getChildren().get(1), NodeType.AND, 6, 7);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/61146397/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
index bfb7b86..b4258c5 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
@@ -56,7 +56,7 @@ public class AccumuloInputFormatIT extends SimpleMacIT {
Collection<Text> actualSplits = getConnector().tableOperations().listSplits(table);
List<InputSplit> splits = inputFormat.getSplits(job);
- assertEquals(actualSplits.size(), splits.size());
+ assertEquals(actualSplits.size()+1, splits.size());
}
[3/4] git commit: ACCUMULO-391 Removing deprecation from single-table
methods
Posted by cj...@apache.org.
ACCUMULO-391 Removing deprecation from single-table methods
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d399fc25
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d399fc25
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d399fc25
Branch: refs/heads/master
Commit: d399fc251dcda64d184e7ec0ee0f29317d496f16
Parents: eb7d45b
Author: Corey J. Nolet <cj...@gmail.com>
Authored: Sat Oct 12 23:08:00 2013 -0400
Committer: Corey J. Nolet <cj...@gmail.com>
Committed: Tue Oct 15 16:58:40 2013 -0400
----------------------------------------------------------------------
.../core/client/mapred/InputFormatBase.java | 32 ------------------
.../core/client/mapreduce/InputFormatBase.java | 33 -------------------
.../mapreduce/lib/util/InputConfigurator.java | 34 --------------------
3 files changed, 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d399fc25/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
index ae51581..78fa1bc 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/InputFormatBase.java
@@ -264,9 +264,7 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
* @param tableName
* the table to use when the tablename is null in the write call
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void setInputTableName(JobConf job, String tableName) {
InputConfigurator.setInputTableName(CLASS, job, tableName);
}
@@ -279,9 +277,7 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
* @return the table name
* @since 1.5.0
* @see #setInputTableName(JobConf, String)
- * @deprecated since 1.6.0
*/
- @Deprecated
protected static String getInputTableName(JobConf job) {
return InputConfigurator.getInputTableName(CLASS, job);
}
@@ -320,9 +316,7 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
* @param ranges
* the ranges that will be mapped over
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void setRanges(JobConf job, Collection<Range> ranges) {
InputConfigurator.setRanges(CLASS, job, ranges);
}
@@ -337,9 +331,7 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
* if the ranges have been encoded improperly
* @since 1.5.0
* @see #setRanges(JobConf, Collection)
- * @deprecated since 1.6.0
*/
- @Deprecated
protected static List<Range> getRanges(JobConf job) throws IOException {
return InputConfigurator.getRanges(CLASS, job);
}
@@ -353,9 +345,7 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
* a pair of {@link Text} objects corresponding to column family and column qualifier. If the column qualifier is null, the entire column family is
* selected. An empty set is the default and is equivalent to scanning the all columns.
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void fetchColumns(JobConf job, Collection<Pair<Text,Text>> columnFamilyColumnQualifierPairs) {
InputConfigurator.fetchColumns(CLASS, job, columnFamilyColumnQualifierPairs);
}
@@ -368,9 +358,7 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
* @return a set of columns
* @since 1.5.0
* @see #fetchColumns(JobConf, Collection)
- * @deprecated since 1.6.0
*/
- @Deprecated
protected static Set<Pair<Text,Text>> getFetchedColumns(JobConf job) {
return InputConfigurator.getFetchedColumns(CLASS, job);
}
@@ -383,9 +371,7 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
* @param cfg
* the configuration of the iterator
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void addIterator(JobConf job, IteratorSetting cfg) {
InputConfigurator.addIterator(CLASS, job, cfg);
}
@@ -398,9 +384,7 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
* @return a list of iterators
* @since 1.5.0
* @see #addIterator(JobConf, IteratorSetting)
- * @deprecated since 1.6.0
*/
- @Deprecated
protected static List<IteratorSetting> getIterators(JobConf job) {
return InputConfigurator.getIterators(CLASS, job);
}
@@ -418,9 +402,7 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
* the feature is enabled if true, disabled otherwise
* @see #setRanges(JobConf, Collection)
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void setAutoAdjustRanges(JobConf job, boolean enableFeature) {
InputConfigurator.setAutoAdjustRanges(CLASS, job, enableFeature);
}
@@ -433,9 +415,7 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
* @return false if the feature is disabled, true otherwise
* @since 1.5.0
* @see #setAutoAdjustRanges(JobConf, boolean)
- * @deprecated since 1.6.0
*/
- @Deprecated
protected static boolean getAutoAdjustRanges(JobConf job) {
return InputConfigurator.getAutoAdjustRanges(CLASS, job);
}
@@ -451,9 +431,7 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
* @param enableFeature
* the feature is enabled if true, disabled otherwise
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void setScanIsolation(JobConf job, boolean enableFeature) {
InputConfigurator.setScanIsolation(CLASS, job, enableFeature);
}
@@ -466,9 +444,7 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
* @return true if the feature is enabled, false otherwise
* @since 1.5.0
* @see #setScanIsolation(JobConf, boolean)
- * @deprecated since 1.6.0
*/
- @Deprecated
protected static boolean isIsolated(JobConf job) {
return InputConfigurator.isIsolated(CLASS, job);
}
@@ -485,9 +461,7 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
* @param enableFeature
* the feature is enabled if true, disabled otherwise
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void setLocalIterators(JobConf job, boolean enableFeature) {
InputConfigurator.setLocalIterators(CLASS, job, enableFeature);
}
@@ -500,9 +474,7 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
* @return true if the feature is enabled, false otherwise
* @since 1.5.0
* @see #setLocalIterators(JobConf, boolean)
- * @deprecated since 1.6.0
*/
- @Deprecated
protected static boolean usesLocalIterators(JobConf job) {
return InputConfigurator.usesLocalIterators(CLASS, job);
}
@@ -537,9 +509,7 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
* @param enableFeature
* the feature is enabled if true, disabled otherwise
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void setOfflineTableScan(JobConf job, boolean enableFeature) {
InputConfigurator.setOfflineTableScan(CLASS, job, enableFeature);
}
@@ -552,9 +522,7 @@ public abstract class InputFormatBase<K,V> implements InputFormat<K,V> {
* @return true if the feature is enabled, false otherwise
* @since 1.5.0
* @see #setOfflineTableScan(JobConf, boolean)
- * @deprecated since 1.6.0
*/
- @Deprecated
protected static boolean isOfflineScan(JobConf job) {
return InputConfigurator.isOfflineScan(CLASS, job);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d399fc25/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
index d486abd..e2d6b33 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
@@ -168,9 +168,7 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
* @return the table name
* @since 1.5.0
* @see #setInputTableName(Job, String)
- * @deprecated since 1.6.0
*/
- @Deprecated
protected static String getInputTableName(JobContext context) {
return InputConfigurator.getInputTableName(CLASS, getConfiguration(context));
}
@@ -287,9 +285,7 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
* @param tableName
* the table to use when the tablename is null in the write call
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void setInputTableName(Job job, String tableName) {
InputConfigurator.setInputTableName(CLASS, job.getConfiguration(), tableName);
}
@@ -301,7 +297,6 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
* the Hadoop job instance to be configured
* @param auths
* the user's authorizations
- * @since 1.5.0
*/
public static void setScanAuthorizations(Job job, Authorizations auths) {
InputConfigurator.setScanAuthorizations(CLASS, job.getConfiguration(), auths);
@@ -328,9 +323,7 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
* @param ranges
* the ranges that will be mapped over
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void setRanges(Job job, Collection<Range> ranges) {
InputConfigurator.setRanges(CLASS, job.getConfiguration(), ranges);
}
@@ -344,9 +337,7 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
* @since 1.5.0
* @see #setRanges(Job, Collection)
* @see #setRanges(org.apache.hadoop.mapreduce.Job, java.util.Collection)
- * @deprecated since 1.6.0
*/
- @Deprecated
protected static List<Range> getRanges(JobContext context) throws IOException {
return InputConfigurator.getRanges(CLASS, getConfiguration(context));
}
@@ -360,9 +351,7 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
* a pair of {@link Text} objects corresponding to column family and column qualifier. If the column qualifier is null, the entire column family is
* selected. An empty set is the default and is equivalent to scanning the all columns.
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void fetchColumns(Job job, Collection<Pair<Text,Text>> columnFamilyColumnQualifierPairs) {
InputConfigurator.fetchColumns(CLASS, job.getConfiguration(), columnFamilyColumnQualifierPairs);
}
@@ -375,9 +364,7 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
* @return a set of columns
* @since 1.5.0
* @see #fetchColumns(Job, Collection)
- * @deprecated since 1.6.0
*/
- @Deprecated
protected static Set<Pair<Text,Text>> getFetchedColumns(JobContext context) {
return InputConfigurator.getFetchedColumns(CLASS, getConfiguration(context));
}
@@ -390,9 +377,7 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
* @param cfg
* the configuration of the iterator
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void addIterator(Job job, IteratorSetting cfg) {
InputConfigurator.addIterator(CLASS, job.getConfiguration(), cfg);
}
@@ -405,9 +390,7 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
* @return a list of iterators
* @since 1.5.0
* @see #addIterator(Job, IteratorSetting)
- * @deprecated since 1.6.0
*/
- @Deprecated
protected static List<IteratorSetting> getIterators(JobContext context) {
return InputConfigurator.getIterators(CLASS, getConfiguration(context));
}
@@ -425,9 +408,7 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
* the feature is enabled if true, disabled otherwise
* @see #setRanges(Job, Collection)
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void setAutoAdjustRanges(Job job, boolean enableFeature) {
InputConfigurator.setAutoAdjustRanges(CLASS, job.getConfiguration(), enableFeature);
}
@@ -440,9 +421,7 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
* @return false if the feature is disabled, true otherwise
* @since 1.5.0
* @see #setAutoAdjustRanges(Job, boolean)
- * @deprecated since 1.6.0
*/
- @Deprecated
protected static boolean getAutoAdjustRanges(JobContext context) {
return InputConfigurator.getAutoAdjustRanges(CLASS, getConfiguration(context));
}
@@ -507,9 +486,7 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
* @param enableFeature
* the feature is enabled if true, disabled otherwise
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void setScanIsolation(Job job, boolean enableFeature) {
InputConfigurator.setScanIsolation(CLASS, job.getConfiguration(), enableFeature);
}
@@ -522,9 +499,7 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
* @return true if the feature is enabled, false otherwise
* @since 1.5.0
* @see #setScanIsolation(Job, boolean)
- * @deprecated since 1.6.0
*/
- @Deprecated
protected static boolean isIsolated(JobContext context) {
return InputConfigurator.isIsolated(CLASS, getConfiguration(context));
}
@@ -541,9 +516,7 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
* @param enableFeature
* the feature is enabled if true, disabled otherwise
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void setLocalIterators(Job job, boolean enableFeature) {
InputConfigurator.setLocalIterators(CLASS, job.getConfiguration(), enableFeature);
}
@@ -556,9 +529,7 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
* @return true if the feature is enabled, false otherwise
* @since 1.5.0
* @see #setLocalIterators(Job, boolean)
- * @deprecated since 1.6.0
*/
- @Deprecated
protected static boolean usesLocalIterators(JobContext context) {
return InputConfigurator.usesLocalIterators(CLASS, getConfiguration(context));
}
@@ -593,9 +564,7 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
* @param enableFeature
* the feature is enabled if true, disabled otherwise
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void setOfflineTableScan(Job job, boolean enableFeature) {
InputConfigurator.setOfflineTableScan(CLASS, job.getConfiguration(), enableFeature);
}
@@ -608,9 +577,7 @@ public abstract class InputFormatBase<K,V> extends InputFormat<K,V> {
* @return true if the feature is enabled, false otherwise
* @since 1.5.0
* @see #setOfflineTableScan(Job, boolean)
- * @deprecated since 1.6.0
*/
- @Deprecated
protected static boolean isOfflineScan(JobContext context) {
return InputConfigurator.isOfflineScan(CLASS, getConfiguration(context));
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d399fc25/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
index 9dc90e2..f75bcc9 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/InputConfigurator.java
@@ -74,9 +74,7 @@ public class InputConfigurator extends ConfiguratorBase {
* Configuration keys for various features.
*
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static enum Features {
AUTO_ADJUST_RANGES, SCAN_ISOLATION, USE_LOCAL_ITERATORS, SCAN_OFFLINE
}
@@ -91,9 +89,7 @@ public class InputConfigurator extends ConfiguratorBase {
* @param tableName
* the table to use when the tablename is null in the write call
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void setInputTableName(Class<?> implementingClass, Configuration conf, String tableName) {
notNull(tableName);
conf.set(enumToConfKey(implementingClass, ScanOpts.TABLE_NAME), tableName);
@@ -107,9 +103,7 @@ public class InputConfigurator extends ConfiguratorBase {
* @param conf
* the Hadoop configuration object to configure
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static String getInputTableName(Class<?> implementingClass, Configuration conf) {
return conf.get(enumToConfKey(implementingClass, ScanOpts.TABLE_NAME));
}
@@ -158,9 +152,7 @@ public class InputConfigurator extends ConfiguratorBase {
* @throws IllegalArgumentException
* if the ranges cannot be encoded into base 64
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void setRanges(Class<?> implementingClass, Configuration conf, Collection<Range> ranges) {
notNull(ranges);
@@ -189,9 +181,7 @@ public class InputConfigurator extends ConfiguratorBase {
* if the ranges have been encoded improperly
* @since 1.5.0
* @see #setRanges(Class, Configuration, Collection)
- * @deprecated since 1.6.0
*/
- @Deprecated
public static List<Range> getRanges(Class<?> implementingClass, Configuration conf) throws IOException {
Collection<String> encodedRanges = conf.getStringCollection(enumToConfKey(implementingClass, ScanOpts.RANGES));
@@ -215,9 +205,7 @@ public class InputConfigurator extends ConfiguratorBase {
* @return a list of iterators
* @since 1.5.0
* @see #addIterator(Class, Configuration, IteratorSetting)
- * @deprecated since 1.6.0
*/
- @Deprecated
public static List<IteratorSetting> getIterators(Class<?> implementingClass, Configuration conf) {
String iterators = conf.get(enumToConfKey(implementingClass, ScanOpts.ITERATORS));
@@ -254,9 +242,7 @@ public class InputConfigurator extends ConfiguratorBase {
* @throws IllegalArgumentException
* if the column family is null
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void fetchColumns(Class<?> implementingClass, Configuration conf, Collection<Pair<Text,Text>> columnFamilyColumnQualifierPairs) {
notNull(columnFamilyColumnQualifierPairs);
ArrayList<String> columnStrings = new ArrayList<String>();
@@ -283,9 +269,7 @@ public class InputConfigurator extends ConfiguratorBase {
* @return a set of columns
* @since 1.5.0
* @see #fetchColumns(Class, Configuration, Collection)
- * @deprecated since 1.6.0
*/
- @Deprecated
public static Set<Pair<Text,Text>> getFetchedColumns(Class<?> implementingClass, Configuration conf) {
Set<Pair<Text,Text>> columns = new HashSet<Pair<Text,Text>>();
for (String col : conf.getStringCollection(enumToConfKey(implementingClass, ScanOpts.COLUMNS))) {
@@ -309,9 +293,7 @@ public class InputConfigurator extends ConfiguratorBase {
* @throws IllegalArgumentException
* if the iterator can't be serialized into the configuration
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void addIterator(Class<?> implementingClass, Configuration conf, IteratorSetting cfg) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
String newIter;
@@ -351,9 +333,7 @@ public class InputConfigurator extends ConfiguratorBase {
* the feature is enabled if true, disabled otherwise
* @see #setRanges(Class, Configuration, Collection)
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void setAutoAdjustRanges(Class<?> implementingClass, Configuration conf, boolean enableFeature) {
conf.setBoolean(enumToConfKey(implementingClass, Features.AUTO_ADJUST_RANGES), enableFeature);
}
@@ -368,9 +348,7 @@ public class InputConfigurator extends ConfiguratorBase {
* @return false if the feature is disabled, true otherwise
* @since 1.5.0
* @see #setAutoAdjustRanges(Class, Configuration, boolean)
- * @deprecated since 1.6.0
*/
- @Deprecated
public static Boolean getAutoAdjustRanges(Class<?> implementingClass, Configuration conf) {
return conf.getBoolean(enumToConfKey(implementingClass, Features.AUTO_ADJUST_RANGES), true);
}
@@ -388,9 +366,7 @@ public class InputConfigurator extends ConfiguratorBase {
* @param enableFeature
* the feature is enabled if true, disabled otherwise
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void setScanIsolation(Class<?> implementingClass, Configuration conf, boolean enableFeature) {
conf.setBoolean(enumToConfKey(implementingClass, Features.SCAN_ISOLATION), enableFeature);
}
@@ -405,9 +381,7 @@ public class InputConfigurator extends ConfiguratorBase {
* @return true if the feature is enabled, false otherwise
* @since 1.5.0
* @see #setScanIsolation(Class, Configuration, boolean)
- * @deprecated since 1.6.0
*/
- @Deprecated
public static Boolean isIsolated(Class<?> implementingClass, Configuration conf) {
return conf.getBoolean(enumToConfKey(implementingClass, Features.SCAN_ISOLATION), false);
}
@@ -426,9 +400,7 @@ public class InputConfigurator extends ConfiguratorBase {
* @param enableFeature
* the feature is enabled if true, disabled otherwise
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void setLocalIterators(Class<?> implementingClass, Configuration conf, boolean enableFeature) {
conf.setBoolean(enumToConfKey(implementingClass, Features.USE_LOCAL_ITERATORS), enableFeature);
}
@@ -443,9 +415,7 @@ public class InputConfigurator extends ConfiguratorBase {
* @return true if the feature is enabled, false otherwise
* @since 1.5.0
* @see #setLocalIterators(Class, Configuration, boolean)
- * @deprecated since 1.6.0
*/
- @Deprecated
public static Boolean usesLocalIterators(Class<?> implementingClass, Configuration conf) {
return conf.getBoolean(enumToConfKey(implementingClass, Features.USE_LOCAL_ITERATORS), false);
}
@@ -482,9 +452,7 @@ public class InputConfigurator extends ConfiguratorBase {
* @param enableFeature
* the feature is enabled if true, disabled otherwise
* @since 1.5.0
- * @deprecated since 1.6.0
*/
- @Deprecated
public static void setOfflineTableScan(Class<?> implementingClass, Configuration conf, boolean enableFeature) {
conf.setBoolean(enumToConfKey(implementingClass, Features.SCAN_OFFLINE), enableFeature);
}
@@ -499,9 +467,7 @@ public class InputConfigurator extends ConfiguratorBase {
* @return true if the feature is enabled, false otherwise
* @since 1.5.0
* @see #setOfflineTableScan(Class, Configuration, boolean)
- * @deprecated since 1.6.0
*/
- @Deprecated
public static Boolean isOfflineScan(Class<?> implementingClass, Configuration conf) {
return conf.getBoolean(enumToConfKey(implementingClass, Features.SCAN_OFFLINE), false);
}