Updated Branches: refs/heads/master cf6bd4b36 -> cc2f5c8ea
http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/cc2f5c8e/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java ---------------------------------------------------------------------- diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java index 3051204..7baaff9 100644 --- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java +++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java @@ -69,9 +69,9 @@ public class TestPhysicalPlanner { private static CatalogService catalog; private static SQLAnalyzer analyzer; private static LogicalPlanner planner; + private static LogicalOptimizer optimizer; private static StorageManager sm; private static Path testDir; - private static FileSystem fs; private static TableDesc employee = null; private static TableDesc score = null; @@ -84,7 +84,6 @@ public class TestPhysicalPlanner { util.startCatalogCluster(); conf = util.getConfiguration(); testDir = CommonTestingUtil.getTestDir("target/test-data/TestPhysicalPlanner"); - fs = testDir.getFileSystem(conf); sm = StorageManager.get(conf, testDir); catalog = util.getMiniCatalogCluster().getCatalog(); for (FunctionDesc funcDesc : TajoMaster.initBuiltinFunctions()) { @@ -150,6 +149,7 @@ public class TestPhysicalPlanner { catalog.addTable(score); analyzer = new SQLAnalyzer(); planner = new LogicalPlanner(catalog); + optimizer = new LogicalOptimizer(); } @AfterClass @@ -188,7 +188,7 @@ public class TestPhysicalPlanner { Expr expr = analyzer.parse(QUERIES[0]); LogicalPlan plan = planner.createPlan(expr); LogicalNode rootNode =plan.getRootBlock().getRoot(); - LogicalOptimizer.optimize(plan); + optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf,sm); @@ -218,7 +218,7 @@ public class TestPhysicalPlanner { Expr expr = analyzer.parse(QUERIES[16]); LogicalPlan plan = planner.createPlan(expr); LogicalNode rootNode =plan.getRootBlock().getRoot(); - LogicalOptimizer.optimize(plan); + optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf,sm); @@ -244,11 +244,8 @@ public class TestPhysicalPlanner { new Fragment[] { frags[0] }, workDir); Expr context = analyzer.parse(QUERIES[7]); LogicalPlan plan = planner.createPlan(context); - System.out.println(plan.getRootBlock().getRoot()); - System.out.println("-------------------------------"); - LogicalOptimizer.optimize(plan); + optimizer.optimize(plan); LogicalNode rootNode = plan.getRootBlock().getRoot(); - System.out.println(rootNode); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf,sm); PhysicalExec exec = phyPlanner.createPlan(ctx, rootNode); @@ -277,7 +274,7 @@ public class TestPhysicalPlanner { new Fragment[] { frags[0] }, workDir); Expr expr = analyzer.parse(QUERIES[15]); LogicalPlan plan = planner.createPlan(expr); - LogicalNode rootNode = LogicalOptimizer.optimize(plan); + LogicalNode rootNode = optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf,sm); PhysicalExec exec = phyPlanner.createPlan(ctx, rootNode); @@ -305,7 +302,7 @@ public class TestPhysicalPlanner { new Fragment[]{frags[0]}, workDir); Expr context = analyzer.parse(QUERIES[7]); LogicalPlan plan = planner.createPlan(context); - LogicalOptimizer.optimize(plan); + optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf,sm); PhysicalExec exec = phyPlanner.createPlan(ctx, plan.getRootBlock().getRoot()); @@ -365,7 +362,7 @@ public class TestPhysicalPlanner { Expr context = analyzer.parse(CreateTableAsStmts[0]); LogicalPlan plan = planner.createPlan(context); - LogicalNode rootNode = LogicalOptimizer.optimize(plan); + LogicalNode rootNode = optimizer.optimize(plan); TableMeta outputMeta = CatalogUtil.newTableMeta(rootNode.getOutSchema(), @@ -406,7 +403,7 @@ public class TestPhysicalPlanner { Expr context = analyzer.parse(CreateTableAsStmts[1]); LogicalPlan plan = planner.createPlan(context); - LogicalNode rootNode = LogicalOptimizer.optimize(plan); + LogicalNode rootNode = optimizer.optimize(plan); TableMeta outputMeta = CatalogUtil.newTableMeta(rootNode.getOutSchema(), StoreType.RCFILE); @@ -452,7 +449,7 @@ public class TestPhysicalPlanner { StoreTableNode storeNode = new StoreTableNode("partition"); storeNode.setPartitions(PartitionType.HASH, new Column[]{key1, key2}, numPartitions); PlannerUtil.insertNode(rootNode, storeNode); - rootNode = LogicalOptimizer.optimize(plan); + rootNode = optimizer.optimize(plan); TableMeta outputMeta = CatalogUtil.newTableMeta(rootNode.getOutSchema(), StoreType.CSV); @@ -510,7 +507,7 @@ public class TestPhysicalPlanner { StoreTableNode storeNode = new StoreTableNode("emptyset"); storeNode.setPartitions(PartitionType.HASH, new Column[] {}, numPartitions); PlannerUtil.insertNode(rootNode, storeNode); - LogicalOptimizer.optimize(plan); + optimizer.optimize(plan); TableMeta outputMeta = CatalogUtil.newTableMeta(rootNode.getOutSchema(), StoreType.CSV); @@ -558,7 +555,7 @@ public class TestPhysicalPlanner { new Fragment[] { frags[0] }, workDir); Expr context = analyzer.parse(QUERIES[8]); LogicalPlan plan = planner.createPlan(context); - LogicalNode rootNode = LogicalOptimizer.optimize(plan); + LogicalNode rootNode = optimizer.optimize(plan); // Set all aggregation functions to the first phase mode GroupbyNode groupbyNode = (GroupbyNode) PlannerUtil.findTopNode(rootNode, ExprType.GROUP_BY); @@ -591,7 +588,7 @@ public class TestPhysicalPlanner { new Fragment[] { frags[0] }, workDir); Expr context = analyzer.parse(QUERIES[9]); LogicalPlan plan = planner.createPlan(context); - LogicalNode rootNode = LogicalOptimizer.optimize(plan); + LogicalNode rootNode = optimizer.optimize(plan); System.out.println(rootNode.toString()); // Set all aggregation functions to the first phase mode @@ -622,7 +619,7 @@ public class TestPhysicalPlanner { new Fragment[] { frags[0] }, workDir); Expr context = analyzer.parse(QUERIES[11]); LogicalPlan plan = planner.createPlan(context); - LogicalNode rootNode = LogicalOptimizer.optimize(plan); + LogicalNode rootNode = optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf,sm); PhysicalExec exec = phyPlanner.createPlan(ctx, rootNode); @@ -645,7 +642,7 @@ public class TestPhysicalPlanner { new Fragment[] { frags[0] }, workDir); Expr context = analyzer.parse(QUERIES[0]); LogicalPlan plan = planner.createPlan(context); - LogicalNode rootNode = LogicalOptimizer.optimize(plan); + LogicalNode rootNode = optimizer.optimize(plan); LogicalRootNode root = (LogicalRootNode) rootNode; UnionNode union = new UnionNode(root.getSubNode(), root.getSubNode()); root.setSubNode(union); @@ -669,7 +666,7 @@ public class TestPhysicalPlanner { new Fragment[] { }, workDir); Expr expr = analyzer.parse(QUERIES[12]); LogicalPlan plan = planner.createPlan(expr); - LogicalNode rootNode = LogicalOptimizer.optimize(plan); + LogicalNode rootNode = optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); PhysicalExec exec = phyPlanner.createPlan(ctx, rootNode); @@ -682,7 +679,7 @@ public class TestPhysicalPlanner { expr = analyzer.parse(QUERIES[13]); plan = planner.createPlan(expr); - rootNode = LogicalOptimizer.optimize(plan); + rootNode = optimizer.optimize(plan); phyPlanner = new PhysicalPlannerImpl(conf, sm); exec = phyPlanner.createPlan(ctx, rootNode); @@ -705,7 +702,7 @@ public class TestPhysicalPlanner { new Fragment[] {frags[0]}, workDir); Expr context = analyzer.parse(createIndexStmt[0]); LogicalPlan plan = planner.createPlan(context); - LogicalNode rootNode = LogicalOptimizer.optimize(plan); + LogicalNode rootNode = optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); PhysicalExec exec = phyPlanner.createPlan(ctx, rootNode); @@ -732,7 +729,7 @@ public class TestPhysicalPlanner { new Fragment[] {frags[0]}, workDir); Expr expr = analyzer.parse(duplicateElimination[0]); LogicalPlan plan = planner.createPlan(expr); - LogicalNode rootNode = LogicalOptimizer.optimize(plan); + LogicalNode rootNode = optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf,sm); PhysicalExec exec = phyPlanner.createPlan(ctx, rootNode); @@ -764,7 +761,7 @@ public class TestPhysicalPlanner { new Fragment[] {frags[0]}, workDir); Expr context = analyzer.parse(SORT_QUERY[0]); LogicalPlan plan = planner.createPlan(context); - LogicalNode rootNode = LogicalOptimizer.optimize(plan); + LogicalNode rootNode = optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf,sm); PhysicalExec exec = phyPlanner.createPlan(ctx, rootNode); http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/cc2f5c8e/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java index be389a3..0151cb3 100644 --- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java +++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java @@ -49,6 +49,7 @@ public class TestSortExec { private static CatalogService catalog; private static SQLAnalyzer analyzer; private static LogicalPlanner planner; + private static LogicalOptimizer optimizer; private static StorageManager sm; private static TajoTestingCluster util; private static Path workDir; @@ -93,6 +94,7 @@ public class TestSortExec { analyzer = new SQLAnalyzer(); planner = new LogicalPlanner(catalog); + optimizer = new LogicalOptimizer(); } @After @@ -112,7 +114,7 @@ public class TestSortExec { new Fragment[] { frags[0] }, workDir); Expr context = analyzer.parse(QUERIES[0]); LogicalPlan plan = planner.createPlan(context); - LogicalNode rootNode = LogicalOptimizer.optimize(plan); + LogicalNode rootNode = optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf, sm); PhysicalExec exec = phyPlanner.createPlan(ctx, rootNode); http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/cc2f5c8e/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java ---------------------------------------------------------------------- diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java index bce7e6c..69b8bac 100644 --- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java +++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java @@ -16,21 +16,26 @@ package org.apache.tajo.master; import org.apache.hadoop.fs.Path; import org.apache.hadoop.yarn.event.AsyncDispatcher; -import org.apache.tajo.algebra.Expr; -import org.apache.tajo.engine.parser.SQLAnalyzer; -import org.apache.tajo.engine.planner.*; -import org.junit.BeforeClass; -import org.junit.Test; import org.apache.tajo.QueryIdFactory; import org.apache.tajo.TajoTestingCluster; +import org.apache.tajo.algebra.Expr; import org.apache.tajo.benchmark.TPCH; -import org.apache.tajo.catalog.*; +import org.apache.tajo.catalog.CatalogService; +import org.apache.tajo.catalog.CatalogUtil; +import org.apache.tajo.catalog.TableDesc; +import org.apache.tajo.catalog.TableMeta; import org.apache.tajo.catalog.proto.CatalogProtos; import org.apache.tajo.conf.TajoConf; +import org.apache.tajo.engine.parser.SQLAnalyzer; +import org.apache.tajo.engine.planner.LogicalOptimizer; +import org.apache.tajo.engine.planner.LogicalPlan; +import org.apache.tajo.engine.planner.LogicalPlanner; import org.apache.tajo.engine.planner.global.MasterPlan; import org.apache.tajo.engine.planner.logical.LogicalNode; import org.apache.tajo.engine.planner.logical.LogicalRootNode; import org.apache.tajo.storage.StorageManager; +import org.junit.BeforeClass; +import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -41,6 +46,7 @@ public class TestExecutionBlockCursor { private static GlobalPlanner planner; private static SQLAnalyzer analyzer; private static LogicalPlanner logicalPlanner; + private static LogicalOptimizer optimizer; @BeforeClass public static void setUp() throws Exception { @@ -60,6 +66,7 @@ public class TestExecutionBlockCursor { analyzer = new SQLAnalyzer(); logicalPlanner = new LogicalPlanner(catalog); + optimizer = new LogicalOptimizer(); StorageManager sm = new StorageManager(conf); AsyncDispatcher dispatcher = new AsyncDispatcher(); @@ -82,7 +89,7 @@ public class TestExecutionBlockCursor { "join partsupp on s_suppkey = ps_suppkey " + "join part on p_partkey = ps_partkey and p_type like '%BRASS' and p_size = 15"); LogicalPlan logicalPlan = logicalPlanner.createPlan(context); - LogicalNode rootNode = LogicalOptimizer.optimize(logicalPlan); + LogicalNode rootNode = optimizer.optimize(logicalPlan); MasterPlan plan = planner.build(QueryIdFactory.newQueryId(), (LogicalRootNode) rootNode); ExecutionBlockCursor cursor = new ExecutionBlockCursor(plan); http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/cc2f5c8e/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/worker/TestRangeRetrieverHandler.java ---------------------------------------------------------------------- diff --git a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/worker/TestRangeRetrieverHandler.java b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/worker/TestRangeRetrieverHandler.java index 109b3ab..09ab483 100644 --- a/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/worker/TestRangeRetrieverHandler.java +++ b/tajo-core/tajo-core-backend/src/test/java/org/apache/tajo/worker/TestRangeRetrieverHandler.java @@ -23,20 +23,17 @@ import com.google.common.collect.Maps; import org.apache.commons.codec.binary.Base64; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.tajo.algebra.Expr; -import org.apache.tajo.engine.parser.SQLAnalyzer; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; import org.apache.tajo.QueryIdFactory; import org.apache.tajo.TajoTestingCluster; import org.apache.tajo.TaskAttemptContext; +import org.apache.tajo.algebra.Expr; import org.apache.tajo.catalog.*; import org.apache.tajo.catalog.proto.CatalogProtos.StoreType; import org.apache.tajo.common.TajoDataTypes.Type; import org.apache.tajo.conf.TajoConf; import org.apache.tajo.datum.Datum; import org.apache.tajo.datum.DatumFactory; +import org.apache.tajo.engine.parser.SQLAnalyzer; import org.apache.tajo.engine.planner.*; import org.apache.tajo.engine.planner.logical.LogicalNode; import org.apache.tajo.engine.planner.physical.ExternalSortExec; @@ -48,6 +45,9 @@ import org.apache.tajo.storage.index.bst.BSTIndex; import org.apache.tajo.util.CommonTestingUtil; import org.apache.tajo.util.TUtil; import org.apache.tajo.worker.dataserver.retriever.FileChunk; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import java.io.File; import java.io.IOException; @@ -64,6 +64,7 @@ public class TestRangeRetrieverHandler { private CatalogService catalog; private SQLAnalyzer analyzer; private LogicalPlanner planner; + private LogicalOptimizer optimizer; private StorageManager sm; private Schema schema; private static int TEST_TUPLE = 10000; @@ -83,6 +84,7 @@ public class TestRangeRetrieverHandler { analyzer = new SQLAnalyzer(); planner = new LogicalPlanner(catalog); + optimizer = new LogicalOptimizer(); schema = new Schema(); schema.addColumn("empId", Type.INT4); @@ -138,7 +140,7 @@ public class TestRangeRetrieverHandler { new Fragment[] {frags[0]}, testDir); Expr expr = analyzer.parse(SORT_QUERY[0]); LogicalPlan plan = planner.createPlan(expr); - LogicalNode rootNode = LogicalOptimizer.optimize(plan); + LogicalNode rootNode = optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf,sm); PhysicalExec exec = phyPlanner.createPlan(ctx, rootNode); @@ -249,7 +251,7 @@ public class TestRangeRetrieverHandler { new Fragment[] {frags[0]}, testDir); Expr expr = analyzer.parse(SORT_QUERY[1]); LogicalPlan plan = planner.createPlan(expr); - LogicalNode rootNode = LogicalOptimizer.optimize(plan); + LogicalNode rootNode = optimizer.optimize(plan); PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf,sm); PhysicalExec exec = phyPlanner.createPlan(ctx, rootNode);
