sentry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jar...@apache.org
Subject git commit: SENTRY-133: Alter table create partition if not exists - results in error (Brock Noland via Jarek Jarcec Cecho)
Date Fri, 07 Mar 2014 18:19:32 GMT
Repository: incubator-sentry
Updated Branches:
  refs/heads/master 3db29d19f -> 0341d51b9


SENTRY-133: Alter table create partition if not exists - results in error (Brock Noland via
Jarek Jarcec Cecho)


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

Branch: refs/heads/master
Commit: 0341d51b9f6f128b80b47678f7f1c5087b645a77
Parents: 3db29d1
Author: Jarek Jarcec Cecho <jarcec@apache.org>
Authored: Fri Mar 7 10:18:39 2014 -0800
Committer: Jarek Jarcec Cecho <jarcec@apache.org>
Committed: Fri Mar 7 10:19:16 2014 -0800

----------------------------------------------------------------------
 .../binding/hive/HiveAuthzBindingHook.java      | 14 +++-
 .../binding/hive/TestHiveAuthzBindingHook.java  | 86 ++++++++++++++++++++
 .../tests/e2e/hive/TestUriPermissions.java      |  7 +-
 3 files changed, 102 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/0341d51b/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 3624e8f..c719905 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
@@ -232,10 +232,16 @@ implements HiveDriverFilterHook {
       return getCanonicalDb();
     }
   }
-  private AccessURI extractPartition(ASTNode ast) throws SemanticException {
-    if(ast.getChildCount() > 2) {
-      return parseURI(BaseSemanticAnalyzer.
-          unescapeSQLString(ast.getChild(2).getChild(0).getText()));
+
+  @VisibleForTesting
+  protected static AccessURI extractPartition(ASTNode ast) throws SemanticException {
+    for (int i = 0; i < ast.getChildCount(); i++) {
+      ASTNode child = (ASTNode)ast.getChild(i);
+      if (child.getToken().getType() == HiveParser.TOK_PARTITIONLOCATION &&
+          child.getChildCount() == 1) {
+        return parseURI(BaseSemanticAnalyzer.
+          unescapeSQLString(child.getChild(0).getText()));
+      }
     }
     return null;
   }

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/0341d51b/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/binding/hive/TestHiveAuthzBindingHook.java
----------------------------------------------------------------------
diff --git a/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/binding/hive/TestHiveAuthzBindingHook.java
b/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/binding/hive/TestHiveAuthzBindingHook.java
new file mode 100644
index 0000000..9dd4774
--- /dev/null
+++ b/sentry-binding/sentry-binding-hive/src/test/java/org/apache/sentry/binding/hive/TestHiveAuthzBindingHook.java
@@ -0,0 +1,86 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sentry.binding.hive;
+
+import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.ql.parse.ASTNode;
+import org.apache.hadoop.hive.ql.parse.ParseDriver;
+import org.apache.hadoop.hive.ql.parse.ParseUtils;
+import org.apache.hadoop.hive.ql.session.SessionState;
+import org.apache.sentry.core.model.db.AccessURI;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestHiveAuthzBindingHook {
+  private static final Logger LOG = LoggerFactory
+      .getLogger(TestHiveAuthzBindingHook.class);
+
+  private ParseDriver parseDriver;
+  private HiveConf conf;
+
+  @Before
+  public void setupTest() throws Exception {
+    conf = new HiveConf();
+    SessionState.start(conf);
+    parseDriver = new ParseDriver();
+  }
+
+  @Test
+  public void testAddPartition() throws Exception {
+    ASTNode ast = parse("alter table parted add partition (day='Monday')");
+    LOG.info("AST: " + ast.toStringTree());
+    AccessURI partitionLocation = HiveAuthzBindingHook.extractPartition(ast);
+    Assert.assertNull("Query without part location should not return location",
+        partitionLocation);
+  }
+  @Test
+  public void testAddPartitionWithLocation() throws Exception {
+    ASTNode ast = parse("alter table parted add partition (day='Monday') location 'file:/'");
+    LOG.info("AST: " + ast.toStringTree());
+    AccessURI partitionLocation = HiveAuthzBindingHook.extractPartition(ast);
+    Assert.assertNotNull("Query with part location must return location",
+        partitionLocation);
+    Assert.assertEquals("file:///", partitionLocation.getName());
+  }
+
+  @Test
+  public void testAddPartitionIfNotExists() throws Exception {
+    ASTNode ast = parse("alter table parted add if not exists partition (day='Monday')");
+    LOG.info("AST: " + ast.toStringTree());
+    AccessURI partitionLocation = HiveAuthzBindingHook.extractPartition(ast);
+    Assert.assertNull("Query without part location should not return location",
+        partitionLocation);
+  }
+  @Test
+  public void testAddPartitionIfNotExistsWithLocation() throws Exception {
+    ASTNode ast = parse("alter table parted add if not exists partition (day='Monday')" +
+        " location 'file:/'");
+    LOG.info("AST: " + ast.toStringTree());
+    AccessURI partitionLocation = HiveAuthzBindingHook.extractPartition(ast);
+    Assert.assertNotNull("Query with part location must return location",
+        partitionLocation);
+    Assert.assertEquals("file:///", partitionLocation.getName());
+  }
+
+  private ASTNode parse(String command) throws Exception {
+    return ParseUtils.findRootNonNullToken(parseDriver.parse(command));
+  }
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-sentry/blob/0341d51b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUriPermissions.java
----------------------------------------------------------------------
diff --git a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUriPermissions.java
b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUriPermissions.java
index 7fd2470..d9330cb 100644
--- a/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUriPermissions.java
+++ b/sentry-tests/sentry-tests-hive/src/test/java/org/apache/sentry/tests/e2e/hive/TestUriPermissions.java
@@ -133,8 +133,11 @@ public class TestUriPermissions extends AbstractTestWithStaticConfiguration
{
     userConn = context.createConnection(USER1_1);
     userStmt = context.createStatement(userConn);
     userStmt.execute("use " + dbName);
-    userStmt.execute("ALTER TABLE " + tabName + " ADD PARTITION (dt = '21-Dec-2012') " +
+    userStmt.execute("ALTER TABLE " + tabName + " ADD IF NOT EXISTS PARTITION (dt = '21-Dec-2012')
" +
             " LOCATION '" + tabDir + "'");
+    userStmt.execute("ALTER TABLE " + tabName + " DROP PARTITION (dt = '21-Dec-2012')");
+    userStmt.execute("ALTER TABLE " + tabName + " ADD PARTITION (dt = '21-Dec-2012') " +
+        " LOCATION '" + tabDir + "'");
     // negative test user1 cannot alter partition location
     context.assertAuthzException(userStmt,
         "ALTER TABLE " + tabName + " PARTITION (dt = '21-Dec-2012') " + " SET LOCATION '"
+ tabDir + "'");
@@ -150,6 +153,8 @@ public class TestUriPermissions extends AbstractTestWithStaticConfiguration
{
     // positive test, user2 can alter managed partitions
     userStmt.execute("ALTER TABLE " + tabName + " ADD PARTITION (dt = '22-Dec-2012')");
     userStmt.execute("ALTER TABLE " + tabName + " DROP PARTITION (dt = '22-Dec-2012')");
+    userStmt.execute("ALTER TABLE " + tabName + " ADD IF NOT EXISTS PARTITION (dt = '22-Dec-2012')");
+    userStmt.execute("ALTER TABLE " + tabName + " DROP PARTITION (dt = '22-Dec-2012')");
     userConn.close();
 
     // negative test: user3 doesn't have privilege to add/drop partitions


Mime
View raw message