Repository: tajo Updated Branches: refs/heads/branch-0.11.0 84c928dfa -> 4ac2a4c4a
TAJO-1846: Python temp directory path should be selected differently based on user platform. Signed-off-by: Jihoon Son <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/4ac2a4c4 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/4ac2a4c4 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/4ac2a4c4 Branch: refs/heads/branch-0.11.0 Commit: 4ac2a4c4a4e68be4c8d5efd89f571c088411b354 Parents: 84c928d Author: Dongkyu Hwangbo <[email protected]> Authored: Thu Sep 17 12:25:33 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Thu Sep 17 12:25:33 2015 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ .../apache/tajo/plan/function/python/PythonScriptEngine.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/4ac2a4c4/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 36e71e8..a764984 100644 --- a/CHANGES +++ b/CHANGES @@ -269,6 +269,9 @@ Release 0.11.0 - unreleased BUG FIXES + TAJO-1846: Python temp directory path should be selected differently based + on user platform. (Contributed by Dongkyu Hwangbo, Committed by jihoon) + TAJO-1851: Can not release a different rack task. (jinho) TAJO-1830: Fix race condition in HdfsServiceTracker. (jinho) http://git-wip-us.apache.org/repos/asf/tajo/blob/4ac2a4c4/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java b/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java index e202d64..cb49d49 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java @@ -255,9 +255,9 @@ public class PythonScriptEngine extends TajoScriptEngine { private static final String PYTHON_LANGUAGE = "python"; private static final String TAJO_UTIL_NAME = "tajo_util.py"; private static final String CONTROLLER_NAME = "controller.py"; - private static final String BASE_DIR = FileUtils.getTempDirectoryPath() + "/tajo-" + System.getProperty("user.name") + "/python"; - private static final String PYTHON_CONTROLLER_JAR_PATH = "/python" + File.separator + CONTROLLER_NAME; // Relative to root of tajo jar. - private static final String PYTHON_TAJO_UTIL_JAR_PATH = "/python" + File.separator + TAJO_UTIL_NAME; // Relative to root of tajo jar. + private static final String BASE_DIR = FileUtils.getTempDirectoryPath().toString() + File.separator + "tajo-" + System.getProperty("user.name") + File.separator + "python"; + private static final String PYTHON_CONTROLLER_JAR_PATH = "/python/" + CONTROLLER_NAME; // Relative to root of tajo jar. + private static final String PYTHON_TAJO_UTIL_JAR_PATH = "/python/" + TAJO_UTIL_NAME; // Relative to root of tajo jar. // Indexes for arguments being passed to external process enum COMMAND_IDX {
