Return-Path: X-Original-To: apmail-tajo-commits-archive@minotaur.apache.org Delivered-To: apmail-tajo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 30276186A5 for ; Thu, 17 Sep 2015 03:23:18 +0000 (UTC) Received: (qmail 8136 invoked by uid 500); 17 Sep 2015 03:23:18 -0000 Delivered-To: apmail-tajo-commits-archive@tajo.apache.org Received: (qmail 8113 invoked by uid 500); 17 Sep 2015 03:23:17 -0000 Mailing-List: contact commits-help@tajo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tajo.apache.org Delivered-To: mailing list commits@tajo.apache.org Received: (qmail 8104 invoked by uid 99); 17 Sep 2015 03:23:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Sep 2015 03:23:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8EFC1E01F5; Thu, 17 Sep 2015 03:23:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jihoonson@apache.org To: commits@tajo.apache.org Message-Id: <2c0ed017d9cd4bbcbb253761bec9acb9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: tajo git commit: TAJO-1846: Python temp directory path should be selected differently based on user platform. Date: Thu, 17 Sep 2015 03:23:17 +0000 (UTC) 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 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 Authored: Thu Sep 17 12:16:26 2015 +0900 Committer: Jihoon Son 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 {