fix ut

apache · Feb 5, 2024 · f2cda8d · f2cda8d
1 parent 63ea9d8
commit f2cda8d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 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
@@ -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<String, String> 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<String, String> 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<? extends ExternalTable> 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
@@ -54,6 +54,7 @@ public void replayJdbcCatalogTest() throws DdlException {
         Map<String, String> 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<String, String> properties2 = replayJdbcCatalog2.getProperties();