[lucene-solr] 11/18: @846 Small map size tweaks, volatile.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 8f65039d496ff2c7903cc3e1aa08220c3588f6cf
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Sep 16 22:32:13 2020 -0500

    @846 Small map size tweaks, volatile.
---
 solr/core/src/java/org/apache/solr/schema/IndexSchema.java        | 8 ++++----
 solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java | 4 ++--
 .../update/processor/FieldMutatingUpdateProcessorFactory.java     | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
index 40590ad..645bde1 100644
--- a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
+++ b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
@@ -245,8 +245,8 @@ public class IndexSchema {
 
   protected volatile Map<String,FieldType> fieldTypes = new ConcurrentHashMap<>(32);
 
-  protected volatile Set<SchemaField> fieldsWithDefaultValue = ConcurrentHashMap.newKeySet(16);
-  protected volatile Collection<SchemaField> requiredFields = ConcurrentHashMap.newKeySet(16);
+  protected volatile Set<SchemaField> fieldsWithDefaultValue = ConcurrentHashMap.newKeySet(32);
+  protected volatile Collection<SchemaField> requiredFields = ConcurrentHashMap.newKeySet(32);
   protected volatile DynamicField[] dynamicFields = EMPTY_DYNAMIC_FIELDS1;
 
   public DynamicField[] getDynamicFields() { return dynamicFields; }
@@ -256,9 +256,9 @@ public class IndexSchema {
   private volatile Analyzer indexAnalyzer;
   private volatile Analyzer queryAnalyzer;
 
-  protected volatile Set<SchemaAware> schemaAware = ConcurrentHashMap.newKeySet(332);
+  protected volatile Set<SchemaAware> schemaAware = ConcurrentHashMap.newKeySet(32);
 
-  protected volatile Map<String,Set<CopyField>> copyFieldsMap = new ConcurrentHashMap<>(16);
+  protected volatile Map<String,Set<CopyField>> copyFieldsMap = new ConcurrentHashMap<>(32);
   public Map<String,Set<CopyField>> getCopyFieldsMap() { return Collections.unmodifiableMap(copyFieldsMap); }
 
   protected volatile DynamicCopy[] dynamicCopyFields = EMPTY_DYNAMIC_COPIES;
diff --git a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
index 2753d6d..f0b8541 100644
--- a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
+++ b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
@@ -1328,8 +1328,8 @@ public final class ManagedIndexSchema extends IndexSchema {
     // build the new FieldType using the existing FieldTypePluginLoader framework
     // which expects XML, so we use a JSON to XML adapter to transform the JSON object
     // provided in the request into the XML format supported by the plugin loader
-    Map<String,FieldType> newFieldTypes = new HashMap<>(64);
-    List<SchemaAware> schemaAwareList = new ArrayList<>(64);
+    Map<String,FieldType> newFieldTypes = new HashMap<>(32);
+    List<SchemaAware> schemaAwareList = new ArrayList<>(32);
     FieldTypePluginLoader typeLoader = new FieldTypePluginLoader(this, newFieldTypes, schemaAwareList);
     typeLoader.loadSingle(loader, FieldTypeXmlAdapter.toNode(loader, options));
     FieldType ft = newFieldTypes.get(typeName);
diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java
index d6fcb05..719c4f1 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java
@@ -129,7 +129,7 @@ public abstract class FieldMutatingUpdateProcessorFactory
   private Collection<SelectorParams> exclusions 
     = new ArrayList<>();
 
-  private FieldNameSelector selector = null;
+  private volatile FieldNameSelector selector = null;
   
   protected final FieldNameSelector getSelector() {
     if (null != selector) return selector;