xloya commented on code in PR #5728: URL: https://github.com/apache/gravitino/pull/5728#discussion_r1877941961
########## core/src/main/java/org/apache/gravitino/storage/relational/service/ModelVersionMetaService.java: ########## @@ -0,0 +1,288 @@ +/* + * 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.storage.relational.service; + +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.Locale; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; +import org.apache.gravitino.Entity; +import org.apache.gravitino.NameIdentifier; +import org.apache.gravitino.Namespace; +import org.apache.gravitino.exceptions.NoSuchEntityException; +import org.apache.gravitino.meta.ModelEntity; +import org.apache.gravitino.meta.ModelVersionEntity; +import org.apache.gravitino.storage.relational.mapper.ModelMetaMapper; +import org.apache.gravitino.storage.relational.mapper.ModelVersionAliasRelMapper; +import org.apache.gravitino.storage.relational.mapper.ModelVersionMetaMapper; +import org.apache.gravitino.storage.relational.po.ModelPO; +import org.apache.gravitino.storage.relational.po.ModelVersionAliasRelPO; +import org.apache.gravitino.storage.relational.po.ModelVersionPO; +import org.apache.gravitino.storage.relational.utils.ExceptionUtils; +import org.apache.gravitino.storage.relational.utils.POConverters; +import org.apache.gravitino.storage.relational.utils.SessionUtils; +import org.apache.gravitino.utils.NameIdentifierUtil; +import org.apache.gravitino.utils.NamespaceUtil; +import org.glassfish.jersey.internal.guava.Lists; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ModelVersionMetaService { + + private static final Logger LOG = LoggerFactory.getLogger(ModelVersionMetaService.class); + + private static final ModelVersionMetaService INSTANCE = new ModelVersionMetaService(); + + public static ModelVersionMetaService getInstance() { + return INSTANCE; + } + + private ModelVersionMetaService() {} + + public List<ModelVersionEntity> listModelVersionsByNamespace(Namespace ns) { + NamespaceUtil.checkModelVersion(ns); + + NameIdentifier modelIdent = NameIdentifier.of(ns.levels()); + // Will throw a NoSuchEntityException if the model does not exist. + ModelEntity modelEntity = ModelMetaService.getInstance().getModelByIdentifier(modelIdent); + + List<ModelVersionPO> modelVersionPOs = + SessionUtils.getWithoutCommit( + ModelVersionMetaMapper.class, + mapper -> mapper.listModelVersionMetasByModelId(modelEntity.id())); + + if (modelVersionPOs.isEmpty()) { + return Collections.emptyList(); + } + + // Get the aliases for all the model versions. + List<ModelVersionAliasRelPO> aliasRelPOs = + SessionUtils.getWithoutCommit( + ModelVersionAliasRelMapper.class, + mapper -> mapper.selectModelVersionAliasRelByModelId(modelEntity.id())); + Multimap<Integer, ModelVersionAliasRelPO> aliasRelPOsByModelVersion = + ArrayListMultimap.create(); + aliasRelPOs.forEach(r -> aliasRelPOsByModelVersion.put(r.getModelVersion(), r)); + + return modelVersionPOs.stream() + .map( + m -> { + List<ModelVersionAliasRelPO> versionAliasRelPOs = + Lists.newArrayList(aliasRelPOsByModelVersion.get(m.getModelVersion())); + return POConverters.fromModelVersionPO(modelIdent, m, versionAliasRelPOs); + }) + .collect(Collectors.toList()); + } + + public ModelVersionEntity getModelVersionByIdentifier(NameIdentifier ident) { + NameIdentifierUtil.checkModelVersion(ident); + + NameIdentifier modelIdent = NameIdentifier.of(ident.namespace().levels()); + // Will throw a NoSuchEntityException if the model does not exist. + ModelEntity modelEntity = ModelMetaService.getInstance().getModelByIdentifier(modelIdent); + + Integer modelVersion; + try { + modelVersion = Integer.valueOf(ident.name()); + } catch (NumberFormatException e) { + modelVersion = null; + } + + final Integer copiedModelVersion = modelVersion; + ModelVersionPO modelVersionPO = + SessionUtils.getWithoutCommit( + ModelVersionMetaMapper.class, + mapper -> { + if (copiedModelVersion != null) { + return mapper.selectModelVersionMeta(modelEntity.id(), copiedModelVersion); + } else { + return mapper.selectModelVersionMetaByAlias(modelEntity.id(), ident.name()); + } + }); + + if (modelVersionPO == null) { + throw new NoSuchEntityException( + NoSuchEntityException.NO_SUCH_ENTITY_MESSAGE, + Entity.EntityType.MODEL_VERSION.name().toLowerCase(Locale.ROOT), + ident.toString()); + } + + List<ModelVersionAliasRelPO> aliasRelPOs = + SessionUtils.getWithoutCommit( + ModelVersionAliasRelMapper.class, + mapper -> { + if (copiedModelVersion != null) { + return mapper.selectModelVersionAliasRelByModelIdAndVersion( + modelEntity.id(), copiedModelVersion); + } else { + return mapper.selectModelVersionAliasRelByModelIdAndAlias( + modelEntity.id(), ident.name()); + } + }); + + return POConverters.fromModelVersionPO(modelIdent, modelVersionPO, aliasRelPOs); + } + + public void insertModelVersion(ModelVersionEntity modelVersionEntity, boolean overwrite) + throws IOException { + if (overwrite) { Review Comment: Yes, I think if we don't need `overwrite` param, we could discard it at the upper level. ########## core/src/main/java/org/apache/gravitino/storage/relational/mapper/provider/base/ModelMetaBaseSQLProvider.java: ########## @@ -134,4 +134,11 @@ public String deleteModelMetasByLegacyTimeline( + ModelMetaMapper.TABLE_NAME + " WHERE deleted_at > 0 AND deleted_at < #{legacyTimeline} LIMIT #{limit}"; } + + public String updateModelLatestVersion(@Param("modelId") Long modelId) { + return "UPDATE " + + ModelMetaMapper.TABLE_NAME + + " SET model_latest_version = model_latest_version + 1" + + " WHERE model_id = #{modelId} AND deleted_at = 0"; Review Comment: I think it's better to add the `model_latest_version = xxx` condition in the WHERE clause, we should only update the expected version number. If there are concurrent updates, this may cause the version number to increase incorrectly. ########## core/src/main/java/org/apache/gravitino/storage/relational/service/ModelVersionMetaService.java: ########## @@ -0,0 +1,288 @@ +/* + * 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.storage.relational.service; + +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.Locale; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; +import org.apache.gravitino.Entity; +import org.apache.gravitino.NameIdentifier; +import org.apache.gravitino.Namespace; +import org.apache.gravitino.exceptions.NoSuchEntityException; +import org.apache.gravitino.meta.ModelEntity; +import org.apache.gravitino.meta.ModelVersionEntity; +import org.apache.gravitino.storage.relational.mapper.ModelMetaMapper; +import org.apache.gravitino.storage.relational.mapper.ModelVersionAliasRelMapper; +import org.apache.gravitino.storage.relational.mapper.ModelVersionMetaMapper; +import org.apache.gravitino.storage.relational.po.ModelPO; +import org.apache.gravitino.storage.relational.po.ModelVersionAliasRelPO; +import org.apache.gravitino.storage.relational.po.ModelVersionPO; +import org.apache.gravitino.storage.relational.utils.ExceptionUtils; +import org.apache.gravitino.storage.relational.utils.POConverters; +import org.apache.gravitino.storage.relational.utils.SessionUtils; +import org.apache.gravitino.utils.NameIdentifierUtil; +import org.apache.gravitino.utils.NamespaceUtil; +import org.glassfish.jersey.internal.guava.Lists; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ModelVersionMetaService { + + private static final Logger LOG = LoggerFactory.getLogger(ModelVersionMetaService.class); + + private static final ModelVersionMetaService INSTANCE = new ModelVersionMetaService(); + + public static ModelVersionMetaService getInstance() { + return INSTANCE; + } + + private ModelVersionMetaService() {} + + public List<ModelVersionEntity> listModelVersionsByNamespace(Namespace ns) { + NamespaceUtil.checkModelVersion(ns); + + NameIdentifier modelIdent = NameIdentifier.of(ns.levels()); + // Will throw a NoSuchEntityException if the model does not exist. + ModelEntity modelEntity = ModelMetaService.getInstance().getModelByIdentifier(modelIdent); + + List<ModelVersionPO> modelVersionPOs = + SessionUtils.getWithoutCommit( + ModelVersionMetaMapper.class, + mapper -> mapper.listModelVersionMetasByModelId(modelEntity.id())); + + if (modelVersionPOs.isEmpty()) { + return Collections.emptyList(); + } + + // Get the aliases for all the model versions. + List<ModelVersionAliasRelPO> aliasRelPOs = + SessionUtils.getWithoutCommit( + ModelVersionAliasRelMapper.class, + mapper -> mapper.selectModelVersionAliasRelByModelId(modelEntity.id())); + Multimap<Integer, ModelVersionAliasRelPO> aliasRelPOsByModelVersion = + ArrayListMultimap.create(); + aliasRelPOs.forEach(r -> aliasRelPOsByModelVersion.put(r.getModelVersion(), r)); + + return modelVersionPOs.stream() + .map( + m -> { + List<ModelVersionAliasRelPO> versionAliasRelPOs = + Lists.newArrayList(aliasRelPOsByModelVersion.get(m.getModelVersion())); + return POConverters.fromModelVersionPO(modelIdent, m, versionAliasRelPOs); + }) + .collect(Collectors.toList()); + } + + public ModelVersionEntity getModelVersionByIdentifier(NameIdentifier ident) { + NameIdentifierUtil.checkModelVersion(ident); + + NameIdentifier modelIdent = NameIdentifier.of(ident.namespace().levels()); + // Will throw a NoSuchEntityException if the model does not exist. + ModelEntity modelEntity = ModelMetaService.getInstance().getModelByIdentifier(modelIdent); + + Integer modelVersion; + try { + modelVersion = Integer.valueOf(ident.name()); Review Comment: My concern is whether this design is universal for other types of resources? Or can we accept that in the future, if we want to access the sub-resources of a certain type of resource, we need to obtain it through the identifier method? ########## core/src/main/java/org/apache/gravitino/storage/relational/service/ModelVersionMetaService.java: ########## @@ -0,0 +1,278 @@ +/* + * 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.storage.relational.service; + +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.Multimap; +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.Locale; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; +import org.apache.commons.lang3.math.NumberUtils; +import org.apache.gravitino.Entity; +import org.apache.gravitino.NameIdentifier; +import org.apache.gravitino.Namespace; +import org.apache.gravitino.exceptions.NoSuchEntityException; +import org.apache.gravitino.meta.ModelEntity; +import org.apache.gravitino.meta.ModelVersionEntity; +import org.apache.gravitino.storage.relational.mapper.ModelMetaMapper; +import org.apache.gravitino.storage.relational.mapper.ModelVersionAliasRelMapper; +import org.apache.gravitino.storage.relational.mapper.ModelVersionMetaMapper; +import org.apache.gravitino.storage.relational.po.ModelPO; +import org.apache.gravitino.storage.relational.po.ModelVersionAliasRelPO; +import org.apache.gravitino.storage.relational.po.ModelVersionPO; +import org.apache.gravitino.storage.relational.utils.ExceptionUtils; +import org.apache.gravitino.storage.relational.utils.POConverters; +import org.apache.gravitino.storage.relational.utils.SessionUtils; +import org.apache.gravitino.utils.NameIdentifierUtil; +import org.apache.gravitino.utils.NamespaceUtil; +import org.glassfish.jersey.internal.guava.Lists; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ModelVersionMetaService { + + private static final Logger LOG = LoggerFactory.getLogger(ModelVersionMetaService.class); + + private static final ModelVersionMetaService INSTANCE = new ModelVersionMetaService(); + + public static ModelVersionMetaService getInstance() { + return INSTANCE; + } + + private ModelVersionMetaService() {} + + public List<ModelVersionEntity> listModelVersionsByNamespace(Namespace ns) { + NamespaceUtil.checkModelVersion(ns); + + NameIdentifier modelIdent = NameIdentifier.of(ns.levels()); + // Will throw a NoSuchEntityException if the model does not exist. + ModelEntity modelEntity = ModelMetaService.getInstance().getModelByIdentifier(modelIdent); + + List<ModelVersionPO> modelVersionPOs = + SessionUtils.getWithoutCommit( + ModelVersionMetaMapper.class, + mapper -> mapper.listModelVersionMetasByModelId(modelEntity.id())); + + if (modelVersionPOs.isEmpty()) { + return Collections.emptyList(); + } + + // Get the aliases for all the model versions. + List<ModelVersionAliasRelPO> aliasRelPOs = + SessionUtils.getWithoutCommit( + ModelVersionAliasRelMapper.class, + mapper -> mapper.selectModelVersionAliasRelsByModelId(modelEntity.id())); + Multimap<Integer, ModelVersionAliasRelPO> aliasRelPOsByModelVersion = + ArrayListMultimap.create(); + aliasRelPOs.forEach(r -> aliasRelPOsByModelVersion.put(r.getModelVersion(), r)); + + return modelVersionPOs.stream() + .map( + m -> { + List<ModelVersionAliasRelPO> versionAliasRelPOs = + Lists.newArrayList(aliasRelPOsByModelVersion.get(m.getModelVersion())); + return POConverters.fromModelVersionPO(modelIdent, m, versionAliasRelPOs); + }) + .collect(Collectors.toList()); + } + + public ModelVersionEntity getModelVersionByIdentifier(NameIdentifier ident) { + NameIdentifierUtil.checkModelVersion(ident); + + NameIdentifier modelIdent = NameIdentifier.of(ident.namespace().levels()); + // Will throw a NoSuchEntityException if the model does not exist. + ModelEntity modelEntity = ModelMetaService.getInstance().getModelByIdentifier(modelIdent); + + boolean isVersionNumber = NumberUtils.isCreatable(ident.name()); + + ModelVersionPO modelVersionPO = + SessionUtils.getWithoutCommit( + ModelVersionMetaMapper.class, + mapper -> { + if (isVersionNumber) { + return mapper.selectModelVersionMeta( + modelEntity.id(), Integer.valueOf(ident.name())); + } else { + return mapper.selectModelVersionMetaByAlias(modelEntity.id(), ident.name()); + } + }); + + if (modelVersionPO == null) { + throw new NoSuchEntityException( + NoSuchEntityException.NO_SUCH_ENTITY_MESSAGE, + Entity.EntityType.MODEL_VERSION.name().toLowerCase(Locale.ROOT), + ident.toString()); + } + + List<ModelVersionAliasRelPO> aliasRelPOs = + SessionUtils.getWithoutCommit( + ModelVersionAliasRelMapper.class, + mapper -> { + if (isVersionNumber) { + return mapper.selectModelVersionAliasRelsByModelIdAndVersion( + modelEntity.id(), Integer.valueOf(ident.name())); + } else { + return mapper.selectModelVersionAliasRelsByModelIdAndAlias( + modelEntity.id(), ident.name()); + } + }); + + return POConverters.fromModelVersionPO(modelIdent, modelVersionPO, aliasRelPOs); + } + + public void insertModelVersion(ModelVersionEntity modelVersionEntity, boolean overwrite) + throws IOException { + if (overwrite) { + LOG.warn( + "Overwrite is not supported for model version meta, ignoring this flag and " + + "inserting the new model version."); + } + + NameIdentifier modelIdent = modelVersionEntity.modelIdentifier(); + NameIdentifierUtil.checkModel(modelIdent); + + // Will throw a NoSuchEntityException if the model does not exist. + ModelPO modelPO = ModelMetaService.getInstance().getModelPOByIdentifier(modelIdent); + Integer newVersion = modelPO.getModelLatestVersion(); + ModelVersionEntity entityWithNewVersion = + ModelVersionEntity.builder() + .withVersion(newVersion) + .withModelIdentifier(modelIdent) + .withAliases(modelVersionEntity.aliases()) + .withComment(modelVersionEntity.comment()) + .withUri(modelVersionEntity.uri()) + .withProperties(modelVersionEntity.properties()) + .withAuditInfo(modelVersionEntity.auditInfo()) + .build(); + + ModelVersionPO.Builder builder = ModelVersionPO.builder(); + builder + .withModelId(modelPO.getModelId()) + .withMetalakeId(modelPO.getMetalakeId()) + .withCatalogId(modelPO.getCatalogId()) + .withSchemaId(modelPO.getSchemaId()); + ModelVersionPO modelVersionPO = + POConverters.initializeModelVersionPO(entityWithNewVersion, builder); + + List<ModelVersionAliasRelPO> aliasRelPOs = + POConverters.initializeModelVersionAliasRelPO(entityWithNewVersion, modelPO.getModelId()); + + try { + SessionUtils.doMultipleWithCommit( + () -> + SessionUtils.doWithoutCommit( + ModelVersionMetaMapper.class, + mapper -> mapper.insertModelVersionMeta(modelVersionPO)), + () -> { + if (aliasRelPOs.isEmpty()) { + return; + } + + SessionUtils.doWithoutCommit( + ModelVersionAliasRelMapper.class, + mapper -> mapper.insertModelVersionAliasRels(aliasRelPOs)); + }, + () -> + // If the model version is inserted successfully, update the model latest version. + SessionUtils.doWithoutCommit( Review Comment: According to the current logic, this update operation will succeed under normal circumstances. Should we add a specified version when updating as mentioned above and then verify the update result? -- 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]
