Author: hashutosh
Date: Tue Jul 15 18:50:51 2014
New Revision: 1610806
URL: http://svn.apache.org/r1610806
Log:
Merged with latest trunk
Added:
hive/branches/cbo/bin/ext/orcfiledump.cmd
- copied unchanged from r1610787, hive/trunk/bin/ext/orcfiledump.cmd
hive/branches/cbo/common/src/java/org/apache/hadoop/hive/ant/
- copied from r1610787,
hive/trunk/common/src/java/org/apache/hadoop/hive/ant/
hive/branches/cbo/common/src/java/org/apache/hadoop/hive/ant/GenHiveTemplate.java
- copied unchanged from r1610787,
hive/trunk/common/src/java/org/apache/hadoop/hive/ant/GenHiveTemplate.java
hive/branches/cbo/common/src/java/org/apache/hadoop/hive/conf/SystemVariables.java
- copied unchanged from r1610787,
hive/trunk/common/src/java/org/apache/hadoop/hive/conf/SystemVariables.java
hive/branches/cbo/common/src/java/org/apache/hadoop/hive/conf/Validator.java
- copied unchanged from r1610787,
hive/trunk/common/src/java/org/apache/hadoop/hive/conf/Validator.java
hive/branches/cbo/data/files/in_file.dat
- copied unchanged from r1610787, hive/trunk/data/files/in_file.dat
hive/branches/cbo/itests/custom-serde/src/main/java/org/apache/hadoop/hive/serde2/CustomTextSerDe.java
- copied unchanged from r1610787,
hive/trunk/itests/custom-serde/src/main/java/org/apache/hadoop/hive/serde2/CustomTextSerDe.java
hive/branches/cbo/itests/custom-serde/src/main/java/org/apache/hadoop/hive/serde2/CustomTextStorageFormatDescriptor.java
- copied unchanged from r1610787,
hive/trunk/itests/custom-serde/src/main/java/org/apache/hadoop/hive/serde2/CustomTextStorageFormatDescriptor.java
hive/branches/cbo/itests/custom-serde/src/main/resources/
- copied from r1610787, hive/trunk/itests/custom-serde/src/main/resources/
hive/branches/cbo/itests/custom-serde/src/main/resources/META-INF/
- copied from r1610787,
hive/trunk/itests/custom-serde/src/main/resources/META-INF/
hive/branches/cbo/itests/custom-serde/src/main/resources/META-INF/services/
- copied from r1610787,
hive/trunk/itests/custom-serde/src/main/resources/META-INF/services/
hive/branches/cbo/itests/custom-serde/src/main/resources/META-INF/services/org.apache.hadoop.hive.ql.io.StorageFormatDescriptor
- copied unchanged from r1610787,
hive/trunk/itests/custom-serde/src/main/resources/META-INF/services/org.apache.hadoop.hive.ql.io.StorageFormatDescriptor
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleRequest.java
- copied unchanged from r1610787,
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleRequest.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleResponse.java
- copied unchanged from r1610787,
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeRoleResponse.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeType.java
- copied unchanged from r1610787,
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokeType.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/io/AbstractStorageFormatDescriptor.java
- copied unchanged from r1610787,
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/AbstractStorageFormatDescriptor.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/io/ORCFileStorageFormatDescriptor.java
- copied unchanged from r1610787,
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/ORCFileStorageFormatDescriptor.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/io/ParquetFileStorageFormatDescriptor.java
- copied unchanged from r1610787,
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/ParquetFileStorageFormatDescriptor.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/io/RCFileStorageFormatDescriptor.java
- copied unchanged from r1610787,
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/RCFileStorageFormatDescriptor.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/io/SequenceFileStorageFormatDescriptor.java
- copied unchanged from r1610787,
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/SequenceFileStorageFormatDescriptor.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/io/StorageFormatDescriptor.java
- copied unchanged from r1610787,
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/StorageFormatDescriptor.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/io/StorageFormatFactory.java
- copied unchanged from r1610787,
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/StorageFormatFactory.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/io/TextFileStorageFormatDescriptor.java
- copied unchanged from r1610787,
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/io/TextFileStorageFormatDescriptor.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/parse/StorageFormat.java
- copied unchanged from r1610787,
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/StorageFormat.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowConfDesc.java
- copied unchanged from r1610787,
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/ShowConfDesc.java
hive/branches/cbo/ql/src/main/resources/META-INF/
- copied from r1610787, hive/trunk/ql/src/main/resources/META-INF/
hive/branches/cbo/ql/src/main/resources/META-INF/services/
- copied from r1610787,
hive/trunk/ql/src/main/resources/META-INF/services/
hive/branches/cbo/ql/src/main/resources/META-INF/services/org.apache.hadoop.hive.ql.io.StorageFormatDescriptor
- copied unchanged from r1610787,
hive/trunk/ql/src/main/resources/META-INF/services/org.apache.hadoop.hive.ql.io.StorageFormatDescriptor
hive/branches/cbo/ql/src/test/org/apache/hadoop/hive/ql/io/TestStorageFormatDescriptor.java
- copied unchanged from r1610787,
hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/io/TestStorageFormatDescriptor.java
hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_role_grant2.q
- copied unchanged from r1610787,
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant2.q
hive/branches/cbo/ql/src/test/queries/clientpositive/show_conf.q
- copied unchanged from r1610787,
hive/trunk/ql/src/test/queries/clientpositive/show_conf.q
hive/branches/cbo/ql/src/test/queries/clientpositive/storage_format_descriptor.q
- copied unchanged from r1610787,
hive/trunk/ql/src/test/queries/clientpositive/storage_format_descriptor.q
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_role_grant2.q.out
- copied unchanged from r1610787,
hive/trunk/ql/src/test/results/clientnegative/authorization_role_grant2.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/show_conf.q.out
- copied unchanged from r1610787,
hive/trunk/ql/src/test/results/clientpositive/show_conf.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/storage_format_descriptor.q.out
- copied unchanged from r1610787,
hive/trunk/ql/src/test/results/clientpositive/storage_format_descriptor.q.out
Modified:
hive/branches/cbo/ (props changed)
hive/branches/cbo/bin/hive.cmd
hive/branches/cbo/common/pom.xml
hive/branches/cbo/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
hive/branches/cbo/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java
hive/branches/cbo/common/src/test/org/apache/hadoop/hive/conf/TestHiveConfRestrictList.java
hive/branches/cbo/common/src/test/org/apache/hadoop/hive/conf/TestHiveLogging.java
hive/branches/cbo/conf/hive-default.xml.template
hive/branches/cbo/hcatalog/core/src/main/java/org/apache/hive/hcatalog/cli/SemanticAnalysis/CreateTableHook.java
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestAuthorizationApiAuthorizer.java
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
hive/branches/cbo/jdbc/pom.xml
hive/branches/cbo/metastore/if/hive_metastore.thrift
hive/branches/cbo/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
hive/branches/cbo/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h
hive/branches/cbo/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp
hive/branches/cbo/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.cpp
hive/branches/cbo/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsResult.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsInfoResponse.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetOpenTxnsResponse.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetPrincipalsInRoleResponse.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetRoleGrantsForPrincipalResponse.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnsResponse.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowCompactResponse.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ShowLocksResponse.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SkewedInfo.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Type.java
hive/branches/cbo/metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore.php
hive/branches/cbo/metastore/src/gen/thrift/gen-php/metastore/Types.php
hive/branches/cbo/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
hive/branches/cbo/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
hive/branches/cbo/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
hive/branches/cbo/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
hive/branches/cbo/metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb
hive/branches/cbo/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
hive/branches/cbo/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
hive/branches/cbo/metastore/src/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
hive/branches/cbo/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
hive/branches/cbo/metastore/src/java/org/apache/hadoop/hive/metastore/RawStore.java
hive/branches/cbo/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreControlledCommit.java
hive/branches/cbo/metastore/src/test/org/apache/hadoop/hive/metastore/DummyRawStoreForJdoConnection.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/hooks/ATSHook.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/io/IOConstants.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/io/orc/FileDump.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcFile.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/io/orc/WriterImpl.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/metadata/Partition.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/IntraQueryCorrelation.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/optimizer/correlation/QueryPlanTreeTransformation.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/parse/DDLSemanticAnalyzer.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveLexer.g
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/parse/HiveParser.g
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/parse/IdentifiersParser.g
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/parse/ParseUtils.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzerFactory.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/parse/VariableSubstitution.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/parse/authorization/HiveAuthorizationTaskFactoryImpl.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/plan/CreateTableDesc.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/plan/DDLWork.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/plan/HiveOperation.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/processors/SetProcessor.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveOperationType.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessController.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFFormatNumber.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInFile.java
hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_role_grant1.q
hive/branches/cbo/ql/src/test/queries/clientpositive/subquery_exists_having.q
hive/branches/cbo/ql/src/test/queries/clientpositive/subquery_in_having.q
hive/branches/cbo/ql/src/test/queries/clientpositive/truncate_table.q
hive/branches/cbo/ql/src/test/queries/clientpositive/udf_format_number.q
hive/branches/cbo/ql/src/test/queries/clientpositive/udf_in_file.q
hive/branches/cbo/ql/src/test/resources/orc-file-dump-dictionary-threshold.out
hive/branches/cbo/ql/src/test/resources/orc-file-dump.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_role_grant.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/fileformat_bad_class.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/genericFileFormat.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/udf_format_number_wrong5.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/udf_format_number_wrong7.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_role_grant1.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/create_union_table.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/ctas.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/ctas_colname.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/ctas_uses_database_location.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/groupby_duplicate_key.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/input15.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/inputddl1.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/inputddl2.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/inputddl3.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/merge3.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/nonmr_fetch.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/nullformat.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/nullformatCTAS.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/parallel_orderby.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/skewjoin_noskew.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_exists_having.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_in_having.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/temp_table.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/tez/ctas.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/tez/tez_dml.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/truncate_table.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/udf_format_number.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/udf_in_file.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/union25.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/union_top_level.q.out
hive/branches/cbo/service/src/java/org/apache/hive/service/cli/CLIService.java
hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/api/server/TestExecutor.java
hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/PTest.java
hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/ExecutionContextConfiguration.java
hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/conf/TestParser.java
hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/CloudComputeService.java
hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/context/CloudExecutionContextProvider.java
hive/branches/cbo/testutils/ptest2/src/main/java/org/apache/hive/ptest/execution/ssh/RSyncCommandExecutor.java
hive/branches/cbo/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/MockRSyncCommandExecutor.java
hive/branches/cbo/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestParser.java
hive/branches/cbo/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/TestCloudExecutionContextProvider.java
hive/branches/cbo/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestRSyncCommandExecutor.java
Propchange: hive/branches/cbo/
------------------------------------------------------------------------------
Merged /hive/trunk:r1609293-1610787
Modified: hive/branches/cbo/bin/hive.cmd
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/bin/hive.cmd?rev=1610806&r1=1610805&r2=1610806&view=diff
==============================================================================
--- hive/branches/cbo/bin/hive.cmd (original)
+++ hive/branches/cbo/bin/hive.cmd Tue Jul 15 18:50:51 2014
@@ -83,6 +83,12 @@ set AUX_PARAM=
goto :ProcessCmdLine
)
+ if %1==--orcfiledump (
+ set SERVICE=orcfiledump
+ shift
+ goto :ProcessCmdLine
+ )
+
if %1==--help (
set HELP=_help
shift
@@ -339,6 +345,9 @@ goto :EOF
set VAR%SERVICE_COUNT%=rcfilecat
set /a SERVICE_COUNT = %SERVICE_COUNT% + 1
+ set VAR%SERVICE_COUNT%=orcfiledump
+
+ set /a SERVICE_COUNT = %SERVICE_COUNT% + 1
set VAR%SERVICE_COUNT%=schematool
goto :EOF
Modified: hive/branches/cbo/common/pom.xml
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/common/pom.xml?rev=1610806&r1=1610805&r2=1610806&view=diff
==============================================================================
--- hive/branches/cbo/common/pom.xml (original)
+++ hive/branches/cbo/common/pom.xml Tue Jul 15 18:50:51 2014
@@ -65,6 +65,11 @@
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${ant.version}</version>
+ </dependency>
<!-- test inter-project -->
<dependency>
<groupId>junit</groupId>
@@ -106,6 +111,14 @@
</profiles>
<build>
+ <resources>
+ <resource>
+ <directory>../conf/</directory>
+ <includes>
+ <include>hive-default.xml.template</include>
+ </includes>
+ </resource>
+ </resources>
<sourceDirectory>${basedir}/src/java</sourceDirectory>
<testSourceDirectory>${basedir}/src/test</testSourceDirectory>
<scriptSourceDirectory>${basedir}/src/scripts</scriptSourceDirectory>
@@ -136,6 +149,21 @@
<goal>run</goal>
</goals>
</execution>
+ <execution>
+ <id>generate-template</id>
+ <phase>package</phase>
+ <configuration>
+ <target>
+ <property name="compile.classpath"
refid="maven.runtime.classpath"/>
+ <taskdef name="templategen"
classname="org.apache.hadoop.hive.ant.GenHiveTemplate"
+ classpath="${compile.classpath}"/>
+ <templategen
templateFile="${basedir}/../conf/hive-default.xml.template"/>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<plugin>
