OOZIE-2845 Replace reflection-based code which sets variable in HiveConf (pbacsko via abhishekbafna)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/6bac8474 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/6bac8474 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/6bac8474 Branch: refs/heads/oya Commit: 6bac84745b9c62907e8cc6a16bad6c76ac3eb9c6 Parents: e3590b4 Author: abhisek bafna <[email protected]> Authored: Mon Apr 3 20:45:54 2017 +0530 Committer: abhisek bafna <[email protected]> Committed: Mon Apr 3 20:45:54 2017 +0530 ---------------------------------------------------------------------- .../src/test/java/org/apache/oozie/test/MiniHCatServer.java | 7 +------ release-log.txt | 1 + .../main/java/org/apache/oozie/action/hadoop/HiveMain.java | 7 +------ .../main/java/org/apache/oozie/action/hadoop/SparkMain.java | 9 +-------- 4 files changed, 4 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/6bac8474/core/src/test/java/org/apache/oozie/test/MiniHCatServer.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/test/MiniHCatServer.java b/core/src/test/java/org/apache/oozie/test/MiniHCatServer.java index b2f7282..85b0e97 100644 --- a/core/src/test/java/org/apache/oozie/test/MiniHCatServer.java +++ b/core/src/test/java/org/apache/oozie/test/MiniHCatServer.java @@ -24,7 +24,6 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.io.IOException; -import java.lang.reflect.Field; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; @@ -146,11 +145,7 @@ public class MiniHCatServer { } public static void resetHiveConfStaticVariables() throws Exception { - // HiveConf initializes location of hive-site.xml in static block. - // So this is needed so that tests like TestHiveMain that create hive-site.xml don't fail. - Field declaredField = HiveConf.class.getDeclaredField("hiveSiteURL"); - declaredField.setAccessible(true); - declaredField.set(null, HiveConf.class.getClassLoader().getResource("hive-site.xml")); + HiveConf.setHiveSiteLocation(HiveConf.class.getClassLoader().getResource("hive-site.xml")); } private void setSystemProperty(String name, String value) { http://git-wip-us.apache.org/repos/asf/oozie/blob/6bac8474/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 7757487..89405a5 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.4.0 release (trunk - unreleased) +OOZIE-2845 Replace reflection-based code which sets variable in HiveConf (pbacsko via abhishekbafna) OOZIE-2831 Update maven-project-info-reports-plugin to 2.9 (asasvari via gezapeti) OOZIE-2753 Update Docs for Jetty Tomcat changes (asasvari via abhishekbafna) OOZIE-2841 Limit FindBugs diff errors in JIRA comments (andras.piros via gezapeti) http://git-wip-us.apache.org/repos/asf/oozie/blob/6bac8474/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java ---------------------------------------------------------------------- diff --git a/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java b/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java index bc8ab29..f314bab 100644 --- a/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java +++ b/sharelib/hive/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java @@ -24,7 +24,6 @@ import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; import java.io.OutputStream; -import java.lang.reflect.Field; import java.net.URL; import java.util.ArrayList; import java.util.HashSet; @@ -207,11 +206,7 @@ public class HiveMain extends LauncherMain { // Reset the hiveSiteURL static variable as we just created hive-site.xml. // If prepare block had a drop partition it would have been initialized to null. - Field declaredField = HiveConf.class.getDeclaredField("hiveSiteURL"); - if (declaredField != null) { - declaredField.setAccessible(true); - declaredField.set(null, HiveConf.class.getClassLoader().getResource("hive-site.xml")); - } + HiveConf.setHiveSiteLocation(HiveConf.class.getClassLoader().getResource("hive-site.xml")); return hiveConf; } http://git-wip-us.apache.org/repos/asf/oozie/blob/6bac8474/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java ---------------------------------------------------------------------- diff --git a/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java b/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java index c24d95c..88de5c4 100644 --- a/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java +++ b/sharelib/spark/src/main/java/org/apache/oozie/action/hadoop/SparkMain.java @@ -22,7 +22,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; -import java.lang.reflect.Field; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; @@ -586,13 +585,7 @@ public class SparkMain extends LauncherMain { // hive-site.xml. // If prepare block had a drop partition it would have been initialized // to null. - try { - Field declaredField = HiveConf.class.getDeclaredField("hiveSiteURL"); - declaredField.setAccessible(true); - declaredField.set(null, HiveConf.class.getClassLoader().getResource("hive-site.xml")); - } - catch (Throwable ignore) { - } + HiveConf.setHiveSiteLocation(HiveConf.class.getClassLoader().getResource("hive-site.xml")); } /**
