From 67fbd4f7a180c3cacdb2a65c4d81ec929dfd1283 Mon Sep 17 00:00:00 2001
From: Steve Rowe <sarowe@apache.org>
Date: Tue, 18 Jul 2017 17:24:09 -0400
Subject: [PATCH] Randomize PointFields in schema-HighlighterMaxOffsetTest.xml,
 schema-luceneMatchVersion.xml, schema-minimal-atomic-stress.xml, and all
 affected tests

---
 solr/CHANGES.txt                                              | 2 ++
 .../solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml | 2 +-
 .../solr/collection1/conf/schema-luceneMatchVersion.xml       | 2 +-
 .../solr/collection1/conf/schema-minimal-atomic-stress.xml    | 2 +-
 .../apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java  | 4 +++-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 1d94c32a832..277ba78c0dd 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -511,6 +511,8 @@ Other Changes
   - SOLR-11115: Randomize PointFields in schema-psuedo-fields.xml, schema-multiword-synonyms.xml, and all affected tests (Steve Rowe)
   - SOLR-11116: Randomize PointFields in schema-numeric.xml and all related tests (Steve Rowe)
   - SOLR-11117: Randomize PointFields in schema-behavior.xml, schema-enums.xml, and all affected tests (Steve Rowe)
+  - SOLR-11118: Randomize PointFields in schema-HighlighterMaxOffsetTest.xml, schema-luceneMatchVersion.xml, 
+    schema-minimal-atomic-stress.xml, and all affected tests (Steve Rowe)
 
 * SOLR-6807: Changed requestDispatcher's handleSelect to default to false, thus ignoring "qt".
   Simplified configs to not refer to handleSelect or "qt".  Switch all tests that assumed true to assume false
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml b/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
index c4472223107..6ea70f30e15 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
@@ -40,7 +40,7 @@ Test for HighlighterMaxOffsetTest which requires the use of ReversedWildcardFilt
 
 
   <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
-  <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
+  <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" positionIncrementGap="0"/>
 
 
   <!-- Just like text_general except it reverses the characters of
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml b/solr/core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml
index 95d6e035d11..406cfd23bb2 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml
@@ -16,7 +16,7 @@
  limitations under the License.
 -->
 <schema name="luceneMatchVersionTest" version="1.1">
-  <fieldType name="long" class="solr.TrieLongField"/>
+  <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}"/>
   <fieldType name="string" class="solr.StrField"/>
   <fieldType name="text40" class="solr.TextField">
     <analyzer>
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-minimal-atomic-stress.xml b/solr/core/src/test-files/solr/collection1/conf/schema-minimal-atomic-stress.xml
index dffa365fd27..39f0d581060 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-minimal-atomic-stress.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-minimal-atomic-stress.xml
@@ -31,7 +31,7 @@
   <field name="long_stored_idx"  type="long" indexed="true" stored="true"  docValues="false" />
 
   <fieldType name="string" class="solr.StrField" multiValued="false" indexed="false" stored="false" docValues="false" />
-  <fieldType name="long" class="solr.TrieLongField" multiValued="false" indexed="false" stored="false" docValues="false"/>
+  <fieldType name="long" class="${solr.tests.LongFieldType}" multiValued="false" indexed="false" stored="false" docValues="false"/>
 
   <!-- unused, but play nice with existing solrconfig so we don't have to create a new one just for this test -->
   <dynamicField name="*" type="string" indexed="true" stored="true" />
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java
index 9c04f757f37..7e0a66d9e85 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java
@@ -137,9 +137,11 @@ public class TestStressCloudBlindAtomicUpdates extends SolrCloudTestCase {
       CLIENTS.add(getHttpSolrClient(jetty.getBaseUrl() + "/" + COLLECTION_NAME + "/"));
     }
 
+    final boolean usingPoints = Boolean.getBoolean(NUMERIC_POINTS_SYSPROP);
+
     // sanity check no one broke the assumptions we make about our schema
     checkExpectedSchemaType( map("name","long",
-                                 "class","solr.TrieLongField",
+                                 "class", usingPoints ? "solr.LongPointField" : "solr.TrieLongField",
                                  "multiValued",Boolean.FALSE,
                                  "indexed",Boolean.FALSE,
                                  "stored",Boolean.FALSE,