http://git-wip-us.apache.org/repos/asf/vxquery/blob/f90d5873/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java ---------------------------------------------------------------------- diff --cc vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java index 9ad8fec,77d500c..b6eb621 --- a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/XMLParser.java @@@ -19,10 -19,8 +19,9 @@@ import java.io.File import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; - import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; @@@ -131,49 -126,4 +127,52 @@@ public class XMLParser } } ++<<<<<<< HEAD + public void parseHDFSElements(InputStream inputStream, IFrameWriter writer, FrameTupleAccessor fta, int tupleIndex) + throws IOException { + try { + Reader input; + if (bufferSize > 0) { + input = new BufferedReader(new InputStreamReader(inputStream), bufferSize); + } else { + input = new InputStreamReader(inputStream); + } + in.setCharacterStream(input); + handler.setupElementWriter(writer, fta, tupleIndex); + parser.parse(in); + input.close(); + } catch (IOException e) { + HyracksDataException hde = new HyracksDataException(e); + hde.setNodeId(nodeId); + throw hde; + } catch (SAXException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + public void parseHDFSDocument(InputStream inputStream, ArrayBackedValueStorage abvs) throws HyracksDataException { + try { + Reader input; + if (bufferSize > 0) { + input = new BufferedReader(new InputStreamReader(inputStream), bufferSize); + } else { + input = new InputStreamReader(inputStream); + } + in.setCharacterStream(input); + parser.parse(in); + handler.writeDocument(abvs); + input.close(); + } catch (IOException e) { + HyracksDataException hde = new HyracksDataException(e); + hde.setNodeId(nodeId); + throw hde; + } catch (SAXException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + ++======= ++>>>>>>> master }
http://git-wip-us.apache.org/repos/asf/vxquery/blob/f90d5873/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/query/XMLQueryCompiler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/f90d5873/vxquery-server/src/main/resources/conf/cluster.properties ---------------------------------------------------------------------- diff --cc vxquery-server/src/main/resources/conf/cluster.properties index 3ce563f,fd015d4..5b8fe9f --- a/vxquery-server/src/main/resources/conf/cluster.properties +++ b/vxquery-server/src/main/resources/conf/cluster.properties @@@ -52,6 -52,3 +52,6 @@@ NCJAVA_OPTS="-server -Xmx7G -Djava.util # debug option: NCJAVA_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,address=7002,server=y,suspend=n -Xmx1g -Djava.util.logging.config.file=logging.properties" # Yourkit option: -agentpath:/tools/yjp-2014-build-14114/bin/linux-x86-64/libyjpagent.so=port=20001" # Yourkit mac option: -agentpath:/Applications/YourKit_Java_Profiler.app/bin/mac/libyjpagent.jnilib=sampling + +#HDFS configuration directory - HDFS_CONF=$CONF_PATH$ ++HDFS_CONF=/Users/stevenjacobs/asterix/vxquery/vxquery-xtest/src/test/resources/hadoop/conf http://git-wip-us.apache.org/repos/asf/vxquery/blob/f90d5873/vxquery-xtest/pom.xml ---------------------------------------------------------------------- diff --cc vxquery-xtest/pom.xml index ccf7497,59da063..bf29648 --- a/vxquery-xtest/pom.xml +++ b/vxquery-xtest/pom.xml @@@ -161,21 -161,6 +161,21 @@@ </dependency> <dependency> - <groupId>edu.uci.ics.hyracks</groupId> ++ <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-hdfs-2.x</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + </dependency> + + <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> <scope>compile</scope>
