You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2017/07/25 09:05:53 UTC
[08/50] [abbrv] lucene-solr:feature/autoscaling: Randomize
PointFields in schema-HighlighterMaxOffsetTest.xml,
schema-luceneMatchVersion.xml, schema-minimal-atomic-stress.xml,
and all affected tests
Randomize PointFields in schema-HighlighterMaxOffsetTest.xml, schema-luceneMatchVersion.xml, schema-minimal-atomic-stress.xml, and all affected tests
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/67fbd4f7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/67fbd4f7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/67fbd4f7
Branch: refs/heads/feature/autoscaling
Commit: 67fbd4f7a180c3cacdb2a65c4d81ec929dfd1283
Parents: 8d5c029
Author: Steve Rowe <sa...@apache.org>
Authored: Tue Jul 18 17:24:09 2017 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Tue Jul 18 17:24:09 2017 -0400
----------------------------------------------------------------------
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 +-
.../org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java | 4 +++-
5 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/67fbd4f7/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 1d94c32..277ba78 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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/67fbd4f7/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
----------------------------------------------------------------------
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 c447222..6ea70f3 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
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/67fbd4f7/solr/core/src/test-files/solr/collection1/conf/schema-luceneMatchVersion.xml
----------------------------------------------------------------------
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 95d6e03..406cfd2 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>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/67fbd4f7/solr/core/src/test-files/solr/collection1/conf/schema-minimal-atomic-stress.xml
----------------------------------------------------------------------
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 dffa365..39f0d58 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" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/67fbd4f7/solr/core/src/test/org/apache/solr/cloud/TestStressCloudBlindAtomicUpdates.java
----------------------------------------------------------------------
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 9c04f75..7e0a66d 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,