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/10/29 21:06:04 UTC
[iceberg] 02/09: 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 0.12.x
in repository https://gitbox.apache.org/repos/asf/iceberg.git
commit 8ff9c339a7dca7f5bed6e593f67c843b6622e96a
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 f9bef15..ebf4964 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
@@ -248,7 +248,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) {