http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/SequencePointable.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/SequencePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/SequencePointable.java index 1c81b48..0aa66f7 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/SequencePointable.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/SequencePointable.java @@ -16,12 +16,12 @@ */ package org.apache.vxquery.datamodel.accessors; -import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits; -import edu.uci.ics.hyracks.data.std.api.AbstractPointable; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IPointableFactory; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; -import edu.uci.ics.hyracks.data.std.primitive.VoidPointable; +import org.apache.hyracks.api.dataflow.value.ITypeTraits; +import org.apache.hyracks.data.std.api.AbstractPointable; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IPointableFactory; +import org.apache.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.data.std.primitive.VoidPointable; public class SequencePointable extends AbstractPointable { private static final int ENTRY_COUNT_SIZE = 4; @@ -77,4 +77,4 @@ public class SequencePointable extends AbstractPointable { private static int getDataAreaOffset(byte[] bytes, int start) { return getSlotArrayOffset(start) + getEntryCount(bytes, start) * SLOT_SIZE; } -} \ No newline at end of file +}
http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TaggedValuePointable.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TaggedValuePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TaggedValuePointable.java index 5760fc1..ac40491 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TaggedValuePointable.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TaggedValuePointable.java @@ -16,12 +16,12 @@ */ package org.apache.vxquery.datamodel.accessors; -import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits; -import edu.uci.ics.hyracks.data.std.api.AbstractPointable; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IPointableFactory; -import edu.uci.ics.hyracks.data.std.primitive.BytePointable; -import edu.uci.ics.hyracks.data.std.primitive.VoidPointable; +import org.apache.hyracks.api.dataflow.value.ITypeTraits; +import org.apache.hyracks.data.std.api.AbstractPointable; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IPointableFactory; +import org.apache.hyracks.data.std.primitive.BytePointable; +import org.apache.hyracks.data.std.primitive.VoidPointable; public class TaggedValuePointable extends AbstractPointable { public static final IPointableFactory FACTORY = new IPointableFactory() { @@ -45,4 +45,4 @@ public class TaggedValuePointable extends AbstractPointable { public void getValue(IPointable value) { value.set(bytes, start + 1, length - 1); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TypedPointables.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TypedPointables.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TypedPointables.java index d303dfe..32eed34 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TypedPointables.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/TypedPointables.java @@ -30,14 +30,14 @@ import org.apache.vxquery.datamodel.accessors.nodes.NodeTreePointable; import org.apache.vxquery.datamodel.accessors.nodes.PINodePointable; import org.apache.vxquery.datamodel.accessors.nodes.TextOrCommentNodePointable; -import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable; -import edu.uci.ics.hyracks.data.std.primitive.BytePointable; -import edu.uci.ics.hyracks.data.std.primitive.DoublePointable; -import edu.uci.ics.hyracks.data.std.primitive.FloatPointable; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; -import edu.uci.ics.hyracks.data.std.primitive.LongPointable; -import edu.uci.ics.hyracks.data.std.primitive.ShortPointable; -import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable; +import org.apache.hyracks.data.std.primitive.BooleanPointable; +import org.apache.hyracks.data.std.primitive.BytePointable; +import org.apache.hyracks.data.std.primitive.DoublePointable; +import org.apache.hyracks.data.std.primitive.FloatPointable; +import org.apache.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.data.std.primitive.LongPointable; +import org.apache.hyracks.data.std.primitive.ShortPointable; +import org.apache.hyracks.data.std.primitive.UTF8StringPointable; /** * One pointable for each type. http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/CodedQNamePointable.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/CodedQNamePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/CodedQNamePointable.java index 83a3d3b..7c3d390 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/CodedQNamePointable.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/CodedQNamePointable.java @@ -16,11 +16,11 @@ */ package org.apache.vxquery.datamodel.accessors.atomic; -import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits; -import edu.uci.ics.hyracks.data.std.api.AbstractPointable; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IPointableFactory; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.api.dataflow.value.ITypeTraits; +import org.apache.hyracks.data.std.api.AbstractPointable; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IPointableFactory; +import org.apache.hyracks.data.std.primitive.IntegerPointable; public class CodedQNamePointable extends AbstractPointable { public static final int SIZE = 12; @@ -68,4 +68,4 @@ public class CodedQNamePointable extends AbstractPointable { public int getLocalCode() { return IntegerPointable.getInteger(bytes, start + OFF_LOCAL); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java index ccd9936..36af614 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSBinaryPointable.java @@ -16,10 +16,10 @@ */ package org.apache.vxquery.datamodel.accessors.atomic; -import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits; -import edu.uci.ics.hyracks.data.std.api.AbstractPointable; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IPointableFactory; +import org.apache.hyracks.api.dataflow.value.ITypeTraits; +import org.apache.hyracks.data.std.api.AbstractPointable; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IPointableFactory; public class XSBinaryPointable extends AbstractPointable { public static final ITypeTraits TYPE_TRAITS = new ITypeTraits() { http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java index e7aaf8a..d728927 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDatePointable.java @@ -19,12 +19,12 @@ package org.apache.vxquery.datamodel.accessors.atomic; import org.apache.vxquery.datamodel.api.IDate; import org.apache.vxquery.datamodel.api.ITimezone; -import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits; -import edu.uci.ics.hyracks.data.std.api.AbstractPointable; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IPointableFactory; -import edu.uci.ics.hyracks.data.std.primitive.BytePointable; -import edu.uci.ics.hyracks.data.std.primitive.ShortPointable; +import org.apache.hyracks.api.dataflow.value.ITypeTraits; +import org.apache.hyracks.data.std.api.AbstractPointable; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IPointableFactory; +import org.apache.hyracks.data.std.primitive.BytePointable; +import org.apache.hyracks.data.std.primitive.ShortPointable; /** * The date is split up into five sections. Due to leap year, we have decided to keep the @@ -156,4 +156,4 @@ public class XSDatePointable extends AbstractPointable implements IDate, ITimezo return getDay(bytes, start) * CHRONON_OF_DAY; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java index a40dc01..5691d73 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDateTimePointable.java @@ -24,13 +24,13 @@ import org.apache.vxquery.datamodel.api.ITime; import org.apache.vxquery.datamodel.api.ITimezone; import org.apache.vxquery.datamodel.util.DateTime; -import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits; -import edu.uci.ics.hyracks.data.std.api.AbstractPointable; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IPointableFactory; -import edu.uci.ics.hyracks.data.std.primitive.BytePointable; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; -import edu.uci.ics.hyracks.data.std.primitive.ShortPointable; +import org.apache.hyracks.api.dataflow.value.ITypeTraits; +import org.apache.hyracks.data.std.api.AbstractPointable; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IPointableFactory; +import org.apache.hyracks.data.std.primitive.BytePointable; +import org.apache.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.data.std.primitive.ShortPointable; /** * The datetime is split up into eight sections. Due to leap year, we have decided to keep the @@ -245,4 +245,4 @@ public class XSDateTimePointable extends AbstractPointable implements IDate, ITi + getTimezoneHour(bytes, start) + ":" + getTimezoneMinute(bytes, start) : ""); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java index f60d9bd..1559b06 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDecimalPointable.java @@ -16,15 +16,15 @@ */ package org.apache.vxquery.datamodel.accessors.atomic; -import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits; -import edu.uci.ics.hyracks.data.std.api.AbstractPointable; -import edu.uci.ics.hyracks.data.std.api.IComparable; -import edu.uci.ics.hyracks.data.std.api.IHashable; -import edu.uci.ics.hyracks.data.std.api.INumeric; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IPointableFactory; -import edu.uci.ics.hyracks.data.std.primitive.BytePointable; -import edu.uci.ics.hyracks.data.std.primitive.LongPointable; +import org.apache.hyracks.api.dataflow.value.ITypeTraits; +import org.apache.hyracks.data.std.api.AbstractPointable; +import org.apache.hyracks.data.std.api.IComparable; +import org.apache.hyracks.data.std.api.IHashable; +import org.apache.hyracks.data.std.api.INumeric; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IPointableFactory; +import org.apache.hyracks.data.std.primitive.BytePointable; +import org.apache.hyracks.data.std.primitive.LongPointable; public class XSDecimalPointable extends AbstractPointable implements IHashable, IComparable, INumeric { private final static int DECIMAL_PLACE_OFFSET = 0; @@ -200,4 +200,4 @@ public class XSDecimalPointable extends AbstractPointable implements IHashable, return ((double) getDecimalValue()) / Math.pow(10, getDecimalPlace()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java index 0a9bd1f..e997349 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSDurationPointable.java @@ -16,12 +16,12 @@ */ package org.apache.vxquery.datamodel.accessors.atomic; -import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits; -import edu.uci.ics.hyracks.data.std.api.AbstractPointable; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IPointableFactory; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; -import edu.uci.ics.hyracks.data.std.primitive.LongPointable; +import org.apache.hyracks.api.dataflow.value.ITypeTraits; +import org.apache.hyracks.data.std.api.AbstractPointable; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IPointableFactory; +import org.apache.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.data.std.primitive.LongPointable; public class XSDurationPointable extends AbstractPointable { private final static int YEAR_MONTH_OFFSET = 0; @@ -86,4 +86,4 @@ public class XSDurationPointable extends AbstractPointable { public void setDayTime(long value) { setDayTime(bytes, start, value); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java index f35c067..f8e63b6 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSQNamePointable.java @@ -16,11 +16,11 @@ */ package org.apache.vxquery.datamodel.accessors.atomic; -import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits; -import edu.uci.ics.hyracks.data.std.api.AbstractPointable; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IPointableFactory; -import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable; +import org.apache.hyracks.api.dataflow.value.ITypeTraits; +import org.apache.hyracks.data.std.api.AbstractPointable; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IPointableFactory; +import org.apache.hyracks.data.std.primitive.UTF8StringPointable; /** * The XSQNamePointable holds three strings: URI, Prefix and Local Name. http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java index 2919bc0..62eedde 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/atomic/XSTimePointable.java @@ -19,12 +19,12 @@ package org.apache.vxquery.datamodel.accessors.atomic; import org.apache.vxquery.datamodel.api.ITime; import org.apache.vxquery.datamodel.api.ITimezone; -import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits; -import edu.uci.ics.hyracks.data.std.api.AbstractPointable; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IPointableFactory; -import edu.uci.ics.hyracks.data.std.primitive.BytePointable; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.api.dataflow.value.ITypeTraits; +import org.apache.hyracks.data.std.api.AbstractPointable; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IPointableFactory; +import org.apache.hyracks.data.std.primitive.BytePointable; +import org.apache.hyracks.data.std.primitive.IntegerPointable; /** * The time is split up into five sections. Due to leap year, we have decided to keep the @@ -153,4 +153,4 @@ public class XSTimePointable extends AbstractPointable implements ITime, ITimezo return 0; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AbstractNodePointable.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AbstractNodePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AbstractNodePointable.java index b5ced2c..7601688 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AbstractNodePointable.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AbstractNodePointable.java @@ -17,8 +17,8 @@ package org.apache.vxquery.datamodel.accessors.nodes; -import edu.uci.ics.hyracks.data.std.api.AbstractPointable; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.data.std.api.AbstractPointable; +import org.apache.hyracks.data.std.primitive.IntegerPointable; public abstract class AbstractNodePointable extends AbstractPointable { public int getLocalNodeId(NodeTreePointable nodeTree) { http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java index 030222b..fd4cfc6 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/AttributeNodePointable.java @@ -18,10 +18,10 @@ package org.apache.vxquery.datamodel.accessors.nodes; import org.apache.vxquery.datamodel.accessors.atomic.CodedQNamePointable; -import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IPointableFactory; -import edu.uci.ics.hyracks.data.std.primitive.VoidPointable; +import org.apache.hyracks.api.dataflow.value.ITypeTraits; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IPointableFactory; +import org.apache.hyracks.data.std.primitive.VoidPointable; /* * Attribute { @@ -100,4 +100,4 @@ public class AttributeNodePointable extends AbstractNodePointable { private int getValueSize(NodeTreePointable nodeTree) { return length - (getValueOffset(nodeTree) - start); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java index d2dc5d0..95dc404 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/DocumentNodePointable.java @@ -18,10 +18,10 @@ package org.apache.vxquery.datamodel.accessors.nodes; import org.apache.vxquery.datamodel.accessors.SequencePointable; -import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IPointableFactory; -import edu.uci.ics.hyracks.data.std.primitive.VoidPointable; +import org.apache.hyracks.api.dataflow.value.ITypeTraits; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IPointableFactory; +import org.apache.hyracks.data.std.primitive.VoidPointable; /* * Document { @@ -64,4 +64,4 @@ public class DocumentNodePointable extends AbstractNodePointable { private int getContentSize(NodeTreePointable nodeTree) { return length - (getContentOffset(nodeTree) - start); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java index faadd33..4367d91 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/ElementNodePointable.java @@ -19,12 +19,12 @@ package org.apache.vxquery.datamodel.accessors.nodes; import org.apache.vxquery.datamodel.accessors.SequencePointable; import org.apache.vxquery.datamodel.accessors.atomic.CodedQNamePointable; -import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IPointableFactory; -import edu.uci.ics.hyracks.data.std.primitive.BytePointable; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; -import edu.uci.ics.hyracks.data.std.primitive.VoidPointable; +import org.apache.hyracks.api.dataflow.value.ITypeTraits; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IPointableFactory; +import org.apache.hyracks.data.std.primitive.BytePointable; +import org.apache.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.data.std.primitive.VoidPointable; /* * Element { @@ -201,4 +201,4 @@ public class ElementNodePointable extends AbstractNodePointable { private int getChildrenChunkSize(NodeTreePointable nodeTree) { return childrenChunkExists() ? SequencePointable.getSequenceLength(bytes, getChildrenChunkOffset(nodeTree)) : 0; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java index 4b0697f..db03e28 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/NodeTreePointable.java @@ -18,16 +18,16 @@ package org.apache.vxquery.datamodel.accessors.nodes; import org.apache.vxquery.datamodel.accessors.TaggedValuePointable; -import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits; -import edu.uci.ics.hyracks.data.std.algorithms.BinarySearchAlgorithm; -import edu.uci.ics.hyracks.data.std.api.AbstractPointable; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IPointableFactory; -import edu.uci.ics.hyracks.data.std.collections.api.IValueReferenceVector; -import edu.uci.ics.hyracks.data.std.primitive.BytePointable; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; -import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable; -import edu.uci.ics.hyracks.data.std.primitive.VoidPointable; +import org.apache.hyracks.api.dataflow.value.ITypeTraits; +import org.apache.hyracks.data.std.algorithms.BinarySearchAlgorithm; +import org.apache.hyracks.data.std.api.AbstractPointable; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IPointableFactory; +import org.apache.hyracks.data.std.collections.api.IValueReferenceVector; +import org.apache.hyracks.data.std.primitive.BytePointable; +import org.apache.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.data.std.primitive.UTF8StringPointable; +import org.apache.hyracks.data.std.primitive.VoidPointable; /* * NodeTree { @@ -204,4 +204,4 @@ public class NodeTreePointable extends AbstractPointable { private int getRootNodeOffset() { return getDictionaryOffset() + getDictionarySize(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java index 2318ba6..3ae5126 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/PINodePointable.java @@ -16,11 +16,11 @@ */ package org.apache.vxquery.datamodel.accessors.nodes; -import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IPointableFactory; -import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable; -import edu.uci.ics.hyracks.data.std.primitive.VoidPointable; +import org.apache.hyracks.api.dataflow.value.ITypeTraits; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IPointableFactory; +import org.apache.hyracks.data.std.primitive.UTF8StringPointable; +import org.apache.hyracks.data.std.primitive.VoidPointable; /* * PI { @@ -76,4 +76,4 @@ public class PINodePointable extends AbstractNodePointable { private int getContentSize(NodeTreePointable nodeTree) { return UTF8StringPointable.getUTFLength(bytes, getContentOffset(nodeTree)) + 2; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java index 2ab2555..cea7c02 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/accessors/nodes/TextOrCommentNodePointable.java @@ -16,10 +16,10 @@ */ package org.apache.vxquery.datamodel.accessors.nodes; -import edu.uci.ics.hyracks.api.dataflow.value.ITypeTraits; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.api.IPointableFactory; -import edu.uci.ics.hyracks.data.std.primitive.VoidPointable; +import org.apache.hyracks.api.dataflow.value.ITypeTraits; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.api.IPointableFactory; +import org.apache.hyracks.data.std.primitive.VoidPointable; /* * Text | Comment { @@ -63,4 +63,4 @@ public class TextOrCommentNodePointable extends AbstractNodePointable { return length - (getValueOffset(nodeTree) - start); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/StringValueBuilder.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/StringValueBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/StringValueBuilder.java index ad59a5c..215d1b1 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/StringValueBuilder.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/StringValueBuilder.java @@ -19,7 +19,7 @@ package org.apache.vxquery.datamodel.builders.atomic; import java.io.DataOutput; import java.io.IOException; -import edu.uci.ics.hyracks.data.std.primitive.UTF8StringWriter; +import org.apache.hyracks.data.std.primitive.UTF8StringWriter; public class StringValueBuilder { private final UTF8StringWriter writer; @@ -31,4 +31,4 @@ public class StringValueBuilder { public void write(CharSequence string, DataOutput out) throws IOException { writer.writeUTF8String(string, out); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java index f1961ff..51c026b 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/atomic/UTF8StringBuilder.java @@ -23,8 +23,8 @@ import java.io.UTFDataFormatException; import org.apache.vxquery.datamodel.builders.base.AbstractBuilder; import org.apache.vxquery.runtime.functions.util.FunctionHelper; -import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage; -import edu.uci.ics.hyracks.data.std.primitive.BytePointable; +import org.apache.hyracks.data.std.api.IMutableValueStorage; +import org.apache.hyracks.data.std.primitive.BytePointable; public class UTF8StringBuilder extends AbstractBuilder { private IMutableValueStorage mvs; @@ -51,4 +51,4 @@ public class UTF8StringBuilder extends AbstractBuilder { throw new UTFDataFormatException("encoded string too long: " + mvs.getLength() + " bytes"); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java index 4ba9a14..bacad26 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractBuilder.java @@ -18,10 +18,10 @@ package org.apache.vxquery.datamodel.builders.base; import java.io.IOException; -import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage; +import org.apache.hyracks.data.std.api.IMutableValueStorage; public abstract class AbstractBuilder { public abstract void reset(IMutableValueStorage mvs) throws IOException; public abstract void finish() throws IOException; -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractValueBuilder.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractValueBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractValueBuilder.java index 15eea32..abe8eb1 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractValueBuilder.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/AbstractValueBuilder.java @@ -17,4 +17,4 @@ package org.apache.vxquery.datamodel.builders.base; public abstract class AbstractValueBuilder implements IValueBuilder { -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IValueBuilder.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IValueBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IValueBuilder.java index a83b6b1..fc38cda 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IValueBuilder.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/base/IValueBuilder.java @@ -22,4 +22,4 @@ public interface IValueBuilder { public void reset(); public void write(DataOutput out); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java index 1c5c7a5..955668f 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AbstractNodeBuilder.java @@ -18,10 +18,10 @@ package org.apache.vxquery.datamodel.builders.nodes; import java.io.IOException; -import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage; +import org.apache.hyracks.data.std.api.IMutableValueStorage; public abstract class AbstractNodeBuilder { public abstract void reset(IMutableValueStorage mvs) throws IOException; public abstract void finish() throws IOException; -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java index cea7799..7743cd8 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/AttributeNodeBuilder.java @@ -21,8 +21,8 @@ import java.io.IOException; import org.apache.vxquery.datamodel.values.ValueTag; -import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage; -import edu.uci.ics.hyracks.data.std.api.IValueReference; +import org.apache.hyracks.data.std.api.IMutableValueStorage; +import org.apache.hyracks.data.std.api.IValueReference; public class AttributeNodeBuilder extends AbstractNodeBuilder { private DataOutput out; @@ -56,4 +56,4 @@ public class AttributeNodeBuilder extends AbstractNodeBuilder { public void setValue(IValueReference value) throws IOException { out.write(value.getByteArray(), value.getStartOffset(), value.getLength()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java index 104868f..d79bb88 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/CommentNodeBuilder.java @@ -21,8 +21,8 @@ import java.io.IOException; import org.apache.vxquery.datamodel.values.ValueTag; -import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage; -import edu.uci.ics.hyracks.data.std.api.IValueReference; +import org.apache.hyracks.data.std.api.IMutableValueStorage; +import org.apache.hyracks.data.std.api.IValueReference; public class CommentNodeBuilder extends AbstractNodeBuilder { private DataOutput out; @@ -44,4 +44,4 @@ public class CommentNodeBuilder extends AbstractNodeBuilder { public void setValue(IValueReference value) throws IOException { out.write(value.getByteArray(), value.getStartOffset(), value.getLength()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java index bee221d..dae149f 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DictionaryBuilder.java @@ -24,12 +24,12 @@ import java.util.TreeMap; import org.apache.vxquery.util.GrowableIntArray; -import edu.uci.ics.hyracks.data.std.algorithms.BinarySearchAlgorithm; -import edu.uci.ics.hyracks.data.std.collections.api.IValueReferenceVector; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; -import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; -import edu.uci.ics.hyracks.data.std.util.ByteArrayAccessibleOutputStream; +import org.apache.hyracks.data.std.algorithms.BinarySearchAlgorithm; +import org.apache.hyracks.data.std.collections.api.IValueReferenceVector; +import org.apache.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.data.std.primitive.UTF8StringPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.data.std.util.ByteArrayAccessibleOutputStream; public class DictionaryBuilder { private final GrowableIntArray stringEndOffsets; @@ -158,4 +158,4 @@ public class DictionaryBuilder { cacheReady = false; return slotIndex; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java index 176580e..47c811c 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/DocumentNodeBuilder.java @@ -22,8 +22,8 @@ import java.io.IOException; import org.apache.vxquery.datamodel.values.ValueTag; import org.apache.vxquery.util.GrowableIntArray; -import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.data.std.api.IMutableValueStorage; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class DocumentNodeBuilder extends AbstractNodeBuilder { private final GrowableIntArray childrenSlots; @@ -79,4 +79,4 @@ public class DocumentNodeBuilder extends AbstractNodeBuilder { out.write(childrenDataArea.getByteArray(), childrenDataArea.getStartOffset(), childrenDataArea.getLength()); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java index d455fd5..89aaddc 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/ElementNodeBuilder.java @@ -23,11 +23,11 @@ import org.apache.vxquery.datamodel.accessors.nodes.ElementNodePointable; import org.apache.vxquery.datamodel.values.ValueTag; import org.apache.vxquery.util.GrowableIntArray; -import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage; -import edu.uci.ics.hyracks.data.std.api.IValueReference; -import edu.uci.ics.hyracks.data.std.primitive.BytePointable; -import edu.uci.ics.hyracks.data.std.primitive.IntegerPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.data.std.api.IMutableValueStorage; +import org.apache.hyracks.data.std.api.IValueReference; +import org.apache.hyracks.data.std.primitive.BytePointable; +import org.apache.hyracks.data.std.primitive.IntegerPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class ElementNodeBuilder extends AbstractNodeBuilder { private final GrowableIntArray attrSlots; @@ -176,4 +176,4 @@ public class ElementNodeBuilder extends AbstractNodeBuilder { out.write(childrenDataArea.getByteArray(), childrenDataArea.getStartOffset(), childrenDataArea.getLength()); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java index c890f3b..5eb08df 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/NodeSubTreeBuilder.java @@ -23,7 +23,7 @@ import org.apache.vxquery.datamodel.accessors.TaggedValuePointable; import org.apache.vxquery.datamodel.accessors.nodes.NodeTreePointable; import org.apache.vxquery.datamodel.values.ValueTag; -import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage; +import org.apache.hyracks.data.std.api.IMutableValueStorage; public class NodeSubTreeBuilder extends AbstractNodeBuilder { private DataOutput mainOut; @@ -67,4 +67,4 @@ public class NodeSubTreeBuilder extends AbstractNodeBuilder { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java index a472143..ee37511 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/PINodeBuilder.java @@ -21,8 +21,8 @@ import java.io.IOException; import org.apache.vxquery.datamodel.values.ValueTag; -import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage; -import edu.uci.ics.hyracks.data.std.api.IValueReference; +import org.apache.hyracks.data.std.api.IMutableValueStorage; +import org.apache.hyracks.data.std.api.IValueReference; public class PINodeBuilder extends AbstractNodeBuilder { private DataOutput out; @@ -48,4 +48,4 @@ public class PINodeBuilder extends AbstractNodeBuilder { public void setContent(IValueReference value) throws IOException { out.write(value.getByteArray(), value.getStartOffset(), value.getLength()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java index acddb8b..84ee20e 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/nodes/TextNodeBuilder.java @@ -21,8 +21,8 @@ import java.io.IOException; import org.apache.vxquery.datamodel.values.ValueTag; -import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage; -import edu.uci.ics.hyracks.data.std.api.IValueReference; +import org.apache.hyracks.data.std.api.IMutableValueStorage; +import org.apache.hyracks.data.std.api.IValueReference; public class TextNodeBuilder extends AbstractNodeBuilder { private DataOutput out; @@ -44,4 +44,4 @@ public class TextNodeBuilder extends AbstractNodeBuilder { public void setValue(IValueReference value) throws IOException { out.write(value.getByteArray(), value.getStartOffset(), value.getLength()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java index 96d6c3d..12f4ad7 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/builders/sequence/SequenceBuilder.java @@ -22,9 +22,9 @@ import java.io.IOException; import org.apache.vxquery.datamodel.values.ValueTag; import org.apache.vxquery.util.GrowableIntArray; -import edu.uci.ics.hyracks.data.std.api.IMutableValueStorage; -import edu.uci.ics.hyracks.data.std.api.IValueReference; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.data.std.api.IMutableValueStorage; +import org.apache.hyracks.data.std.api.IValueReference; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class SequenceBuilder { private final GrowableIntArray slots = new GrowableIntArray(); @@ -62,4 +62,4 @@ public class SequenceBuilder { out.write(dataArea.getByteArray(), dataArea.getStartOffset(), dataArea.getLength()); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java index c30c77b..e2c89e9 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/ValueTag.java @@ -100,4 +100,4 @@ public class ValueTag { return false; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/XDMConstants.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/XDMConstants.java b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/XDMConstants.java index 8f1d7b3..bc058c7 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/XDMConstants.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/datamodel/values/XDMConstants.java @@ -21,9 +21,9 @@ import java.util.Arrays; import org.apache.vxquery.datamodel.builders.sequence.SequenceBuilder; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.primitive.BooleanPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.primitive.BooleanPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public class XDMConstants { private static final byte[] BOOLEAN_TRUE_CONSTANT; @@ -81,4 +81,4 @@ public class XDMConstants { private XDMConstants() { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/DefaultSystemExceptionFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/DefaultSystemExceptionFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/DefaultSystemExceptionFactory.java index 3c0e143..6dfd040 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/DefaultSystemExceptionFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/DefaultSystemExceptionFactory.java @@ -38,4 +38,4 @@ public final class DefaultSystemExceptionFactory implements SystemExceptionFacto public SystemException createException(ErrorCode code, SourceLocation location) { return new SystemException(code, location); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorReporter.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorReporter.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorReporter.java index d271095..8a1cdb0 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorReporter.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/ErrorReporter.java @@ -18,4 +18,4 @@ package org.apache.vxquery.exceptions; public interface ErrorReporter { public void reportError(Exception e); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java index 697d76c..39b12b9 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemException.java @@ -65,4 +65,4 @@ public class SystemException extends Exception { public ErrorCode getCode() { return code; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemExceptionFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemExceptionFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemExceptionFactory.java index d26f5af..15dcc61 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemExceptionFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/SystemExceptionFactory.java @@ -24,4 +24,4 @@ public interface SystemExceptionFactory { public SystemException createException(ErrorCode eCode); public SystemException createException(ErrorCode eCode, SourceLocation location); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryDataException.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryDataException.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryDataException.java index 79a37af..e41872c 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryDataException.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/VXQueryDataException.java @@ -18,7 +18,7 @@ package org.apache.vxquery.exceptions; import java.io.File; -import edu.uci.ics.hyracks.api.exceptions.HyracksDataException; +import org.apache.hyracks.api.exceptions.HyracksDataException; public class VXQueryDataException extends HyracksDataException { http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/WarningReporter.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/WarningReporter.java b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/WarningReporter.java index 419b6ed..0e7da5d 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/exceptions/WarningReporter.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/exceptions/WarningReporter.java @@ -18,4 +18,4 @@ package org.apache.vxquery.exceptions; public interface WarningReporter { public void reportWarning(Exception e); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/functions/BuiltinFunction.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/BuiltinFunction.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/BuiltinFunction.java index c85be26..1b002be 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/functions/BuiltinFunction.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/BuiltinFunction.java @@ -34,4 +34,4 @@ public class BuiltinFunction extends Function { public boolean useContextImplicitly() { return implicitContext; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/functions/ExternalFunction.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/ExternalFunction.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/ExternalFunction.java index 9d0891d..e80826d 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/functions/ExternalFunction.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/ExternalFunction.java @@ -32,4 +32,4 @@ public class ExternalFunction extends Function { public boolean useContextImplicitly() { return false; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/functions/Function.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/Function.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/Function.java index c725743..1305536 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/functions/Function.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/Function.java @@ -26,11 +26,11 @@ import org.apache.vxquery.compiler.rewriter.rules.propagationpolicies.uniquenode import org.apache.vxquery.exceptions.ErrorCode; import org.apache.vxquery.exceptions.SystemException; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo; -import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; -import edu.uci.ics.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory; +import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; +import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo; +import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.algebricks.runtime.base.IUnnestingEvaluatorFactory; public abstract class Function implements IFunctionInfo { private static final String VXQUERY = "vxquery"; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/functions/Operator.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/Operator.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/Operator.java index 1819129..ddce15c 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/functions/Operator.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/Operator.java @@ -32,4 +32,4 @@ public class Operator extends Function { public boolean useContextImplicitly() { return false; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java index 609e005..8604212 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/Signature.java @@ -71,4 +71,4 @@ public final class Signature { public void serialize(StringBuffer buffer) { } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/functions/UserDefinedXQueryFunction.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/functions/UserDefinedXQueryFunction.java b/vxquery-core/src/main/java/org/apache/vxquery/functions/UserDefinedXQueryFunction.java index 63b8c12..6d00845 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/functions/UserDefinedXQueryFunction.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/functions/UserDefinedXQueryFunction.java @@ -18,7 +18,7 @@ import javax.xml.namespace.QName; import org.apache.vxquery.context.XQueryVariable; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalPlan; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalPlan; public class UserDefinedXQueryFunction extends Function { private XQueryVariable[] params; @@ -54,4 +54,4 @@ public class UserDefinedXQueryFunction extends Function { public boolean useContextImplicitly() { return false; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultDataSink.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultDataSink.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultDataSink.java index 9fc639f..8286d1b 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultDataSink.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultDataSink.java @@ -16,11 +16,11 @@ */ package org.apache.vxquery.metadata; -import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSink; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.FileSplitDomain; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.IPartitioningProperty; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty; -import edu.uci.ics.hyracks.dataflow.std.file.FileSplit; +import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSink; +import org.apache.hyracks.algebricks.core.algebra.properties.FileSplitDomain; +import org.apache.hyracks.algebricks.core.algebra.properties.IPartitioningProperty; +import org.apache.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty; +import org.apache.hyracks.dataflow.std.file.FileSplit; public class QueryResultDataSink implements IDataSink { private final FileSplit[] fileSplits; @@ -49,4 +49,4 @@ public class QueryResultDataSink implements IDataSink { public FileSplit[] getFileSplits() { return fileSplits; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultSetDataSink.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultSetDataSink.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultSetDataSink.java index 1e4e781..80166e7 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultSetDataSink.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/QueryResultSetDataSink.java @@ -16,11 +16,11 @@ */ package org.apache.vxquery.metadata; -import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSink; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.IPartitioningProperty; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.ResultSetDomain; -import edu.uci.ics.hyracks.api.dataset.ResultSetId; +import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSink; +import org.apache.hyracks.algebricks.core.algebra.properties.IPartitioningProperty; +import org.apache.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty; +import org.apache.hyracks.algebricks.core.algebra.properties.ResultSetDomain; +import org.apache.hyracks.api.dataset.ResultSetId; public class QueryResultSetDataSink implements IDataSink { @@ -46,4 +46,4 @@ public class QueryResultSetDataSink implements IDataSink { public IPartitioningProperty getPartitioningProperty() { return new RandomPartitioningProperty(new ResultSetDomain()); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java index d17a1a9..62d1ca7 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionDataSource.java @@ -21,14 +21,14 @@ import java.util.List; import org.apache.vxquery.compiler.rewriter.rules.CollectionFileDomain; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable; -import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSource; -import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSourcePropertiesProvider; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.FunctionalDependency; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.ILocalStructuralProperty; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.IPhysicalPropertiesVector; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty; -import edu.uci.ics.hyracks.algebricks.core.algebra.properties.StructuralPropertiesVector; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable; +import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSource; +import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSourcePropertiesProvider; +import org.apache.hyracks.algebricks.core.algebra.properties.FunctionalDependency; +import org.apache.hyracks.algebricks.core.algebra.properties.ILocalStructuralProperty; +import org.apache.hyracks.algebricks.core.algebra.properties.IPhysicalPropertiesVector; +import org.apache.hyracks.algebricks.core.algebra.properties.RandomPartitioningProperty; +import org.apache.hyracks.algebricks.core.algebra.properties.StructuralPropertiesVector; public class VXQueryCollectionDataSource implements IDataSource<String> { private static final String DELIMITER = "\\|"; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/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 8fdd1ec..d5966b8 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 @@ -25,23 +25,24 @@ import java.util.logging.Logger; import org.apache.commons.io.FileUtils; import org.apache.commons.io.filefilter.TrueFileFilter; +import org.apache.hyracks.api.comm.IFrame; +import org.apache.hyracks.api.comm.IFrameFieldAppender; +import org.apache.hyracks.api.comm.VSizeFrame; +import org.apache.hyracks.api.context.IHyracksTaskContext; +import org.apache.hyracks.api.dataflow.IOperatorNodePushable; +import org.apache.hyracks.api.dataflow.value.IRecordDescriptorProvider; +import org.apache.hyracks.api.dataflow.value.RecordDescriptor; +import org.apache.hyracks.api.exceptions.HyracksDataException; +import org.apache.hyracks.api.job.IOperatorDescriptorRegistry; +import org.apache.hyracks.dataflow.common.comm.io.FrameFixedFieldTupleAppender; +import org.apache.hyracks.dataflow.common.comm.io.FrameTupleAccessor; +import org.apache.hyracks.dataflow.std.base.AbstractSingleActivityOperatorDescriptor; +import org.apache.hyracks.dataflow.std.base.AbstractUnaryInputUnaryOutputOperatorNodePushable; import org.apache.vxquery.context.DynamicContext; import org.apache.vxquery.xmlparser.ITreeNodeIdProvider; import org.apache.vxquery.xmlparser.TreeNodeIdProvider; import org.apache.vxquery.xmlparser.XMLParser; -import edu.uci.ics.hyracks.api.context.IHyracksTaskContext; -import edu.uci.ics.hyracks.api.dataflow.IOperatorNodePushable; -import edu.uci.ics.hyracks.api.dataflow.value.IRecordDescriptorProvider; -import edu.uci.ics.hyracks.api.dataflow.value.RecordDescriptor; -import edu.uci.ics.hyracks.api.exceptions.HyracksDataException; -import edu.uci.ics.hyracks.api.job.IOperatorDescriptorRegistry; -import edu.uci.ics.hyracks.dataflow.common.comm.io.FrameTupleAccessor; -import edu.uci.ics.hyracks.dataflow.common.comm.io.FrameTupleAppender; -import edu.uci.ics.hyracks.dataflow.common.comm.util.FrameUtils; -import edu.uci.ics.hyracks.dataflow.std.base.AbstractSingleActivityOperatorDescriptor; -import edu.uci.ics.hyracks.dataflow.std.base.AbstractUnaryInputUnaryOutputOperatorNodePushable; - public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityOperatorDescriptor { private static final long serialVersionUID = 1L; private short dataSourceId; @@ -63,18 +64,18 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO @Override public IOperatorNodePushable createPushRuntime(IHyracksTaskContext ctx, IRecordDescriptorProvider recordDescProvider, int partition, int nPartitions) throws HyracksDataException { - final FrameTupleAccessor fta = new FrameTupleAccessor(ctx.getFrameSize(), + final FrameTupleAccessor fta = new FrameTupleAccessor( recordDescProvider.getInputRecordDescriptor(getActivityId(), 0)); final int fieldOutputCount = recordDescProvider.getOutputRecordDescriptor(getActivityId(), 0).getFieldCount(); - final ByteBuffer frame = ctx.allocateFrame(); - final FrameTupleAppender appender = new FrameTupleAppender(ctx.getFrameSize(), fieldOutputCount); + final IFrame frame = new VSizeFrame(ctx); + final IFrameFieldAppender appender = new FrameFixedFieldTupleAppender(fieldOutputCount); final short partitionId = (short) ctx.getTaskAttemptId().getTaskId().getPartition(); final ITreeNodeIdProvider nodeIdProvider = new TreeNodeIdProvider(partitionId, dataSourceId, totalDataSources); final String nodeId = ctx.getJobletContext().getApplicationContext().getNodeId(); final DynamicContext dCtx = (DynamicContext) ctx.getJobletContext().getGlobalJobData(); final String collectionName = collectionPartitions[partition % collectionPartitions.length]; - final XMLParser parser = new XMLParser(false, nodeIdProvider, nodeId, frame, appender, childSeq, + final XMLParser parser = new XMLParser(false, nodeIdProvider, nodeId, appender, childSeq, dCtx.getStaticContext()); return new AbstractUnaryInputUnaryOutputOperatorNodePushable() { @@ -101,7 +102,7 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO if (LOGGER.isLoggable(Level.FINE)) { LOGGER.fine("Starting to read XML document: " + xmlDocument.getAbsolutePath()); } - parser.parseElements(xmlDocument, writer, fta, tupleIndex); + parser.parseElements(xmlDocument, writer, tupleIndex); } } } else { @@ -118,12 +119,11 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO @Override public void close() throws HyracksDataException { // Check if needed? - fta.reset(frame); - if (fta.getTupleCount() > 0) { - FrameUtils.flushFrame(frame, writer); + if (appender.getTupleCount() > 0) { + appender.flush(writer, true); } writer.close(); } }; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryIOFileFilter.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryIOFileFilter.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryIOFileFilter.java index 104f254..70070dc 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryIOFileFilter.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryIOFileFilter.java @@ -34,4 +34,4 @@ public class VXQueryIOFileFilter implements IOFileFilter { } return false; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java index ea4bdb1..238f6d3 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryMetadataProvider.java @@ -24,34 +24,34 @@ import java.util.Map; import org.apache.vxquery.context.StaticContext; -import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint; -import edu.uci.ics.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.common.utils.Pair; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.ILogicalExpression; -import edu.uci.ics.hyracks.algebricks.core.algebra.base.LogicalVariable; -import edu.uci.ics.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; -import edu.uci.ics.hyracks.algebricks.core.algebra.functions.IFunctionInfo; -import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSink; -import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSource; -import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IDataSourceIndex; -import edu.uci.ics.hyracks.algebricks.core.algebra.metadata.IMetadataProvider; -import edu.uci.ics.hyracks.algebricks.core.algebra.operators.logical.IOperatorSchema; -import edu.uci.ics.hyracks.algebricks.core.jobgen.impl.JobGenContext; -import edu.uci.ics.hyracks.algebricks.data.IAWriterFactory; -import edu.uci.ics.hyracks.algebricks.data.IPrinterFactory; -import edu.uci.ics.hyracks.algebricks.data.IResultSerializerFactoryProvider; -import edu.uci.ics.hyracks.algebricks.runtime.base.IPushRuntimeFactory; -import edu.uci.ics.hyracks.algebricks.runtime.serializer.ResultSerializerFactoryProvider; -import edu.uci.ics.hyracks.algebricks.runtime.writers.PrinterBasedWriterFactory; -import edu.uci.ics.hyracks.api.dataflow.IOperatorDescriptor; -import edu.uci.ics.hyracks.api.dataflow.value.IResultSerializerFactory; -import edu.uci.ics.hyracks.api.dataflow.value.ISerializerDeserializer; -import edu.uci.ics.hyracks.api.dataflow.value.RecordDescriptor; -import edu.uci.ics.hyracks.api.dataset.ResultSetId; -import edu.uci.ics.hyracks.api.job.JobSpecification; -import edu.uci.ics.hyracks.dataflow.std.result.ResultWriterOperatorDescriptor; +import org.apache.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint; +import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.common.utils.Pair; +import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression; +import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable; +import org.apache.hyracks.algebricks.core.algebra.expressions.IVariableTypeEnvironment; +import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; +import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo; +import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSink; +import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSource; +import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSourceIndex; +import org.apache.hyracks.algebricks.core.algebra.metadata.IMetadataProvider; +import org.apache.hyracks.algebricks.core.algebra.operators.logical.IOperatorSchema; +import org.apache.hyracks.algebricks.core.jobgen.impl.JobGenContext; +import org.apache.hyracks.algebricks.data.IAWriterFactory; +import org.apache.hyracks.algebricks.data.IPrinterFactory; +import org.apache.hyracks.algebricks.data.IResultSerializerFactoryProvider; +import org.apache.hyracks.algebricks.runtime.base.IPushRuntimeFactory; +import org.apache.hyracks.algebricks.runtime.serializer.ResultSerializerFactoryProvider; +import org.apache.hyracks.algebricks.runtime.writers.PrinterBasedWriterFactory; +import org.apache.hyracks.api.dataflow.IOperatorDescriptor; +import org.apache.hyracks.api.dataflow.value.IResultSerializerFactory; +import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer; +import org.apache.hyracks.api.dataflow.value.RecordDescriptor; +import org.apache.hyracks.api.dataset.ResultSetId; +import org.apache.hyracks.api.job.JobSpecification; +import org.apache.hyracks.dataflow.std.result.ResultWriterOperatorDescriptor; public class VXQueryMetadataProvider implements IMetadataProvider<String, String> { private final String[] nodeList; @@ -229,4 +229,4 @@ public class VXQueryMetadataProvider implements IMetadataProvider<String, String throw new UnsupportedOperationException(); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/result/ResultUtils.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/result/ResultUtils.java b/vxquery-core/src/main/java/org/apache/vxquery/result/ResultUtils.java index 923706e..ae7f5a1 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/result/ResultUtils.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/result/ResultUtils.java @@ -17,9 +17,9 @@ package org.apache.vxquery.result; import java.io.IOException; import java.nio.ByteBuffer; -import edu.uci.ics.hyracks.api.comm.IFrameTupleAccessor; -import edu.uci.ics.hyracks.api.exceptions.HyracksDataException; -import edu.uci.ics.hyracks.dataflow.common.comm.util.ByteBufferInputStream; +import org.apache.hyracks.api.comm.IFrameTupleAccessor; +import org.apache.hyracks.api.exceptions.HyracksDataException; +import org.apache.hyracks.dataflow.common.comm.util.ByteBufferInputStream; public class ResultUtils { public static String getStringFromBuffer(ByteBuffer buffer, IFrameTupleAccessor fta) throws HyracksDataException { http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java index 4f9437b..5ec14ee 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/factory/hashfunction/VXQueryRawBinaryHashFunctionFactory.java @@ -16,9 +16,9 @@ */ package org.apache.vxquery.runtime.factory.hashfunction; -import edu.uci.ics.hyracks.api.dataflow.value.IBinaryHashFunction; -import edu.uci.ics.hyracks.api.dataflow.value.IBinaryHashFunctionFactory; -import edu.uci.ics.hyracks.data.std.accessors.MurmurHash3BinaryHashFunctionFamily; +import org.apache.hyracks.api.dataflow.value.IBinaryHashFunction; +import org.apache.hyracks.api.dataflow.value.IBinaryHashFunctionFactory; +import org.apache.hyracks.data.std.accessors.MurmurHash3BinaryHashFunctionFamily; public class VXQueryRawBinaryHashFunctionFactory implements IBinaryHashFunctionFactory { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java index ba31783..325fb71 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinAggregateEvaluatorFactory.java @@ -31,12 +31,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentAggr import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation; import org.apache.vxquery.runtime.functions.util.FunctionHelper; -import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException; -import edu.uci.ics.hyracks.algebricks.runtime.base.IAggregateEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluator; -import edu.uci.ics.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; -import edu.uci.ics.hyracks.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.util.ArrayBackedValueStorage; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.runtime.base.IAggregateEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; public abstract class AbstractMaxMinAggregateEvaluatorFactory extends AbstractTaggedValueArgumentAggregateEvaluatorFactory { @@ -110,4 +110,4 @@ public abstract class AbstractMaxMinAggregateEvaluatorFactory extends } protected abstract AbstractValueComparisonOperation createValueComparisonOperation(); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/vxquery/blob/4684567b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java index b2aa0b9..82d938e 100644 --- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java +++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/aggregate/AbstractMaxMinScalarEvaluatorFactory.java @@ -28,12 +28,12 @@ import org.apache.vxquery.runtime.functions.base.AbstractTaggedValueArgumentScal import org.apache.vxquery.runtime.functions.comparison.AbstractValueComparisonOperation; import org.apache.vxquery.runtime.functions.util.FunctionHelper; -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.data.std.api.IPointable; -import edu.uci.ics.hyracks.data.std.primitive.VoidPointable; +import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator; +import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory; +import org.apache.hyracks.api.context.IHyracksTaskContext; +import org.apache.hyracks.data.std.api.IPointable; +import org.apache.hyracks.data.std.primitive.VoidPointable; public abstract class AbstractMaxMinScalarEvaluatorFactory extends AbstractTaggedValueArgumentScalarEvaluatorFactory { private static final long serialVersionUID = 1L; @@ -87,4 +87,4 @@ public abstract class AbstractMaxMinScalarEvaluatorFactory extends AbstractTagge } protected abstract AbstractValueComparisonOperation createValueComparisonOperation(); -} \ No newline at end of file +}
