You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sentry.apache.org by sd...@apache.org on 2015/10/26 04:22:42 UTC

incubator-sentry git commit: SENTRY-917: Improve TestRuntimeMetadataRetrieval for keeping database policies consistent with Hive metadata (Dapeng Sun, Reviewed by: Guoquan Shen)

Repository: incubator-sentry
Updated Branches:
  refs/heads/hive_plugin_v2 5c2677553 -> 9429a2d38


SENTRY-917: Improve TestRuntimeMetadataRetrieval for keeping database policies consistent with Hive metadata (Dapeng Sun, Reviewed by: Guoquan Shen)


Project: http://git-wip-us.apache.org/repos/asf/incubator-sentry/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-sentry/commit/9429a2d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-sentry/tree/9429a2d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-sentry/diff/9429a2d3

Branch: refs/heads/hive_plugin_v2
Commit: 9429a2d38cf932f17136e5228a243bea94fc4a14
Parents: 5c26775
Author: Sun Dapeng <sd...@apache.org>
Authored: Mon Oct 26 11:14:49 2015 +0800
Committer: Sun Dapeng <sd...@apache.org>
Committed: Mon Oct 26 11:14:49 2015 +0800

----------------------------------------------------------------------
 .../e2e/hive/TestRuntimeMetadataRetrieval.java  | 23 ++++++++++----------
 1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/9429a2d3/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestRuntimeMetadataRetrieval.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestRuntimeMetadataRetrieval.java b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestRuntimeMetadataRetrieval.java
index 0f27a7e..6eb960b 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestRuntimeMetadataRetrieval.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestRuntimeMetadataRetrieval.java
@@ -272,23 +272,24 @@ public class TestRuntimeMetadataRetrieval extends AbstractTestWithStaticConfigur
     statement.execute("CREATE DATABASE " + DB1);
     statement.execute("USE " + DB1);
     createTabs(statement, DB1, tableNames);
+
+    policyFile
+        .addRolesToGroup(USERGROUP1, "tab1_priv,tab2_priv,tab3_priv")
+        .addPermissionsToRole("tab1_priv", "server=server1->db=" + DB1 + "->table="
+            + tableNames[0] + "->action=select")
+        .addPermissionsToRole("tab2_priv", "server=server1->db=" + DB1 + "->table="
+            + tableNames[1] + "->action=insert")
+        .addPermissionsToRole("tab3_priv", "server=server1->db=" + DB1 + "->table="
+            + tableNames[2] + "->action=select")
+        .setUserGroupMapping(StaticUserGroup.getStaticMapping());
+    writePolicyFile(policyFile);
+
     // Admin should see all tables except table_5, the one does not match the pattern
     ResultSet rs = statement.executeQuery("SHOW TABLE EXTENDED IN " + DB1 + " LIKE 'tb*'");
     tableNamesValidation.addAll(Arrays.asList(tableNames).subList(0, 4));
     validateTablesInRs(rs, DB1, tableNamesValidation);
     statement.close();
 
-    policyFile
-            .addRolesToGroup(USERGROUP1, "tab1_priv,tab2_priv,tab3_priv")
-            .addPermissionsToRole("tab1_priv", "server=server1->db=" + DB1 + "->table="
-                    + tableNames[0] + "->action=select")
-            .addPermissionsToRole("tab2_priv", "server=server1->db=" + DB1 + "->table="
-                    + tableNames[1] + "->action=insert")
-            .addPermissionsToRole("tab3_priv", "server=server1->db=" + DB1 + "->table="
-                    + tableNames[2] + "->action=select")
-            .setUserGroupMapping(StaticUserGroup.getStaticMapping());
-    writePolicyFile(policyFile);
-
     connection = context.createConnection(USER1_1);
     statement = context.createStatement(connection);
     statement.execute("USE " + DB1);