Skip to content

WIP: Add namespace support for the v2 catalog API #4

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.

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
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
/*
* 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.spark.sql.catalog.v2;

/**
* NamespaceChange subclasses represent requested changes to a namespace. These are passed to
* {@link SupportsNamespaces#alterNamespace}. For example,
* <pre>
* import NamespaceChange._
* val catalog = Catalogs.load(name)
* catalog.namespaces.alterNamespace(ident,
* setProperty("prop", "value"),
* removeProperty("other_prop")
* )
* </pre>
*/
public interface NamespaceChange {
/**
* Create a NamespaceChange for setting a namespace property.
* <p>
* If the property already exists, it will be replaced with the new value.
*
* @param property the property name
* @param value the new property value
* @return a NamespaceChange for the addition
*/
static NamespaceChange setProperty(String property, String value) {
return new SetProperty(property, value);
}

/**
* Create a NamespaceChange for removing a namespace property.
* <p>
* If the property does not exist, the change will succeed.
*
* @param property the property name
* @return a NamespaceChange for the addition
*/
static NamespaceChange removeProperty(String property) {
return new RemoveProperty(property);
}

/**
* A NamespaceChange to set a namespace property.
* <p>
* If the property already exists, it must be replaced with the new value.
*/
final class SetProperty implements NamespaceChange {
private final String property;
private final String value;

private SetProperty(String property, String value) {
this.property = property;
this.value = value;
}

public String property() {
return property;
}

public String value() {
return value;
}
}

/**
* A NamespaceChange to remove a namespace property.
* <p>
* If the property does not exist, the change should succeed.
*/
final class RemoveProperty implements NamespaceChange {
private final String property;

private RemoveProperty(String property) {
this.property = property;
}

public String property() {
return property;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
/*
* 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.spark.sql.catalog.v2;

import org.apache.spark.sql.catalyst.analysis.NamespaceAlreadyExistsException;
import org.apache.spark.sql.catalyst.analysis.NoSuchNamespaceException;

import java.util.Map;

/**
* Catalog methods for working with namespaces.
* <p>
* If an object such as a table, view, or function exists, its parent namespaces must also exist
* and must be returned by the discovery methods {@link #listNamespaces()} and
* {@link #listNamespaces(String[])}.
* <p>
* Catalog implementations are not required to maintain the existence of namespaces independent of
* objects in a namespace. For example, a function catalog that loads functions using reflection
* and uses Java packages as namespaces is not required to support the methods to create, alter, or
* drop a namespace. Implementations are allowed to discover the existence of objects or namespaces
* without throwing {@link NoSuchNamespaceException} when no namespace is found.
*/
public interface SupportsNamespaces extends CatalogPlugin {

/**
* List top-level namespaces from the catalog.
* <p>
* If an object such as a table, view, or function exists, its parent namespaces must also exist
* and must be returned by this discovery method. For example, if table a.b.t exists, this method
* must return ["a"] in the result array.
*
* @return an array of multi-part namespace names
*/
String[][] listNamespaces() throws NoSuchNamespaceException;

/**
* List namespaces in a namespace.
* <p>
* If an object such as a table, view, or function exists, its parent namespaces must also exist
* and must be returned by this discovery method. For example, if table a.b.t exists, this method
* invoked as listNamespaces(["a"]) must return ["a", "b"] in the result array.
*
* @param namespace a multi-part namespace
* @return an array of multi-part namespace names
* @throws NoSuchNamespaceException If the namespace does not exist (optional)
*/
String[][] listNamespaces(String[] namespace) throws NoSuchNamespaceException;

/**
* Test whether a namespace exists.
* <p>
* If an object such as a table, view, or function exists, its parent namespaces must also exist.
* For example, if table a.b.t exists, this method invoked as namespaceExists(["a"]) or
* namespaceExists(["a", "b"]) must return true.
*
* @param namespace a multi-part namespace
* @return true if the namespace exists, false otherwise
*/
default boolean namespaceExists(String[] namespace) {
try {
loadNamespaceMetadata(namespace);
return true;
} catch (NoSuchNamespaceException e) {
return false;
}
}

/**
* Load metadata properties for a namespace.
*
* @param namespace a multi-part namespace
* @return a string map of properties for the given namespace
* @throws NoSuchNamespaceException If the namespace does not exist (optional)
* @throws UnsupportedOperationException If namespace properties are not supported
*/
Map<String, String> loadNamespaceMetadata(String[] namespace) throws NoSuchNamespaceException;

/**
* Create a namespace in the catalog.
*
* @param namespace a multi-part namespace
* @param metadata a string map of properties for the given namespace
* @throws NamespaceAlreadyExistsException If the namespace already exists
* @throws UnsupportedOperationException If create is not a supported operation
*/
void createNamespace(
String[] namespace,
Map<String, String> metadata) throws NamespaceAlreadyExistsException;

/**
* Apply a set of metadata changes to a namespace in the catalog.
*
* @param namespace a multi-part namespace
* @param changes a collection of changes to apply to the namespace
* @throws NoSuchNamespaceException If the namespace does not exist (optional)
* @throws UnsupportedOperationException If namespace properties are not supported
*/
void alterNamespace(
String[] namespace,
NamespaceChange... changes) throws NoSuchNamespaceException;

/**
* Drop a namespace from the catalog.
* <p>
* This operation may be rejected by the catalog implementation if the namespace is not empty by
* throwing {@link IllegalStateException}. If the catalog implementation does not support this
* operation, it may throw {@link UnsupportedOperationException}.
*
* @param namespace a multi-part namespace
* @return true if the namespace was dropped
* @throws NoSuchNamespaceException If the namespace does not exist (optional)
* @throws IllegalStateException If the namespace is not empty
* @throws UnsupportedOperationException If drop is not a supported operation
*/
boolean dropNamespace(String[] namespace) throws NoSuchNamespaceException;
}
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ default boolean tableExists(Identifier ident) {
* @param partitions transforms to use for partitioning data in the table
* @param properties a string map of table properties
* @return metadata for the new table
* @throws TableAlreadyExistsException If a table already exists for the identifier
* @throws TableAlreadyExistsException If a table or view already exists for the identifier
* @throws UnsupportedOperationException If a requested partition transform is not supported
* @throws NoSuchNamespaceException If the identifier namespace does not exist (optional)
*/
Expand Down