You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by tu...@apache.org on 2012/06/30 06:00:33 UTC
svn commit: r1355627 - in /incubator/oozie/trunk:
core/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java
core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
release-log.txt
Author: tucu
Date: Sat Jun 30 04:00:32 2012
New Revision: 1355627
URL: http://svn.apache.org/viewvc?rev=1355627&view=rev
Log:
OOZIE-895 Oozie Hive-action should use Hive var replacement (rkanter via tucu)
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
incubator/oozie/trunk/release-log.txt
Modified: incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java?rev=1355627&r1=1355626&r2=1355627&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java (original)
+++ incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/HiveMain.java Sat Jun 30 04:00:32 2012
@@ -222,15 +222,15 @@ public class HiveMain extends LauncherMa
// Prepare the Hive Script
String script = readStringFromFile(scriptPath);
System.out.println();
- System.out.println("Original script [" + scriptPath + "] content: ");
+ System.out.println("Script [" + scriptPath + "] content: ");
System.out.println("------------------------");
System.out.println(script);
System.out.println("------------------------");
System.out.println();
+ // Pass any parameters to Hive via arguments
String[] params = MapReduceMain.getStrings(hiveConf, HIVE_PARAMS);
if (params.length > 0) {
- Map<String, String> varMap = new HashMap<String, String>();
System.out.println("Parameters:");
System.out.println("------------------------");
for (String param : params) {
@@ -242,22 +242,11 @@ public class HiveMain extends LauncherMa
} else if (idx == 0) {
throw new RuntimeException("Parameter value not specified: " + param);
}
- String var = param.substring(0, idx);
- String val = param.substring(idx + 1, param.length());
- varMap.put(var, val);
+ arguments.add("--hivevar");
+ arguments.add(param);
}
System.out.println("------------------------");
System.out.println();
-
- String resolvedScript = substitute(varMap, script);
- scriptPath = scriptPath + ".sub";
- writeStringToFile(scriptPath, resolvedScript);
-
- System.out.println("Resolved script [" + scriptPath + "] content: ");
- System.out.println("------------------------");
- System.out.println(resolvedScript);
- System.out.println("------------------------");
- System.out.println();
}
arguments.add("-f");
@@ -326,27 +315,4 @@ public class HiveMain extends LauncherMa
}
}
}
-
- private static void writeStringToFile(String filePath, String str) throws IOException {
- BufferedWriter out = null;
- try {
- out = new BufferedWriter(new FileWriter(filePath));
- out.write(str);
- }
- finally {
- if (out != null) {
- out.close();
- }
- }
- }
-
- static String substitute(Map<String, String> vars, String expr) {
- for (Map.Entry<String, String> entry : vars.entrySet()) {
- String var = "${" + entry.getKey() + "}";
- String value = entry.getValue();
- expr = expr.replace(var, value);
- }
- return expr;
- }
-
}
Modified: incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java?rev=1355627&r1=1355626&r2=1355627&view=diff
==============================================================================
--- incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java (original)
+++ incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java Sat Jun 30 04:00:32 2012
@@ -67,15 +67,6 @@ public class TestHiveActionExecutor exte
HiveActionExecutor.class.getName());
}
- public void testVariableSubstitutionSimple() throws Exception {
- String key = "test.random.key";
- String keyExpression = "${" + key + "}";
- Map<String, String> varMap = new HashMap<String, String>();
- varMap.put(key, keyExpression);
- String value = HiveMain.substitute(varMap, keyExpression);
- assertTrue("Unexpected value " + value, value.equals(keyExpression));
- }
-
public void testSetupMethods() throws Exception {
HiveActionExecutor ae = new HiveActionExecutor();
assertEquals("hive", ae.getType());
Modified: incubator/oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1355627&r1=1355626&r2=1355627&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Sat Jun 30 04:00:32 2012
@@ -1,5 +1,6 @@
-- Oozie 3.3.0 release (trunk - unreleased)
+OOZIE-895 Oozie Hive-action should use Hive var replacement (rkanter via tucu)
OOZIE-888 Change default logging levels for oozieops and hadoop.security.authentication.server to INFO from DEBUG (rkanter via tucu)
OOZIE-896 TestFsActionExecutor.java failing (britt via virag)
OOZIE-881 Support for recursive chmod (britt via virag)