Look up only selected fields in getConfigStringValueInternal()

abh1sar · abh1sar · commit af6d9f1e0c66 · 2025-02-28T13:36:59.000+05:30
diff --git a/framework/config/src/main/java/org/apache/cloudstack/framework/config/dao/ConfigurationDao.java b/framework/config/src/main/java/org/apache/cloudstack/framework/config/dao/ConfigurationDao.java
@@ -70,4 +70,6 @@ public interface ConfigurationDao extends GenericDao<ConfigurationVO, String> {
     void invalidateCache();
 
     List<ConfigurationVO> searchPartialConfigurations();
+
+    String getValueByKey(String key);
 }
diff --git a/framework/config/src/main/java/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java b/framework/config/src/main/java/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java
@@ -44,6 +44,7 @@ public class ConfigurationDaoImpl extends GenericDaoBase<ConfigurationVO, String
     final SearchBuilder<ConfigurationVO> InstanceSearch;
     final SearchBuilder<ConfigurationVO> NameSearch;
     final SearchBuilder<ConfigurationVO> PartialSearch;
+    final SearchBuilder<ConfigurationVO> ConfigValueSearch;
 
     public static final String UPDATE_CONFIGURATION_SQL = "UPDATE configuration SET value = ? WHERE name = ?";
 
@@ -59,6 +60,10 @@ public ConfigurationDaoImpl() {
         PartialSearch.select("name", SearchCriteria.Func.NATIVE, PartialSearch.entity().getName());
         PartialSearch.select("groupId", SearchCriteria.Func.NATIVE, PartialSearch.entity().getGroupId());
         PartialSearch.select("subGroupId", SearchCriteria.Func.NATIVE, PartialSearch.entity().getSubGroupId());
+
+        ConfigValueSearch = createSearchBuilder();
+        ConfigValueSearch.and("name", ConfigValueSearch.entity().getName(), SearchCriteria.Op.EQ);
+        ConfigValueSearch.select("value", SearchCriteria.Func.NATIVE, ConfigValueSearch.entity().getValue());
     }
 
     @Override
@@ -218,4 +223,12 @@ public List<ConfigurationVO> searchPartialConfigurations() {
         SearchCriteria<ConfigurationVO> sc = PartialSearch.create();
         return searchIncludingRemoved(sc, null, null, false);
     }
+
+    @Override
+    public String getValueByKey(String key) {
+        SearchCriteria<ConfigurationVO> sc = ConfigValueSearch.create();
+        sc.setParameters("name", key);
+        ConfigurationVO configVO = findOneIncludingRemovedBy(sc);
+        return (configVO == null ? null : configVO.getValue());
+    }
 }
diff --git a/framework/config/src/main/java/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java b/framework/config/src/main/java/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java
@@ -291,11 +291,7 @@ protected String getConfigStringValueInternal(String cacheKey) {
             }
             return scopedConfigStorage.getConfigValue(scopeId, key);
         }
-        ConfigurationVO configurationVO = _configDao.findById(key);
-        if (configurationVO != null) {
-            return configurationVO.getValue();
-        }
-        return null;
+        return _configDao.getValueByKey(key);
     }
 
     private String getConfigCacheKey(String key, ConfigKey.Scope scope, Long scopeId) {
diff --git a/framework/config/src/test/java/org/apache/cloudstack/framework/config/impl/ConfigDepotImplTest.java b/framework/config/src/test/java/org/apache/cloudstack/framework/config/impl/ConfigDepotImplTest.java
@@ -77,9 +77,7 @@ public void testIsNewConfig() {
     }
 
     private void runTestGetConfigStringValue(String key, String value) {
-        ConfigurationVO configurationVO = Mockito.mock(ConfigurationVO.class);
-        Mockito.when(configurationVO.getValue()).thenReturn(value);
-        Mockito.when(_configDao.findById(key)).thenReturn(configurationVO);
+        Mockito.when(_configDao.getValueByKey(key)).thenReturn(value);
         String result = configDepotImpl.getConfigStringValue(key, ConfigKey.Scope.Global, null);
         Assert.assertEquals(value, result);
     }
@@ -100,8 +98,7 @@ private void runTestGetConfigStringValueExpiry(long wait, int configDBRetrieval)
         }
         String result = configDepotImpl.getConfigStringValue(key, ConfigKey.Scope.Global, null);
         Assert.assertEquals(value, result);
-        Mockito.verify(_configDao, Mockito.times(configDBRetrieval)).findById(key);
-
+        Mockito.verify(_configDao, Mockito.times(configDBRetrieval)).getValueByKey(key);
     }
 
     @Test
diff --git a/server/src/test/java/com/cloud/vpc/dao/MockConfigurationDaoImpl.java b/server/src/test/java/com/cloud/vpc/dao/MockConfigurationDaoImpl.java
@@ -123,4 +123,9 @@ public void invalidateCache() {
     public List<ConfigurationVO> searchPartialConfigurations() {
         return List.of();
     }
+
+    @Override
+    public String getValueByKey(String key) {
+        return null;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -70,4 +70,6 @@ public interface ConfigurationDao extends GenericDao<ConfigurationVO, String> {`
`70`	`70`	`void invalidateCache();`
`71`	`71`
`72`	`72`	`List<ConfigurationVO> searchPartialConfigurations();`
	`73`	`+`
	`74`	`+ String getValueByKey(String key);`
`73`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -291,11 +291,7 @@ protected String getConfigStringValueInternal(String cacheKey) {`
`291`	`291`	`}`
`292`	`292`	`return scopedConfigStorage.getConfigValue(scopeId, key);`
`293`	`293`	`}`
`294`		`- ConfigurationVO configurationVO = _configDao.findById(key);`
`295`		`- if (configurationVO != null) {`
`296`		`- return configurationVO.getValue();`
`297`		`- }`
`298`		`- return null;`
	`294`	`+ return _configDao.getValueByKey(key);`
`299`	`295`	`}`
`300`	`296`
`301`	`297`	`private String getConfigCacheKey(String key, ConfigKey.Scope scope, Long scopeId) {`
Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,7 @@ public void testIsNewConfig() {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`private void runTestGetConfigStringValue(String key, String value) {`
`80`		`- ConfigurationVO configurationVO = Mockito.mock(ConfigurationVO.class);`
`81`		`- Mockito.when(configurationVO.getValue()).thenReturn(value);`
`82`		`- Mockito.when(_configDao.findById(key)).thenReturn(configurationVO);`
	`80`	`+ Mockito.when(_configDao.getValueByKey(key)).thenReturn(value);`
`83`	`81`	`String result = configDepotImpl.getConfigStringValue(key, ConfigKey.Scope.Global, null);`
`84`	`82`	`Assert.assertEquals(value, result);`
`85`	`83`	`}`
`@@ -100,8 +98,7 @@ private void runTestGetConfigStringValueExpiry(long wait, int configDBRetrieval)`
`100`	`98`	`}`
`101`	`99`	`String result = configDepotImpl.getConfigStringValue(key, ConfigKey.Scope.Global, null);`
`102`	`100`	`Assert.assertEquals(value, result);`
`103`		`- Mockito.verify(_configDao, Mockito.times(configDBRetrieval)).findById(key);`
`104`		`-`
	`101`	`+ Mockito.verify(_configDao, Mockito.times(configDBRetrieval)).getValueByKey(key);`
`105`	`102`	`}`
`106`	`103`
`107`	`104`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -123,4 +123,9 @@ public void invalidateCache() {`
`123`	`123`	`public List<ConfigurationVO> searchPartialConfigurations() {`
`124`	`124`	`return List.of();`
`125`	`125`	`}`
	`126`	`+`
	`127`	`+ @Override`
	`128`	`+ public String getValueByKey(String key) {`
	`129`	`+ return null;`
	`130`	`+ }`
`126`	`131`	`}`