You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2014/10/01 17:38:29 UTC
[6/6] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tajo into block_iteration
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into block_iteration
Conflicts:
tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/890a96c3
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/890a96c3
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/890a96c3
Branch: refs/heads/block_iteration
Commit: 890a96c33a76587db2e25b13b6e2c53adf204dfc
Parents: fade0a8 0356a52
Author: Hyunsik Choi <hy...@apache.org>
Authored: Wed Oct 1 08:38:12 2014 -0700
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Wed Oct 1 08:38:12 2014 -0700
----------------------------------------------------------------------
CHANGES | 10 +++
.../java/org/apache/tajo/cli/HelpCommand.java | 30 ++------
.../main/java/org/apache/tajo/cli/TajoCli.java | 2 +-
.../engine/planner/PreLogicalPlanVerifier.java | 14 ++++
.../org/apache/tajo/master/GlobalEngine.java | 8 ++-
.../apache/tajo/master/querymaster/Query.java | 12 +---
.../main/java/org/apache/tajo/util/JSPUtil.java | 2 +-
.../planner/TestPreLogicalPlanVerifier.java | 74 ++++++++++++++++++++
.../master/querymaster/TestQueryProgress.java | 73 +++++++++++++++++++
.../main/sphinx/getting_started/building.rst | 10 ++-
tajo-project/pom.xml | 7 +-
11 files changed, 201 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/890a96c3/CHANGES
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/890a96c3/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
----------------------------------------------------------------------
diff --cc tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
index 23c4949,9612eeb..0a75023
--- a/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
+++ b/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
@@@ -131,10 -136,6 +136,11 @@@ public class GlobalEngine extends Abstr
return optimizer;
}
++ @VisibleForTesting
+ public LogicalPlanVerifier getLogicalPlanVerifier() {
+ return annotatedPlanVerifier;
+ }
+
private QueryContext createQueryContext(Session session) {
QueryContext newQueryContext = new QueryContext(context.getConf(), session);
http://git-wip-us.apache.org/repos/asf/tajo/blob/890a96c3/tajo-project/pom.xml
----------------------------------------------------------------------