mchades commented on code in PR #13367: URL: https://github.com/apache/gravitino/pull/13367#discussion_r4060305372
########## core/src/test/java/org/apache/gravitino/TestGravitinoEnvMetadataComponents.java: ########## @@ -0,0 +1,299 @@ +/* + * 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; + +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.Mockito.clearInvocations; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.withSettings; + +import java.util.Collections; +import org.apache.commons.lang3.reflect.FieldUtils; +import org.apache.gravitino.Entity.EntityType; +import org.apache.gravitino.catalog.FilesetNormalizeDispatcher; +import org.apache.gravitino.catalog.FilesetOperationDispatcher; +import org.apache.gravitino.catalog.FunctionNormalizeDispatcher; +import org.apache.gravitino.catalog.FunctionOperationDispatcher; +import org.apache.gravitino.catalog.ModelNormalizeDispatcher; +import org.apache.gravitino.catalog.ModelOperationDispatcher; +import org.apache.gravitino.catalog.PartitionNormalizeDispatcher; +import org.apache.gravitino.catalog.PartitionOperationDispatcher; +import org.apache.gravitino.catalog.SchemaNormalizeDispatcher; +import org.apache.gravitino.catalog.SchemaOperationDispatcher; +import org.apache.gravitino.catalog.TableNormalizeDispatcher; +import org.apache.gravitino.catalog.TableOperationDispatcher; +import org.apache.gravitino.catalog.TopicNormalizeDispatcher; +import org.apache.gravitino.catalog.TopicOperationDispatcher; +import org.apache.gravitino.catalog.ViewNormalizeDispatcher; +import org.apache.gravitino.catalog.ViewOperationDispatcher; +import org.apache.gravitino.hook.FilesetHookDispatcher; +import org.apache.gravitino.hook.FunctionHookDispatcher; +import org.apache.gravitino.hook.ModelHookDispatcher; +import org.apache.gravitino.hook.SchemaHookDispatcher; +import org.apache.gravitino.hook.TableHookDispatcher; +import org.apache.gravitino.hook.TopicHookDispatcher; +import org.apache.gravitino.hook.ViewHookDispatcher; +import org.apache.gravitino.listener.FilesetEventDispatcher; +import org.apache.gravitino.listener.FunctionEventDispatcher; +import org.apache.gravitino.listener.ModelEventDispatcher; +import org.apache.gravitino.listener.PartitionEventDispatcher; +import org.apache.gravitino.listener.SchemaEventDispatcher; +import org.apache.gravitino.listener.StatisticEventDispatcher; +import org.apache.gravitino.listener.TableEventDispatcher; +import org.apache.gravitino.listener.TopicEventDispatcher; +import org.apache.gravitino.listener.ViewEventDispatcher; +import org.apache.gravitino.meta.BaseMetalake; +import org.apache.gravitino.stats.StatisticManager; +import org.apache.gravitino.stats.storage.MemoryPartitionStatsStorageFactory; +import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.mockito.MockedStatic; + +@TestMethodOrder(OrderAnnotation.class) +class TestGravitinoEnvMetadataComponents { + + @Test + @Order(1) + void testMetadataProfileRejectsNonSingletonEnvironment() { + IllegalStateException exception = + assertThrows( + IllegalStateException.class, + () -> new TestGravitinoEnv().initializeMetadataComponents(metadataConfig(false))); + + assertEquals( + "Metadata components must be initialized on GravitinoEnv.getInstance().", + exception.getMessage()); + } + + @Test + @Order(2) + void testMetadataProfileProvidesCompleteMetadataAccessWithoutServerServices() throws Exception { + Config config = metadataConfig(false); + EntityStore entityStore = relationStore(); + GravitinoEnv env = GravitinoEnv.getInstance(); Review Comment: Updated in `d8a01334d2`. Each test now snapshots every non-static field on the process-wide singleton, replaces it with a fresh environment state for the test, and restores the original state in `@AfterEach`. The explicit test ordering was removed, so mocked or closed components no longer leak into other tests. The metadata-profile test class passes locally. ########## core/src/main/java/org/apache/gravitino/GravitinoEnv.java: ########## @@ -229,24 +231,43 @@ public static GravitinoEnv getInstance() { */ public void initializeBaseComponents(Config config) { LOG.info("Initializing Gravitino base environment..."); - this.config = config; - FileFetcher.get().initialize(config.get(Configs.BLOCK_UNSAFE_REMOTE_URI)); - SecretPropertyUtils.configureSensitiveKeyKeywords(config); + initializeConfig(config); this.manageFullComponents = false; initBaseComponents(); LOG.info("Gravitino base environment is initialized."); } + /** + * Initializes components required for normalized metadata operations. + * + * <p>This initialization profile does not initialize event listeners, audit logging, metadata + * hooks, auxiliary services, or job management. + * + * <p>This method must be invoked on the singleton returned by {@link #getInstance()}, because + * metadata components use environment-scoped dependencies. Review Comment: Updated in `d8a01334d2`. The Javadoc now states that some metadata components read dependencies directly from the `GravitinoEnv.getInstance()` singleton instead of from the object being initialized, which explains the singleton precondition. -- 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]
