This is an automated email from the ASF dual-hosted git repository.
ngangam pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
commit d66d5fc3480815fb39fad33f484a6a03119e2bf3
Author: Naveen Gangam <ngan...@cloudera.com>
AuthorDate: Tue Nov 24 00:16:49 2020 -0500
fix for 2 additional test failures
---
.../plugin/sqlstd/Operation2Privilege.java | 8 +
.../results/clientpositive/dataconnector.q.out | 205 ---------------------
2 files changed, 8 insertions(+), 205 deletions(-)
diff --git
a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java
b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java
index 3a10a06..2b9c7ab 100644
---
a/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java
+++
b/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/Operation2Privilege.java
@@ -442,6 +442,14 @@ public class Operation2Privilege {
op2Priv.put(HiveOperationType.CREATE_MAPPING,
PrivRequirement.newIOPrivRequirement(null, null));
op2Priv.put(HiveOperationType.ALTER_MAPPING,
PrivRequirement.newIOPrivRequirement(null, null));
op2Priv.put(HiveOperationType.DROP_MAPPING,
PrivRequirement.newIOPrivRequirement(null, null));
+
+ op2Priv.put(HiveOperationType.CREATEDATACONNECTOR,
PrivRequirement.newIOPrivRequirement(null, ADMIN_PRIV_AR));
+ op2Priv.put(HiveOperationType.DROPDATACONNECTOR,
PrivRequirement.newIOPrivRequirement(null, ADMIN_PRIV_AR));
+ op2Priv.put(HiveOperationType.ALTERDATACONNECTOR,
PrivRequirement.newIOPrivRequirement(null, ADMIN_PRIV_AR));
+ op2Priv.put(HiveOperationType.ALTERDATACONNECTOR_OWNER,
PrivRequirement.newIOPrivRequirement(null, ADMIN_PRIV_AR));
+ op2Priv.put(HiveOperationType.ALTERDATACONNECTOR_URL,
PrivRequirement.newIOPrivRequirement(null, ADMIN_PRIV_AR));
+ op2Priv.put(HiveOperationType.DESCDATACONNECTOR,
PrivRequirement.newIOPrivRequirement(null, null));
+ op2Priv.put(HiveOperationType.SHOWDATACONNECTORS,
PrivRequirement.newIOPrivRequirement(null, null));
}
/**
diff --git a/ql/src/test/results/clientpositive/dataconnector.q.out
b/ql/src/test/results/clientpositive/dataconnector.q.out
deleted file mode 100644
index 8b678c2..0000000
--- a/ql/src/test/results/clientpositive/dataconnector.q.out
+++ /dev/null
@@ -1,205 +0,0 @@
-PREHOOK: query: SHOW CONNECTORS
-PREHOOK: type: SHOWDATACONNECTORS
-POSTHOOK: query: SHOW CONNECTORS
-POSTHOOK: type: SHOWDATACONNECTORS
-PREHOOK: query: CREATE CONNECTOR mysql_test
-TYPE 'mysql'
-URL 'jdbc:mysql://nightly1.apache.org:3306/hive1'
-COMMENT 'test connector'
-WITH DCPROPERTIES (
-"hive.sql.dbcp.username"="hive1",
-"hive.sql.dbcp.password"="hive1")
-PREHOOK: type: CREATEDATACONNECTOR
-PREHOOK: Output: connector:mysql_test
-POSTHOOK: query: CREATE CONNECTOR mysql_test
-TYPE 'mysql'
-URL 'jdbc:mysql://nightly1.apache.org:3306/hive1'
-COMMENT 'test connector'
-WITH DCPROPERTIES (
-"hive.sql.dbcp.username"="hive1",
-"hive.sql.dbcp.password"="hive1")
-POSTHOOK: type: CREATEDATACONNECTOR
-POSTHOOK: Output: connector:mysql_test
-PREHOOK: query: SHOW CONNECTORS
-PREHOOK: type: SHOWDATACONNECTORS
-POSTHOOK: query: SHOW CONNECTORS
-POSTHOOK: type: SHOWDATACONNECTORS
-mysql_test
-PREHOOK: query: CREATE CONNECTOR IF NOT EXISTS mysql_test
-TYPE 'mysql'
-URL 'jdbc:mysql://nightly1.apache.org:3306/hive1'
-COMMENT 'test connector'
-WITH DCPROPERTIES (
-"hive.sql.dbcp.username"="hive1",
-"hive.sql.dbcp.password"="hive1")
-PREHOOK: type: CREATEDATACONNECTOR
-PREHOOK: Output: connector:mysql_test
-POSTHOOK: query: CREATE CONNECTOR IF NOT EXISTS mysql_test
-TYPE 'mysql'
-URL 'jdbc:mysql://nightly1.apache.org:3306/hive1'
-COMMENT 'test connector'
-WITH DCPROPERTIES (
-"hive.sql.dbcp.username"="hive1",
-"hive.sql.dbcp.password"="hive1")
-POSTHOOK: type: CREATEDATACONNECTOR
-POSTHOOK: Output: connector:mysql_test
-PREHOOK: query: SHOW CONNECTORS
-PREHOOK: type: SHOWDATACONNECTORS
-POSTHOOK: query: SHOW CONNECTORS
-POSTHOOK: type: SHOWDATACONNECTORS
-mysql_test
-PREHOOK: query: CREATE CONNECTOR IF NOT EXISTS derby_test
-TYPE 'derby'
-#### A masked pattern was here ####
-COMMENT 'test derby connector'
-WITH DCPROPERTIES (
-"hive.sql.dbcp.username"="APP",
-"hive.sql.dbcp.password"="mine")
-PREHOOK: type: CREATEDATACONNECTOR
-PREHOOK: Output: connector:derby_test
-POSTHOOK: query: CREATE CONNECTOR IF NOT EXISTS derby_test
-TYPE 'derby'
-#### A masked pattern was here ####
-COMMENT 'test derby connector'
-WITH DCPROPERTIES (
-"hive.sql.dbcp.username"="APP",
-"hive.sql.dbcp.password"="mine")
-POSTHOOK: type: CREATEDATACONNECTOR
-POSTHOOK: Output: connector:derby_test
-PREHOOK: query: DROP CONNECTOR mysql_test
-PREHOOK: type: DROPDATACONNECTOR
-PREHOOK: Input: connector:mysql_test
-PREHOOK: Output: connector:mysql_test
-POSTHOOK: query: DROP CONNECTOR mysql_test
-POSTHOOK: type: DROPDATACONNECTOR
-POSTHOOK: Input: connector:mysql_test
-POSTHOOK: Output: connector:mysql_test
-PREHOOK: query: SHOW CONNECTORS
-PREHOOK: type: SHOWDATACONNECTORS
-POSTHOOK: query: SHOW CONNECTORS
-POSTHOOK: type: SHOWDATACONNECTORS
-derby_test
-PREHOOK: query: DROP CONNECTOR IF EXISTS mysql_test
-PREHOOK: type: DROPDATACONNECTOR
-POSTHOOK: query: DROP CONNECTOR IF EXISTS mysql_test
-POSTHOOK: type: DROPDATACONNECTOR
-PREHOOK: query: SHOW CONNECTORS
-PREHOOK: type: SHOWDATACONNECTORS
-POSTHOOK: query: SHOW CONNECTORS
-POSTHOOK: type: SHOWDATACONNECTORS
-derby_test
-PREHOOK: query: CREATE CONNECTOR mysql_test
-TYPE 'mysql'
-URL 'jdbc:mysql://nightly1.apache.org:3306/hive1'
-COMMENT 'test connector'
-WITH DCPROPERTIES (
-"hive.sql.dbcp.username"="hive1",
-"hive.sql.dbcp.password"="hive1")
-PREHOOK: type: CREATEDATACONNECTOR
-PREHOOK: Output: connector:mysql_test
-POSTHOOK: query: CREATE CONNECTOR mysql_test
-TYPE 'mysql'
-URL 'jdbc:mysql://nightly1.apache.org:3306/hive1'
-COMMENT 'test connector'
-WITH DCPROPERTIES (
-"hive.sql.dbcp.username"="hive1",
-"hive.sql.dbcp.password"="hive1")
-POSTHOOK: type: CREATEDATACONNECTOR
-POSTHOOK: Output: connector:mysql_test
-PREHOOK: query: SHOW CONNECTORS
-PREHOOK: type: SHOWDATACONNECTORS
-POSTHOOK: query: SHOW CONNECTORS
-POSTHOOK: type: SHOWDATACONNECTORS
-derby_test
-mysql_test
-PREHOOK: query: CREATE REMOTE DATABASE db_derby USING derby_test with
DBPROPERTIES("connector.remoteDbName"="APP")
-PREHOOK: type: CREATEDATABASE
-PREHOOK: Output: database:db_derby
-#### A masked pattern was here ####
-POSTHOOK: query: CREATE REMOTE DATABASE db_derby USING derby_test with
DBPROPERTIES("connector.remoteDbName"="APP")
-POSTHOOK: type: CREATEDATABASE
-POSTHOOK: Output: database:db_derby
-#### A masked pattern was here ####
-PREHOOK: query: SHOW DATABASES
-PREHOOK: type: SHOWDATABASES
-POSTHOOK: query: SHOW DATABASES
-POSTHOOK: type: SHOWDATABASES
-db_derby
-default
-PREHOOK: query: USE db_derby
-PREHOOK: type: SWITCHDATABASE
-PREHOOK: Input: database:db_derby
-POSTHOOK: query: USE db_derby
-POSTHOOK: type: SWITCHDATABASE
-POSTHOOK: Input: database:db_derby
-PREHOOK: query: SHOW TABLES
-PREHOOK: type: SHOWTABLES
-PREHOOK: Input: database:db_derby
-POSTHOOK: query: SHOW TABLES
-POSTHOOK: type: SHOWTABLES
-POSTHOOK: Input: database:db_derby
-PREHOOK: query: alter connector mysql_test set URL
'jdbc:mysql://nightly1.apache.org:3306/hive2'
-PREHOOK: type: ALTERDATACONNECTOR_
-PREHOOK: Output: connector:mysql_test
-POSTHOOK: query: alter connector mysql_test set URL
'jdbc:mysql://nightly1.apache.org:3306/hive2'
-POSTHOOK: type: ALTERDATACONNECTOR_
-POSTHOOK: Output: connector:mysql_test
-PREHOOK: query: DESCRIBE CONNECTOR extended mysql_test
-PREHOOK: type: DESCDATACONNECTOR
-PREHOOK: Input: connector:mysql_test
-POSTHOOK: query: DESCRIBE CONNECTOR extended mysql_test
-POSTHOOK: type: DESCDATACONNECTOR
-POSTHOOK: Input: connector:mysql_test
-mysql_test mysql jdbc:mysql://nightly1.apache.org:3306/hive2
hive_test_user USER test connector {hive.sql.dbcp.password=hive1,
hive.sql.dbcp.username=hive1}
-PREHOOK: query: alter connector mysql_test set
DCPROPERTIES("hive.sql.dbcp.username"="hive2","hive.sql.dbcp.password"="hive2")
-PREHOOK: type: ALTERDATACONNECTOR
-PREHOOK: Output: connector:mysql_test
-POSTHOOK: query: alter connector mysql_test set
DCPROPERTIES("hive.sql.dbcp.username"="hive2","hive.sql.dbcp.password"="hive2")
-POSTHOOK: type: ALTERDATACONNECTOR
-POSTHOOK: Output: connector:mysql_test
-PREHOOK: query: DESCRIBE CONNECTOR extended mysql_test
-PREHOOK: type: DESCDATACONNECTOR
-PREHOOK: Input: connector:mysql_test
-POSTHOOK: query: DESCRIBE CONNECTOR extended mysql_test
-POSTHOOK: type: DESCDATACONNECTOR
-POSTHOOK: Input: connector:mysql_test
-mysql_test mysql jdbc:mysql://nightly1.apache.org:3306/hive2
hive_test_user USER test connector {hive.sql.dbcp.password=hive2,
hive.sql.dbcp.username=hive2}
-PREHOOK: query: alter connector mysql_test set OWNER USER newuser
-PREHOOK: type: ALTERDATABASE_OWNER
-PREHOOK: Output: connector:mysql_test
-POSTHOOK: query: alter connector mysql_test set OWNER USER newuser
-POSTHOOK: type: ALTERDATABASE_OWNER
-POSTHOOK: Output: connector:mysql_test
-PREHOOK: query: DESCRIBE CONNECTOR extended mysql_test
-PREHOOK: type: DESCDATACONNECTOR
-PREHOOK: Input: connector:mysql_test
-POSTHOOK: query: DESCRIBE CONNECTOR extended mysql_test
-POSTHOOK: type: DESCDATACONNECTOR
-POSTHOOK: Input: connector:mysql_test
-mysql_test mysql jdbc:mysql://nightly1.apache.org:3306/hive2 newuser
USER test connector {hive.sql.dbcp.password=hive2,
hive.sql.dbcp.username=hive2}
-PREHOOK: query: DROP DATABASE db_derby
-PREHOOK: type: DROPDATABASE
-PREHOOK: Input: database:db_derby
-PREHOOK: Output: database:db_derby
-POSTHOOK: query: DROP DATABASE db_derby
-POSTHOOK: type: DROPDATABASE
-POSTHOOK: Input: database:db_derby
-POSTHOOK: Output: database:db_derby
-PREHOOK: query: SHOW DATABASES
-PREHOOK: type: SHOWDATABASES
-POSTHOOK: query: SHOW DATABASES
-POSTHOOK: type: SHOWDATABASES
-default
-PREHOOK: query: DROP CONNECTOR mysql_test
-PREHOOK: type: DROPDATACONNECTOR
-PREHOOK: Input: connector:mysql_test
-PREHOOK: Output: connector:mysql_test
-POSTHOOK: query: DROP CONNECTOR mysql_test
-POSTHOOK: type: DROPDATACONNECTOR
-POSTHOOK: Input: connector:mysql_test
-POSTHOOK: Output: connector:mysql_test
-PREHOOK: query: SHOW CONNECTORS
-PREHOOK: type: SHOWDATACONNECTORS
-POSTHOOK: query: SHOW CONNECTORS
-POSTHOOK: type: SHOWDATACONNECTORS
-derby_test
