changed file path in tests to work with new filesystem check
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/63c910ed Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/63c910ed Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/63c910ed Branch: refs/heads/steven/hdfs Commit: 63c910ed866135d404b7fd619a7f248c68e42898 Parents: 1062664 Author: efikalti <[email protected]> Authored: Wed Sep 16 23:23:22 2015 +0300 Committer: efikalti <[email protected]> Committed: Wed Sep 16 23:23:22 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/vxquery/hdfs2/HDFSFunctions.java | 15 ++++++++++++--- .../src/main/resources/conf/cluster.properties | 2 +- .../main/java/org/apache/vxquery/xtest/MiniDFS.java | 5 ++++- .../Queries/XQuery/HDFS/Aggregate/avgHDFS.xq | 2 +- .../Queries/XQuery/HDFS/Aggregate/countHDFS.xq | 2 +- .../Queries/XQuery/HDFS/Aggregate/maxHDFS.xq | 2 +- .../Queries/XQuery/HDFS/Aggregate/minHDFS.xq | 2 +- .../Queries/XQuery/HDFS/Aggregate/sumHDFS.xq | 2 +- 8 files changed, 22 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/63c910ed/vxquery-core/src/main/java/org/apache/vxquery/hdfs2/HDFSFunctions.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/hdfs2/HDFSFunctions.java b/vxquery-core/src/main/java/org/apache/vxquery/hdfs2/HDFSFunctions.java index 5435b48..0680eb3 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/hdfs2/HDFSFunctions.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/hdfs2/HDFSFunctions.java @@ -174,12 +174,21 @@ public class HDFSFunctions { if (this.conf_path == null) { // load properties file Properties prop = new Properties(); - String propFilePath = "vxquery-server/src/main/resources/conf/cluster.properties"; + String propFilePath = "../vxquery-server/src/main/resources/conf/cluster.properties"; try { prop.load(new FileInputStream(propFilePath)); } catch (FileNotFoundException e) { - if (LOGGER.isLoggable(Level.SEVERE)) { - LOGGER.severe(e.getMessage()); + propFilePath = "vxquery-server/src/main/resources/conf/cluster.properties"; + try { + prop.load(new FileInputStream(propFilePath)); + } catch (FileNotFoundException e1) { + if (LOGGER.isLoggable(Level.SEVERE)) { + LOGGER.severe(e1.getMessage()); + } + } catch (IOException e1) { + if (LOGGER.isLoggable(Level.SEVERE)) { + LOGGER.severe(e1.getMessage()); + } } } catch (IOException e) { if (LOGGER.isLoggable(Level.SEVERE)) { http://git-wip-us.apache.org/repos/asf/vxquery/blob/63c910ed/vxquery-server/src/main/resources/conf/cluster.properties ---------------------------------------------------------------------- diff --git a/vxquery-server/src/main/resources/conf/cluster.properties b/vxquery-server/src/main/resources/conf/cluster.properties index f5106cb..3ce563f 100644 --- a/vxquery-server/src/main/resources/conf/cluster.properties +++ b/vxquery-server/src/main/resources/conf/cluster.properties @@ -54,4 +54,4 @@ NCJAVA_OPTS="-server -Xmx7G -Djava.util.logging.config.file=./vxquery-benchmark/ # Yourkit mac option: -agentpath:/Applications/YourKit_Java_Profiler.app/bin/mac/libyjpagent.jnilib=sampling #HDFS configuration directory -HDFS_CONF=$CONF_PATH$ +HDFS_CONF=$CONF_PATH$ \ No newline at end of file http://git-wip-us.apache.org/repos/asf/vxquery/blob/63c910ed/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 b620656..c8c5fa8 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 @@ -20,7 +20,9 @@ import java.io.IOException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.LocatedFileStatus; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.fs.RemoteIterator; import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.StartupOption; import org.apache.hadoop.mapred.JobConf; @@ -77,7 +79,8 @@ public class MiniDFS { src = new Path(DATA_PATH); } } - Path dest = new Path("vxquery-hdfs-test"); + dfs.mkdirs(new Path("/tmp")); + Path dest = new Path("/tmp/vxquery-hdfs-test"); dfs.copyFromLocalFile(src, dest); if (dfs.exists(dest)) { System.err.println("Test files copied to HDFS successfully"); http://git-wip-us.apache.org/repos/asf/vxquery/blob/63c910ed/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/avgHDFS.xq ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/avgHDFS.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/avgHDFS.xq index 676b56f..3214b97 100644 --- a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/avgHDFS.xq +++ b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/avgHDFS.xq @@ -18,7 +18,7 @@ (: XQuery Aggregate Query :) (: Find the average minimum temperature. :) fn:avg( - let $collection := "vxquery-hdfs-test" + let $collection := "hdfs://tmp/vxquery-hdfs-test" for $r in collection($collection)/dataCollection/data where $r/dataType eq "TMIN" return $r/value http://git-wip-us.apache.org/repos/asf/vxquery/blob/63c910ed/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/countHDFS.xq ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/countHDFS.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/countHDFS.xq index 76b0815..7940b03 100644 --- a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/countHDFS.xq +++ b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/countHDFS.xq @@ -18,7 +18,7 @@ (: XQuery Aggregate Query :) (: Find the number of wind sensor readings. :) fn:count( - let $collection := "vxquery-hdfs-test" + let $collection := "hdfs://tmp/vxquery-hdfs-test" for $r in collection($collection)/dataCollection/data where $r/dataType eq "AWND" return $r/value http://git-wip-us.apache.org/repos/asf/vxquery/blob/63c910ed/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/maxHDFS.xq ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/maxHDFS.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/maxHDFS.xq index c73c264..0db1980 100644 --- a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/maxHDFS.xq +++ b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/maxHDFS.xq @@ -18,7 +18,7 @@ (: XQuery Aggregate Query :) (: Find the highest max temperature. :) fn:max( - let $collection := "vxquery-hdfs-test" + let $collection := "hdfs://tmp/vxquery-hdfs-test" for $r in collection($collection)/dataCollection/data where $r/dataType eq "TMAX" return $r/value http://git-wip-us.apache.org/repos/asf/vxquery/blob/63c910ed/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/minHDFS.xq ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/minHDFS.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/minHDFS.xq index 4884a33..869e222 100644 --- a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/minHDFS.xq +++ b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/minHDFS.xq @@ -18,7 +18,7 @@ (: XQuery Aggregate Query :) (: Find the lowest min temperature. :) fn:min( - let $collection := "vxquery-hdfs-test" + let $collection := "hdfs://tmp/vxquery-hdfs-test" for $r in collection($collection)/dataCollection/data where $r/dataType eq "TMIN" return $r/value http://git-wip-us.apache.org/repos/asf/vxquery/blob/63c910ed/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/sumHDFS.xq ---------------------------------------------------------------------- diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/sumHDFS.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/sumHDFS.xq index 1625183..fb1e12c 100644 --- a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/sumHDFS.xq +++ b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/sumHDFS.xq @@ -18,7 +18,7 @@ (: XQuery Aggregate Query :) (: Find the total precipitation. :) fn:sum( - let $collection := "vxquery-hdfs-test" + let $collection := "hdfs://tmp/vxquery-hdfs-test" for $r in collection($collection)/dataCollection/data where $r/dataType eq "PRCP" return $r/value
