github-actions[bot] commented on code in PR #69458: URL: https://github.com/apache/doris/pull/69458#discussion_r4351655200
########## fe/fe-core/src/main/java/org/apache/doris/datasource/metacache/CatalogMetadataChanges.java: ########## @@ -0,0 +1,215 @@ +// 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.doris.datasource.metacache; + +import org.apache.doris.catalog.Env; +import org.apache.doris.common.util.Util; +import org.apache.doris.connector.cache.CacheCallbackContext; +import org.apache.doris.connector.cache.CatalogMetaCache; +import org.apache.doris.connector.cache.ScopePath; +import org.apache.doris.connector.spi.Connector; +import org.apache.doris.datasource.ExternalCatalog; +import org.apache.doris.datasource.ExternalDatabase; +import org.apache.doris.datasource.ExternalTable; +import org.apache.doris.datasource.log.ExternalObjectLog; +import org.apache.doris.datasource.plugin.PluginDrivenExternalCatalog; + +import com.google.common.base.Strings; + +import java.util.ArrayList; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Optional; +import java.util.Set; + +/** + * The engine's semantic change boundary. FE names, remote connector identities and numeric derived state are + * projected once and detached at one catalog publication barrier. Projection never loads remote metadata. + * Connector domains own registrations/lifetime; resource scopes own invalidation, independently of domains. + */ +public final class CatalogMetadataChanges { + private CatalogMetadataChanges() { + } + + public static ExternalObjectLog table(ExternalTable table, boolean lookup, long updateTime) { + ExternalObjectLog change = lookup + ? ExternalObjectLog.createForExplicitRefreshTable(table.getCatalog().getId(), + table.getDb().getFullName(), table.getName(), updateTime) + : ExternalObjectLog.createForRefreshTable(table.getCatalog().getId(), + table.getDb().getFullName(), table.getName(), updateTime); + change.setDbId(table.getDb().getId()); + change.setTableId(table.getId()); + return change.withRemoteNames(table.getRemoteDbName(), table.getRemoteName()); + } + + public static void apply(ExternalCatalog catalog, ExternalObjectLog change) { + apply(catalog, java.util.Collections.singletonList(change)); + } + + /** A rename event can span databases; all old/new coordinates share one publication barrier. */ + public static void apply(ExternalCatalog catalog, List<ExternalObjectLog> changes) { + List<ScopePath> scopes = new ArrayList<>(); + RuntimeException failure = null; + try { + for (ExternalObjectLog change : changes) { + try { + plan(catalog, change, scopes); + } catch (RuntimeException error) { + if (failure == null) { + failure = error; + } else { + failure.addSuppressed(error); + } + } + } + } finally { + CatalogMetaCache owner = catalog.getMetaCacheOwnerIfPresent(); + if (owner != null) { + owner.invalidateScopes(scopes); + } + if (Env.getCurrentEnv().getSortedPartitionsCacheManager() != null) { + for (ExternalObjectLog change : changes) { + invalidateSortedPartitions(catalog, change); + } + } + } + if (failure != null) { + throw failure; + } + } + + private static void invalidateSortedPartitions(ExternalCatalog catalog, ExternalObjectLog change) { + if (change.getTableName() == null) { + Env.getCurrentEnv().getSortedPartitionsCacheManager().invalidateAll(); + } else { + Env.getCurrentEnv().getSortedPartitionsCacheManager().invalidateTable( + catalog.getName(), change.getDbName(), change.getTableName()); + if (change.getNewTableName() != null) { + Env.getCurrentEnv().getSortedPartitionsCacheManager().invalidateTable( + catalog.getName(), change.getDbName(), change.getNewTableName()); + } + } + } + + private static void plan(ExternalCatalog catalog, ExternalObjectLog change, List<ScopePath> scopes) { + Optional<ExternalDatabase<? extends ExternalTable>> db = catalog.getDbForReplay(change.getDbName()); + Optional<? extends ExternalTable> table = Strings.isNullOrEmpty(change.getTableName()) + ? Optional.empty() : db.flatMap(database -> database.getTableForReplay(change.getTableName())); + long dbId = change.getDbId() != 0 ? change.getDbId() + : Util.genIdByName(catalog.getName(), change.getDbName()); + long tableId = change.getTableId() != 0 ? change.getTableId() + : change.getTableName() == null ? 0L + : Util.genIdByName(catalog.getName(), change.getDbName(), change.getTableName()); + String remoteDb = change.getRemoteDbName() != null ? change.getRemoteDbName() + : db.map(ExternalDatabase::getRemoteName).orElse(null); + String remoteTable = change.getRemoteTableName() != null ? change.getRemoteTableName() + : table.map(ExternalTable::getRemoteName).orElse(null); + Connector connector = catalog instanceof PluginDrivenExternalCatalog + ? ((PluginDrivenExternalCatalog) catalog).getConnectorIfPresent() : null; + Set<ScopePath> remote = new LinkedHashSet<>(); + boolean database = Strings.isNullOrEmpty(change.getTableName()); + boolean partitions = change.getPartitionNames() != null; + String canonicalDb = catalog.resolveDatabaseNameForInvalidation(change.getDbName()); + if (!canonicalDb.equals(change.getDbName())) { + scopes.add(local(ScopePath.database(canonicalDb))); + scopes.add(id(ScopePath.database(Long.toString(Util.genIdByName(catalog.getName(), canonicalDb))))); + } + if (database) { + scopes.add(local(ScopePath.database(change.getDbName()))); + scopes.add(local(ScopePath.databaseCollection())); + scopes.add(id(ScopePath.database(Long.toString(dbId)))); + remote.add(remoteDb == null ? ScopePath.catalog() : ScopePath.database(remoteDb)); + remote.add(ScopePath.databaseCollection()); + } else { + table.ifPresent(value -> { + if (!partitions) { + value.unsetObjectCreated(); + } + if (change.getLastUpdateTime() > 0) { + value.setUpdateTime(change.getLastUpdateTime()); + } + }); + scopes.add(id(ScopePath.table(Long.toString(dbId), Long.toString(tableId)))); + if (!partitions) { + if (db.isPresent() && change.isInvalidateTableLookup()) { + String canonical = db.get().resolveTableNameForInvalidation(change.getTableName()); + scopes.add(local(ScopePath.table(db.get().getFullName(), canonical))); + scopes.add(id(ScopePath.table(Long.toString(dbId), Long.toString(Util.genIdByName( + catalog.getName(), db.get().getFullName(), canonical))))); + } + scopes.add(local(change.isInvalidateTableLookup() + ? ScopePath.table(change.getDbName(), change.getTableName()) + : ScopePath.tableMetadata(change.getDbName(), change.getTableName()))); + if (change.isInvalidateTableLookup() || change.getNewTableName() != null) { + scopes.add(local(ScopePath.tableCollection(change.getDbName()))); + } + } + if (remoteDb == null || remoteTable == null) { + // Old logs carry only local identities. Widen only the remote coordinate, without I/O. + remote.add(remoteDb == null ? ScopePath.catalog() : ScopePath.database(remoteDb)); + } else { + remote.add(ScopePath.table(remoteDb, remoteTable)); + } + if (remoteDb != null && (change.isInvalidateTableLookup() || change.getNewTableName() != null)) { + remote.add(ScopePath.tableCollection(remoteDb)); + } + if (change.getNewTableName() != null) { + scopes.add(local(ScopePath.table(change.getDbName(), change.getTableName()))); + scopes.add(local(ScopePath.table(change.getDbName(), change.getNewTableName()))); Review Comment: [P2] Invalidate the case-equivalent rename destination With `lower_case_table_names=2`, warm a destination named `Dest`, drop it outside Doris, then rename another table to `DEST` in a case-preserving Iceberg catalog. This branch invalidates only the exact `DEST` key and its numeric ID; the cached `Dest` object, ID, schema and row count survive. By-ID readers (`ExternalDatabase.getTableNullable(long)`, used by statistics and constraints) can therefore still resolve the dropped destination after the rename. Previously `invalidateTableRename()` resolved both names through `resolveTableNameForInvalidation()`. Add the canonical destination's LOCAL and ID scopes to this barrier on the leader and replay paths, and cover this mode-2 replacement case. -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
