yuqi1129 commented on code in PR #8297:
URL: https://github.com/apache/gravitino/pull/8297#discussion_r2314728445
##########
build.gradle.kts:
##########
@@ -564,9 +569,9 @@ subprojects {
exclude("test/**")
}
}
- tasks.named("compileJava").configure {
- dependsOn("spotlessCheck")
- }
+// tasks.named("compileJava").configure {
Review Comment:
Please remove it if it's unused.
##########
core/src/main/java/org/apache/gravitino/cache/CaffeineEntityCache.java:
##########
@@ -331,18 +346,66 @@ private <KEY, VALUE> Caffeine<KEY, VALUE>
newBaseBuilder(Config cacheConfig) {
}
/**
- * Invalidates the entities by the given cache key.
+ * Invalidate entities with iterative BFS algorithm.
*
* @param identifier The identifier of the entity to invalidate
*/
- private boolean invalidateEntities(NameIdentifier identifier) {
- List<EntityCacheKey> entityKeysToRemove =
-
Lists.newArrayList(cacheIndex.getValuesForKeysStartingWith(identifier.toString()));
+ private boolean invalidateEntities(
+ NameIdentifier identifier,
+ Entity.EntityType type,
+ Optional<SupportsRelationOperations.Type> relTypeOpt) {
+ Queue<EntityCacheKey> queue = new ArrayDeque<>();
- cacheData.invalidateAll(entityKeysToRemove);
- entityKeysToRemove.forEach(key -> cacheIndex.remove(key.toString()));
+ EntityCacheKey valueForExactKey;
+ if (relTypeOpt.isEmpty()) {
+ valueForExactKey =
+ cacheIndex.getValueForExactKey(EntityCacheKey.of(identifier,
type).toString());
+ } else {
+ valueForExactKey =
+ cacheIndex.getValueForExactKey(
+ EntityCacheRelationKey.of(identifier, type,
relTypeOpt.get()).toString());
+ }
+
+ if (valueForExactKey == null) {
+ // No key to remove
+ return false;
+ }
+
+ queue.offer(valueForExactKey);
+
+ while (!queue.isEmpty()) {
+ EntityCacheKey currentKeyToRemove = queue.poll();
+
+ cacheData.invalidate(currentKeyToRemove);
+ cacheIndex.remove(currentKeyToRemove.toString());
+
+ // Remove related entity keys
+ List<EntityCacheKey> relatedEntityKeysToRemove =
+ Lists.newArrayList(
+
cacheIndex.getValuesForKeysStartingWith(currentKeyToRemove.identifier().toString()));
+ relatedEntityKeysToRemove.forEach(queue::offer);
Review Comment:
queue.addAll
##########
core/src/main/java/org/apache/gravitino/cache/CaffeineEntityCache.java:
##########
@@ -331,18 +346,66 @@ private <KEY, VALUE> Caffeine<KEY, VALUE>
newBaseBuilder(Config cacheConfig) {
}
/**
- * Invalidates the entities by the given cache key.
+ * Invalidate entities with iterative BFS algorithm.
*
* @param identifier The identifier of the entity to invalidate
*/
- private boolean invalidateEntities(NameIdentifier identifier) {
- List<EntityCacheKey> entityKeysToRemove =
-
Lists.newArrayList(cacheIndex.getValuesForKeysStartingWith(identifier.toString()));
+ private boolean invalidateEntities(
+ NameIdentifier identifier,
+ Entity.EntityType type,
+ Optional<SupportsRelationOperations.Type> relTypeOpt) {
+ Queue<EntityCacheKey> queue = new ArrayDeque<>();
- cacheData.invalidateAll(entityKeysToRemove);
- entityKeysToRemove.forEach(key -> cacheIndex.remove(key.toString()));
+ EntityCacheKey valueForExactKey;
+ if (relTypeOpt.isEmpty()) {
+ valueForExactKey =
+ cacheIndex.getValueForExactKey(EntityCacheKey.of(identifier,
type).toString());
+ } else {
+ valueForExactKey =
+ cacheIndex.getValueForExactKey(
+ EntityCacheRelationKey.of(identifier, type,
relTypeOpt.get()).toString());
+ }
Review Comment:
```
String entityCacheKeyString = relTypeOpt.isEmpty() ?
EntityCacheKey.of(identifier, type).toString() :
EntityCacheRelationKey.of(identifier, type, relTypeOpt.get()).toString();
valueForExactKey = cacheIndex.getValueForExactKey
```
##########
core/src/main/java/org/apache/gravitino/cache/ReverseIndexRules.java:
##########
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.gravitino.cache;
+
+import org.apache.gravitino.Entity;
+import org.apache.gravitino.NameIdentifier;
+import org.apache.gravitino.Namespace;
+import org.apache.gravitino.meta.GroupEntity;
+import org.apache.gravitino.meta.RoleEntity;
+import org.apache.gravitino.meta.UserEntity;
+import org.apache.gravitino.utils.NamespaceUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Reverse index rules for different entity types. This class defines how to
process reverse
+ * indexing for UserEntity, GroupEntity, and RoleEntity. <br>
+ * For example: - UserEntity role is
{metalake-name}.system.user.{user-name}:USER-{serial-number} -
+ * UserEntity role is
{metalake-name}.system.group.{group-name}:GROUP-{serial-number} - RoleEntity
+ * role is {metalake-name}.system.role.{role-name}:ROLE-{serial-number} -
{serial-number}: Because
+ */
+public class ReverseIndexRules {
+ private static final Logger LOG =
LoggerFactory.getLogger(ReverseIndexRules.class.getName());
+
+ /** UserEntity reverse index processor */
+ public static final ReverseIndexCache.ReverseIndexRule USER_REVERSE_RULE =
+ (entity, key, reverseIndexCache) -> {
+ UserEntity userEntity = (UserEntity) entity;
+ if (userEntity.roleNames() != null) {
+ userEntity
+ .roleNames()
+ .forEach(
+ role -> {
+ Namespace ns =
NamespaceUtil.ofRole(userEntity.namespace().level(0));
+ NameIdentifier nameIdentifier = NameIdentifier.of(ns,
role);
+ reverseIndexCache.put(nameIdentifier,
Entity.EntityType.ROLE, key);
+ });
+ }
+ };
+
+ /** GroupEntity reverse index processor */
+ public static final ReverseIndexCache.ReverseIndexRule GROUP_REVERSE_RULE =
+ (entity, key, reverseIndexCache) -> {
+ GroupEntity groupEntity = (GroupEntity) entity;
+ if (groupEntity.roleNames() != null) {
+ groupEntity
+ .roleNames()
+ .forEach(
+ role -> {
+ Namespace ns =
NamespaceUtil.ofRole(groupEntity.namespace().level(0));
+ NameIdentifier nameIdentifier = NameIdentifier.of(ns,
role);
+ reverseIndexCache.put(nameIdentifier,
Entity.EntityType.ROLE, key);
+ });
+ }
+ };
+
+ /** * RoleEntity reverse index processor */
+ public static final ReverseIndexCache.ReverseIndexRule ROLE_REVERSE_RULE =
+ (entity, key, reverseIndexCache) -> {
+ RoleEntity roleEntity = (RoleEntity) entity;
+ if (roleEntity.securableObjects() != null) {
+ roleEntity
+ .securableObjects()
+ .forEach(
+ securableObject -> {
+ Namespace namespace = Namespace.empty();
+ Entity.EntityType entityType = Entity.EntityType.METALAKE;
+ switch (securableObject.type()) {
+ case METALAKE:
+ entityType = Entity.EntityType.METALAKE;
+ namespace = NamespaceUtil.ofMetalake();
+ break;
+ case CATALOG:
+ entityType = Entity.EntityType.CATALOG;
+ namespace =
NamespaceUtil.ofCatalog(roleEntity.namespace().level(0));
+ break;
+ case FILESET:
+ entityType = Entity.EntityType.FILESET;
+ Namespace nsParent =
Namespace.fromString(securableObject.parent());
+ namespace =
+ NamespaceUtil.ofFileset(
+ roleEntity.namespace().level(0),
+ nsParent.level(0),
+ nsParent.level(1));
+ break;
+ default:
Review Comment:
cc @xunliu
--
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]
