alirezazamani commented on a change in pull request #869: Replace customized
view cache with property cache
URL: https://github.com/apache/helix/pull/869#discussion_r400556444
##########
File path:
helix-core/src/main/java/org/apache/helix/common/caches/CustomizedViewCache.java
##########
@@ -71,87 +77,18 @@ protected CustomizedViewCache(String clusterName,
PropertyType propertyType, Str
*/
public void refresh(HelixDataAccessor accessor) {
long startTime = System.currentTimeMillis();
- PropertyKey.Builder keyBuilder = accessor.keyBuilder();
- Set<PropertyKey> currentPropertyKeys = new HashSet<>();
-
- List<String> resources =
accessor.getChildNames(customizedViewsKey(keyBuilder));
-
- for (String resource : resources) {
- currentPropertyKeys.add(customizedViewKey(keyBuilder, resource));
- }
-
- Set<PropertyKey> cachedKeys = new HashSet<>();
- Map<PropertyKey, CustomizedView> cachedCustomizedViewMap =
Maps.newHashMap();
- for (String resource : _customizedViewCache.keySet()) {
- PropertyKey key = customizedViewKey(keyBuilder, resource);
- cachedKeys.add(key);
- cachedCustomizedViewMap.put(key, _customizedViewCache.get(resource));
- }
- cachedKeys.retainAll(currentPropertyKeys);
-
- Set<PropertyKey> reloadKeys = new HashSet<>(currentPropertyKeys);
- reloadKeys.removeAll(cachedKeys);
-
- Map<PropertyKey, CustomizedView> updatedMap =
- refreshProperties(accessor, reloadKeys, new ArrayList<>(cachedKeys),
- cachedCustomizedViewMap, new HashSet<>());
-
- Map<String, CustomizedView> newCustomizedViewMap = Maps.newHashMap();
- for (CustomizedView customizedView : updatedMap.values()) {
- newCustomizedViewMap.put(customizedView.getResourceName(),
customizedView);
- }
-
- _customizedViewCache = new HashMap<>(newCustomizedViewMap);
- _customizedViewMap = new HashMap<>(newCustomizedViewMap);
-
+ _customizedViewCache.refresh(accessor);
long endTime = System.currentTimeMillis();
- LOG.info("Refresh " + _customizedViewMap.size() + " CustomizedViews of
type " + _customizedStateType
- + " for cluster " + _clusterName + ", took " + (endTime - startTime) +
" ms");
- }
-
- private PropertyKey customizedViewsKey(PropertyKey.Builder keyBuilder) {
- PropertyKey customizedViewPropertyKey;
- if (_propertyType.equals(PropertyType.CUSTOMIZEDVIEW)){
- customizedViewPropertyKey =
keyBuilder.customizedView(_customizedStateType);
- } else {
- throw new HelixException(
- "Failed to refresh CustomizedViewCache, Wrong property type " +
_propertyType + "!");
- }
- return customizedViewPropertyKey;
- }
- private PropertyKey customizedViewKey(PropertyKey.Builder keyBuilder, String
resource) {
- PropertyKey customizedViewPropertyKey;
- if (_propertyType.equals(PropertyType.CUSTOMIZEDVIEW)) {
- customizedViewPropertyKey =
keyBuilder.customizedView(_customizedStateType, resource);
- } else {
- throw new HelixException(
- "Failed to refresh CustomizedViewCache, Wrong property type " +
_propertyType + "!");
- }
- return customizedViewPropertyKey;
+ LOG.info("Refresh " + _customizedViewCache.getPropertyMap().size() + "
CustomizedViews of type " + _customizedStateType
Review comment:
Done. Thanks.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
