From f2cda8d2eafa5ff9c53ed6f60fb3381c4c906e72 Mon Sep 17 00:00:00 2001 From: morningman Date: Mon, 5 Feb 2024 14:32:31 +0800 Subject: [PATCH] fix ut --- .../java/org/apache/doris/datasource/ExternalCatalog.java | 7 ++++--- .../doris/datasource/jdbc/JdbcExternalCatalogTest.java | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java index 075559a317975c..c5408dd3103852 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java @@ -106,7 +106,7 @@ public abstract class ExternalCatalog private String comment; // A cached and being converted properties for external catalog. // generated from catalog properties. - private final byte[] lock = new byte[0]; + private byte[] propLock = new byte[0]; private Map convertedProperties = null; public ExternalCatalog() { @@ -302,7 +302,7 @@ protected void init() { public void onRefresh(boolean invalidCache) { this.objectCreated = false; this.initialized = false; - synchronized (this.lock) { + synchronized (this.propLock) { this.convertedProperties = null; } this.invalidCacheInInit = invalidCache; @@ -432,7 +432,7 @@ public Map getProperties() { if (convertedProperties != null) { return convertedProperties; } - synchronized (lock) { + synchronized (propLock) { if (convertedProperties != null) { return convertedProperties; } @@ -569,6 +569,7 @@ public void gsonPostProcess() throws IOException { } } } + this.propLock = new byte[0]; } public void addDatabaseForTest(ExternalDatabase db) { diff --git a/fe/fe-core/src/test/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalogTest.java b/fe/fe-core/src/test/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalogTest.java index 7bc268b64211bb..8394daf0682b6c 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalogTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/datasource/jdbc/JdbcExternalCatalogTest.java @@ -54,6 +54,7 @@ public void replayJdbcCatalogTest() throws DdlException { Map newProperties = Maps.newHashMap(); newProperties.put(JdbcResource.CONNECTION_POOL_MIN_SIZE, "2"); jdbcExternalCatalog.getCatalogProperty().modifyCatalogProps(newProperties); + jdbcExternalCatalog.notifyPropertiesUpdated(newProperties); JdbcExternalCatalog replayJdbcCatalog2 = (JdbcExternalCatalog) CatalogFactory.createFromLog( jdbcExternalCatalog.constructEditLog()); Map properties2 = replayJdbcCatalog2.getProperties();