tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jihoon...@apache.org
Subject [12/13] tajo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support
Date Wed, 18 Mar 2015 17:25:51 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support

Conflicts:
	tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/indexes.sql


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/6b30cfe6
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/6b30cfe6
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/6b30cfe6

Branch: refs/heads/index_support
Commit: 6b30cfe627c5413349d87c6104ee3461b90ef727
Parents: 292cd9e a9ae3ca
Author: Jihoon Son <jihoonson@apache.org>
Authored: Thu Mar 19 02:25:03 2015 +0900
Committer: Jihoon Son <jihoonson@apache.org>
Committed: Thu Mar 19 02:25:03 2015 +0900

----------------------------------------------------------------------
 CHANGES                                         |  24 ++
 .../apache/tajo/algebra/ColumnDefinition.java   |   2 +-
 .../org/apache/tajo/algebra/DataTypeExpr.java   |  18 +-
 tajo-catalog/tajo-catalog-client/pom.xml        |   2 +-
 .../org/apache/tajo/catalog/CatalogUtil.java    |  28 +-
 .../java/org/apache/tajo/catalog/Column.java    |  45 ++-
 .../org/apache/tajo/catalog/DDLBuilder.java     |   9 +-
 .../java/org/apache/tajo/catalog/Schema.java    | 156 ++++++---
 .../org/apache/tajo/catalog/SchemaUtil.java     |  42 +++
 .../java/org/apache/tajo/catalog/TypeDesc.java  |  75 ++++
 .../org/apache/tajo/catalog/TestSchema.java     | 137 ++++++++
 .../tajo-catalog-drivers/tajo-hcatalog/pom.xml  |   2 +-
 tajo-catalog/tajo-catalog-server/pom.xml        |   2 +-
 .../dictionary/ColumnsTableDescriptor.java      |   7 +-
 .../tajo/catalog/store/AbstractDBStore.java     |  64 +++-
 .../apache/tajo/catalog/store/MariaDBStore.java |   5 +-
 .../apache/tajo/catalog/store/MySQLStore.java   |  11 +-
 .../apache/tajo/catalog/store/OracleStore.java  |   2 +-
 .../tajo/catalog/store/PostgreSQLStore.java     |   4 +-
 .../src/main/resources/schemas/derby/derby.xml  |  12 +-
 .../main/resources/schemas/mariadb/columns.sql  |   3 +-
 .../main/resources/schemas/mysql/columns.sql    |   3 +-
 .../main/resources/schemas/oracle/columns.sql   |   9 -
 .../main/resources/schemas/oracle/databases.sql |   6 -
 .../main/resources/schemas/oracle/indexes.sql   |  18 -
 .../main/resources/schemas/oracle/oracle.xml    |  10 +-
 .../schemas/oracle/partition_methods.sql        |   7 -
 .../resources/schemas/oracle/partitions.sql     |  10 -
 .../src/main/resources/schemas/oracle/stats.sql |   6 -
 .../schemas/oracle/table_properties.sql         |   7 -
 .../main/resources/schemas/oracle/tables.sql    |   9 -
 .../resources/schemas/oracle/tablespaces.sql    |   6 -
 .../resources/schemas/postgresql/columns.sql    |   9 -
 .../resources/schemas/postgresql/databases.sql  |   6 -
 .../schemas/postgresql/partition_methods.sql    |   7 -
 .../resources/schemas/postgresql/partitions.sql |  10 -
 .../resources/schemas/postgresql/postgresql.xml |  10 +-
 .../schemas/postgresql/table_properties.sql     |   7 -
 .../resources/schemas/postgresql/tables.sql     |   9 -
 .../schemas/postgresql/tablespaces.sql          |   6 -
 .../org/apache/tajo/catalog/TestCatalog.java    | 101 ++++++
 tajo-cli/pom.xml                                |   2 +-
 .../cli/tsql/commands/DescTableCommand.java     |   5 +-
 tajo-client/pom.xml                             |   2 +-
 .../apache/tajo/client/SessionConnection.java   |  20 +-
 .../java/org/apache/tajo/conf/TajoConf.java     |   2 +
 .../java/org/apache/tajo/util/BytesUtils.java   | 159 +++++----
 .../java/org/apache/tajo/util/StringUtils.java  |   6 +-
 tajo-common/src/main/proto/DataTypes.proto      |  10 +
 .../org/apache/tajo/util/TestStringUtil.java    |   4 +-
 tajo-core/pom.xml                               |  58 ++-
 .../engine/planner/physical/HashJoinExec.java   |  51 ++-
 .../planner/physical/HashLeftOuterJoinExec.java |  74 +++-
 .../physical/PartitionMergeScanExec.java        |  17 +-
 .../tajo/engine/planner/physical/ScanExec.java  |  72 ++++
 .../engine/planner/physical/SeqScanExec.java    | 105 +-----
 .../apache/tajo/engine/utils/CacheHolder.java   |  97 ++++++
 .../apache/tajo/engine/utils/TableCache.java    |  84 +++++
 .../apache/tajo/engine/utils/TableCacheKey.java |  57 +++
 .../apache/tajo/engine/utils/TupleCache.java    | 122 -------
 .../apache/tajo/engine/utils/TupleCacheKey.java |  57 ---
 .../tajo/worker/ExecutionBlockContext.java      |  43 ++-
 .../worker/ExecutionBlockSharedResource.java    |  26 ++
 .../main/java/org/apache/tajo/worker/Task.java  |  75 ++--
 .../apache/tajo/worker/TaskAttemptContext.java  |   2 +-
 .../java/org/apache/tajo/worker/TaskRunner.java |   9 +-
 .../apache/tajo/worker/TaskRunnerManager.java   |   4 +-
 .../org/apache/tajo/cli/tools/TestTajoDump.java |  21 ++
 .../org/apache/tajo/cli/tsql/TestTajoCli.java   |  40 ++-
 .../apache/tajo/engine/eval/ExprTestBase.java   |   5 +-
 .../tajo/engine/query/TestCreateTable.java      |  24 ++
 .../tajo/engine/query/TestSelectQuery.java      |  48 +++
 .../apache/tajo/engine/util/TestTableCache.java | 109 ++++++
 .../apache/tajo/engine/util/TestTupleCache.java |  89 -----
 .../multibytes_delimiter1/table1.tbl            |   5 +
 .../multibytes_delimiter2/table2.tbl            |   5 +
 .../TestCreateTable/testNestedRecord1.sql       |   1 +
 .../TestCreateTable/testNestedRecord2.sql       |   1 +
 .../multibytes_delimiter_table1_ddl.sql         |   3 +
 .../multibytes_delimiter_table2_ddl.sql         |   3 +
 .../multibytes_delimiter_table3_ddl.sql         |   3 +
 .../multibytes_delimiter_table4_ddl.sql         |   3 +
 .../testMultiBytesDelimiter1.sql                |   1 +
 .../testMultiBytesDelimiter2.sql                |   1 +
 .../testMultiBytesDelimiter3.sql                |   1 +
 .../testMultiBytesDelimiter4.sql                |   1 +
 .../TestSelectQuery/testExplainSelect.result    |   4 +-
 .../testMultiBytesDelimiter1.result             |   7 +
 .../testMultiBytesDelimiter2.result             |   7 +
 .../testMultiBytesDelimiter3.result             |   7 +
 .../testMultiBytesDelimiter4.result             |   7 +
 .../testDescTableForNestedSchema.result         |  29 ++
 .../results/TestTajoDump/testDump2.result       |  16 +
 tajo-dist/pom.xml                               |   7 +-
 .../org/apache/tajo/plan/ExprAnnotator.java     |   5 +-
 .../org/apache/tajo/plan/LogicalPlanner.java    |  18 +-
 .../org/apache/tajo/plan/TypeDeterminant.java   |   4 +-
 .../plan/serder/LogicalNodeDeserializer.java    |   3 +
 .../tajo/plan/serder/LogicalNodeSerializer.java |   2 +
 tajo-plan/src/main/proto/Plan.proto             |   1 +
 tajo-project/pom.xml                            |  31 ++
 tajo-project/src/site/site.xml                  |   2 +-
 tajo-pullserver/pom.xml                         |   2 +-
 tajo-rpc/pom.xml                                | 180 ++--------
 .../org/apache/tajo/rpc/AsyncRpcClient.java     | 267 --------------
 .../org/apache/tajo/rpc/AsyncRpcServer.java     | 148 --------
 .../org/apache/tajo/rpc/BlockingRpcClient.java  | 315 -----------------
 .../org/apache/tajo/rpc/BlockingRpcServer.java  | 147 --------
 .../java/org/apache/tajo/rpc/CallFuture.java    |  84 -----
 .../apache/tajo/rpc/DefaultRpcController.java   |  65 ----
 .../org/apache/tajo/rpc/NettyClientBase.java    | 173 ---------
 .../org/apache/tajo/rpc/NettyRpcController.java |  63 ----
 .../org/apache/tajo/rpc/NettyServerBase.java    | 205 -----------
 .../java/org/apache/tajo/rpc/NullCallback.java  |  38 --
 .../tajo/rpc/ProtoChannelInitializer.java       |  50 ---
 .../apache/tajo/rpc/RemoteCallException.java    |  69 ----
 .../org/apache/tajo/rpc/RemoteException.java    |  37 --
 .../tajo/rpc/RetriesExhaustedException.java     | 104 ------
 .../org/apache/tajo/rpc/RpcChannelFactory.java  | 182 ----------
 .../org/apache/tajo/rpc/RpcConnectionPool.java  | 194 -----------
 .../main/java/org/apache/tajo/rpc/RpcUtils.java |  68 ----
 .../org/apache/tajo/rpc/ServerCallable.java     | 162 ---------
 .../apache/tajo/rpc/TajoServiceException.java   |  58 ---
 tajo-rpc/src/main/proto/DummyProtos.proto       |  47 ---
 tajo-rpc/src/main/proto/RpcProtos.proto         |  32 --
 tajo-rpc/src/main/proto/TestProtocol.proto      |  31 --
 tajo-rpc/src/main/proto/TestProtos.proto        |  35 --
 tajo-rpc/src/test/java/log4j.properties         |  25 --
 .../java/org/apache/tajo/rpc/TestAsyncRpc.java  | 339 ------------------
 .../org/apache/tajo/rpc/TestBlockingRpc.java    | 341 ------------------
 .../rpc/test/impl/DummyProtocolAsyncImpl.java   |  86 -----
 .../test/impl/DummyProtocolBlockingImpl.java    |  83 -----
 tajo-rpc/tajo-rpc-common/pom.xml                | 216 ++++++++++++
 .../org/apache/tajo/rpc/NettyServerBase.java    | 243 +++++++++++++
 .../org/apache/tajo/rpc/RemoteException.java    |  37 ++
 .../tajo/rpc/RetriesExhaustedException.java     | 104 ++++++
 .../org/apache/tajo/rpc/RpcChannelFactory.java  | 182 ++++++++++
 .../org/apache/tajo/rpc/RpcEventListener.java   |  62 ++++
 .../main/java/org/apache/tajo/rpc/RpcUtils.java | 122 +++++++
 tajo-rpc/tajo-rpc-protobuf/pom.xml              | 274 +++++++++++++++
 .../org/apache/tajo/rpc/AsyncRpcClient.java     | 227 ++++++++++++
 .../org/apache/tajo/rpc/AsyncRpcServer.java     | 148 ++++++++
 .../org/apache/tajo/rpc/BlockingRpcClient.java  | 273 +++++++++++++++
 .../org/apache/tajo/rpc/BlockingRpcServer.java  | 147 ++++++++
 .../java/org/apache/tajo/rpc/CallFuture.java    |  84 +++++
 .../apache/tajo/rpc/DefaultRpcController.java   |  65 ++++
 .../org/apache/tajo/rpc/NettyClientBase.java    | 221 ++++++++++++
 .../org/apache/tajo/rpc/NettyRpcController.java |  63 ++++
 .../java/org/apache/tajo/rpc/NullCallback.java  |  38 ++
 .../tajo/rpc/ProtoChannelInitializer.java       |  50 +++
 .../apache/tajo/rpc/RemoteCallException.java    |  69 ++++
 .../org/apache/tajo/rpc/RemoteException.java    |  37 ++
 .../tajo/rpc/RetriesExhaustedException.java     | 104 ++++++
 .../org/apache/tajo/rpc/RpcConnectionPool.java  | 190 ++++++++++
 .../org/apache/tajo/rpc/ServerCallable.java     | 162 +++++++++
 .../apache/tajo/rpc/TajoServiceException.java   |  58 +++
 .../src/main/proto/DummyProtos.proto            |  47 +++
 .../src/main/proto/RpcProtos.proto              |  32 ++
 .../src/main/proto/TestProtocol.proto           |  31 ++
 .../src/main/proto/TestProtos.proto             |  35 ++
 .../src/test/java/log4j.properties              |  25 ++
 .../java/org/apache/tajo/rpc/TestAsyncRpc.java  | 345 ++++++++++++++++++
 .../org/apache/tajo/rpc/TestBlockingRpc.java    | 349 +++++++++++++++++++
 .../rpc/test/impl/DummyProtocolAsyncImpl.java   |  86 +++++
 .../test/impl/DummyProtocolBlockingImpl.java    |  83 +++++
 tajo-rpc/tajo-ws-rs/pom.xml                     | 218 ++++++++++++
 .../rs/netty/NettyRestChannelInitializer.java   |  50 +++
 .../ws/rs/netty/NettyRestHandlerContainer.java  | 319 +++++++++++++++++
 .../NettyRestHandlerContainerProvider.java      |  42 +++
 .../tajo/ws/rs/netty/NettyRestServer.java       |  67 ++++
 .../ws/rs/netty/NettyRestServerFactory.java     |  89 +++++
 .../ws/rs/netty/NettyRestServerListener.java    |  72 ++++
 .../tajo/ws/rs/netty/gson/GsonFeature.java      |  34 ++
 .../tajo/ws/rs/netty/gson/GsonReader.java       |  52 +++
 .../apache/tajo/ws/rs/netty/gson/GsonUtil.java  |  32 ++
 .../tajo/ws/rs/netty/gson/GsonWriter.java       |  59 ++++
 .../NettyRestHandlerContainerProviderTest.java  |  66 ++++
 .../tajo/ws/rs/netty/NettyRestServerTest.java   | 137 ++++++++
 .../ws/rs/netty/testapp1/TestApplication1.java  |  38 ++
 .../ws/rs/netty/testapp1/TestResource1.java     |  36 ++
 .../ws/rs/netty/testapp2/DirectoriesDao.java    |  39 +++
 .../rs/netty/testapp2/DirectoriesResource.java  |  85 +++++
 .../tajo/ws/rs/netty/testapp2/Directory.java    |  52 +++
 .../testapp2/FileManagementApplication.java     |  35 ++
 .../org/apache/tajo/storage/TestLazyTuple.java  |   4 +-
 .../tajo/storage/hbase/ColumnMapping.java       |   6 +-
 .../apache/tajo/storage/hbase/HBaseScanner.java |   3 +-
 .../tajo/storage/hbase/HBaseStorageManager.java |   3 +-
 .../java/org/apache/tajo/storage/CSVFile.java   |  21 +-
 .../sequencefile/SequenceFileScanner.java       |   3 +-
 .../tajo/storage/text/CSVLineDeserializer.java  |  14 +-
 .../apache/tajo/storage/text/CSVLineSerDe.java  |   5 +-
 .../tajo/storage/text/CSVLineSerializer.java    |   8 +-
 .../tajo/storage/text/DelimitedTextFile.java    |   2 +-
 .../tajo/storage/text/FieldSplitProcessor.java  |   8 +-
 .../text/MultiBytesFieldSplitProcessor.java     |  45 +++
 .../tajo/storage/text/TextLineDeserializer.java |   6 +-
 .../apache/tajo/storage/text/TextLineSerDe.java |   3 +-
 .../apache/tajo/storage/TestSplitProcessor.java |  38 +-
 199 files changed, 7679 insertions(+), 4434 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/6b30cfe6/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/6b30cfe6/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/6b30cfe6/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/6b30cfe6/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/6b30cfe6/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/6b30cfe6/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/6b30cfe6/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/DescTableCommand.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/6b30cfe6/tajo-client/src/main/java/org/apache/tajo/client/SessionConnection.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/6b30cfe6/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/6b30cfe6/tajo-core/src/main/java/org/apache/tajo/worker/Task.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/6b30cfe6/tajo-core/src/main/java/org/apache/tajo/worker/TaskAttemptContext.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/6b30cfe6/tajo-core/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/6b30cfe6/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/6b30cfe6/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeDeserializer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/6b30cfe6/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeSerializer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tajo/blob/6b30cfe6/tajo-plan/src/main/proto/Plan.proto
----------------------------------------------------------------------


Mime
View raw message