From d517361bb1fbcb040f1c7cda103127ed0f3b6a2c Mon Sep 17 00:00:00 2001 From: Noble Paul Date: Thu, 13 Aug 2020 13:34:24 +1000 Subject: [PATCH] SOLR-14680: Provide an implementation for the new SolrCluster API (#1730) --- .../solr/cloud/TestLazySolrCluster.java | 97 ++++ .../apache/solr/common/LazySolrCluster.java | 446 ++++++++++++++++++ .../org/apache/solr/common/SimpleZkMap.java | 139 ++++++ .../org/apache/solr/common/cloud/Aliases.java | 8 + .../solr/common/cloud/ClusterState.java | 4 + .../apache/solr/common/cloud/DocRouter.java | 13 +- .../solr/common/cloud/ZkStateReader.java | 10 +- .../solr/common/util/LinkedSimpleHashMap.java | 34 ++ .../apache/solr/common/util/NamedList.java | 39 +- .../org/apache/solr/common/util/Utils.java | 5 +- .../solr/common/util/WrappedSimpleMap.java | 49 ++ 11 files changed, 834 insertions(+), 10 deletions(-) create mode 100644 solr/core/src/test/org/apache/solr/cloud/TestLazySolrCluster.java create mode 100644 solr/solrj/src/java/org/apache/solr/common/LazySolrCluster.java create mode 100644 solr/solrj/src/java/org/apache/solr/common/SimpleZkMap.java create mode 100644 solr/solrj/src/java/org/apache/solr/common/util/LinkedSimpleHashMap.java create mode 100644 solr/solrj/src/java/org/apache/solr/common/util/WrappedSimpleMap.java diff --git a/solr/core/src/test/org/apache/solr/cloud/TestLazySolrCluster.java b/solr/core/src/test/org/apache/solr/cloud/TestLazySolrCluster.java new file mode 100644 index 00000000000..0414f6cbba4 --- /dev/null +++ b/solr/core/src/test/org/apache/solr/cloud/TestLazySolrCluster.java @@ -0,0 +1,97 @@ +/* + * 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. + */ + +package org.apache.solr.cloud; + +import org.apache.solr.client.solrj.impl.CloudSolrClient; +import org.apache.solr.client.solrj.request.CollectionAdminRequest; +import org.apache.solr.cluster.api.CollectionConfig; +import org.apache.solr.cluster.api.SimpleMap; +import org.apache.solr.cluster.api.SolrCollection; +import org.apache.solr.common.LazySolrCluster; +import org.apache.solr.common.cloud.SolrZkClient; +import org.apache.solr.common.cloud.ZkStateReader; +import org.apache.zookeeper.CreateMode; +import org.junit.BeforeClass; + +import java.util.ArrayList; +import java.util.List; + + +public class TestLazySolrCluster extends SolrCloudTestCase { + @BeforeClass + public static void setupCluster() throws Exception { + configureCluster(5) + .addConfig("conf1", TEST_PATH().resolve("configsets").resolve("cloud-minimal").resolve("conf")) + .configure(); + } + + public void test() throws Exception { + CloudSolrClient cloudClient = cluster.getSolrClient(); + String collection = "testLazyCluster1"; + cloudClient.request(CollectionAdminRequest.createCollection(collection, "conf1", 2, 2)); + cluster.waitForActiveCollection(collection, 2, 4); + collection = "testLazyCluster2"; + cloudClient.request(CollectionAdminRequest.createCollection(collection, "conf1", 2, 2)); + cluster.waitForActiveCollection(collection, 2, 4); + + LazySolrCluster solrCluster = new LazySolrCluster(cluster.getSolrClient().getZkStateReader()); + SimpleMap colls = solrCluster.collections(); + + SolrCollection c = colls.get("testLazyCluster1"); + assertNotNull(c); + c = colls.get("testLazyCluster2"); + assertNotNull(c); + int[] count = new int[1]; + solrCluster.collections().forEachEntry((s, solrCollection) -> count[0]++); + assertEquals(2, count[0]); + + count[0] = 0; + + assertEquals(2, solrCluster.collections().get("testLazyCluster1").shards().size()); + solrCluster.collections().get("testLazyCluster1").shards() + .forEachEntry((s, shard) -> shard.replicas().forEachEntry((s1, replica) -> count[0]++)); + assertEquals(4, count[0]); + + assertEquals(5, solrCluster.nodes().size()); + SolrZkClient zkClient = cloudClient.getZkStateReader().getZkClient(); + zkClient.create(ZkStateReader.CONFIGS_ZKNODE + "/conf1/a", null, CreateMode.PERSISTENT, true); + zkClient.create(ZkStateReader.CONFIGS_ZKNODE + "/conf1/a/aa1", new byte[1024], CreateMode.PERSISTENT, true); + zkClient.create(ZkStateReader.CONFIGS_ZKNODE + "/conf1/a/aa2", new byte[1024 * 2], CreateMode.PERSISTENT, true); + + List allFiles = new ArrayList<>(); + byte[] buf = new byte[3*1024]; + CollectionConfig conf1 = solrCluster.configs().get("conf1"); + conf1.resources().abortableForEach((s, resource) -> { + allFiles.add(s); + if("a/aa1".equals(s)) { + resource.get(is -> assertEquals(1024, is.read(buf))); + } + if("a/aa2".equals(s)) { + resource.get(is -> assertEquals(2*1024, is.read(buf))); + } + if("a".equals(s)) { + resource.get(is -> assertEquals(-1, is.read())); + } + return Boolean.TRUE; + }); + assertEquals(5, allFiles.size()); + + } + + +} diff --git a/solr/solrj/src/java/org/apache/solr/common/LazySolrCluster.java b/solr/solrj/src/java/org/apache/solr/common/LazySolrCluster.java new file mode 100644 index 00000000000..1ec5ecf5989 --- /dev/null +++ b/solr/solrj/src/java/org/apache/solr/common/LazySolrCluster.java @@ -0,0 +1,446 @@ +/* + * 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. + */ + +package org.apache.solr.common; + +import org.apache.solr.cluster.api.*; +import org.apache.solr.common.cloud.*; +import org.apache.solr.common.util.Utils; +import org.apache.solr.common.util.WrappedSimpleMap; +import org.apache.zookeeper.KeeperException; + +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.BiConsumer; + +import static org.apache.solr.common.cloud.ZkStateReader.URL_SCHEME; +import static org.apache.solr.common.cloud.ZkStateReader.getCollectionPathRoot; + +/** + * Reference implementation for SolrCluster. + * As much as possible fetch all the values lazily because the value of anything + * can change any moment + * Creating an instance is a low cost operation. It does not result in a + * network call or large object creation + * + */ + +public class LazySolrCluster implements SolrCluster { + final ZkStateReader zkStateReader; + + private final Map cached = new ConcurrentHashMap<>(); + private final SimpleMap collections; + private final SimpleMap collectionsAndAliases; + private final SimpleMap nodes; + private SimpleMap configs; + + public LazySolrCluster(ZkStateReader zkStateReader) { + this.zkStateReader = zkStateReader; + collections = lazyCollectionsMap(zkStateReader); + collectionsAndAliases = lazyCollectionsWithAlias(zkStateReader); + nodes = lazyNodeMap(); + } + + private SimpleMap lazyConfigMap() { + Set configNames = new HashSet<>(); + new SimpleZkMap(zkStateReader, ZkStateReader.CONFIGS_ZKNODE) + .abortableForEach((name, resource) -> { + if (!name.contains("/")) { + configNames.add(name); + return Boolean.TRUE; + } + return Boolean.FALSE; + }); + + return new SimpleMap<>() { + @Override + public CollectionConfig get(String key) { + if (configNames.contains(key)) { + return new ConfigImpl(key); + } else { + return null; + } + } + + @Override + public void forEachEntry(BiConsumer fun) { + for (String name : configNames) { + fun.accept(name, new ConfigImpl(name)); + } + } + + @Override + public int size() { + return configNames.size(); + } + }; + } + + private SimpleMap lazyNodeMap() { + return new SimpleMap<>() { + @Override + public SolrNode get(String key) { + if (!zkStateReader.getClusterState().liveNodesContain(key)) { + return null; + } + return new Node(key); + } + + @Override + public void forEachEntry(BiConsumer fun) { + for (String s : zkStateReader.getClusterState().getLiveNodes()) { + fun.accept(s, new Node(s)); + } + } + + @Override + public int size() { + return zkStateReader.getClusterState().getLiveNodes().size(); + } + }; + } + + private SimpleMap lazyCollectionsWithAlias(ZkStateReader zkStateReader) { + return new SimpleMap<>() { + @Override + public SolrCollection get(String key) { + SolrCollection result = collections.get(key); + if (result != null) return result; + Aliases aliases = zkStateReader.getAliases(); + List aliasNames = aliases.resolveAliases(key); + if (aliasNames == null || aliasNames.isEmpty()) return null; + return _collection(aliasNames.get(0), null); + } + + @Override + public void forEachEntry(BiConsumer fun) { + collections.forEachEntry(fun); + Aliases aliases = zkStateReader.getAliases(); + aliases.forEachAlias((s, colls) -> { + if (colls == null || colls.isEmpty()) return; + fun.accept(s, _collection(colls.get(0), null)); + }); + + } + + @Override + public int size() { + return collections.size() + zkStateReader.getAliases().size(); + } + }; + } + + private SimpleMap lazyCollectionsMap(ZkStateReader zkStateReader) { + return new SimpleMap<>() { + @Override + public SolrCollection get(String key) { + return _collection(key, null); + } + + @Override + public void forEachEntry(BiConsumer fun) { + zkStateReader.getClusterState().forEachCollection(coll -> fun.accept(coll.getName(), _collection(coll.getName(), coll))); + } + + @Override + public int size() { + return zkStateReader.getClusterState().size(); + } + }; + } + + private SolrCollection _collection(String key, DocCollection c) { + if (c == null) c = zkStateReader.getCollection(key); + if (c == null) { + cached.remove(key); + return null; + } + SolrCollectionImpl existing = cached.get(key); + if (existing == null || existing.coll != c) { + cached.put(key, existing = new SolrCollectionImpl(c, zkStateReader)); + } + return existing; + } + + @Override + public SimpleMap collections() throws SolrException { + return collections; + } + + @Override + public SimpleMap collections(boolean includeAlias) throws SolrException { + return includeAlias ? collectionsAndAliases : collections; + } + + @Override + public SimpleMap nodes() throws SolrException { + return nodes; + } + + @Override + public SimpleMap configs() throws SolrException { + if (configs == null) { + //these are lightweight objects and we don't care even if multiple objects ar ecreated b/c of a race condition + configs = lazyConfigMap(); + } + return configs; + } + + @Override + public String overseerNode() throws SolrException { + return null; + } + + @Override + public String thisNode() { + return null; + } + + private class SolrCollectionImpl implements SolrCollection { + final DocCollection coll; + final SimpleMap shards; + final ZkStateReader zkStateReader; + final Router router; + String confName; + + private SolrCollectionImpl(DocCollection coll, ZkStateReader zkStateReader) { + this.coll = coll; + this.zkStateReader = zkStateReader; + this.router = key -> coll.getRouter().getTargetSlice(key, null, null, null, null).getName(); + LinkedHashMap map = new LinkedHashMap<>(); + for (Slice slice : coll.getSlices()) { + map.put(slice.getName(), new ShardImpl(this, slice)); + } + shards = new WrappedSimpleMap<>(map); + + } + + @Override + public String name() { + return coll.getName(); + } + + @Override + public SimpleMap shards() { + return shards; + } + + @Override + @SuppressWarnings("rawtypes") + public String config() { + if (confName == null) { + // do this lazily . It's usually not necessary + try { + byte[] d = zkStateReader.getZkClient().getData(getCollectionPathRoot(coll.getName()), null, null, true); + if (d == null || d.length == 0) return null; + Map m = (Map) Utils.fromJSON(d); + confName = (String) m.get("configName"); + } catch (KeeperException | InterruptedException e) { + SimpleZkMap.throwZkExp(e); + //cannot read from ZK + return null; + + } + } + return confName; + } + + @Override + public Router router() { + return router; + } + } + + private class ShardImpl implements Shard { + final SolrCollectionImpl collection; + final Slice slice; + final HashRange range; + final SimpleMap replicas; + + private ShardImpl(SolrCollectionImpl collection, Slice slice) { + this.collection = collection; + this.slice = slice; + range = _range(slice); + replicas = _replicas(); + } + + private SimpleMap _replicas() { + Map replicas = new HashMap<>(); + slice.forEach(replica -> replicas.put(replica.getName(), new ShardReplicaImpl(ShardImpl.this, replica))); + return new WrappedSimpleMap<>(replicas); + } + + private HashRange _range(Slice slice) { + return slice.getRange() == null ? + null : + new HashRange() { + @Override + public int min() { + return slice.getRange().min; + } + + @Override + public int max() { + return slice.getRange().max; + } + }; + } + + @Override + public String name() { + return slice.getName(); + } + + @Override + public String collection() { + return collection.name(); + } + + @Override + public HashRange range() { + return range; + } + + @Override + public SimpleMap replicas() { + return replicas; + } + + @Override + public String leader() { + Replica leader = slice.getLeader(); + return leader == null ? null : leader.getName(); + } + } + + private class ShardReplicaImpl implements ShardReplica { + private final ShardImpl shard; + private final Replica replica; + + private ShardReplicaImpl(ShardImpl shard, Replica replica) { + this.shard = shard; + this.replica = replica; + } + + @Override + public String name() { + return replica.name; + } + + @Override + public String shard() { + return shard.name(); + } + + @Override + public String collection() { + return shard.collection.name(); + } + + @Override + public String node() { + return replica.getNodeName(); + } + + @Override + public String core() { + return replica.getCoreName(); + } + + @Override + public Replica.Type type() { + return replica.type; + } + + @Override + public boolean alive() { + return zkStateReader.getClusterState().getLiveNodes().contains(node()) + && replica.getState() == Replica.State.ACTIVE; + } + + @Override + public long indexSize() { + //todo implement later + throw new UnsupportedOperationException("Not yet implemented"); + } + + @Override + public boolean isLeader() { + return Objects.equals(shard.leader() , name()); + } + + @Override + public String url(ApiType type) { + String base = nodes.get(node()).baseUrl(type); + if (type == ApiType.V2) { + return base + "/cores/" + core(); + } else { + return base + "/" + core(); + } + } + } + + private class Node implements SolrNode { + private final String name; + + private Node(String name) { + this.name = name; + } + + @Override + public String name() { + return name; + } + + @Override + public String baseUrl(ApiType apiType) { + return Utils.getBaseUrlForNodeName(name, zkStateReader.getClusterProperty(URL_SCHEME, "http"), apiType == ApiType.V2); + } + + @Override + public SimpleMap cores() { + //todo implement later + //this requires a call to the node + throw new UnsupportedOperationException("Not yet implemented"); + } + } + + private class ConfigImpl implements CollectionConfig { + final String name; + final SimpleMap resources; + final String path; + + private ConfigImpl(String name) { + this.name = name; + path = ZkStateReader.CONFIGS_ZKNODE + "/" + name; + this.resources = new SimpleZkMap(zkStateReader, path); + } + + @Override + public SimpleMap resources() { + return resources; + } + + @Override + public String name() { + return name; + } + + } + +} + diff --git a/solr/solrj/src/java/org/apache/solr/common/SimpleZkMap.java b/solr/solrj/src/java/org/apache/solr/common/SimpleZkMap.java new file mode 100644 index 00000000000..644125f5d4e --- /dev/null +++ b/solr/solrj/src/java/org/apache/solr/common/SimpleZkMap.java @@ -0,0 +1,139 @@ +/* + * 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. + */ + +package org.apache.solr.common; + +import org.apache.solr.cluster.api.Resource; +import org.apache.solr.cluster.api.SimpleMap; +import org.apache.solr.common.cloud.ZkStateReader; +import org.apache.zookeeper.KeeperException; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.function.BiConsumer; +import java.util.function.BiFunction; + +/**A view of ZK as a {@link SimpleMap} impl. This gives a flat view of all paths instead of a tree view + * eg: a, b, c , a/a1, a/a2, a/a1/aa1 etc + * If possible, use the {@link #abortableForEach(BiFunction)} to traverse + * DO not use the {@link #size()} method. It always return 0 because it is very expensive to compute that + * + */ +public class SimpleZkMap implements SimpleMap { + private final ZkStateReader zkStateReader; + private final String basePath; + + static final byte[] EMPTY_BYTES = new byte[0]; + + + public SimpleZkMap(ZkStateReader zkStateReader, String path) { + this.zkStateReader = zkStateReader; + this.basePath = path; + } + + + @Override + public Resource get(String key) { + return readZkNode(basePath + key); + } + + @Override + public void abortableForEach(BiFunction fun) { + try { + recursiveRead("", + zkStateReader.getZkClient().getChildren(basePath, null, true), + fun); + } catch (KeeperException | InterruptedException e) { + throwZkExp(e); + } + } + + @Override + public void forEachEntry(BiConsumer fun) { + abortableForEach((path, resource) -> { + fun.accept(path, resource); + return Boolean.TRUE; + }); + } + + @Override + public int size() { + return 0; + } + + private Resource readZkNode(String path) { + return new Resource() { + @Override + public String name() { + return path; + } + + @Override + public void get(Consumer consumer) throws SolrException { + try { + byte[] data = zkStateReader.getZkClient().getData(basePath+"/"+ path, null, null, true); + if (data != null && data.length > 0) { + consumer.read(new ByteArrayInputStream(data)); + } else { + consumer.read(new ByteArrayInputStream(EMPTY_BYTES)); + } + } catch (KeeperException | InterruptedException e) { + throwZkExp(e); + } catch (IOException e) { + throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Can;t read stream" , e); + } + + } + }; + } + + private boolean recursiveRead(String parent, List childrenList, BiFunction fun) { + if(childrenList == null || childrenList.isEmpty()) return true; + try { + Map> withKids = new LinkedHashMap<>(); + for (String child : childrenList) { + String relativePath = parent.isBlank() ? child: parent+"/"+child; + if(!fun.apply(relativePath, readZkNode(relativePath))) return false; + List l1 = zkStateReader.getZkClient().getChildren(basePath+ "/"+ relativePath, null, true); + if(l1 != null && !l1.isEmpty()) { + withKids.put(relativePath, l1); + } + } + //now we iterate through all nodes with sub paths + for (Map.Entry> e : withKids.entrySet()) { + //has children + if(!recursiveRead(e.getKey(), e.getValue(), fun)) { + return false; + } + } + } catch (KeeperException | InterruptedException e) { + throwZkExp(e); + } + return true; + } + + static void throwZkExp(Exception e) { + if (e instanceof InterruptedException) { + Thread.currentThread().interrupt(); + } + throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "ZK errror", e); + } + +} diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/Aliases.java b/solr/solrj/src/java/org/apache/solr/common/cloud/Aliases.java index 45fc9d86ad9..a87735f0b4f 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/Aliases.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/Aliases.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Objects; +import java.util.function.BiConsumer; import java.util.function.UnaryOperator; import java.util.stream.Collectors; @@ -72,6 +73,13 @@ public class Aliases { this.zNodeVersion = zNodeVersion; } + public void forEachAlias(BiConsumer> consumer) { + collectionAliases.forEach((s, colls) -> consumer.accept(s, Collections.unmodifiableList(colls))); + } + public int size() { + return collectionAliases.size(); + } + /** * Create an instance from the JSON bytes read from zookeeper. Generally this should * only be done by a ZkStateReader. diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java index 3c518e02814..ebed0ff0663 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java @@ -380,4 +380,8 @@ public class ClusterState implements JSONWriter.Writable { } + public int size() { + return collectionStates.size(); + } + } diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java b/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java index 0f45231e310..4e127493b9d 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java @@ -16,6 +16,7 @@ */ package org.apache.solr.common.cloud; +import org.apache.solr.cluster.api.HashRange; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.params.SolrParams; @@ -86,7 +87,7 @@ public abstract class DocRouter { // Hash ranges can't currently "wrap" - i.e. max must be greater or equal to min. // TODO: ranges may not be all contiguous in the future (either that or we will // need an extra class to model a collection of ranges) - public static class Range implements JSONWriter.Writable, Comparable { + public static class Range implements JSONWriter.Writable, Comparable , HashRange { public int min; // inclusive public int max; // inclusive @@ -96,6 +97,16 @@ public abstract class DocRouter { this.max = max; } + @Override + public int min() { + return min; + } + + @Override + public int max() { + return max; + } + public boolean includes(int hash) { return hash >= min && hash <= max; } diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java index d49a39c0a16..42731633172 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java @@ -51,11 +51,7 @@ import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.common.params.CollectionAdminParams; import org.apache.solr.common.params.CoreAdminParams; -import org.apache.solr.common.util.ExecutorUtil; -import org.apache.solr.common.util.ObjectReleaseTracker; -import org.apache.solr.common.util.Pair; -import org.apache.solr.common.util.SolrNamedThreadFactory; -import org.apache.solr.common.util.Utils; +import org.apache.solr.common.util.*; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.KeeperException.NoNodeException; import org.apache.zookeeper.WatchedEvent; @@ -2182,4 +2178,8 @@ public class ZkStateReader implements SolrCloseable { return result; } } + + public DocCollection getCollection(String collection) { + return clusterState.getCollectionOrNull(collection); + } } diff --git a/solr/solrj/src/java/org/apache/solr/common/util/LinkedSimpleHashMap.java b/solr/solrj/src/java/org/apache/solr/common/util/LinkedSimpleHashMap.java new file mode 100644 index 00000000000..1fc6afc3648 --- /dev/null +++ b/solr/solrj/src/java/org/apache/solr/common/util/LinkedSimpleHashMap.java @@ -0,0 +1,34 @@ +/* + * 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. + */ +package org.apache.solr.common.util; + +import org.apache.solr.cluster.api.SimpleMap; + +import java.util.LinkedHashMap; +import java.util.function.BiConsumer; + +public class LinkedSimpleHashMap extends LinkedHashMap implements SimpleMap { + @Override + public T get(String key) { + return super.get(key); + } + + @Override + public void forEachEntry(BiConsumer fun) { + + } +} diff --git a/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java b/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java index 694eb937bb9..9156619cde8 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java @@ -30,7 +30,11 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.function.BiConsumer; +import java.util.function.BiFunction; +import java.util.function.Consumer; +import java.util.function.Function; +import org.apache.solr.cluster.api.SimpleMap; import org.apache.solr.common.MapWriter; import org.apache.solr.common.SolrException; import org.apache.solr.common.params.MultiMapSolrParams; @@ -63,7 +67,7 @@ import org.apache.solr.common.params.SolrParams; * */ @SuppressWarnings({"unchecked", "rawtypes"}) -public class NamedList implements Cloneable, Serializable, Iterable> , MapWriter { +public class NamedList implements Cloneable, Serializable, Iterable> , MapWriter, SimpleMap { private static final long serialVersionUID = 1957981902839867821L; protected final List nvPairs; @@ -509,7 +513,7 @@ public class NamedList implements Cloneable, Serializable, Iterable implements Cloneable, Serializable, Iterable action) { + + @Override + public void abortableForEach(BiFunction fun) { + int sz = size(); + for (int i = 0; i < sz; i++) { + if(!fun.apply(getName(i), getVal(i))) break; + } + } + + @Override + public void abortableForEachKey(Function fun) { + int sz = size(); + for (int i = 0; i < sz; i++) { + if(!fun.apply(getName(i))) break; + } + } + + @Override + public void forEachKey(Consumer fun) { + int sz = size(); + for (int i = 0; i < sz; i++) { + fun.accept(getName(i)); + } + } + public void forEach(BiConsumer action) { int sz = size(); for (int i = 0; i < sz; i++) { action.accept(getName(i), getVal(i)); } } + + @Override + public void forEachEntry(BiConsumer fun) { + forEach(fun); + } } diff --git a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java b/solr/solrj/src/java/org/apache/solr/common/util/Utils.java index 2e68b1993cd..8fd137b9051 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/Utils.java @@ -728,13 +728,16 @@ public class Utils { } public static String getBaseUrlForNodeName(final String nodeName, String urlScheme) { + return getBaseUrlForNodeName(nodeName, urlScheme, false); + } + public static String getBaseUrlForNodeName(final String nodeName, String urlScheme, boolean isV2) { final int _offset = nodeName.indexOf("_"); if (_offset < 0) { throw new IllegalArgumentException("nodeName does not contain expected '_' separator: " + nodeName); } final String hostAndPort = nodeName.substring(0, _offset); final String path = URLDecoder.decode(nodeName.substring(1 + _offset), UTF_8); - return urlScheme + "://" + hostAndPort + (path.isEmpty() ? "" : ("/" + path)); + return urlScheme + "://" + hostAndPort + (path.isEmpty() ? "" : ("/" + (isV2? "api": path))); } public static long time(TimeSource timeSource, TimeUnit unit) { diff --git a/solr/solrj/src/java/org/apache/solr/common/util/WrappedSimpleMap.java b/solr/solrj/src/java/org/apache/solr/common/util/WrappedSimpleMap.java new file mode 100644 index 00000000000..e8f58a5be98 --- /dev/null +++ b/solr/solrj/src/java/org/apache/solr/common/util/WrappedSimpleMap.java @@ -0,0 +1,49 @@ +/* + * 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. + */ + +package org.apache.solr.common.util; + +import org.apache.solr.cluster.api.SimpleMap; + +import java.util.Map; +import java.util.function.BiConsumer; + +public class WrappedSimpleMap implements SimpleMap { + private final Map delegate; + + @Override + public T get(String key) { + return delegate.get(key); + } + + @Override + public void forEachEntry(BiConsumer fun) { + delegate.forEach(fun); + + } + + @Override + public int size() { + return delegate.size(); + } + + + public WrappedSimpleMap(Map delegate) { + this.delegate = delegate; + } + +}