tez git commit: TEZ-2461. tez-history-parser compile fails with hadoop-2.4 (rbalamohan)

[rb...@apache.org]

Repository: tez
Updated Branches:
  refs/heads/master 11aa17e01 -> 2fc34ed67


TEZ-2461. tez-history-parser compile fails with hadoop-2.4 (rbalamohan)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/2fc34ed6
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/2fc34ed6
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/2fc34ed6

Branch: refs/heads/master
Commit: 2fc34ed6719b10ee3d8b31d2d105c8be7f62a69a
Parents: 11aa17e
Author: Rajesh Balamohan <rb...@apache.org>
Authored: Tue May 19 10:29:45 2015 +0530
Committer: Rajesh Balamohan <rb...@apache.org>
Committed: Tue May 19 10:29:45 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                  | 2 ++
 .../src/main/java/org/apache/tez/history/ATSImportTool.java  | 8 ++++----
 .../main/java/org/apache/tez/history/parser/utils/Utils.java | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/2fc34ed6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 21ae041..98ccafe 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,8 @@ Release 0.8.0: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2461. tez-history-parser compile fails with hadoop-2.4.
+  TEZ-2076. Tez framework to extract/analyze data stored in ATS for specific dag.
   TEZ-2436. Tez UI: Add cancel button in column selector.
   TEZ-2351. Remove GroupByOrderbyMRRTest example from tez-tests.
   TEZ-2419. Inputs/Outputs should inform the Processor about Interrupts when interrupted during a blocking Op.

http://git-wip-us.apache.org/repos/asf/tez/blob/2fc34ed6/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/ATSImportTool.java
----------------------------------------------------------------------
diff --git a/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/ATSImportTool.java b/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/ATSImportTool.java
index 3545cec..87da000 100644
--- a/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/ATSImportTool.java
+++ b/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/ATSImportTool.java
@@ -21,6 +21,7 @@ package org.apache.tez.history;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
+import com.google.common.base.Strings;
 import com.sun.jersey.api.client.Client;
 import com.sun.jersey.api.client.ClientHandlerException;
 import com.sun.jersey.api.client.ClientResponse;
@@ -41,7 +42,6 @@ import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
-import org.apache.directory.api.util.Strings;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.http.HttpConfig;
@@ -127,7 +127,7 @@ public class ATSImportTool extends Configured implements Tool {
 
   public ATSImportTool(String baseUri, String dagId, File baseDownloadDir, int batchSize)
       throws TezException {
-    Preconditions.checkArgument(!Strings.isEmpty(dagId), "dagId can not be null or empty");
+    Preconditions.checkArgument(!Strings.isNullOrEmpty(dagId), "dagId can not be null or empty");
     Preconditions.checkArgument(baseDownloadDir != null, "downloadDir can not be null");
     Preconditions.checkArgument(TezDAGID.fromString(dagId) != null, "Not a valid DAG ID " + dagId);
 
@@ -404,11 +404,11 @@ public class ATSImportTool extends Configured implements Tool {
       } else {
         yarnTimelineAddress = conf.get(Constants.TIMELINE_SERVICE_WEBAPP_HTTP_ADDRESS_CONF_NAME);
       }
-      Preconditions.checkArgument(!Strings.isEmpty(yarnTimelineAddress), "Yarn timeline address can"
+      Preconditions.checkArgument(!Strings.isNullOrEmpty(yarnTimelineAddress), "Yarn timeline address can"
           + " not be empty. Please check configurations.");
     } else {
       yarnTimelineAddress = yarnTimelineAddress.trim();
-      Preconditions.checkArgument(!Strings.isEmpty(yarnTimelineAddress), "Yarn timeline address can"
+      Preconditions.checkArgument(!Strings.isNullOrEmpty(yarnTimelineAddress), "Yarn timeline address can"
           + " not be empty. Please provide valid url with --" +
           YARN_TIMELINE_SERVICE_ADDRESS + " option");
     }

http://git-wip-us.apache.org/repos/asf/tez/blob/2fc34ed6/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/parser/utils/Utils.java
----------------------------------------------------------------------
diff --git a/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/parser/utils/Utils.java b/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/parser/utils/Utils.java
index 16ef4c9..d5a66e3 100644
--- a/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/parser/utils/Utils.java
+++ b/tez-plugins/tez-history-parser/src/main/java/org/apache/tez/history/parser/utils/Utils.java
@@ -18,17 +18,17 @@
 
 package org.apache.tez.history.parser.utils;
 
-import org.apache.directory.api.util.Strings;
+import com.google.common.base.Strings;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.log4j.ConsoleAppender;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
-import org.apache.tez.history.parser.datamodel.Constants;
-import org.apache.tez.history.parser.datamodel.Event;
 import org.apache.tez.common.counters.CounterGroup;
 import org.apache.tez.common.counters.TezCounter;
 import org.apache.tez.common.counters.TezCounters;
+import org.apache.tez.history.parser.datamodel.Constants;
+import org.apache.tez.history.parser.datamodel.Event;
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONException;
 import org.codehaus.jettison.json.JSONObject;
@@ -110,7 +110,7 @@ public class Utils {
   }
 
   public static void setupRootLogger() {
-    if (Strings.isEmpty(System.getProperty(LOG4J_CONFIGURATION))) {
+    if (Strings.isNullOrEmpty(System.getProperty(LOG4J_CONFIGURATION))) {
       //By default print to console with INFO level
       Logger.getRootLogger().
           addAppender(new ConsoleAppender(new PatternLayout(PatternLayout.TTCC_CONVERSION_PATTERN)));