vxquery-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sjaco...@apache.org
Subject [17/40] vxquery git commit: MiniDFSCluster tests, user needs to change the path to his vxquery project path
Date Tue, 17 May 2016 23:09:30 GMT
MiniDFSCluster tests, user needs to change the path to his vxquery project path


Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/b33b1947
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/b33b1947
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/b33b1947

Branch: refs/heads/steven/hdfs
Commit: b33b1947af1dcf0f077f2f771a6f4d714f5fd512
Parents: 7ef1b62
Author: efikalti <efikalti@gmail.com>
Authored: Thu Jul 16 14:23:30 2015 +0300
Committer: efikalti <efikalti@gmail.com>
Committed: Thu Jul 16 14:23:30 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/vxquery/xtest/Main.java     |  2 -
 .../java/org/apache/vxquery/xtest/MiniDFS.java  | 91 ++++++++++++++++++++
 .../java/org/apache/vxquery/xtest/XTest.java    | 68 ---------------
 .../org/apache/vxquery/xtest/VXQueryTest.java   | 19 ++++
 .../HDFS/Aggregate/avgHDFS.txt                  |  1 +
 .../HDFS/Aggregate/countHDFS.txt                |  1 +
 .../HDFS/Aggregate/maxHDFS.txt                  |  1 +
 .../HDFS/Aggregate/minHDFS.txt                  |  1 +
 .../HDFS/Aggregate/sumHDFS.txt                  |  1 +
 .../HDFS/Partition-1/avgHDFS.txt                |  1 -
 .../HDFS/Partition-1/countHDFS.txt              |  1 -
 .../HDFS/Partition-1/maxHDFS.txt                |  1 -
 .../HDFS/Partition-1/minHDFS.txt                |  1 -
 .../HDFS/Partition-1/sumHDFS.txt                |  1 -
 .../Queries/XQuery/HDFS/Aggregate/avgHDFS.xq    | 25 ++++++
 .../Queries/XQuery/HDFS/Aggregate/countHDFS.xq  | 25 ++++++
 .../Queries/XQuery/HDFS/Aggregate/maxHDFS.xq    | 25 ++++++
 .../Queries/XQuery/HDFS/Aggregate/minHDFS.xq    | 25 ++++++
 .../Queries/XQuery/HDFS/Aggregate/sumHDFS.xq    | 25 ++++++
 .../Queries/XQuery/HDFS/Partition-1/avgHDFS.xq  | 25 ------
 .../XQuery/HDFS/Partition-1/countHDFS.xq        | 25 ------
 .../Queries/XQuery/HDFS/Partition-1/maxHDFS.xq  | 25 ------
 .../Queries/XQuery/HDFS/Partition-1/minHDFS.xq  | 25 ------
 .../Queries/XQuery/HDFS/Partition-1/sumHDFS.xq  | 25 ------
 .../TestSources/hdfs-test-data/AS000000003.xml  | 18 ----
 .../hdfs-test-data/AS000000003_200303_0.xml     | 18 ----
 .../TestSources/hdfs-test-data/US000000001.xml  | 18 ----
 .../hdfs-test-data/US000000001_200101_0.xml     | 18 ----
 .../TestSources/hdfs-test-data/US000000002.xml  | 18 ----
 .../hdfs-test-data/US000000002_200202_0.xml     | 18 ----
 .../TestSources/hdfs-test-data/US000000004.xml  | 18 ----
 .../hdfs-test-data/US000000004_200404_0.xml     | 18 ----
 .../src/test/resources/VXQueryCatalog.xml       | 11 +--
 .../cat/HDFSAggregatePartition1Queries.xml      | 48 -----------
 .../test/resources/cat/HDFSAggregateQueries.xml | 48 +++++++++++
 35 files changed, 292 insertions(+), 399 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/Main.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/Main.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/Main.java
index 83d56be..616a114 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/Main.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/Main.java
@@ -30,9 +30,7 @@ public class Main {
         }
 
         XTest xts = new XTest(opts);
-        xts.setupHDFS();
         xts.init();
         xts.waitForCompletion();
-        xts.shutdownDFS();
     }
 }

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/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
new file mode 100644
index 0000000..b620656
--- /dev/null
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/MiniDFS.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+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;
+import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.StartupOption;
+import org.apache.hadoop.mapred.JobConf;
+
+public class MiniDFS {
+
+    private MiniDFSCluster dfsCluster;
+
+    public void miniDFS() {
+
+    }
+
+    public void startHDFS() throws IOException {
+
+        FileSystem lfs = FileSystem.getLocal(new Configuration());
+        JobConf conf = new JobConf();
+        String PATH_TO_HADOOP_CONF = "src/test/resources/hadoop/conf";
+        Path hdfs_conf = new Path(PATH_TO_HADOOP_CONF);
+        if (!lfs.exists(hdfs_conf)) {
+            PATH_TO_HADOOP_CONF = "vxquery-xtest/src/test/resources/hadoop/conf";
+            hdfs_conf = new Path(PATH_TO_HADOOP_CONF);
+            if (!lfs.exists(hdfs_conf)) {
+                PATH_TO_HADOOP_CONF = "../vxquery-xtest/src/test/resources/hadoop/conf";
+                hdfs_conf = new Path(PATH_TO_HADOOP_CONF);
+            }
+        }
+        conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/core-site.xml"));
+        conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/mapred-site.xml"));
+        conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/hdfs-site.xml"));
+        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");
+        MiniDFSCluster.Builder build = new MiniDFSCluster.Builder(conf);
+        build.nameNodePort(nameNodePort);
+        build.nameNodeHttpPort(nameNodePort + 34);
+        build.numDataNodes(numDataNodes);
+        build.checkExitOnShutdown(true);
+        build.startupOption(StartupOption.REGULAR);
+        build.format(true);
+        build.waitSafeMode(true);
+        dfsCluster = build.build();
+
+        FileSystem dfs = FileSystem.get(conf);
+        String DATA_PATH = "src/test/resources/TestSources/ghcnd";
+        Path src = new Path(DATA_PATH);
+        if (!lfs.exists(src)) {
+            DATA_PATH = "vxquery-xtest/src/test/resources/TestSources/ghcnd";
+            src = new Path(DATA_PATH);
+            if (!lfs.exists(src)) {
+                DATA_PATH = "../vxquery-xtest/src/test/resources/TestSources/ghcnd";
+                src = new Path(DATA_PATH);
+            }
+        }
+        Path dest = new Path("vxquery-hdfs-test");
+        dfs.copyFromLocalFile(src, dest);
+        if (dfs.exists(dest)) {
+            System.err.println("Test files copied to HDFS successfully");
+        }
+    }
+
+    public void shutdownHDFS() {
+        System.err.println("Tests completed.Shutting down HDFS");
+        dfsCluster.shutdown();
+    }
+}

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java
index 3b0b6a7..cd3d791 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/XTest.java
@@ -17,21 +17,12 @@
 package org.apache.vxquery.xtest;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
-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;
 import org.mortbay.jetty.Server;
 
 public class XTest {
@@ -42,7 +33,6 @@ public class XTest {
     private TestRunnerFactory trf;
     private int count;
     private int finishCount;
-    private MiniDFSCluster dfsCluster;
 
     XTest(XTestOptions opts) {
         this.opts = opts;
@@ -50,7 +40,6 @@ public class XTest {
     }
 
     void init() throws Exception {
-
         finishCount = 0;
         if (opts.threads <= 0) {
             opts.threads = 1;
@@ -88,7 +77,6 @@ public class XTest {
             }
         });
         trf = new TestRunnerFactory(opts);
-        //setupHDFS();
         trf.registerReporters(reporters);
         TestCaseFactory tcf = new TestCaseFactory(trf, eSvc, opts);
         count = tcf.process();
@@ -122,60 +110,4 @@ public class XTest {
             }
         }
     }
-
-    public void setupHDFS() throws IOException {
-        
-        FileSystem lfs = FileSystem.getLocal(new Configuration());
-        JobConf conf = new JobConf();
-        String PATH_TO_HADOOP_CONF = "vxquery-xtest/src/test/resources/hadoop/conf";
-        Path hdfs_conf = new Path(PATH_TO_HADOOP_CONF);
-        if (!lfs.exists(hdfs_conf)) {
-            PATH_TO_HADOOP_CONF = "src/test/resources/hadoop/conf";
-            hdfs_conf = new Path(PATH_TO_HADOOP_CONF);
-            if (!lfs.exists(hdfs_conf)) {
-                PATH_TO_HADOOP_CONF = "../vxquery-xtest/src/test/resources/hadoop/conf";
-                hdfs_conf = new Path(PATH_TO_HADOOP_CONF);
-            }
-        }
-        conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/core-site.xml"));
-        conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/mapred-site.xml"));
-        conf.addResource(new Path(PATH_TO_HADOOP_CONF + "/hdfs-site.xml"));
-        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");
-        MiniDFSCluster.Builder build = new MiniDFSCluster.Builder(conf);
-        build.nameNodePort(nameNodePort);
-        build.nameNodeHttpPort(nameNodePort + 34);
-        build.numDataNodes(numDataNodes);
-        build.checkExitOnShutdown(true);
-        build.startupOption(StartupOption.REGULAR);
-        build.format(true);
-        build.waitSafeMode(true);
-        dfsCluster = build.build();
-
-        FileSystem dfs = FileSystem.get(conf);
-        String DATA_PATH = "src/test/resources/TestSources/ghcnd";
-        Path src = new Path(DATA_PATH);
-        if (!lfs.exists(src)) {
-            DATA_PATH = "vxquery-xtest/src/test/resources/TestSources/ghcnd";
-            src = new Path(DATA_PATH);
-            if (!lfs.exists(src)) {
-                DATA_PATH = "../vxquery-xtest/src/test/resources/TestSources/ghcnd";
-                src = new Path(DATA_PATH);
-            }
-        }
-        Path dest = new Path("vxquery-hdfs-test");
-        dfs.copyFromLocalFile(src, dest);
-        if (dfs.exists(dest)) {
-            System.err.println("Test files copied to HDFS successfully");
-        }
-    }
-
-    public void shutdownDFS() {
-        System.err.println("Tests completed.Shutting down HDFS");
-        dfsCluster.shutdown();
-    }
 }

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/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 b889eb6..c4e1273 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
@@ -19,11 +19,14 @@ package org.apache.vxquery.xtest;
 import static org.junit.Assert.fail;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.Collection;
 
 import org.apache.commons.lang3.StringUtils;
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -33,6 +36,7 @@ import org.junit.runners.Parameterized.Parameters;
 public class VXQueryTest {
     private TestCase tc;
     private TestRunner tr;
+    private static MiniDFS dfs;
 
     private static String VXQUERY_CATALOG = StringUtils.join(new String[] { "src", "test", "resources",
             "VXQueryCatalog.xml" }, File.separator);
@@ -107,4 +111,19 @@ public class VXQueryTest {
         tr.close();
     }
 
+    @BeforeClass
+    public static void setupHDFS() {
+        dfs = new MiniDFS();
+        try {
+            dfs.startHDFS();
+        } catch (IOException e) {
+            System.err.println(e);
+        }
+    }
+
+    @AfterClass
+    public static void shutdownHDFS() {
+        dfs.shutdownHDFS();
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/avgHDFS.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/avgHDFS.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/avgHDFS.txt
new file mode 100644
index 0000000..7ef6ffe
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/avgHDFS.txt
@@ -0,0 +1 @@
+12.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/countHDFS.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/countHDFS.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/countHDFS.txt
new file mode 100644
index 0000000..d8263ee
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/countHDFS.txt
@@ -0,0 +1 @@
+2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/maxHDFS.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/maxHDFS.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/maxHDFS.txt
new file mode 100644
index 0000000..dc7b54a
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/maxHDFS.txt
@@ -0,0 +1 @@
+33
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/minHDFS.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/minHDFS.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/minHDFS.txt
new file mode 100644
index 0000000..ea1acb6
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/minHDFS.txt
@@ -0,0 +1 @@
+11.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/sumHDFS.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/sumHDFS.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/sumHDFS.txt
new file mode 100644
index 0000000..2b82dfe
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Aggregate/sumHDFS.txt
@@ -0,0 +1 @@
+60
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/avgHDFS.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/avgHDFS.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/avgHDFS.txt
deleted file mode 100644
index 7ef6ffe..0000000
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/avgHDFS.txt
+++ /dev/null
@@ -1 +0,0 @@
-12.5
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/countHDFS.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/countHDFS.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/countHDFS.txt
deleted file mode 100644
index d8263ee..0000000
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/countHDFS.txt
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/maxHDFS.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/maxHDFS.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/maxHDFS.txt
deleted file mode 100644
index dc7b54a..0000000
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/maxHDFS.txt
+++ /dev/null
@@ -1 +0,0 @@
-33
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/minHDFS.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/minHDFS.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/minHDFS.txt
deleted file mode 100644
index ea1acb6..0000000
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/minHDFS.txt
+++ /dev/null
@@ -1 +0,0 @@
-11.25
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/sumHDFS.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/sumHDFS.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/sumHDFS.txt
deleted file mode 100644
index 2b82dfe..0000000
--- a/vxquery-xtest/src/test/resources/ExpectedTestResults/HDFS/Partition-1/sumHDFS.txt
+++ /dev/null
@@ -1 +0,0 @@
-60
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/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
new file mode 100644
index 0000000..676b56f
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/avgHDFS.xq
@@ -0,0 +1,25 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   
+     http://www.apache.org/licenses/LICENSE-2.0
+   
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License. :)
+
+(: XQuery Aggregate Query :)
+(: Find the average minimum temperature.                                            :)
+fn:avg(
+    let $collection := "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/b33b1947/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
new file mode 100644
index 0000000..76b0815
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/countHDFS.xq
@@ -0,0 +1,25 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   
+     http://www.apache.org/licenses/LICENSE-2.0
+   
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License. :)
+
+(: XQuery Aggregate Query :)
+(: Find the number of wind sensor readings.                                            :)
+fn:count(
+    let $collection := "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/b33b1947/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
new file mode 100644
index 0000000..c73c264
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/maxHDFS.xq
@@ -0,0 +1,25 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   
+     http://www.apache.org/licenses/LICENSE-2.0
+   
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License. :)
+
+(: XQuery Aggregate Query :)
+(: Find the highest max temperature.                                            :)
+fn:max(
+    let $collection := "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/b33b1947/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
new file mode 100644
index 0000000..4884a33
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/minHDFS.xq
@@ -0,0 +1,25 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   
+     http://www.apache.org/licenses/LICENSE-2.0
+   
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License. :)
+
+(: XQuery Aggregate Query :)
+(: Find the lowest min temperature.                                            :)
+fn:min(
+    let $collection := "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/b33b1947/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
new file mode 100644
index 0000000..1625183
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Aggregate/sumHDFS.xq
@@ -0,0 +1,25 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   
+     http://www.apache.org/licenses/LICENSE-2.0
+   
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License. :)
+
+(: XQuery Aggregate Query :)
+(: Find the total precipitation.                                            :)
+fn:sum(
+    let $collection := "vxquery-hdfs-test"
+    for $r in collection($collection)/dataCollection/data
+    where $r/dataType eq "PRCP" 
+    return $r/value
+)

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/avgHDFS.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/avgHDFS.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/avgHDFS.xq
deleted file mode 100644
index 676b56f..0000000
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/avgHDFS.xq
+++ /dev/null
@@ -1,25 +0,0 @@
-(: Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-   
-     http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License. :)
-
-(: XQuery Aggregate Query :)
-(: Find the average minimum temperature.                                            :)
-fn:avg(
-    let $collection := "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/b33b1947/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/countHDFS.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/countHDFS.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/countHDFS.xq
deleted file mode 100644
index 76b0815..0000000
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/countHDFS.xq
+++ /dev/null
@@ -1,25 +0,0 @@
-(: Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-   
-     http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License. :)
-
-(: XQuery Aggregate Query :)
-(: Find the number of wind sensor readings.                                            :)
-fn:count(
-    let $collection := "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/b33b1947/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/maxHDFS.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/maxHDFS.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/maxHDFS.xq
deleted file mode 100644
index c73c264..0000000
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/maxHDFS.xq
+++ /dev/null
@@ -1,25 +0,0 @@
-(: Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-   
-     http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License. :)
-
-(: XQuery Aggregate Query :)
-(: Find the highest max temperature.                                            :)
-fn:max(
-    let $collection := "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/b33b1947/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/minHDFS.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/minHDFS.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/minHDFS.xq
deleted file mode 100644
index 4884a33..0000000
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/minHDFS.xq
+++ /dev/null
@@ -1,25 +0,0 @@
-(: Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-   
-     http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License. :)
-
-(: XQuery Aggregate Query :)
-(: Find the lowest min temperature.                                            :)
-fn:min(
-    let $collection := "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/b33b1947/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/sumHDFS.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/sumHDFS.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/sumHDFS.xq
deleted file mode 100644
index 1625183..0000000
--- a/vxquery-xtest/src/test/resources/Queries/XQuery/HDFS/Partition-1/sumHDFS.xq
+++ /dev/null
@@ -1,25 +0,0 @@
-(: Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-   
-     http://www.apache.org/licenses/LICENSE-2.0
-   
-   Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License. :)
-
-(: XQuery Aggregate Query :)
-(: Find the total precipitation.                                            :)
-fn:sum(
-    let $collection := "vxquery-hdfs-test"
-    for $r in collection($collection)/dataCollection/data
-    where $r/dataType eq "PRCP" 
-    return $r/value
-)

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/AS000000003.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/AS000000003.xml b/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/AS000000003.xml
deleted file mode 100644
index 0f754c2..0000000
--- a/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/AS000000003.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:AS000000003</id><displayName>Station 3</displayName><latitude>-30.000</latitude><longitude>30.000</longitude><locationLabels><type>CNTRY</type><id>FIPS:AS</id><displayName>AUSTRALIA</displayName></locationLabels></station></stationCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/AS000000003_200303_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/AS000000003_200303_0.xml b/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/AS000000003_200303_0.xml
deleted file mode 100644
index ec44bcd..0000000
--- a/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/AS000000003_200303_0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<dataCollection pageCount="1" totalCount="2"><data><date>2003-03-03T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:AS000000003</station><value>13.75</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2003-03-03T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:AS000000003</station><value>33</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000001.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000001.xml b/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000001.xml
deleted file mode 100644
index 5479293..0000000
--- a/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000001.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:US000000001</id><displayName>Station 1</displayName><latitude>10.000</latitude><longitude>-10.000</longitude><elevation>1000.0</elevation><locationLabels><type>ST</type><id>FIPS:1</id><displayName>State 1</displayName></locationLabels><locationLabels><type>CNTY</type><id>FIPS:-9999</id><displayName>County 1</displayName></locationLabels><locationLabels><type>CNTRY</type><id>FIPS:US</id><displayName>UNITED STATES</displayName></locationLabels></station></stationCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000001_200101_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000001_200101_0.xml b/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000001_200101_0.xml
deleted file mode 100644
index 30f2242..0000000
--- a/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000001_200101_0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<dataCollection pageCount="1" totalCount="3"><data><date>2001-01-01T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000001</station><value>11.25</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000001</station><value>31</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2001-01-01T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000001</station><value>1000</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000002.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000002.xml b/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000002.xml
deleted file mode 100644
index 52b0797..0000000
--- a/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000002.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:US000000002</id><displayName>Station 2</displayName><latitude>20.000</latitude><longitude>-20.000</longitude><elevation>2000.0</elevation><locationLabels><type>ST</type><id>FIPS:1</id><displayName>State 1</displayName></locationLabels><locationLabels><type>CNTY</type><id>FIPS:-9999</id><displayName>County 2</displayName></locationLabels><locationLabels><type>CNTRY</type><id>FIPS:US</id><displayName>UNITED STATES</displayName></locationLabels></station></stationCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000002_200202_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000002_200202_0.xml b/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000002_200202_0.xml
deleted file mode 100644
index 9f2695f..0000000
--- a/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000002_200202_0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<dataCollection pageCount="1" totalCount="3"><data><date>2002-02-02T00:00:00.000</date><dataType>TMIN</dataType><station>GHCND:US000000002</station><value>12.5</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>TMAX</dataType><station>GHCND:US000000002</station><value>32</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2002-02-02T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000002</station><value>20</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000004.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000004.xml b/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000004.xml
deleted file mode 100644
index 15eef88..0000000
--- a/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000004.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<stationCollection pageSize="100" pageCount="1" totalCount="1"><station><id>GHCND:US000000004</id><displayName>Station 4</displayName><latitude>40.000</latitude><longitude>-40.000</longitude><elevation>4000.0</elevation><locationLabels><type>ST</type><id>FIPS:1</id><displayName>State 4</displayName></locationLabels><locationLabels><type>CNTY</type><id>FIPS:-9999</id><displayName>County 4</displayName></locationLabels><locationLabels><type>CNTRY</type><id>FIPS:US</id><displayName>UNITED STATES</displayName></locationLabels></station></stationCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000004_200404_0.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000004_200404_0.xml b/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000004_200404_0.xml
deleted file mode 100644
index d24fdf6..0000000
--- a/vxquery-xtest/src/test/resources/TestSources/hdfs-test-data/US000000004_200404_0.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<dataCollection pageCount="1" totalCount="2"><data><date>2004-04-04T00:00:00.000</date><dataType>PRCP</dataType><station>GHCND:US000000004</station><value>40</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data><data><date>2004-04-04T00:00:00.000</date><dataType>AWND</dataType><station>GHCND:US000000004</station><value>4</value><attributes><attribute></attribute><attribute></attribute><attribute>a</attribute><attribute></attribute></attributes></data></dataCollection>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/VXQueryCatalog.xml b/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
index ab7c155..9691e6c 100644
--- a/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
+++ b/vxquery-xtest/src/test/resources/VXQueryCatalog.xml
@@ -39,7 +39,7 @@
 <!ENTITY SingleQuery SYSTEM "cat/SingleQuery.xml">
 <!ENTITY SingleAlternateQuery SYSTEM "cat/SingleAlternateQuery.xml">
 
-<!ENTITY HDFSAggregatePartition1Queries SYSTEM "cat/HDFSAggregatePartition1Queries.xml">
+<!ENTITY HDFSAggregateQueries SYSTEM "cat/HDFSAggregateQueries.xml">
 
 ]>
 <test-suite xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog"
@@ -84,9 +84,6 @@
      <source ID="ghcnd_quarter_4" FileName="TestSources/ghcnd/half_2/quarter_4" Creator="Preston Carman">
        <description last-mod="2014-04-02">Collection of files</description>
      </source>
-     <source ID="hdfs" FileName="TestSources/hdfs" Creator="Efi Kaltirimidou">
-       <description last-mod="2015-06-11">Collection of files</description>
-     </source>
    </sources>
    <test-group name="SingleQuery" featureOwner="Preston Carman">
       <GroupInfo>
@@ -181,17 +178,17 @@
          &GhcndRecordsPartition4Queries;
       </test-group>
    </test-group>
-   <test-group name="HDFSAggregatePartitionQueries" featureOwner="Efi Kaltirimidou">
+   <test-group name="HDFSAggregateQueries" featureOwner="Efi Kaltirimidou">
       <GroupInfo>
          <title>Aggregate Partition Queries in HDFS</title>
          <description/>
       </GroupInfo>
-      <test-group name="AggregateParallelExecutionTests" featureOwner="Efi Kaltirimidou">
+      <test-group name="CollectionReadFromHDFSAggregateTests" featureOwner="Efi Kaltirimidou">
          <GroupInfo>
             <title>Aggregate HDFS Execution Tests</title>
             <description/>
          </GroupInfo>
-         &HDFSAggregatePartition1Queries;
+        &HDFSAggregateQueries;
       </test-group>
    </test-group>
 </test-suite>

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/cat/HDFSAggregatePartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/HDFSAggregatePartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/HDFSAggregatePartition1Queries.xml
deleted file mode 100644
index 4f798c9..0000000
--- a/vxquery-xtest/src/test/resources/cat/HDFSAggregatePartition1Queries.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-
-<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregatePartition1Queries" featureOwner="VXQuery">
-   <GroupInfo>
-      <title>HDFS Aggregate Partition 1</title>
-      <description/>
-   </GroupInfo>
-   <test-case name="hdfs-aggregate-partition-1-avg" FilePath="HDFS/Partition-1/" Creator="Efi Kaltirimidou">
-      <description>Count records in HDFS returned for q02 from the weather benchmark with 1 partition.</description>
-      <query name="avgHDFS" date="2015-06-11"/>
-      <output-file compare="Text">avgHDFS.txt</output-file>
-   </test-case>
-   <test-case name="hdfs-aggregate-partition-1-count" FilePath="HDFS/Partition-1/" Creator="Efi Kaltirimidou">
-      <description>Count records in HDFS returned for q02 from the weather benchmark with 1 partition.</description>
-      <query name="countHDFS" date="2015-06-11"/>
-      <output-file compare="Text">countHDFS.txt</output-file>
-   </test-case>
-   <test-case name="hdfs-aggregate-partition-1-min" FilePath="HDFS/Partition-1/" Creator="Efi Kaltirimidou">
-      <description>Count records in HDFS returned for q05 from the weather benchmark with 1 partition.</description>
-      <query name="minHDFS" date="2015-06-11"/>
-      <output-file compare="Text">minHDFS.txt</output-file>
-   </test-case>
-   <test-case name="hdfs-aggregate-partition-1-max" FilePath="HDFS/Partition-1/" Creator="Efi Kaltirimidou">
-      <description>Count records in HDFS returned for q07 from the weather benchmark with 1 partition.</description>
-      <query name="maxHDFS" date="2015-06-11"/>
-      <output-file compare="Text">maxHDFS.txt</output-file>
-   </test-case>
-   <test-case name="hdfs-aggregate-partition-1-sum" FilePath="HDFS/Partition-1/" Creator="Efi Kaltirimidou">
-      <description>Count records in HDFS returned for q03 from the weather benchmark with 1 partition.</description>
-      <query name="sumHDFS" date="2015-06-11"/>
-      <output-file compare="Text">sumHDFS.txt</output-file>
-   </test-case>
-</test-group>

http://git-wip-us.apache.org/repos/asf/vxquery/blob/b33b1947/vxquery-xtest/src/test/resources/cat/HDFSAggregateQueries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/HDFSAggregateQueries.xml b/vxquery-xtest/src/test/resources/cat/HDFSAggregateQueries.xml
new file mode 100644
index 0000000..2b36f9f
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/cat/HDFSAggregateQueries.xml
@@ -0,0 +1,48 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<test-group xmlns="http://www.w3.org/2005/02/query-test-XQTSCatalog" name="AggregateQueries" featureOwner="VXQuery">
+   <GroupInfo>
+      <title>HDFS Aggregate</title>
+      <description/>
+   </GroupInfo>
+   <test-case name="hdfs-aggregate-avg" FilePath="HDFS/Aggregate/" Creator="Efi Kaltirimidou">
+      <description>Count records in HDFS returned for q02 from the weather benchmark.</description>
+      <query name="avgHDFS" date="2015-06-11"/>
+      <output-file compare="Text">avgHDFS.txt</output-file>
+   </test-case>
+   <test-case name="hdfs-aggregate-count" FilePath="HDFS/Aggregate/" Creator="Efi Kaltirimidou">
+      <description>Count records in HDFS returned for q02 from the weather benchmark.</description>
+      <query name="countHDFS" date="2015-06-11"/>
+      <output-file compare="Text">countHDFS.txt</output-file>
+   </test-case>
+   <test-case name="hdfs-aggregate-min" FilePath="HDFS/Aggregate/" Creator="Efi Kaltirimidou">
+      <description>Count records in HDFS returned for q05 from the weather benchmark.</description>
+      <query name="minHDFS" date="2015-06-11"/>
+      <output-file compare="Text">minHDFS.txt</output-file>
+   </test-case>
+   <test-case name="hdfs-aggregate-max" FilePath="HDFS/Aggregate/" Creator="Efi Kaltirimidou">
+      <description>Count records in HDFS returned for q07 from the weather benchmark.</description>
+      <query name="maxHDFS" date="2015-06-11"/>
+      <output-file compare="Text">maxHDFS.txt</output-file>
+   </test-case>
+   <test-case name="hdfs-aggregate-sum" FilePath="HDFS/Aggregate/" Creator="Efi Kaltirimidou">
+      <description>Count records in HDFS returned for q03 from the weather benchmark.</description>
+      <query name="sumHDFS" date="2015-06-11"/>
+      <output-file compare="Text">sumHDFS.txt</output-file>
+   </test-case>
+</test-group>


Mime
View raw message