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.

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

fix(iceberg): listnamespaces includes warehouse name as root #12761

Merged
merged 3 commits into from
Mar 3, 2025
Merged
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
6 changes: 6 additions & 0 deletions metadata-service/iceberg-catalog/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,9 @@ disallow_untyped_defs = false

[tool.pyright]
extraPaths = ['tests']

[tool.pytest.ini_options]
markers = [
"quick: marks limited tests for a quick validation",
"serial",
]
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,9 @@ def test_iceberg_quick(spark_session, warehouse):
_test_basic_view_ops(spark_session)
_test_rename_ops(spark_session)

result = spark_session.sql("show namespaces")
assert (result[result["namespace"] == "default"].count() == 1)


def _create_table(spark_session, ns, table_name):
spark_session.sql("create namespace if not exists default")
Expand All @@ -221,12 +224,19 @@ def _create_table(spark_session, ns, table_name):

spark_session.sql(f"insert into {ns}.{table_name} values (1, 'foo' ) ")

result = spark_session.sql("show namespaces")
assert (result[result["namespace"] == "default"].count() == 1)

result = spark_session.sql("show namespaces in default")
assert (result[result["namespace"] == f"{ns}"].count() == 1)



def test_load_tables(spark_session, warehouse):
namespace_count = 3
table_count = 4
namespace_count = 2
table_count = 2
for ns_index in range(namespace_count):
ns = f"default_ns{ns_index}"
ns = f"default.ns{ns_index}"
for table_index in range(table_count):
table_name = f"table_{table_index}"
_create_table(spark_session, ns, table_name)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ public static String parentDir(String fileLocation) {
}

public static String namespaceNameFromContainerUrn(Urn urn) {
return urn.toString().substring(NAMESPACE_CONTAINER_PREFIX.length());
// Must do inverse of implementation of method containerUrn(String platformInstance, String[]
// levels) in this file
String namespaceWithPlatformInstance =
urn.toString().substring(NAMESPACE_CONTAINER_PREFIX.length());
return namespaceWithPlatformInstance.substring(namespaceWithPlatformInstance.indexOf('.') + 1);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ public void testListNamespaces_NestedNamespace() throws Exception {
SearchResult mockResult = mock(SearchResult.class);
List<SearchEntity> entitiesList =
Arrays.asList(
createSearchEntity("urn:li:container:iceberg__parent.ns1"),
createSearchEntity("urn:li:container:iceberg__parent.ns2"));
createSearchEntity("urn:li:container:iceberg__platformInstance.parent.ns1"),
createSearchEntity("urn:li:container:iceberg__platformInstance.parent.ns2"));
SearchEntityArray entities = new SearchEntityArray();
entities.addAll(entitiesList);
when(mockResult.getEntities()).thenReturn(entities);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ public void testContainerUrn() {

assertNotNull(containerUrn);
assertEquals(containerUrn.toString(), "urn:li:container:iceberg__testInstance.db.schema");

Namespace namespaceFromUrn =
Namespace.of(Utils.namespaceNameFromContainerUrn(containerUrn).split("\\."));
assertEquals(namespaceFromUrn, namespace);
}

@Test
Expand Down
Loading