You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iceberg.apache.org by bl...@apache.org on 2021/09/13 15:38:25 UTC

[iceberg] branch master updated: AWS: Fix DynamoDbCatalog.dropNamespace attr check (#3035)

This is an automated email from the ASF dual-hosted git repository.

blue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iceberg.git


The following commit(s) were added to refs/heads/master by this push:
     new e0b20d4  AWS: Fix DynamoDbCatalog.dropNamespace attr check (#3035)
e0b20d4 is described below

commit e0b20d42bbbcf4e066cd567095802ddcfea752a5
Author: Bijan Houle <bi...@users.noreply.github.com>
AuthorDate: Mon Sep 13 09:38:16 2021 -0600

    AWS: Fix DynamoDbCatalog.dropNamespace attr check (#3035)
---
 .../org/apache/iceberg/aws/dynamodb/DynamoDbCatalogTest.java | 12 ++++++++++++
 .../org/apache/iceberg/aws/dynamodb/DynamoDbCatalog.java     |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/aws/src/integration/java/org/apache/iceberg/aws/dynamodb/DynamoDbCatalogTest.java b/aws/src/integration/java/org/apache/iceberg/aws/dynamodb/DynamoDbCatalogTest.java
index 8d4273c..9074d28 100644
--- a/aws/src/integration/java/org/apache/iceberg/aws/dynamodb/DynamoDbCatalogTest.java
+++ b/aws/src/integration/java/org/apache/iceberg/aws/dynamodb/DynamoDbCatalogTest.java
@@ -283,6 +283,18 @@ public class DynamoDbCatalogTest {
     Assert.assertEquals(2, table.schema().columns().size());
   }
 
+  @Test
+  public void testDropNamespace() {
+    Namespace namespace = Namespace.of(genRandomName());
+    catalog.createNamespace(namespace);
+    catalog.dropNamespace(namespace);
+    GetItemResponse response = dynamo.getItem(GetItemRequest.builder()
+            .tableName(catalogTableName)
+            .key(DynamoDbCatalog.namespacePrimaryKey(namespace))
+            .build());
+    Assert.assertFalse("namespace must not exist", response.hasItem());
+  }
+
   private static String genRandomName() {
     return UUID.randomUUID().toString().replace("-", "");
   }
diff --git a/aws/src/main/java/org/apache/iceberg/aws/dynamodb/DynamoDbCatalog.java b/aws/src/main/java/org/apache/iceberg/aws/dynamodb/DynamoDbCatalog.java
index 89e4671..b9443e4 100644
--- a/aws/src/main/java/org/apache/iceberg/aws/dynamodb/DynamoDbCatalog.java
+++ b/aws/src/main/java/org/apache/iceberg/aws/dynamodb/DynamoDbCatalog.java
@@ -256,7 +256,7 @@ public class DynamoDbCatalog extends BaseMetastoreCatalog implements Closeable,
       dynamo.deleteItem(DeleteItemRequest.builder()
           .tableName(awsProperties.dynamoDbTableName())
           .key(namespacePrimaryKey(namespace))
-          .conditionExpression("attribute_exists(" + namespace + ")")
+          .conditionExpression("attribute_exists(" + COL_NAMESPACE + ")")
           .build());
       return true;
     } catch (ConditionalCheckFailedException e) {