Repository: accumulo Updated Branches: refs/heads/master 2643a8c05 -> d1535c5e8
ACCUMULO-3479 Drop Hadoop 1 support Some more changes from Christopher. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d1535c5e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d1535c5e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d1535c5e Branch: refs/heads/master Commit: d1535c5e8761046d6701e58ebefd24935ad24790 Parents: 2643a8c Author: Josh Elser <els...@apache.org> Authored: Wed Jan 14 15:13:46 2015 -0500 Committer: Josh Elser <els...@apache.org> Committed: Wed Jan 14 15:13:46 2015 -0500 ---------------------------------------------------------------------- README | 10 +++--- assemble/bin/accumulo | 2 +- assemble/bin/bootstrap_config.sh | 37 +++----------------- assemble/conf/examples/crypto/accumulo-site.xml | 3 -- .../examples/vfs-classloader/accumulo-site.xml | 3 -- assemble/conf/templates/accumulo-env.sh | 2 -- assemble/conf/templates/accumulo-site.xml | 4 --- .../core/client/impl/TableOperationsImpl.java | 4 +-- .../accumulo/core/file/map/MapFileUtil.java | 6 ++-- .../mapreduce/AccumuloFileOutputFormatTest.java | 9 ++--- .../mapreduce/AccumuloInputFormatTest.java | 24 +++++-------- .../AccumuloMultiTableInputFormatTest.java | 6 ++-- .../mapreduce/AccumuloOutputFormatTest.java | 6 ++-- .../mapreduce/AccumuloRowInputFormatTest.java | 3 +- .../core/client/mapreduce/TokenFileTest.java | 3 +- .../lib/partition/RangePartitionerTest.java | 3 +- .../conf/CredentialProviderFactoryShimTest.java | 17 ++------- .../simple/filedata/CharacterHistogram.java | 3 +- .../examples/simple/mapreduce/JobUtil.java | 30 ---------------- .../examples/simple/mapreduce/NGramIngest.java | 2 +- .../examples/simple/mapreduce/RegexExample.java | 2 +- .../examples/simple/mapreduce/RowHash.java | 2 +- .../examples/simple/mapreduce/TableToFile.java | 2 +- .../simple/mapreduce/TeraSortIngest.java | 2 +- .../simple/mapreduce/TokenFileWordCount.java | 2 +- .../simple/mapreduce/UniqueColumns.java | 2 +- .../examples/simple/mapreduce/WordCount.java | 2 +- .../mapreduce/bulk/BulkIngestExample.java | 3 +- .../simple/filedata/ChunkInputFormatTest.java | 3 +- .../impl/MiniAccumuloClusterImpl.java | 2 +- pom.xml | 2 +- .../accumulo/server/fs/VolumeManagerImpl.java | 33 +++-------------- .../apache/accumulo/server/fs/VolumeUtil.java | 3 +- .../apache/accumulo/server/init/Initialize.java | 5 +-- .../gc/GarbageCollectWriteAheadLogs.java | 5 +-- .../accumulo/gc/SimpleGarbageCollector.java | 5 +-- .../accumulo/master/tableOps/BulkImport.java | 10 ++---- .../accumulo/master/tableOps/DeleteTable.java | 7 ++-- .../apache/accumulo/tserver/log/LogSorter.java | 4 +-- .../accumulo/tserver/log/MultiReader.java | 3 +- .../accumulo/tserver/log/MultiReaderTest.java | 8 ++--- .../vfs/providers/HdfsFileObject.java | 4 +-- .../apache/accumulo/test/AccumuloDFSBase.java | 2 +- test/pom.xml | 23 ------------ .../performance/scan/CollectTabletStats.java | 4 +-- .../test/randomwalk/multitable/CopyTool.java | 3 +- .../randomwalk/sequential/MapRedVerifyTool.java | 3 +- .../test/randomwalk/shard/BulkInsert.java | 4 +-- .../test/randomwalk/shard/SortTool.java | 3 +- .../test/functional/AccumuloInputFormatIT.java | 3 +- .../system/continuous/continuous-env.sh.example | 1 - 51 files changed, 74 insertions(+), 260 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/README ---------------------------------------------------------------------- diff --git a/README b/README index ad6f2bf..27b3c66 100644 --- a/README +++ b/README @@ -38,8 +38,8 @@ the pom.xml file for the necessary components. You can build an Accumulo binary distribution, which is created in the assemble/target directory, using the following command. Note that maven 3 is required starting with Accumulo v1.5.0. By default, Accumulo compiles -against Hadoop 2.2.0, but these artifacts should be compatible with Apache -Hadoop 1.2.x or Apache Hadoop 2.2.x releases. +against Apache Hadoop 2.2.0, but these artifacts should be compatible with newer +releases of Hadoop which are backwards-compatible with Hadoop 2.2.0. mvn package -P assemble @@ -47,10 +47,8 @@ By default, Accumulo compiles against Apache Hadoop 2.2.0. To compile against a different Hadoop 2-compatible version, specify the profile and version, e.g. "-Dhadoop.version=0.23.5". -To compile against Apache Hadoop 1.2.1, or a different version that is compatible -with Hadoop 1, specify hadoop.profile and hadoop.version on the command line, -e.g. "-Dhadoop.profile=1 -Dhadoop.version=0.20.205.0" or - "-Dhadoop.profile=1 -Dhadoop.version=1.1.0". +Support for Apache Hadoop 1.x versions has been dropped. To support these +versions of Hadoop, use an older version of Accumulo. If you are running on another Unix-like operating system (OSX, etc) then you may wish to build the native libraries. They are not strictly necessary http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/assemble/bin/accumulo ---------------------------------------------------------------------- diff --git a/assemble/bin/accumulo b/assemble/bin/accumulo index 727a4c8..e21e2fc 100755 --- a/assemble/bin/accumulo +++ b/assemble/bin/accumulo @@ -137,7 +137,7 @@ if [ ! -d "${ACCUMULO_LOG_DIR}" ]; then fi # This is default for hadoop 2.x; -# for hadoop 1.0, 1.1, specify (DY)LD_LIBRARY_PATH +# for another distribution, specify (DY)LD_LIBRARY_PATH # explicitly in ${ACCUMULO_HOME}/conf/accumulo-env.sh # usually something like: # ${HADOOP_PREFIX}/lib/native/${PLATFORM} http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/assemble/bin/bootstrap_config.sh ---------------------------------------------------------------------- diff --git a/assemble/bin/bootstrap_config.sh b/assemble/bin/bootstrap_config.sh index bc94a34..c6257cf 100755 --- a/assemble/bin/bootstrap_config.sh +++ b/assemble/bin/bootstrap_config.sh @@ -232,11 +232,9 @@ fi if [[ -z "${HADOOP_VERSION}" ]]; then echo echo "Choose the Apache Hadoop version:" - select HADOOP in 'Hadoop 1' 'Hadoop 2' 'HDP 2.0/2.1' 'HDP 2.2' ; do + select HADOOP in 'Hadoop 2' 'HDP 2.0/2.1' 'HDP 2.2' ; do if [ "${HADOOP}" == "Hadoop 2" ]; then HADOOP_VERSION="2" - elif [ "${HADOOP}" == "Hadoop 1" ]; then - HADOOP_VERSION="1" elif [ "${HADOOP}" == "HDP 2.0/2.1" ]; then HADOOP_VERSION="HDP2" elif [ "${HADOOP}" == "HDP 2.2" ]; then @@ -246,9 +244,9 @@ if [[ -z "${HADOOP_VERSION}" ]]; then echo break done -elif [[ "${HADOOP_VERSION}" != "1" && "${HADOOP_VERSION}" != "2" && "${HADOOP_VERSION}" != "HDP2" && "${HADOOP_VERSION}" != "HDP2.2" ]]; then +elif [[ "${HADOOP_VERSION}" != "2" && "${HADOOP_VERSION}" != "HDP2" && "${HADOOP_VERSION}" != "HDP2.2" ]]; then echo "Invalid Hadoop version" - echo "Supported Hadoop versions: '1', '2', 'HDP2', 'HDP2.2'" + echo "Supported Hadoop versions: '2', 'HDP2', 'HDP2.2'" exit 1 fi @@ -297,26 +295,7 @@ sed -e "s/\${memMapMax}/${!MEMORY_MAP_MAX}/" \ -e "s=\${mvnProjBaseDir}=${MAVEN_PROJ_BASEDIR}=" ${TEMPLATE_CONF_DIR}/$ACCUMULO_SITE > ${CONF_DIR}/$ACCUMULO_SITE #Configure for hadoop 1 -if [[ "$HADOOP_VERSION" = "1" ]]; then - sed -e 's/^test -z \"$HADOOP_CONF_DIR\"/#test -z \"$HADOOP_CONF_DIR\"/' -e 's/^# test -z "$HADOOP_CONF_DIR"/test -z \"$HADOOP_CONF_DIR\"/' "${CONF_DIR}/$ACCUMULO_ENV" > temp - mv temp "${CONF_DIR}/$ACCUMULO_ENV" - sed -e 's/<!-- Hadoop 2 requirements -->/<!-- Hadoop 2 requirements --><!--/' \ - -e 's/<!-- End Hadoop 2 requirements -->/--><!-- End Hadoop 2 requirements -->/' \ - "${CONF_DIR}/$ACCUMULO_SITE" > temp - mv temp "${CONF_DIR}/$ACCUMULO_SITE" - sed -e 's/<!-- HDP 2.0 requirements -->/<!-- HDP 2.0 requirements --><!--/' \ - -e 's/<!-- End HDP 2.0 requirements -->/--><!-- End HDP 2.0 requirements -->/' \ - "${CONF_DIR}/$ACCUMULO_SITE" > temp - mv temp "${CONF_DIR}/$ACCUMULO_SITE" - sed -e 's/<!-- HDP 2.2 requirements -->/<!-- HDP 2.2 requirements --><!--/' \ - -e 's/<!-- End HDP 2.2 requirements -->/--><!-- End HDP 2.2 requirements -->/' \ - "${CONF_DIR}/$ACCUMULO_SITE" > temp - mv temp "${CONF_DIR}/$ACCUMULO_SITE" -elif [[ "${HADOOP_VERSION}" == "2" ]]; then - sed -e 's/<!-- Hadoop 1 requirements -->/<!-- Hadoop 1 requirements --><!--/' \ - -e 's/<!-- End Hadoop 1 requirements -->/--><!-- End Hadoop 1 requirements -->/' \ - "${CONF_DIR}/$ACCUMULO_SITE" > temp - mv temp "${CONF_DIR}/$ACCUMULO_SITE" +if [[ "${HADOOP_VERSION}" == "2" ]]; then sed -e 's/<!-- HDP 2.0 requirements -->/<!-- HDP 2.0 requirements --><!--/' \ -e 's/<!-- End HDP 2.0 requirements -->/--><!-- End HDP 2.0 requirements -->/' \ "${CONF_DIR}/$ACCUMULO_SITE" > temp @@ -326,10 +305,6 @@ elif [[ "${HADOOP_VERSION}" == "2" ]]; then "${CONF_DIR}/$ACCUMULO_SITE" > temp mv temp "${CONF_DIR}/$ACCUMULO_SITE" elif [[ "${HADOOP_VERSION}" == "HDP2" ]]; then - sed -e 's/<!-- Hadoop 1 requirements -->/<!-- Hadoop 1 requirements --><!--/' \ - -e 's/<!-- End Hadoop 1 requirements -->/--><!-- End Hadoop 1 requirements -->/' \ - "${CONF_DIR}/$ACCUMULO_SITE" > temp - mv temp "${CONF_DIR}/$ACCUMULO_SITE" sed -e 's/<!-- Hadoop 2 requirements -->/<!-- Hadoop 2 requirements --><!--/' \ -e 's/<!-- End Hadoop 2 requirements -->/--><!-- End Hadoop 2 requirements -->/' \ "${CONF_DIR}/$ACCUMULO_SITE" > temp @@ -339,10 +314,6 @@ elif [[ "${HADOOP_VERSION}" == "HDP2" ]]; then "${CONF_DIR}/$ACCUMULO_SITE" > temp mv temp "${CONF_DIR}/$ACCUMULO_SITE" elif [[ "${HADOOP_VERSION}" == "HDP2.2" ]]; then - sed -e 's/<!-- Hadoop 1 requirements -->/<!-- Hadoop 1 requirements --><!--/' \ - -e 's/<!-- End Hadoop 1 requirements -->/--><!-- End Hadoop 1 requirements -->/' \ - "${CONF_DIR}/$ACCUMULO_SITE" > temp - mv temp "${CONF_DIR}/$ACCUMULO_SITE" sed -e 's/<!-- Hadoop 2 requirements -->/<!-- Hadoop 2 requirements --><!--/' \ -e 's/<!-- End Hadoop 2 requirements -->/--><!-- End Hadoop 2 requirements -->/' \ "${CONF_DIR}/$ACCUMULO_SITE" > temp http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/assemble/conf/examples/crypto/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/assemble/conf/examples/crypto/accumulo-site.xml b/assemble/conf/examples/crypto/accumulo-site.xml index b905017..82052d5 100644 --- a/assemble/conf/examples/crypto/accumulo-site.xml +++ b/assemble/conf/examples/crypto/accumulo-site.xml @@ -100,9 +100,6 @@ $ACCUMULO_HOME/lib/[^.].*.jar, $ZOOKEEPER_HOME/zookeeper[^.].*.jar, $HADOOP_CONF_DIR, - $HADOOP_PREFIX/[^.].*.jar, - $HADOOP_PREFIX/lib/[^.].*.jar, - <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/assemble/conf/examples/vfs-classloader/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/assemble/conf/examples/vfs-classloader/accumulo-site.xml b/assemble/conf/examples/vfs-classloader/accumulo-site.xml index 73284bc..d9d85e5 100644 --- a/assemble/conf/examples/vfs-classloader/accumulo-site.xml +++ b/assemble/conf/examples/vfs-classloader/accumulo-site.xml @@ -98,9 +98,6 @@ $ACCUMULO_HOME/lib/[^.].*.jar, $ZOOKEEPER_HOME/zookeeper[^.].*.jar, $HADOOP_CONF_DIR, - $HADOOP_PREFIX/[^.].*.jar, - $HADOOP_PREFIX/lib/[^.].*.jar, - <!-- Comment the following for hadoop-1 --> $HADOOP_PREFIX/share/hadoop/common/.*.jar, $HADOOP_PREFIX/share/hadoop/common/lib/(?!slf4j)[^.].*.jar, $HADOOP_PREFIX/share/hadoop/hdfs/.*.jar, http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/assemble/conf/templates/accumulo-env.sh ---------------------------------------------------------------------- diff --git a/assemble/conf/templates/accumulo-env.sh b/assemble/conf/templates/accumulo-env.sh index 1ea1834..a21702b 100644 --- a/assemble/conf/templates/accumulo-env.sh +++ b/assemble/conf/templates/accumulo-env.sh @@ -34,8 +34,6 @@ else unset HADOOP_HOME fi -# hadoop-1.2: -# test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/conf" # hadoop-2.0: test -z "$HADOOP_CONF_DIR" && export HADOOP_CONF_DIR="$HADOOP_PREFIX/etc/hadoop" http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/assemble/conf/templates/accumulo-site.xml ---------------------------------------------------------------------- diff --git a/assemble/conf/templates/accumulo-site.xml b/assemble/conf/templates/accumulo-site.xml index 7fe3fe4..ab8fb03 100644 --- a/assemble/conf/templates/accumulo-site.xml +++ b/assemble/conf/templates/accumulo-site.xml @@ -127,10 +127,6 @@ ${mvnProjBaseDir} /usr/hdp/current/hadoop-yarn-client/lib/jersey.*.jar, /usr/hdp/current/hive-client/lib/hive-accumulo-handler.jar <!-- End HDP 2.2 requirements --> - <!-- Hadoop 1 requirements --> - $HADOOP_PREFIX/[^.].*.jar, - $HADOOP_PREFIX/lib/(?!slf4j)[^.].*.jar, - <!-- End Hadoop 1 requirements --> </value> <description>Classpaths that accumulo checks for updates and class files.</description> </property> http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java index e32a9e1..49dc645 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java +++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java @@ -1168,8 +1168,6 @@ public class TableOperationsImpl extends TableOperationsHelper { return ranges; } - // TODO Remove deprecation warning suppression when Hadoop1 support is dropped - @SuppressWarnings("deprecation") private Path checkPath(String dir, String kind, String type) throws IOException, AccumuloException, AccumuloSecurityException { Path ret; Map<String,String> props = context.getConnector().instanceOperations().getSystemConfiguration(); @@ -1186,7 +1184,7 @@ public class TableOperationsImpl extends TableOperationsHelper { if (!fs.exists(ret)) throw new AccumuloException(kind + " import " + type + " directory " + dir + " does not exist!"); - if (!fs.getFileStatus(ret).isDir()) { + if (!fs.getFileStatus(ret).isDirectory()) { throw new AccumuloException(kind + " import " + type + " directory " + dir + " is not a directory!"); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java b/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java index 1373eac..ae058f9 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java +++ b/core/src/main/java/org/apache/accumulo/core/file/map/MapFileUtil.java @@ -26,23 +26,21 @@ import org.apache.hadoop.io.MapFile; import org.apache.hadoop.io.SequenceFile; public class MapFileUtil { - @SuppressWarnings("deprecation") public static MapFile.Reader openMapFile(AccumuloConfiguration acuconf, FileSystem fs, String dirName, Configuration conf) throws IOException { MapFile.Reader mfr = null; try { - mfr = new MapFile.Reader(fs, dirName, conf); + mfr = new MapFile.Reader(fs.makeQualified(new Path(dirName)), conf); return mfr; } catch (IOException e) { throw e; } } - @SuppressWarnings("deprecation") public static SequenceFile.Reader openIndex(Configuration conf, FileSystem fs, Path mapFile) throws IOException { Path indexPath = new Path(mapFile, MapFile.INDEX_FILE_NAME); SequenceFile.Reader index = null; try { - index = new SequenceFile.Reader(fs, indexPath, conf); + index = new SequenceFile.Reader(conf, SequenceFile.Reader.file(fs.makeQualified(indexPath))); return index; } catch (IOException e) { throw e; http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java index 2a453e3..f5114ce 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormatTest.java @@ -131,8 +131,7 @@ public class AccumuloFileOutputFormatTest { String pass = args[1]; String table = args[2]; - @SuppressWarnings("deprecation") - Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); + Job job = Job.getInstance(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); job.setJarByClass(this.getClass()); job.setInputFormatClass(AccumuloInputFormat.class); @@ -197,8 +196,7 @@ public class AccumuloFileOutputFormatTest { long d = 10l; String e = "snappy"; - @SuppressWarnings("deprecation") - Job job1 = new Job(); + Job job1 = Job.getInstance(); AccumuloFileOutputFormat.setReplication(job1, a); AccumuloFileOutputFormat.setFileBlockSize(job1, b); AccumuloFileOutputFormat.setDataBlockSize(job1, c); @@ -219,8 +217,7 @@ public class AccumuloFileOutputFormatTest { d = 110l; e = "lzo"; - @SuppressWarnings("deprecation") - Job job2 = new Job(); + Job job2 = Job.getInstance(); AccumuloFileOutputFormat.setReplication(job2, a); AccumuloFileOutputFormat.setFileBlockSize(job2, b); AccumuloFileOutputFormat.setDataBlockSize(job2, c); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java index 9d74182..07303c7 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java @@ -68,8 +68,7 @@ public class AccumuloInputFormatTest { */ @Test public void testSetIterator() throws IOException { - @SuppressWarnings("deprecation") - Job job = new Job(); + Job job = Job.getInstance(); IteratorSetting is = new IteratorSetting(1, "WholeRow", "org.apache.accumulo.core.iterators.WholeRowIterator"); AccumuloInputFormat.addIterator(job, is); @@ -82,8 +81,7 @@ public class AccumuloInputFormatTest { @Test public void testAddIterator() throws IOException { - @SuppressWarnings("deprecation") - Job job = new Job(); + Job job = Job.getInstance(); AccumuloInputFormat.addIterator(job, new IteratorSetting(1, "WholeRow", WholeRowIterator.class)); AccumuloInputFormat.addIterator(job, new IteratorSetting(2, "Versions", "org.apache.accumulo.core.iterators.VersioningIterator")); @@ -131,8 +129,7 @@ public class AccumuloInputFormatTest { String value = "comma,delimited,value"; IteratorSetting someSetting = new IteratorSetting(1, "iterator", "Iterator.class"); someSetting.addOption(key, value); - @SuppressWarnings("deprecation") - Job job = new Job(); + Job job = Job.getInstance(); AccumuloInputFormat.addIterator(job, someSetting); List<IteratorSetting> list = AccumuloInputFormat.getIterators(job); @@ -158,8 +155,7 @@ public class AccumuloInputFormatTest { */ @Test public void testGetIteratorSettings() throws IOException { - @SuppressWarnings("deprecation") - Job job = new Job(); + Job job = Job.getInstance(); 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")); @@ -190,8 +186,7 @@ public class AccumuloInputFormatTest { @Test public void testSetRegex() throws IOException { - @SuppressWarnings("deprecation") - Job job = new Job(); + Job job = Job.getInstance(); String regex = ">\"*%<>\'\\"; @@ -250,8 +245,7 @@ public class AccumuloInputFormatTest { @SuppressWarnings("unchecked") Class<? extends InputFormat<?,?>> inputFormatClass = (Class<? extends InputFormat<?,?>>) Class.forName(inputFormatClassName); - @SuppressWarnings("deprecation") - Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); + Job job = Job.getInstance(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); job.setJarByClass(this.getClass()); job.setInputFormatClass(inputFormatClass); @@ -300,8 +294,7 @@ public class AccumuloInputFormatTest { @Test public void testCorrectRangeInputSplits() throws Exception { - @SuppressWarnings("deprecation") - Job job = new Job(new Configuration(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); + Job job = Job.getInstance(new Configuration(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); String username = "user", table = "table", instance = "mapreduce_testCorrectRangeInputSplits"; PasswordToken password = new PasswordToken("password"); @@ -397,8 +390,7 @@ public class AccumuloInputFormatTest { @Test public void testEmptyColumnFamily() throws IOException { - @SuppressWarnings("deprecation") - Job job = new Job(); + Job job = Job.getInstance(); Set<Pair<Text,Text>> cols = new HashSet<Pair<Text,Text>>(); cols.add(new Pair<Text,Text>(new Text(""), null)); cols.add(new Pair<Text,Text>(new Text("foo"), new Text("bar"))); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java index 05fbbb4..7b72e84 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloMultiTableInputFormatTest.java @@ -98,8 +98,7 @@ public class AccumuloMultiTableInputFormatTest { String table1 = args[2]; String table2 = args[3]; - @SuppressWarnings("deprecation") - Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); + Job job = Job.getInstance(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); job.setJarByClass(this.getClass()); job.setInputFormatClass(AccumuloMultiTableInputFormat.class); @@ -165,8 +164,7 @@ public class AccumuloMultiTableInputFormatTest { */ @Test public void testInputTableConfigSerialization() throws IOException { - @SuppressWarnings("deprecation") - Job job = new Job(); + Job job = Job.getInstance(); InputTableConfig tableConfig = new InputTableConfig().setRanges(Collections.singletonList(new Range("a", "b"))) .fetchColumns(Collections.singleton(new Pair<Text,Text>(new Text("CF1"), new Text("CQ1")))) http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java index 0be7b0a..d9a9600 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatTest.java @@ -96,8 +96,7 @@ public class AccumuloOutputFormatTest { String table1 = args[2]; String table2 = args[3]; - @SuppressWarnings("deprecation") - Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); + Job job = Job.getInstance(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); job.setJarByClass(this.getClass()); job.setInputFormatClass(AccumuloInputFormat.class); @@ -132,8 +131,7 @@ public class AccumuloOutputFormatTest { @Test public void testBWSettings() throws IOException { - @SuppressWarnings("deprecation") - Job job = new Job(); + Job job = Job.getInstance(); // make sure we aren't testing defaults final BatchWriterConfig bwDefaults = new BatchWriterConfig(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java index e8920eb..484d208 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloRowInputFormatTest.java @@ -152,8 +152,7 @@ public class AccumuloRowInputFormatTest { String pass = args[1]; String table = args[2]; - @SuppressWarnings("deprecation") - Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); + Job job = Job.getInstance(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); job.setJarByClass(this.getClass()); job.setInputFormatClass(AccumuloRowInputFormat.class); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/core/src/test/java/org/apache/accumulo/core/client/mapreduce/TokenFileTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/TokenFileTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/TokenFileTest.java index 8359b89..ef7f28b 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/TokenFileTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/TokenFileTest.java @@ -99,8 +99,7 @@ public class TokenFileTest { String table1 = args[2]; String table2 = args[3]; - @SuppressWarnings("deprecation") - Job job = new Job(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); + Job job = Job.getInstance(getConf(), this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); job.setJarByClass(this.getClass()); job.setInputFormatClass(AccumuloInputFormat.class); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/core/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitionerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitionerTest.java b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitionerTest.java index 13a09d6..89f8864 100644 --- a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitionerTest.java +++ b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitionerTest.java @@ -53,8 +53,7 @@ public class RangePartitionerTest { } private RangePartitioner prepPartitioner(int numSubBins) throws IOException { - @SuppressWarnings("deprecation") - Job job = new Job(); + Job job = Job.getInstance(); RangePartitioner.setNumSubBins(job, numSubBins); RangePartitioner rp = new RangePartitioner(); rp.setConf(job.getConfiguration()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java b/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java index 6bfd6e8..29e2632 100644 --- a/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java +++ b/core/src/test/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShimTest.java @@ -18,7 +18,6 @@ package org.apache.accumulo.core.conf; import java.io.File; import java.io.IOException; -import java.lang.reflect.Method; import java.net.URL; import java.util.Collections; import java.util.HashMap; @@ -30,7 +29,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.MiniDFSCluster; -import org.apache.log4j.Logger; import org.junit.Assert; import org.junit.Assume; import org.junit.BeforeClass; @@ -40,7 +38,6 @@ import org.junit.Test; * */ public class CredentialProviderFactoryShimTest { - private static final Logger log = Logger.getLogger(CredentialProviderFactoryShimTest.class); private static final String populatedKeyStoreName = "/accumulo.jceks", emptyKeyStoreName = "/empty.jceks"; private static File emptyKeyStore, populatedKeyStore; @@ -165,9 +162,7 @@ public class CredentialProviderFactoryShimTest { public void extractFromHdfs() throws Exception { File target = new File(System.getProperty("user.dir"), "target"); String prevValue = System.setProperty("test.build.data", new File(target, this.getClass().getName() + "_minidfs").toString()); - // TODO Remove when Hadoop1 support is dropped - @SuppressWarnings("deprecation") - MiniDFSCluster dfsCluster = new MiniDFSCluster(new Configuration(), 1, true, null); + MiniDFSCluster dfsCluster = new MiniDFSCluster.Builder(new Configuration()).build(); try { if (null != prevValue) { System.setProperty("test.build.data", prevValue); @@ -176,15 +171,7 @@ public class CredentialProviderFactoryShimTest { } // One namenode, One configuration - Configuration dfsConfiguration; - Method m = MiniDFSCluster.class.getMethod("getConfiguration", int.class); - try { - Object result = m.invoke(dfsCluster, 0); - dfsConfiguration = (Configuration) result; - } catch (Exception e) { - log.info("Couldn't get configuration from MiniDFS cluster, assuming hadoop-1 and ignoring test", e); - return; - } + Configuration dfsConfiguration = dfsCluster.getConfiguration(0); Path destPath = new Path("/accumulo.jceks"); FileSystem dfs = dfsCluster.getFileSystem(); // Put the populated keystore in hdfs http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/CharacterHistogram.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/CharacterHistogram.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/CharacterHistogram.java index c760ee3..9e32090 100644 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/CharacterHistogram.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/CharacterHistogram.java @@ -29,7 +29,6 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.iterators.user.SummingArrayCombiner; import org.apache.accumulo.core.security.ColumnVisibility; -import org.apache.accumulo.examples.simple.mapreduce.JobUtil; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.io.Text; @@ -83,7 +82,7 @@ public class CharacterHistogram extends Configured implements Tool { @Override public int run(String[] args) throws Exception { - Job job = JobUtil.getJob(getConf()); + Job job = Job.getInstance(getConf()); job.setJobName(this.getClass().getSimpleName()); job.setJarByClass(this.getClass()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/JobUtil.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/JobUtil.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/JobUtil.java deleted file mode 100644 index d732562..0000000 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/JobUtil.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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.examples.simple.mapreduce; - -import java.io.IOException; - -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.mapreduce.Job; - -public class JobUtil { - public static Job getJob(Configuration conf) throws IOException { - @SuppressWarnings("deprecation") - Job job = new Job(conf); - return job; - } -} http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java index 6ae74ce..6cf0be5 100644 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/NGramIngest.java @@ -68,7 +68,7 @@ public class NGramIngest extends Configured implements Tool { Opts opts = new Opts(); opts.parseArgs(getClass().getName(), args); - Job job = JobUtil.getJob(getConf()); + Job job = Job.getInstance(getConf()); job.setJobName(getClass().getSimpleName()); job.setJarByClass(getClass()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java index d6695e6..ad5bc74 100644 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RegexExample.java @@ -61,7 +61,7 @@ public class RegexExample extends Configured implements Tool { Opts opts = new Opts(); opts.parseArgs(getClass().getName(), args); - Job job = JobUtil.getJob(getConf()); + Job job = Job.getInstance(getConf()); job.setJobName(getClass().getSimpleName()); job.setJarByClass(getClass()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java index 06bfc8f..0bc2c2f 100644 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/RowHash.java @@ -62,7 +62,7 @@ public class RowHash extends Configured implements Tool { @Override public int run(String[] args) throws Exception { - Job job = JobUtil.getJob(getConf()); + Job job = Job.getInstance(getConf()); job.setJobName(this.getClass().getName()); job.setJarByClass(this.getClass()); Opts opts = new Opts(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java index b9c62ef..7eb6b42 100644 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TableToFile.java @@ -68,7 +68,7 @@ public class TableToFile extends Configured implements Tool { @Override public int run(String[] args) throws IOException, InterruptedException, ClassNotFoundException, AccumuloSecurityException { - Job job = JobUtil.getJob(getConf()); + Job job = Job.getInstance(getConf()); job.setJobName(this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); job.setJarByClass(this.getClass()); Opts opts = new Opts(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java index 7870688..9aac75e 100644 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java @@ -366,7 +366,7 @@ public class TeraSortIngest extends Configured implements Tool { @Override public int run(String[] args) throws Exception { - Job job = JobUtil.getJob(getConf()); + Job job = Job.getInstance(getConf()); job.setJobName("TeraSortCloud"); job.setJarByClass(this.getClass()); Opts opts = new Opts(); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TokenFileWordCount.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TokenFileWordCount.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TokenFileWordCount.java index 7822910..49e1f50 100644 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TokenFileWordCount.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TokenFileWordCount.java @@ -71,7 +71,7 @@ public class TokenFileWordCount extends Configured implements Tool { String input = args[4]; String tableName = args[5]; - Job job = JobUtil.getJob(getConf()); + Job job = Job.getInstance(getConf()); job.setJobName(TokenFileWordCount.class.getName()); job.setJarByClass(this.getClass()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java index 7c0b91a..9cdf8d0 100644 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/UniqueColumns.java @@ -89,7 +89,7 @@ public class UniqueColumns extends Configured implements Tool { String jobName = this.getClass().getSimpleName() + "_" + System.currentTimeMillis(); - Job job = JobUtil.getJob(getConf()); + Job job = Job.getInstance(getConf()); job.setJobName(jobName); job.setJarByClass(this.getClass()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java index 8ead101..04df4c8 100644 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/WordCount.java @@ -73,7 +73,7 @@ public class WordCount extends Configured implements Tool { Opts opts = new Opts(); opts.parseArgs(WordCount.class.getName(), args); - Job job = JobUtil.getJob(getConf()); + Job job = Job.getInstance(getConf()); job.setJobName(WordCount.class.getName()); job.setJarByClass(this.getClass()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java index 354396c..e4000e4 100644 --- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java +++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/bulk/BulkIngestExample.java @@ -29,7 +29,6 @@ import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.util.Base64; import org.apache.accumulo.core.util.TextUtil; -import org.apache.accumulo.examples.simple.mapreduce.JobUtil; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.FileSystem; @@ -109,7 +108,7 @@ public class BulkIngestExample extends Configured implements Tool { Configuration conf = getConf(); PrintStream out = null; try { - Job job = JobUtil.getJob(conf); + Job job = Job.getInstance(conf); job.setJobName("bulk ingest example"); job.setJarByClass(this.getClass()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java ---------------------------------------------------------------------- diff --git a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java index 3f57119..5540759 100644 --- a/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java +++ b/examples/simple/src/test/java/org/apache/accumulo/examples/simple/filedata/ChunkInputFormatTest.java @@ -37,7 +37,6 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.ColumnVisibility; -import org.apache.accumulo.examples.simple.mapreduce.JobUtil; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.mapreduce.Job; @@ -203,7 +202,7 @@ public class ChunkInputFormatTest { String pass = args[2]; String table = args[3]; - Job job = JobUtil.getJob(getConf()); + Job job = Job.getInstance(getConf()); job.setJobName(this.getClass().getSimpleName() + "_" + System.currentTimeMillis()); job.setJarByClass(this.getClass()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java ---------------------------------------------------------------------- diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java index 27d6b19..d2a999d 100644 --- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java +++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java @@ -385,7 +385,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster { conf.set("dfs.datanode.synconclose", "true"); conf.set("dfs.datanode.data.dir.perm", MiniDFSUtil.computeDatanodeDirectoryPermission()); String oldTestBuildData = System.setProperty("test.build.data", dfs.getAbsolutePath()); - miniDFS = new MiniDFSCluster(conf, 1, true, null); + miniDFS = new MiniDFSCluster.Builder(conf).build(); if (oldTestBuildData == null) System.clearProperty("test.build.data"); else http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6b9ed4a..6bffbe1 100644 --- a/pom.xml +++ b/pom.xml @@ -864,7 +864,7 @@ </requireMavenVersion> <requireProperty> <property>hadoop.profile</property> - <regex>(1|2)</regex> + <regex>(2)</regex> <regexMessage>You should specify the Hadoop profile by major Hadoop generation, i.e. 1 or 2, not by a version number. Use hadoop.version to use a particular Hadoop version within that generation. See README for more details.</regexMessage> </requireProperty> http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java index 7d40b9a..d144064 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java +++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java @@ -21,13 +21,11 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.io.IOException; import java.lang.reflect.Method; import java.net.URI; -import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Map.Entry; @@ -47,6 +45,7 @@ import org.apache.commons.lang.NotImplementedException; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.ContentSummary; +import org.apache.hadoop.fs.CreateFlag; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileStatus; @@ -56,7 +55,6 @@ import org.apache.hadoop.fs.Trash; import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.hdfs.DistributedFileSystem; import org.apache.hadoop.hdfs.protocol.HdfsConstants.SafeModeAction; -import org.apache.hadoop.util.Progressable; import org.apache.log4j.Logger; import com.google.common.base.Optional; @@ -175,33 +173,10 @@ public class VolumeManagerImpl implements VolumeManager { FileSystem fs = v.getFileSystem(); blockSize = correctBlockSize(fs.getConf(), blockSize); bufferSize = correctBufferSize(fs.getConf(), bufferSize); + EnumSet<CreateFlag> set = EnumSet.of(CreateFlag.SYNC_BLOCK, CreateFlag.CREATE); + log.debug("creating " + logPath + " with CreateFlag set: " + set); try { - // This... - // EnumSet<CreateFlag> set = EnumSet.of(CreateFlag.SYNC_BLOCK, CreateFlag.CREATE); - // return fs.create(logPath, FsPermission.getDefault(), set, buffersize, replication, blockSize, null); - // Becomes this: - Class<?> createFlags = Class.forName("org.apache.hadoop.fs.CreateFlag"); - List<Enum<?>> flags = new ArrayList<Enum<?>>(); - if (createFlags.isEnum()) { - for (Object constant : createFlags.getEnumConstants()) { - if (constant.toString().equals("SYNC_BLOCK")) { - flags.add((Enum<?>) constant); - log.debug("Found synch enum " + constant); - } - if (constant.toString().equals("CREATE")) { - flags.add((Enum<?>) constant); - log.debug("Found CREATE enum " + constant); - } - } - } - Object set = EnumSet.class.getMethod("of", java.lang.Enum.class, java.lang.Enum.class).invoke(null, flags.get(0), flags.get(1)); - log.debug("CreateFlag set: " + set); - Method create = fs.getClass().getMethod("create", Path.class, FsPermission.class, EnumSet.class, Integer.TYPE, Short.TYPE, Long.TYPE, Progressable.class); - log.debug("creating " + logPath + " with SYNCH_BLOCK flag"); - return (FSDataOutputStream) create.invoke(fs, logPath, FsPermission.getDefault(), set, bufferSize, replication, blockSize, null); - } catch (ClassNotFoundException ex) { - // Expected in hadoop 1.0 - return fs.create(logPath, true, bufferSize, replication, blockSize); + return fs.create(logPath, FsPermission.getDefault(), set, bufferSize, replication, blockSize, null); } catch (Exception ex) { log.debug(ex, ex); return fs.create(logPath, true, bufferSize, replication, blockSize); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java index d40106d..1dcc6aa 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java +++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeUtil.java @@ -345,11 +345,10 @@ public class VolumeUtil { return false; } - @SuppressWarnings("deprecation") private static HashSet<String> getFileNames(FileStatus[] filesStatuses) { HashSet<String> names = new HashSet<String>(); for (FileStatus fileStatus : filesStatuses) - if (fileStatus.isDir()) + if (fileStatus.isDirectory()) throw new IllegalArgumentException("expected " + fileStatus.getPath() + " to be a file"); else names.add(fileStatus.getPath().getName()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java index ed2189d..2da6ba0 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java +++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java @@ -435,10 +435,7 @@ public class Initialize { Path dir = new Path(s); try { FileStatus fstat = fs.getFileStatus(dir); - // TODO Remove deprecation warning suppression when Hadoop1 support is dropped - @SuppressWarnings("deprecation") - boolean isDirectory = fstat.isDir(); - if (!isDirectory) { + if (!fstat.isDirectory()) { log.fatal("location " + dir + " exists but is not a directory"); return; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java ---------------------------------------------------------------------- diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java index 5aee0c5..35c60d6 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java @@ -465,10 +465,7 @@ public class GarbageCollectWriteAheadLogs { continue; for (FileStatus status : listing) { String server = status.getPath().getName(); - // TODO Remove deprecation warning suppression when Hadoop1 support is dropped - @SuppressWarnings("deprecation") - boolean isDirectory = status.isDir(); - if (isDirectory) { + if (status.isDirectory()) { servers.add(server); for (FileStatus file : fs.listStatus(new Path(walRoot, server))) { if (isUUID(file.getPath().getName())) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java ---------------------------------------------------------------------- diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java index db37c8b..c380eb7 100644 --- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java +++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java @@ -442,17 +442,14 @@ public class SimpleGarbageCollector extends AccumuloServerContext implements Ifa @Override public void deleteTableDirIfEmpty(String tableID) throws IOException { // if dir exist and is empty, then empty list is returned... - // hadoop 1.0 will return null if the file doesn't exist // hadoop 2.0 will throw an exception if the file does not exist for (String dir : ServerConstants.getTablesDirs()) { FileStatus[] tabletDirs = null; try { tabletDirs = fs.listStatus(new Path(dir + "/" + tableID)); } catch (FileNotFoundException ex) { - // ignored - } - if (tabletDirs == null) continue; + } if (tabletDirs.length == 0) { Path p = new Path(dir + "/" + tableID); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java index c663686..16c317a 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/BulkImport.java @@ -141,8 +141,6 @@ public class BulkImport extends MasterRepo { } @Override - // TODO Remove deprecation warning suppression when Hadoop1 support is dropped - @SuppressWarnings("deprecation") public Repo<Master> call(long tid, Master master) throws Exception { log.debug(" tid " + tid + " sourceDir " + sourceDir); @@ -161,7 +159,7 @@ public class BulkImport extends MasterRepo { if (errorStatus == null) throw new ThriftTableOperationException(tableId, null, TableOperation.BULK_IMPORT, TableOperationExceptionType.BULK_BAD_ERROR_DIRECTORY, errorDir + " does not exist"); - if (!errorStatus.isDir()) + if (!errorStatus.isDirectory()) throw new ThriftTableOperationException(tableId, null, TableOperation.BULK_IMPORT, TableOperationExceptionType.BULK_BAD_ERROR_DIRECTORY, errorDir + " is not a directory"); if (fs.listStatus(errorPath).length != 0) @@ -213,8 +211,6 @@ public class BulkImport extends MasterRepo { } } - // TODO Remove deprecation warning suppression when Hadoop1 support is dropped - @SuppressWarnings("deprecation") private String prepareBulkImport(Master master, final VolumeManager fs, String dir, String tableId) throws Exception { final Path bulkDir = createNewBulkDir(fs, tableId); @@ -250,7 +246,7 @@ public class BulkImport extends MasterRepo { } if (extension.equals(Constants.MAPFILE_EXTENSION)) { - if (!fileStatus.isDir()) { + if (!fileStatus.isDirectory()) { log.warn(fileStatus.getPath() + " is not a map file, ignoring"); return null; } @@ -261,7 +257,7 @@ public class BulkImport extends MasterRepo { } try { FileStatus dataStatus = fs.getFileStatus(new Path(fileStatus.getPath(), MapFile.DATA_FILE_NAME)); - if (dataStatus.isDir()) { + if (dataStatus.isDirectory()) { log.warn(fileStatus.getPath() + " is not a map file, ignoring"); return null; } http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java ---------------------------------------------------------------------- diff --git a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java index 1f903ca..4cff0c7 100644 --- a/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java +++ b/server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java @@ -268,18 +268,15 @@ class CleanUp extends MasterRepo { final String childName = child.getPath().getName(); final Path childInSrc = new Path(src, childName), childInDest = new Path(dest, childName); - @SuppressWarnings("deprecation") boolean isFile = fs.isFile(childInSrc), isDir = child.isDir(); - // TODO change to `child.isFile()` when Hadoop-1 support is dropped - if (isFile) { + if (child.isFile()) { if (fs.exists(childInDest)) { log.warn("File already exists in archive, ignoring. " + childInDest); } else { fs.rename(childInSrc, childInDest); } - // TODO change to `child.isDirectory()` when Hadoop-1 support is dropped - } else if (isDir) { + } else if (child.isDirectory()) { if (fs.exists(childInDest)) { // Recurse merge(fs, childInSrc, childInDest); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java index 8231d37..589b777 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LogSorter.java @@ -176,8 +176,8 @@ public class LogSorter { Path path = new Path(destPath, String.format("part-r-%05d", part)); FileSystem ns = fs.getVolumeByPath(path).getFileSystem(); - @SuppressWarnings("deprecation") - MapFile.Writer output = new MapFile.Writer(ns.getConf(), ns, path.toString(), LogFileKey.class, LogFileValue.class); + MapFile.Writer output = new MapFile.Writer(ns.getConf(), ns.makeQualified(path), MapFile.Writer.keyClass(LogFileKey.class), + MapFile.Writer.valueClass(LogFileValue.class)); try { Collections.sort(buffer, new Comparator<Pair<LogFileKey,LogFileValue>>() { @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/server/tserver/src/main/java/org/apache/accumulo/tserver/log/MultiReader.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/MultiReader.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/MultiReader.java index c2a0683..174ee4d 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/MultiReader.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/MultiReader.java @@ -89,7 +89,6 @@ public class MultiReader { private PriorityBuffer heap = new PriorityBuffer(); - @SuppressWarnings("deprecation") public MultiReader(VolumeManager fs, Path directory) throws IOException { boolean foundFinish = false; for (FileStatus child : fs.listStatus(directory)) { @@ -100,7 +99,7 @@ public class MultiReader { continue; } FileSystem ns = fs.getVolumeByPath(child.getPath()).getFileSystem(); - heap.add(new Index(new Reader(ns, child.getPath().toString(), ns.getConf()))); + heap.add(new Index(new Reader(ns.makeQualified(child.getPath()), ns.getConf()))); } if (!foundFinish) throw new IOException("Sort \"" + SortedLogState.FINISHED.getMarker() + "\" flag not found in " + directory); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/server/tserver/src/test/java/org/apache/accumulo/tserver/log/MultiReaderTest.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/MultiReaderTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/MultiReaderTest.java index a79e77e..e483cac 100644 --- a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/MultiReaderTest.java +++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/MultiReaderTest.java @@ -50,16 +50,16 @@ public class MultiReaderTest { fs.create(new Path(root, "finished")).close(); FileSystem ns = fs.getVolumeByPath(root).getFileSystem(); - @SuppressWarnings("deprecation") - Writer oddWriter = new Writer(ns.getConf(), ns, new Path(root, "odd").toString(), IntWritable.class, BytesWritable.class); + Writer oddWriter = new Writer(ns.getConf(), ns.makeQualified(new Path(root, "odd")), Writer.keyClass(IntWritable.class), + Writer.valueClass(BytesWritable.class)); BytesWritable value = new BytesWritable("someValue".getBytes()); for (int i = 1; i < 1000; i += 2) { oddWriter.append(new IntWritable(i), value); } oddWriter.close(); - @SuppressWarnings("deprecation") - Writer evenWriter = new Writer(ns.getConf(), ns, new Path(root, "even").toString(), IntWritable.class, BytesWritable.class); + Writer evenWriter = new Writer(ns.getConf(), ns.makeQualified(new Path(root, "even")), Writer.keyClass(IntWritable.class), + Writer.valueClass(BytesWritable.class)); for (int i = 0; i < 1000; i += 2) { if (i == 10) continue; http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java ---------------------------------------------------------------------- diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java index 6849073..0f2cc36 100644 --- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java +++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java @@ -147,15 +147,13 @@ public class HdfsFileObject extends AbstractFileObject { * @see org.apache.commons.vfs2.provider.AbstractFileObject#doGetType() */ @Override - // TODO Remove deprecation warning suppression when Hadoop1 support is dropped - @SuppressWarnings("deprecation") protected FileType doGetType() throws Exception { try { doAttach(); if (null == stat) { return FileType.IMAGINARY; } - if (stat.isDir()) { + if (stat.isDirectory()) { return FileType.FOLDER; } else { return FileType.FILE; http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java ---------------------------------------------------------------------- diff --git a/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java b/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java index feab493..cbc8beb 100644 --- a/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java +++ b/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java @@ -65,7 +65,7 @@ public class AccumuloDFSBase { conf.setLong(DFSConfigKeys.DFS_BLOCK_SIZE_KEY, 1024 * 1024); // 1M blocksize try { - cluster = new MiniDFSCluster(conf, 1, true, null); + cluster = new MiniDFSCluster.Builder(conf).build(); cluster.waitClusterUp(); // We can't assume that the hostname of "localhost" will still be "localhost" after // starting up the NameNode. We may get mapped into a FQDN via settings in /etc/hosts. http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/test/pom.xml ---------------------------------------------------------------------- diff --git a/test/pom.xml b/test/pom.xml index b0a926f..16f4125 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -294,29 +294,6 @@ </dependency> </dependencies> </profile> - <!-- profile for building against Hadoop 1.x - Activate using: mvn -Dhadoop.profile=1 --> - <profile> - <id>hadoop-1</id> - <activation> - <property> - <name>hadoop.profile</name> - <value>1</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-tools</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - </profile> <!-- profile for building against Hadoop 2.x XXX Since this is the default, make sure to sync hadoop-default when changing. Activate using: mvn -Dhadoop.profile=2 --> http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java index 3a45215..00d1bf6 100644 --- a/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java +++ b/test/src/main/java/org/apache/accumulo/test/performance/scan/CollectTabletStats.java @@ -387,8 +387,6 @@ public class CollectTabletStats { return new ArrayList<FileRef>(MetadataTableUtil.getDataFileSizes(ke, context).keySet()); } - // TODO Remove deprecation warning suppression when Hadoop1 support is dropped - @SuppressWarnings("deprecation") private static void reportHdfsBlockLocations(List<FileRef> files) throws Exception { VolumeManager fs = VolumeManagerImpl.get(); @@ -396,7 +394,7 @@ public class CollectTabletStats { for (FileRef file : files) { FileStatus status = fs.getFileStatus(file.path()); - if (status.isDir()) { + if (status.isDirectory()) { // assume it is a map file status = fs.getFileStatus(new Path(file + "/data")); } http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java index d39f8df..515ea36 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/CopyTool.java @@ -47,8 +47,7 @@ public class CopyTool extends Configured implements Tool { @Override public int run(String[] args) throws Exception { - @SuppressWarnings("deprecation") - Job job = new Job(getConf(), this.getClass().getSimpleName()); + Job job = Job.getInstance(getConf(), this.getClass().getSimpleName()); job.setJarByClass(this.getClass()); if (job.getJar() == null) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java index 47b671c..1e384ed 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/MapRedVerifyTool.java @@ -78,8 +78,7 @@ public class MapRedVerifyTool extends Configured implements Tool { @Override public int run(String[] args) throws Exception { - @SuppressWarnings("deprecation") - Job job = new Job(getConf(), this.getClass().getSimpleName()); + Job job = Job.getInstance(getConf(), this.getClass().getSimpleName()); job.setJarByClass(this.getClass()); if (job.getJar() == null) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java index 1074e5a..095b5f7 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java @@ -54,9 +54,9 @@ public class BulkInsert extends Test { SequenceFile.Writer writer; - @SuppressWarnings("deprecation") SeqfileBatchWriter(Configuration conf, FileSystem fs, String file) throws IOException { - writer = new SequenceFile.Writer(fs, conf, new Path(file), Key.class, Value.class); + writer = SequenceFile.createWriter(conf, SequenceFile.Writer.file(fs.makeQualified(new Path(file))), SequenceFile.Writer.keyClass(Key.class), + SequenceFile.Writer.valueClass(Value.class)); } @Override http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/SortTool.java ---------------------------------------------------------------------- diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/SortTool.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/SortTool.java index 1247bc2..cc397de 100644 --- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/SortTool.java +++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/SortTool.java @@ -45,8 +45,7 @@ public class SortTool extends Configured implements Tool { } public int run(String[] args) throws Exception { - @SuppressWarnings("deprecation") - Job job = new Job(getConf(), this.getClass().getSimpleName()); + Job job = Job.getInstance(getConf(), this.getClass().getSimpleName()); job.setJarByClass(this.getClass()); if (job.getJar() == null) { http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/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 fcd7afa..b48bebb 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 @@ -92,8 +92,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterIT { } } - @SuppressWarnings("deprecation") - Job job = new Job(); + Job job = Job.getInstance(); AccumuloInputFormat.setInputTableName(job, table); AccumuloInputFormat.setZooKeeperInstance(job, clientConf); AccumuloInputFormat.setConnectorInfo(job, getPrincipal(), getToken()); http://git-wip-us.apache.org/repos/asf/accumulo/blob/d1535c5e/test/system/continuous/continuous-env.sh.example ---------------------------------------------------------------------- diff --git a/test/system/continuous/continuous-env.sh.example b/test/system/continuous/continuous-env.sh.example index 75cd0a5..0abd8c3 100644 --- a/test/system/continuous/continuous-env.sh.example +++ b/test/system/continuous/continuous-env.sh.example @@ -105,7 +105,6 @@ MASTER_RESTART_SLEEP_TIME=2 #Do we want to perturb HDFS? Only works on HDFS versions with HA, i.e. Hadoop 2 # AGITATE_HDFS=true -#Defaults to false for Accumulo versions that ship default against Hadoop 1 AGITATE_HDFS=false AGITATE_HDFS_SLEEP_TIME=10 AGITATE_HDFS_SUPERUSER=hdfs
