Skip to content

fix: Allow dropping of empty namespaces #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
xieandrew wants to merge 1 commit into from
Closed

fix: Allow dropping of empty namespaces #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ice-rest-catalog/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,6 @@
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-yaml</artifactId>
<version>${jackson.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.etcd</groupId>
Expand Down
6 changes: 2 additions & 4 deletions ice-rest-catalog/src/main/java/com/altinity/ice/rest/catalog/internal/etcd/EtcdCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ private void validateTableIdentifier(TableIdentifier identifier) {

@Override
public List<Namespace> listNamespaces(Namespace namespace) throws NoSuchNamespaceException {
validateNamespace(namespace);
String prefix = namespaceKey(namespace);
prefix = prefix.endsWith("/") ? prefix : prefix + "/";
GetResponse res = unwrap(kv.get(byteSeq(prefix), GetOption.builder().isPrefix(true).build()));
Expand Down Expand Up @@ -241,11 +240,11 @@ private KeyValue loadNamespaceMetadataRaw(Namespace namespace) throws NoSuchName

@Override
public boolean dropNamespace(Namespace namespace) throws NamespaceNotEmptyException {
validateNamespace(namespace);
if (!namespaceExists(namespace)) {
throw new NoSuchNamespaceException("Namespace does not exist: %s", namespace);
}
if (!listNamespaces(namespace).isEmpty() || !listTables(namespace).isEmpty()) {
if (!namespace.level(0).isEmpty()
&& (!listNamespaces(namespace).isEmpty() || !listTables(namespace).isEmpty())) {
throw new NamespaceNotEmptyException("Cannot drop non-empty namespace: " + namespace);
}
// FIXME: child ns/table might have been created since check ^
Expand Down Expand Up @@ -336,7 +335,6 @@ protected TableOperations newTableOps(TableIdentifier tableIdentifier) {

@Override
public List<TableIdentifier> listTables(Namespace namespace) {
validateNamespace(namespace);
String prefix = tableKey(namespace);
prefix = prefix.endsWith("/") ? prefix : prefix + "/";
GetResponse res = unwrap(kv.get(byteSeq(prefix), GetOption.builder().isPrefix(true).build()));
Expand Down