Skip to content

HIVE-29016: Disable caching on the Iceberg REST Catalog #5871

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
wants to merge 2 commits into from
Closed

HIVE-29016: Disable caching on the Iceberg REST Catalog #5871

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
edef550
HIVE-29016: Disable caching on the Iceberg REST Catalog
okumin Jun 14, 2025
9690b44
Follow SonarQube
okumin Jun 15, 2025
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
4 changes: 0 additions & 4 deletions ...e/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/conf/MetastoreConf.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1870,10 +1870,6 @@ public enum ConfVars {
"hive.metastore.iceberg.catalog.servlet.auth", "jwt", new StringSetValidator("simple", "jwt"),
"HMS Iceberg Catalog servlet authentication method (simple or jwt)."
),
ICEBERG_CATALOG_CACHE_EXPIRY("metastore.iceberg.catalog.cache.expiry",
"hive.metastore.iceberg.catalog.cache.expiry", 60_000L,
"HMS Iceberg Catalog cache expiry."
),
HTTPSERVER_THREADPOOL_MIN("hive.metastore.httpserver.threadpool.min",
"hive.metastore.httpserver.threadpool.min", 8,
"HMS embedded HTTP server minimum number of threads."
Expand Down
85 changes: 0 additions & 85 deletions ...store/metastore-rest-catalog/src/main/java/org/apache/iceberg/rest/HMSCachingCatalog.java
View file
Open in desktop

This file was deleted.

144 changes: 46 additions & 98 deletions ...store/metastore-rest-catalog/src/main/java/org/apache/iceberg/rest/HMSCatalogAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,12 @@
import org.apache.iceberg.exceptions.NoSuchIcebergTableException;
import org.apache.iceberg.exceptions.NoSuchNamespaceException;
import org.apache.iceberg.exceptions.NoSuchTableException;
import org.apache.iceberg.exceptions.NoSuchViewException;
import org.apache.iceberg.exceptions.NotAuthorizedException;
import org.apache.iceberg.exceptions.RESTException;
import org.apache.iceberg.exceptions.UnprocessableEntityException;
import org.apache.iceberg.exceptions.ValidationException;
import org.apache.iceberg.hive.HiveCatalog;
import org.apache.iceberg.relocated.com.google.common.base.Splitter;
import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap;
import org.apache.iceberg.relocated.com.google.common.collect.Lists;
Expand Down Expand Up @@ -86,14 +88,14 @@ public class HMSCatalogAdapter implements RESTClient {

private static final Map<Class<? extends Exception>, Integer> EXCEPTION_ERROR_CODES =
ImmutableMap.<Class<? extends Exception>, Integer>builder()
.put(NamespaceNotSupported.class, 400)
.put(IllegalArgumentException.class, 400)
.put(ValidationException.class, 400)
.put(NamespaceNotEmptyException.class, 400)
.put(NamespaceNotEmptyException.class, 409)
.put(NotAuthorizedException.class, 401)
.put(ForbiddenException.class, 403)
.put(NoSuchNamespaceException.class, 404)
.put(NoSuchTableException.class, 404)
.put(NoSuchViewException.class, 404)
.put(NoSuchIcebergTableException.class, 404)
.put(UnsupportedOperationException.class, 406)
.put(AlreadyExistsException.class, 409)
Expand All @@ -118,11 +120,10 @@ public class HMSCatalogAdapter implements RESTClient {
private final ViewCatalog asViewCatalog;


public HMSCatalogAdapter(Catalog catalog) {
public HMSCatalogAdapter(HiveCatalog catalog) {
this.catalog = catalog;
this.asNamespaceCatalog =
catalog instanceof SupportsNamespaces ? (SupportsNamespaces) catalog : null;
this.asViewCatalog = catalog instanceof ViewCatalog ? (ViewCatalog) catalog : null;
this.asNamespaceCatalog = catalog;
this.asViewCatalog = catalog;
}

enum HTTPMethod {
Expand Down Expand Up @@ -326,53 +327,36 @@ private OAuthTokenResponse tokens(Object body) {
}

private ListNamespacesResponse listNamespaces(Map<String, String> vars) {
if (asNamespaceCatalog != null) {
Namespace namespace;
if (vars.containsKey("parent")) {
namespace = Namespace.of(RESTUtil.NAMESPACE_SPLITTER.splitToStream(vars.get("parent")).toArray(String[]::new));
} else {
namespace = Namespace.empty();
}
return castResponse(ListNamespacesResponse.class, CatalogHandlers.listNamespaces(asNamespaceCatalog, namespace));
Namespace namespace;
if (vars.containsKey("parent")) {
namespace = Namespace.of(RESTUtil.NAMESPACE_SPLITTER.splitToStream(vars.get("parent")).toArray(String[]::new));
} else {
namespace = Namespace.empty();
}
throw new NamespaceNotSupported(catalog.toString());
return castResponse(ListNamespacesResponse.class, CatalogHandlers.listNamespaces(asNamespaceCatalog, namespace));
}

private CreateNamespaceResponse createNamespace(Object body) {
if (asNamespaceCatalog != null) {
CreateNamespaceRequest request = castRequest(CreateNamespaceRequest.class, body);
return castResponse(
CreateNamespaceResponse.class, CatalogHandlers.createNamespace(asNamespaceCatalog, request));
}
throw new NamespaceNotSupported(catalog.toString());
CreateNamespaceRequest request = castRequest(CreateNamespaceRequest.class, body);
return castResponse(
CreateNamespaceResponse.class, CatalogHandlers.createNamespace(asNamespaceCatalog, request));
}

private GetNamespaceResponse loadNamespace(Map<String, String> vars) {
if (asNamespaceCatalog != null) {
Namespace namespace = namespaceFromPathVars(vars);
return castResponse(
GetNamespaceResponse.class, CatalogHandlers.loadNamespace(asNamespaceCatalog, namespace));
}
throw new NamespaceNotSupported(catalog.toString());
Namespace namespace = namespaceFromPathVars(vars);
return castResponse(GetNamespaceResponse.class, CatalogHandlers.loadNamespace(asNamespaceCatalog, namespace));
}

private RESTResponse dropNamespace(Map<String, String> vars) {
if (asNamespaceCatalog != null) {
CatalogHandlers.dropNamespace(asNamespaceCatalog, namespaceFromPathVars(vars));
}
throw new NamespaceNotSupported(catalog.toString());
CatalogHandlers.dropNamespace(asNamespaceCatalog, namespaceFromPathVars(vars));
return null;
}

private UpdateNamespacePropertiesResponse updateNamespace(Map<String, String> vars, Object body) {
if (asNamespaceCatalog != null) {
Namespace namespace = namespaceFromPathVars(vars);
UpdateNamespacePropertiesRequest request =
castRequest(UpdateNamespacePropertiesRequest.class, body);
return castResponse(
UpdateNamespacePropertiesResponse.class,
CatalogHandlers.updateNamespaceProperties(asNamespaceCatalog, namespace, request));
}
throw new NamespaceNotSupported(catalog.toString());
Namespace namespace = namespaceFromPathVars(vars);
UpdateNamespacePropertiesRequest request = castRequest(UpdateNamespacePropertiesRequest.class, body);
return castResponse(UpdateNamespacePropertiesResponse.class,
CatalogHandlers.updateNamespaceProperties(asNamespaceCatalog, namespace, request));
}

private ListTablesResponse listTables(Map<String, String> vars) {
Expand All @@ -386,11 +370,9 @@ private LoadTableResponse createTable(Map<String, String> vars, Object body) {
CreateTableRequest request = castRequest(CreateTableRequest.class, body);
request.validate();
if (request.stageCreate()) {
return castResponse(
responseType, CatalogHandlers.stageTableCreate(catalog, namespace, request));
return castResponse(responseType, CatalogHandlers.stageTableCreate(catalog, namespace, request));
} else {
return castResponse(
responseType, CatalogHandlers.createTable(catalog, namespace, request));
return castResponse(responseType, CatalogHandlers.createTable(catalog, namespace, request));
}
}

Expand Down Expand Up @@ -439,65 +421,43 @@ private RESTResponse commitTransaction(Object body) {
}

private ListTablesResponse listViews(Map<String, String> vars) {
if (null != asViewCatalog) {
Namespace namespace = namespaceFromPathVars(vars);
String pageToken = PropertyUtil.propertyAsString(vars, "pageToken", null);
String pageSize = PropertyUtil.propertyAsString(vars, "pageSize", null);
if (pageSize != null) {
return castResponse(
ListTablesResponse.class,
CatalogHandlers.listViews(asViewCatalog, namespace, pageToken, pageSize));
} else {
return castResponse(
ListTablesResponse.class, CatalogHandlers.listViews(asViewCatalog, namespace));
}
Namespace namespace = namespaceFromPathVars(vars);
String pageToken = PropertyUtil.propertyAsString(vars, "pageToken", null);
String pageSize = PropertyUtil.propertyAsString(vars, "pageSize", null);
if (pageSize != null) {
return castResponse(ListTablesResponse.class,
CatalogHandlers.listViews(asViewCatalog, namespace, pageToken, pageSize));
} else {
return castResponse(ListTablesResponse.class, CatalogHandlers.listViews(asViewCatalog, namespace));
}
throw new ViewNotSupported(catalog.toString());
}

private LoadViewResponse createView(Map<String, String> vars, Object body) {
if (null != asViewCatalog) {
Namespace namespace = namespaceFromPathVars(vars);
CreateViewRequest request = castRequest(CreateViewRequest.class, body);
return castResponse(
LoadViewResponse.class, CatalogHandlers.createView(asViewCatalog, namespace, request));
}
throw new ViewNotSupported(catalog.toString());
Namespace namespace = namespaceFromPathVars(vars);
CreateViewRequest request = castRequest(CreateViewRequest.class, body);
return castResponse(LoadViewResponse.class, CatalogHandlers.createView(asViewCatalog, namespace, request));
}

private LoadViewResponse loadView(Map<String, String> vars) {
if (null != asViewCatalog) {
TableIdentifier ident = identFromPathVars(vars);
return castResponse(LoadViewResponse.class, CatalogHandlers.loadView(asViewCatalog, ident));
}
throw new ViewNotSupported(catalog.toString());
TableIdentifier ident = identFromPathVars(vars);
return castResponse(LoadViewResponse.class, CatalogHandlers.loadView(asViewCatalog, ident));
}

private LoadViewResponse updateView(Map<String, String> vars, Object body) {
if (null != asViewCatalog) {
TableIdentifier ident = identFromPathVars(vars);
UpdateTableRequest request = castRequest(UpdateTableRequest.class, body);
return castResponse(
LoadViewResponse.class, CatalogHandlers.updateView(asViewCatalog, ident, request));
}
throw new ViewNotSupported(catalog.toString());
TableIdentifier ident = identFromPathVars(vars);
UpdateTableRequest request = castRequest(UpdateTableRequest.class, body);
return castResponse(LoadViewResponse.class, CatalogHandlers.updateView(asViewCatalog, ident, request));
}

private RESTResponse renameView(Object body) {
if (null != asViewCatalog) {
RenameTableRequest request = castRequest(RenameTableRequest.class, body);
CatalogHandlers.renameView(asViewCatalog, request);
RenameTableRequest request = castRequest(RenameTableRequest.class, body);
CatalogHandlers.renameView(asViewCatalog, request);
return null;
}
throw new ViewNotSupported(catalog.toString());
}

private RESTResponse dropView(Map<String, String> vars) {
if (null != asViewCatalog) {
CatalogHandlers.dropView(asViewCatalog, identFromPathVars(vars));
return null;
}
throw new ViewNotSupported(catalog.toString());
CatalogHandlers.dropView(asViewCatalog, identFromPathVars(vars));
return null;
}

/**
Expand Down Expand Up @@ -703,18 +663,6 @@ public void close() {
// The caller is responsible for closing the underlying catalog backing this REST catalog.
}

private static class NamespaceNotSupported extends RuntimeException {
NamespaceNotSupported(String catalog) {
super("catalog " + catalog + " does not support namespace");
}
}

private static class ViewNotSupported extends RuntimeException {
ViewNotSupported(String catalog) {
super("catalog " + catalog + " does not support views");
}
}

private static class BadResponseType extends RuntimeException {
private BadResponseType(Class<?> responseType, Object response) {
super(
Expand Down
Loading
Loading