You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2014/11/25 06:25:40 UTC
[2/3] tajo git commit: Merge branch 'master' of
http://git-wip-us.apache.org/repos/asf/tajo into index_support
Merge branch 'master' of http://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/ee4e95b6
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/ee4e95b6
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/ee4e95b6
Branch: refs/heads/index_support
Commit: ee4e95b693f5a6029d7978fa72451c7d36c03d30
Parents: 1071e61 a56f8b5
Author: Jihoon Son <ji...@apache.org>
Authored: Tue Nov 25 14:24:37 2014 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Tue Nov 25 14:24:37 2014 +0900
----------------------------------------------------------------------
CHANGES | 23 +++
.../org/apache/tajo/algebra/CreateTable.java | 4 +-
.../main/java/org/apache/tajo/algebra/Expr.java | 5 +-
.../tajo/catalog/json/FunctionAdapter.java | 5 +-
.../tajo/catalog/json/TableMetaAdapter.java | 12 +-
.../tajo/catalog/store/HCatalogStore.java | 3 +-
.../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 ++-
.../tajo/master/TajoMasterClientService.java | 32 ++--
.../master/querymaster/QueryJobManager.java | 70 +++++--
.../master/querymaster/QueryMasterTask.java | 1 +
.../org/apache/tajo/net/CachedDNSResolver.java | 64 -------
.../tajo/scheduler/SimpleFifoScheduler.java | 2 +-
.../apache/tajo/util/history/HistoryWriter.java | 2 +
.../tajo/webapp/QueryExecutorServlet.java | 24 ++-
.../java/org/apache/tajo/worker/TajoWorker.java | 12 +-
.../main/java/org/apache/tajo/worker/Task.java | 4 +-
.../apache/tajo/worker/TaskRunnerManager.java | 7 +-
.../src/main/resources/webapps/admin/index.jsp | 42 +----
.../resources/webapps/admin/query_executor.jsp | 4 +-
.../org/apache/tajo/TajoTestingCluster.java | 19 ++
.../org/apache/tajo/cli/tsql/TestTajoCli.java | 22 ++-
.../tajo/master/ha/TestHAServiceHDFSImpl.java | 41 +++--
.../org/apache/tajo/worker/TestHistory.java | 6 +-
.../tajo/plan/serder/EvalNodeAdapter.java | 3 +-
.../tajo/plan/serder/LogicalNodeAdapter.java | 3 +-
.../org/apache/tajo/storage/avro/AvroUtil.java | 35 +++-
.../java/org/apache/tajo/HttpFileServer.java | 84 +++++++++
.../org/apache/tajo/HttpFileServerHandler.java | 184 +++++++++++++++++++
.../tajo/HttpFileServerPipelineFactory.java | 54 ++++++
.../apache/tajo/storage/avro/TestAvroUtil.java | 108 +++++++++++
.../tajo/pullserver/TajoPullServerService.java | 2 +-
35 files changed, 734 insertions(+), 217 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/ee4e95b6/tajo-algebra/src/main/java/org/apache/tajo/algebra/CreateTable.java
----------------------------------------------------------------------