Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/2faa47c1 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/2faa47c1 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/2faa47c1 Branch: refs/heads/index_support Commit: 2faa47c124fc81b7b3ef6e72c3fc7fd91aa072a1 Parents: 4d7910a 338a2b7 Author: Jihoon Son <[email protected]> Authored: Thu Apr 16 15:12:32 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Thu Apr 16 15:12:32 2015 +0900 ---------------------------------------------------------------------- CHANGES | 6 ++++ .../org/apache/tajo/cli/tsql/SimpleParser.java | 2 +- .../apache/tajo/engine/parser/SQLAnalyzer.java | 10 +++++++ .../src/main/resources/webapps/admin/query.jsp | 30 +++++++++++--------- .../tajo/engine/query/TestSelectQuery.java | 14 +++++++++ .../testSelectWithParentheses1.sql | 1 + .../testSelectWithParentheses2.sql | 1 + .../testSelectWithParentheses1.result | 3 ++ .../testSelectWithParentheses2.result | 3 ++ 9 files changed, 55 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/2faa47c1/tajo-core/src/main/java/org/apache/tajo/engine/parser/SQLAnalyzer.java ----------------------------------------------------------------------
