From e1d3e7879e4fe4d55d91cefd06b3f963ee956a32 Mon Sep 17 00:00:00 2001 From: sunxiaojian Date: Thu, 28 Mar 2024 17:11:06 +0800 Subject: [PATCH] fixed --- .../paimon/catalog/AbstractCatalogLockContext.java | 7 ------- .../org/apache/paimon/catalog/CatalogLockContext.java | 2 ++ .../org/apache/paimon/jdbc/JdbcCatalogLockContext.java | 10 ++++++++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/paimon-core/src/main/java/org/apache/paimon/catalog/AbstractCatalogLockContext.java b/paimon-core/src/main/java/org/apache/paimon/catalog/AbstractCatalogLockContext.java index c7cecd8833faf..26cd5af096ba6 100644 --- a/paimon-core/src/main/java/org/apache/paimon/catalog/AbstractCatalogLockContext.java +++ b/paimon-core/src/main/java/org/apache/paimon/catalog/AbstractCatalogLockContext.java @@ -19,17 +19,10 @@ package org.apache.paimon.catalog; import org.apache.paimon.client.ClientPool; -import org.apache.paimon.options.Options; /** Abstract context for lock factory to create lock. */ public abstract class AbstractCatalogLockContext implements CatalogLockContext { - protected final Options options; - - public AbstractCatalogLockContext(Options options) { - this.options = options; - } - protected abstract CP clientPool(); } diff --git a/paimon-core/src/main/java/org/apache/paimon/catalog/CatalogLockContext.java b/paimon-core/src/main/java/org/apache/paimon/catalog/CatalogLockContext.java index 442409c81be87..23e6aa69574b0 100644 --- a/paimon-core/src/main/java/org/apache/paimon/catalog/CatalogLockContext.java +++ b/paimon-core/src/main/java/org/apache/paimon/catalog/CatalogLockContext.java @@ -25,6 +25,8 @@ /** Context for lock factory to create lock. */ public interface CatalogLockContext extends Serializable { + String LOCK_CONFIGURATION_PREFIX = "lock."; + Options options(); static CatalogLockContext fromOptions(Options options) { diff --git a/paimon-core/src/main/java/org/apache/paimon/jdbc/JdbcCatalogLockContext.java b/paimon-core/src/main/java/org/apache/paimon/jdbc/JdbcCatalogLockContext.java index f5da56ae45c2e..e745a58f7ac0c 100644 --- a/paimon-core/src/main/java/org/apache/paimon/jdbc/JdbcCatalogLockContext.java +++ b/paimon-core/src/main/java/org/apache/paimon/jdbc/JdbcCatalogLockContext.java @@ -26,14 +26,20 @@ public class JdbcCatalogLockContext extends AbstractCatalogLockContext