Changes for the last two comments: Restored the SequencePointable with only two changes Modified compareKeys() class
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/98dc04fd Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/98dc04fd Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/98dc04fd Branch: refs/heads/master Commit: 98dc04fd5e9ec8b2044db88349b1db59d0234b7c Parents: b28fc19 Author: riyafa <[email protected]> Authored: Thu May 19 10:12:11 2016 +0530 Committer: riyafa <[email protected]> Committed: Thu May 19 10:12:11 2016 +0530 ---------------------------------------------------------------------- .../vxquery/datamodel/accessors/SequencePointable.java | 2 +- .../java/org/apache/vxquery/datamodel/ObjectByteTest.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/vxquery/blob/98dc04fd/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 9ccac0b..561ef8b 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 @@ -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/98dc04fd/vxquery-core/src/test/java/org/apache/vxquery/datamodel/ObjectByteTest.java ---------------------------------------------------------------------- diff --git a/vxquery-core/src/test/java/org/apache/vxquery/datamodel/ObjectByteTest.java b/vxquery-core/src/test/java/org/apache/vxquery/datamodel/ObjectByteTest.java index 2bf95c1..4bdb503 100644 --- a/vxquery-core/src/test/java/org/apache/vxquery/datamodel/ObjectByteTest.java +++ b/vxquery-core/src/test/java/org/apache/vxquery/datamodel/ObjectByteTest.java @@ -18,6 +18,7 @@ import java.io.IOException; import org.apache.hyracks.data.std.api.IPointable; import org.apache.hyracks.data.std.primitive.UTF8StringPointable; +import org.apache.hyracks.data.std.primitive.VoidPointable; import org.apache.hyracks.data.std.util.ArrayBackedValueStorage; import org.apache.vxquery.datamodel.accessors.SequencePointable; import org.apache.vxquery.datamodel.accessors.TaggedValuePointable; @@ -41,6 +42,7 @@ public class ObjectByteTest extends AbstractPointableTest { private TaggedValuePointable tvpValue3 = (TaggedValuePointable) TaggedValuePointable.FACTORY.createPointable(); private SequencePointable sp = (SequencePointable) SequencePointable.FACTORY.createPointable(); private ObjectPointable op = (ObjectPointable) ObjectPointable.FACTORY.createPointable(); + private IPointable vp = VoidPointable.FACTORY.createPointable(); @Test public void testEmptyObject() { @@ -254,9 +256,9 @@ public class ObjectByteTest extends AbstractPointableTest { } } - private boolean compareKeys(IPointable tvp1, IPointable tvp2) { - - return FunctionHelper.arraysEqual(tvp1.getByteArray(), tvp1.getStartOffset() + 1, tvp1.getLength() - 1, - tvp2.getByteArray(), tvp2.getStartOffset(), tvp2.getLength()); + private boolean compareKeys(TaggedValuePointable tvp1, IPointable tvp2) { + tvp1.getValue(vp); + return FunctionHelper.arraysEqual(vp.getByteArray(), vp.getStartOffset(), vp.getLength(), tvp2.getByteArray(), + tvp2.getStartOffset(), tvp2.getLength()); } }
