jerryshao commented on code in PR #12454:
URL: https://github.com/apache/gravitino/pull/12454#discussion_r3793486917
##########
core/src/main/java/org/apache/gravitino/storage/relational/service/MetalakeMetaService.java:
##########
@@ -318,18 +320,18 @@ public boolean deleteMetalake(NameIdentifier ident,
boolean cascade) {
ViewMetaMapper.class,
mapper ->
mapper.softDeleteViewMetasByMetalakeId(metalakeId)));
} else {
- List<CatalogEntity> catalogEntities =
- CatalogMetaService.getInstance()
-
.listCatalogsByNamespace(NamespaceUtil.ofCatalog(ident.name()));
- if (!catalogEntities.isEmpty()) {
- throw new NonEmptyEntityException(
- "Entity %s has sub-entities, you should remove sub-entities
first", ident);
- }
SessionUtils.doMultipleWithCommit(
- () ->
- SessionUtils.doWithoutCommit(
- MetalakeMetaMapper.class,
- mapper ->
mapper.softDeleteMetalakeMetaByMetalakeId(metalakeId)),
+ () -> {
+ deleteMetalakeWithVersion(ident, metalakeId, currentVersion);
+ List<CatalogPO> catalogPOs =
+ SessionUtils.getWithoutCommit(
+ CatalogMetaMapper.class,
+ mapper -> mapper.listCatalogPOsByMetalakeId(metalakeId));
+ if (!catalogPOs.isEmpty()) {
+ throw new NonEmptyEntityException(
+ "Entity %s has sub-entities, you should remove
sub-entities first", ident);
+ }
Review Comment:
Can you add the omments?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
