Merge remote-tracking branch 'origin/master' into llap
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/e69bd1ee Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/e69bd1ee Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/e69bd1ee Branch: refs/heads/llap Commit: e69bd1ee53ba8f7aef8614d1cd3fb339e07db984 Parents: 5816ff3 9b5eb45 Author: Jason Dere <jd...@hortonworks.com> Authored: Wed Apr 20 13:04:26 2016 -0700 Committer: Jason Dere <jd...@hortonworks.com> Committed: Wed Apr 20 13:04:26 2016 -0700 ---------------------------------------------------------------------- .../org/apache/hive/jdbc/TestJdbcDriver2.java | 85 +- .../test/resources/testconfiguration.properties | 3 +- .../apache/hive/jdbc/HiveQueryResultSet.java | 9 + .../org/apache/hive/jdbc/HiveStatement.java | 75 +- .../llap/io/decode/OrcEncodedDataConsumer.java | 45 +- metastore/if/hive_metastore.thrift | 59 + .../upgrade/derby/034-HIVE-13076.derby.sql | 3 + .../upgrade/derby/hive-schema-2.1.0.derby.sql | 6 + .../derby/upgrade-2.0.0-to-2.1.0.derby.sql | 1 + .../upgrade/mssql/019-HIVE-13076.mssql.sql | 15 + .../upgrade/mssql/hive-schema-2.1.0.mssql.sql | 18 + .../mssql/upgrade-2.0.0-to-2.1.0.mssql.sql | 1 + .../upgrade/mysql/034-HIVE-13076.mysql.sql | 17 + .../upgrade/mysql/hive-schema-2.1.0.mysql.sql | 17 +- .../mysql/upgrade-2.0.0-to-2.1.0.mysql.sql | 1 + .../upgrade/oracle/034-HIVE-13076.oracle.sql | 15 + .../upgrade/oracle/hive-schema-2.1.0.oracle.sql | 19 + .../oracle/upgrade-2.0.0-to-2.1.0.oracle.sql | 1 + .../postgres/033-HIVE-13076.postgres.sql | 15 + .../postgres/hive-schema-2.1.0.postgres.sql | 17 + .../upgrade-2.0.0-to-2.1.0.postgres.sql | 1 + .../gen/thrift/gen-cpp/ThriftHiveMetastore.cpp | 4885 +++++++----- .../gen/thrift/gen-cpp/ThriftHiveMetastore.h | 447 ++ .../ThriftHiveMetastore_server.skeleton.cpp | 15 + .../gen/thrift/gen-cpp/hive_metastore_types.cpp | 6512 +++++++++------- .../gen/thrift/gen-cpp/hive_metastore_types.h | 404 + .../metastore/api/AddDynamicPartitions.java | 32 +- .../metastore/api/AddPartitionsRequest.java | 36 +- .../hive/metastore/api/AddPartitionsResult.java | 36 +- .../metastore/api/ClearFileMetadataRequest.java | 32 +- .../metastore/api/DropPartitionsResult.java | 36 +- .../hive/metastore/api/FireEventRequest.java | 32 +- .../hive/metastore/api/ForeignKeysRequest.java | 692 ++ .../hive/metastore/api/ForeignKeysResponse.java | 443 ++ .../hadoop/hive/metastore/api/Function.java | 36 +- .../metastore/api/GetAllFunctionsResponse.java | 36 +- .../api/GetFileMetadataByExprRequest.java | 32 +- .../api/GetFileMetadataByExprResult.java | 48 +- .../metastore/api/GetFileMetadataRequest.java | 32 +- .../metastore/api/GetFileMetadataResult.java | 44 +- .../metastore/api/GetOpenTxnsInfoResponse.java | 36 +- .../hive/metastore/api/GetOpenTxnsResponse.java | 32 +- .../api/HeartbeatTxnRangeResponse.java | 64 +- .../metastore/api/InsertEventRequestData.java | 32 +- .../hadoop/hive/metastore/api/LockRequest.java | 36 +- .../api/NotificationEventResponse.java | 36 +- .../hive/metastore/api/OpenTxnsResponse.java | 32 +- .../metastore/api/PartitionsByExprResult.java | 36 +- .../metastore/api/PartitionsStatsRequest.java | 64 +- .../metastore/api/PartitionsStatsResult.java | 76 +- .../hive/metastore/api/PrimaryKeysRequest.java | 490 ++ .../hive/metastore/api/PrimaryKeysResponse.java | 443 ++ .../metastore/api/PutFileMetadataRequest.java | 64 +- .../hive/metastore/api/RequestPartsSpec.java | 68 +- .../hive/metastore/api/SQLForeignKey.java | 1715 +++++ .../hive/metastore/api/SQLPrimaryKey.java | 1103 +++ .../hive/metastore/api/ShowCompactResponse.java | 36 +- .../hive/metastore/api/ShowLocksResponse.java | 36 +- .../hive/metastore/api/TableStatsRequest.java | 32 +- .../hive/metastore/api/TableStatsResult.java | 36 +- .../hive/metastore/api/ThriftHiveMetastore.java | 7122 +++++++++++++----- .../gen-php/metastore/ThriftHiveMetastore.php | 2260 ++++-- .../src/gen/thrift/gen-php/metastore/Types.php | 5564 ++++++++------ .../hive_metastore/ThriftHiveMetastore-remote | 21 + .../hive_metastore/ThriftHiveMetastore.py | 1890 +++-- .../gen/thrift/gen-py/hive_metastore/ttypes.py | 1440 +++- .../gen/thrift/gen-rb/hive_metastore_types.rb | 152 + .../gen/thrift/gen-rb/thrift_hive_metastore.rb | 209 + .../hadoop/hive/metastore/HiveMetaStore.java | 97 +- .../hive/metastore/HiveMetaStoreClient.java | 46 +- .../hadoop/hive/metastore/IMetaStoreClient.java | 16 + .../hive/metastore/MetaStoreDirectSql.java | 134 + .../hadoop/hive/metastore/ObjectStore.java | 397 +- .../apache/hadoop/hive/metastore/RawStore.java | 12 + .../hadoop/hive/metastore/hbase/HBaseStore.java | 24 + .../hive/metastore/model/MConstraint.java | 148 + metastore/src/model/package.jdo | 33 + .../DummyRawStoreControlledCommit.java | 24 + .../DummyRawStoreForJdoConnection.java | 24 + orc/src/java/org/apache/orc/DataReader.java | 6 +- .../java/org/apache/orc/DataReaderFactory.java | 9 + .../org/apache/orc/MetadataReaderFactory.java | 12 + orc/src/java/org/apache/orc/OrcUtils.java | 75 - orc/src/java/org/apache/orc/Reader.java | 6 - orc/src/java/org/apache/orc/RecordReader.java | 8 +- .../java/org/apache/orc/TypeDescription.java | 62 +- .../org/apache/orc/impl/BitFieldReader.java | 5 +- .../apache/orc/impl/DataReaderProperties.java | 84 + .../orc/impl/DefaultMetadataReaderFactory.java | 14 + .../java/org/apache/orc/impl/IntegerReader.java | 26 +- .../org/apache/orc/impl/MetadataReader.java | 5 +- .../org/apache/orc/impl/MetadataReaderImpl.java | 17 +- .../orc/impl/MetadataReaderProperties.java | 96 + .../apache/orc/impl/RunLengthByteReader.java | 36 +- .../apache/orc/impl/RunLengthIntegerReader.java | 31 +- .../orc/impl/RunLengthIntegerReaderV2.java | 33 +- .../java/org/apache/orc/impl/WriterImpl.java | 47 +- .../orc/impl/TestDataReaderProperties.java | 69 + .../orc/impl/TestMetadataReaderProperties.java | 72 + .../java/org/apache/hadoop/hive/ql/Driver.java | 42 +- .../ql/exec/vector/VectorizedRowBatchCtx.java | 13 +- .../ql/io/orc/DefaultDataReaderFactory.java | 14 + .../hadoop/hive/ql/io/orc/OrcInputFormat.java | 43 +- .../hive/ql/io/orc/OrcRawRecordMerger.java | 3 +- .../hadoop/hive/ql/io/orc/ReaderImpl.java | 50 +- .../hadoop/hive/ql/io/orc/RecordReaderImpl.java | 203 +- .../hive/ql/io/orc/RecordReaderUtils.java | 17 +- .../hadoop/hive/ql/io/orc/SchemaEvolution.java | 234 +- .../hive/ql/io/orc/TreeReaderFactory.java | 838 ++- .../ql/io/orc/VectorizedOrcInputFormat.java | 32 +- .../hadoop/hive/ql/io/orc/WriterImpl.java | 2 + .../hadoop/hive/ql/parse/SemanticAnalyzer.java | 7 +- .../hadoop/hive/ql/session/SessionState.java | 2 +- .../hive/ql/io/orc/TestRecordReaderImpl.java | 145 +- .../hive/ql/io/orc/TestTypeDescription.java | 4 +- .../hive/ql/io/orc/TestVectorOrcFile.java | 1634 ++-- .../hive/ql/io/orc/TestVectorizedORCReader.java | 7 +- .../queries/clientpositive/encryption_ctas.q | 16 + .../encrypted/encryption_ctas.q.out | 56 + .../gen-py/hive_service/ThriftHive-remote | 21 + .../cli/operation/GetCatalogsOperation.java | 5 +- .../cli/operation/GetColumnsOperation.java | 5 +- .../cli/operation/GetFunctionsOperation.java | 6 +- .../cli/operation/GetSchemasOperation.java | 7 +- .../cli/operation/GetTableTypesOperation.java | 7 +- .../cli/operation/GetTablesOperation.java | 10 +- .../cli/operation/GetTypeInfoOperation.java | 7 +- .../hive/service/cli/operation/Operation.java | 8 +- .../service/cli/operation/SQLOperation.java | 7 +- .../hive/ql/exec/vector/BytesColumnVector.java | 11 - .../ql/exec/vector/TimestampColumnVector.java | 2 +- .../hive/ql/exec/vector/UnionColumnVector.java | 2 + .../ptest2/src/main/resources/source-prep.vm | 2 - 133 files changed, 30015 insertions(+), 12493 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/e69bd1ee/itests/src/test/resources/testconfiguration.properties ----------------------------------------------------------------------