adutra commented on code in PR #8857:
URL: https://github.com/apache/iceberg/pull/8857#discussion_r1365251661
##########
nessie/src/main/java/org/apache/iceberg/nessie/NessieIcebergClient.java:
##########
@@ -181,23 +182,83 @@ public IcebergTable table(TableIdentifier
tableIdentifier) {
}
public void createNamespace(Namespace namespace, Map<String, String>
metadata) {
+ getRef().checkMutable();
+
+ if (namespace.isEmpty()) {
+ throw new IllegalArgumentException("Creating empty namespaces is not
supported");
+ }
+
+ ContentKey key = ContentKey.of(namespace.levels());
+ org.projectnessie.model.Namespace content =
+ org.projectnessie.model.Namespace.of(key.getElements(), metadata);
+
try {
- getRef().checkMutable();
- withReference(
- getApi()
- .createNamespace()
-
.namespace(org.projectnessie.model.Namespace.of(namespace.levels()))
- .properties(metadata))
- .create();
- refresh();
- } catch (NessieNamespaceAlreadyExistsException e) {
- throw new AlreadyExistsException(e, "Namespace already exists: %s",
namespace);
+
+ // First, check that the namespace doesn't exist at the current hash;
+ // this will avoid a NessieBadRequestException when committing the
namespace creation
+ Reference ref = getReference();
+ Map<ContentKey, Content> contentMap =
api.getContent().reference(ref).key(key).get();
+ Content existing = contentMap.get(key);
+ if (existing != null) {
+ throwNamespaceAlreadyExists(key, existing);
+ }
+
+ try {
+
+ CommitMultipleOperationsBuilder commitBuilder =
+ api.commitMultipleOperations()
+ .commitMeta(
+ NessieUtil.buildCommitMetadata("create namespace " + key,
catalogOptions))
+ .operation(Operation.Put.of(key, content));
+
+ Tasks.foreach(commitBuilder)
+ .retry(5)
+ .stopRetryOn(
+ NessieReferenceNotFoundException.class,
NessieReferenceConflictException.class)
+ .throwFailureWhenFinished()
+ .onFailure((o, exception) -> refresh())
+ .run(
+ b -> {
Review Comment:
I'll use `builder` if you don't mind, `commit` looks a bit weird too :
`commit.branch(...).commit()`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org
For additional commands, e-mail: issues-h...@iceberg.apache.org
