Author: thejas
Date: Thu Jul 31 16:10:43 2014
New Revision: 1614929
URL: http://svn.apache.org/r1614929
Log:
HIVE-6437 : DefaultHiveAuthorizationProvider should not initialize a new
HiveConf (Navis via Thejas Nair)
Added:
hive/trunk/contrib/src/test/queries/clientpositive/url_hook.q
hive/trunk/contrib/src/test/results/clientpositive/url_hook.q.out
Removed:
hive/trunk/contrib/src/test/queries/clientnegative/url_hook.q
hive/trunk/contrib/src/test/results/clientnegative/url_hook.q.out
Modified:
hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/metastore/hooks/TestURLHook.java
hive/trunk/data/conf/hive-site.xml
hive/trunk/itests/hive-unit/src/main/java/org/apache/hive/jdbc/miniHS2/MiniHS2.java
hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java
hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/DefaultHiveAuthorizationProvider.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/StorageBasedAuthorizationProvider.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveRoleGrant.java
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessController.java
hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java
hive/trunk/ql/src/test/queries/clientnegative/authorization_cannot_create_all_role.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_cannot_create_default_role.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_cannot_create_none_role.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_caseinsensitivity.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_drop_db_cascade.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_drop_db_empty.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_drop_role_no_admin.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_priv_current_role_neg.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_cycles1.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_cycles2.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant2.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant_nosuchrole.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant_otherrole.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant_otheruser.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_rolehierarchy_privs.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_set_role_neg2.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otherrole.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_all.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_alltabs.q
hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_wtab.q
hive/trunk/ql/src/test/queries/clientpositive/authorization_1_sql_std.q
hive/trunk/ql/src/test/queries/clientpositive/authorization_admin_almighty1.q
hive/trunk/ql/src/test/queries/clientpositive/authorization_admin_almighty2.q
hive/trunk/ql/src/test/queries/clientpositive/authorization_create_func1.q
hive/trunk/ql/src/test/queries/clientpositive/authorization_create_macro1.q
hive/trunk/ql/src/test/queries/clientpositive/authorization_insert.q
hive/trunk/ql/src/test/queries/clientpositive/authorization_owner_actions_db.q
hive/trunk/ql/src/test/queries/clientpositive/authorization_role_grant1.q
hive/trunk/ql/src/test/queries/clientpositive/authorization_role_grant2.q
hive/trunk/ql/src/test/queries/clientpositive/authorization_set_show_current_role.q
hive/trunk/ql/src/test/queries/clientpositive/authorization_show_grant.q
hive/trunk/ql/src/test/queries/clientpositive/authorization_view_sqlstd.q
Modified: hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL:
http://svn.apache.org/viewvc/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
--- hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
(original)
+++ hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Thu
Jul 31 16:10:43 2014
@@ -108,7 +108,6 @@ public class HiveConf extends Configurat
HiveConf.ConfVars.METASTOREPWD,
HiveConf.ConfVars.METASTORECONNECTURLHOOK,
HiveConf.ConfVars.METASTORECONNECTURLKEY,
- HiveConf.ConfVars.METASTOREFORCERELOADCONF,
HiveConf.ConfVars.METASTORESERVERMINTHREADS,
HiveConf.ConfVars.METASTORESERVERMAXTHREADS,
HiveConf.ConfVars.METASTORE_TCP_KEEP_ALIVE,
@@ -352,11 +351,6 @@ public class HiveConf extends Configurat
"jdbc:derby:;databaseName=metastore_db;create=true",
"JDBC connect string for a JDBC metastore"),
- METASTOREFORCERELOADCONF("hive.metastore.force.reload.conf", false,
- "Whether to force reloading of the metastore configuration
(including\n" +
- "the connection URL, before the next metastore query that accesses
the\n" +
- "datastore. Once reloaded, this value is reset to false. Used for\n" +
- "testing only."),
HMSHANDLERATTEMPTS("hive.hmshandler.retry.attempts", 1,
"The number of times to retry a HMSHandler call if there were a
connection error"),
HMSHANDLERINTERVAL("hive.hmshandler.retry.interval", 1000,
@@ -1556,7 +1550,7 @@ public class HiveConf extends Configurat
"Comma separated list of non-SQL Hive commands users are authorized to
execute"),
HIVE_CONF_RESTRICTED_LIST("hive.conf.restricted.list",
-
"hive.security.authenticator.manager,hive.security.authorization.manager",
+
"hive.security.authenticator.manager,hive.security.authorization.manager,hive.users.in.admin.role",
"Comma separated list of configuration options which are immutable at
runtime"),
// If this is set all move tasks at the end of a multi-insert query will
only begin once all
@@ -1677,7 +1671,9 @@ public class HiveConf extends Configurat
" none: default(past) behavior. Implies only alphaNumeric and
underscore are valid characters in identifiers.\n" +
" column: implies column names can contain any character."
),
- USERS_IN_ADMIN_ROLE("hive.users.in.admin.role", "",
+
+ // role names are case-insensitive
+ USERS_IN_ADMIN_ROLE("hive.users.in.admin.role", "", false,
"Comma separated list of users who are in admin role for
bootstrapping.\n" +
"More users can be added in ADMIN role later."),
@@ -1723,25 +1719,31 @@ public class HiveConf extends Configurat
private final String description;
private final boolean excluded;
+ private final boolean caseSensitive;
ConfVars(String varname, Object defaultVal, String description) {
- this(varname, defaultVal, null, description, false);
+ this(varname, defaultVal, null, description, true, false);
}
ConfVars(String varname, Object defaultVal, String description, boolean
excluded) {
- this(varname, defaultVal, null, description, excluded);
+ this(varname, defaultVal, null, description, true, excluded);
+ }
+
+ ConfVars(String varname, String defaultVal, boolean caseSensitive, String
description) {
+ this(varname, defaultVal, null, description, caseSensitive, false);
}
ConfVars(String varname, Object defaultVal, Validator validator, String
description) {
- this(varname, defaultVal, validator, description, false);
+ this(varname, defaultVal, validator, description, true, false);
}
- ConfVars(String varname, Object defaultVal, Validator validator, String
description, boolean excluded) {
+ ConfVars(String varname, Object defaultVal, Validator validator, String
description, boolean caseSensitive, boolean excluded) {
this.varname = varname;
this.validator = validator;
this.description = description;
this.defaultExpr = defaultVal == null ? null :
String.valueOf(defaultVal);
this.excluded = excluded;
+ this.caseSensitive = caseSensitive;
if (defaultVal == null || defaultVal instanceof String) {
this.valClass = String.class;
this.valType = VarType.STRING;
@@ -1808,6 +1810,10 @@ public class HiveConf extends Configurat
return excluded;
}
+ public boolean isCaseSensitive() {
+ return caseSensitive;
+ }
+
@Override
public String toString() {
return varname;
Modified:
hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/metastore/hooks/TestURLHook.java
URL:
http://svn.apache.org/viewvc/hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/metastore/hooks/TestURLHook.java?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/metastore/hooks/TestURLHook.java
(original)
+++
hive/trunk/contrib/src/java/org/apache/hadoop/hive/contrib/metastore/hooks/TestURLHook.java
Thu Jul 31 16:10:43 2014
@@ -28,7 +28,8 @@ import org.apache.hadoop.hive.metastore.
*/
public class TestURLHook implements JDOConnectionURLHook {
- static String originalUrl = null;
+ private String originalUrl;
+
@Override
public String getJdoConnectionUrl(Configuration conf) throws Exception {
if (originalUrl == null) {
Added: hive/trunk/contrib/src/test/queries/clientpositive/url_hook.q
URL:
http://svn.apache.org/viewvc/hive/trunk/contrib/src/test/queries/clientpositive/url_hook.q?rev=1614929&view=auto
==============================================================================
--- hive/trunk/contrib/src/test/queries/clientpositive/url_hook.q (added)
+++ hive/trunk/contrib/src/test/queries/clientpositive/url_hook.q Thu Jul 31
16:10:43 2014
@@ -0,0 +1,6 @@
+add jar
${system:maven.local.repository}/org/apache/hive/hive-contrib/${system:hive.version}/hive-contrib-${system:hive.version}.jar;
+SHOW TABLES 'src';
+
+set
hive.metastore.ds.connection.url.hook=org.apache.hadoop.hive.contrib.metastore.hooks.TestURLHook;
+-- changes to dummy derby store.. should return empty result
+SHOW TABLES 'src';
Added: hive/trunk/contrib/src/test/results/clientpositive/url_hook.q.out
URL:
http://svn.apache.org/viewvc/hive/trunk/contrib/src/test/results/clientpositive/url_hook.q.out?rev=1614929&view=auto
==============================================================================
--- hive/trunk/contrib/src/test/results/clientpositive/url_hook.q.out (added)
+++ hive/trunk/contrib/src/test/results/clientpositive/url_hook.q.out Thu Jul
31 16:10:43 2014
@@ -0,0 +1,11 @@
+PREHOOK: query: SHOW TABLES 'src'
+PREHOOK: type: SHOWTABLES
+POSTHOOK: query: SHOW TABLES 'src'
+POSTHOOK: type: SHOWTABLES
+src
+PREHOOK: query: -- changes to dummy derby store.. should return empty result
+SHOW TABLES 'src'
+PREHOOK: type: SHOWTABLES
+POSTHOOK: query: -- changes to dummy derby store.. should return empty result
+SHOW TABLES 'src'
+POSTHOOK: type: SHOWTABLES
Modified: hive/trunk/data/conf/hive-site.xml
URL:
http://svn.apache.org/viewvc/hive/trunk/data/conf/hive-site.xml?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
--- hive/trunk/data/conf/hive-site.xml (original)
+++ hive/trunk/data/conf/hive-site.xml Thu Jul 31 16:10:43 2014
@@ -240,4 +240,9 @@
<value>minimal</value>
</property>
+<property>
+ <name>hive.users.in.admin.role</name>
+ <value>hive_admin_user</value>
+</property>
+
</configuration>
Modified:
hive/trunk/itests/hive-unit/src/main/java/org/apache/hive/jdbc/miniHS2/MiniHS2.java
URL:
http://svn.apache.org/viewvc/hive/trunk/itests/hive-unit/src/main/java/org/apache/hive/jdbc/miniHS2/MiniHS2.java?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/itests/hive-unit/src/main/java/org/apache/hive/jdbc/miniHS2/MiniHS2.java
(original)
+++
hive/trunk/itests/hive-unit/src/main/java/org/apache/hive/jdbc/miniHS2/MiniHS2.java
Thu Jul 31 16:10:43 2014
@@ -178,7 +178,6 @@ public class MiniHS2 extends AbstractHiv
hiveConf.setVar(ConfVars.HIVE_SERVER2_THRIFT_BIND_HOST, getHost());
hiveConf.setIntVar(ConfVars.HIVE_SERVER2_THRIFT_PORT, getBinaryPort());
hiveConf.setIntVar(ConfVars.HIVE_SERVER2_THRIFT_HTTP_PORT, getHttpPort());
- HiveMetaStore.HMSHandler.resetDefaultDBFlag();
Path scratchDir = new Path(baseDfsDir, "scratch");
fs.mkdirs(scratchDir);
Modified:
hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java
URL:
http://svn.apache.org/viewvc/hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java
(original)
+++
hive/trunk/itests/hive-unit/src/test/java/org/apache/hadoop/hive/metastore/TestMetastoreVersion.java
Thu Jul 31 16:10:43 2014
@@ -42,9 +42,9 @@ public class TestMetastoreVersion extend
@Override
protected void setUp() throws Exception {
super.setUp();
- Field defDb =
HiveMetaStore.HMSHandler.class.getDeclaredField("createDefaultDB");
+ Field defDb =
HiveMetaStore.HMSHandler.class.getDeclaredField("currentUrl");
defDb.setAccessible(true);
- defDb.setBoolean(null, false);
+ defDb.set(null, null);
hiveConf = new HiveConf(this.getClass());
System.setProperty("hive.metastore.event.listeners",
DummyListener.class.getName());
Modified:
hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
URL:
http://svn.apache.org/viewvc/hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
(original)
+++
hive/trunk/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
Thu Jul 31 16:10:43 2014
@@ -1738,10 +1738,10 @@ public class QTestUtil {
(command != null ? " running " + command : "") + (debugHint != null ?
debugHint : ""));
}
+ // for negative tests, which is succeeded.. no need to print the query string
public void failed(String fname, String debugHint) {
- String command = SessionState.get() != null ?
SessionState.get().getLastCommand() : null;
Assert.fail("Client Execution was expected to fail, but succeeded with
error code 0 " +
- (command != null ? " running " + command : "") + (debugHint != null ?
debugHint : ""));
+ (debugHint != null ? debugHint : ""));
}
public void failedDiff(int ecode, String fname, String debugHint) {
@@ -1755,7 +1755,9 @@ public class QTestUtil {
e.printStackTrace();
System.err.println("Failed query: " + fname);
System.err.flush();
- Assert.fail("Unexpected exception" + (command != null ? " running " +
command : "") +
+ Assert.fail("Unexpected exception " +
+ org.apache.hadoop.util.StringUtils.stringifyException(e) + "\n" +
+ (command != null ? " running " + command : "") +
(debugHint != null ? debugHint : ""));
}
}
Modified:
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
URL:
http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
(original)
+++
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
Thu Jul 31 16:10:43 2014
@@ -89,7 +89,6 @@ import org.apache.hadoop.hive.metastore.
import org.apache.hadoop.hive.metastore.api.GrantRevokePrivilegeResponse;
import org.apache.hadoop.hive.metastore.api.GrantRevokeRoleRequest;
import org.apache.hadoop.hive.metastore.api.GrantRevokeRoleResponse;
-import org.apache.hadoop.hive.metastore.api.GrantRevokeType;
import org.apache.hadoop.hive.metastore.api.HeartbeatRequest;
import org.apache.hadoop.hive.metastore.api.HeartbeatTxnRangeRequest;
import org.apache.hadoop.hive.metastore.api.HeartbeatTxnRangeResponse;
@@ -241,13 +240,12 @@ public class HiveMetaStore extends Thrif
public static class HMSHandler extends FacebookBase implements
IHMSHandler {
public static final Log LOG = HiveMetaStore.LOG;
- private static boolean createDefaultDB = false;
- private static boolean defaultRolesCreated = false;
- private static boolean adminUsersAdded = false;
private String rawStoreClassName;
private final HiveConf hiveConf; // stores datastore (jpox) properties,
// right now they come from
jpox.properties
+ private static String currentUrl;
+
private Warehouse wh; // hdfs warehouse
private final ThreadLocal<RawStore> threadLocalMS =
new ThreadLocal<RawStore>() {
@@ -316,8 +314,6 @@ public class HiveMetaStore extends Thrif
address, cmd).toString());
}
- // The next serial number to be assigned
- private boolean checkForDefaultDb;
private static int nextSerialNum = 0;
private static ThreadLocal<Integer> threadLocalId = new
ThreadLocal<Integer>() {
@Override
@@ -350,10 +346,6 @@ public class HiveMetaStore extends Thrif
return threadLocalId.get();
}
- public static void resetDefaultDBFlag() {
- createDefaultDB = false;
- }
-
public HMSHandler(String name) throws MetaException {
super(name);
hiveConf = new HiveConf(this.getClass());
@@ -387,8 +379,6 @@ public class HiveMetaStore extends Thrif
private boolean init() throws MetaException {
rawStoreClassName =
hiveConf.getVar(HiveConf.ConfVars.METASTORE_RAW_STORE_IMPL);
- checkForDefaultDb = hiveConf.getBoolean(
- "hive.metastore.checkForDefaultDb", true);
initListeners = MetaStoreUtils.getMetaStoreListeners(
MetaStoreInitListener.class, hiveConf,
hiveConf.getVar(HiveConf.ConfVars.METASTORE_INIT_HOOKS));
@@ -404,9 +394,12 @@ public class HiveMetaStore extends Thrif
wh = new Warehouse(hiveConf);
synchronized (HMSHandler.class) {
- createDefaultDB();
- createDefaultRoles();
- addAdminUsers();
+ if (currentUrl == null ||
!currentUrl.equals(MetaStoreInit.getConnectionURL(hiveConf))) {
+ createDefaultDB();
+ createDefaultRoles();
+ addAdminUsers();
+ currentUrl = MetaStoreInit.getConnectionURL(hiveConf);
+ }
}
if (hiveConf.getBoolean("hive.metastore.metrics.enabled", false)) {
@@ -517,7 +510,6 @@ public class HiveMetaStore extends Thrif
db.setOwnerType(PrincipalType.ROLE);
ms.createDatabase(db);
}
- HMSHandler.createDefaultDB = true;
}
/**
@@ -526,9 +518,6 @@ public class HiveMetaStore extends Thrif
* @throws MetaException
*/
private void createDefaultDB() throws MetaException {
- if (HMSHandler.createDefaultDB || !checkForDefaultDb) {
- return;
- }
try {
createDefaultDB_core(getMS());
} catch (InvalidObjectException e) {
@@ -541,11 +530,6 @@ public class HiveMetaStore extends Thrif
private void createDefaultRoles() throws MetaException {
- if(defaultRolesCreated) {
- LOG.debug("Admin role already created previously.");
- return;
- }
-
RawStore ms = getMS();
try {
ms.addRole(ADMIN, ADMIN);
@@ -579,16 +563,10 @@ public class HiveMetaStore extends Thrif
// Unlikely to be thrown.
LOG.warn("Failed while granting global privs to admin", e);
}
-
- defaultRolesCreated = true;
}
private void addAdminUsers() throws MetaException {
- if(adminUsersAdded) {
- LOG.debug("Admin users already added.");
- return;
- }
// now add pre-configured users to admin role
String userStr =
HiveConf.getVar(hiveConf,ConfVars.USERS_IN_ADMIN_ROLE,"").trim();
if (userStr.isEmpty()) {
@@ -623,7 +601,6 @@ public class HiveMetaStore extends Thrif
LOG.debug(userName + " already in admin role", e);
}
}
- adminUsersAdded = true;
}
private void logInfo(String m) {
Modified:
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
URL:
http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
(original)
+++
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
Thu Jul 31 16:10:43 2014
@@ -34,6 +34,7 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -144,6 +145,8 @@ public class HiveMetaStoreClient impleme
private String tokenStrForm;
private final boolean localMetaStore;
+ private Map<String, String> currentMetaVars;
+
// for thrift connects
private int retries = 5;
private int retryDelaySeconds = 0;
@@ -171,6 +174,7 @@ public class HiveMetaStoreClient impleme
// through the network
client = HiveMetaStore.newHMSHandler("hive client", conf);
isConnected = true;
+ snapshotActiveConf();
return;
}
@@ -231,6 +235,26 @@ public class HiveMetaStoreClient impleme
}
@Override
+ public boolean isCompatibleWith(HiveConf conf) {
+ if (currentMetaVars == null) {
+ return false; // recreate
+ }
+ boolean compatible = true;
+ for (ConfVars oneVar : HiveConf.metaVars) {
+ // Since metaVars are all of different types, use string for comparison
+ String oldVar = currentMetaVars.get(oneVar.varname);
+ String newVar = conf.get(oneVar.varname, "");
+ if (oldVar == null ||
+ (oneVar.isCaseSensitive() ? !oldVar.equals(newVar) :
!oldVar.equalsIgnoreCase(newVar))) {
+ LOG.info("Mestastore configuration " + oneVar.varname +
+ " changed from " + oldVar + " to " + newVar);
+ compatible = false;
+ }
+ }
+ return compatible;
+ }
+
+ @Override
public void reconnect() throws MetaException {
if (localMetaStore) {
// For direct DB connections we don't yet support reestablishing
connections.
@@ -383,9 +407,19 @@ public class HiveMetaStoreClient impleme
throw new MetaException("Could not connect to meta store using any of
the URIs provided." +
" Most recent failure: " + StringUtils.stringifyException(tte));
}
+
+ snapshotActiveConf();
+
LOG.info("Connected to metastore.");
}
+ private void snapshotActiveConf() {
+ currentMetaVars = new HashMap<String, String>(HiveConf.metaVars.length);
+ for (ConfVars oneVar : HiveConf.metaVars) {
+ currentMetaVars.put(oneVar.varname, conf.get(oneVar.varname, ""));
+ }
+ }
+
public String getTokenStrForm() throws IOException {
return tokenStrForm;
}
@@ -393,6 +427,7 @@ public class HiveMetaStoreClient impleme
@Override
public void close() {
isConnected = false;
+ currentMetaVars = null;
try {
if (null != client) {
client.shutdown();
Modified:
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
URL:
http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
(original)
+++
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
Thu Jul 31 16:10:43 2014
@@ -19,9 +19,9 @@
package org.apache.hadoop.hive.metastore;
import org.apache.hadoop.hive.common.ValidTxnList;
+import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.metastore.api.CompactionType;
import org.apache.hadoop.hive.metastore.api.GetOpenTxnsInfoResponse;
-import org.apache.hadoop.hive.metastore.api.GetOpenTxnsResponse;
import org.apache.hadoop.hive.metastore.api.HeartbeatTxnRangeResponse;
import org.apache.hadoop.hive.metastore.api.LockRequest;
import org.apache.hadoop.hive.metastore.api.LockResponse;
@@ -41,19 +41,14 @@ import org.apache.hadoop.hive.common.Obj
import org.apache.hadoop.hive.metastore.api.AlreadyExistsException;
import org.apache.hadoop.hive.metastore.api.ColumnStatistics;
import org.apache.hadoop.hive.metastore.api.ColumnStatisticsObj;
-import org.apache.hadoop.hive.metastore.api.CompactionType;
import org.apache.hadoop.hive.metastore.api.ConfigValSecurityException;
import org.apache.hadoop.hive.metastore.api.Database;
import org.apache.hadoop.hive.metastore.api.FieldSchema;
import org.apache.hadoop.hive.metastore.api.Function;
-import org.apache.hadoop.hive.metastore.api.GetOpenTxnsInfoResponse;
-import org.apache.hadoop.hive.metastore.api.GetOpenTxnsResponse;
import org.apache.hadoop.hive.metastore.api.GetPrincipalsInRoleRequest;
import org.apache.hadoop.hive.metastore.api.GetPrincipalsInRoleResponse;
import org.apache.hadoop.hive.metastore.api.GetRoleGrantsForPrincipalRequest;
import org.apache.hadoop.hive.metastore.api.GetRoleGrantsForPrincipalResponse;
-import org.apache.hadoop.hive.metastore.api.GrantRevokePrivilegeRequest;
-import org.apache.hadoop.hive.metastore.api.GrantRevokePrivilegeResponse;
import org.apache.hadoop.hive.metastore.api.HiveObjectPrivilege;
import org.apache.hadoop.hive.metastore.api.HiveObjectRef;
import org.apache.hadoop.hive.metastore.api.Index;
@@ -61,28 +56,18 @@ import org.apache.hadoop.hive.metastore.
import org.apache.hadoop.hive.metastore.api.InvalidObjectException;
import org.apache.hadoop.hive.metastore.api.InvalidOperationException;
import org.apache.hadoop.hive.metastore.api.InvalidPartitionException;
-import org.apache.hadoop.hive.metastore.api.LockRequest;
-import org.apache.hadoop.hive.metastore.api.LockResponse;
import org.apache.hadoop.hive.metastore.api.MetaException;
-import org.apache.hadoop.hive.metastore.api.NoSuchLockException;
import org.apache.hadoop.hive.metastore.api.NoSuchObjectException;
-import org.apache.hadoop.hive.metastore.api.NoSuchTxnException;
-import org.apache.hadoop.hive.metastore.api.OpenTxnsResponse;
import org.apache.hadoop.hive.metastore.api.Partition;
import org.apache.hadoop.hive.metastore.api.PartitionEventType;
import org.apache.hadoop.hive.metastore.api.PrincipalPrivilegeSet;
import org.apache.hadoop.hive.metastore.api.PrincipalType;
import org.apache.hadoop.hive.metastore.api.PrivilegeBag;
import org.apache.hadoop.hive.metastore.api.Role;
-import org.apache.hadoop.hive.metastore.api.ShowCompactResponse;
-import org.apache.hadoop.hive.metastore.api.ShowLocksResponse;
import org.apache.hadoop.hive.metastore.api.Table;
-import org.apache.hadoop.hive.metastore.api.TxnAbortedException;
-import org.apache.hadoop.hive.metastore.api.TxnOpenException;
import org.apache.hadoop.hive.metastore.api.UnknownDBException;
import org.apache.hadoop.hive.metastore.api.UnknownPartitionException;
import org.apache.hadoop.hive.metastore.api.UnknownTableException;
-import org.apache.thrift.TException;
/**
* TODO Unnecessary when the server sides for both dbstore and filestore are
@@ -91,6 +76,12 @@ import org.apache.thrift.TException;
public interface IMetaStoreClient {
/**
+ * Returns whether current client is convertible with conf or not
+ * @return
+ */
+ public boolean isCompatibleWith(HiveConf conf);
+
+ /**
* Tries to reconnect this MetaStoreClient to the MetaStore.
*/
public void reconnect() throws MetaException;
Modified:
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java
URL:
http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java
(original)
+++
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/RawStoreProxy.java
Thu Jul 31 16:10:43 2014
@@ -26,8 +26,6 @@ import java.lang.reflect.UndeclaredThrow
import java.util.List;
import org.apache.commons.lang.ClassUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.common.classification.InterfaceAudience;
import org.apache.hadoop.hive.common.classification.InterfaceStability;
@@ -55,7 +53,7 @@ public class RawStoreProxy implements In
// This has to be called before initializing the instance of RawStore
init();
- this.base = (RawStore) ReflectionUtils.newInstance(rawStoreClass, conf);
+ this.base = ReflectionUtils.newInstance(rawStoreClass, conf);
}
public static RawStore getProxy(HiveConf hiveConf, Configuration conf,
String rawStoreClassName,
@@ -96,14 +94,6 @@ public class RawStoreProxy implements In
public Object invoke(Object proxy, Method method, Object[] args) throws
Throwable {
Object ret = null;
- boolean reloadConf = HiveConf.getBoolVar(hiveConf,
- HiveConf.ConfVars.METASTOREFORCERELOADCONF);
-
- if (reloadConf) {
- MetaStoreInit.updateConnectionURL(hiveConf, getConf(), null,
metaStoreInitData);
- initMS();
- }
-
try {
ret = method.invoke(base, args);
} catch (UndeclaredThrowableException e) {
Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
(original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java Thu Jul
31 16:10:43 2014
@@ -43,6 +43,7 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -141,6 +142,10 @@ public class Hive {
}
};
+ public static Hive get(Configuration c, Class<?> clazz) throws HiveException
{
+ return get(c instanceof HiveConf ? (HiveConf)c : new HiveConf(c, clazz));
+ }
+
/**
* Gets hive object for the current thread. If one is not initialized then a
* new one is created If the new configuration is different in metadata conf
@@ -153,20 +158,13 @@ public class Hive {
*
*/
public static Hive get(HiveConf c) throws HiveException {
- boolean needsRefresh = false;
Hive db = hiveDB.get();
- if (db != null) {
- for (HiveConf.ConfVars oneVar : HiveConf.metaVars) {
- // Since metaVars are all of different types, use string for comparison
- String oldVar = db.getConf().get(oneVar.varname, "");
- String newVar = c.get(oneVar.varname, "");
- if (oldVar.compareToIgnoreCase(newVar) != 0) {
- needsRefresh = true;
- break;
- }
- }
+ if (db == null ||
+ (db.metaStoreClient != null &&
!db.metaStoreClient.isCompatibleWith(c))) {
+ return get(c, true);
}
- return get(c, needsRefresh);
+ db.conf = c;
+ return db;
}
/**
@@ -195,7 +193,8 @@ public class Hive {
public static Hive get() throws HiveException {
Hive db = hiveDB.get();
if (db == null) {
- db = new Hive(new HiveConf(Hive.class));
+ SessionState session = SessionState.get();
+ db = new Hive(session == null ? new HiveConf(Hive.class) :
session.getConf());
hiveDB.set(db);
}
return db;
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/DefaultHiveAuthorizationProvider.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/DefaultHiveAuthorizationProvider.java?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/DefaultHiveAuthorizationProvider.java
(original)
+++
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/DefaultHiveAuthorizationProvider.java
Thu Jul 31 16:10:43 2014
@@ -19,7 +19,6 @@
package org.apache.hadoop.hive.ql.security.authorization;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.metadata.Hive;
import org.apache.hadoop.hive.ql.metadata.HiveException;
@@ -27,7 +26,7 @@ public class DefaultHiveAuthorizationPro
BitSetCheckedAuthorizationProvider {
public void init(Configuration conf) throws HiveException {
- hive_db = new HiveProxy(Hive.get(new HiveConf(conf,
HiveAuthorizationProvider.class)));
+ hive_db = new HiveProxy(Hive.get(conf, HiveAuthorizationProvider.class));
}
}
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/StorageBasedAuthorizationProvider.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/StorageBasedAuthorizationProvider.java?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/StorageBasedAuthorizationProvider.java
(original)
+++
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/StorageBasedAuthorizationProvider.java
Thu Jul 31 16:10:43 2014
@@ -35,7 +35,6 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsAction;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.hdfs.DFSConfigKeys;
-import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.metastore.HiveMetaStore.HMSHandler;
import org.apache.hadoop.hive.metastore.Warehouse;
import org.apache.hadoop.hive.metastore.api.Database;
@@ -83,7 +82,7 @@ public class StorageBasedAuthorizationPr
// till we explicitly initialize it as being from the client side. So,
we have a
// chicken-and-egg problem. So, we now track whether or not we're
running from client-side
// in the SBAP itself.
- hive_db = new HiveProxy(Hive.get(new HiveConf(getConf(),
StorageBasedAuthorizationProvider.class)));
+ hive_db = new HiveProxy(Hive.get(getConf(),
StorageBasedAuthorizationProvider.class));
this.wh = new Warehouse(getConf());
if (this.wh == null){
// If wh is still null after just having initialized it, bail out -
something's very wrong.
@@ -117,7 +116,7 @@ public class StorageBasedAuthorizationPr
// Update to previous comment: there does seem to be one place that uses
this
// and that is to authorize "show databases" in hcat commandline, which is
used
- // by webhcat. And user-level auth seems to be a resonable default in this
case.
+ // by webhcat. And user-level auth seems to be a reasonable default in
this case.
// The now deprecated HdfsAuthorizationProvider in hcatalog approached
this in
// another way, and that was to see if the user had said above appropriate
requested
// privileges for the hive root warehouse directory. That seems to be the
best
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveRoleGrant.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveRoleGrant.java?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveRoleGrant.java
(original)
+++
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/HiveRoleGrant.java
Thu Jul 31 16:10:43 2014
@@ -123,5 +123,7 @@ public class HiveRoleGrant implements Co
}
-
+ public String toString() {
+ return roleName + "[" + principalName + ":" + principalType + (grantOption
? ":WITH GRANT]" : "]");
+ }
}
Modified:
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessController.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessController.java?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessController.java
(original)
+++
hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/security/authorization/plugin/sqlstd/SQLStdHiveAccessController.java
Thu Jul 31 16:10:43 2014
@@ -105,6 +105,7 @@ public class SQLStdHiveAccessController
}
this.currentUserName = newUserName;
this.currentRoles = getRolesFromMS();
+ LOG.info("Current user : " + currentUserName + ", Current Roles : " +
currentRoles);
}
private List<HiveRoleGrant> getRolesFromMS() throws HiveAuthzPluginException
{
@@ -532,6 +533,7 @@ public class SQLStdHiveAccessController
currentRoles.add(adminRole);
return;
}
+ LOG.info("Current user : " + currentUserName + ", Current Roles : " +
currentRoles);
// If we are here it means, user is requesting a role he doesn't belong to.
throw new HiveAccessControlException(currentUserName +" doesn't belong to
role "
+roleName);
Modified:
hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java
(original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/metadata/TestHive.java Thu
Jul 31 16:10:43 2014
@@ -509,6 +509,7 @@ public class TestHive extends TestCase {
public void testHiveRefreshOnConfChange() throws Throwable{
Hive prevHiveObj = Hive.get();
+ prevHiveObj.getDatabaseCurrent();
Hive newHiveObj;
//if HiveConf has not changed, same object should be returned
@@ -522,6 +523,7 @@ public class TestHive extends TestCase {
//if HiveConf has changed, new object should be returned
prevHiveObj = Hive.get();
+ prevHiveObj.getDatabaseCurrent();
//change value of a metavar config param in new hive conf
newHconf = new HiveConf(hiveConf);
newHconf.setIntVar(ConfVars.METASTORETHRIFTCONNECTIONRETRIES,
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_cannot_create_all_role.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_cannot_create_all_role.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/authorization_cannot_create_all_role.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/authorization_cannot_create_all_role.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_cannot_create_default_role.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_cannot_create_default_role.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/authorization_cannot_create_default_role.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/authorization_cannot_create_default_role.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_cannot_create_none_role.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_cannot_create_none_role.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/authorization_cannot_create_none_role.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/authorization_cannot_create_none_role.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_caseinsensitivity.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_caseinsensitivity.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/authorization_caseinsensitivity.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/authorization_caseinsensitivity.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_drop_db_cascade.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_drop_db_cascade.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/authorization_drop_db_cascade.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/authorization_drop_db_cascade.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_drop_db_empty.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_drop_db_empty.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientnegative/authorization_drop_db_empty.q
(original)
+++ hive/trunk/ql/src/test/queries/clientnegative/authorization_drop_db_empty.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_drop_role_no_admin.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_drop_role_no_admin.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/authorization_drop_role_no_admin.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/authorization_drop_role_no_admin.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_priv_current_role_neg.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_priv_current_role_neg.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/authorization_priv_current_role_neg.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/authorization_priv_current_role_neg.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_cycles1.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_role_cycles1.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientnegative/authorization_role_cycles1.q
(original)
+++ hive/trunk/ql/src/test/queries/clientnegative/authorization_role_cycles1.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_cycles2.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_role_cycles2.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientnegative/authorization_role_cycles2.q
(original)
+++ hive/trunk/ql/src/test/queries/clientnegative/authorization_role_cycles2.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant.q
(original)
+++ hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant2.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant2.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant2.q
(original)
+++ hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant2.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant_nosuchrole.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant_nosuchrole.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant_nosuchrole.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant_nosuchrole.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant_otherrole.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant_otherrole.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant_otherrole.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant_otherrole.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant_otheruser.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant_otheruser.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant_otheruser.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/authorization_role_grant_otheruser.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_rolehierarchy_privs.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_rolehierarchy_privs.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/authorization_rolehierarchy_privs.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/authorization_rolehierarchy_privs.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_set_role_neg2.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_set_role_neg2.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientnegative/authorization_set_role_neg2.q
(original)
+++ hive/trunk/ql/src/test/queries/clientnegative/authorization_set_role_neg2.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otherrole.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otherrole.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otherrole.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otherrole.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_all.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_all.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_all.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_all.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_alltabs.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_alltabs.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_alltabs.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_alltabs.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified:
hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_wtab.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_wtab.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_wtab.q
(original)
+++
hive/trunk/ql/src/test/queries/clientnegative/authorization_show_grant_otheruser_wtab.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified:
hive/trunk/ql/src/test/queries/clientpositive/authorization_1_sql_std.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/authorization_1_sql_std.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/authorization_1_sql_std.q
(original)
+++ hive/trunk/ql/src/test/queries/clientpositive/authorization_1_sql_std.q Thu
Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified:
hive/trunk/ql/src/test/queries/clientpositive/authorization_admin_almighty1.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/authorization_admin_almighty1.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientpositive/authorization_admin_almighty1.q
(original)
+++
hive/trunk/ql/src/test/queries/clientpositive/authorization_admin_almighty1.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_test_user;
Modified:
hive/trunk/ql/src/test/queries/clientpositive/authorization_admin_almighty2.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/authorization_admin_almighty2.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientpositive/authorization_admin_almighty2.q
(original)
+++
hive/trunk/ql/src/test/queries/clientpositive/authorization_admin_almighty2.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified:
hive/trunk/ql/src/test/queries/clientpositive/authorization_create_func1.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/authorization_create_func1.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/authorization_create_func1.q
(original)
+++ hive/trunk/ql/src/test/queries/clientpositive/authorization_create_func1.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified:
hive/trunk/ql/src/test/queries/clientpositive/authorization_create_macro1.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/authorization_create_macro1.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/authorization_create_macro1.q
(original)
+++ hive/trunk/ql/src/test/queries/clientpositive/authorization_create_macro1.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified: hive/trunk/ql/src/test/queries/clientpositive/authorization_insert.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/authorization_insert.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/authorization_insert.q
(original)
+++ hive/trunk/ql/src/test/queries/clientpositive/authorization_insert.q Thu
Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
Modified:
hive/trunk/ql/src/test/queries/clientpositive/authorization_owner_actions_db.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/authorization_owner_actions_db.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientpositive/authorization_owner_actions_db.q
(original)
+++
hive/trunk/ql/src/test/queries/clientpositive/authorization_owner_actions_db.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified:
hive/trunk/ql/src/test/queries/clientpositive/authorization_role_grant1.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/authorization_role_grant1.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/authorization_role_grant1.q
(original)
+++ hive/trunk/ql/src/test/queries/clientpositive/authorization_role_grant1.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified:
hive/trunk/ql/src/test/queries/clientpositive/authorization_role_grant2.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/authorization_role_grant2.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/authorization_role_grant2.q
(original)
+++ hive/trunk/ql/src/test/queries/clientpositive/authorization_role_grant2.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
Modified:
hive/trunk/ql/src/test/queries/clientpositive/authorization_set_show_current_role.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/authorization_set_show_current_role.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
---
hive/trunk/ql/src/test/queries/clientpositive/authorization_set_show_current_role.q
(original)
+++
hive/trunk/ql/src/test/queries/clientpositive/authorization_set_show_current_role.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set user.name=hive_admin_user;
Modified:
hive/trunk/ql/src/test/queries/clientpositive/authorization_show_grant.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/authorization_show_grant.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/authorization_show_grant.q
(original)
+++ hive/trunk/ql/src/test/queries/clientpositive/authorization_show_grant.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
Modified:
hive/trunk/ql/src/test/queries/clientpositive/authorization_view_sqlstd.q
URL:
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/authorization_view_sqlstd.q?rev=1614929&r1=1614928&r2=1614929&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/authorization_view_sqlstd.q
(original)
+++ hive/trunk/ql/src/test/queries/clientpositive/authorization_view_sqlstd.q
Thu Jul 31 16:10:43 2014
@@ -1,4 +1,3 @@
-set hive.users.in.admin.role=hive_admin_user;
set
hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactoryForTest;
set
hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateConfigUserAuthenticator;
set hive.security.authorization.enabled=true;
