tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjf...@apache.org
Subject tez git commit: TEZ-2075. Incompatible issue caused by TEZ-1233 that TezConfiguration.TEZ_SITE_XML is made private (zjffdu)
Date Fri, 13 Feb 2015 14:45:31 GMT
Repository: tez
Updated Branches:
  refs/heads/master b26fdfe7f -> 8e8405b37


TEZ-2075. Incompatible issue caused by TEZ-1233 that TezConfiguration.TEZ_SITE_XML is made
private (zjffdu)


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

Branch: refs/heads/master
Commit: 8e8405b370f647d9a3c23faf9ef7a6b88c99c572
Parents: b26fdfe
Author: Jeff Zhang <zjffdu@apache.org>
Authored: Fri Feb 13 22:45:08 2015 +0800
Committer: Jeff Zhang <zjffdu@apache.org>
Committed: Fri Feb 13 22:45:08 2015 +0800

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 .../src/main/java/org/apache/tez/dag/api/TezConfiguration.java    | 2 +-
 .../test/java/org/apache/tez/dag/api/TestTezConfiguration.java    | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/8e8405b3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d62308b..df584a9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ Release 0.7.0: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2075. Incompatible issue caused by TEZ-1233 that TezConfiguration.TEZ_SITE_XML is made
private
   TEZ-2082. Race condition in TaskAttemptListenerImpTezDag.getTask()
   TEZ-1233. Allow configuration of framework parameters per vertex.
   TEZ-2045. TaskAttemptListener should not pull Tasks from AMContainer. Instead these should
be registered with the listener.

http://git-wip-us.apache.org/repos/asf/tez/blob/8e8405b3/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
----------------------------------------------------------------------
diff --git a/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java b/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
index cfd6426..0bf78f9 100644
--- a/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
+++ b/tez-api/src/main/java/org/apache/tez/dag/api/TezConfiguration.java
@@ -43,7 +43,7 @@ import com.google.common.annotations.VisibleForTesting;
 @Public
 public class TezConfiguration extends Configuration {
 
-  private final static String TEZ_SITE_XML = "tez-site.xml";
+  public final static String TEZ_SITE_XML = "tez-site.xml";
 
   private final static Log LOG = LogFactory.getLog(TezConfiguration.class);
 

http://git-wip-us.apache.org/repos/asf/tez/blob/8e8405b3/tez-api/src/test/java/org/apache/tez/dag/api/TestTezConfiguration.java
----------------------------------------------------------------------
diff --git a/tez-api/src/test/java/org/apache/tez/dag/api/TestTezConfiguration.java b/tez-api/src/test/java/org/apache/tez/dag/api/TestTezConfiguration.java
index 4423f16..76d5f3c 100644
--- a/tez-api/src/test/java/org/apache/tez/dag/api/TestTezConfiguration.java
+++ b/tez-api/src/test/java/org/apache/tez/dag/api/TestTezConfiguration.java
@@ -57,7 +57,8 @@ public class TestTezConfiguration {
     Class<?> c = TezConfiguration.class;
     Set<String> expectedKeys = new HashSet<String>();
     for (Field f : c.getFields()) {
-      if (!f.getName().endsWith("DEFAULT") && f.getType() == String.class) {
+      if (!f.getName().endsWith("DEFAULT") && f.getType() == String.class
+          && !f.getName().equals("TEZ_SITE_XML")) {
         String value = (String)f.get(null);
         // not prefix
         if (!value.endsWith(".")) {


Mime
View raw message