accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject accumulo git commit: ACCUMULO-3479 Drop Hadoop 1 support
Date Thu, 15 Jan 2015 23:46:18 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master a4274f9bf -> 51a78ecd7


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/51a78ecd
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/51a78ecd
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/51a78ecd

Branch: refs/heads/master
Commit: 51a78ecd7267e62df86d716be18956b25a600564
Parents: a4274f9
Author: Christopher Tubbs <ctubbsii@apache.org>
Authored: Wed Dec 10 22:29:26 2014 -0500
Committer: Christopher Tubbs <ctubbsii@apache.org>
Committed: Thu Jan 15 18:45:59 2015 -0500

----------------------------------------------------------------------
 assemble/bin/bootstrap_config.sh                                 | 2 +-
 pom.xml                                                          | 4 ++--
 .../java/org/apache/accumulo/test/continuous/ContinuousMoru.java | 3 +--
 .../org/apache/accumulo/test/continuous/ContinuousVerify.java    | 3 +--
 .../java/org/apache/accumulo/test/randomwalk/shard/SortTool.java | 1 +
 5 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/51a78ecd/assemble/bin/bootstrap_config.sh
----------------------------------------------------------------------
diff --git a/assemble/bin/bootstrap_config.sh b/assemble/bin/bootstrap_config.sh
index 5268272..f6eb4d1 100755
--- a/assemble/bin/bootstrap_config.sh
+++ b/assemble/bin/bootstrap_config.sh
@@ -323,7 +323,7 @@ else
   mv temp ${CONF_DIR}/${ACCUMULO_SITE}
 fi
 
-#Configure for hadoop 1
+# Configure hadoop version
 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
-->/' \

http://git-wip-us.apache.org/repos/asf/accumulo/blob/51a78ecd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index be8adb6..dda1cfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,7 +121,7 @@
     <bouncycastle.version>1.50</bouncycastle.version>
     <!-- surefire/failsafe plugin option -->
     <forkCount>1</forkCount>
-    <!-- overwritten in profiles hadoop-2 -->
+    <!-- overwritten in hadoop profiles -->
     <hadoop.version>2.2.0</hadoop.version>
     <htrace.version>3.0.4</htrace.version>
     <httpclient.version>3.1</httpclient.version>
@@ -135,7 +135,7 @@
     <!-- surefire/failsafe plugin option -->
     <reuseForks>false</reuseForks>
     <sealJars>false</sealJars>
-    <!-- overwritten in profiles hadoop-2 -->
+    <!-- overwritten in hadoop profiles -->
     <slf4j.version>1.7.5</slf4j.version>
     <!-- Thrift version -->
     <thrift.version>0.9.1</thrift.version>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/51a78ecd/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java
index 0cee5ca..4b5c3e7 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousMoru.java
@@ -133,8 +133,7 @@ public class ContinuousMoru extends Configured implements Tool {
     BatchWriterOpts bwOpts = new BatchWriterOpts();
     opts.parseArgs(ContinuousMoru.class.getName(), args, bwOpts);
 
-    @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/51a78ecd/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
index 1171ea3..fccaeeb 100644
--- a/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
+++ b/test/src/main/java/org/apache/accumulo/test/continuous/ContinuousVerify.java
@@ -164,8 +164,7 @@ public class ContinuousVerify extends Configured implements Tool {
     Opts opts = new Opts();
     opts.parseArgs(this.getClass().getName(), args);
 
-    @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/51a78ecd/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 cc397de..dcfe50b 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
@@ -44,6 +44,7 @@ public class SortTool extends Configured implements Tool {
     this.splits = splits;
   }
 
+  @Override
   public int run(String[] args) throws Exception {
     Job job = Job.getInstance(getConf(), this.getClass().getSimpleName());
     job.setJarByClass(this.getClass());


Mime
View raw message