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/45f5ed3a Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/45f5ed3a Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/45f5ed3a Branch: refs/heads/TAJO-1027 Commit: 45f5ed3adba931f4706f26dda1d3c03240ee11d3 Parents: 7a7b4fd 87e7ba2 Author: Jaehwa Jung <[email protected]> Authored: Mon Aug 11 14:40:25 2014 +0900 Committer: Jaehwa Jung <[email protected]> Committed: Mon Aug 11 14:40:25 2014 +0900 ---------------------------------------------------------------------- CHANGES | 8 + .../java/org/apache/tajo/catalog/TableMeta.java | 14 +- .../apache/tajo/catalog/TestKeyValueSet.java | 83 ++++++- .../tajo/catalog/store/HCatalogStore.java | 28 +-- .../tajo/catalog/store/TestHCatalogStore.java | 12 +- .../org/apache/tajo/catalog/TestCatalog.java | 10 +- .../tajo/cli/DefaultTajoCliOutputFormatter.java | 16 +- .../java/org/apache/tajo/cli/HelpCommand.java | 100 ++++---- .../java/org/apache/tajo/cli/SetCommand.java | 78 +++++- .../main/java/org/apache/tajo/cli/TajoCli.java | 149 ++++++++---- .../apache/tajo/cli/TajoCliOutputFormatter.java | 5 +- .../org/apache/tajo/cli/TajoShellCommand.java | 10 +- .../main/java/org/apache/tajo/ConfigKey.java | 52 ++++ .../java/org/apache/tajo/OverridableConf.java | 235 +++++++++++++++++++ .../main/java/org/apache/tajo/SessionVars.java | 211 +++++++++++++++++ .../java/org/apache/tajo/conf/TajoConf.java | 199 ++++++++-------- .../main/java/org/apache/tajo/datum/Datum.java | 2 +- .../java/org/apache/tajo/datum/NullDatum.java | 1 + .../java/org/apache/tajo/util/KeyValueSet.java | 149 ++++++++++-- .../java/org/apache/tajo/util/StringUtils.java | 96 ++++++++ .../tajo/datum/TestArithmeticOperator.java | 4 +- .../tajo/engine/planner/LogicalOptimizer.java | 9 +- .../apache/tajo/engine/planner/LogicalPlan.java | 4 +- .../engine/planner/LogicalPlanPreprocessor.java | 18 +- .../engine/planner/LogicalPlanVerifier.java | 12 +- .../tajo/engine/planner/LogicalPlanner.java | 35 ++- .../engine/planner/PhysicalPlannerImpl.java | 44 +++- .../engine/planner/PreLogicalPlanVerifier.java | 21 +- .../engine/planner/global/GlobalPlanner.java | 18 +- .../planner/physical/ExternalSortExec.java | 4 +- .../HashBasedColPartitionStoreExec.java | 3 +- .../SortBasedColPartitionStoreExec.java | 7 +- .../engine/planner/physical/StoreTableExec.java | 6 +- .../apache/tajo/engine/query/QueryContext.java | 144 ++++++------ .../tajo/engine/query/QueryUnitRequestImpl.java | 3 +- .../org/apache/tajo/engine/utils/TupleUtil.java | 3 +- .../org/apache/tajo/master/GlobalEngine.java | 94 ++++---- .../tajo/master/TajoMasterClientService.java | 31 ++- .../apache/tajo/master/querymaster/Query.java | 4 +- .../tajo/master/querymaster/QueryMaster.java | 11 +- .../querymaster/QueryMasterManagerService.java | 4 +- .../master/querymaster/QueryMasterTask.java | 4 +- .../tajo/master/querymaster/Repartitioner.java | 16 +- .../tajo/master/querymaster/SubQuery.java | 15 +- .../org/apache/tajo/master/session/Session.java | 50 ++-- .../session/SessionLivelinessMonitor.java | 2 +- .../main/java/org/apache/tajo/worker/Task.java | 4 +- .../apache/tajo/worker/TaskAttemptContext.java | 12 +- .../resources/webapps/worker/querydetail.jsp | 10 + .../apache/tajo/LocalTajoTestingUtility.java | 5 + .../java/org/apache/tajo/QueryTestCaseBase.java | 2 +- .../test/java/org/apache/tajo/TpchTestBase.java | 2 +- .../tajo/cli/TestDefaultCliOutputFormatter.java | 47 +++- .../java/org/apache/tajo/cli/TestTajoCli.java | 172 ++++++++------ .../org/apache/tajo/client/TestTajoClient.java | 8 +- .../apache/tajo/engine/eval/ExprTestBase.java | 9 +- .../tajo/engine/eval/TestEvalTreeUtil.java | 16 +- .../engine/planner/TestLogicalOptimizer.java | 20 +- .../tajo/engine/planner/TestLogicalPlan.java | 3 +- .../tajo/engine/planner/TestLogicalPlanner.java | 135 ++++++++--- .../tajo/engine/planner/TestPlannerUtil.java | 5 +- .../planner/global/TestBroadcastJoinPlan.java | 62 ++--- .../planner/physical/TestBNLJoinExec.java | 9 +- .../planner/physical/TestBSTIndexExec.java | 4 +- .../planner/physical/TestExternalSortExec.java | 4 +- .../physical/TestFullOuterHashJoinExec.java | 24 +- .../physical/TestFullOuterMergeJoinExec.java | 29 +-- .../planner/physical/TestHashAntiJoinExec.java | 4 +- .../planner/physical/TestHashJoinExec.java | 19 +- .../planner/physical/TestHashSemiJoinExec.java | 4 +- .../physical/TestLeftOuterHashJoinExec.java | 28 +-- .../physical/TestLeftOuterNLJoinExec.java | 25 +- .../planner/physical/TestMergeJoinExec.java | 4 +- .../engine/planner/physical/TestNLJoinExec.java | 17 +- .../planner/physical/TestPhysicalPlanner.java | 100 ++++---- .../physical/TestProgressExternalSortExec.java | 4 +- .../physical/TestRightOuterHashJoinExec.java | 16 +- .../physical/TestRightOuterMergeJoinExec.java | 32 +-- .../engine/planner/physical/TestSortExec.java | 4 +- .../tajo/engine/query/TestGroupByQuery.java | 22 +- .../tajo/engine/query/TestJoinBroadcast.java | 8 +- .../apache/tajo/engine/query/TestJoinQuery.java | 90 +++---- .../tajo/engine/query/TestNullValues.java | 14 +- .../tajo/engine/query/TestSelectQuery.java | 10 +- .../apache/tajo/engine/query/TestSortQuery.java | 8 +- .../tajo/engine/query/TestTablePartitions.java | 43 ++++ .../org/apache/tajo/jdbc/TestResultSet.java | 2 +- .../tajo/master/TestExecutionBlockCursor.java | 6 +- .../apache/tajo/master/TestGlobalPlanner.java | 4 +- .../querymaster/TestQueryUnitStatusUpdate.java | 2 +- .../tajo/worker/TestRangeRetrieverHandler.java | 8 +- .../TestTablePartitions/lineitemspecial.tbl | 5 + .../TestTablePartitions/lineitemspecial_ddl.sql | 3 + .../TestSpecialCharPartitionKeys1.result | 4 + .../TestSpecialCharPartitionKeys2.result | 3 + .../TestTajoCli/testHelpSessionVars.result | 36 +++ ...estSelectResultWithNullTrueDeprecated.result | 9 + .../testStopWhenErrorDeprecated.result | 6 + .../java/org/apache/tajo/storage/Appender.java | 2 +- .../java/org/apache/tajo/storage/CSVFile.java | 11 +- .../org/apache/tajo/storage/StorageUtil.java | 18 +- .../org/apache/tajo/storage/avro/AvroUtil.java | 17 +- .../org/apache/tajo/storage/rcfile/RCFile.java | 10 +- .../sequencefile/SequenceFileAppender.java | 30 ++- .../sequencefile/SequenceFileScanner.java | 21 +- .../apache/tajo/storage/v2/RCFileScanner.java | 2 +- .../tajo/storage/TestCompressionStorages.java | 12 + .../org/apache/tajo/storage/TestStorages.java | 13 + 108 files changed, 2272 insertions(+), 1010 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/45f5ed3a/tajo-catalog/tajo-catalog-drivers/tajo-hcatalog/src/main/java/org/apache/tajo/catalog/store/HCatalogStore.java ----------------------------------------------------------------------
