clean up.
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/5d029489 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/5d029489 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/5d029489 Branch: refs/heads/ecarm002/interval_join_merge Commit: 5d02948925a3af098459ab3efba882e1d7154bfb Parents: 933c130 Author: Preston Carman <prest...@apache.org> Authored: Wed Jul 27 12:14:50 2016 -0700 Committer: Preston Carman <prest...@apache.org> Committed: Wed Jul 27 12:14:50 2016 -0700 ---------------------------------------------------------------------- .../sort/AbstractSorterOperatorDescriptor.java | 10 -------- .../dataflow/std/structures/TuplePointer.java | 26 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5d029489/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/AbstractSorterOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/AbstractSorterOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/AbstractSorterOperatorDescriptor.java index 665a90b..c3adc20 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/AbstractSorterOperatorDescriptor.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/AbstractSorterOperatorDescriptor.java @@ -99,16 +99,6 @@ public abstract class AbstractSorterOperatorDescriptor extends AbstractOperatorD public SortTaskState(JobId jobId, TaskId taskId) { super(jobId, taskId); } - - @Override - public void toBytes(DataOutput out) throws IOException { - - } - - @Override - public void fromBytes(DataInput in) throws IOException { - - } } protected abstract class SortActivity extends AbstractActivityNode { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/5d029489/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/TuplePointer.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/TuplePointer.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/TuplePointer.java index ae8eb24..42351a7 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/TuplePointer.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/TuplePointer.java @@ -18,11 +18,37 @@ */ package org.apache.hyracks.dataflow.std.structures; +import java.util.Comparator; + public final class TuplePointer implements IResetable<TuplePointer> { public static final int INVALID_ID = -1; private int frameIndex; private int tupleIndex; + public static final Comparator<TuplePointer> ASC = new Comparator<TuplePointer>() { + @Override + public int compare(TuplePointer tp1, TuplePointer tp2) { + int c = tp1.getFrameIndex() - tp2.getFrameIndex(); + if (c == 0) { + c = tp1.getTupleIndex() - tp2.getTupleIndex(); + } + return c; + } + + }; + + public static final Comparator<TuplePointer> DESC = new Comparator<TuplePointer>() { + @Override + public int compare(TuplePointer tp1, TuplePointer tp2) { + int c = tp2.getFrameIndex() - tp1.getFrameIndex(); + if (c == 0) { + c = tp2.getTupleIndex() - tp1.getTupleIndex(); + } + return c; + } + + }; + public TuplePointer() { this(INVALID_ID, INVALID_ID); }