Repository: vxquery Updated Branches: refs/heads/master d8fca31cf -> dac53abcf
VXQUERY-194: Moved HDFS created test files to target Also automatically delete these files after the tests Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/dac53abc Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/dac53abc Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/dac53abc Branch: refs/heads/master Commit: dac53abcf3cd1c8ca9e603ff1640acf2058ba424 Parents: d8fca31 Author: Steven Glenn Jacobs <[email protected]> Authored: Tue Jun 7 14:05:53 2016 -0700 Committer: Steven Glenn Jacobs <[email protected]> Committed: Tue Jun 7 14:05:53 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/vxquery/xtest/MiniDFS.java | 7 ++----- .../src/test/java/org/apache/vxquery/xtest/VXQueryTest.java | 4 +++- 2 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/dac53abc/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/MiniDFS.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/MiniDFS.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/MiniDFS.java index a675150..345a6b5 100644 --- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/MiniDFS.java +++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/MiniDFS.java @@ -18,7 +18,6 @@ package org.apache.vxquery.xtest; import java.io.IOException; -import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.MiniDFSCluster; @@ -31,9 +30,8 @@ public class MiniDFS { private static final String PATH_TO_HADOOP_CONF = "src/test/resources/hadoop/conf"; private static final String DATA_PATH = "src/test/resources/TestSources/ghcnd"; - public void startHDFS() throws IOException { + public void startHDFS(String folder) throws IOException { - FileSystem lfs = FileSystem.getLocal(new Configuration()); JobConf conf = new JobConf(); conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/core-site.xml")); conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/mapred-site.xml")); @@ -41,9 +39,8 @@ public class MiniDFS { int numDataNodes = 1; int nameNodePort = 40000; - // cleanup artifacts created on the local file system - lfs.delete(new Path("build"), true); System.setProperty("hadoop.log.dir", "logs"); + System.setProperty("test.build.data", folder.concat("/")); MiniDFSCluster.Builder build = new MiniDFSCluster.Builder(conf); build.nameNodePort(nameNodePort); build.nameNodeHttpPort(nameNodePort + 34); http://git-wip-us.apache.org/repos/asf/vxquery/blob/dac53abc/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java index 11f7eb2..3679aba 100644 --- a/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java +++ b/vxquery-xtest/src/test/java/org/apache/vxquery/xtest/VXQueryTest.java @@ -65,9 +65,11 @@ public class VXQueryTest extends AbstractXQueryTest { FileUtils.deleteDirectory(tmp); } new File(TMP.concat("/indexFolder")).mkdirs(); + String HDFSFolder = TMP.concat("/hdfsFolder"); + new File(HDFSFolder).mkdirs(); dfs = new MiniDFS(); try { - dfs.startHDFS(); + dfs.startHDFS(HDFSFolder); } catch (IOException e) { System.err.println(e); }
