Repository: hive Updated Branches: refs/heads/master 55e4dd080 -> 8a804cccf
HIVE-19620: Change tmp directory used by PigServer in HCat tests (Jesus Camacho Rodriguez, reviewed by Daniel Dai) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/8a804ccc Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/8a804ccc Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/8a804ccc Branch: refs/heads/master Commit: 8a804cccf297d1bc7cccdcea767bbb00c5806c09 Parents: 55e4dd0 Author: Jesus Camacho Rodriguez <jcama...@apache.org> Authored: Mon May 21 09:48:23 2018 -0700 Committer: Jesus Camacho Rodriguez <jcama...@apache.org> Committed: Mon May 21 09:48:23 2018 -0700 ---------------------------------------------------------------------- .../hive/hcatalog/mapreduce/HCatBaseTest.java | 28 +++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/8a804ccc/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatBaseTest.java ---------------------------------------------------------------------- diff --git a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatBaseTest.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatBaseTest.java index 463d4a3..8471e5b 100644 --- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatBaseTest.java +++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatBaseTest.java @@ -116,22 +116,24 @@ public abstract class HCatBaseTest { * debugging easier */ public static PigServer createPigServer(boolean stopOnFailure) throws ExecException { + Properties p = new Properties(); + Path workDir = new Path(System.getProperty("test.tmp.dir", + "target" + File.separator + "test" + File.separator + "tmp")); + String testId = "HCatBaseTest_" + System.currentTimeMillis(); + p.put("mapred.local.dir", workDir + File.separator + testId + + File.separator + "mapred" + File.separator + "local"); + p.put("mapred.system.dir", workDir + File.separator + testId + + File.separator + "mapred" + File.separator + "system"); + p.put("mapreduce.jobtracker.staging.root.dir", workDir + File.separator + testId + + File.separator + "mapred" + File.separator + "staging"); + p.put("mapred.temp.dir", workDir + File.separator + testId + + File.separator + "mapred" + File.separator + "temp"); + p.put("pig.temp.dir", workDir + File.separator + testId + + File.separator + "pig" + File.separator + "temp"); if(stopOnFailure) { - Properties p = new Properties(); - Path workDir = new Path(System.getProperty("test.tmp.dir", - "target" + File.separator + "test" + File.separator + "tmp")); - String testId = "HCatBaseTest_" + System.currentTimeMillis(); - p.put("mapred.local.dir", workDir + File.separator + testId - + File.separator + "mapred" + File.separator + "local"); - p.put("mapred.system.dir", workDir + File.separator + testId - + File.separator + "mapred" + File.separator + "system"); - p.put("mapreduce.jobtracker.staging.root.dir", workDir + File.separator + testId - + File.separator + "mapred" + File.separator + "staging"); - p.put("mapred.temp.dir", workDir + File.separator + testId - + File.separator + "mapred" + File.separator + "temp"); p.put("stop.on.failure", Boolean.TRUE.toString()); return new PigServer(ExecType.LOCAL, p); } - return new PigServer(ExecType.LOCAL); + return new PigServer(ExecType.LOCAL, p); } }
