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/2fe3db4c Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/2fe3db4c Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/2fe3db4c Branch: refs/heads/index_support Commit: 2fe3db4c5aacff01604d99b82dcc0e7311d8a3ee Parents: 37c4e2b 1971d85 Author: Jihoon Son <[email protected]> Authored: Mon Apr 27 23:17:29 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Mon Apr 27 23:17:29 2015 +0900 ---------------------------------------------------------------------- CHANGES | 11 + .../main/java/org/apache/tajo/algebra/Join.java | 4 +- .../org/apache/tajo/cli/tsql/SimpleParser.java | 8 +- .../engine/planner/PhysicalPlannerImpl.java | 8 + .../engine/planner/global/GlobalPlanner.java | 26 +- .../java/org/apache/tajo/querymaster/Stage.java | 12 +- .../apache/tajo/cli/tsql/TestSimpleParser.java | 20 +- .../apache/tajo/engine/query/TestJoinQuery.java | 13 + .../tajo/engine/query/TestTablePartitions.java | 455 +++++++++++++------ .../apache/tajo/querymaster/TestQueryState.java | 93 ++++ .../queries/TestJoinQuery/testNaturalJoin.sql | 3 + .../TestJoinQuery/testNaturalJoin.result | 27 ++ .../tajo/plan/algebra/BaseAlgebraVisitor.java | 4 +- 13 files changed, 523 insertions(+), 161 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/2fe3db4c/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/2fe3db4c/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/2fe3db4c/tajo-core/src/test/java/org/apache/tajo/engine/query/TestTablePartitions.java ---------------------------------------------------------------------- diff --cc tajo-core/src/test/java/org/apache/tajo/engine/query/TestTablePartitions.java index 5679d5f,0d98b91..57b6417 --- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestTablePartitions.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestTablePartitions.java @@@ -777,22 -890,29 +890,29 @@@ public class TestTablePartitions extend @Test public final void testColumnPartitionedTableWithSmallerExpressions2() throws Exception { + ResultSet res = null; + ClientProtos.SubmitQueryResponse response = null; String tableName = CatalogUtil.normalizeIdentifier("testColumnPartitionedTableWithSmallerExpressions2"); - ResultSet res = executeString( + + if (nodeType == NodeType.INSERT) { + res = executeString( "create table " + tableName + " (col1 int4, col2 int4, null_col int4) partition by column(key float8) "); - res.close(); + res.close(); - assertTrue(catalog.existsTable(DEFAULT_DATABASE_NAME, tableName)); + assertTrue(catalog.existsTable(DEFAULT_DATABASE_NAME, tableName)); - ClientProtos.SubmitQueryResponse response = client.executeQuery("insert overwrite into " + tableName + response = client.executeQuery("insert overwrite into " + tableName + " select l_returnflag , l_orderkey, l_partkey from lineitem"); - assertTrue(response.getResult().hasErrorMessage()); - assertEquals(response.getResult().getErrorMessage(), "INSERT has smaller expressions than target columns\n"); - assertTrue(response.hasErrorMessage()); - assertEquals(response.getErrorMessage(), "INSERT has smaller expressions than target columns\n"); ++ assertTrue(response.getResult().hasErrorMessage()); ++ assertEquals(response.getResult().getErrorMessage(), "INSERT has smaller expressions than target columns\n"); - res = executeFile("case15.sql"); - assertResultSet(res, "case15.result"); - res.close(); + res = executeFile("case15.sql"); + assertResultSet(res, "case15.result"); + res.close(); + + executeString("DROP TABLE " + tableName + " PURGE").close(); + } } http://git-wip-us.apache.org/repos/asf/tajo/blob/2fe3db4c/tajo-plan/src/main/java/org/apache/tajo/plan/algebra/BaseAlgebraVisitor.java ----------------------------------------------------------------------
