DRILL-264: MappingSets should not be static
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/135b0dbc Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/135b0dbc Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/135b0dbc Branch: refs/heads/master Commit: 135b0dbcdd61044447fa1012d44a9bb436072ec7 Parents: 8b64b94 Author: Steven Phillips <[email protected]> Authored: Thu Oct 17 15:59:10 2013 -0700 Committer: Steven Phillips <[email protected]> Committed: Wed Oct 30 15:23:34 2013 -0700 ---------------------------------------------------------------------- .../exec/physical/impl/aggregate/AggBatch.java | 30 ++++++++++---------- .../exec/physical/impl/sort/SortBatch.java | 6 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/135b0dbc/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/AggBatch.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/AggBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/AggBatch.java index 8618b7f..f652e35 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/AggBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/AggBatch.java @@ -202,9 +202,9 @@ public class AggBatch extends AbstractRecordBatch<StreamingAggregate> { - private static final GeneratorMapping IS_SAME = GeneratorMapping.create("setupInterior", "isSame", null, null); - private static final MappingSet IS_SAME_I1 = new MappingSet("index1", null, IS_SAME, IS_SAME); - private static final MappingSet IS_SAME_I2 = new MappingSet("index2", null, IS_SAME, IS_SAME); + private final GeneratorMapping IS_SAME = GeneratorMapping.create("setupInterior", "isSame", null, null); + private final MappingSet IS_SAME_I1 = new MappingSet("index1", null, IS_SAME, IS_SAME); + private final MappingSet IS_SAME_I2 = new MappingSet("index2", null, IS_SAME, IS_SAME); private void setupIsSame(CodeGenerator<Aggregator> cg, LogicalExpression[] keyExprs){ cg.setMappingSet(IS_SAME_I1); @@ -222,10 +222,10 @@ public class AggBatch extends AbstractRecordBatch<StreamingAggregate> { cg.getEvalBlock()._return(JExpr.TRUE); } - private static final GeneratorMapping IS_SAME_PREV_INTERNAL_BATCH_READ = GeneratorMapping.create("isSamePrev", "isSamePrev", null, null); // the internal batch changes each time so we need to redo setup. - private static final GeneratorMapping IS_SAME_PREV = GeneratorMapping.create("setupInterior", "isSamePrev", null, null); - private static final MappingSet ISA_B1 = new MappingSet("b1Index", null, "b1", null, IS_SAME_PREV_INTERNAL_BATCH_READ, IS_SAME_PREV_INTERNAL_BATCH_READ); - private static final MappingSet ISA_B2 = new MappingSet("b2Index", null, "incoming", null, IS_SAME_PREV, IS_SAME_PREV); + private final GeneratorMapping IS_SAME_PREV_INTERNAL_BATCH_READ = GeneratorMapping.create("isSamePrev", "isSamePrev", null, null); // the internal batch changes each time so we need to redo setup. + private final GeneratorMapping IS_SAME_PREV = GeneratorMapping.create("setupInterior", "isSamePrev", null, null); + private final MappingSet ISA_B1 = new MappingSet("b1Index", null, "b1", null, IS_SAME_PREV_INTERNAL_BATCH_READ, IS_SAME_PREV_INTERNAL_BATCH_READ); + private final MappingSet ISA_B2 = new MappingSet("b2Index", null, "incoming", null, IS_SAME_PREV, IS_SAME_PREV); private void setupIsSameApart(CodeGenerator<Aggregator> cg, LogicalExpression[] keyExprs){ cg.setMappingSet(ISA_B1); @@ -243,9 +243,9 @@ public class AggBatch extends AbstractRecordBatch<StreamingAggregate> { cg.getEvalBlock()._return(JExpr.TRUE); } - private static final GeneratorMapping EVAL_INSIDE = GeneratorMapping.create("setupInterior", "addRecord", null, null); - private static final GeneratorMapping EVAL_OUTSIDE = GeneratorMapping.create("setupInterior", "outputRecordValues", "resetValues", "cleanup"); - private static final MappingSet EVAL = new MappingSet("index", "outIndex", EVAL_INSIDE, EVAL_OUTSIDE, EVAL_INSIDE); + private final GeneratorMapping EVAL_INSIDE = GeneratorMapping.create("setupInterior", "addRecord", null, null); + private final GeneratorMapping EVAL_OUTSIDE = GeneratorMapping.create("setupInterior", "outputRecordValues", "resetValues", "cleanup"); + private final MappingSet EVAL = new MappingSet("index", "outIndex", EVAL_INSIDE, EVAL_OUTSIDE, EVAL_INSIDE); private void addRecordValues(CodeGenerator<Aggregator> cg, LogicalExpression[] valueExprs){ cg.setMappingSet(EVAL); @@ -256,7 +256,7 @@ public class AggBatch extends AbstractRecordBatch<StreamingAggregate> { cg.getBlock(BlockType.EVAL)._return(JExpr.TRUE); } - private static final MappingSet RECORD_KEYS = new MappingSet(GeneratorMapping.create("setupInterior", "outputRecordKeys", null, null)); + private final MappingSet RECORD_KEYS = new MappingSet(GeneratorMapping.create("setupInterior", "outputRecordKeys", null, null)); private void outputRecordKeys(CodeGenerator<Aggregator> cg, TypedFieldId[] keyOutputIds, LogicalExpression[] keyExprs){ cg.setMappingSet(RECORD_KEYS); @@ -267,11 +267,11 @@ public class AggBatch extends AbstractRecordBatch<StreamingAggregate> { cg.getBlock(BlockType.EVAL)._return(JExpr.TRUE); } - private static final GeneratorMapping PREVIOUS_KEYS_OUT = GeneratorMapping.create("setupInterior", "outputRecordKeysPrev", null, null); - private static final MappingSet RECORD_KEYS_PREV_OUT = new MappingSet("previousIndex", "outIndex", "previous", "outgoing", PREVIOUS_KEYS_OUT, PREVIOUS_KEYS_OUT); + private final GeneratorMapping PREVIOUS_KEYS_OUT = GeneratorMapping.create("setupInterior", "outputRecordKeysPrev", null, null); + private final MappingSet RECORD_KEYS_PREV_OUT = new MappingSet("previousIndex", "outIndex", "previous", "outgoing", PREVIOUS_KEYS_OUT, PREVIOUS_KEYS_OUT); - private static final GeneratorMapping PREVIOUS_KEYS = GeneratorMapping.create("outputRecordKeysPrev", "outputRecordKeysPrev", null, null); - private static final MappingSet RECORD_KEYS_PREV = new MappingSet("previousIndex", "outIndex", "previous", null, PREVIOUS_KEYS, PREVIOUS_KEYS); + private final GeneratorMapping PREVIOUS_KEYS = GeneratorMapping.create("outputRecordKeysPrev", "outputRecordKeysPrev", null, null); + private final MappingSet RECORD_KEYS_PREV = new MappingSet("previousIndex", "outIndex", "previous", null, PREVIOUS_KEYS, PREVIOUS_KEYS); private void outputRecordKeysPrev(CodeGenerator<Aggregator> cg, TypedFieldId[] keyOutputIds, LogicalExpression[] keyExprs){ cg.setMappingSet(RECORD_KEYS_PREV); http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/135b0dbc/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortBatch.java ---------------------------------------------------------------------- diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortBatch.java index 3fd590c..0bfd6ca 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortBatch.java @@ -50,9 +50,9 @@ import com.sun.codemodel.JExpr; public class SortBatch extends AbstractRecordBatch<Sort> { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(SortBatch.class); - public static final MappingSet MAIN_MAPPING = new MappingSet( (String) null, null, CodeGenerator.DEFAULT_SCALAR_MAP, CodeGenerator.DEFAULT_SCALAR_MAP); - public static final MappingSet LEFT_MAPPING = new MappingSet("leftIndex", null, CodeGenerator.DEFAULT_SCALAR_MAP, CodeGenerator.DEFAULT_SCALAR_MAP); - public static final MappingSet RIGHT_MAPPING = new MappingSet("rightIndex", null, CodeGenerator.DEFAULT_SCALAR_MAP, CodeGenerator.DEFAULT_SCALAR_MAP); + public final MappingSet MAIN_MAPPING = new MappingSet( (String) null, null, CodeGenerator.DEFAULT_SCALAR_MAP, CodeGenerator.DEFAULT_SCALAR_MAP); + public final MappingSet LEFT_MAPPING = new MappingSet("leftIndex", null, CodeGenerator.DEFAULT_SCALAR_MAP, CodeGenerator.DEFAULT_SCALAR_MAP); + public final MappingSet RIGHT_MAPPING = new MappingSet("rightIndex", null, CodeGenerator.DEFAULT_SCALAR_MAP, CodeGenerator.DEFAULT_SCALAR_MAP); private static long MAX_SORT_BYTES = 8l * 1024 * 1024 * 1024;
