(incubator-paimon) branch master updated: [core] Unified Naming of JdbcCatalog Fields (#3025)

[lzljs3620320]

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

lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-paimon.git


The following commit(s) were added to refs/heads/master by this push:
     new 6e1b9891c [core] Unified Naming of JdbcCatalog Fields (#3025)
6e1b9891c is described below

commit 6e1b9891cda1080db8915209a810b6689dfd3f11
Author: Xiaojian Sun <sunxiaojian...@163.com>
AuthorDate: Mon Mar 18 09:56:12 2024 +0800

    [core] Unified Naming of JdbcCatalog Fields (#3025)
---
 .../java/org/apache/paimon/jdbc/JdbcCatalogLock.java     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git 
a/paimon-core/src/main/java/org/apache/paimon/jdbc/JdbcCatalogLock.java 
b/paimon-core/src/main/java/org/apache/paimon/jdbc/JdbcCatalogLock.java
index 85f15f7f9..d135a6caf 100644
--- a/paimon-core/src/main/java/org/apache/paimon/jdbc/JdbcCatalogLock.java
+++ b/paimon-core/src/main/java/org/apache/paimon/jdbc/JdbcCatalogLock.java
@@ -35,22 +35,22 @@ public class JdbcCatalogLock implements CatalogLock {
     private final JdbcClientPool connections;
     private final long checkMaxSleep;
     private final long acquireTimeout;
-    private final String catalogName;
+    private final String catalogKey;
 
     public JdbcCatalogLock(
             JdbcClientPool connections,
-            String catalogName,
+            String catalogKey,
             long checkMaxSleep,
             long acquireTimeout) {
         this.connections = connections;
         this.checkMaxSleep = checkMaxSleep;
         this.acquireTimeout = acquireTimeout;
-        this.catalogName = catalogName;
+        this.catalogKey = catalogKey;
     }
 
     @Override
     public <T> T runWithLock(String database, String table, Callable<T> 
callable) throws Exception {
-        String lockUniqueName = String.format("%s.%s.%s", catalogName, 
database, table);
+        String lockUniqueName = String.format("%s.%s.%s", catalogKey, 
database, table);
         lock(lockUniqueName);
         try {
             return callable.call();
@@ -102,7 +102,7 @@ public class JdbcCatalogLock implements CatalogLock {
             JdbcLockContext lockContext = (JdbcLockContext) context;
             return new JdbcCatalogLock(
                     lockContext.connections,
-                    lockContext.catalogName,
+                    lockContext.catalogKey,
                     checkMaxSleep(lockContext.conf),
                     acquireTimeout(lockContext.conf));
         }
@@ -110,13 +110,13 @@ public class JdbcCatalogLock implements CatalogLock {
 
     static class JdbcLockContext implements LockContext {
         private final JdbcClientPool connections;
-        private final String catalogName;
+        private final String catalogKey;
         private final Map<String, String> conf;
 
         public JdbcLockContext(
-                JdbcClientPool connections, String catalogName, Map<String, 
String> conf) {
+                JdbcClientPool connections, String catalogKey, Map<String, 
String> conf) {
             this.connections = connections;
-            this.catalogName = catalogName;
+            this.catalogKey = catalogKey;
             this.conf = conf;
         }
     }