-
Notifications
You must be signed in to change notification settings - Fork 12.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor ConfigCache and related pathways ,remove md5GBK to uniformly…
… use UTF-8 encoding for md5 fields. Utilize the SPI mechanism in related pathways and methods to ensure extensibility for support of other types of encoding. Fix test.
- Loading branch information
Showing
31 changed files
with
1,133 additions
and
127 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
config/src/main/java/com/alibaba/nacos/config/server/model/ConfigCacheFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * Copyright 1999-2024 Alibaba Group Holding Ltd. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.alibaba.nacos.config.server.model; | ||
|
|
||
| /** | ||
| * The interface Config cache factory. | ||
| * | ||
| * @author Sunrisea | ||
| */ | ||
| public interface ConfigCacheFactory { | ||
|
|
||
| /** | ||
| * Create config cache config cache. | ||
| * | ||
| * @return the config cache | ||
| */ | ||
| public ConfigCache createConfigCache(); | ||
|
|
||
| /** | ||
| * Create config cache config cache. | ||
| * | ||
| * @param md5 the md 5 | ||
| * @param lastModifiedTs the last modified ts | ||
| * @return the config cache | ||
| */ | ||
| public ConfigCache createConfigCache(String md5, long lastModifiedTs); | ||
|
|
||
| /** | ||
| * Create config cache gray config cache gray. | ||
| * | ||
| * @param grayName the gray name | ||
| * @return the config cache gray | ||
| */ | ||
| public ConfigCacheGray createConfigCacheGray(String grayName); | ||
|
|
||
| /** | ||
| * Create config cache gray config cache gray. | ||
| * | ||
| * @param md5 the md 5 | ||
| * @param lastModifiedTs the last modified ts | ||
| * @param grayRule the gray rule | ||
| * @return the config cache gray | ||
| */ | ||
| public ConfigCacheGray createConfigCacheGray(String md5, long lastModifiedTs, String grayRule); | ||
|
|
||
| /** | ||
| * Gets config cache factroy name. | ||
| * | ||
| * @return the config cache factory name | ||
| */ | ||
| public String getConfigCacheFactoryName(); | ||
| } |
81 changes: 81 additions & 0 deletions
81
config/src/main/java/com/alibaba/nacos/config/server/model/ConfigCacheFactoryDelegate.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * Copyright 1999-2024 Alibaba Group Holding Ltd. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.alibaba.nacos.config.server.model; | ||
|
|
||
| import com.alibaba.nacos.common.spi.NacosServiceLoader; | ||
| import com.alibaba.nacos.common.utils.StringUtils; | ||
| import com.alibaba.nacos.sys.env.EnvUtil; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.util.Collection; | ||
|
|
||
| /** | ||
| * The type Config cache factory delegate. | ||
| * | ||
| * @author Sunrisea | ||
| */ | ||
| public class ConfigCacheFactoryDelegate { | ||
|
|
||
| private static final Logger LOGGER = LoggerFactory.getLogger(ConfigCacheFactoryDelegate.class); | ||
|
|
||
| private static final ConfigCacheFactoryDelegate INSTANCE = new ConfigCacheFactoryDelegate(); | ||
|
|
||
| private String configCacheFactoryType = EnvUtil.getProperty("nacos.config.cache.type", "nacos"); | ||
|
|
||
| private ConfigCacheFactory configCacheFactory = null; | ||
|
|
||
| private ConfigCacheFactoryDelegate() { | ||
| Collection<ConfigCacheFactory> configCacheFactories = NacosServiceLoader.load(ConfigCacheFactory.class); | ||
| for (ConfigCacheFactory each : configCacheFactories) { | ||
| if (StringUtils.isEmpty(each.getConfigCacheFactoryName())) { | ||
| LOGGER.warn("[ConfigCacheFactory] Load ConfigCacheFactory({}) ConfigFactroyName (null/empty) fail. " | ||
| + "Please add ConfigFactoryName to resolve", | ||
| each.getClass()); | ||
| continue; | ||
| } | ||
| LOGGER.info("[ConfigCacheFactory] Load ConfigCacheFactory({}) ConfigCacheFactoryName({}) successfully. ", | ||
| each.getClass(), each.getConfigCacheFactoryName()); | ||
| if (StringUtils.equals(configCacheFactoryType, each.getConfigCacheFactoryName())) { | ||
| this.configCacheFactory = each; | ||
| } | ||
| } | ||
| if (this.configCacheFactory == null) { | ||
| this.configCacheFactory = new NacosConfigCacheFactory(); | ||
| } | ||
| } | ||
|
|
||
| public static ConfigCacheFactoryDelegate getInstance() { | ||
| return INSTANCE; | ||
| } | ||
|
|
||
| public ConfigCache createConfigCache() { | ||
| return configCacheFactory.createConfigCache(); | ||
| } | ||
|
|
||
| public ConfigCache createConfigCache(String md5, long lastModifiedTs) { | ||
| return configCacheFactory.createConfigCache(md5, lastModifiedTs); | ||
| } | ||
|
|
||
| public ConfigCacheGray createConfigCacheGray(String grayName) { | ||
| return configCacheFactory.createConfigCacheGray(grayName); | ||
| } | ||
|
|
||
| public ConfigCacheGray createConfigCacheGray(String md5, long lastModifiedTs, String grayRule) { | ||
| return configCacheFactory.createConfigCacheGray(md5, lastModifiedTs, grayRule); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
config/src/main/java/com/alibaba/nacos/config/server/model/ConfigCacheMd5PostProcessor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
| * Copyright 1999-2024 Alibaba Group Holding Ltd. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.alibaba.nacos.config.server.model; | ||
|
|
||
| /** | ||
| * The interface Config cache md5 post processor. | ||
| * | ||
| * @author Sunrisea | ||
| */ | ||
| public interface ConfigCacheMd5PostProcessor { | ||
|
|
||
| /** | ||
| * Gets post processor name. | ||
| * | ||
| * @return the post processor name | ||
| */ | ||
| public String getPostProcessorName(); | ||
|
|
||
| /** | ||
| * Post process. | ||
| * | ||
| * @param configCache the config cache | ||
| * @param content the content | ||
| */ | ||
| public void postProcess(ConfigCache configCache, String content); | ||
| } |
Oops, something went wrong.