jiajunwang commented on a change in pull request #1307: URL: https://github.com/apache/helix/pull/1307#discussion_r493048679
########## File path: helix-core/src/main/java/org/apache/helix/model/ClusterTrie.java ########## @@ -0,0 +1,155 @@ +package org.apache.helix.model; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.apache.helix.HelixException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * This is a class that uses a trie data structure to represent cluster topology. Each node + * except the terminal node represents a certain domain in the topology, and an terminal node + * represents an instance in the cluster. + */ +public class ClusterTrie { + public static final String DELIMITER = "/"; + public static final String CONNECTOR = ":"; + + private static Logger logger = LoggerFactory.getLogger(ClusterTrie.class); + private TrieNode _rootNode; + private String[] _topologyKeys; + private String _faultZoneType; + private List<String> _invalidInstances = new ArrayList<>(); + + public ClusterTrie(final List<String> liveNodes, + final Map<String, InstanceConfig> instanceConfigMap, ClusterConfig clusterConfig) { + validateInstanceConfig(liveNodes, instanceConfigMap); + _topologyKeys = getTopologyDef(clusterConfig); + _faultZoneType = clusterConfig.getFaultZoneType(); + _invalidInstances = getInvalidInstancesFromConfig(instanceConfigMap, _topologyKeys); + instanceConfigMap.keySet().removeAll(_invalidInstances); + _rootNode = constructTrie(instanceConfigMap, _topologyKeys); + } + + public TrieNode getRootNode() { + return _rootNode; + } + + public String[] getTopologyKeys() { + return _topologyKeys; + } + + public String getFaultZoneType() { + return _faultZoneType; + } + + public List<String> getInvalidInstances() { + return _invalidInstances; + } + + private void validateInstanceConfig(final List<String> liveNodes, + final Map<String, InstanceConfig> instanceConfigMap) { + if (instanceConfigMap == null || !instanceConfigMap.keySet().containsAll(liveNodes)) { + List<String> liveNodesCopy = new ArrayList<>(); + liveNodesCopy.addAll(liveNodes); + throw new HelixException(String.format("Config for instances %s is not found!", + instanceConfigMap == null ? liveNodes + : liveNodesCopy.removeAll(instanceConfigMap.keySet()))); + } + } + + private List<String> getInvalidInstancesFromConfig(Map<String, InstanceConfig> instanceConfigMap, + final String[] topologyKeys) { + List<String> invalidInstances = new ArrayList<>(); + for (String instanceName : instanceConfigMap.keySet()) { + try { + Map<String, String> domainAsMap = instanceConfigMap.get(instanceName).getDomainAsMap(); + for (String key : topologyKeys) { + String value = domainAsMap.get(key); + if (value == null || value.length() == 0) { + logger.info(String.format("Domain %s for instance %s is not set", domainAsMap.get(key), + instanceName)); + invalidInstances.add(instanceName); + break; + } + } + } catch (IllegalArgumentException e) { + invalidInstances.add(instanceName); + } + } + return invalidInstances; + } + + // Note that we do not validate whether topology-aware is enabled or fault zone type is + // defined, as they do not block the construction of the trie + private String[] getTopologyDef(ClusterConfig clusterConfig) { + String[] topologyDef; + String topologyDefInConfig = clusterConfig.getTopology(); + if (topologyDefInConfig == null) { + throw new HelixException(String.format("The topology of cluster %s is empty!", + clusterConfig.getClusterName())); + } + // A list of all keys in cluster topology, e.g., a cluster topology defined as + // /group/zone/rack/host will return ["group", "zone", "rack", "host"]. + topologyDef = Arrays.asList(topologyDefInConfig.trim().split(DELIMITER)).stream() Review comment: The same example that I gave Xiaoyuan for the Topology.java change, "/group/ zone/ rack /host", do we accept this one? With your current logic, I think it will return "["group", " zone", " rack ", "host"]". Please mind the space in the keys. It will cause a mismatch in the later algorithm. ########## File path: helix-core/src/main/java/org/apache/helix/model/TrieClusterTopology.java ########## @@ -0,0 +1,340 @@ +package org.apache.helix.model; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import org.apache.helix.HelixException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * This is a class that uses a trie data structure to represent cluster topology. Each node + * except the terminal node represents a certain domain in the topology, and an terminal node + * represents an instance in the cluster. + */ +public class TrieClusterTopology { + private static Logger logger = LoggerFactory.getLogger(TrieClusterTopology.class); + private static final String DELIMITER = "/"; + private static final String CONNECTOR = ":"; + + private final TrieNode _rootNode; + private final String[] _topologyKeys; + private final String _faultZoneType; + + public TrieClusterTopology(final List<String> liveNodes, + final Map<String, InstanceConfig> instanceConfigMap, ClusterConfig clusterConfig) { + if (instanceConfigMap == null || !instanceConfigMap.keySet().containsAll(liveNodes)) { + throw new HelixException(String.format("Config for instances %s is not found!", + instanceConfigMap == null ? liveNodes : liveNodes.removeAll(instanceConfigMap.keySet()))); + } + + String topologyDef = clusterConfig.getTopology(); + if (topologyDef == null) { + throw new HelixException(String.format("The topology of cluster %s is empty!", + clusterConfig.getClusterName())); + } + // A list of all keys in cluster topology, e.g., a cluster topology defined as + // /group/zone/rack/host will return ["group", "zone", "rack", "host"]. + _topologyKeys = Arrays.asList(topologyDef.trim().split(DELIMITER)).stream() + .filter(str -> !str.isEmpty()).collect(Collectors.toList()).toArray(new String[0]); Review comment: Commented in your new code. Let me resolve this one. ########## File path: helix-core/src/main/java/org/apache/helix/model/ClusterTrie.java ########## @@ -0,0 +1,150 @@ +package org.apache.helix.model; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.apache.helix.HelixException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * This is a class that uses a trie data structure to represent cluster topology. Each node + * except the terminal node represents a certain domain in the topology, and an terminal node + * represents an instance in the cluster. + */ +public class ClusterTrie { + public static final String DELIMITER = "/"; + public static final String CONNECTOR = ":"; + + private static Logger logger = LoggerFactory.getLogger(ClusterTrie.class); + private TrieNode _rootNode; + private String[] _topologyKeys; + private String _faultZoneType; + private List<String> _invalidInstances = new ArrayList<>(); + + public ClusterTrie(final List<String> liveNodes, + final Map<String, InstanceConfig> instanceConfigMap, ClusterConfig clusterConfig) { + validateInstanceConfig(liveNodes, instanceConfigMap); + validateClusterConfig(clusterConfig); + _faultZoneType = clusterConfig.getFaultZoneType(); + _rootNode = constructTrie(instanceConfigMap); + } + + + public TrieNode getRootNode() { + return _rootNode; + } + + public String[] getTopologyKeys() { + return _topologyKeys; + } + + public String getFaultZoneType() { + return _faultZoneType; + } + + public List<String> getInvalidInstances() { + return _invalidInstances; + } + + private void removeInvalidInstanceConfig(Map<String, InstanceConfig> instanceConfigMap) { + for (String instanceName : instanceConfigMap.keySet()) { + try { + Map<String, String> domainAsMap = instanceConfigMap.get(instanceName).getDomainAsMap(); + for (String key : _topologyKeys) { + String value = domainAsMap.get(key); + if (value == null || value.length() == 0) { + logger.info(String.format("Domain %s for instance %s is not set", domainAsMap.get(key), + instanceName)); + _invalidInstances.add(instanceName); + break; + } + } + } catch (IllegalArgumentException e) { + _invalidInstances.add(instanceName); + } + } + _invalidInstances.forEach(entry -> instanceConfigMap.remove(entry)); + } + + private void validateInstanceConfig(final List<String> liveNodes, + final Map<String, InstanceConfig> instanceConfigMap) { + if (instanceConfigMap == null || !instanceConfigMap.keySet().containsAll(liveNodes)) { + List<String> liveNodesCopy = new ArrayList<>(); + liveNodesCopy.addAll(liveNodes); + throw new HelixException(String.format("Config for instances %s is not found!", + instanceConfigMap == null ? liveNodes + : liveNodesCopy.removeAll(instanceConfigMap.keySet()))); + } + } + + // Note that we do not validate whether topology-aware is enabled or fault zone type is + // defined, as they do not block the construction of the trie + private void validateClusterConfig(ClusterConfig clusterConfig) { + String topologyDef = clusterConfig.getTopology(); + if (topologyDef == null) { + throw new HelixException(String.format("The topology of cluster %s is empty!", + clusterConfig.getClusterName())); + } + // A list of all keys in cluster topology, e.g., a cluster topology defined as + // /group/zone/rack/host will return ["group", "zone", "rack", "host"]. + _topologyKeys = Arrays.asList(topologyDef.trim().split(DELIMITER)).stream() + .filter(str -> !str.isEmpty()).collect(Collectors.toList()).toArray(new String[0]); + if (_topologyKeys.length == 0) { + throw new HelixException(String.format("The topology of cluster %s is not correctly defined", + clusterConfig.getClusterName())); + } + } + + /** + * Constructs a trie based on the provided instance config map. It loops through all instance + * configs and constructs the trie in a top down manner. + */ + private TrieNode constructTrie(Map<String, InstanceConfig> instanceConfigMap) { + TrieNode rootNode = new TrieNode(new HashMap<>(), "", "ROOT"); + removeInvalidInstanceConfig(instanceConfigMap); + Map<String, Map<String, String>> instanceDomainsMap = new HashMap<>(); + instanceConfigMap.entrySet().forEach( + entry -> instanceDomainsMap.put(entry.getKey(), entry.getValue().getDomainAsMap())); + + for (Map.Entry<String, Map<String, String>> entry : instanceDomainsMap.entrySet()) { + TrieNode curNode = rootNode; + String path = ""; + for (int i = 0; i < _topologyKeys.length; i++) { + String key = _topologyKeys[i] + CONNECTOR + entry.getValue().get(_topologyKeys[i]); + path = path + DELIMITER + key; + TrieNode nextNode = curNode.getChildren().get(key); + if (nextNode == null) { + nextNode = new TrieNode(new HashMap<>(), path, _topologyKeys[i]); Review comment: I don't get the reason. With your example, it should be very simple to distinguish since these 3 zone:0 nodes are under different parent nodes. And while you are traversing, the algorithm can construct the full path based on parents' information. You can even keep a stack with paths for this purpose. ########## File path: helix-core/src/main/java/org/apache/helix/api/topology/ClusterTopology.java ########## @@ -0,0 +1,248 @@ +package org.apache.helix.api.topology; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.helix.model.ClusterConfig; +import org.apache.helix.model.ClusterTrie; +import org.apache.helix.model.InstanceConfig; +import org.apache.helix.model.TrieNode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.apache.helix.model.ClusterTrie.CONNECTOR; +import static org.apache.helix.model.ClusterTrie.DELIMITER; + + +public class ClusterTopology { + private static Logger logger = LoggerFactory.getLogger(ClusterTopology.class); + + private final ClusterTrie _trieClusterTopology; + + public ClusterTopology(final List<String> liveNodes, + final Map<String, InstanceConfig> instanceConfigMap, ClusterConfig clusterConfig) { + _trieClusterTopology = new ClusterTrie(liveNodes, instanceConfigMap, clusterConfig); + } + + /** + * Return the whole topology of a cluster as a map. The key of the map is the first level of + * domain, and the value is a list of string that represents the path to each end node in that + * domain. E.g., assume the topology is defined as /group/zone/rack/host, the result may be { + * ["/group:0": {"/zone:0/rack:0/host:0", "/zone:1/rack:1/host:1"}], ["/group:1": {"/zone:1 + * /rack:1/host:1", "/zone:1/rack:1/host:2"}]} + */ + public Map<String, List<String>> getTopologyMap() { + return getTopologyUnderDomain(new HashMap<>()); + } + + /** + * Return all the instances under fault zone type. The key of the returned map is each fault + * zone name, and the value is a list of string that represents the path to each end node in + * that fault zone. + * @return , e.g. if the fault zone is "zone", it may return {["/group:0/zone:0": {"rack:0/host + * :0", "rack:1/host:1"}, ["/group:0/zone:1": {"/rack:0:host:2", "/rack:1/host:3"}]} + */ + public Map<String, List<String>> getFaultZoneMap() { + String faultZone = _trieClusterTopology.getFaultZoneType(); + if (faultZone == null) { + throw new IllegalArgumentException("The fault zone in cluster config is not defined"); + } + return getTopologyUnderDomainType(faultZone); + } + + /** + * Return the instances whose domain field is not valid + */ + public List<String> getInvalidInstances() { + return _trieClusterTopology.getInvalidInstances(); + } + + /** + * Return the topology under a certain domain as a map. The key of the returned map is the next + * level domain, and the value is a list of string that represents the path to each end node in + * that domain. + * @param domain A map defining the domain name and its value, e.g. {["group": "1"], ["zone", + * "2"]} + * @return the topology under the given domain, e.g. {["/group:1/zone:2/rack:0": {"/host:0", + * "/host:1"}, ["/group:1/zone:2/rack:1": {"/host:2", "/host:3"}]} + */ + private Map<String, List<String>> getTopologyUnderDomain(Map<String, String> domain) { + LinkedHashMap<String, String> orderedDomain = validateAndOrderDomain(domain); + TrieNode startNode = getStartNode(orderedDomain); + Map<String, TrieNode> children = startNode.getChildren(); + Map<String, List<String>> results = new HashMap<>(); + children.entrySet().forEach(child -> { + results.put(startNode.getPath() + DELIMITER + child.getKey(), + truncatePath(getPathUnderNode(child.getValue()), child.getValue().getPath())); + }); + return results; + } + + /** + * Return the full topology of a certain domain type. + * @param domainType a specific type of domain, e.g. zone + * @return the topology of the given domain type, e.g. {["/group:0/zone:0": {"rack:0/host:0", + * "rack:1/host:1"}, ["/group:0/zone:1": {"/rack:0:host:2", "/rack:1/host:3"}]} + */ + private Map<String, List<String>> getTopologyUnderDomainType(String domainType) { + String[] topologyKeys = _trieClusterTopology.getTopologyKeys(); + if (domainType.equals(topologyKeys[0])) { + return getTopologyMap(); + } + Map<String, List<String>> results = new HashMap<>(); + String parentDomainType = null; + for (int i = 1; i < topologyKeys.length; i++) { + if (topologyKeys[i].equals(domainType)) { + parentDomainType = topologyKeys[i - 1]; + break; + } + } + // get all the starting nodes for the domain type + List<TrieNode> startNodes = getStartNodes(parentDomainType); + for (TrieNode startNode : startNodes) { + results.putAll(getTopologyUnderPath(startNode.getPath())); + } + return results; + } + + /** + * Return the topology under a certain path as a map. The key of the returned map is the next + * level domain, and the value is a list of string that represents the path to each end node in + * that domain. + * @param path a path to a certain Trie node, e.g. /group:1/zone:2 + * @return the topology under the given domain, e.g. {["/group:1/zone:2/rack:0": {"/host:0", + * "/host:1"}, ["/group:1/zone:2/rack:1": {"/host:2", "/host:3"}]} + */ + private Map<String, List<String>> getTopologyUnderPath(String path) { + Map<String, String> domain = convertPathToDomain(path); + return getTopologyUnderDomain(domain); + } + + /** + * Validate the domain provided has continuous fields in cluster topology definition. If it + * has, order the domain based on cluster topology definition. E.g. if the cluster topology is + * /group/zone/rack/instance, and domain is provided as {["zone": "1"], ["group", "2"]} will be + * reordered in a LinkedinHashMap as {["group", "2"], ["zone": "1"]} + */ + private LinkedHashMap<String, String> validateAndOrderDomain(Map<String, String> domain) { + LinkedHashMap<String, String> orderedDomain = new LinkedHashMap<>(); + if (domain == null) { + throw new IllegalArgumentException("The domain should not be null"); + } + String[] topologyKeys = _trieClusterTopology.getTopologyKeys(); + for (int i = 0; i < domain.size(); i++) { + if (!domain.containsKey(topologyKeys[i])) { + throw new IllegalArgumentException(String + .format("The input domain is not valid, the key %s is required", topologyKeys[i])); + } else { + orderedDomain.put(topologyKeys[i], domain.get(topologyKeys[i])); + } + } + return orderedDomain; + } + + /** + * Truncate each path in the given set and only retain path starting from current node's + * children to each end node. + * @param toRemovePath The path from root to current node. It should be removed so that users + * can get a better view. + */ + private List<String> truncatePath(Set<String> paths, String toRemovePath) { + List<String> results = new ArrayList<>(); + paths.forEach(path -> { + String truncatedPath = path.replace(toRemovePath, ""); + results.add(truncatedPath); + }); + return results; + } + + /** + * Return all the paths from a TrieNode as a set. + * @param node the node from where to collect all the nodes' paths. + * @return All the paths under the node. + */ + private Set<String> getPathUnderNode(TrieNode node) { + Set<String> resultMap = new HashSet<>(); + Deque<TrieNode> nodeStack = new ArrayDeque<>(); + nodeStack.push(node); + while (!nodeStack.isEmpty()) { + node = nodeStack.pop(); + if (node.getChildren().isEmpty()) { + resultMap.add(node.getPath()); + } else { + for (TrieNode child : node.getChildren().values()) { + nodeStack.push(child); + } + } + } + return resultMap; + } + + private TrieNode getStartNode(LinkedHashMap<String, String> domain) { Review comment: I understand the logic, I'm just asking about the name. Since this method can also be used to get the leaf, I feel getNode() is simpler and more generic. But no strong preference here. ########## File path: helix-core/src/main/java/org/apache/helix/api/topology/ClusterTopology.java ########## @@ -0,0 +1,248 @@ +package org.apache.helix.api.topology; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Deque; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.helix.model.ClusterConfig; +import org.apache.helix.model.ClusterTrie; +import org.apache.helix.model.InstanceConfig; +import org.apache.helix.model.TrieNode; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.apache.helix.model.ClusterTrie.CONNECTOR; +import static org.apache.helix.model.ClusterTrie.DELIMITER; + + +public class ClusterTopology { + private static Logger logger = LoggerFactory.getLogger(ClusterTopology.class); + + private final ClusterTrie _trieClusterTopology; + + public ClusterTopology(final List<String> liveNodes, + final Map<String, InstanceConfig> instanceConfigMap, ClusterConfig clusterConfig) { + _trieClusterTopology = new ClusterTrie(liveNodes, instanceConfigMap, clusterConfig); + } + + /** + * Return the whole topology of a cluster as a map. The key of the map is the first level of + * domain, and the value is a list of string that represents the path to each end node in that + * domain. E.g., assume the topology is defined as /group/zone/rack/host, the result may be { + * ["/group:0": {"/zone:0/rack:0/host:0", "/zone:1/rack:1/host:1"}], ["/group:1": {"/zone:1 + * /rack:1/host:1", "/zone:1/rack:1/host:2"}]} + */ + public Map<String, List<String>> getTopologyMap() { + return getTopologyUnderDomain(new HashMap<>()); + } + + /** + * Return all the instances under fault zone type. The key of the returned map is each fault + * zone name, and the value is a list of string that represents the path to each end node in + * that fault zone. + * @return , e.g. if the fault zone is "zone", it may return {["/group:0/zone:0": {"rack:0/host + * :0", "rack:1/host:1"}, ["/group:0/zone:1": {"/rack:0:host:2", "/rack:1/host:3"}]} + */ + public Map<String, List<String>> getFaultZoneMap() { + String faultZone = _trieClusterTopology.getFaultZoneType(); + if (faultZone == null) { + throw new IllegalArgumentException("The fault zone in cluster config is not defined"); + } + return getTopologyUnderDomainType(faultZone); + } + + /** + * Return the instances whose domain field is not valid + */ + public List<String> getInvalidInstances() { + return _trieClusterTopology.getInvalidInstances(); + } + + /** + * Return the topology under a certain domain as a map. The key of the returned map is the next + * level domain, and the value is a list of string that represents the path to each end node in + * that domain. + * @param domain A map defining the domain name and its value, e.g. {["group": "1"], ["zone", + * "2"]} + * @return the topology under the given domain, e.g. {["/group:1/zone:2/rack:0": {"/host:0", + * "/host:1"}, ["/group:1/zone:2/rack:1": {"/host:2", "/host:3"}]} + */ + private Map<String, List<String>> getTopologyUnderDomain(Map<String, String> domain) { Review comment: Yeah, I see. Let's keep the current design for now. ########## File path: helix-core/src/main/java/org/apache/helix/model/TrieNode.java ########## @@ -0,0 +1,59 @@ +package org.apache.helix.model; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import java.util.HashMap; +import java.util.Map; + + +public class TrieNode { + // A mapping between trie key and children nodes. + private Map<String, TrieNode> _children; + + // the complete path/prefix leading to the current node. + private final String _path; + + private final String _nodeKey; + + TrieNode(String path, String nodeKey) { + _path = path; + _nodeKey = nodeKey; + _children = new HashMap<>(); + } + + public Map<String, TrieNode> getChildren() { + return _children; + } + + public String getPath() { + return _path; + } + + public String getNodeKey() { + return _nodeKey; + } + + public void addChildrenMap(Map <String, TrieNode> children) { Review comment: I guess this is not necessary? ########## File path: helix-core/src/main/java/org/apache/helix/model/ClusterTrie.java ########## @@ -0,0 +1,156 @@ +package org.apache.helix.model; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.apache.helix.HelixException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * This is a class that uses a trie data structure to represent cluster topology. Each node + * except the terminal node represents a certain domain in the topology, and an terminal node + * represents an instance in the cluster. + */ +public class ClusterTrie { + public static final String DELIMITER = "/"; + public static final String CONNECTOR = ":"; + + private static Logger logger = LoggerFactory.getLogger(ClusterTrie.class); + private TrieNode _rootNode; + private String[] _topologyKeys; + private String _faultZoneType; + private List<String> _invalidInstances = new ArrayList<>(); + + public ClusterTrie(final List<String> liveNodes, + final Map<String, InstanceConfig> instanceConfigMap, ClusterConfig clusterConfig) { + validateInstanceConfig(liveNodes, instanceConfigMap); + _topologyKeys = getTopologyDef(clusterConfig); + _faultZoneType = clusterConfig.getFaultZoneType(); + _invalidInstances = getInvalidInstancesFromConfig(instanceConfigMap, _topologyKeys); + instanceConfigMap.keySet().removeAll(_invalidInstances); + _rootNode = constructTrie(instanceConfigMap, _topologyKeys); + } + + public TrieNode getRootNode() { + return _rootNode; + } + + public String[] getTopologyKeys() { + return _topologyKeys; + } + + public String getFaultZoneType() { + return _faultZoneType; + } + + public List<String> getInvalidInstances() { + return _invalidInstances; + } + + private void validateInstanceConfig(final List<String> liveNodes, + final Map<String, InstanceConfig> instanceConfigMap) { + if (instanceConfigMap == null || !instanceConfigMap.keySet().containsAll(liveNodes)) { + List<String> liveNodesCopy = new ArrayList<>(); + liveNodesCopy.addAll(liveNodes); + throw new HelixException(String.format("Config for instances %s is not found!", + instanceConfigMap == null ? liveNodes + : liveNodesCopy.removeAll(instanceConfigMap.keySet()))); + } + } + + private List<String> getInvalidInstancesFromConfig(Map<String, InstanceConfig> instanceConfigMap, + final String[] topologyKeys) { + List<String> invalidInstances = new ArrayList<>(); + for (String instanceName : instanceConfigMap.keySet()) { + try { + Map<String, String> domainAsMap = instanceConfigMap.get(instanceName).getDomainAsMap(); + for (String key : topologyKeys) { + String value = domainAsMap.get(key); + if (value == null || value.length() == 0) { + logger.info(String.format("Domain %s for instance %s is not set", domainAsMap.get(key), + instanceName)); + invalidInstances.add(instanceName); + break; + } + } + } catch (IllegalArgumentException e) { + invalidInstances.add(instanceName); + } + } + return invalidInstances; + } + + // Note that we do not validate whether topology-aware is enabled or fault zone type is + // defined, as they do not block the construction of the trie + private String[] getTopologyDef(ClusterConfig clusterConfig) { + String[] topologyDef; + String topologyDefInConfig = clusterConfig.getTopology(); + if (topologyDefInConfig == null) { + throw new HelixException(String.format("The topology of cluster %s is empty!", + clusterConfig.getClusterName())); + } + // A list of all keys in cluster topology, e.g., a cluster topology defined as + // /group/zone/rack/host will return ["group", "zone", "rack", "host"]. + topologyDef = + Arrays.asList(topologyDefInConfig.trim().split(DELIMITER)).stream().map(str -> str.trim()) Review comment: nit, the first tirm becomes unnecessary with the later one in the map(). ########## File path: helix-core/src/main/java/org/apache/helix/model/ClusterTrie.java ########## @@ -0,0 +1,156 @@ +package org.apache.helix.model; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.apache.helix.HelixException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * This is a class that uses a trie data structure to represent cluster topology. Each node + * except the terminal node represents a certain domain in the topology, and an terminal node + * represents an instance in the cluster. + */ +public class ClusterTrie { + public static final String DELIMITER = "/"; + public static final String CONNECTOR = ":"; + + private static Logger logger = LoggerFactory.getLogger(ClusterTrie.class); + private TrieNode _rootNode; + private String[] _topologyKeys; + private String _faultZoneType; + private List<String> _invalidInstances = new ArrayList<>(); + + public ClusterTrie(final List<String> liveNodes, + final Map<String, InstanceConfig> instanceConfigMap, ClusterConfig clusterConfig) { + validateInstanceConfig(liveNodes, instanceConfigMap); + _topologyKeys = getTopologyDef(clusterConfig); + _faultZoneType = clusterConfig.getFaultZoneType(); + _invalidInstances = getInvalidInstancesFromConfig(instanceConfigMap, _topologyKeys); + instanceConfigMap.keySet().removeAll(_invalidInstances); + _rootNode = constructTrie(instanceConfigMap, _topologyKeys); + } + + public TrieNode getRootNode() { + return _rootNode; + } + + public String[] getTopologyKeys() { + return _topologyKeys; + } + + public String getFaultZoneType() { + return _faultZoneType; + } + + public List<String> getInvalidInstances() { + return _invalidInstances; + } + + private void validateInstanceConfig(final List<String> liveNodes, + final Map<String, InstanceConfig> instanceConfigMap) { + if (instanceConfigMap == null || !instanceConfigMap.keySet().containsAll(liveNodes)) { + List<String> liveNodesCopy = new ArrayList<>(); + liveNodesCopy.addAll(liveNodes); + throw new HelixException(String.format("Config for instances %s is not found!", + instanceConfigMap == null ? liveNodes + : liveNodesCopy.removeAll(instanceConfigMap.keySet()))); + } + } + + private List<String> getInvalidInstancesFromConfig(Map<String, InstanceConfig> instanceConfigMap, + final String[] topologyKeys) { + List<String> invalidInstances = new ArrayList<>(); + for (String instanceName : instanceConfigMap.keySet()) { + try { + Map<String, String> domainAsMap = instanceConfigMap.get(instanceName).getDomainAsMap(); + for (String key : topologyKeys) { + String value = domainAsMap.get(key); + if (value == null || value.length() == 0) { + logger.info(String.format("Domain %s for instance %s is not set", domainAsMap.get(key), + instanceName)); + invalidInstances.add(instanceName); + break; + } + } + } catch (IllegalArgumentException e) { + invalidInstances.add(instanceName); + } + } + return invalidInstances; + } + + // Note that we do not validate whether topology-aware is enabled or fault zone type is + // defined, as they do not block the construction of the trie + private String[] getTopologyDef(ClusterConfig clusterConfig) { + String[] topologyDef; + String topologyDefInConfig = clusterConfig.getTopology(); + if (topologyDefInConfig == null) { + throw new HelixException(String.format("The topology of cluster %s is empty!", + clusterConfig.getClusterName())); + } + // A list of all keys in cluster topology, e.g., a cluster topology defined as + // /group/zone/rack/host will return ["group", "zone", "rack", "host"]. + topologyDef = + Arrays.asList(topologyDefInConfig.trim().split(DELIMITER)).stream().map(str -> str.trim()) + .filter(str -> !str.isEmpty()).collect(Collectors.toList()).toArray(new String[0]); + if (topologyDef.length == 0) { + throw new HelixException(String.format("The topology of cluster %s is not correctly defined", + clusterConfig.getClusterName())); + } + return topologyDef; + } + + /** + * Constructs a trie based on the provided instance config map. It loops through all instance + * configs and constructs the trie in a top down manner. + */ + private TrieNode constructTrie(Map<String, InstanceConfig> instanceConfigMap, + final String[] topologyKeys) { + TrieNode rootNode = new TrieNode("", "ROOT"); + Map<String, Map<String, String>> instanceDomainsMap = new HashMap<>(); + instanceConfigMap.entrySet().forEach( + entry -> instanceDomainsMap.put(entry.getKey(), entry.getValue().getDomainAsMap())); + + for (Map.Entry<String, Map<String, String>> entry : instanceDomainsMap.entrySet()) { + TrieNode curNode = rootNode; + String path = ""; Review comment: StringBuilder for the performance. ########## File path: helix-core/src/main/java/org/apache/helix/model/ClusterTrie.java ########## @@ -0,0 +1,156 @@ +package org.apache.helix.model; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.apache.helix.HelixException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * This is a class that uses a trie data structure to represent cluster topology. Each node + * except the terminal node represents a certain domain in the topology, and an terminal node + * represents an instance in the cluster. + */ +public class ClusterTrie { + public static final String DELIMITER = "/"; + public static final String CONNECTOR = ":"; + + private static Logger logger = LoggerFactory.getLogger(ClusterTrie.class); + private TrieNode _rootNode; + private String[] _topologyKeys; + private String _faultZoneType; + private List<String> _invalidInstances = new ArrayList<>(); + + public ClusterTrie(final List<String> liveNodes, + final Map<String, InstanceConfig> instanceConfigMap, ClusterConfig clusterConfig) { + validateInstanceConfig(liveNodes, instanceConfigMap); + _topologyKeys = getTopologyDef(clusterConfig); + _faultZoneType = clusterConfig.getFaultZoneType(); + _invalidInstances = getInvalidInstancesFromConfig(instanceConfigMap, _topologyKeys); + instanceConfigMap.keySet().removeAll(_invalidInstances); + _rootNode = constructTrie(instanceConfigMap, _topologyKeys); + } + + public TrieNode getRootNode() { + return _rootNode; + } + + public String[] getTopologyKeys() { + return _topologyKeys; + } + + public String getFaultZoneType() { + return _faultZoneType; + } + + public List<String> getInvalidInstances() { + return _invalidInstances; + } + + private void validateInstanceConfig(final List<String> liveNodes, + final Map<String, InstanceConfig> instanceConfigMap) { + if (instanceConfigMap == null || !instanceConfigMap.keySet().containsAll(liveNodes)) { + List<String> liveNodesCopy = new ArrayList<>(); + liveNodesCopy.addAll(liveNodes); + throw new HelixException(String.format("Config for instances %s is not found!", + instanceConfigMap == null ? liveNodes + : liveNodesCopy.removeAll(instanceConfigMap.keySet()))); + } + } + + private List<String> getInvalidInstancesFromConfig(Map<String, InstanceConfig> instanceConfigMap, + final String[] topologyKeys) { + List<String> invalidInstances = new ArrayList<>(); + for (String instanceName : instanceConfigMap.keySet()) { + try { + Map<String, String> domainAsMap = instanceConfigMap.get(instanceName).getDomainAsMap(); + for (String key : topologyKeys) { + String value = domainAsMap.get(key); + if (value == null || value.length() == 0) { + logger.info(String.format("Domain %s for instance %s is not set", domainAsMap.get(key), + instanceName)); + invalidInstances.add(instanceName); + break; + } + } + } catch (IllegalArgumentException e) { + invalidInstances.add(instanceName); + } + } + return invalidInstances; + } + + // Note that we do not validate whether topology-aware is enabled or fault zone type is + // defined, as they do not block the construction of the trie + private String[] getTopologyDef(ClusterConfig clusterConfig) { + String[] topologyDef; + String topologyDefInConfig = clusterConfig.getTopology(); + if (topologyDefInConfig == null) { + throw new HelixException(String.format("The topology of cluster %s is empty!", + clusterConfig.getClusterName())); + } + // A list of all keys in cluster topology, e.g., a cluster topology defined as + // /group/zone/rack/host will return ["group", "zone", "rack", "host"]. + topologyDef = + Arrays.asList(topologyDefInConfig.trim().split(DELIMITER)).stream().map(str -> str.trim()) + .filter(str -> !str.isEmpty()).collect(Collectors.toList()).toArray(new String[0]); + if (topologyDef.length == 0) { + throw new HelixException(String.format("The topology of cluster %s is not correctly defined", + clusterConfig.getClusterName())); + } + return topologyDef; + } + + /** + * Constructs a trie based on the provided instance config map. It loops through all instance + * configs and constructs the trie in a top down manner. + */ + private TrieNode constructTrie(Map<String, InstanceConfig> instanceConfigMap, + final String[] topologyKeys) { + TrieNode rootNode = new TrieNode("", "ROOT"); + Map<String, Map<String, String>> instanceDomainsMap = new HashMap<>(); + instanceConfigMap.entrySet().forEach( + entry -> instanceDomainsMap.put(entry.getKey(), entry.getValue().getDomainAsMap())); + + for (Map.Entry<String, Map<String, String>> entry : instanceDomainsMap.entrySet()) { + TrieNode curNode = rootNode; + String path = ""; + for (int i = 0; i < topologyKeys.length; i++) { + String key = topologyKeys[i] + CONNECTOR + entry.getValue().get(topologyKeys[i]); + path = path + DELIMITER + key; + TrieNode nextNode = curNode.getChildren().get(key); + if (nextNode == null) { + nextNode = new TrieNode(path, topologyKeys[i]); Review comment: I guess you just need the full path for the leaf node. ########## File path: helix-core/src/main/java/org/apache/helix/model/ClusterTrie.java ########## @@ -0,0 +1,156 @@ +package org.apache.helix.model; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.apache.helix.HelixException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * This is a class that uses a trie data structure to represent cluster topology. Each node + * except the terminal node represents a certain domain in the topology, and an terminal node + * represents an instance in the cluster. + */ +public class ClusterTrie { + public static final String DELIMITER = "/"; + public static final String CONNECTOR = ":"; + + private static Logger logger = LoggerFactory.getLogger(ClusterTrie.class); + private TrieNode _rootNode; + private String[] _topologyKeys; + private String _faultZoneType; + private List<String> _invalidInstances = new ArrayList<>(); + + public ClusterTrie(final List<String> liveNodes, + final Map<String, InstanceConfig> instanceConfigMap, ClusterConfig clusterConfig) { + validateInstanceConfig(liveNodes, instanceConfigMap); + _topologyKeys = getTopologyDef(clusterConfig); + _faultZoneType = clusterConfig.getFaultZoneType(); + _invalidInstances = getInvalidInstancesFromConfig(instanceConfigMap, _topologyKeys); + instanceConfigMap.keySet().removeAll(_invalidInstances); + _rootNode = constructTrie(instanceConfigMap, _topologyKeys); + } + + public TrieNode getRootNode() { + return _rootNode; + } + + public String[] getTopologyKeys() { + return _topologyKeys; + } + + public String getFaultZoneType() { + return _faultZoneType; + } + + public List<String> getInvalidInstances() { + return _invalidInstances; + } + + private void validateInstanceConfig(final List<String> liveNodes, + final Map<String, InstanceConfig> instanceConfigMap) { + if (instanceConfigMap == null || !instanceConfigMap.keySet().containsAll(liveNodes)) { + List<String> liveNodesCopy = new ArrayList<>(); + liveNodesCopy.addAll(liveNodes); + throw new HelixException(String.format("Config for instances %s is not found!", + instanceConfigMap == null ? liveNodes + : liveNodesCopy.removeAll(instanceConfigMap.keySet()))); + } + } + + private List<String> getInvalidInstancesFromConfig(Map<String, InstanceConfig> instanceConfigMap, + final String[] topologyKeys) { + List<String> invalidInstances = new ArrayList<>(); + for (String instanceName : instanceConfigMap.keySet()) { + try { + Map<String, String> domainAsMap = instanceConfigMap.get(instanceName).getDomainAsMap(); + for (String key : topologyKeys) { + String value = domainAsMap.get(key); + if (value == null || value.length() == 0) { + logger.info(String.format("Domain %s for instance %s is not set", domainAsMap.get(key), + instanceName)); + invalidInstances.add(instanceName); + break; + } + } + } catch (IllegalArgumentException e) { + invalidInstances.add(instanceName); + } + } + return invalidInstances; + } + + // Note that we do not validate whether topology-aware is enabled or fault zone type is + // defined, as they do not block the construction of the trie + private String[] getTopologyDef(ClusterConfig clusterConfig) { + String[] topologyDef; + String topologyDefInConfig = clusterConfig.getTopology(); + if (topologyDefInConfig == null) { Review comment: Better to add one more check that, if the topologyDefInConfig does not start with DELIMITER, then it is invalid. ########## File path: helix-core/src/main/java/org/apache/helix/model/ClusterTrie.java ########## @@ -0,0 +1,150 @@ +package org.apache.helix.model; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.apache.helix.HelixException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +/** + * This is a class that uses a trie data structure to represent cluster topology. Each node + * except the terminal node represents a certain domain in the topology, and an terminal node + * represents an instance in the cluster. + */ +public class ClusterTrie { + public static final String DELIMITER = "/"; + public static final String CONNECTOR = ":"; + + private static Logger logger = LoggerFactory.getLogger(ClusterTrie.class); + private TrieNode _rootNode; + private String[] _topologyKeys; + private String _faultZoneType; + private List<String> _invalidInstances = new ArrayList<>(); + + public ClusterTrie(final List<String> liveNodes, + final Map<String, InstanceConfig> instanceConfigMap, ClusterConfig clusterConfig) { + validateInstanceConfig(liveNodes, instanceConfigMap); + validateClusterConfig(clusterConfig); + _faultZoneType = clusterConfig.getFaultZoneType(); + _rootNode = constructTrie(instanceConfigMap); + } + + + public TrieNode getRootNode() { + return _rootNode; + } + + public String[] getTopologyKeys() { + return _topologyKeys; + } + + public String getFaultZoneType() { + return _faultZoneType; + } + + public List<String> getInvalidInstances() { + return _invalidInstances; + } + + private void removeInvalidInstanceConfig(Map<String, InstanceConfig> instanceConfigMap) { + for (String instanceName : instanceConfigMap.keySet()) { + try { + Map<String, String> domainAsMap = instanceConfigMap.get(instanceName).getDomainAsMap(); + for (String key : _topologyKeys) { + String value = domainAsMap.get(key); + if (value == null || value.length() == 0) { + logger.info(String.format("Domain %s for instance %s is not set", domainAsMap.get(key), + instanceName)); + _invalidInstances.add(instanceName); + break; + } + } + } catch (IllegalArgumentException e) { + _invalidInstances.add(instanceName); + } + } + _invalidInstances.forEach(entry -> instanceConfigMap.remove(entry)); + } + + private void validateInstanceConfig(final List<String> liveNodes, + final Map<String, InstanceConfig> instanceConfigMap) { + if (instanceConfigMap == null || !instanceConfigMap.keySet().containsAll(liveNodes)) { + List<String> liveNodesCopy = new ArrayList<>(); + liveNodesCopy.addAll(liveNodes); + throw new HelixException(String.format("Config for instances %s is not found!", + instanceConfigMap == null ? liveNodes + : liveNodesCopy.removeAll(instanceConfigMap.keySet()))); + } + } + + // Note that we do not validate whether topology-aware is enabled or fault zone type is + // defined, as they do not block the construction of the trie + private void validateClusterConfig(ClusterConfig clusterConfig) { + String topologyDef = clusterConfig.getTopology(); + if (topologyDef == null) { + throw new HelixException(String.format("The topology of cluster %s is empty!", + clusterConfig.getClusterName())); + } + // A list of all keys in cluster topology, e.g., a cluster topology defined as + // /group/zone/rack/host will return ["group", "zone", "rack", "host"]. + _topologyKeys = Arrays.asList(topologyDef.trim().split(DELIMITER)).stream() + .filter(str -> !str.isEmpty()).collect(Collectors.toList()).toArray(new String[0]); + if (_topologyKeys.length == 0) { + throw new HelixException(String.format("The topology of cluster %s is not correctly defined", + clusterConfig.getClusterName())); + } + } + + /** + * Constructs a trie based on the provided instance config map. It loops through all instance + * configs and constructs the trie in a top down manner. + */ + private TrieNode constructTrie(Map<String, InstanceConfig> instanceConfigMap) { + TrieNode rootNode = new TrieNode(new HashMap<>(), "", "ROOT"); + removeInvalidInstanceConfig(instanceConfigMap); + Map<String, Map<String, String>> instanceDomainsMap = new HashMap<>(); + instanceConfigMap.entrySet().forEach( + entry -> instanceDomainsMap.put(entry.getKey(), entry.getValue().getDomainAsMap())); + + for (Map.Entry<String, Map<String, String>> entry : instanceDomainsMap.entrySet()) { + TrieNode curNode = rootNode; + String path = ""; + for (int i = 0; i < _topologyKeys.length; i++) { + String key = _topologyKeys[i] + CONNECTOR + entry.getValue().get(_topologyKeys[i]); + path = path + DELIMITER + key; + TrieNode nextNode = curNode.getChildren().get(key); + if (nextNode == null) { + nextNode = new TrieNode(new HashMap<>(), path, _topologyKeys[i]); Review comment: It's both memory and additional computing for splitting/merging the path String. If we just put minimum info into trie, then there is no need to merge Strings. And there is no additional memory usage. Then when you read the tree, you don't need to split based on the ":" again. So I feel there would be a lot of saving on both the write and read side. To be specific, I think the node needs: 1. children map<domain value, TrieNode>, 2. domain Type (optional, since the recorded topology def list can be used to determine the type), 3. domain value (optional too, duplicate with the childrm map key, but could be convient). Then when you read, you can fill the type according to the depth of the tree and collect the domain value based on the children map key. The matter is to avoid String operations in which we create new String objects. ---------------------------------------------------------------- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
