You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sentry.apache.org by sh...@apache.org on 2014/02/01 00:42:09 UTC
git commit: SENTRY-107: Upgrade hadoop on master (Brock Noland via
Shreepadma Venugopalan)
Updated Branches:
refs/heads/master 2a5fb34b8 -> a39b2325e
SENTRY-107: Upgrade hadoop on master (Brock Noland via Shreepadma Venugopalan)
Project: http://git-wip-us.apache.org/repos/asf/incubator-sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-sentry/commit/a39b2325
Tree: http://git-wip-us.apache.org/repos/asf/incubator-sentry/tree/a39b2325
Diff: http://git-wip-us.apache.org/repos/asf/incubator-sentry/diff/a39b2325
Branch: refs/heads/master
Commit: a39b2325e4460faa9187d68b875f4342f8768256
Parents: 2a5fb34
Author: Shreepadma Venugopalan <sh...@apache.org>
Authored: Fri Jan 31 15:41:48 2014 -0800
Committer: Shreepadma Venugopalan <sh...@apache.org>
Committed: Fri Jan 31 15:41:48 2014 -0800
----------------------------------------------------------------------
pom.xml | 110 +++++++++----------
sentry-binding/sentry-binding-hive/pom.xml | 4 -
.../binding/hive/HiveAuthzBindingHook.java | 8 +-
.../hive/HiveAuthzBindingSessionHook.java | 5 +-
.../binding/hive/authz/HiveAuthzBinding.java | 2 +-
.../binding/hive/TestHiveAuthzBindings.java | 6 +-
sentry-tests/sentry-tests-hive/pom.xml | 24 +---
.../e2e/hive/TestPrivilegesAtTableScope.java | 2 +-
.../tests/e2e/hive/TestServerConfiguration.java | 4 +-
9 files changed, 66 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/a39b2325/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2f70df1..3bab152 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,19 +52,29 @@ limitations under the License.
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compile.source>1.6</maven.compile.source>
<maven.compile.target>1.6</maven.compile.target>
+ <!-- versions are in alphabetical order -->
+ <ant.contrib.version>1.0b3</ant.contrib.version>
+ <maven.antrun.plugin.version>1.7</maven.antrun.plugin.version>
+ <maven.enforcer.plugin.version>1.3.1</maven.enforcer.plugin.version>
+ <build.helper.maven.plugin.version>1.8</build.helper.maven.plugin.version>
<commons.lang.version>2.6</commons.lang.version>
+ <datanucleus.maven.plugin.version>3.3.0-release</datanucleus.maven.plugin.version>
+ <datanucleus-api-jdo.version>3.2.1</datanucleus-api-jdo.version>
+ <datanucleus-core.version>3.2.2</datanucleus-core.version>
+ <datanucleus-rdbms.version>3.2.1</datanucleus-rdbms.version>
<derby.version>10.4.2.0</derby.version>
+ <hive.version>0.12.0-cdh5.0.0-beta-2-SNAPSHOT</hive.version>
+ <hadoop.version>2.2.0-cdh5.0.0-beta-2-SNAPSHOT</hadoop.version>
<fest.reflect.version>1.4.1</fest.reflect.version>
<guava.version>11.0.2</guava.version>
- <hadoop.version>2.0.0-cdh4.4.0</hadoop.version>
- <hive.version>0.10.0-cdh4.4.0</hive.version>
<junit.version>4.9</junit.version>
<libthrift.version>0.9.0-cdh4-1</libthrift.version>
+ <libfb303.version>0.9.0</libfb303.version>
<log4j.version>1.2.16</log4j.version>
<shiro.version>1.2.1</shiro.version>
<slf4j.version>1.6.1</slf4j.version>
- <solr.version>4.4.0-cdh5.0.0-SNAPSHOT</solr.version>
- <zookeeper.version>3.4.5-cdh4.4.0</zookeeper.version>
+ <solr.version>4.4.0-cdh5.0.0-beta-2-SNAPSHOT</solr.version>
+ <zookeeper.version>3.4.5-cdh5.0.0-beta-2-SNAPSHOT</zookeeper.version>
</properties>
<dependencyManagement>
@@ -78,49 +88,51 @@ limitations under the License.
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>${derby.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>${libthrift.version}</version>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libfb303</artifactId>
+ <version>${libfb303.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-common</artifactId>
<version>${hive.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>${hadoop.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
<version>${hadoop.version}</version>
- <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minikdc</artifactId>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <version>${cdh.hadoop.version}</version>
- <scope>provided</scope>
+ <version>${hadoop.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-metastore</artifactId>
<version>${hive.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-test-framework</artifactId>
<version>${solr.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
@@ -132,25 +144,21 @@ limitations under the License.
<groupId>org.apache.solr</groupId>
<artifactId>solr-solrj</artifactId>
<version>${solr.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.easytesting</groupId>
<artifactId>fest-reflect</artifactId>
<version>${fest.reflect.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
@@ -161,19 +169,16 @@ limitations under the License.
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sentry</groupId>
@@ -194,85 +199,51 @@ limitations under the License.
<groupId>org.apache.hive</groupId>
<artifactId>hive-jdbc</artifactId>
<version>${hive.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-shims</artifactId>
<version>${hive.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-serde</artifactId>
<version>${hive.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-exec</artifactId>
<version>${hive.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-service</artifactId>
<version>${hive.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-hwi</artifactId>
- <version>${hive.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-pdk</artifactId>
- <version>${hive.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-hbase-handler</artifactId>
<version>${hive.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-contrib</artifactId>
<version>${hive.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-cli</artifactId>
<version>${hive.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-builtins</artifactId>
- <version>${hive.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-anttasks</artifactId>
- <version>${hive.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sentry</groupId>
<artifactId>sentry-binding-hive</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sentry</groupId>
<artifactId>sentry-binding-solr</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sentry</groupId>
@@ -293,7 +264,6 @@ limitations under the License.
<groupId>org.apache.sentry</groupId>
<artifactId>sentry-policy-db</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.sentry</groupId>
@@ -320,6 +290,12 @@ limitations under the License.
<build>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <inherited>true</inherited>
+ <extensions>true</extensions>
+ </plugin>
+ <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
</plugin>
@@ -328,6 +304,11 @@ limitations under the License.
<pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>2.4.0</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
@@ -399,8 +380,23 @@ limitations under the License.
<repositories>
<repository>
- <id>cloudera</id>
- <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
+ <id>cdh.repo</id>
+ <url>https://repository.cloudera.com/artifactory/cloudera-repos</url>
+ <name>Cloudera Repositories</name>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>cdh.snapshots.repo</id>
+ <url>https://repository.cloudera.com/artifactory/libs-snapshot-local</url>
+ <name>Cloudera Snapshots Repository</name>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
</repository>
</repositories>
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/a39b2325/sentry-binding/sentry-binding-hive/pom.xml
----------------------------------------------------------------------
diff --git a/sentry-binding/sentry-binding-hive/pom.xml b/sentry-binding/sentry-binding-hive/pom.xml
index 74f9065..132f4bc 100644
--- a/sentry-binding/sentry-binding-hive/pom.xml
+++ b/sentry-binding/sentry-binding-hive/pom.xml
@@ -56,10 +56,6 @@ limitations under the License.
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-builtins</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
<artifactId>hive-service</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/a39b2325/sentry-binding/sentry-binding-hive/src/main/java/org/apache/sentry/binding/hive/HiveAuthzBindingHook.java
----------------------------------------------------------------------
diff --git a/sentry-binding/sentry-binding-hive/src/main/java/org/apache/sentry/binding/hive/HiveAuthzBindingHook.java b/sentry-binding/sentry-binding-hive/src/main/java/org/apache/sentry/binding/hive/HiveAuthzBindingHook.java
index 9852c9e..cac4864 100644
--- a/sentry-binding/sentry-binding-hive/src/main/java/org/apache/sentry/binding/hive/HiveAuthzBindingHook.java
+++ b/sentry-binding/sentry-binding-hive/src/main/java/org/apache/sentry/binding/hive/HiveAuthzBindingHook.java
@@ -220,12 +220,8 @@ implements HiveDriverFilterHook {
}
// Find the current database for session
- private Database getCanonicalDb() throws SemanticException {
- try {
- return new Database(Hive.get().getCurrentDatabase());
- } catch (HiveException e) {
- throw new SemanticException("Error retrieving current db", e);
- }
+ private Database getCanonicalDb() {
+ return new Database(SessionState.get().getCurrentDatabase());
}
private Database extractDatabase(ASTNode ast) throws SemanticException {
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/a39b2325/sentry-binding/sentry-binding-hive/src/main/java/org/apache/sentry/binding/hive/HiveAuthzBindingSessionHook.java
----------------------------------------------------------------------
diff --git a/sentry-binding/sentry-binding-hive/src/main/java/org/apache/sentry/binding/hive/HiveAuthzBindingSessionHook.java b/sentry-binding/sentry-binding-hive/src/main/java/org/apache/sentry/binding/hive/HiveAuthzBindingSessionHook.java
index f584b9b..1506d8a 100644
--- a/sentry-binding/sentry-binding-hive/src/main/java/org/apache/sentry/binding/hive/HiveAuthzBindingSessionHook.java
+++ b/sentry-binding/sentry-binding-hive/src/main/java/org/apache/sentry/binding/hive/HiveAuthzBindingSessionHook.java
@@ -39,7 +39,6 @@ public class HiveAuthzBindingSessionHook
ConfVars.HIVE_EXTENDED_ENITITY_CAPTURE.varname + "," +
ConfVars.SCRATCHDIR.varname + "," +
ConfVars.LOCALSCRATCHDIR.varname + "," +
- ConfVars.HIVE_SERVER2_AUTHZ_EXTERNAL_EXEC.varname + "," +
ConfVars.METASTOREURIS.varname + "," +
ConfVars.METASTORECONNECTURLKEY.varname + "," +
ConfVars.HADOOPBIN.varname + "," +
@@ -47,6 +46,7 @@ public class HiveAuthzBindingSessionHook
ConfVars.HIVEAUXJARS.varname + "," +
ConfVars.HIVESTATSDBCONNECTIONSTRING.varname + "," +
ConfVars.SCRATCHDIRPERMISSION.varname + "," +
+ ConfVars.HIVE_SECURITY_COMMAND_WHITELIST.varname + "," +
HiveAuthzConf.HIVE_ACCESS_CONF_URL + "," +
HiveAuthzConf.HIVE_SENTRY_CONF_URL + "," +
HiveAuthzConf.HIVE_ACCESS_SUBJECT_NAME + "," +
@@ -58,7 +58,6 @@ public class HiveAuthzBindingSessionHook
* semantic, exec and filter hooks
* 2. Set additional config properties required for auth
* set HIVE_EXTENDED_ENITITY_CAPTURE = true
- * set HIVE_SERVER2_AUTHZ_EXTERNAL_EXEC = false
* set SCRATCHDIRPERMISSION = 700
* 3. Add sensetive config parameters to the config restrict list so that they can't be overridden by users
*/
@@ -73,7 +72,7 @@ public class HiveAuthzBindingSessionHook
// setup config
sessionConf.setBoolVar(ConfVars.HIVE_EXTENDED_ENITITY_CAPTURE, true);
- sessionConf.setBoolVar(ConfVars.HIVE_SERVER2_AUTHZ_EXTERNAL_EXEC, false);
+ sessionConf.setVar(ConfVars.HIVE_SECURITY_COMMAND_WHITELIST, "set");
sessionConf.setVar(ConfVars.SCRATCHDIRPERMISSION, SCRATCH_DIR_PERMISSIONS);
// set user name
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/a39b2325/sentry-binding/sentry-binding-hive/src/main/java/org/apache/sentry/binding/hive/authz/HiveAuthzBinding.java
----------------------------------------------------------------------
diff --git a/sentry-binding/sentry-binding-hive/src/main/java/org/apache/sentry/binding/hive/authz/HiveAuthzBinding.java b/sentry-binding/sentry-binding-hive/src/main/java/org/apache/sentry/binding/hive/authz/HiveAuthzBinding.java
index a769991..45d5d3b 100644
--- a/sentry-binding/sentry-binding-hive/src/main/java/org/apache/sentry/binding/hive/authz/HiveAuthzBinding.java
+++ b/sentry-binding/sentry-binding-hive/src/main/java/org/apache/sentry/binding/hive/authz/HiveAuthzBinding.java
@@ -111,7 +111,7 @@ public class HiveAuthzBinding {
if("none".equalsIgnoreCase(authMethod)) {
throw new InvalidConfigurationException("Authentication can't be NONE in non-testing mode");
}
- boolean impersonation = hiveConf.getBoolVar(ConfVars.HIVE_SERVER2_KERBEROS_IMPERSONATION);
+ boolean impersonation = hiveConf.getBoolVar(ConfVars.HIVE_SERVER2_ENABLE_DOAS);
boolean allowImpersonation = Boolean.parseBoolean(Strings.nullToEmpty(
authzConf.get(AuthzConfVars.AUTHZ_ALLOW_HIVE_IMPERSONATION.getVar())).trim());
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/a39b2325/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/binding/hive/TestHiveAuthzBindings.java
----------------------------------------------------------------------
diff --git a/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/binding/hive/TestHiveAuthzBindings.java b/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/binding/hive/TestHiveAuthzBindings.java
index 6b2166b..e6d790a 100644
--- a/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/binding/hive/TestHiveAuthzBindings.java
+++ b/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/binding/hive/TestHiveAuthzBindings.java
@@ -289,7 +289,7 @@ public class TestHiveAuthzBindings {
@Test(expected=AuthorizationException.class)
public void testImpersonationRestriction() throws Exception {
// perpare the hive and auth configs
- hiveConf.setBoolVar(ConfVars.HIVE_SERVER2_KERBEROS_IMPERSONATION, true);
+ hiveConf.setBoolVar(ConfVars.HIVE_SERVER2_ENABLE_DOAS, true);
hiveConf.setVar(ConfVars.HIVE_SERVER2_AUTHENTICATION, "Kerberos");
authzConf.set(AuthzConfVars.SENTRY_TESTING_MODE.getVar(), "false");
testAuth = new HiveAuthzBinding(hiveConf, authzConf);
@@ -307,7 +307,7 @@ public class TestHiveAuthzBindings {
@Test
public void testImpersonationAllowed() throws Exception {
// perpare the hive and auth configs
- hiveConf.setBoolVar(ConfVars.HIVE_SERVER2_KERBEROS_IMPERSONATION, true);
+ hiveConf.setBoolVar(ConfVars.HIVE_SERVER2_ENABLE_DOAS, true);
hiveConf.setVar(ConfVars.HIVE_SERVER2_AUTHENTICATION, "Kerberos");
authzConf.set(AuthzConfVars.SENTRY_TESTING_MODE.getVar(), "false");
authzConf.set(AuthzConfVars.AUTHZ_ALLOW_HIVE_IMPERSONATION.getVar(), "true");
@@ -330,7 +330,7 @@ public class TestHiveAuthzBindings {
}
return authList;
}
-
+
/**
* Turn off authentication and verify exception is raised in non-testing mode
* @throws Exception
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/a39b2325/sentry-tests/sentry-tests-hive/pom.xml
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/pom.xml b/sentry-tests/sentry-tests-hive/pom.xml
index f46e275..030b9b1 100644
--- a/sentry-tests/sentry-tests-hive/pom.xml
+++ b/sentry-tests/sentry-tests-hive/pom.xml
@@ -71,16 +71,6 @@ limitations under the License.
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
- <artifactId>hive-pdk</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-hwi</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
<artifactId>hive-jdbc</artifactId>
<scope>test</scope>
</dependency>
@@ -110,16 +100,6 @@ limitations under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-builtins</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-anttasks</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<scope>test</scope>
@@ -280,8 +260,8 @@ limitations under the License.
mv $BASE_DIR/${finalName}* $BASE_DIR/$finalName
}
mkdir -p $DOWNLOAD_DIR
- download "http://archive.cloudera.com/cdh4/cdh/4/hadoop-latest.tar.gz" hadoop.tar.gz hadoop
- download "http://archive.cloudera.com/cdh4/cdh/4/hive-latest.tar.gz" hive.tar.gz hive
+ download "http://archive.cloudera.com/cdh5/cdh/5/hadoop-latest.tar.gz" hadoop.tar.gz hadoop
+ download "http://archive.cloudera.com/cdh5/cdh/5/hive-latest.tar.gz" hive.tar.gz hive
</echo>
<exec executable="bash" dir="${basedir}" failonerror="true">
<arg line="target/download.sh"/>
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/a39b2325/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtTableScope.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtTableScope.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtTableScope.java
index 0198a6f..c267ea6 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtTableScope.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestPrivilegesAtTableScope.java
@@ -200,7 +200,7 @@ public class TestPrivilegesAtTableScope extends AbstractTestWithStaticConfigurat
statement = context.createStatement(connection);
statement.execute("USE DB_1");
// test user can execute insert on table
- statement.executeQuery("INSERT INTO TABLE TAB_1 SELECT A FROM TAB_2");
+ statement.execute("INSERT INTO TABLE TAB_1 SELECT A FROM TAB_2");
// negative test: user can't query table
try {
http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/a39b2325/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestServerConfiguration.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestServerConfiguration.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestServerConfiguration.java
index fa8a75e..6bb39bc 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestServerConfiguration.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestServerConfiguration.java
@@ -190,7 +190,7 @@ public class TestServerConfiguration extends AbstractTestWithHiveServer {
verifyConfig(testUser, ConfVars.HIVE_EXEC_FILTER_HOOK.varname,
HiveAuthzBindingSessionHook.FILTER_HOOK);
verifyConfig(testUser, ConfVars.HIVE_EXTENDED_ENITITY_CAPTURE.varname, "true");
- verifyConfig(testUser, ConfVars.HIVE_SERVER2_AUTHZ_EXTERNAL_EXEC.varname, "false");
+ verifyConfig(testUser, ConfVars.HIVE_SECURITY_COMMAND_WHITELIST.varname, "set");
verifyConfig(testUser, ConfVars.SCRATCHDIRPERMISSION.varname, HiveAuthzBindingSessionHook.SCRATCH_DIR_PERMISSIONS);
verifyConfig(testUser, HiveConf.ConfVars.HIVE_CONF_RESTRICTED_LIST.varname,
HiveAuthzBindingSessionHook.ACCESS_RESTRICT_LIST);
@@ -263,4 +263,4 @@ public class TestServerConfiguration extends AbstractTestWithHiveServer {
context.close();
}
-}
\ No newline at end of file
+}