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/2f0a0b73 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/2f0a0b73 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/2f0a0b73 Branch: refs/heads/index_support Commit: 2f0a0b738e16d429e8b7cb0c79753e9ff30233d0 Parents: ab0e004 ef282eb Author: Jihoon Son <[email protected]> Authored: Wed Nov 19 20:47:45 2014 +0900 Committer: Jihoon Son <[email protected]> Committed: Wed Nov 19 20:47:45 2014 +0900 ---------------------------------------------------------------------- CHANGES | 17 ++ .../org/apache/tajo/algebra/CreateTable.java | 4 +- .../main/java/org/apache/tajo/algebra/Expr.java | 5 +- .../org/apache/tajo/catalog/CatalogUtil.java | 2 - .../tajo/catalog/json/FunctionAdapter.java | 5 +- .../tajo/catalog/json/TableMetaAdapter.java | 12 +- .../src/main/proto/CatalogProtos.proto | 1 - .../java/org/apache/tajo/cli/tsql/TajoCli.java | 5 + .../org/apache/tajo/json/CommonGsonHelper.java | 24 ++- .../org/apache/tajo/json/DataTypeAdapter.java | 2 +- .../java/org/apache/tajo/json/DatumAdapter.java | 14 +- .../java/org/apache/tajo/master/TajoMaster.java | 29 ++- .../org/apache/tajo/net/CachedDNSResolver.java | 64 ------ .../tajo/scheduler/SimpleFifoScheduler.java | 2 +- .../apache/tajo/util/history/HistoryWriter.java | 2 + .../java/org/apache/tajo/worker/TajoWorker.java | 12 +- .../apache/tajo/worker/TaskRunnerManager.java | 7 +- .../org/apache/tajo/TajoTestingCluster.java | 19 ++ .../org/apache/tajo/cli/tsql/TestTajoCli.java | 22 +- .../tajo/master/ha/TestHAServiceHDFSImpl.java | 41 ++-- .../tajo/plan/serder/EvalNodeAdapter.java | 3 +- .../tajo/plan/serder/LogicalNodeAdapter.java | 3 +- tajo-project/pom.xml | 2 +- tajo-storage/pom.xml | 11 +- .../tajo/storage/trevni/TrevniAppender.java | 202 ------------------- .../tajo/storage/trevni/TrevniScanner.java | 193 ------------------ .../src/main/resources/storage-default.xml | 18 +- .../apache/tajo/storage/TestMergeScanner.java | 4 +- .../org/apache/tajo/storage/TestStorages.java | 1 - .../src/test/resources/storage-default.xml | 18 +- .../tajo/pullserver/TajoPullServerService.java | 2 +- 31 files changed, 167 insertions(+), 579 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/2f0a0b73/tajo-algebra/src/main/java/org/apache/tajo/algebra/CreateTable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/2f0a0b73/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto ----------------------------------------------------------------------
