Removed a parameter from the parse function call since could be local to the class.
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/22f84418 Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/22f84418 Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/22f84418 Branch: refs/heads/prestonc/benchmark Commit: 22f844188900fb246faf2b96717688f908e42d58 Parents: 3f6c844 Author: Preston Carman <[email protected]> Authored: Tue May 6 17:38:51 2014 -0700 Committer: Preston Carman <[email protected]> Committed: Thu May 8 14:15:35 2014 -0700 ---------------------------------------------------------------------- .../metadata/VXQueryCollectionOperatorDescriptor.java | 4 +--- .../node/FnDocAvailableScalarEvaluatorFactory.java | 4 +--- .../functions/node/FnDocScalarEvaluatorFactory.java | 5 +---- .../vxquery/runtime/functions/util/FunctionHelper.java | 7 +++---- .../main/java/org/apache/vxquery/xmlparser/XMLParser.java | 10 ++++++---- 5 files changed, 12 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/22f84418/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 1ca0ea6..121f0f9 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 @@ -31,7 +31,6 @@ import org.apache.vxquery.runtime.functions.step.ChildPathStepOperatorDescriptor import org.apache.vxquery.xmlparser.ITreeNodeIdProvider; import org.apache.vxquery.xmlparser.TreeNodeIdProvider; import org.apache.vxquery.xmlparser.XMLParser; -import org.xml.sax.InputSource; import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; import edu.uci.ics.hyracks.api.context.IHyracksTaskContext; @@ -72,7 +71,6 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO final int fieldOutputCount = recordDescProvider.getOutputRecordDescriptor(getActivityId(), 0).getFieldCount(); final ByteBuffer frame = ctx.allocateFrame(); final FrameTupleAppender appender = new FrameTupleAppender(ctx.getFrameSize(), fieldOutputCount); - final InputSource in = new InputSource(); final ArrayBackedValueStorage abvsFileNode = new ArrayBackedValueStorage(); final short partitionId = (short) ctx.getTaskAttemptId().getTaskId().getPartition(); final ITreeNodeIdProvider nodeIdProvider = new TreeNodeIdProvider(partitionId, dataSourceId, totalDataSources); @@ -120,7 +118,7 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO // Now add new field. abvsFileNode.reset(); try { - parser.parseFile(file, in, abvsFileNode); + parser.parseFile(file, abvsFileNode); } catch (HyracksDataException e) { e.setNodeId(nodeId); throw e; http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/22f84418/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocAvailableScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocAvailableScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocAvailableScalarEvaluatorFactory.java index eb5b41a..499119c 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocAvailableScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocAvailableScalarEvaluatorFactory.java @@ -27,7 +27,6 @@ import org.apache.vxquery.exceptions.SystemException; import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluator; import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScalarEvaluatorFactory; import org.apache.vxquery.runtime.functions.util.FunctionHelper; -import org.xml.sax.InputSource; import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator; @@ -49,7 +48,6 @@ public class FnDocAvailableScalarEvaluatorFactory extends AbstractTaggedValueArg protected IScalarEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args) throws AlgebricksException { final ArrayBackedValueStorage abvs = new ArrayBackedValueStorage(); - final InputSource in = new InputSource(); final UTF8StringPointable stringp = (UTF8StringPointable) UTF8StringPointable.FACTORY.createPointable(); final SequencePointable seqp = (SequencePointable) SequencePointable.FACTORY.createPointable(); final ByteBufferInputStream bbis = new ByteBufferInputStream(); @@ -73,7 +71,7 @@ public class FnDocAvailableScalarEvaluatorFactory extends AbstractTaggedValueArg } try { - FunctionHelper.readInDocFromPointable(stringp, in, bbis, di, abvs, null); + FunctionHelper.readInDocFromPointable(stringp, bbis, di, abvs, null); XDMConstants.setTrue(result); } catch (Exception e) { XDMConstants.setFalse(result); http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/22f84418/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocScalarEvaluatorFactory.java index 8bb8af9..2c9fc03 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/node/FnDocScalarEvaluatorFactory.java @@ -30,13 +30,11 @@ import org.apache.vxquery.runtime.functions.util.FunctionHelper; import org.apache.vxquery.xmlparser.ITreeNodeIdProvider; import org.apache.vxquery.xmlparser.TreeNodeIdProvider; import org.apache.vxquery.xmlparser.XMLParser; -import org.xml.sax.InputSource; import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator; import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; import edu.uci.ics.hyracks.api.context.IHyracksTaskContext; -import edu.uci.ics.hyracks.api.exceptions.HyracksDataException; import edu.uci.ics.hyracks.data.std.api.IPointable; import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable; import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; @@ -53,7 +51,6 @@ public class FnDocScalarEvaluatorFactory extends AbstractTaggedValueArgumentScal protected IScalarEvaluator createEvaluator(IHyracksTaskContext ctx, IScalarEvaluator[] args) throws AlgebricksException { final ArrayBackedValueStorage abvs = new ArrayBackedValueStorage(); - final InputSource in = new InputSource(); final UTF8StringPointable stringp = (UTF8StringPointable) UTF8StringPointable.FACTORY.createPointable(); final SequencePointable seqp = (SequencePointable) SequencePointable.FACTORY.createPointable(); final ByteBufferInputStream bbis = new ByteBufferInputStream(); @@ -81,7 +78,7 @@ public class FnDocScalarEvaluatorFactory extends AbstractTaggedValueArgumentScal try { // Only one document should be parsed so its ok to have a unique parser. XMLParser parser = new XMLParser(false, nodeIdProvider); - FunctionHelper.readInDocFromPointable(stringp, in, bbis, di, abvs, parser); + FunctionHelper.readInDocFromPointable(stringp, bbis, di, abvs, parser); } catch (Exception e) { throw new SystemException(ErrorCode.SYSE0001, e); } http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/22f84418/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 d732145..4953c12 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 @@ -54,7 +54,6 @@ import org.apache.vxquery.runtime.functions.strings.UTF8StringCharacterIterator; import org.apache.vxquery.types.BuiltinTypeConstants; import org.apache.vxquery.types.BuiltinTypeRegistry; import org.apache.vxquery.xmlparser.XMLParser; -import org.xml.sax.InputSource; import edu.uci.ics.hyracks.api.exceptions.HyracksDataException; import edu.uci.ics.hyracks.data.std.api.IPointable; @@ -1233,8 +1232,8 @@ public class FunctionHelper { System.err.println(" printUTF8String END"); } - public static void readInDocFromPointable(UTF8StringPointable stringp, InputSource in, ByteBufferInputStream bbis, - DataInputStream di, ArrayBackedValueStorage abvs, XMLParser parser) throws HyracksDataException { + public static void readInDocFromPointable(UTF8StringPointable stringp, ByteBufferInputStream bbis, DataInputStream di, + ArrayBackedValueStorage abvs, XMLParser parser) throws HyracksDataException { String fName; try { fName = getStringFromPointable(stringp, bbis, di); @@ -1242,7 +1241,7 @@ public class FunctionHelper { throw new HyracksDataException(e); } File file = new File(fName); - parser.parseFile(file, in, abvs); + parser.parseFile(file, abvs); } public static boolean transformThenCompareMinMaxTaggedValues(AbstractValueComparisonOperation aOp, http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/22f84418/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 445915b..43402ed 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 @@ -32,21 +32,23 @@ import edu.uci.ics.hyracks.api.exceptions.HyracksDataException; import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; public class XMLParser { - XMLReader parser; - SAXContentHandler handler; - + final XMLReader parser; + final SAXContentHandler handler; + final InputSource in; + public XMLParser(boolean attachTypes, ITreeNodeIdProvider idProvider) throws HyracksDataException { try { parser = XMLReaderFactory.createXMLReader(); handler = new SAXContentHandler(attachTypes, idProvider); parser.setContentHandler(handler); parser.setProperty("http://xml.org/sax/properties/lexical-handler";, handler); + in = new InputSource(); } catch (Exception e) { throw new HyracksDataException(e.toString()); } } - public void parseFile(File file, InputSource in, ArrayBackedValueStorage abvs) throws HyracksDataException { + public void parseFile(File file, ArrayBackedValueStorage abvs) throws HyracksDataException { try { if (file.getName().toLowerCase().endsWith(".xml.gz")) { in.setCharacterStream(new InputStreamReader(new GZIPInputStream(new FileInputStream(file))));
