Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into
index_support
Conflicts:
tajo-core/src/test/java/org/apache/tajo/querymaster/TestKillQuery.java
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/7cafc33b
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/7cafc33b
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/7cafc33b
Branch: refs/heads/index_support
Commit: 7cafc33b0c564e0d10f80cf3f25be2262ef1880f
Parents: 9d48a40 c429c97
Author: Jihoon Son <[email protected]>
Authored: Wed Jan 28 12:55:14 2015 +0900
Committer: Jihoon Son <[email protected]>
Committed: Wed Jan 28 12:55:14 2015 +0900
----------------------------------------------------------------------
CHANGES | 7 +
.../java/org/apache/tajo/conf/TajoConf.java | 2 +-
.../org/apache/tajo/master/QueryInProgress.java | 1 +
.../java/org/apache/tajo/querymaster/Stage.java | 2 +
.../java/org/apache/tajo/querymaster/Task.java | 5 +-
.../java/org/apache/tajo/worker/TajoWorker.java | 7 +
.../tajo/worker/TajoWorkerClientService.java | 4 +-
.../org/apache/tajo/TajoTestingCluster.java | 52 +++----
.../tajo/engine/query/TestHBaseTable.java | 135 +------------------
.../master/scheduler/TestFifoScheduler.java | 8 +-
.../apache/tajo/querymaster/TestKillQuery.java | 60 ++++++++-
tajo-dist/src/main/bin/tajo | 54 ++++----
.../org/apache/tajo/storage/StorageManager.java | 3 +-
.../tajo/storage/hbase/HBaseStorageManager.java | 13 +-
14 files changed, 152 insertions(+), 201 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/7cafc33b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/7cafc33b/tajo-core/src/main/java/org/apache/tajo/worker/TajoWorkerClientService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/7cafc33b/tajo-core/src/test/java/org/apache/tajo/querymaster/TestKillQuery.java
----------------------------------------------------------------------
diff --cc tajo-core/src/test/java/org/apache/tajo/querymaster/TestKillQuery.java
index b5c745a,42ad8da..afcc4d9
--- a/tajo-core/src/test/java/org/apache/tajo/querymaster/TestKillQuery.java
+++ b/tajo-core/src/test/java/org/apache/tajo/querymaster/TestKillQuery.java
@@@ -73,11 -86,10 +86,10 @@@ public class TestKillQuery
QueryContext defaultContext =
LocalTajoTestingUtility.createDummyContext(conf);
Session session = LocalTajoTestingUtility.createDummySession();
CatalogService catalog = cluster.getMaster().getCatalog();
- String query = "select l_orderkey, l_partkey from lineitem group by
l_orderkey, l_partkey order by l_orderkey";
LogicalPlanner planner = new LogicalPlanner(catalog);
- LogicalOptimizer optimizer = new LogicalOptimizer(conf);
+ LogicalOptimizer optimizer = new LogicalOptimizer(conf, catalog);
- Expr expr = analyzer.parse(query);
+ Expr expr = analyzer.parse(queryStr);
LogicalPlan plan = planner.createPlan(defaultContext, expr);
optimizer.optimize(plan);
