http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java index 1a8a90e..548d43a 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java @@ -35,7 +35,6 @@ import org.apache.tajo.engine.planner.logical.JoinNode; import org.apache.tajo.engine.planner.logical.LogicalNode; import org.apache.tajo.engine.planner.logical.NodeType; import org.apache.tajo.engine.query.QueryContext; -import org.apache.tajo.master.session.Session; import org.apache.tajo.storage.*; import org.apache.tajo.storage.fragment.FileFragment; import org.apache.tajo.util.CommonTestingUtil; @@ -61,7 +60,7 @@ public class TestFullOuterHashJoinExec { private LogicalPlanner planner; private AbstractStorageManager sm; private Path testDir; - private static Session session = LocalTajoTestingUtility.createDummySession(); + private QueryContext defaultContext; private TableDesc dep3; private TableDesc job3; @@ -234,11 +233,10 @@ public class TestFullOuterHashJoinExec { phone3 = CatalogUtil.newTableDesc(PHONE3_NAME, phone3Schema, phone3Meta, phone3Path); catalog.createTable(phone3); - - - analyzer = new SQLAnalyzer(); planner = new LogicalPlanner(catalog); + + defaultContext = LocalTajoTestingUtility.createDummyContext(conf); } @After @@ -260,7 +258,7 @@ public class TestFullOuterHashJoinExec { @Test public final void testFullOuterHashJoinExec0() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[0]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.IN_MEMORY_HASH_JOIN); @@ -270,7 +268,7 @@ public class TestFullOuterHashJoinExec { FileFragment[] merged = TUtil.concat(dep3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestFullOuterHashJoinExec0"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); @@ -297,7 +295,7 @@ public class TestFullOuterHashJoinExec { @Test public final void testFullOuterHashJoinExec1() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[1]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.IN_MEMORY_HASH_JOIN); @@ -307,7 +305,7 @@ public class TestFullOuterHashJoinExec { FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestFullOuter_HashJoinExec1"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); @@ -333,7 +331,7 @@ public class TestFullOuterHashJoinExec { @Test public final void testFullOuterHashJoinExec2() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[2]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.IN_MEMORY_HASH_JOIN); @@ -343,7 +341,7 @@ public class TestFullOuterHashJoinExec { FileFragment[] merged = TUtil.concat(emp3Frags, job3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestFullOuterHashJoinExec2"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); @@ -370,7 +368,7 @@ public class TestFullOuterHashJoinExec { @Test public final void testFullOuterHashJoinExec3() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[3]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.IN_MEMORY_HASH_JOIN); @@ -381,7 +379,7 @@ public class TestFullOuterHashJoinExec { FileFragment[] merged = TUtil.concat(emp3Frags, phone3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestFullOuterHashJoinExec3"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer);
http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java index 50e5906..1b9f7aa 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java @@ -36,7 +36,6 @@ import org.apache.tajo.engine.planner.logical.JoinNode; import org.apache.tajo.engine.planner.logical.LogicalNode; import org.apache.tajo.engine.planner.logical.NodeType; import org.apache.tajo.engine.query.QueryContext; -import org.apache.tajo.master.session.Session; import org.apache.tajo.storage.*; import org.apache.tajo.storage.fragment.FileFragment; import org.apache.tajo.util.CommonTestingUtil; @@ -62,7 +61,7 @@ public class TestFullOuterMergeJoinExec { private LogicalPlanner planner; private AbstractStorageManager sm; private Path testDir; - private static final Session session = LocalTajoTestingUtility.createDummySession(); + private QueryContext defaultContext; private TableDesc dep3; private TableDesc dep4; @@ -279,6 +278,8 @@ public class TestFullOuterMergeJoinExec { analyzer = new SQLAnalyzer(); planner = new LogicalPlanner(catalog); + + defaultContext = LocalTajoTestingUtility.createDummyContext(conf); } @After @@ -304,7 +305,7 @@ public class TestFullOuterMergeJoinExec { @Test public final void testFullOuterMergeJoin0() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[0]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); @@ -316,7 +317,7 @@ public class TestFullOuterMergeJoinExec { FileFragment[] merged = TUtil.concat(emp3Frags, dep3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testFullOuterMergeJoin0"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); @@ -341,7 +342,7 @@ public class TestFullOuterMergeJoinExec { @Test public final void testFullOuterMergeJoin1() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[1]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); @@ -353,7 +354,7 @@ public class TestFullOuterMergeJoinExec { FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testFullOuterMergeJoin1"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); @@ -378,7 +379,7 @@ public class TestFullOuterMergeJoinExec { @Test public final void testFullOuterMergeJoin2() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[2]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); @@ -390,7 +391,7 @@ public class TestFullOuterMergeJoinExec { FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testFullOuterMergeJoin2"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); @@ -416,7 +417,7 @@ public class TestFullOuterMergeJoinExec { @Test public final void testFullOuterMergeJoin3() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[3]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); @@ -428,7 +429,7 @@ public class TestFullOuterMergeJoinExec { FileFragment[] merged = TUtil.concat(emp3Frags, dep4Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testFullOuterMergeJoin3"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); @@ -456,7 +457,7 @@ public class TestFullOuterMergeJoinExec { @Test public final void testFullOuterMergeJoin4() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[4]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); @@ -469,7 +470,7 @@ public class TestFullOuterMergeJoinExec { FileFragment[] merged = TUtil.concat(emp3Frags, phone3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testFullOuterMergeJoin4"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); @@ -495,7 +496,7 @@ public class TestFullOuterMergeJoinExec { @Test public final void testFullOuterMergeJoin5() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[5]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); @@ -508,7 +509,7 @@ public class TestFullOuterMergeJoinExec { FileFragment[] merged = TUtil.concat(phone3Frags,emp3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testFullOuterMergeJoin5"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java index 794ca79..7055e44 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java @@ -154,11 +154,11 @@ public class TestHashAntiJoinExec { FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testHashAntiJoin"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(new Enforcer()); Expr expr = analyzer.parse(QUERIES[0]); - LogicalPlan plan = planner.createPlan(LocalTajoTestingUtility.createDummySession(), expr); + LogicalPlan plan = planner.createPlan(LocalTajoTestingUtility.createDummyContext(conf), expr); optimizer.optimize(plan); LogicalNode rootNode = plan.getRootBlock().getRoot(); http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java index 0e07536..a8828ab 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java @@ -20,6 +20,7 @@ package org.apache.tajo.engine.planner.physical; import org.apache.hadoop.fs.Path; import org.apache.tajo.LocalTajoTestingUtility; +import org.apache.tajo.SessionVars; import org.apache.tajo.TajoConstants; import org.apache.tajo.TajoTestingCluster; import org.apache.tajo.algebra.Expr; @@ -36,7 +37,6 @@ import org.apache.tajo.engine.planner.logical.JoinNode; import org.apache.tajo.engine.planner.logical.LogicalNode; import org.apache.tajo.engine.planner.logical.NodeType; import org.apache.tajo.engine.query.QueryContext; -import org.apache.tajo.master.session.Session; import org.apache.tajo.storage.*; import org.apache.tajo.storage.fragment.FileFragment; import org.apache.tajo.util.CommonTestingUtil; @@ -61,7 +61,7 @@ public class TestHashJoinExec { private LogicalPlanner planner; private AbstractStorageManager sm; private Path testDir; - private final Session session = LocalTajoTestingUtility.createDummySession(); + private QueryContext defaultContext; private TableDesc employee; private TableDesc people; @@ -126,6 +126,7 @@ public class TestHashJoinExec { catalog.createTable(people); analyzer = new SQLAnalyzer(); planner = new LogicalPlanner(catalog); + defaultContext = LocalTajoTestingUtility.createDummyContext(conf); } @After @@ -140,8 +141,9 @@ public class TestHashJoinExec { @Test public final void testHashInnerJoin() throws IOException, PlanningException { + Expr expr = analyzer.parse(QUERIES[0]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); @@ -152,7 +154,7 @@ public class TestHashJoinExec { FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testHashInnerJoin"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); @@ -182,7 +184,7 @@ public class TestHashJoinExec { @Test public final void testCheckIfInMemoryInnerJoinIsPossible() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[0]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); @@ -195,13 +197,12 @@ public class TestHashJoinExec { FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testHashInnerJoin"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); - TajoConf localConf = new TajoConf(conf); - localConf.setLongVar(TajoConf.ConfVars.EXECUTOR_INNER_JOIN_INMEMORY_HASH_THRESHOLD, 100l); - PhysicalPlannerImpl phyPlanner = new PhysicalPlannerImpl(localConf, sm); + ctx.getQueryContext().setLong(SessionVars.HASH_JOIN_SIZE_LIMIT.keyname(), 100l); + PhysicalPlannerImpl phyPlanner = new PhysicalPlannerImpl(conf, sm); PhysicalExec exec = phyPlanner.createPlan(ctx, plan); ProjectionExec proj = (ProjectionExec) exec; http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java index 835260f..6373f23 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java @@ -158,11 +158,11 @@ public class TestHashSemiJoinExec { FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testHashSemiJoin"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(new Enforcer()); Expr expr = analyzer.parse(QUERIES[0]); - LogicalPlan plan = planner.createPlan(LocalTajoTestingUtility.createDummySession(), expr); + LogicalPlan plan = planner.createPlan(LocalTajoTestingUtility.createDummyContext(conf), expr); optimizer.optimize(plan); LogicalNode rootNode = plan.getRootBlock().getRoot(); http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java index bb25875..ef740e3 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java @@ -35,7 +35,6 @@ import org.apache.tajo.engine.planner.logical.JoinNode; import org.apache.tajo.engine.planner.logical.LogicalNode; import org.apache.tajo.engine.planner.logical.NodeType; import org.apache.tajo.engine.query.QueryContext; -import org.apache.tajo.master.session.Session; import org.apache.tajo.storage.*; import org.apache.tajo.storage.fragment.FileFragment; import org.apache.tajo.util.CommonTestingUtil; @@ -62,7 +61,7 @@ public class TestLeftOuterHashJoinExec { private LogicalPlanner planner; private AbstractStorageManager sm; private Path testDir; - private Session session = LocalTajoTestingUtility.createDummySession(); + private QueryContext defaultContext; private TableDesc dep3; private TableDesc job3; @@ -239,6 +238,7 @@ public class TestLeftOuterHashJoinExec { analyzer = new SQLAnalyzer(); planner = new LogicalPlanner(catalog); + defaultContext = LocalTajoTestingUtility.createDummyContext(conf); } @After @@ -262,7 +262,7 @@ public class TestLeftOuterHashJoinExec { @Test public final void testLeftOuterHashJoinExec0() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[0]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.IN_MEMORY_HASH_JOIN); @@ -272,7 +272,7 @@ public class TestLeftOuterHashJoinExec { FileFragment[] merged = TUtil.concat(dep3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuterHashJoinExec0"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); @@ -303,11 +303,11 @@ public class TestLeftOuterHashJoinExec { FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuter_HashJoinExec1"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(new Enforcer()); Expr expr = analyzer.parse(QUERIES[1]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); PhysicalExec exec = phyPlanner.createPlan(ctx, plan); @@ -344,11 +344,11 @@ public class TestLeftOuterHashJoinExec { FileFragment[] merged = TUtil.concat(emp3Frags, job3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuter_HashJoinExec2"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(new Enforcer()); Expr expr = analyzer.parse(QUERIES[2]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); PhysicalExec exec = phyPlanner.createPlan(ctx, plan); @@ -386,11 +386,11 @@ public class TestLeftOuterHashJoinExec { FileFragment[] merged = TUtil.concat(emp3Frags, phone3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuter_HashJoinExec3"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(new Enforcer()); Expr expr = analyzer.parse(QUERIES[3]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); PhysicalExec exec = phyPlanner.createPlan(ctx, plan); @@ -428,11 +428,11 @@ public class TestLeftOuterHashJoinExec { FileFragment[] merged = TUtil.concat(phone3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuter_HashJoinExec4"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(new Enforcer()); Expr expr = analyzer.parse(QUERIES[4]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); PhysicalExec exec = phyPlanner.createPlan(ctx, plan); @@ -444,12 +444,10 @@ public class TestLeftOuterHashJoinExec { assertEquals(1, 0); } else{ - Tuple tuple; int count = 0; - int i = 1; exec.init(); - while ((tuple = exec.next()) != null) { + while (exec.next() != null) { //TODO check contents count = count + 1; } http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterNLJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterNLJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterNLJoinExec.java index e935f57..2a8d9f0 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterNLJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterNLJoinExec.java @@ -36,7 +36,6 @@ import org.apache.tajo.engine.planner.PlanningException; import org.apache.tajo.engine.planner.enforce.Enforcer; import org.apache.tajo.engine.planner.logical.LogicalNode; import org.apache.tajo.engine.query.QueryContext; -import org.apache.tajo.master.session.Session; import org.apache.tajo.storage.*; import org.apache.tajo.storage.fragment.FileFragment; import org.apache.tajo.util.CommonTestingUtil; @@ -60,7 +59,7 @@ public class TestLeftOuterNLJoinExec { private CatalogService catalog; private SQLAnalyzer analyzer; private LogicalPlanner planner; - private static final Session session = LocalTajoTestingUtility.createDummySession(); + private QueryContext defaultContext; private AbstractStorageManager sm; private Path testDir; @@ -236,6 +235,8 @@ public class TestLeftOuterNLJoinExec { analyzer = new SQLAnalyzer(); planner = new LogicalPlanner(catalog); + + defaultContext = LocalTajoTestingUtility.createDummyContext(conf); } @After @@ -261,11 +262,11 @@ public class TestLeftOuterNLJoinExec { FileFragment[] merged = TUtil.concat(dep3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuterNLJoinExec0"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(new Enforcer()); Expr context = analyzer.parse(QUERIES[0]); - LogicalNode plan = planner.createPlan(session, context).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, context).getRootBlock().getRoot(); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); @@ -303,11 +304,11 @@ public class TestLeftOuterNLJoinExec { Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuter_NLJoinExec1"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(new Enforcer()); Expr context = analyzer.parse(QUERIES[1]); - LogicalNode plan = planner.createPlan(session, context).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, context).getRootBlock().getRoot(); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); @@ -347,11 +348,11 @@ public class TestLeftOuterNLJoinExec { FileFragment[] merged = TUtil.concat(emp3Frags, job3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuter_NLJoinExec2"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(new Enforcer()); Expr context = analyzer.parse(QUERIES[2]); - LogicalNode plan = planner.createPlan(session, context).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, context).getRootBlock().getRoot(); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); @@ -392,11 +393,11 @@ public class TestLeftOuterNLJoinExec { FileFragment[] merged = TUtil.concat(emp3Frags, phone3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuter_NLJoinExec3"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(new Enforcer()); Expr context = analyzer.parse(QUERIES[3]); - LogicalNode plan = planner.createPlan(session, context).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, context).getRootBlock().getRoot(); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); @@ -436,11 +437,11 @@ public class TestLeftOuterNLJoinExec { FileFragment[] merged = TUtil.concat(phone3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestLeftOuter_NLJoinExec4"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(new Enforcer()); Expr context = analyzer.parse(QUERIES[4]); - LogicalNode plan = planner.createPlan(session, context).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, context).getRootBlock().getRoot(); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java index a4449fa..ed19e4f 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java @@ -154,7 +154,7 @@ public class TestMergeJoinExec { @Test public final void testMergeInnerJoin() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[0]); - LogicalPlan plan = planner.createPlan(LocalTajoTestingUtility.createDummySession(), expr); + LogicalPlan plan = planner.createPlan(LocalTajoTestingUtility.createDummyContext(conf), expr); LogicalNode root = plan.getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(root, NodeType.JOIN); @@ -166,7 +166,7 @@ public class TestMergeJoinExec { FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testMergeInnerJoin"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java index 019929d..1120bbe 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java @@ -152,12 +152,12 @@ public class TestNLJoinExec { FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testNLCrossJoin"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(new Enforcer()); - Expr context = analyzer.parse(QUERIES[0]); - LogicalNode plan = planner.createPlan(LocalTajoTestingUtility.createDummySession(), - context).getRootBlock().getRoot(); + Expr expr = analyzer.parse(QUERIES[0]); + LogicalNode plan = planner.createPlan(LocalTajoTestingUtility.createDummyContext(conf), + expr).getRootBlock().getRoot(); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); PhysicalExec exec = phyPlanner.createPlan(ctx, plan); @@ -181,13 +181,12 @@ public class TestNLJoinExec { FileFragment[] merged = TUtil.concat(empFrags, peopleFrags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testNLInnerJoin"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), merged, workDir); ctx.setEnforcer(new Enforcer()); - Expr context = analyzer.parse(QUERIES[1]); - LogicalNode plan = planner.createPlan(LocalTajoTestingUtility.createDummySession(), - context).getRootBlock().getRoot(); - //LogicalOptimizer.optimize(ctx, plan); + Expr expr = analyzer.parse(QUERIES[1]); + LogicalNode plan = planner.createPlan(LocalTajoTestingUtility.createDummyContext(conf), + expr).getRootBlock().getRoot(); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); PhysicalExec exec = phyPlanner.createPlan(ctx, plan); http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java index a823d2b..a184a9a 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java @@ -85,6 +85,7 @@ public class TestPhysicalPlanner { private static AbstractStorageManager sm; private static Path testDir; private static Session session = LocalTajoTestingUtility.createDummySession(); + private static QueryContext defaultContext; private static TableDesc employee = null; private static TableDesc score = null; @@ -168,6 +169,7 @@ public class TestPhysicalPlanner { planner = new LogicalPlanner(catalog); optimizer = new LogicalOptimizer(conf); + defaultContext = LocalTajoTestingUtility.createDummyContext(conf); masterPlan = new MasterPlan(LocalTajoTestingUtility.newQueryId(), null, null); } @@ -201,12 +203,12 @@ public class TestPhysicalPlanner { FileFragment[] frags = StorageManager.splitNG(conf, "default.employee", employee.getMeta(), employee.getPath(), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testCreateScanPlan"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] { frags[0] }, workDir); ctx.setEnforcer(new Enforcer()); Expr expr = analyzer.parse(QUERIES[0]); - LogicalPlan plan = planner.createPlan(session, expr); + LogicalPlan plan = planner.createPlan(defaultContext, expr); LogicalNode rootNode =plan.getRootBlock().getRoot(); optimizer.optimize(plan); @@ -232,12 +234,12 @@ public class TestPhysicalPlanner { FileFragment[] frags = StorageManager.splitNG(conf, "default.employee", employee.getMeta(), employee.getPath(), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testCreateScanWithFilterPlan"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] { frags[0] }, workDir); ctx.setEnforcer(new Enforcer()); Expr expr = analyzer.parse(QUERIES[16]); - LogicalPlan plan = planner.createPlan(session, expr); + LogicalPlan plan = planner.createPlan(defaultContext, expr); LogicalNode rootNode =plan.getRootBlock().getRoot(); optimizer.optimize(plan); @@ -261,12 +263,12 @@ public class TestPhysicalPlanner { FileFragment[] frags = StorageManager.splitNG(conf, "default.score", score.getMeta(), score.getPath(), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testGroupByPlan"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] { frags[0] }, workDir); ctx.setEnforcer(new Enforcer()); Expr context = analyzer.parse(QUERIES[7]); - LogicalPlan plan = planner.createPlan(session, context); + LogicalPlan plan = planner.createPlan(defaultContext, context); optimizer.optimize(plan); LogicalNode rootNode = plan.getRootBlock().getRoot(); @@ -293,12 +295,12 @@ public class TestPhysicalPlanner { Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir( "target/test-data/testHashGroupByPlanWithALLField"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] { frags[0] }, workDir); ctx.setEnforcer(new Enforcer()); Expr expr = analyzer.parse(QUERIES[15]); - LogicalPlan plan = planner.createPlan(session, expr); + LogicalPlan plan = planner.createPlan(defaultContext, expr); LogicalNode rootNode = optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf,sm); @@ -322,12 +324,12 @@ public class TestPhysicalPlanner { FileFragment[] frags = StorageManager.splitNG(conf, "default.score", score.getMeta(), score.getPath(), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testSortGroupByPlan"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[]{frags[0]}, workDir); ctx.setEnforcer(new Enforcer()); Expr context = analyzer.parse(QUERIES[7]); - LogicalPlan plan = planner.createPlan(session, context); + LogicalPlan plan = planner.createPlan(defaultContext, context); optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf,sm); @@ -382,14 +384,14 @@ public class TestPhysicalPlanner { FileFragment[] frags = StorageManager.splitNG(conf, "default.score", score.getMeta(), score.getPath(), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testStorePlan"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] { frags[0] }, workDir); ctx.setEnforcer(new Enforcer()); ctx.setOutputPath(new Path(workDir, "grouped1")); Expr context = analyzer.parse(CreateTableAsStmts[0]); - LogicalPlan plan = planner.createPlan(session, context); + LogicalPlan plan = planner.createPlan(defaultContext, context); LogicalNode rootNode = optimizer.optimize(plan); @@ -424,14 +426,14 @@ public class TestPhysicalPlanner { FileFragment[] frags = StorageManager.splitNG(conf, "default.score", score.getMeta(), score.getPath(), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testStorePlanWithRCFile"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] { frags[0] }, workDir); ctx.setEnforcer(new Enforcer()); ctx.setOutputPath(new Path(workDir, "grouped2")); Expr context = analyzer.parse(CreateTableAsStmts[1]); - LogicalPlan plan = planner.createPlan(session, context); + LogicalPlan plan = planner.createPlan(defaultContext, context); LogicalNode rootNode = optimizer.optimize(plan); TableMeta outputMeta = CatalogUtil.newTableMeta(StoreType.RCFILE); @@ -465,14 +467,14 @@ public class TestPhysicalPlanner { FileFragment[] frags = StorageManager.splitNG(conf, "default.score", score.getMeta(), score.getPath(), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testStorePlan"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] { frags[0] }, workDir); ctx.setEnforcer(new Enforcer()); ctx.setOutputPath(new Path(workDir, "grouped3")); Expr context = analyzer.parse(CreateTableAsStmts[2]); - LogicalPlan plan = planner.createPlan(session, context); + LogicalPlan plan = planner.createPlan(defaultContext, context); LogicalNode rootNode = optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf,sm); PhysicalExec exec = phyPlanner.createPlan(ctx, rootNode); @@ -483,7 +485,7 @@ public class TestPhysicalPlanner { public final void testEnforceForHashBasedColumnPartitionStorePlan() throws IOException, PlanningException { Expr context = analyzer.parse(CreateTableAsStmts[2]); - LogicalPlan plan = planner.createPlan(session, context); + LogicalPlan plan = planner.createPlan(defaultContext, context); LogicalRootNode rootNode = (LogicalRootNode) optimizer.optimize(plan); CreateTableNode createTableNode = rootNode.getChild(); Enforcer enforcer = new Enforcer(); @@ -492,7 +494,7 @@ public class TestPhysicalPlanner { FileFragment[] frags = StorageManager.splitNG(conf, "default.score", score.getMeta(), score.getPath(), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testStorePlan"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] { frags[0] }, workDir); ctx.setEnforcer(enforcer); @@ -507,7 +509,7 @@ public class TestPhysicalPlanner { public final void testEnforceForSortBasedColumnPartitionStorePlan() throws IOException, PlanningException { Expr context = analyzer.parse(CreateTableAsStmts[2]); - LogicalPlan plan = planner.createPlan(session, context); + LogicalPlan plan = planner.createPlan(defaultContext, context); LogicalRootNode rootNode = (LogicalRootNode) optimizer.optimize(plan); CreateTableNode createTableNode = rootNode.getChild(); Enforcer enforcer = new Enforcer(); @@ -516,7 +518,7 @@ public class TestPhysicalPlanner { FileFragment[] frags = StorageManager.splitNG(conf, "default.score", score.getMeta(), score.getPath(), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testStorePlan"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] { frags[0] }, workDir); ctx.setEnforcer(enforcer); @@ -533,11 +535,11 @@ public class TestPhysicalPlanner { Integer.MAX_VALUE); QueryUnitAttemptId id = LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testPartitionedStorePlan"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), id, new FileFragment[] { frags[0] }, workDir); ctx.setEnforcer(new Enforcer()); Expr context = analyzer.parse(QUERIES[7]); - LogicalPlan plan = planner.createPlan(session, context); + LogicalPlan plan = planner.createPlan(defaultContext, context); int numPartitions = 3; Column key1 = new Column("default.score.deptname", Type.TEXT); @@ -594,11 +596,11 @@ public class TestPhysicalPlanner { Path workDir = CommonTestingUtil.getTestDir( "target/test-data/testPartitionedStorePlanWithEmptyGroupingSet"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), id, new FileFragment[] { frags[0] }, workDir); ctx.setEnforcer(new Enforcer()); Expr expr = analyzer.parse(QUERIES[14]); - LogicalPlan plan = planner.createPlan(session, expr); + LogicalPlan plan = planner.createPlan(defaultContext, expr); LogicalNode rootNode = plan.getRootBlock().getRoot(); int numPartitions = 1; DataChannel dataChannel = new DataChannel(masterPlan.newExecutionBlockId(), masterPlan.newExecutionBlockId(), @@ -648,12 +650,12 @@ public class TestPhysicalPlanner { FileFragment[] frags = StorageManager.splitNG(conf, "default.score", score.getMeta(), score.getPath(), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testAggregationFunction"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] { frags[0] }, workDir); ctx.setEnforcer(new Enforcer()); Expr context = analyzer.parse(QUERIES[8]); - LogicalPlan plan = planner.createPlan(session, context); + LogicalPlan plan = planner.createPlan(defaultContext, context); LogicalNode rootNode = optimizer.optimize(plan); // Set all aggregation functions to the first phase mode @@ -679,12 +681,12 @@ public class TestPhysicalPlanner { FileFragment[] frags = StorageManager.splitNG(conf, "default.score", score.getMeta(), score.getPath(), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testCountFunction"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] { frags[0] }, workDir); ctx.setEnforcer(new Enforcer()); Expr context = analyzer.parse(QUERIES[9]); - LogicalPlan plan = planner.createPlan(session, context); + LogicalPlan plan = planner.createPlan(defaultContext, context); LogicalNode rootNode = optimizer.optimize(plan); // Set all aggregation functions to the first phase mode @@ -707,12 +709,12 @@ public class TestPhysicalPlanner { FileFragment[] frags = StorageManager.splitNG(conf, "default.score", score.getMeta(), score.getPath(), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testGroupByWithNullValue"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] { frags[0] }, workDir); ctx.setEnforcer(new Enforcer()); Expr context = analyzer.parse(QUERIES[11]); - LogicalPlan plan = planner.createPlan(session, context); + LogicalPlan plan = planner.createPlan(defaultContext, context); LogicalNode rootNode = optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf,sm); @@ -732,12 +734,12 @@ public class TestPhysicalPlanner { FileFragment[] frags = StorageManager.splitNG(conf, "default.employee", employee.getMeta(), employee.getPath(), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testUnionPlan"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] { frags[0] }, workDir); ctx.setEnforcer(new Enforcer()); Expr context = analyzer.parse(QUERIES[0]); - LogicalPlan plan = planner.createPlan(session, context); + LogicalPlan plan = planner.createPlan(defaultContext, context); LogicalNode rootNode = optimizer.optimize(plan); LogicalRootNode root = (LogicalRootNode) rootNode; UnionNode union = plan.createNode(UnionNode.class); @@ -760,11 +762,11 @@ public class TestPhysicalPlanner { @Test public final void testEvalExpr() throws IOException, PlanningException { Path workDir = CommonTestingUtil.getTestDir("target/test-data/testEvalExpr"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] { }, workDir); Expr expr = analyzer.parse(QUERIES[12]); - LogicalPlan plan = planner.createPlan(session, expr); + LogicalPlan plan = planner.createPlan(defaultContext, expr); LogicalNode rootNode = optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); @@ -777,7 +779,7 @@ public class TestPhysicalPlanner { assertTrue(7.0d == tuple.get(1).asFloat8()); expr = analyzer.parse(QUERIES[13]); - plan = planner.createPlan(session, expr); + plan = planner.createPlan(defaultContext, expr); rootNode = optimizer.optimize(plan); phyPlanner = new PhysicalPlannerImpl(conf, sm); @@ -797,11 +799,11 @@ public class TestPhysicalPlanner { FileFragment[] frags = StorageManager.splitNG(conf, "default.employee", employee.getMeta(), employee.getPath(), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testCreateIndex"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] {frags[0]}, workDir); Expr context = analyzer.parse(createIndexStmt[0]); - LogicalPlan plan = planner.createPlan(session, context); + LogicalPlan plan = planner.createPlan(defaultContext, context); LogicalNode rootNode = optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); @@ -825,12 +827,12 @@ public class TestPhysicalPlanner { Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testDuplicateEliminate"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] {frags[0]}, workDir); ctx.setEnforcer(new Enforcer()); Expr expr = analyzer.parse(duplicateElimination[0]); - LogicalPlan plan = planner.createPlan(session, expr); + LogicalPlan plan = planner.createPlan(defaultContext, expr); LogicalNode rootNode = optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf,sm); @@ -859,12 +861,12 @@ public class TestPhysicalPlanner { employee.getPath(), Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testIndexedStoreExec"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] {frags[0]}, workDir); ctx.setEnforcer(new Enforcer()); Expr context = analyzer.parse(SORT_QUERY[0]); - LogicalPlan plan = planner.createPlan(session, context); + LogicalPlan plan = planner.createPlan(defaultContext, context); LogicalNode rootNode = optimizer.optimize(plan); SortNode sortNode = PlannerUtil.findTopNode(rootNode, NodeType.SORT); @@ -953,7 +955,7 @@ public class TestPhysicalPlanner { Path workDir = CommonTestingUtil.getTestDir("target/test-data/testSortEnforcer"); Expr context = analyzer.parse(SORT_QUERY[0]); - LogicalPlan plan = planner.createPlan(session, context); + LogicalPlan plan = planner.createPlan(defaultContext, context); optimizer.optimize(plan); LogicalNode rootNode = plan.getRootBlock().getRoot(); @@ -961,7 +963,7 @@ public class TestPhysicalPlanner { Enforcer enforcer = new Enforcer(); enforcer.enforceSortAlgorithm(sortNode.getPID(), SortAlgorithm.IN_MEMORY_SORT); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] {frags[0]}, workDir); ctx.setEnforcer(enforcer); @@ -975,7 +977,7 @@ public class TestPhysicalPlanner { assertTrue(exec instanceof MemSortExec); context = analyzer.parse(SORT_QUERY[0]); - plan = planner.createPlan(session, context); + plan = planner.createPlan(defaultContext, context); optimizer.optimize(plan); rootNode = plan.getRootBlock().getRoot(); @@ -983,7 +985,7 @@ public class TestPhysicalPlanner { enforcer = new Enforcer(); enforcer.enforceSortAlgorithm(sortNode.getPID(), SortAlgorithm.MERGE_SORT); - ctx = new TaskAttemptContext(conf, new QueryContext(), + ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] {frags[0]}, workDir); ctx.setEnforcer(enforcer); @@ -1003,7 +1005,7 @@ public class TestPhysicalPlanner { Path workDir = CommonTestingUtil.getTestDir("target/test-data/testGroupByEnforcer"); Expr context = analyzer.parse(QUERIES[7]); - LogicalPlan plan = planner.createPlan(session, context); + LogicalPlan plan = planner.createPlan(defaultContext, context); optimizer.optimize(plan); LogicalNode rootNode = plan.getRootBlock().getRoot(); @@ -1011,7 +1013,7 @@ public class TestPhysicalPlanner { Enforcer enforcer = new Enforcer(); enforcer.enforceHashAggregation(groupByNode.getPID()); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] {frags[0]}, workDir); ctx.setEnforcer(enforcer); @@ -1025,7 +1027,7 @@ public class TestPhysicalPlanner { assertNotNull(PhysicalPlanUtil.findExecutor(exec, HashAggregateExec.class)); context = analyzer.parse(QUERIES[7]); - plan = planner.createPlan(session, context); + plan = planner.createPlan(defaultContext, context); optimizer.optimize(plan); rootNode = plan.getRootBlock().getRoot(); @@ -1033,7 +1035,7 @@ public class TestPhysicalPlanner { enforcer = new Enforcer(); enforcer.enforceSortAggregation(groupByNode.getPID(), null); - ctx = new TaskAttemptContext(conf, new QueryContext(), + ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(masterPlan), new FileFragment[] {frags[0]}, workDir); ctx.setEnforcer(enforcer); http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java index ed6cb4e..f649dac 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java @@ -139,11 +139,11 @@ public class TestProgressExternalSortExec { FileFragment[] frags = StorageManager.splitNG(conf, "default.employee", employee.getMeta(), employee.getPath(), Integer.MAX_VALUE); Path workDir = new Path(testDir, TestExternalSortExec.class.getName()); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), new FileFragment[] { frags[0] }, workDir); ctx.setEnforcer(new Enforcer()); Expr expr = analyzer.parse(QUERIES[0]); - LogicalPlan plan = planner.createPlan(LocalTajoTestingUtility.createDummySession(), expr); + LogicalPlan plan = planner.createPlan(LocalTajoTestingUtility.createDummyContext(conf), expr); LogicalNode rootNode = plan.getRootBlock().getRoot(); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java index de90f70..506555e 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java @@ -36,7 +36,6 @@ import org.apache.tajo.engine.planner.PlanningException; import org.apache.tajo.engine.planner.enforce.Enforcer; import org.apache.tajo.engine.planner.logical.LogicalNode; import org.apache.tajo.engine.query.QueryContext; -import org.apache.tajo.master.session.Session; import org.apache.tajo.storage.*; import org.apache.tajo.storage.fragment.FileFragment; import org.apache.tajo.util.CommonTestingUtil; @@ -62,7 +61,7 @@ public class TestRightOuterHashJoinExec { private LogicalPlanner planner; private AbstractStorageManager sm; private Path testDir; - private static Session session = LocalTajoTestingUtility.createDummySession(); + private QueryContext defaultContext; private TableDesc dep3; private TableDesc job3; @@ -214,6 +213,7 @@ public class TestRightOuterHashJoinExec { analyzer = new SQLAnalyzer(); planner = new LogicalPlanner(catalog); + defaultContext = LocalTajoTestingUtility.createDummyContext(conf); } @After @@ -237,11 +237,11 @@ public class TestRightOuterHashJoinExec { FileFragment[] merged = TUtil.concat(emp3Frags, dep3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestRightOuter_HashJoinExec0"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(new Enforcer()); Expr expr = analyzer.parse(QUERIES[0]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); PhysicalExec exec = phyPlanner.createPlan(ctx, plan); @@ -278,11 +278,11 @@ public class TestRightOuterHashJoinExec { FileFragment[] merged = TUtil.concat(emp3Frags, job3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestRightOuter_HashJoinExec1"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(new Enforcer()); Expr expr = analyzer.parse(QUERIES[1]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); PhysicalExec exec = phyPlanner.createPlan(ctx, plan); @@ -319,11 +319,11 @@ public class TestRightOuterHashJoinExec { FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestRightOuter_HashJoinExec2"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(new Enforcer()); Expr expr = analyzer.parse(QUERIES[2]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); PhysicalExec exec = phyPlanner.createPlan(ctx, plan); http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java index d971073..0ce74eb 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java @@ -35,7 +35,6 @@ import org.apache.tajo.engine.planner.logical.JoinNode; import org.apache.tajo.engine.planner.logical.LogicalNode; import org.apache.tajo.engine.planner.logical.NodeType; import org.apache.tajo.engine.query.QueryContext; -import org.apache.tajo.master.session.Session; import org.apache.tajo.storage.*; import org.apache.tajo.storage.fragment.FileFragment; import org.apache.tajo.util.CommonTestingUtil; @@ -61,7 +60,8 @@ public class TestRightOuterMergeJoinExec { private LogicalPlanner planner; private AbstractStorageManager sm; private Path testDir; - private static final Session session = LocalTajoTestingUtility.createDummySession(); + private QueryContext defaultContext; + private TableDesc dep3; private TableDesc dep4; @@ -276,10 +276,10 @@ public class TestRightOuterMergeJoinExec { phone3 = CatalogUtil.newTableDesc(PHONE3_NAME, phone3Schema, phone3Meta, phone3Path); catalog.createTable(phone3); - - analyzer = new SQLAnalyzer(); planner = new LogicalPlanner(catalog); + + defaultContext = LocalTajoTestingUtility.createDummyContext(conf); } @After @@ -305,7 +305,7 @@ public class TestRightOuterMergeJoinExec { @Test public final void testRightOuterMergeJoin0() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[0]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); @@ -315,7 +315,7 @@ public class TestRightOuterMergeJoinExec { FileFragment[] merged = TUtil.concat(emp3Frags, dep3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testRightOuterMergeJoin0"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); @@ -340,7 +340,7 @@ public class TestRightOuterMergeJoinExec { @Test public final void testRightOuter_MergeJoin1() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[1]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); @@ -352,7 +352,7 @@ public class TestRightOuterMergeJoinExec { FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testRightOuterMergeJoin1"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); @@ -376,7 +376,7 @@ public class TestRightOuterMergeJoinExec { @Test public final void testRightOuterMergeJoin2() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[2]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); @@ -388,7 +388,7 @@ public class TestRightOuterMergeJoinExec { FileFragment[] merged = TUtil.concat(job3Frags, emp3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testRightOuterMergeJoin2"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); @@ -412,7 +412,7 @@ public class TestRightOuterMergeJoinExec { @Test public final void testRightOuter_MergeJoin3() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[3]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); @@ -424,7 +424,7 @@ public class TestRightOuterMergeJoinExec { FileFragment[] merged = TUtil.concat(emp3Frags, dep4Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testRightOuter_MergeJoin3"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); @@ -449,7 +449,7 @@ public class TestRightOuterMergeJoinExec { @Test public final void testRightOuter_MergeJoin4() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[4]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); @@ -462,7 +462,7 @@ public class TestRightOuterMergeJoinExec { FileFragment[] merged = TUtil.concat(emp3Frags, phone3Frags); Path workDir = CommonTestingUtil.getTestDir("target/test-data/testRightOuter_MergeJoin4"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); @@ -486,7 +486,7 @@ public class TestRightOuterMergeJoinExec { @Test public final void testRightOuterMergeJoin5() throws IOException, PlanningException { Expr expr = analyzer.parse(QUERIES[5]); - LogicalNode plan = planner.createPlan(session, expr).getRootBlock().getRoot(); + LogicalNode plan = planner.createPlan(defaultContext, expr).getRootBlock().getRoot(); JoinNode joinNode = PlannerUtil.findTopNode(plan, NodeType.JOIN); Enforcer enforcer = new Enforcer(); enforcer.enforceJoinAlgorithm(joinNode.getPID(), JoinAlgorithm.MERGE_JOIN); @@ -499,7 +499,7 @@ public class TestRightOuterMergeJoinExec { Path workDir = CommonTestingUtil.getTestDir("target/test-data/testRightOuterMergeJoin5"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility.newQueryUnitAttemptId(), merged, workDir); ctx.setEnforcer(enforcer); http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java index da6fb34..4d4cc3d 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java @@ -110,12 +110,12 @@ public class TestSortExec { public final void testNext() throws IOException, PlanningException { FileFragment[] frags = StorageManager.splitNG(conf, "default.employee", employeeMeta, tablePath, Integer.MAX_VALUE); Path workDir = CommonTestingUtil.getTestDir("target/test-data/TestSortExec"); - TaskAttemptContext ctx = new TaskAttemptContext(conf, new QueryContext(), + TaskAttemptContext ctx = new TaskAttemptContext(new QueryContext(conf), LocalTajoTestingUtility .newQueryUnitAttemptId(), new FileFragment[] { frags[0] }, workDir); ctx.setEnforcer(new Enforcer()); Expr context = analyzer.parse(QUERIES[0]); - LogicalPlan plan = planner.createPlan(LocalTajoTestingUtility.createDummySession(), context); + LogicalPlan plan = planner.createPlan(LocalTajoTestingUtility.createDummyContext(conf), context); LogicalNode rootNode = optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java index fe9f990..2b62c0e 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestGroupByQuery.java @@ -291,8 +291,8 @@ public class TestGroupByQuery extends QueryTestCaseBase { // case9 KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.put(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.put(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("id", Type.TEXT); @@ -345,8 +345,8 @@ public class TestGroupByQuery extends QueryTestCaseBase { public final void testDistinctAggregationCaseByCase3() throws Exception { // first distinct is smaller than second distinct. KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.put(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.put(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("col1", Type.TEXT); @@ -375,8 +375,8 @@ public class TestGroupByQuery extends QueryTestCaseBase { public final void testDistinctAggregationCaseByCase4() throws Exception { // Reproduction case for TAJO-994 KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.put(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.put(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("col1", Type.TEXT); @@ -562,8 +562,8 @@ public class TestGroupByQuery extends QueryTestCaseBase { @Test public final void testNumShufflePartition() throws Exception { KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.put(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.put(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("col1", Type.TEXT); @@ -592,7 +592,7 @@ public class TestGroupByQuery extends QueryTestCaseBase { TajoTestingCluster.createTable("testnumshufflepartition", schema, tableOptions, data.toArray(new String[]{}), 3); try { - testingCluster.setAllTajoDaemonConfValue(ConfVars.DIST_QUERY_GROUPBY_PARTITION_VOLUME.varname, "2"); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$DIST_QUERY_GROUPBY_PARTITION_VOLUME.varname, "2"); ResultSet res = executeString( "select col1 \n" + ",count(distinct col2) as cnt1\n" + @@ -646,8 +646,8 @@ public class TestGroupByQuery extends QueryTestCaseBase { assertEquals(2, partitionIds.size()); executeString("DROP TABLE testnumshufflepartition PURGE").close(); } finally { - testingCluster.setAllTajoDaemonConfValue(ConfVars.DIST_QUERY_GROUPBY_PARTITION_VOLUME.varname, - ConfVars.DIST_QUERY_GROUPBY_PARTITION_VOLUME.defaultVal); + testingCluster.setAllTajoDaemonConfValue(ConfVars.$DIST_QUERY_GROUPBY_PARTITION_VOLUME.varname, + ConfVars.$DIST_QUERY_GROUPBY_PARTITION_VOLUME.defaultVal); } } } http://git-wip-us.apache.org/repos/asf/tajo/blob/ddfc3f33/tajo-core/src/test/java/org/apache/tajo/engine/query/TestJoinBroadcast.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestJoinBroadcast.java b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestJoinBroadcast.java index 349ad0c..2625136 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestJoinBroadcast.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestJoinBroadcast.java @@ -48,9 +48,9 @@ import static org.junit.Assert.*; public class TestJoinBroadcast extends QueryTestCaseBase { public TestJoinBroadcast() throws Exception { super(TajoConstants.DEFAULT_DATABASE_NAME); - testingCluster.setAllTajoDaemonConfValue(TajoConf.ConfVars.DIST_QUERY_BROADCAST_JOIN_AUTO.varname, "true"); + testingCluster.setAllTajoDaemonConfValue(TajoConf.ConfVars.$TEST_BROADCAST_JOIN_ENABLED.varname, "true"); testingCluster.setAllTajoDaemonConfValue( - TajoConf.ConfVars.DIST_QUERY_BROADCAST_JOIN_THRESHOLD.varname, "" + (5 * 1024)); + TajoConf.ConfVars.$DIST_QUERY_BROADCAST_JOIN_THRESHOLD.varname, "" + (5 * 1024)); executeDDL("create_lineitem_large_ddl.sql", "lineitem_large"); executeDDL("create_customer_large_ddl.sql", "customer_large"); @@ -575,8 +575,8 @@ public class TestJoinBroadcast extends QueryTestCaseBase { @Test public final void testLeftOuterJoinLeftSideSmallTable() throws Exception { KeyValueSet tableOptions = new KeyValueSet(); - tableOptions.put(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); - tableOptions.put(StorageConstants.CSVFILE_NULL, "\\\\N"); + tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER); + tableOptions.set(StorageConstants.CSVFILE_NULL, "\\\\N"); Schema schema = new Schema(); schema.addColumn("id", Type.INT4);
