Skip to content
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

Jump to bottom

[#2401] improvement(spark-connector): support alter namespace operation #2407

Merged
merged 2 commits into from
Mar 6, 2024
Merged

[#2401] improvement(spark-connector): support alter namespace operation #2407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e18af1f
[#2401] improvement(spark-connector): support alter namespace operation
SteNicholas Mar 1, 2024
9d79a62
[#2401] improvement(spark-connector): support alter namespace operation
SteNicholas Mar 6, 2024
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
28 changes: 23 additions & 5 deletions integration-test/src/test/java/com/datastrato/gravitino/integration/test/spark/SparkIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,39 @@ void testCreateAndLoadSchema() {
Assertions.assertTrue(StringUtils.isBlank(properties));

testDatabaseName = "t_create2";
String testDatabaseLocation = "/tmp/" + testDatabaseName;
sql(
String.format(
"CREATE DATABASE %s COMMENT 'comment' LOCATION '/user'\n"
+ " WITH DBPROPERTIES (ID=001);",
testDatabaseName));
"CREATE DATABASE %s COMMENT 'comment' LOCATION '%s'\n" + " WITH DBPROPERTIES (ID=001);",
testDatabaseName, testDatabaseLocation));
databaseMeta = getDatabaseMetadata(testDatabaseName);
String comment = databaseMeta.get("Comment");
Assertions.assertEquals("comment", comment);
Assertions.assertEquals("datastrato", databaseMeta.get("Owner"));
// underlying catalog may change /user to file:/user
Assertions.assertTrue(databaseMeta.get("Location").contains("/user"));
// underlying catalog may change /tmp/t_create2 to file:/tmp/t_create2
Assertions.assertTrue(databaseMeta.get("Location").contains(testDatabaseLocation));
properties = databaseMeta.get("Properties");
Assertions.assertEquals("((ID,001))", properties);
}

@Test
void testAlterSchema() {
String testDatabaseName = "t_alter";
sql("CREATE DATABASE " + testDatabaseName);
Assertions.assertTrue(
StringUtils.isBlank(getDatabaseMetadata(testDatabaseName).get("Properties")));

sql(String.format("ALTER DATABASE %s SET DBPROPERTIES ('ID'='001')", testDatabaseName));
Assertions.assertEquals("((ID,001))", getDatabaseMetadata(testDatabaseName).get("Properties"));

// Hive metastore doesn't support alter database location, therefore this test method
// doesn't verify ALTER DATABASE database_name SET LOCATION 'new_location'.

Assertions.assertThrowsExactly(
NoSuchNamespaceException.class,
() -> sql("ALTER DATABASE notExists SET DBPROPERTIES ('ID'='001')"));
}

@Test
void testDropSchema() {
String testDatabaseName = "t_drop";
Expand Down
25 changes: 24 additions & 1 deletion spark-connector/src/main/java/com/datastrato/gravitino/spark/catalog/GravitinoCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.datastrato.gravitino.exceptions.NonEmptySchemaException;
import com.datastrato.gravitino.exceptions.SchemaAlreadyExistsException;
import com.datastrato.gravitino.rel.Schema;
import com.datastrato.gravitino.rel.SchemaChange;
import com.datastrato.gravitino.spark.GravitinoSparkConfig;
import com.google.common.base.Preconditions;
import java.util.Arrays;
Expand All @@ -30,6 +31,7 @@
import org.apache.spark.sql.connector.catalog.Column;
import org.apache.spark.sql.connector.catalog.Identifier;
import org.apache.spark.sql.connector.catalog.NamespaceChange;
import org.apache.spark.sql.connector.catalog.NamespaceChange.SetProperty;
import org.apache.spark.sql.connector.catalog.SupportsNamespaces;
import org.apache.spark.sql.connector.catalog.Table;
import org.apache.spark.sql.connector.catalog.TableCatalog;
Expand Down Expand Up @@ -175,7 +177,28 @@ public void createNamespace(String[] namespace, Map<String, String> metadata)
@Override
public void alterNamespace(String[] namespace, NamespaceChange... changes)
throws NoSuchNamespaceException {
throw new NotSupportedException("Doesn't support altering namespace");
validateNamespace(namespace);
SchemaChange[] schemaChanges =
Arrays.stream(changes)
.map(
change -> {
if (change instanceof SetProperty) {
SetProperty setProperty = ((SetProperty) change);
return SchemaChange.setProperty(setProperty.property(), setProperty.value());
} else {
throw new UnsupportedOperationException(
String.format(
"Unsupported namespace change %s", change.getClass().getName()));
}
})
.toArray(SchemaChange[]::new);
try {
gravitinoCatalogClient
.asSchemas()
.alterSchema(NameIdentifier.of(metalakeName, catalogName, namespace[0]), schemaChanges);
} catch (NoSuchSchemaException e) {
throw new NoSuchNamespaceException(namespace);
}
}

@Override
Expand Down
Loading