Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

TAJO-1055: ExecutorPreCompiler does not cache correctly compiled TupleComparators. #152

Closed
hyunsik wants to merge 2 commits into from
Closed

TAJO-1055: ExecutorPreCompiler does not cache correctly compiled TupleComparators. #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76b4f89
TAJO-1055: ExecutorPreCompiler does not cache correctly compiled Tupl…
hyunsik Sep 19, 2014
081a8af
Merge branch 'block_iteration' of https://git-wip-us.apache.org/repos…
hyunsik Sep 21, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tajo-core/src/main/java/org/apache/tajo/engine/codegen/ExecutorPreCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public class ExecutorPreCompiler extends BasicLogicalPlanVisitor<ExecutorPreComp
public static void compile(CompilationContext context, LogicalNode node) throws PlanningException {
instance.visit(context, null, null, node, new Stack<LogicalNode>());
context.compiledEvals = Collections.unmodifiableMap(context.compiledEvals);
context.compiledComparators = Collections.unmodifiableMap(context.compiledComparators);
}

public static Map<Pair<Schema, EvalNode>, EvalNode> compile(TajoClassLoader classLoader, LogicalNode node)
Expand Down
13 changes: 5 additions & 8 deletions tajo-storage/src/main/java/org/apache/tajo/storage/BaseTupleComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,7 @@ public class BaseTupleComparator extends TupleComparator implements ProtoObject<
private final int[] sortKeyIds;
private final boolean[] asc;
@SuppressWarnings("unused")
private final boolean[] nullFirsts;

private Datum left;
private Datum right;
private int compVal;
private final boolean[] nullFirsts;

/**
* @param schema The schema of input tuples
Expand Down Expand Up @@ -108,9 +104,10 @@ public boolean isAscendingFirstKey() {

@Override
public int compare(Tuple tuple1, Tuple tuple2) {
int compVal = 0;
for (int i = 0; i < sortKeyIds.length; i++) {
left = tuple1.get(sortKeyIds[i]);
right = tuple2.get(sortKeyIds[i]);
Datum left = tuple1.get(sortKeyIds[i]);
Datum right = tuple2.get(sortKeyIds[i]);

if (left.isNull() || right.isNull()) {
if (!left.equals(right)) {
Expand Down Expand Up @@ -144,7 +141,7 @@ public int compare(Tuple tuple1, Tuple tuple2) {

@Override
public int hashCode() {
return Objects.hashCode(sortKeyIds);
return Objects.hashCode(sortSpecs);
}

@Override
Expand Down