Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/89892d0b Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/89892d0b Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/89892d0b Branch: refs/heads/master Commit: 89892d0bc7b8bc5ff6cf188c0ca151d003a6df85 Parents: 08efcf2 4253f1b Author: Hyunsik Choi <[email protected]> Authored: Tue Aug 4 18:04:21 2015 +0900 Committer: Hyunsik Choi <[email protected]> Committed: Tue Aug 4 18:04:21 2015 +0900 ---------------------------------------------------------------------- CHANGES | 2 + .../tajo/catalog/AbstractCatalogClient.java | 4 +- .../org/apache/tajo/catalog/CatalogService.java | 5 +- .../java/org/apache/tajo/catalog/Schema.java | 4 +- .../exception/AmbiguousFunctionException.java | 6 + .../exception/AmbiguousTableException.java | 9 +- .../catalog/exception/CatalogException.java | 9 +- .../exception/DuplicateColumnException.java | 5 + .../exception/DuplicateDatabaseException.java | 6 + .../exception/DuplicateIndexException.java | 5 + .../exception/DuplicatePartitionException.java | 5 + .../exception/DuplicateTableException.java | 5 + .../exception/UndefinedColumnException.java | 5 + .../exception/UndefinedDatabaseException.java | 5 + .../exception/UndefinedFunctionException.java | 8 +- .../exception/UndefinedPartitionException.java | 5 + .../exception/UndefinedTableException.java | 5 + .../exception/UndefinedTablespaceException.java | 5 + .../org/apache/tajo/catalog/TestSchema.java | 3 +- .../tajo/catalog/store/HiveCatalogUtil.java | 2 +- .../org/apache/tajo/catalog/CatalogServer.java | 62 +-- .../InfoSchemaMetadataDictionary.java | 12 +- .../tajo/catalog/store/AbstractDBStore.java | 24 +- .../org/apache/tajo/catalog/store/MemStore.java | 24 +- .../catalog/store/XMLCatalogSchemaManager.java | 8 +- .../org/apache/tajo/cli/tools/TajoAdmin.java | 4 +- .../java/org/apache/tajo/cli/tsql/TajoCli.java | 7 +- .../tsql/commands/ConnectDatabaseCommand.java | 3 +- .../tajo/cli/tsql/commands/SetCommand.java | 5 +- tajo-client/pom.xml | 4 +- .../apache/tajo/client/CatalogAdminClient.java | 26 +- .../tajo/client/CatalogAdminClientImpl.java | 91 ++-- .../apache/tajo/client/ClientExceptionUtil.java | 106 ++++ .../client/InvalidClientSessionException.java | 9 +- .../org/apache/tajo/client/QueryClient.java | 41 +- .../org/apache/tajo/client/QueryClientImpl.java | 83 ++-- .../apache/tajo/client/SessionConnection.java | 103 ++-- .../org/apache/tajo/client/TajoClientImpl.java | 46 +- .../org/apache/tajo/client/TajoClientUtil.java | 2 +- .../apache/tajo/client/v2/ClientDelegate.java | 41 ++ .../tajo/client/v2/ClientDelegateFactory.java | 42 ++ .../org/apache/tajo/client/v2/ClientUtil.java | 30 ++ .../apache/tajo/client/v2/FutureListener.java | 25 + .../tajo/client/v2/LegacyClientDelegate.java | 485 +++++++++++++++++++ .../org/apache/tajo/client/v2/QueryFuture.java | 133 +++++ .../org/apache/tajo/client/v2/QueryState.java | 36 ++ .../apache/tajo/client/v2/ServiceDiscovery.java | 28 ++ .../org/apache/tajo/client/v2/TajoClient.java | 154 ++++++ .../v2/exception/ClientConnectionException.java | 28 ++ .../ClientUnableToConnectException.java | 28 ++ .../org/apache/tajo/jdbc/FetchResultSet.java | 2 +- .../exception/AmbiguousColumnException.java | 9 +- .../apache/tajo/exception/ErrorMessages.java | 6 +- .../NoSuchSessionVariableException.java | 33 ++ .../apache/tajo/exception/ReturnStateUtil.java | 3 +- .../apache/tajo/exception/SQLExceptionUtil.java | 22 +- .../org/apache/tajo/exception/TajoError.java | 7 + .../apache/tajo/exception/TajoException.java | 11 + .../tajo/exception/TajoInternalError.java | 6 + .../exception/UndefinedOperatorException.java | 5 + .../tajo/exception/UnsupportedException.java | 5 + tajo-core/pom.xml | 4 +- .../org/apache/tajo/benchmark/BenchmarkSet.java | 3 +- .../java/org/apache/tajo/benchmark/TPCH.java | 5 +- .../engine/planner/global/GlobalPlanner.java | 107 ++-- .../java/org/apache/tajo/master/TajoMaster.java | 3 +- .../tajo/master/exec/CreateTableExecutor.java | 15 +- .../apache/tajo/master/exec/DDLExecutor.java | 36 +- .../apache/tajo/master/exec/QueryExecutor.java | 3 +- .../tajo/session/InvalidSessionException.java | 7 +- .../tajo/webapp/QueryExecutorServlet.java | 2 +- .../apache/tajo/LocalTajoTestingUtility.java | 6 +- .../java/org/apache/tajo/QueryTestCaseBase.java | 10 +- .../org/apache/tajo/client/TestTajoClient.java | 62 +-- .../tajo/client/TestTajoClientFailures.java | 16 +- .../apache/tajo/client/v2/TestTajoClientV2.java | 236 +++++++++ .../engine/codegen/TestEvalCodeGenerator.java | 23 +- .../apache/tajo/engine/eval/ExprTestBase.java | 31 +- .../tajo/engine/eval/TestIntervalType.java | 5 +- .../apache/tajo/engine/eval/TestPredicates.java | 39 +- .../tajo/engine/eval/TestSQLDateTimeTypes.java | 11 +- .../tajo/engine/eval/TestSQLExpression.java | 32 +- .../function/TestConditionalExpressions.java | 11 +- .../engine/function/TestDateTimeFunctions.java | 21 +- .../tajo/engine/function/TestJsonFunctions.java | 5 +- .../tajo/engine/function/TestMathFunctions.java | 49 +- .../function/TestPatternMatchingPredicates.java | 15 +- .../engine/function/TestPythonFunctions.java | 5 +- .../TestStringOperatorsAndFunctions.java | 77 ++- .../apache/tajo/engine/query/TestIndexScan.java | 3 +- .../apache/tajo/engine/query/TestJoinQuery.java | 6 +- .../java/org/apache/tajo/jdbc/TestTajoJdbc.java | 90 ---- .../testExecuteQueryAsync.result | 7 + .../testExecuteQueryAsyncWithListener.result | 2 + .../testExecuteQueryType1.result | 7 + .../testExecuteQueryType2.result | 4 + .../testExecuteQueryType3.result | 4 + .../org/apache/tajo/jdbc/JdbcConnection.java | 28 +- .../org/apache/tajo/jdbc/MetaDataTuple.java | 17 +- .../org/apache/tajo/jdbc/TajoStatement.java | 55 --- .../tajo/plan/expr/BasicEvalNodeVisitor.java | 1 + .../tajo/plan/expr/SimpleEvalNodeVisitor.java | 3 +- .../plan/function/stream/CSVLineSerializer.java | 1 - .../tajo/plan/nameresolver/NameResolver.java | 6 +- .../plan/nameresolver/ResolverByLegacy.java | 3 +- .../tajo/plan/nameresolver/ResolverByRels.java | 4 +- .../nameresolver/ResolverByRelsAndSubExprs.java | 4 +- .../nameresolver/ResolverBySubExprsAndRels.java | 4 +- .../rewrite/rules/ProjectionPushDownRule.java | 11 +- .../tajo/plan/serder/EvalNodeDeserializer.java | 5 +- .../tajo/plan/verifier/VerificationState.java | 6 + .../org/apache/tajo/storage/NullScanner.java | 4 +- .../org/apache/tajo/storage/RowStoreUtil.java | 2 +- .../org/apache/tajo/storage/Tablespace.java | 3 +- .../apache/tajo/tuple/offheap/HeapTuple.java | 2 - .../apache/tajo/tuple/offheap/UnSafeTuple.java | 2 - 116 files changed, 2276 insertions(+), 749 deletions(-) ----------------------------------------------------------------------
