Apache Solr open-source search software
SOLR-16600 Use Array instead of ObjectList when dealling with parallelCachesRefresh in CloudSolrClient (#1283)
Alexe085b54baf8e
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.javaindex 5a146e70a81..b638dd13dff 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java@@ -99,7 +99,7 @@ public abstract class CloudSolrClient extends SolrClient {private final boolean updatesToLeaders;private final boolean directUpdatesToLeadersOnly;private final RequestReplicaListTransformerGenerator requestRLTGenerator;- boolean parallelUpdates; // TODO final+ private final boolean parallelUpdates;private ExecutorService threadPool =ExecutorUtil.newMDCAwareCachedThreadPool(new SolrNamedThreadFactory("CloudSolrClient ThreadPool"));@@ -107,26 +107,22 @@ public abstract class CloudSolrClient extends SolrClient {public static final String STATE_VERSION = "_stateVer_";protected long retryExpiryTime =TimeUnit.NANOSECONDS.convert(3, TimeUnit.SECONDS); // 3 seconds or 3 million nanos- private final Set<String> NON_ROUTABLE_PARAMS;-- {- NON_ROUTABLE_PARAMS = new HashSet<>();- NON_ROUTABLE_PARAMS.add(UpdateParams.EXPUNGE_DELETES);- NON_ROUTABLE_PARAMS.add(UpdateParams.MAX_OPTIMIZE_SEGMENTS);- NON_ROUTABLE_PARAMS.add(UpdateParams.COMMIT);- NON_ROUTABLE_PARAMS.add(UpdateParams.WAIT_SEARCHER);- NON_ROUTABLE_PARAMS.add(UpdateParams.OPEN_SEARCHER);-- NON_ROUTABLE_PARAMS.add(UpdateParams.SOFT_COMMIT);- NON_ROUTABLE_PARAMS.add(UpdateParams.PREPARE_COMMIT);- NON_ROUTABLE_PARAMS.add(UpdateParams.OPTIMIZE);-- // Not supported via SolrCloud- // NON_ROUTABLE_PARAMS.add(UpdateParams.ROLLBACK);-- }-- protected volatile List<Object> locks = objectList(3);+ private static final Set<String> NON_ROUTABLE_PARAMS =+ Set.of(+ UpdateParams.EXPUNGE_DELETES,+ UpdateParams.MAX_OPTIMIZE_SEGMENTS,+ UpdateParams.COMMIT,+ UpdateParams.WAIT_SEARCHER,+ UpdateParams.OPEN_SEARCHER,+ UpdateParams.SOFT_COMMIT,+ UpdateParams.PREPARE_COMMIT,+ UpdateParams.OPTIMIZE++ // Not supported via SolrCloud+ // UpdateParams.ROLLBACK+ );++ protected volatile Object[] locks = objectList(3);/** Constructs {@link CloudSolrClient} instances from provided configuration. */public static class Builder extends CloudHttp2SolrClient.Builder {@@ -1251,9 +1247,11 @@ public abstract class CloudSolrClient extends SolrClient {locks = objectList(n);}- protected static ArrayList<Object> objectList(int n) {- ArrayList<Object> l = new ArrayList<>(n);- for (int i = 0; i < n; i++) l.add(new Object());+ protected static Object[] objectList(int n) {+ Object[] l = new Object[n];+ for (int i = 0; i < n; i++) {+ l[i] = new Object();+ }return l;}@@ -1276,12 +1274,10 @@ public abstract class CloudSolrClient extends SolrClient {// it is readily available just return itreturn ref.get();}- List<Object> locks = this.locks;- final Object lock =- locks.get(- Math.abs(- Hash.murmurhash3_x86_32(collection, 0, collection.length(), 0) % locks.size()));- DocCollection fetchedCol = null;+ Object[] locks = this.locks;+ int lockId =+ Math.abs(Hash.murmurhash3_x86_32(collection, 0, collection.length(), 0) % locks.length);+ final Object lock = locks[lockId];synchronized (lock) {/*we have waited for sometime just check once again*/cacheEntry = collectionStateCache.get(collection);@@ -1291,7 +1287,7 @@ public abstract class CloudSolrClient extends SolrClient {}// We are going to fetch a new version// we MUST try to get a new version- fetchedCol = ref.get(); // this is a call to ZK+ DocCollection fetchedCol = ref.get(); // this is a call to ZKif (fetchedCol == null) return null; // this collection no more existsif (col != null && fetchedCol.getZNodeVersion() == col.getZNodeVersion()) {cacheEntry.setRetriedAt(); // we retried and found that it is the same version