updated from api change.
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/1f3fb827 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/1f3fb827 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/1f3fb827 Branch: refs/heads/ecarm002/interval_join_merge Commit: 1f3fb8274284c8f7924c689104f593cfd3300171 Parents: 0725160 Author: Preston Carman <prest...@apache.org> Authored: Thu Jul 14 13:55:19 2016 -0700 Committer: Preston Carman <prest...@apache.org> Committed: Thu Jul 14 13:55:19 2016 -0700 ---------------------------------------------------------------------- .../hyracks/dataflow/std/join/NaturalMergeJoinChecker.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/1f3fb827/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/NaturalMergeJoinChecker.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/NaturalMergeJoinChecker.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/NaturalMergeJoinChecker.java index 030e25b..9a50d0c 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/NaturalMergeJoinChecker.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/NaturalMergeJoinChecker.java @@ -41,7 +41,13 @@ public class NaturalMergeJoinChecker implements IMergeJoinChecker { @Override public boolean checkToRemoveInMemory(ITupleAccessor accessorLeft, ITupleAccessor accessorRight) throws HyracksDataException { - int c = comparator.compare(accessorLeft, accessorLeft.getTupleId(), accessorRight, accessorRight.getTupleId()); + return checkToRemoveInMemory(accessorLeft, accessorLeft.getTupleId(), accessorRight, accessorRight.getTupleId()); + } + + @Override + public boolean checkToRemoveInMemory(IFrameTupleAccessor accessorLeft, int leftTupleIndex, + IFrameTupleAccessor accessorRight, int rightTupleIndex) throws HyracksDataException { + int c = comparator.compare(accessorLeft, leftTupleIndex, accessorRight, rightTupleIndex); return c < 0; }
