Author: gunther
Date: Fri Jul 25 00:38:23 2014
New Revision: 1613335
URL: http://svn.apache.org/r1613335
Log:
Merge latest trunk into tez branch. (Gunther Hagleitner)
Added:
hive/branches/cbo/common/src/java/org/apache/hadoop/hive/common/cli/HiveFileProcessor.java
- copied unchanged from r1613334,
hive/trunk/common/src/java/org/apache/hadoop/hive/common/cli/HiveFileProcessor.java
hive/branches/cbo/common/src/java/org/apache/hadoop/hive/common/cli/IHiveFileProcessor.java
- copied unchanged from r1613334,
hive/trunk/common/src/java/org/apache/hadoop/hive/common/cli/IHiveFileProcessor.java
hive/branches/cbo/common/src/java/org/apache/hive/common/util/AnnotationUtils.java
- copied unchanged from r1613334,
hive/trunk/common/src/java/org/apache/hive/common/util/AnnotationUtils.java
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hive/jdbc/authorization/TestHS2AuthzContext.java
- copied unchanged from r1613334,
hive/trunk/itests/hive-unit/src/test/java/org/apache/hive/jdbc/authorization/TestHS2AuthzContext.java
hive/branches/cbo/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizationValidatorForTest.java
- copied unchanged from r1613334,
hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizationValidatorForTest.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeRequest.java
- copied unchanged from r1613334,
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeRequest.java
hive/branches/cbo/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeResponse.java
- copied unchanged from r1613334,
hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GrantRevokePrivilegeResponse.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorElt.java
- copied unchanged from r1613334,
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/expressions/VectorElt.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/NullScanOptimizer.java
- copied unchanged from r1613334,
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/NullScanOptimizer.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/NullScanTaskDispatcher.java
- copied unchanged from r1613334,
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/NullScanTaskDispatcher.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandUtil.java
- copied unchanged from r1613334,
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandUtil.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveAuthzContext.java
- copied unchanged from r1613334,
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveAuthzContext.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveV1Authorizer.java
- copied unchanged from r1613334,
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveV1Authorizer.java
hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_compile.q
- copied unchanged from r1613334,
hive/trunk/ql/src/test/queries/clientnegative/authorization_compile.q
hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_deletejar.q
- copied unchanged from r1613334,
hive/trunk/ql/src/test/queries/clientnegative/authorization_deletejar.q
hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_fail_8.q
- copied unchanged from r1613334,
hive/trunk/ql/src/test/queries/clientnegative/authorization_fail_8.q
hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_admin_almighty2.q
- copied unchanged from r1613334,
hive/trunk/ql/src/test/queries/clientpositive/authorization_admin_almighty2.q
hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_reset.q
- copied unchanged from r1613334,
hive/trunk/ql/src/test/queries/clientpositive/authorization_reset.q
hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_show_role_principals_v1.q
- copied unchanged from r1613334,
hive/trunk/ql/src/test/queries/clientpositive/authorization_show_role_principals_v1.q
hive/branches/cbo/ql/src/test/queries/clientpositive/optimize_nullscan.q
- copied unchanged from r1613334,
hive/trunk/ql/src/test/queries/clientpositive/optimize_nullscan.q
hive/branches/cbo/ql/src/test/queries/clientpositive/vector_cast_constant.q
- copied unchanged from r1613334,
hive/trunk/ql/src/test/queries/clientpositive/vector_cast_constant.q
hive/branches/cbo/ql/src/test/queries/clientpositive/vector_elt.q
- copied unchanged from r1613334,
hive/trunk/ql/src/test/queries/clientpositive/vector_elt.q
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_compile.q.out
- copied unchanged from r1613334,
hive/trunk/ql/src/test/results/clientnegative/authorization_compile.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_deletejar.q.out
- copied unchanged from r1613334,
hive/trunk/ql/src/test/results/clientnegative/authorization_deletejar.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_fail_8.q.out
- copied unchanged from r1613334,
hive/trunk/ql/src/test/results/clientnegative/authorization_fail_8.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_admin_almighty2.q.out
- copied unchanged from r1613334,
hive/trunk/ql/src/test/results/clientpositive/authorization_admin_almighty2.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_reset.q.out
- copied unchanged from r1613334,
hive/trunk/ql/src/test/results/clientpositive/authorization_reset.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_show_role_principals_v1.q.out
- copied unchanged from r1613334,
hive/trunk/ql/src/test/results/clientpositive/authorization_show_role_principals_v1.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/optimize_nullscan.q.out
- copied unchanged from r1613334,
hive/trunk/ql/src/test/results/clientpositive/optimize_nullscan.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out
- copied unchanged from r1613334,
hive/trunk/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/tez/vector_cast_constant.q.out
- copied unchanged from r1613334,
hive/trunk/ql/src/test/results/clientpositive/tez/vector_cast_constant.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/vector_cast_constant.q.out
- copied unchanged from r1613334,
hive/trunk/ql/src/test/results/clientpositive/vector_cast_constant.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/vector_elt.q.out
- copied unchanged from r1613334,
hive/trunk/ql/src/test/results/clientpositive/vector_elt.q.out
hive/branches/cbo/service/src/test/org/apache/hive/service/cli/session/TestSessionGlobalInitFile.java
- copied unchanged from r1613334,
hive/trunk/service/src/test/org/apache/hive/service/cli/session/TestSessionGlobalInitFile.java
Removed:
hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_show_role_principals_v1.q
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_show_role_principals_v1.q.out
Modified:
hive/branches/cbo/ (props changed)
hive/branches/cbo/beeline/src/java/org/apache/hive/beeline/BeeLine.java
hive/branches/cbo/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java
hive/branches/cbo/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
hive/branches/cbo/conf/hive-default.xml.template
hive/branches/cbo/contrib/src/test/results/clientnegative/case_with_row_sequence.q.out
hive/branches/cbo/contrib/src/test/results/clientnegative/invalid_row_sequence.q.out
hive/branches/cbo/contrib/src/test/results/clientnegative/udtf_explode2.q.out
hive/branches/cbo/contrib/src/test/results/clientpositive/dboutput.q.out
hive/branches/cbo/contrib/src/test/results/clientpositive/lateral_view_explode2.q.out
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_avg.q.out
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_group_concat.q.out
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_max.q.out
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_max_n.q.out
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_min.q.out
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_min_n.q.out
hive/branches/cbo/contrib/src/test/results/clientpositive/udf_example_add.q.out
hive/branches/cbo/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out
hive/branches/cbo/contrib/src/test/results/clientpositive/udf_example_format.q.out
hive/branches/cbo/contrib/src/test/results/clientpositive/udf_row_sequence.q.out
hive/branches/cbo/contrib/src/test/results/clientpositive/udtf_explode2.q.out
hive/branches/cbo/contrib/src/test/results/clientpositive/udtf_output_on_close.q.out
hive/branches/cbo/data/conf/hive-site.xml
hive/branches/cbo/hbase-handler/src/java/org/apache/hadoop/hive/hbase/ColumnMappings.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/hadoop/hive/ql/security/FolderPermissionBase.java
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hive/jdbc/authorization/TestJdbcWithSQLAuthorization.java
hive/branches/cbo/itests/qtest/testconfiguration.properties
hive/branches/cbo/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessControllerForTest.java
hive/branches/cbo/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizerFactoryForTest.java
hive/branches/cbo/jdbc/src/java/org/apache/hive/jdbc/HiveStatement.java
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/ThriftHiveMetastore.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/java/org/apache/hadoop/hive/metastore/Warehouse.java
hive/branches/cbo/metastore/src/java/org/apache/hadoop/hive/metastore/txn/TxnHandler.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/metastore/src/test/org/apache/hadoop/hive/metastore/txn/TestCompactionTxnHandler.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/ErrorMsg.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/exec/ExplainTask.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionInfo.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/exec/FunctionRegistry.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/exec/Utilities.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/exec/WindowFunctionInfo.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorColumnAssignFactory.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorExpressionDescriptor.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizationContext.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/hooks/Entity.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/hooks/WriteEntity.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/RecordReaderImpl.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/SessionHiveMetaStoreClient.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/optimizer/SimpleFetchOptimizer.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/optimizer/StatsOptimizer.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/MetadataOnlyOptimizer.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/PhysicalOptimizer.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/optimizer/physical/Vectorizer.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/parse/FunctionSemanticAnalyzer.java
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/TezCompiler.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/GroupByDesc.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/plan/RevokeDesc.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/plan/TezEdgeProperty.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/processors/AddResourceProcessor.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/processors/CommandProcessorResponse.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/processors/CompileProcessor.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/processors/DeleteResourceProcessor.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/processors/DfsProcessor.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/processors/ResetProcessor.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/AuthorizationUtils.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/Privilege.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveAuthorizationValidator.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveAuthorizer.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveAuthorizerImpl.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/HivePrincipal.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HivePrivilege.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HivePrivilegeObject.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/GrantPrivAuthUtils.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/SQLAuthorizationUtils.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/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizationValidator.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/session/SessionState.java
hive/branches/cbo/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFEvaluator.java
hive/branches/cbo/ql/src/test/org/apache/hadoop/hive/ql/security/authorization/plugin/TestHiveOperationType.java
hive/branches/cbo/ql/src/test/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/TestSQLStdHiveAccessController.java
hive/branches/cbo/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestCleaner.java
hive/branches/cbo/ql/src/test/org/apache/hadoop/hive/ql/txn/compactor/TestInitiator.java
hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_addjar.q
hive/branches/cbo/ql/src/test/queries/clientnegative/authorization_dfs.q
hive/branches/cbo/ql/src/test/queries/clientpositive/annotate_stats_filter.q
hive/branches/cbo/ql/src/test/queries/clientpositive/authorization_revoke_table_priv.q
hive/branches/cbo/ql/src/test/queries/clientpositive/avro_partitioned.q
hive/branches/cbo/ql/src/test/queries/clientpositive/nonmr_fetch_threshold.q
hive/branches/cbo/ql/src/test/queries/clientpositive/orc_ppd_date.q
hive/branches/cbo/ql/src/test/resources/orc-file-dump.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_addjar.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_addpartition.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_alter_db_owner.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_alter_db_owner_default.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_caseinsensitivity.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_create_func1.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_create_func2.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_create_macro1.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_createview.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_ctas.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_desc_table_nosel.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_dfs.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_drop_db_cascade.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_drop_db_empty.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_droppartition.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_fail_1.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_fail_3.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_fail_4.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_fail_5.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_fail_7.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_grant_table_allpriv.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_grant_table_fail1.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_grant_table_fail_nogrant.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_insert_noinspriv.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_insert_noselectpriv.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_insertoverwrite_nodel.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_not_owner_alter_tab_rename.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_not_owner_alter_tab_serdeprop.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_not_owner_drop_tab.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_not_owner_drop_view.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_part.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_priv_current_role_neg.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_public_create.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_public_drop.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_role_cycles1.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_role_cycles2.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_role_grant.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_role_grant2.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_role_grant_nosuchrole.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_rolehierarchy_privs.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_select.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_select_view.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_show_parts_nosel.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorization_truncate.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/authorize_create_tbl.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/create_function_nonexistent_class.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/create_function_nonudf_class.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/create_udaf_failure.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/create_unknown_genericudf.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/create_unknown_udf_udaf.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/drop_native_udf.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/temp_table_authorize_create_tbl.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/udf_function_does_not_implement_udf.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/udf_local_resource.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/udf_nonexistent_resource.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/udf_test_error.q.out
hive/branches/cbo/ql/src/test/results/clientnegative/udf_test_error_reduce.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/alter_rename_partition_authorization.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/annotate_stats_filter.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_1.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_2.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_3.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_4.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_5.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_6.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_9.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_create_func1.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/authorization_revoke_table_priv.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/autogen_colalias.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/avro_partitioned.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/compile_processor.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/create_func1.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/create_genericudaf.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/create_genericudf.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/create_udaf.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/create_view.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/cross_product_check_1.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/cross_product_check_2.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/drop_udf.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/keyword_1.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/mapjoin1.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/nonmr_fetch_threshold.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/orc_ppd_date.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/ptf_register_tblfn.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/ptf_streaming.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/show_roles.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/subq_where_serialization.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_exists.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.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_in_having.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_multiinsert.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_notexists.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_notexists_having.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_notin.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_notin_having.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/tez/bucket2.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/tez/bucket3.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/tez/bucket4.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/tez/subquery_in.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/udaf_sum_list.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/udf_compare_java_string.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/udf_context_aware.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/udf_logic_java_boolean.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/udf_testlength.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/udf_testlength2.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/udf_using.q.out
hive/branches/cbo/ql/src/test/results/clientpositive/windowing_udaf2.q.out
hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/HiveSessionBase.java
hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/HiveSessionImpl.java
hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/HiveSessionImplwithUGI.java
hive/branches/cbo/service/src/java/org/apache/hive/service/cli/session/SessionManager.java
Propchange: hive/branches/cbo/
------------------------------------------------------------------------------
Merged /hive/trunk:r1611502-1613334
Modified:
hive/branches/cbo/beeline/src/java/org/apache/hive/beeline/BeeLine.java
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/beeline/src/java/org/apache/hive/beeline/BeeLine.java?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/beeline/src/java/org/apache/hive/beeline/BeeLine.java
(original)
+++ hive/branches/cbo/beeline/src/java/org/apache/hive/beeline/BeeLine.java Fri
Jul 25 00:38:23 2014
@@ -1165,8 +1165,9 @@ public class BeeLine implements Closeabl
if (getDatabaseConnection() == null || getDatabaseConnection().getUrl() ==
null) {
return "beeline> ";
} else {
+ String printClosed = getDatabaseConnection().isClosed() ? " (closed)" :
"";
return getPrompt(getDatabaseConnections().getIndex()
- + ": " + getDatabaseConnection().getUrl()) + "> ";
+ + ": " + getDatabaseConnection().getUrl()) + printClosed + "> ";
}
}
Modified:
hive/branches/cbo/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java
(original)
+++
hive/branches/cbo/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java
Fri Jul 25 00:38:23 2014
@@ -30,7 +30,6 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.LinkedList;
import java.util.List;
-import java.util.Properties;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -54,6 +53,9 @@ class DatabaseConnection {
private Schema schema = null;
private Completor sqlCompletor = null;
+ public boolean isClosed() {
+ return (null == connection);
+ }
public DatabaseConnection(BeeLine beeLine, String driver, String url,
Properties info) throws SQLException {
@@ -101,15 +103,6 @@ class DatabaseConnection {
/**
* Connection to the specified data source.
- *
- * @param driver
- * the driver class
- * @param url
- * the connection URL
- * @param username
- * the username
- * @param password
- * the password
*/
boolean connect() throws SQLException {
try {
Modified:
hive/branches/cbo/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
(original)
+++ hive/branches/cbo/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
Fri Jul 25 00:38:23 2014
@@ -807,7 +807,7 @@ public class HiveConf extends Configurat
HIVE_ORC_WRITE_FORMAT("hive.exec.orc.write.format", null,
"Define the version of the file to write"),
HIVE_ORC_DEFAULT_STRIPE_SIZE("hive.exec.orc.default.stripe.size",
- 256L * 1024 * 1024,
+ 64L * 1024 * 1024,
"Define the default ORC stripe size"),
HIVE_ORC_DEFAULT_BLOCK_SIZE("hive.exec.orc.default.block.size", 256L *
1024 * 1024,
"Define the default file system block size for ORC files."),
@@ -989,6 +989,7 @@ public class HiveConf extends Configurat
HIVEPPDREMOVEDUPLICATEFILTERS("hive.ppd.remove.duplicatefilters", true,
"Whether to push predicates down into storage handlers. Ignored when
hive.optimize.ppd is false."),
HIVEMETADATAONLYQUERIES("hive.optimize.metadataonly", true, ""),
+ HIVENULLSCANOPTIMIZE("hive.optimize.null.scan", true, "Dont scan relations
which are guaranteed to not generate any rows"),
HIVEOPTPPD_STORAGE("hive.optimize.ppd.storage", true,
"Whether to push predicates down to storage handlers"),
HIVEOPTGROUPBY("hive.optimize.groupby", true,
@@ -1265,14 +1266,14 @@ public class HiveConf extends Configurat
HIVEOUTERJOINSUPPORTSFILTERS("hive.outerjoin.supports.filters", true, ""),
- HIVEFETCHTASKCONVERSION("hive.fetch.task.conversion", "minimal", new
StringSet("minimal", "more"),
+ HIVEFETCHTASKCONVERSION("hive.fetch.task.conversion", "more", new
StringSet("minimal", "more"),
"Some select queries can be converted to single FETCH task minimizing
latency.\n" +
"Currently the query should be single sourced not having any subquery
and should not have\n" +
"any aggregations or distincts (which incurs RS), lateral views and
joins.\n" +
"1. minimal : SELECT STAR, FILTER on partition columns, LIMIT only\n" +
"2. more : SELECT, FILTER, LIMIT only (support TABLESAMPLE and
virtual columns)\n"
),
- HIVEFETCHTASKCONVERSIONTHRESHOLD("hive.fetch.task.conversion.threshold",
-1l,
+ HIVEFETCHTASKCONVERSIONTHRESHOLD("hive.fetch.task.conversion.threshold",
1073741824L,
"Input threshold for applying hive.fetch.task.conversion. If target
table is native, input length\n" +
"is calculated by summation of file lengths. If it's not native,
storage handler for the table\n" +
"can optionally implement
org.apache.hadoop.hive.ql.metadata.InputEstimator interface."),
@@ -1389,6 +1390,12 @@ public class HiveConf extends Configurat
"If the property is set, the value must be a valid URI (java.net.URI,
e.g. \"file:///tmp/my-logging.properties\"), \n" +
"which you can then extract a URL from and pass to
PropertyConfigurator.configure(URL)."),
+ // Hive global init file location
+ HIVE_GLOBAL_INIT_FILE_LOCATION("hive.global.init.file.location",
System.getenv("HIVE_CONF_DIR"),
+ "The location of HS2 global init file (.hiverc).\n" +
+ "If the property is not set, then HS2 will search for the file in
$HIVE_CONF_DIR/.\n" +
+ "If the property is set, the value must be a valid path where the init
file is located."),
+
// prefix used to auto generated column aliases (this should be started
with '_')
HIVE_AUTOGEN_COLUMNALIAS_PREFIX_LABEL("hive.autogen.columnalias.prefix.label",
"_c",
"String used as a prefix when auto generating column alias.\n" +
@@ -1825,19 +1832,25 @@ public class HiveConf extends Configurat
enum VarType {
STRING {
+ @Override
void checkType(String value) throws Exception { }
+ @Override
String defaultValueString(ConfVars confVar) { return
confVar.defaultStrVal; }
},
INT {
+ @Override
void checkType(String value) throws Exception {
Integer.valueOf(value); }
},
LONG {
+ @Override
void checkType(String value) throws Exception { Long.valueOf(value); }
},
FLOAT {
+ @Override
void checkType(String value) throws Exception { Float.valueOf(value); }
},
BOOLEAN {
+ @Override
void checkType(String value) throws Exception {
Boolean.valueOf(value); }
};
Modified: hive/branches/cbo/conf/hive-default.xml.template
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/conf/hive-default.xml.template?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/conf/hive-default.xml.template (original)
+++ hive/branches/cbo/conf/hive-default.xml.template Fri Jul 25 00:38:23 2014
@@ -1334,7 +1334,7 @@
</property>
<property>
<key>hive.exec.orc.default.stripe.size</key>
- <value>268435456</value>
+ <value>67108864</value>
<description>Define the default ORC stripe size</description>
</property>
<property>
@@ -1726,6 +1726,11 @@
<description/>
</property>
<property>
+ <key>hive.optimize.null.scan</key>
+ <value>true</value>
+ <description>Dont scan relations which are guaranteed to not generate any
rows</description>
+ </property>
+ <property>
<key>hive.optimize.ppd.storage</key>
<value>true</value>
<description>Whether to push predicates down to storage
handlers</description>
@@ -2234,7 +2239,7 @@
</property>
<property>
<key>hive.fetch.task.conversion</key>
- <value>minimal</value>
+ <value>more</value>
<description>
Some select queries can be converted to single FETCH task minimizing
latency.
Currently the query should be single sourced not having any subquery and
should not have
@@ -2245,7 +2250,7 @@
</property>
<property>
<key>hive.fetch.task.conversion.threshold</key>
- <value>-1</value>
+ <value>1073741824</value>
<description>
Input threshold for applying hive.fetch.task.conversion. If target table
is native, input length
is calculated by summation of file lengths. If it's not native, storage
handler for the table
@@ -2465,6 +2470,15 @@
</description>
</property>
<property>
+ <key>hive.global.init.file.location</key>
+ <value/>
+ <description>
+ The location of HS2 global init file (.hiverc).
+ If the property is not set, then HS2 will search for the file in
$HIVE_CONF_DIR/.
+ If the property is set, the value must be a valid path where the init
file is located.
+ </description>
+ </property>
+ <property>
<key>hive.autogen.columnalias.prefix.label</key>
<value>_c</value>
<description>
Modified:
hive/branches/cbo/contrib/src/test/results/clientnegative/case_with_row_sequence.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/contrib/src/test/results/clientnegative/case_with_row_sequence.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/contrib/src/test/results/clientnegative/case_with_row_sequence.q.out
(original)
+++
hive/branches/cbo/contrib/src/test/results/clientnegative/case_with_row_sequence.q.out
Fri Jul 25 00:38:23 2014
@@ -5,11 +5,11 @@ POSTHOOK: type: DROPFUNCTION
PREHOOK: query: create temporary function row_sequence as
'org.apache.hadoop.hive.contrib.udf.UDFRowSequence'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: row_sequence
POSTHOOK: query: create temporary function row_sequence as
'org.apache.hadoop.hive.contrib.udf.UDFRowSequence'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: row_sequence
PREHOOK: query: -- make sure a stateful function inside of CASE throws an
exception
-- since the short-circuiting requirements are contradictory
SELECT CASE WHEN 3 > 2 THEN 10 WHEN row_sequence() > 5 THEN 20 ELSE 30 END
Modified:
hive/branches/cbo/contrib/src/test/results/clientnegative/invalid_row_sequence.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/contrib/src/test/results/clientnegative/invalid_row_sequence.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/contrib/src/test/results/clientnegative/invalid_row_sequence.q.out
(original)
+++
hive/branches/cbo/contrib/src/test/results/clientnegative/invalid_row_sequence.q.out
Fri Jul 25 00:38:23 2014
@@ -2,18 +2,18 @@ PREHOOK: query: -- Verify that a statefu
drop temporary function row_sequence
PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: row_sequence
POSTHOOK: query: -- Verify that a stateful UDF cannot be used outside of the
SELECT list
drop temporary function row_sequence
POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: row_sequence
PREHOOK: query: create temporary function row_sequence as
'org.apache.hadoop.hive.contrib.udf.UDFRowSequence'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: row_sequence
POSTHOOK: query: create temporary function row_sequence as
'org.apache.hadoop.hive.contrib.udf.UDFRowSequence'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: row_sequence
FAILED: SemanticException [Error 10084]: Stateful UDF's can only be invoked in
the SELECT list
Modified:
hive/branches/cbo/contrib/src/test/results/clientnegative/udtf_explode2.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/contrib/src/test/results/clientnegative/udtf_explode2.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/contrib/src/test/results/clientnegative/udtf_explode2.q.out
(original)
+++
hive/branches/cbo/contrib/src/test/results/clientnegative/udtf_explode2.q.out
Fri Jul 25 00:38:23 2014
@@ -1,7 +1,7 @@
PREHOOK: query: CREATE TEMPORARY FUNCTION explode2 AS
'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFExplode2'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: explode2
POSTHOOK: query: CREATE TEMPORARY FUNCTION explode2 AS
'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFExplode2'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: explode2
FAILED: SemanticException [Error 10083]: The number of aliases supplied in the
AS clause does not match the number of columns output by the UDTF expected 2
aliases but got 1
Modified:
hive/branches/cbo/contrib/src/test/results/clientpositive/dboutput.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/contrib/src/test/results/clientpositive/dboutput.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/contrib/src/test/results/clientpositive/dboutput.q.out
(original)
+++ hive/branches/cbo/contrib/src/test/results/clientpositive/dboutput.q.out
Fri Jul 25 00:38:23 2014
@@ -1,9 +1,9 @@
PREHOOK: query: CREATE TEMPORARY FUNCTION dboutput AS
'org.apache.hadoop.hive.contrib.genericudf.example.GenericUDFDBOutput'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: dboutput
POSTHOOK: query: CREATE TEMPORARY FUNCTION dboutput AS
'org.apache.hadoop.hive.contrib.genericudf.example.GenericUDFDBOutput'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: dboutput
PREHOOK: query: DESCRIBE FUNCTION dboutput
PREHOOK: type: DESCFUNCTION
POSTHOOK: query: DESCRIBE FUNCTION dboutput
@@ -186,7 +186,7 @@ POSTHOOK: Input: default@src
#### A masked pattern was here ####
PREHOOK: query: DROP TEMPORARY FUNCTION dboutput
PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: dboutput
POSTHOOK: query: DROP TEMPORARY FUNCTION dboutput
POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: dboutput
Modified:
hive/branches/cbo/contrib/src/test/results/clientpositive/lateral_view_explode2.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/contrib/src/test/results/clientpositive/lateral_view_explode2.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/contrib/src/test/results/clientpositive/lateral_view_explode2.q.out
(original)
+++
hive/branches/cbo/contrib/src/test/results/clientpositive/lateral_view_explode2.q.out
Fri Jul 25 00:38:23 2014
@@ -1,9 +1,9 @@
PREHOOK: query: CREATE TEMPORARY FUNCTION explode2 AS
'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFExplode2'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: explode2
POSTHOOK: query: CREATE TEMPORARY FUNCTION explode2 AS
'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFExplode2'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: explode2
PREHOOK: query: SELECT col1, col2 FROM src LATERAL VIEW explode2(array(1,2,3))
myTable AS col1, col2 LIMIT 3
PREHOOK: type: QUERY
PREHOOK: Input: default@src
@@ -17,7 +17,7 @@ POSTHOOK: Input: default@src
3 3
PREHOOK: query: DROP TEMPORARY FUNCTION explode2
PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: explode2
POSTHOOK: query: DROP TEMPORARY FUNCTION explode2
POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: explode2
Modified:
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_avg.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_avg.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_avg.q.out
(original)
+++
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_avg.q.out
Fri Jul 25 00:38:23 2014
@@ -1,9 +1,9 @@
PREHOOK: query: CREATE TEMPORARY FUNCTION example_avg AS
'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleAvg'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_avg
POSTHOOK: query: CREATE TEMPORARY FUNCTION example_avg AS
'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleAvg'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_avg
PREHOOK: query: EXPLAIN
SELECT example_avg(substr(value,5)),
example_avg(IF(substr(value,5) > 250, NULL, substr(value,5)))
@@ -77,7 +77,7 @@ POSTHOOK: Input: default@src
260.182 134.82926829268294
PREHOOK: query: DROP TEMPORARY FUNCTION example_avg
PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_avg
POSTHOOK: query: DROP TEMPORARY FUNCTION example_avg
POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_avg
Modified:
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_group_concat.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_group_concat.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_group_concat.q.out
(original)
+++
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_group_concat.q.out
Fri Jul 25 00:38:23 2014
@@ -1,9 +1,9 @@
PREHOOK: query: CREATE TEMPORARY FUNCTION example_group_concat AS
'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleGroupConcat'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_group_concat
POSTHOOK: query: CREATE TEMPORARY FUNCTION example_group_concat AS
'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleGroupConcat'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_group_concat
PREHOOK: query: EXPLAIN
SELECT substr(value,5,1), example_group_concat("(", key, ":", value, ")")
FROM src
@@ -90,7 +90,7 @@ POSTHOOK: Input: default@src
9
(90:val_90)(90:val_90)(90:val_90)(92:val_92)(95:val_95)(95:val_95)(96:val_96)(97:val_97)(97:val_97)(98:val_98)(98:val_98)(9:val_9)
PREHOOK: query: DROP TEMPORARY FUNCTION example_group_concat
PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_group_concat
POSTHOOK: query: DROP TEMPORARY FUNCTION example_group_concat
POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_group_concat
Modified:
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_max.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_max.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_max.q.out
(original)
+++
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_max.q.out
Fri Jul 25 00:38:23 2014
@@ -1,9 +1,9 @@
PREHOOK: query: CREATE TEMPORARY FUNCTION example_max AS
'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMax'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_max
POSTHOOK: query: CREATE TEMPORARY FUNCTION example_max AS
'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMax'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_max
PREHOOK: query: DESCRIBE FUNCTION EXTENDED example_max
PREHOOK: type: DESCFUNCTION
POSTHOOK: query: DESCRIBE FUNCTION EXTENDED example_max
@@ -82,7 +82,7 @@ POSTHOOK: Input: default@src
98 98
PREHOOK: query: DROP TEMPORARY FUNCTION example_max
PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_max
POSTHOOK: query: DROP TEMPORARY FUNCTION example_max
POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_max
Modified:
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_max_n.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_max_n.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_max_n.q.out
(original)
+++
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_max_n.q.out
Fri Jul 25 00:38:23 2014
@@ -1,9 +1,9 @@
PREHOOK: query: CREATE TEMPORARY FUNCTION example_max_n AS
'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMaxN'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_max_n
POSTHOOK: query: CREATE TEMPORARY FUNCTION example_max_n AS
'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMaxN'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_max_n
PREHOOK: query: EXPLAIN
SELECT example_max_n(substr(value,5),10),
example_max_n(IF(substr(value,5) > 250, NULL, substr(value,5)),10)
@@ -77,7 +77,7 @@ POSTHOOK: Input: default@src
[498.0,498.0,498.0,497.0,496.0,495.0,494.0,493.0,492.0,492.0]
[249.0,248.0,247.0,244.0,242.0,242.0,241.0,239.0,239.0,238.0]
PREHOOK: query: DROP TEMPORARY FUNCTION example_max_n
PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_max_n
POSTHOOK: query: DROP TEMPORARY FUNCTION example_max_n
POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_max_n
Modified:
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_min.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_min.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_min.q.out
(original)
+++
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_min.q.out
Fri Jul 25 00:38:23 2014
@@ -1,9 +1,9 @@
PREHOOK: query: CREATE TEMPORARY FUNCTION example_min AS
'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMin'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_min
POSTHOOK: query: CREATE TEMPORARY FUNCTION example_min AS
'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMin'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_min
PREHOOK: query: DESCRIBE FUNCTION EXTENDED example_min
PREHOOK: type: DESCFUNCTION
POSTHOOK: query: DESCRIBE FUNCTION EXTENDED example_min
@@ -82,7 +82,7 @@ POSTHOOK: Input: default@src
0 0
PREHOOK: query: DROP TEMPORARY FUNCTION example_min
PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_min
POSTHOOK: query: DROP TEMPORARY FUNCTION example_min
POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_min
Modified:
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_min_n.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_min_n.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_min_n.q.out
(original)
+++
hive/branches/cbo/contrib/src/test/results/clientpositive/udaf_example_min_n.q.out
Fri Jul 25 00:38:23 2014
@@ -1,9 +1,9 @@
PREHOOK: query: CREATE TEMPORARY FUNCTION example_min_n AS
'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMinN'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_min_n
POSTHOOK: query: CREATE TEMPORARY FUNCTION example_min_n AS
'org.apache.hadoop.hive.contrib.udaf.example.UDAFExampleMinN'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_min_n
PREHOOK: query: EXPLAIN
SELECT example_min_n(substr(value,5),10),
example_min_n(IF(substr(value,5) < 250, NULL, substr(value,5)),10)
@@ -77,7 +77,7 @@ POSTHOOK: Input: default@src
[0.0,0.0,0.0,2.0,4.0,5.0,5.0,5.0,8.0,9.0]
[252.0,255.0,255.0,256.0,256.0,257.0,258.0,260.0,262.0,263.0]
PREHOOK: query: DROP TEMPORARY FUNCTION example_min_n
PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_min_n
POSTHOOK: query: DROP TEMPORARY FUNCTION example_min_n
POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_min_n
Modified:
hive/branches/cbo/contrib/src/test/results/clientpositive/udf_example_add.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/contrib/src/test/results/clientpositive/udf_example_add.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/contrib/src/test/results/clientpositive/udf_example_add.q.out
(original)
+++
hive/branches/cbo/contrib/src/test/results/clientpositive/udf_example_add.q.out
Fri Jul 25 00:38:23 2014
@@ -1,9 +1,9 @@
PREHOOK: query: CREATE TEMPORARY FUNCTION example_add AS
'org.apache.hadoop.hive.contrib.udf.example.UDFExampleAdd'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_add
POSTHOOK: query: CREATE TEMPORARY FUNCTION example_add AS
'org.apache.hadoop.hive.contrib.udf.example.UDFExampleAdd'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_add
PREHOOK: query: EXPLAIN
SELECT example_add(1, 2),
example_add(1, 2, 3),
@@ -81,7 +81,7 @@ POSTHOOK: Input: default@src
3 6 10 3.3000000000000003 6.6 11.0 10.4
PREHOOK: query: DROP TEMPORARY FUNCTION example_add
PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_add
POSTHOOK: query: DROP TEMPORARY FUNCTION example_add
POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_add
Modified:
hive/branches/cbo/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out
(original)
+++
hive/branches/cbo/contrib/src/test/results/clientpositive/udf_example_arraymapstruct.q.out
Fri Jul 25 00:38:23 2014
@@ -1,21 +1,21 @@
PREHOOK: query: CREATE TEMPORARY FUNCTION example_arraysum AS
'org.apache.hadoop.hive.contrib.udf.example.UDFExampleArraySum'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_arraysum
POSTHOOK: query: CREATE TEMPORARY FUNCTION example_arraysum AS
'org.apache.hadoop.hive.contrib.udf.example.UDFExampleArraySum'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_arraysum
PREHOOK: query: CREATE TEMPORARY FUNCTION example_mapconcat AS
'org.apache.hadoop.hive.contrib.udf.example.UDFExampleMapConcat'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_mapconcat
POSTHOOK: query: CREATE TEMPORARY FUNCTION example_mapconcat AS
'org.apache.hadoop.hive.contrib.udf.example.UDFExampleMapConcat'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_mapconcat
PREHOOK: query: CREATE TEMPORARY FUNCTION example_structprint AS
'org.apache.hadoop.hive.contrib.udf.example.UDFExampleStructPrint'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_structprint
POSTHOOK: query: CREATE TEMPORARY FUNCTION example_structprint AS
'org.apache.hadoop.hive.contrib.udf.example.UDFExampleStructPrint'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_structprint
PREHOOK: query: EXPLAIN
SELECT example_arraysum(lint), example_mapconcat(mstringstring),
example_structprint(lintstring[0])
FROM src_thrift
@@ -76,19 +76,19 @@ POSTHOOK: Input: default@src_thrift
NULL NULL NULL
PREHOOK: query: DROP TEMPORARY FUNCTION example_arraysum
PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_arraysum
POSTHOOK: query: DROP TEMPORARY FUNCTION example_arraysum
POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_arraysum
PREHOOK: query: DROP TEMPORARY FUNCTION example_mapconcat
PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_mapconcat
POSTHOOK: query: DROP TEMPORARY FUNCTION example_mapconcat
POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_mapconcat
PREHOOK: query: DROP TEMPORARY FUNCTION example_structprint
PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_structprint
POSTHOOK: query: DROP TEMPORARY FUNCTION example_structprint
POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_structprint
Modified:
hive/branches/cbo/contrib/src/test/results/clientpositive/udf_example_format.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/contrib/src/test/results/clientpositive/udf_example_format.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/contrib/src/test/results/clientpositive/udf_example_format.q.out
(original)
+++
hive/branches/cbo/contrib/src/test/results/clientpositive/udf_example_format.q.out
Fri Jul 25 00:38:23 2014
@@ -1,9 +1,9 @@
PREHOOK: query: CREATE TEMPORARY FUNCTION example_format AS
'org.apache.hadoop.hive.contrib.udf.example.UDFExampleFormat'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_format
POSTHOOK: query: CREATE TEMPORARY FUNCTION example_format AS
'org.apache.hadoop.hive.contrib.udf.example.UDFExampleFormat'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_format
PREHOOK: query: EXPLAIN
SELECT example_format("abc"),
example_format("%1$s", 1.1),
@@ -69,7 +69,7 @@ POSTHOOK: Input: default@src
abc 1.1 1.1 1.200000e+00 a 12 10
PREHOOK: query: DROP TEMPORARY FUNCTION example_format
PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: example_format
POSTHOOK: query: DROP TEMPORARY FUNCTION example_format
POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: example_format
Modified:
hive/branches/cbo/contrib/src/test/results/clientpositive/udf_row_sequence.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/contrib/src/test/results/clientpositive/udf_row_sequence.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/contrib/src/test/results/clientpositive/udf_row_sequence.q.out
(original)
+++
hive/branches/cbo/contrib/src/test/results/clientpositive/udf_row_sequence.q.out
Fri Jul 25 00:38:23 2014
@@ -13,11 +13,11 @@ POSTHOOK: type: DROPFUNCTION
PREHOOK: query: create temporary function row_sequence as
'org.apache.hadoop.hive.contrib.udf.UDFRowSequence'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: row_sequence
POSTHOOK: query: create temporary function row_sequence as
'org.apache.hadoop.hive.contrib.udf.UDFRowSequence'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: row_sequence
PREHOOK: query: DESCRIBE FUNCTION EXTENDED row_sequence
PREHOOK: type: DESCFUNCTION
POSTHOOK: query: DESCRIBE FUNCTION EXTENDED row_sequence
@@ -643,7 +643,7 @@ POSTHOOK: Input: default@src
119 false
PREHOOK: query: drop temporary function row_sequence
PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: row_sequence
POSTHOOK: query: drop temporary function row_sequence
POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: row_sequence
Modified:
hive/branches/cbo/contrib/src/test/results/clientpositive/udtf_explode2.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/contrib/src/test/results/clientpositive/udtf_explode2.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/contrib/src/test/results/clientpositive/udtf_explode2.q.out
(original)
+++
hive/branches/cbo/contrib/src/test/results/clientpositive/udtf_explode2.q.out
Fri Jul 25 00:38:23 2014
@@ -1,9 +1,9 @@
PREHOOK: query: CREATE TEMPORARY FUNCTION explode2 AS
'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFExplode2'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: explode2
POSTHOOK: query: CREATE TEMPORARY FUNCTION explode2 AS
'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFExplode2'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: explode2
PREHOOK: query: SELECT explode2(array(1,2,3)) AS (col1, col2) FROM src LIMIT 3
PREHOOK: type: QUERY
PREHOOK: Input: default@src
@@ -17,7 +17,7 @@ POSTHOOK: Input: default@src
3 3
PREHOOK: query: DROP TEMPORARY FUNCTION explode2
PREHOOK: type: DROPFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: explode2
POSTHOOK: query: DROP TEMPORARY FUNCTION explode2
POSTHOOK: type: DROPFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: explode2
Modified:
hive/branches/cbo/contrib/src/test/results/clientpositive/udtf_output_on_close.q.out
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/contrib/src/test/results/clientpositive/udtf_output_on_close.q.out?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/contrib/src/test/results/clientpositive/udtf_output_on_close.q.out
(original)
+++
hive/branches/cbo/contrib/src/test/results/clientpositive/udtf_output_on_close.q.out
Fri Jul 25 00:38:23 2014
@@ -1,9 +1,9 @@
PREHOOK: query: CREATE TEMPORARY FUNCTION udtfCount2 AS
'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFCount2'
PREHOOK: type: CREATEFUNCTION
-PREHOOK: Output: database:default
+PREHOOK: Output: udtfcount2
POSTHOOK: query: CREATE TEMPORARY FUNCTION udtfCount2 AS
'org.apache.hadoop.hive.contrib.udtf.example.GenericUDTFCount2'
POSTHOOK: type: CREATEFUNCTION
-POSTHOOK: Output: database:default
+POSTHOOK: Output: udtfcount2
PREHOOK: query: SELECT udtfCount2(key) AS count FROM src
PREHOOK: type: QUERY
PREHOOK: Input: default@src
Modified: hive/branches/cbo/data/conf/hive-site.xml
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/data/conf/hive-site.xml?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/data/conf/hive-site.xml (original)
+++ hive/branches/cbo/data/conf/hive-site.xml Fri Jul 25 00:38:23 2014
@@ -235,5 +235,9 @@
</property>
+<property>
+ <name>hive.fetch.task.conversion</name>
+ <value>minimal</value>
+</property>
</configuration>
Modified:
hive/branches/cbo/hbase-handler/src/java/org/apache/hadoop/hive/hbase/ColumnMappings.java
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/hbase-handler/src/java/org/apache/hadoop/hive/hbase/ColumnMappings.java?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/hbase-handler/src/java/org/apache/hadoop/hive/hbase/ColumnMappings.java
(original)
+++
hive/branches/cbo/hbase-handler/src/java/org/apache/hadoop/hive/hbase/ColumnMappings.java
Fri Jul 25 00:38:23 2014
@@ -285,8 +285,11 @@ public class ColumnMappings implements I
return columnsMapping;
}
+ /**
+ * Represents a mapping from a single Hive column to an HBase column
qualifier, column family or row key.
+ */
// todo use final fields
- static class ColumnMapping {
+ public static class ColumnMapping {
ColumnMapping() {
binaryStorage = new ArrayList<Boolean>(2);
@@ -305,6 +308,50 @@ public class ColumnMappings implements I
String qualifierPrefix;
byte[] qualifierPrefixBytes;
+ public String getColumnName() {
+ return columnName;
+ }
+
+ public TypeInfo getColumnType() {
+ return columnType;
+ }
+
+ public String getFamilyName() {
+ return familyName;
+ }
+
+ public String getQualifierName() {
+ return qualifierName;
+ }
+
+ public byte[] getFamilyNameBytes() {
+ return familyNameBytes;
+ }
+
+ public byte[] getQualifierNameBytes() {
+ return qualifierNameBytes;
+ }
+
+ public List<Boolean> getBinaryStorage() {
+ return binaryStorage;
+ }
+
+ public boolean isHbaseRowKey() {
+ return hbaseRowKey;
+ }
+
+ public String getMappingSpec() {
+ return mappingSpec;
+ }
+
+ public String getQualifierPrefix() {
+ return qualifierPrefix;
+ }
+
+ public byte[] getQualifierPrefixBytes() {
+ return qualifierPrefixBytes;
+ }
+
public boolean isCategory(ObjectInspector.Category category) {
return columnType.getCategory() == category;
}
Modified:
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
(original)
+++
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hadoop/hive/jdbc/TestJdbcDriver.java
Fri Jul 25 00:38:23 2014
@@ -18,8 +18,8 @@
package org.apache.hadoop.hive.jdbc;
-import static org.apache.hadoop.hive.ql.exec.ExplainTask.EXPL_COLUMN_NAME;
import static org.apache.hadoop.hive.conf.SystemVariables.SET_COLUMN_NAME;
+import static org.apache.hadoop.hive.ql.exec.ExplainTask.EXPL_COLUMN_NAME;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
@@ -1158,7 +1158,7 @@ public class TestJdbcDriver extends Test
assertEquals("", res.getString(4)); // column
assertEquals("hive_test_user", res.getString(5));
assertEquals("USER", res.getString(6));
- assertEquals("Select", res.getString(7));
+ assertEquals("SELECT", res.getString(7));
assertEquals(false, res.getBoolean(8)); // grant option
assertEquals(-1, res.getLong(9));
assertNotNull(res.getString(10)); // grantor
Modified:
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestAuthorizationApiAuthorizer.java
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestAuthorizationApiAuthorizer.java?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestAuthorizationApiAuthorizer.java
(original)
+++
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestAuthorizationApiAuthorizer.java
Fri Jul 25 00:38:23 2014
@@ -123,7 +123,7 @@ public abstract class TestAuthorizationA
FunctionInvoker invoker = new FunctionInvoker() {
@Override
public void invoke() throws Exception {
- msc.revoke_privileges(new PrivilegeBag(new
ArrayList<HiveObjectPrivilege>()));
+ msc.revoke_privileges(new PrivilegeBag(new
ArrayList<HiveObjectPrivilege>()), false);
}
};
testFunction(invoker);
Modified:
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/FolderPermissionBase.java
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/FolderPermissionBase.java?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/FolderPermissionBase.java
(original)
+++
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/security/FolderPermissionBase.java
Fri Jul 25 00:38:23 2014
@@ -37,7 +37,6 @@ import org.apache.hadoop.hive.ql.process
import org.apache.hadoop.hive.ql.session.SessionState;
import org.apache.hadoop.hive.shims.HadoopShims.MiniDFSShim;
import org.apache.hadoop.hive.shims.ShimLoader;
-import org.junit.BeforeClass;
import org.junit.Test;
/**
@@ -97,7 +96,6 @@ public abstract class FolderPermissionBa
SessionState.start(new CliSessionState(conf));
driver = new Driver(conf);
-
setupDataTable();
}
@@ -117,9 +115,53 @@ public abstract class FolderPermissionBa
}
@Test
- public void testCreateTable() throws Exception {
+ public void testCreateDb() throws Exception {
+ //see if db inherits permission from warehouse directory.
String testDb = "mydb";
String tableName = "createtable";
+
+ setPermission(warehouseDir.toString());
+ verifyPermission(warehouseDir.toString());
+
+ CommandProcessorResponse ret = driver.run("CREATE DATABASE " + testDb);
+ Assert.assertEquals(0,ret.getResponseCode());
+
+ assertExistence(warehouseDir + "/" + testDb + ".db");
+ verifyPermission(warehouseDir + "/" + testDb + ".db");
+
+ ret = driver.run("USE " + testDb);
+ Assert.assertEquals(0,ret.getResponseCode());
+
+ ret = driver.run("CREATE TABLE " + tableName + " (key string, value
string)");
+ Assert.assertEquals(0,ret.getResponseCode());
+
+ verifyPermission(warehouseDir + "/" + testDb + ".db/" + tableName);
+
+ ret = driver.run("insert into table " + tableName + " select key,value
from default.mysrc");
+ Assert.assertEquals(0,ret.getResponseCode());
+
+ assertExistence(warehouseDir + "/" + testDb + ".db/" + tableName);
+ verifyPermission(warehouseDir + "/" + testDb + ".db/" + tableName);
+
+ Assert.assertTrue(listStatus(warehouseDir + "/" + testDb + ".db/" +
tableName).size() > 0);
+ for (String child : listStatus(warehouseDir + "/" + testDb + ".db/" +
tableName)) {
+ verifyPermission(child);
+ }
+
+ ret = driver.run("USE default");
+ Assert.assertEquals(0,ret.getResponseCode());
+
+ //cleanup after the test.
+ fs.delete(warehouseDir, true);
+ fs.mkdirs(warehouseDir);
+ Assert.assertEquals(listStatus(warehouseDir.toString()).size(), 0);
+ setupDataTable();
+ }
+
+ @Test
+ public void testCreateTable() throws Exception {
+ String testDb = "mydb2";
+ String tableName = "createtable";
CommandProcessorResponse ret = driver.run("CREATE DATABASE " + testDb);
Assert.assertEquals(0,ret.getResponseCode());
Modified:
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
(original)
+++
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestJdbcDriver2.java
Fri Jul 25 00:38:23 2014
@@ -18,8 +18,8 @@
package org.apache.hive.jdbc;
-import static org.apache.hadoop.hive.ql.exec.ExplainTask.EXPL_COLUMN_NAME;
import static org.apache.hadoop.hive.conf.SystemVariables.SET_COLUMN_NAME;
+import static org.apache.hadoop.hive.ql.exec.ExplainTask.EXPL_COLUMN_NAME;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -53,7 +53,6 @@ import org.apache.hadoop.hive.conf.HiveC
import org.apache.hadoop.hive.metastore.TableType;
import org.apache.hadoop.hive.ql.exec.UDF;
import org.apache.hadoop.hive.ql.processors.DfsProcessor;
-import org.apache.hadoop.hive.ql.processors.SetProcessor;
import org.apache.hive.common.util.HiveVersionInfo;
import org.apache.hive.jdbc.Utils.JdbcConnectionParams;
import org.apache.hive.service.cli.operation.ClassicTableTypeMapping;
@@ -276,22 +275,22 @@ public class TestJdbcDriver2 {
Statement s = this.con.createStatement();
ResultSet rs = s.executeQuery("SELECT * FROM " + dataTypeTableName);
- rs.close();
- s.close();
-
assertTrue(s.getConnection() == this.con);
assertTrue(rs.getStatement() == s);
+ rs.close();
+ s.close();
+
/* Test parent references from PreparedStatement */
PreparedStatement ps = this.con.prepareStatement("SELECT * FROM " +
dataTypeTableName);
rs = ps.executeQuery();
- rs.close();
- ps.close();
-
assertTrue(ps.getConnection() == this.con);
assertTrue(rs.getStatement() == ps);
+ rs.close();
+ ps.close();
+
/* Test DatabaseMetaData queries which do not have a parent Statement */
DatabaseMetaData md = this.con.getMetaData();
@@ -1997,7 +1996,7 @@ public class TestJdbcDriver2 {
assertEquals("", res.getString(4)); // column
assertEquals("hive_test_user", res.getString(5));
assertEquals("USER", res.getString(6));
- assertEquals("Select", res.getString(7));
+ assertEquals("SELECT", res.getString(7));
assertEquals(false, res.getBoolean(8)); // grant option
assertEquals(-1, res.getLong(9));
assertNotNull(res.getString(10)); // grantor
Modified:
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hive/jdbc/authorization/TestJdbcWithSQLAuthorization.java
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hive/jdbc/authorization/TestJdbcWithSQLAuthorization.java?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hive/jdbc/authorization/TestJdbcWithSQLAuthorization.java
(original)
+++
hive/branches/cbo/itests/hive-unit/src/test/java/org/apache/hive/jdbc/authorization/TestJdbcWithSQLAuthorization.java
Fri Jul 25 00:38:23 2014
@@ -125,12 +125,14 @@ public class TestJdbcWithSQLAuthorizatio
// create tables
try {
stmt.execute("dfs -ls /tmp/");
- } catch (SQLException e){
+ } catch (SQLException e) {
caughtException = true;
- assertTrue("Checking error message content",
- e.getMessage().contains("Insufficient privileges to execute"));
- }
- finally {
+ String msg = "Permission denied: Principal [name=user1, type=USER]
does not have "
+ + "following privileges for operation DFS [[ADMIN PRIVILEGE] on "
+ + "Object [type=COMMAND_PARAMS, name=[-ls, /tmp/]]]";
+ assertTrue("Checking content of error message:" + e.getMessage(),
+ e.getMessage().contains(msg));
+ } finally {
stmt.close();
hs2Conn.close();
}
Modified: hive/branches/cbo/itests/qtest/testconfiguration.properties
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/itests/qtest/testconfiguration.properties?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
--- hive/branches/cbo/itests/qtest/testconfiguration.properties (original)
+++ hive/branches/cbo/itests/qtest/testconfiguration.properties Fri Jul 25
00:38:23 2014
@@ -1,5 +1,5 @@
minimr.query.files=stats_counter_partitioned.q,list_bucket_dml_10.q,input16_cc.q,scriptfile1.q,scriptfile1_win.q,bucket4.q,bucketmapjoin6.q,disable_merge_for_bucketing.q,reduce_deduplicate.q,smb_mapjoin_8.q,join1.q,groupby2.q,bucketizedhiveinputformat.q,bucketmapjoin7.q,optrstat_groupby.q,bucket_num_reducers.q,bucket5.q,load_fs2.q,bucket_num_reducers2.q,infer_bucket_sort_merge.q,infer_bucket_sort_reducers_power_two.q,infer_bucket_sort_dyn_part.q,infer_bucket_sort_bucketed_table.q,infer_bucket_sort_map_operators.q,infer_bucket_sort_num_buckets.q,leftsemijoin_mr.q,schemeAuthority.q,schemeAuthority2.q,truncate_column_buckets.q,remote_script.q,,load_hdfs_file_with_space_in_the_name.q,parallel_orderby.q,import_exported_table.q,stats_counter.q,auto_sortmerge_join_16.q,quotedid_smb.q,file_with_header_footer.q,external_table_with_space_in_location_path.q,root_dir_external_table.q,index_bitmap3.q,ql_rewrite_gbtoidx.q,index_bitmap_auto.q,udf_using.q,empty_dir_in_table.q,temp_table_external.q
minimr.query.negative.files=cluster_tasklog_retrieval.q,minimr_broken_pipe.q,mapreduce_stack_trace.q,mapreduce_stack_trace_turnoff.q,mapreduce_stack_trace_hadoop20.q,mapreduce_stack_trace_turnoff_hadoop20.q,file_with_header_footer_negative.q,udf_local_resource.q
minitez.query.files=tez_fsstat.q,mapjoin_decimal.q,tez_join_tests.q,tez_joins_explain.q,mrr.q,tez_dml.q,tez_insert_overwrite_local_directory_1.q,tez_union.q,bucket_map_join_tez1.q,bucket_map_join_tez2.q,tez_schema_evolution.q,tez_join_hash.q
-minitez.query.files.shared=cross_product_check_1.q,cross_product_check_2.q,dynpart_sort_opt_vectorization.q,dynpart_sort_optimization.q,orc_analyze.q,join0.q,join1.q,auto_join0.q,auto_join1.q,bucket2.q,bucket3.q,bucket4.q,count.q,create_merge_compressed.q,cross_join.q,ctas.q,custom_input_output_format.q,disable_merge_for_bucketing.q,enforce_order.q,filter_join_breaktask.q,filter_join_breaktask2.q,groupby1.q,groupby2.q,groupby3.q,having.q,insert1.q,insert_into1.q,insert_into2.q,leftsemijoin.q,limit_pushdown.q,load_dyn_part1.q,load_dyn_part2.q,load_dyn_part3.q,mapjoin_mapjoin.q,mapreduce1.q,mapreduce2.q,merge1.q,merge2.q,metadata_only_queries.q,sample1.q,subquery_in.q,subquery_exists.q,vectorization_15.q,ptf.q,stats_counter.q,stats_noscan_1.q,stats_counter_partitioned.q,union2.q,union3.q,union4.q,union5.q,union6.q,union7.q,union8.q,union9.q,transform1.q,transform2.q,transform_ppr1.q,transform_ppr2.q,script_env_var1.q,script_env_var2.q,script_pipe.q,scriptfile1.q,metadataonly1.q,temp_t
able.q,vectorized_ptf.q,cbo_correctness.q
+minitez.query.files.shared=cross_product_check_1.q,cross_product_check_2.q,dynpart_sort_opt_vectorization.q,dynpart_sort_optimization.q,orc_analyze.q,join0.q,join1.q,auto_join0.q,auto_join1.q,bucket2.q,bucket3.q,bucket4.q,count.q,create_merge_compressed.q,cross_join.q,ctas.q,custom_input_output_format.q,disable_merge_for_bucketing.q,enforce_order.q,filter_join_breaktask.q,filter_join_breaktask2.q,groupby1.q,groupby2.q,groupby3.q,having.q,insert1.q,insert_into1.q,insert_into2.q,leftsemijoin.q,limit_pushdown.q,load_dyn_part1.q,load_dyn_part2.q,load_dyn_part3.q,mapjoin_mapjoin.q,mapreduce1.q,mapreduce2.q,merge1.q,merge2.q,metadata_only_queries.q,sample1.q,subquery_in.q,subquery_exists.q,vectorization_15.q,ptf.q,stats_counter.q,stats_noscan_1.q,stats_counter_partitioned.q,union2.q,union3.q,union4.q,union5.q,union6.q,union7.q,union8.q,union9.q,transform1.q,transform2.q,transform_ppr1.q,transform_ppr2.q,script_env_var1.q,script_env_var2.q,script_pipe.q,scriptfile1.q,metadataonly1.q,temp_t
able.q,vectorized_ptf.q,optimize_nullscan.q,vector_cast_constant.q,cbo_correctness.q
beeline.positive.exclude=add_part_exist.q,alter1.q,alter2.q,alter4.q,alter5.q,alter_rename_partition.q,alter_rename_partition_authorization.q,archive.q,archive_corrupt.q,archive_multi.q,archive_mr_1806.q,archive_multi_mr_1806.q,authorization_1.q,authorization_2.q,authorization_4.q,authorization_5.q,authorization_6.q,authorization_7.q,ba_table1.q,ba_table2.q,ba_table3.q,ba_table_udfs.q,binary_table_bincolserde.q,binary_table_colserde.q,cluster.q,columnarserde_create_shortcut.q,combine2.q,constant_prop.q,create_nested_type.q,create_or_replace_view.q,create_struct_table.q,create_union_table.q,database.q,database_location.q,database_properties.q,ddltime.q,describe_database_json.q,drop_database_removes_partition_dirs.q,escape1.q,escape2.q,exim_00_nonpart_empty.q,exim_01_nonpart.q,exim_02_00_part_empty.q,exim_02_part.q,exim_03_nonpart_over_compat.q,exim_04_all_part.q,exim_04_evolved_parts.q,exim_05_some_part.q,exim_06_one_part.q,exim_07_all_part_over_nonoverlap.q,exim_08_nonpart_rename.q,
exim_09_part_spec_nonoverlap.q,exim_10_external_managed.q,exim_11_managed_external.q,exim_12_external_location.q,exim_13_managed_location.q,exim_14_managed_location_over_existing.q,exim_15_external_part.q,exim_16_part_external.q,exim_17_part_managed.q,exim_18_part_external.q,exim_19_00_part_external_location.q,exim_19_part_external_location.q,exim_20_part_managed_location.q,exim_21_export_authsuccess.q,exim_22_import_exist_authsuccess.q,exim_23_import_part_authsuccess.q,exim_24_import_nonexist_authsuccess.q,global_limit.q,groupby_complex_types.q,groupby_complex_types_multi_single_reducer.q,index_auth.q,index_auto.q,index_auto_empty.q,index_bitmap.q,index_bitmap1.q,index_bitmap2.q,index_bitmap3.q,index_bitmap_auto.q,index_bitmap_rc.q,index_compact.q,index_compact_1.q,index_compact_2.q,index_compact_3.q,index_stale_partitioned.q,init_file.q,input16.q,input16_cc.q,input46.q,input_columnarserde.q,input_dynamicserde.q,input_lazyserde.q,input_testxpath3.q,input_testxpath4.q,insert2_overwr
ite_partitions.q,insertexternal1.q,join_thrift.q,lateral_view.q,load_binary_data.q,load_exist_part_authsuccess.q,load_nonpart_authsuccess.q,load_part_authsuccess.q,loadpart_err.q,lock1.q,lock2.q,lock3.q,lock4.q,merge_dynamic_partition.q,multi_insert.q,multi_insert_move_tasks_share_dependencies.q,null_column.q,ppd_clusterby.q,query_with_semi.q,rename_column.q,sample6.q,sample_islocalmode_hook.q,set_processor_namespaces.q,show_tables.q,source.q,split_sample.q,str_to_map.q,transform1.q,udaf_collect_set.q,udaf_context_ngrams.q,udaf_histogram_numeric.q,udaf_ngrams.q,udaf_percentile_approx.q,udf_array.q,udf_bitmap_and.q,udf_bitmap_or.q,udf_explode.q,udf_format_number.q,udf_map.q,udf_map_keys.q,udf_map_values.q,udf_max.q,udf_min.q,udf_named_struct.q,udf_percentile.q,udf_printf.q,udf_sentences.q,udf_sort_array.q,udf_split.q,udf_struct.q,udf_substr.q,udf_translate.q,udf_union.q,udf_xpath.q,udtf_stack.q,view.q,virtual_column.q
Modified:
hive/branches/cbo/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessControllerForTest.java
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessControllerForTest.java?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessControllerForTest.java
(original)
+++
hive/branches/cbo/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessControllerForTest.java
Fri Jul 25 00:38:23 2014
@@ -19,11 +19,9 @@ package org.apache.hadoop.hive.ql.securi
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.hive.conf.HiveConf;
-import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
import org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider;
import
org.apache.hadoop.hive.ql.security.authorization.plugin.HiveAuthzPluginException;
import
org.apache.hadoop.hive.ql.security.authorization.plugin.HiveMetastoreClientFactory;
-import
org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAccessController;
/**
* Extends SQLStdHiveAccessController to relax the restriction of not being
able to run dfs
@@ -43,9 +41,6 @@ public class SQLStdHiveAccessControllerF
public void applyAuthorizationConfigPolicy(HiveConf hiveConf) {
super.applyAuthorizationConfigPolicy(hiveConf);
- // allow set and dfs commands
- hiveConf.setVar(ConfVars.HIVE_SECURITY_COMMAND_WHITELIST, "set,dfs");
-
// remove restrictions on the variables that can be set using set command
hiveConf.setIsModWhiteListEnabled(false);
Modified:
hive/branches/cbo/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizerFactoryForTest.java
URL:
http://svn.apache.org/viewvc/hive/branches/cbo/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizerFactoryForTest.java?rev=1613335&r1=1613334&r2=1613335&view=diff
==============================================================================
---
hive/branches/cbo/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizerFactoryForTest.java
(original)
+++
hive/branches/cbo/itests/util/src/main/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAuthorizerFactoryForTest.java
Fri Jul 25 00:38:23 2014
@@ -35,7 +35,7 @@ public class SQLStdHiveAuthorizerFactory
new SQLStdHiveAccessControllerForTest(metastoreClientFactory, conf,
authenticator);
return new HiveAuthorizerImpl(
privilegeManager,
- new SQLStdHiveAuthorizationValidator(metastoreClientFactory, conf,
authenticator,
+ new SQLStdHiveAuthorizationValidatorForTest(metastoreClientFactory,
conf, authenticator,
privilegeManager)
);
}
