(gravitino) branch cherry-pick-933401bd-to-branch-1.3 updated: [#12643] fix(core): Resolve cherry-pick conflicts

[yuqi4733]

This is an automated email from the ASF dual-hosted git repository.

yuqi1129 pushed a commit to branch cherry-pick-933401bd-to-branch-1.3
in repository https://gitbox.apache.org/repos/asf/gravitino.git


The following commit(s) were added to 
refs/heads/cherry-pick-933401bd-to-branch-1.3 by this push:
     new f71a9cc0b6 [#12643] fix(core): Resolve cherry-pick conflicts
f71a9cc0b6 is described below

commit f71a9cc0b67a9d427c80e84feebbe4e0429047d1
Author: yuqi <y...@datastrato.com>
AuthorDate: Wed Aug 26 19:43:13 2026 +0800

    [#12643] fix(core): Resolve cherry-pick conflicts
---
 core/src/main/java/org/apache/gravitino/catalog/CatalogManager.java | 6 ------
 .../test/java/org/apache/gravitino/catalog/TestCatalogManager.java  | 3 +--
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git 
a/core/src/main/java/org/apache/gravitino/catalog/CatalogManager.java 
b/core/src/main/java/org/apache/gravitino/catalog/CatalogManager.java
index 65c90d62fc..71f90b679a 100644
--- a/core/src/main/java/org/apache/gravitino/catalog/CatalogManager.java
+++ b/core/src/main/java/org/apache/gravitino/catalog/CatalogManager.java
@@ -298,16 +298,10 @@ public class CatalogManager implements CatalogDispatcher, 
Closeable {
   @Nullable private final CatalogChangeLogListener catalogChangeLogListener;
 
   private final IdGenerator idGenerator;
-<<<<<<< HEAD
-  private final List<Consumer<NameIdentifier>> removalListeners = 
Lists.newArrayList();
-=======
-
-  private final SecretManager secretManager;
 
   // Copy-on-write: listeners may be registered while the cache's removal 
listener (running on a
   // cache executor thread) is iterating this list.
   private final List<Consumer<NameIdentifier>> removalListeners = new 
CopyOnWriteArrayList<>();
->>>>>>> 933401bda ([#12504] fix(core): Fix flaky 
TestCatalogManager.testCatalogCacheRemoveListener (#12514))
   private final ConcurrentHashMap<NameIdentifier, AtomicInteger> 
localMutationCounts =
       new ConcurrentHashMap<>();
 
diff --git 
a/core/src/test/java/org/apache/gravitino/catalog/TestCatalogManager.java 
b/core/src/test/java/org/apache/gravitino/catalog/TestCatalogManager.java
index ae4f5cfc38..2101bd062e 100644
--- a/core/src/test/java/org/apache/gravitino/catalog/TestCatalogManager.java
+++ b/core/src/test/java/org/apache/gravitino/catalog/TestCatalogManager.java
@@ -1236,8 +1236,7 @@ public class TestCatalogManager {
     store.initialize(config);
     store.put(metalakeEntity, true);
 
-    try (CatalogManager manager =
-        new CatalogManager(config, store, new RandomIdGenerator(), new 
SecretManager(config))) {
+    try (CatalogManager manager = new CatalogManager(config, store, new 
RandomIdGenerator())) {
       // Create a catalog
       manager.createCatalog(ident, Catalog.Type.RELATIONAL, provider, 
"comment", props);