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/1fad72eb Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/1fad72eb Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/1fad72eb Branch: refs/heads/index_support Commit: 1fad72ebe8d4eb330773b44ecdf4040860286a30 Parents: 121d9fd 6582d86 Author: Jihoon Son <[email protected]> Authored: Thu Jan 8 16:59:20 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Thu Jan 8 16:59:20 2015 +0900 ---------------------------------------------------------------------- CHANGES | 20 +- dev-support/test-patch.sh | 2 +- .../org/apache/tajo/catalog/CatalogService.java | 4 +- .../tajo/catalog/store/HCatalogStore.java | 2 +- .../apache/tajo/catalog/store/HCatalogUtil.java | 2 +- .../tajo/catalog/store/AbstractDBStore.java | 10 +- .../catalog/store/XMLCatalogSchemaManager.java | 18 +- .../store/TestXMLCatalogSchemaManager.java | 14 +- .../cli/tsql/DefaultTajoCliOutputFormatter.java | 2 +- .../java/org/apache/tajo/cli/tsql/TajoCli.java | 4 +- .../tajo/cli/tsql/TajoCliOutputFormatter.java | 2 +- .../java/org/apache/tajo/ha/HAServiceUtil.java | 20 +- .../tajo/util/datetime/DateTimeFormat.java | 2 +- .../java/org/apache/tajo/benchmark/TPCH.java | 22 ++ .../tajo/master/DefaultTaskScheduler.java | 6 +- .../apache/tajo/master/TajoAsyncDispatcher.java | 232 ------------------- .../tajo/master/event/QueryStopEvent.java | 47 ++++ .../master/querymaster/QueryInProgress.java | 14 +- .../tajo/master/querymaster/QueryJobEvent.java | 1 + .../master/querymaster/QueryJobManager.java | 16 +- .../tajo/master/querymaster/QueryMaster.java | 17 +- .../master/querymaster/QueryMasterTask.java | 44 ++-- .../tajo/master/querymaster/Repartitioner.java | 16 +- .../apache/tajo/master/querymaster/Stage.java | 8 +- .../java/org/apache/tajo/QueryTestCaseBase.java | 6 + .../org/apache/tajo/TajoTestingCluster.java | 8 +- .../test/java/org/apache/tajo/TpchTestBase.java | 8 +- .../org/apache/tajo/cli/tsql/TestTajoCli.java | 4 +- .../java/org/apache/tajo/jdbc/TestTajoJdbc.java | 29 ++- .../tajo/master/querymaster/TestKillQuery.java | 37 ++- .../tajo/scheduler/TestFifoScheduler.java | 43 ++-- .../org/apache/tajo/worker/TestHistory.java | 44 ++-- tajo-dist/src/main/bin/tajo | 2 +- .../main/sphinx/backup_and_restore/catalog.rst | 2 +- .../configuration/catalog_configuration.rst | 77 +++--- tajo-docs/src/main/sphinx/jdbc_driver.rst | 2 +- tajo-docs/src/main/sphinx/tsql/meta_command.rst | 2 +- .../tajo/plan/LogicalPlanPreprocessor.java | 2 +- .../plan/rewrite/rules/FilterPushDownRule.java | 6 +- .../tajo/plan/verifier/ExprsVerifier.java | 2 +- tajo-project/pom.xml | 22 +- tajo-project/src/site/apt/index.apt | 4 + .../src/site/markdown/tajo-0.2.0-doc.md | 2 +- .../src/site/markdown/tajo-0.8.0-doc.md | 2 +- .../site/resources/releases/0.8.0/relnotes.html | 4 +- .../site/resources/releases/0.9.0/relnotes.html | 2 +- .../java/org/apache/tajo/storage/DiskUtil.java | 2 +- .../storage/HashShuffleAppenderManager.java | 8 +- .../apache/tajo/storage/avro/AvroAppender.java | 2 +- .../tajo/storage/parquet/ParquetAppender.java | 2 +- .../org/apache/tajo/storage/rcfile/RCFile.java | 2 +- .../objectweb/asm/commons/GeneratorAdapter.java | 2 +- .../tajo/org/objectweb/asm/tree/InsnList.java | 4 +- .../objectweb/asm/tree/analysis/Analyzer.java | 2 +- .../asm/tree/analysis/Interpreter.java | 14 +- 55 files changed, 396 insertions(+), 477 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/1fad72eb/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/1fad72eb/tajo-core/src/test/java/org/apache/tajo/QueryTestCaseBase.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/1fad72eb/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanPreprocessor.java ----------------------------------------------------------------------
