yuqi1129 commented on code in PR #7349:
URL: https://github.com/apache/gravitino/pull/7349#discussion_r2145039326
##########
server-common/src/main/java/org/apache/gravitino/server/authorization/MetadataIdConverter.java:
##########
@@ -17,15 +17,151 @@
package org.apache.gravitino.server.authorization;
+import static
org.apache.gravitino.catalog.CapabilityHelpers.applyCaseSensitive;
+import static org.apache.gravitino.catalog.CapabilityHelpers.getCapability;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import java.io.IOException;
+import java.util.Map;
+import java.util.regex.Pattern;
+import org.apache.gravitino.Entity;
+import org.apache.gravitino.EntityStore;
+import org.apache.gravitino.GravitinoEnv;
+import org.apache.gravitino.HasIdentifier;
import org.apache.gravitino.MetadataObject;
+import org.apache.gravitino.NameIdentifier;
+import org.apache.gravitino.catalog.CatalogManager;
+import org.apache.gravitino.connector.capability.Capability;
+import org.apache.gravitino.meta.BaseMetalake;
+import org.apache.gravitino.meta.CatalogEntity;
+import org.apache.gravitino.meta.ColumnEntity;
+import org.apache.gravitino.meta.FilesetEntity;
+import org.apache.gravitino.meta.ModelEntity;
+import org.apache.gravitino.meta.ModelVersionEntity;
+import org.apache.gravitino.meta.RoleEntity;
+import org.apache.gravitino.meta.SchemaEntity;
+import org.apache.gravitino.meta.TableEntity;
+import org.apache.gravitino.meta.TagEntity;
+import org.apache.gravitino.meta.TopicEntity;
+import org.apache.gravitino.meta.UserEntity;
/** It is used to convert MetadataObject to MetadataId */
public class MetadataIdConverter {
+ private static final Pattern DOT_PATTERN = Pattern.compile("\\.");
+ // Maps metadata type to entity type.
+ private static final Map<MetadataObject.Type, Entity.EntityType>
METADATA_TO_ENTITY_TYPE_MAPPING =
+ ImmutableMap.of(
+ MetadataObject.Type.METALAKE, Entity.EntityType.METALAKE,
+ MetadataObject.Type.CATALOG, Entity.EntityType.CATALOG,
+ MetadataObject.Type.SCHEMA, Entity.EntityType.SCHEMA,
+ MetadataObject.Type.TABLE, Entity.EntityType.TABLE,
+ MetadataObject.Type.MODEL, Entity.EntityType.MODEL,
+ MetadataObject.Type.FILESET, Entity.EntityType.FILESET,
+ MetadataObject.Type.TOPIC, Entity.EntityType.TOPIC,
+ MetadataObject.Type.COLUMN, Entity.EntityType.COLUMN,
+ MetadataObject.Type.ROLE, Entity.EntityType.ROLE);
+ // Maps metadata type to capability scope
+ private static final Map<MetadataObject.Type, Capability.Scope>
METADATA_SCOPE_MAPPING =
+ ImmutableMap.of(
+ MetadataObject.Type.SCHEMA, Capability.Scope.SCHEMA,
+ MetadataObject.Type.TABLE, Capability.Scope.TABLE,
+ MetadataObject.Type.MODEL, Capability.Scope.MODEL,
+ MetadataObject.Type.FILESET, Capability.Scope.FILESET,
+ MetadataObject.Type.TOPIC, Capability.Scope.TOPIC,
+ MetadataObject.Type.COLUMN, Capability.Scope.COLUMN);
+ // Maps entity type to entity class.
+ private static final Map<Entity.EntityType, Class<?>> ENTITY_CLASS_MAPPING =
+ ImmutableMap.<Entity.EntityType, Class<?>>builder()
+ .put(Entity.EntityType.METALAKE, BaseMetalake.class)
+ .put(Entity.EntityType.CATALOG, CatalogEntity.class)
+ .put(Entity.EntityType.SCHEMA, SchemaEntity.class)
+ .put(Entity.EntityType.TABLE, TableEntity.class)
+ .put(Entity.EntityType.FILESET, FilesetEntity.class)
+ .put(Entity.EntityType.MODEL, ModelEntity.class)
+ .put(Entity.EntityType.TOPIC, TopicEntity.class)
+ .put(Entity.EntityType.TAG, TagEntity.class)
+ .put(Entity.EntityType.MODEL_VERSION, ModelVersionEntity.class)
+ .put(Entity.EntityType.COLUMN, ColumnEntity.class)
+ .put(Entity.EntityType.USER, UserEntity.class)
+ .put(Entity.EntityType.GROUP, Entity.class)
+ .put(Entity.EntityType.ROLE, RoleEntity.class)
+ .build();
private MetadataIdConverter() {}
- public static Long doConvert(MetadataObject metadataObject) {
- // TODO depend on MetaCache
- return 0L;
+ /**
+ * Converts the given metadata object to metadata id.
+ *
+ * @param metadataObject The metadata object to convert.
+ * @param metalake The metalake name.
+ * @return The metadata id.
+ * @throws IOException if an error occurs while loading the entity.
+ */
+ public static Long getID(MetadataObject metadataObject, String metalake)
throws IOException {
+ CatalogManager catalogManager =
GravitinoEnv.getInstance().catalogManager();
+ EntityStore entityStore = GravitinoEnv.getInstance().entityStore();
+
+ return getID(metadataObject, metalake, catalogManager, entityStore);
+ }
+
+ @VisibleForTesting
+ static Long getID(
+ MetadataObject metadataObject,
+ String metalake,
+ CatalogManager catalogManager,
+ EntityStore entityStore)
+ throws IOException {
+ Preconditions.checkArgument(metadataObject != null, "Metadata object
cannot be null");
+
+ MetadataObject.Type metadataType = metadataObject.type();
+ NameIdentifier ident =
+ (metadataType != MetadataObject.Type.METALAKE)
+ ? NameIdentifier.of(DOT_PATTERN.split(metalake + "." +
metadataObject.fullName()))
+ : NameIdentifier.of(metadataObject.fullName());
+
+ NameIdentifier normalizedIdent =
+ normalizeCaseSensitive(ident,
METADATA_SCOPE_MAPPING.get(metadataType), catalogManager);
+
+ Entity.EntityType entityType = getEntityType(metadataType);
+
+ Entity entity;
+ try {
+ entity = entityStore.get(normalizedIdent, entityType,
getEntityClass(entityType));
+ } catch (IOException e) {
+ throw new IOException("Failed to convert metadata object: " +
metadataObject.fullName(), e);
Review Comment:
The message should be `failed to load entity from `entitystore`....` or
something similar.
##########
server-common/src/main/java/org/apache/gravitino/server/authorization/MetadataIdConverter.java:
##########
@@ -17,15 +17,151 @@
package org.apache.gravitino.server.authorization;
+import static
org.apache.gravitino.catalog.CapabilityHelpers.applyCaseSensitive;
+import static org.apache.gravitino.catalog.CapabilityHelpers.getCapability;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import java.io.IOException;
+import java.util.Map;
+import java.util.regex.Pattern;
+import org.apache.gravitino.Entity;
+import org.apache.gravitino.EntityStore;
+import org.apache.gravitino.GravitinoEnv;
+import org.apache.gravitino.HasIdentifier;
import org.apache.gravitino.MetadataObject;
+import org.apache.gravitino.NameIdentifier;
+import org.apache.gravitino.catalog.CatalogManager;
+import org.apache.gravitino.connector.capability.Capability;
+import org.apache.gravitino.meta.BaseMetalake;
+import org.apache.gravitino.meta.CatalogEntity;
+import org.apache.gravitino.meta.ColumnEntity;
+import org.apache.gravitino.meta.FilesetEntity;
+import org.apache.gravitino.meta.ModelEntity;
+import org.apache.gravitino.meta.ModelVersionEntity;
+import org.apache.gravitino.meta.RoleEntity;
+import org.apache.gravitino.meta.SchemaEntity;
+import org.apache.gravitino.meta.TableEntity;
+import org.apache.gravitino.meta.TagEntity;
+import org.apache.gravitino.meta.TopicEntity;
+import org.apache.gravitino.meta.UserEntity;
/** It is used to convert MetadataObject to MetadataId */
public class MetadataIdConverter {
+ private static final Pattern DOT_PATTERN = Pattern.compile("\\.");
+ // Maps metadata type to entity type.
+ private static final Map<MetadataObject.Type, Entity.EntityType>
METADATA_TO_ENTITY_TYPE_MAPPING =
+ ImmutableMap.of(
+ MetadataObject.Type.METALAKE, Entity.EntityType.METALAKE,
+ MetadataObject.Type.CATALOG, Entity.EntityType.CATALOG,
+ MetadataObject.Type.SCHEMA, Entity.EntityType.SCHEMA,
+ MetadataObject.Type.TABLE, Entity.EntityType.TABLE,
+ MetadataObject.Type.MODEL, Entity.EntityType.MODEL,
+ MetadataObject.Type.FILESET, Entity.EntityType.FILESET,
+ MetadataObject.Type.TOPIC, Entity.EntityType.TOPIC,
+ MetadataObject.Type.COLUMN, Entity.EntityType.COLUMN,
+ MetadataObject.Type.ROLE, Entity.EntityType.ROLE);
+ // Maps metadata type to capability scope
+ private static final Map<MetadataObject.Type, Capability.Scope>
METADATA_SCOPE_MAPPING =
+ ImmutableMap.of(
+ MetadataObject.Type.SCHEMA, Capability.Scope.SCHEMA,
+ MetadataObject.Type.TABLE, Capability.Scope.TABLE,
+ MetadataObject.Type.MODEL, Capability.Scope.MODEL,
+ MetadataObject.Type.FILESET, Capability.Scope.FILESET,
+ MetadataObject.Type.TOPIC, Capability.Scope.TOPIC,
+ MetadataObject.Type.COLUMN, Capability.Scope.COLUMN);
+ // Maps entity type to entity class.
+ private static final Map<Entity.EntityType, Class<?>> ENTITY_CLASS_MAPPING =
+ ImmutableMap.<Entity.EntityType, Class<?>>builder()
+ .put(Entity.EntityType.METALAKE, BaseMetalake.class)
+ .put(Entity.EntityType.CATALOG, CatalogEntity.class)
+ .put(Entity.EntityType.SCHEMA, SchemaEntity.class)
+ .put(Entity.EntityType.TABLE, TableEntity.class)
+ .put(Entity.EntityType.FILESET, FilesetEntity.class)
+ .put(Entity.EntityType.MODEL, ModelEntity.class)
+ .put(Entity.EntityType.TOPIC, TopicEntity.class)
+ .put(Entity.EntityType.TAG, TagEntity.class)
+ .put(Entity.EntityType.MODEL_VERSION, ModelVersionEntity.class)
+ .put(Entity.EntityType.COLUMN, ColumnEntity.class)
+ .put(Entity.EntityType.USER, UserEntity.class)
+ .put(Entity.EntityType.GROUP, Entity.class)
+ .put(Entity.EntityType.ROLE, RoleEntity.class)
+ .build();
private MetadataIdConverter() {}
- public static Long doConvert(MetadataObject metadataObject) {
- // TODO depend on MetaCache
- return 0L;
+ /**
+ * Converts the given metadata object to metadata id.
+ *
+ * @param metadataObject The metadata object to convert.
+ * @param metalake The metalake name.
+ * @return The metadata id.
+ * @throws IOException if an error occurs while loading the entity.
+ */
+ public static Long getID(MetadataObject metadataObject, String metalake)
throws IOException {
+ CatalogManager catalogManager =
GravitinoEnv.getInstance().catalogManager();
+ EntityStore entityStore = GravitinoEnv.getInstance().entityStore();
+
+ return getID(metadataObject, metalake, catalogManager, entityStore);
+ }
+
+ @VisibleForTesting
+ static Long getID(
+ MetadataObject metadataObject,
+ String metalake,
+ CatalogManager catalogManager,
+ EntityStore entityStore)
+ throws IOException {
+ Preconditions.checkArgument(metadataObject != null, "Metadata object
cannot be null");
+
+ MetadataObject.Type metadataType = metadataObject.type();
+ NameIdentifier ident =
+ (metadataType != MetadataObject.Type.METALAKE)
+ ? NameIdentifier.of(DOT_PATTERN.split(metalake + "." +
metadataObject.fullName()))
+ : NameIdentifier.of(metadataObject.fullName());
+
+ NameIdentifier normalizedIdent =
+ normalizeCaseSensitive(ident,
METADATA_SCOPE_MAPPING.get(metadataType), catalogManager);
+
+ Entity.EntityType entityType = getEntityType(metadataType);
+
+ Entity entity;
+ try {
+ entity = entityStore.get(normalizedIdent, entityType,
getEntityClass(entityType));
+ } catch (IOException e) {
+ throw new IOException("Failed to convert metadata object: " +
metadataObject.fullName(), e);
Review Comment:
Another one is that you catch IOE and then throw one at the same time.
What's the purpose?
##########
server-common/src/main/java/org/apache/gravitino/server/authorization/MetadataIdConverter.java:
##########
@@ -17,15 +17,151 @@
package org.apache.gravitino.server.authorization;
+import static
org.apache.gravitino.catalog.CapabilityHelpers.applyCaseSensitive;
+import static org.apache.gravitino.catalog.CapabilityHelpers.getCapability;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import java.io.IOException;
+import java.util.Map;
+import java.util.regex.Pattern;
+import org.apache.gravitino.Entity;
+import org.apache.gravitino.EntityStore;
+import org.apache.gravitino.GravitinoEnv;
+import org.apache.gravitino.HasIdentifier;
import org.apache.gravitino.MetadataObject;
+import org.apache.gravitino.NameIdentifier;
+import org.apache.gravitino.catalog.CatalogManager;
+import org.apache.gravitino.connector.capability.Capability;
+import org.apache.gravitino.meta.BaseMetalake;
+import org.apache.gravitino.meta.CatalogEntity;
+import org.apache.gravitino.meta.ColumnEntity;
+import org.apache.gravitino.meta.FilesetEntity;
+import org.apache.gravitino.meta.ModelEntity;
+import org.apache.gravitino.meta.ModelVersionEntity;
+import org.apache.gravitino.meta.RoleEntity;
+import org.apache.gravitino.meta.SchemaEntity;
+import org.apache.gravitino.meta.TableEntity;
+import org.apache.gravitino.meta.TagEntity;
+import org.apache.gravitino.meta.TopicEntity;
+import org.apache.gravitino.meta.UserEntity;
/** It is used to convert MetadataObject to MetadataId */
public class MetadataIdConverter {
+ private static final Pattern DOT_PATTERN = Pattern.compile("\\.");
+ // Maps metadata type to entity type.
+ private static final Map<MetadataObject.Type, Entity.EntityType>
METADATA_TO_ENTITY_TYPE_MAPPING =
+ ImmutableMap.of(
+ MetadataObject.Type.METALAKE, Entity.EntityType.METALAKE,
+ MetadataObject.Type.CATALOG, Entity.EntityType.CATALOG,
+ MetadataObject.Type.SCHEMA, Entity.EntityType.SCHEMA,
+ MetadataObject.Type.TABLE, Entity.EntityType.TABLE,
+ MetadataObject.Type.MODEL, Entity.EntityType.MODEL,
+ MetadataObject.Type.FILESET, Entity.EntityType.FILESET,
+ MetadataObject.Type.TOPIC, Entity.EntityType.TOPIC,
+ MetadataObject.Type.COLUMN, Entity.EntityType.COLUMN,
+ MetadataObject.Type.ROLE, Entity.EntityType.ROLE);
+ // Maps metadata type to capability scope
+ private static final Map<MetadataObject.Type, Capability.Scope>
METADATA_SCOPE_MAPPING =
+ ImmutableMap.of(
+ MetadataObject.Type.SCHEMA, Capability.Scope.SCHEMA,
+ MetadataObject.Type.TABLE, Capability.Scope.TABLE,
+ MetadataObject.Type.MODEL, Capability.Scope.MODEL,
+ MetadataObject.Type.FILESET, Capability.Scope.FILESET,
+ MetadataObject.Type.TOPIC, Capability.Scope.TOPIC,
+ MetadataObject.Type.COLUMN, Capability.Scope.COLUMN);
+ // Maps entity type to entity class.
+ private static final Map<Entity.EntityType, Class<?>> ENTITY_CLASS_MAPPING =
+ ImmutableMap.<Entity.EntityType, Class<?>>builder()
+ .put(Entity.EntityType.METALAKE, BaseMetalake.class)
+ .put(Entity.EntityType.CATALOG, CatalogEntity.class)
+ .put(Entity.EntityType.SCHEMA, SchemaEntity.class)
+ .put(Entity.EntityType.TABLE, TableEntity.class)
+ .put(Entity.EntityType.FILESET, FilesetEntity.class)
+ .put(Entity.EntityType.MODEL, ModelEntity.class)
+ .put(Entity.EntityType.TOPIC, TopicEntity.class)
+ .put(Entity.EntityType.TAG, TagEntity.class)
+ .put(Entity.EntityType.MODEL_VERSION, ModelVersionEntity.class)
+ .put(Entity.EntityType.COLUMN, ColumnEntity.class)
+ .put(Entity.EntityType.USER, UserEntity.class)
+ .put(Entity.EntityType.GROUP, Entity.class)
+ .put(Entity.EntityType.ROLE, RoleEntity.class)
+ .build();
private MetadataIdConverter() {}
- public static Long doConvert(MetadataObject metadataObject) {
- // TODO depend on MetaCache
- return 0L;
+ /**
+ * Converts the given metadata object to metadata id.
+ *
+ * @param metadataObject The metadata object to convert.
+ * @param metalake The metalake name.
+ * @return The metadata id.
+ * @throws IOException if an error occurs while loading the entity.
+ */
+ public static Long getID(MetadataObject metadataObject, String metalake)
throws IOException {
+ CatalogManager catalogManager =
GravitinoEnv.getInstance().catalogManager();
+ EntityStore entityStore = GravitinoEnv.getInstance().entityStore();
+
+ return getID(metadataObject, metalake, catalogManager, entityStore);
+ }
+
+ @VisibleForTesting
+ static Long getID(
+ MetadataObject metadataObject,
+ String metalake,
+ CatalogManager catalogManager,
+ EntityStore entityStore)
Review Comment:
These two values can be obtained from `GravitinoEnv.getInstance()`, so
what's the difference between it and method method? I can still use the
following code in method `getID` in L110 and remove them from method
parameters.
```java
CatalogManager catalogManager = GravitinoEnv.getInstance().catalogManager();
EntityStore entityStore = GravitinoEnv.getInstance().entityStore();
```
--
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]
