You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2015/09/17 05:23:17 UTC
tajo git commit: TAJO-1846: Python temp directory path should be
selected differently based on user platform.
Repository: tajo
Updated Branches:
refs/heads/master b68329101 -> 8ef49f018
TAJO-1846: Python temp directory path should be selected differently based on user platform.
Closes #761
Signed-off-by: Jihoon Son <ji...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/8ef49f01
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/8ef49f01
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/8ef49f01
Branch: refs/heads/master
Commit: 8ef49f0186ce813d44ba997b0fdde91497c87cda
Parents: b683291
Author: Dongkyu Hwangbo <hw...@gmail.com>
Authored: Thu Sep 17 12:16:26 2015 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Thu Sep 17 12:23:20 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/8ef49f01/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 0ff4355..830464e 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/8ef49f01/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 {