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/12/09 02:56:31 UTC
[10/10] 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/761e372b
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/761e372b
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/761e372b
Branch: refs/heads/index_support
Commit: 761e372ba2b0f4c589ba81c5d9651b55becc1821
Parents: 72600c1 8f68b4b
Author: Jihoon Son <ji...@apache.org>
Authored: Tue Dec 9 10:55:39 2014 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Tue Dec 9 10:55:39 2014 +0900
----------------------------------------------------------------------
CHANGES | 18 +-
pom.xml | 2 +-
.../tajo/catalog/AbstractCatalogClient.java | 14 +
.../src/main/proto/CatalogProtocol.proto | 1 +
.../org/apache/tajo/catalog/CatalogService.java | 5 +
.../src/main/proto/CatalogProtos.proto | 5 +
.../tajo/catalog/store/HCatalogStore.java | 6 +
.../org/apache/tajo/catalog/CatalogServer.java | 22 +
.../tajo/catalog/store/AbstractDBStore.java | 68 ++
.../apache/tajo/catalog/store/CatalogStore.java | 4 +-
.../org/apache/tajo/catalog/store/MemStore.java | 17 +
.../org/apache/tajo/client/QueryClient.java | 2 +
.../org/apache/tajo/client/QueryClientImpl.java | 8 +-
.../apache/tajo/client/SessionConnection.java | 33 +
.../org/apache/tajo/client/TajoClientUtil.java | 3 +-
.../org/apache/tajo/jdbc/FetchResultSet.java | 1 +
.../apache/tajo/jdbc/TajoMemoryResultSet.java | 5 +-
.../org/apache/tajo/jdbc/TajoResultSet.java | 2 +
.../org/apache/tajo/jdbc/TajoResultSetBase.java | 38 +-
.../java/org/apache/tajo/OverridableConf.java | 7 +-
.../main/java/org/apache/tajo/SessionVars.java | 4 +-
.../java/org/apache/tajo/TajoConstants.java | 2 +
.../java/org/apache/tajo/conf/TajoConf.java | 25 +-
.../main/java/org/apache/tajo/datum/Datum.java | 2 +-
.../org/apache/tajo/datum/DatumFactory.java | 57 +-
.../tajo/json/TimeZoneGsonSerdeAdapter.java | 40 +
.../apache/tajo/storage/StorageConstants.java | 22 +-
.../apache/tajo/util/datetime/DateTimeUtil.java | 23 +-
.../apache/tajo/datum/TestTimestampDatum.java | 7 +-
.../tajo/engine/function/builtin/AvgDouble.java | 3 -
.../engine/function/datetime/CurrentDate.java | 20 +-
.../function/datetime/DatePartFromTime.java | 20 +-
.../datetime/DatePartFromTimestamp.java | 18 +-
.../function/datetime/ToCharTimestamp.java | 18 +-
.../function/datetime/ToTimestampText.java | 15 +-
.../tajo/engine/function/string/BTrim.java | 4 +-
.../tajo/engine/function/string/LTrim.java | 4 +-
.../tajo/engine/function/string/Lpad.java | 4 +-
.../tajo/engine/function/string/RTrim.java | 4 +-
.../engine/function/string/RegexpReplace.java | 4 +-
.../tajo/engine/function/string/Rpad.java | 4 +-
.../apache/tajo/engine/json/CoreGsonHelper.java | 2 +
.../apache/tajo/engine/query/QueryContext.java | 4 +-
.../org/apache/tajo/master/GlobalEngine.java | 8 +-
.../apache/tajo/master/querymaster/Query.java | 9 +-
.../tajo/master/querymaster/QueryMaster.java | 8 +-
.../java/org/apache/tajo/QueryTestCaseBase.java | 8 +
.../org/apache/tajo/TajoTestingCluster.java | 3 +
.../org/apache/tajo/client/TestTajoClient.java | 37 +-
.../apache/tajo/engine/eval/ExprTestBase.java | 59 +-
.../tajo/engine/eval/TestIntervalType.java | 46 +-
.../tajo/engine/eval/TestSQLDateTimeTypes.java | 18 +-
.../tajo/engine/eval/TestSQLExpression.java | 67 +-
.../function/TestConditionalExpressions.java | 16 +-
.../engine/function/TestDateTimeFunctions.java | 186 +++--
.../tajo/engine/query/TestSelectQuery.java | 50 +-
.../apache/tajo/engine/query/TestSortQuery.java | 23 +-
.../org/apache/tajo/jdbc/TestResultSet.java | 13 +-
.../java/org/apache/tajo/jdbc/TestTajoJdbc.java | 6 -
.../TestSelectQuery/timezoned/table1.tbl | 3 +
.../TestSelectQuery/datetime_table_ddl.sql | 4 +
.../datetime_table_timezoned_ddl.sql | 4 +
.../TestSelectQuery/testTimezonedTable1.sql | 1 +
.../TestSelectQuery/testTimezonedTable2.sql | 1 +
.../TestSelectQuery/testTimezonedTable3.sql | 1 +
.../TestSelectQuery/testTimezonedTable1.result | 5 +
.../TestSelectQuery/testTimezonedTable2.result | 5 +
.../TestSelectQuery/testTimezonedTable3.result | 5 +
tajo-dist/src/main/bin/tajo | 3 +
tajo-docs/src/main/sphinx/table_management.rst | 5 +-
.../src/main/sphinx/table_management/csv.rst | 4 +-
.../sphinx/table_management/table_overview.rst | 98 +++
.../apache/tajo/jdbc/TajoMetaDataResultSet.java | 2 +
.../org/apache/tajo/plan/ExprAnnotator.java | 96 ++-
.../org/apache/tajo/plan/LogicalPlanner.java | 28 +-
.../org/apache/tajo/plan/expr/CastEval.java | 28 +-
.../tajo/plan/expr/GeneralFunctionEval.java | 8 +-
.../tajo/plan/function/GeneralFunction.java | 4 +-
.../plan/serder/EvalTreeProtoDeserializer.java | 7 +-
.../plan/serder/EvalTreeProtoSerializer.java | 3 +
.../apache/tajo/plan/serder/PlanGsonHelper.java | 2 +
.../org/apache/tajo/plan/util/PlannerUtil.java | 21 +
tajo-plan/src/main/proto/Plan.proto | 1 +
tajo-pullserver/pom.xml | 146 ++++
.../tajo/pullserver/FadvisedChunkedFile.java | 81 ++
.../tajo/pullserver/FadvisedFileRegion.java | 170 ++++
.../FileAccessForbiddenException.java | 40 +
.../tajo/pullserver/FileCloseListener.java | 53 ++
.../tajo/pullserver/HttpDataServerHandler.java | 245 ++++++
.../HttpDataServerPipelineFactory.java | 56 ++
.../org/apache/tajo/pullserver/HttpUtil.java | 69 ++
.../tajo/pullserver/PullServerAuxService.java | 654 +++++++++++++++
.../apache/tajo/pullserver/PullServerUtil.java | 90 +++
.../apache/tajo/pullserver/TajoPullServer.java | 73 ++
.../tajo/pullserver/TajoPullServerService.java | 808 +++++++++++++++++++
.../retriever/AdvancedDataRetriever.java | 126 +++
.../pullserver/retriever/DataRetriever.java | 29 +
.../retriever/DirectoryRetriever.java | 56 ++
.../tajo/pullserver/retriever/FileChunk.java | 81 ++
.../pullserver/retriever/RetrieverHandler.java | 33 +
.../storage/TextSerializerDeserializer.java | 7 +-
.../tajo/storage/text/CSVLineDeserializer.java | 2 +-
.../tajo/storage/text/CSVLineSerializer.java | 2 +-
.../text/TextFieldSerializerDeserializer.java | 46 +-
tajo-yarn-pullserver/pom.xml | 146 ----
.../tajo/pullserver/FadvisedChunkedFile.java | 81 --
.../tajo/pullserver/FadvisedFileRegion.java | 170 ----
.../FileAccessForbiddenException.java | 40 -
.../tajo/pullserver/FileCloseListener.java | 53 --
.../tajo/pullserver/HttpDataServerHandler.java | 245 ------
.../HttpDataServerPipelineFactory.java | 56 --
.../org/apache/tajo/pullserver/HttpUtil.java | 69 --
.../tajo/pullserver/PullServerAuxService.java | 654 ---------------
.../apache/tajo/pullserver/PullServerUtil.java | 90 ---
.../apache/tajo/pullserver/TajoPullServer.java | 73 --
.../tajo/pullserver/TajoPullServerService.java | 808 -------------------
.../retriever/AdvancedDataRetriever.java | 126 ---
.../pullserver/retriever/DataRetriever.java | 29 -
.../retriever/DirectoryRetriever.java | 56 --
.../tajo/pullserver/retriever/FileChunk.java | 81 --
.../pullserver/retriever/RetrieverHandler.java | 33 -
121 files changed, 3953 insertions(+), 3187 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/761e372b/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/761e372b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/761e372b/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/761e372b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MemStore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/761e372b/tajo-core/src/test/java/org/apache/tajo/QueryTestCaseBase.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/761e372b/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java
----------------------------------------------------------------------