upload and run successfully collection tests
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/4bbd683c Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/4bbd683c Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/4bbd683c Branch: refs/heads/steven/hdfs Commit: 4bbd683c59be40eca1aae3cf663d9b7de28c6964 Parents: 81c90a4 Author: efikalti <[email protected]> Authored: Fri Jun 12 12:15:58 2015 +0300 Committer: efikalti <[email protected]> Committed: Fri Jun 12 12:15:58 2015 +0300 ---------------------------------------------------------------------- .../org/apache/vxquery/hdfs2/HDFSFunctions.java | 43 +++++++++++--------- .../VXQueryCollectionOperatorDescriptor.java | 4 -- .../runtime/functions/util/FunctionHelper.java | 5 --- .../org/apache/vxquery/xmlparser/XMLParser.java | 7 ---- .../java/org/apache/vxquery/xtest/XTest.java | 1 - 5 files changed, 23 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/4bbd683c/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 a475b45..2281233 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 @@ -159,26 +159,29 @@ public class HDFSFunctions { */ public boolean put(String filepath,String dir) { - if (this.fs != null) - { - Path path = new Path(filepath); - Path dest = new Path(dir); - try { - if (fs.exists(dest)) - { - fs.delete(dest, true); //recursive delete - try { - fs.copyFromLocalFile(path, dest); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + if (this.fs != null) { + Path path = new Path(filepath); + Path dest = new Path(dir); + try + { + if (fs.exists(dest)) + { + fs.delete(dest, true); //recursive delete + } + } + catch (IOException e) + { + e.printStackTrace(); + } + try + { + fs.copyFromLocalFile(path, dest); + } + catch (IOException e) + { + e.printStackTrace(); + } + } return false; } http://git-wip-us.apache.org/repos/asf/vxquery/blob/4bbd683c/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java index 029a857..91a6089 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java @@ -20,8 +20,6 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.net.URI; -import java.net.URISyntaxException; import java.nio.ByteBuffer; import java.util.Iterator; import java.util.List; @@ -159,10 +157,8 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO + collectionDirectory.getAbsolutePath() + ") passed to collection."); } } catch (FileNotFoundException e) { - // TODO Auto-generated catch block System.err.println(e); } catch (IOException e) { - // TODO Auto-generated catch block System.err.println(e); } } http://git-wip-us.apache.org/repos/asf/vxquery/blob/4bbd683c/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java index dd89c5a..c664cb4 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/util/FunctionHelper.java @@ -22,16 +22,11 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.net.URI; -import java.net.URISyntaxException; import java.nio.ByteBuffer; import java.util.Arrays; -import java.util.logging.Level; 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.vxquery.context.DynamicContext; import org.apache.vxquery.datamodel.accessors.TaggedValuePointable; import org.apache.vxquery.datamodel.accessors.TypedPointables; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4bbd683c/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java index 291017e..d10092a 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java @@ -21,21 +21,14 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.ObjectInputStream; import java.io.Reader; -import java.net.URI; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import org.apache.hadoop.fs.FSDataInputStream; -import org.apache.hadoop.fs.FSInputStream; -import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.fs.Path; import org.apache.vxquery.context.StaticContext; import org.apache.vxquery.exceptions.VXQueryFileNotFoundException; import org.apache.vxquery.exceptions.VXQueryParseException; -import org.apache.vxquery.hdfs2.HDFSFunctions; import org.apache.vxquery.types.SequenceType; import org.xml.sax.InputSource; import org.xml.sax.SAXException; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4bbd683c/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 6d19f06..cadae02 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 @@ -67,7 +67,6 @@ public class XTest { //run tests for HDFS //upload sources to hdfs HDFSFunctions function = new HDFSFunctions(); - System.getProperty("user.dir"); function.put("src/test/resources/TestSources/ghcnd", "vxquery-hdfs-test"); } reporters.add(new ResultReporter() {
