Skip to content

Spark: Allow create table in hadoop catalog root namespace #4024

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

Merged
rdblue merged 2 commits into from
Feb 2, 2022
Merged

Spark: Allow create table in hadoop catalog root namespace #4024

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
db8de9b
Spark: Allow create table in hadoop catalog root namespace
pan3793 Feb 1, 2022
7d87239
nit
pan3793 Feb 2, 2022
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
6 changes: 6 additions & 0 deletions spark/v3.0/spark/src/main/java/org/apache/iceberg/spark/SparkCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,10 @@ private Pair<Table, Long> load(Identifier ident) {
return Pair.of(icebergCatalog.loadTable(buildIdentifier(ident)), null);

} catch (org.apache.iceberg.exceptions.NoSuchTableException e) {
if (ident.namespace().length == 0) {
throw e;
}

// if the original load didn't work, the identifier may be extended and include a snapshot selector
TableIdentifier namespaceAsIdent = buildIdentifier(namespaceToIdentifier(ident.namespace()));
Table table;
Expand Down Expand Up @@ -567,6 +571,8 @@ private Pair<Table, Long> loadFromPathIdentifier(PathIdentifier ident) {
}

private Identifier namespaceToIdentifier(String[] namespace) {
Preconditions.checkArgument(namespace.length > 0,
"Cannot convert empty namespace to identifier");
String[] ns = Arrays.copyOf(namespace, namespace.length - 1);
String name = namespace[ns.length];
return Identifier.of(ns, name);
Expand Down
11 changes: 11 additions & 0 deletions spark/v3.0/spark/src/test/java/org/apache/iceberg/spark/sql/TestCreateTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,17 @@ public void testCreateTable() {
table.properties().get(TableProperties.DEFAULT_FILE_FORMAT));
}

@Test
public void testCreateTableInRootNamespace() {
Assume.assumeTrue("Hadoop has no default namespace configured", "testhadoop".equals(catalogName));

try {
sql("CREATE TABLE %s.table (id bigint) USING iceberg", catalogName);
} finally {
sql("DROP TABLE IF EXISTS %s.table", catalogName);
}
}

@Test
public void testCreateTableUsingParquet() {
Assume.assumeTrue(
Expand Down
6 changes: 6 additions & 0 deletions spark/v3.1/spark/src/main/java/org/apache/iceberg/spark/SparkCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,10 @@ private Pair<Table, Long> load(Identifier ident) {
return Pair.of(icebergCatalog.loadTable(buildIdentifier(ident)), null);

} catch (org.apache.iceberg.exceptions.NoSuchTableException e) {
if (ident.namespace().length == 0) {
throw e;
}

// if the original load didn't work, the identifier may be extended and include a snapshot selector
TableIdentifier namespaceAsIdent = buildIdentifier(namespaceToIdentifier(ident.namespace()));
Table table;
Expand Down Expand Up @@ -567,6 +571,8 @@ private Pair<Table, Long> loadFromPathIdentifier(PathIdentifier ident) {
}

private Identifier namespaceToIdentifier(String[] namespace) {
Preconditions.checkArgument(namespace.length > 0,
"Cannot convert empty namespace to identifier");
String[] ns = Arrays.copyOf(namespace, namespace.length - 1);
String name = namespace[ns.length];
return Identifier.of(ns, name);
Expand Down
11 changes: 11 additions & 0 deletions spark/v3.1/spark/src/test/java/org/apache/iceberg/spark/sql/TestCreateTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,17 @@ public void testCreateTable() {
table.properties().get(TableProperties.DEFAULT_FILE_FORMAT));
}

@Test
public void testCreateTableInRootNamespace() {
Assume.assumeTrue("Hadoop has no default namespace configured", "testhadoop".equals(catalogName));

try {
sql("CREATE TABLE %s.table (id bigint) USING iceberg", catalogName);
} finally {
sql("DROP TABLE IF EXISTS %s.table", catalogName);
}
}

@Test
public void testCreateTableUsingParquet() {
Assume.assumeTrue(
Expand Down
6 changes: 6 additions & 0 deletions spark/v3.2/spark/src/main/java/org/apache/iceberg/spark/SparkCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,10 @@ private Pair<Table, Long> load(Identifier ident) {
return Pair.of(icebergCatalog.loadTable(buildIdentifier(ident)), null);

} catch (org.apache.iceberg.exceptions.NoSuchTableException e) {
if (ident.namespace().length == 0) {
throw e;
}

// if the original load didn't work, the identifier may be extended and include a snapshot selector
TableIdentifier namespaceAsIdent = buildIdentifier(namespaceToIdentifier(ident.namespace()));
Table table;
Expand Down Expand Up @@ -567,6 +571,8 @@ private Pair<Table, Long> loadFromPathIdentifier(PathIdentifier ident) {
}

private Identifier namespaceToIdentifier(String[] namespace) {
Preconditions.checkArgument(namespace.length > 0,
"Cannot convert empty namespace to identifier");
String[] ns = Arrays.copyOf(namespace, namespace.length - 1);
String name = namespace[ns.length];
return Identifier.of(ns, name);
Expand Down
11 changes: 11 additions & 0 deletions spark/v3.2/spark/src/test/java/org/apache/iceberg/spark/sql/TestCreateTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,17 @@ public void testCreateTable() {
table.properties().get(TableProperties.DEFAULT_FILE_FORMAT));
}

@Test
public void testCreateTableInRootNamespace() {
Assume.assumeTrue("Hadoop has no default namespace configured", "testhadoop".equals(catalogName));

try {
sql("CREATE TABLE %s.table (id bigint) USING iceberg", catalogName);
} finally {
sql("DROP TABLE IF EXISTS %s.table", catalogName);
}
}

@Test
public void testCreateTableUsingParquet() {
Assume.assumeTrue(
Expand Down