You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2017/07/18 20:08:15 UTC
[3/3] lucene-solr:branch_7_0: SOLR-11115: Randomize PointFields in
schema-psuedo-fields.xml, schema-multiword-synonyms.xml,
and all affected tests
SOLR-11115: Randomize PointFields in schema-psuedo-fields.xml, schema-multiword-synonyms.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/234fce79
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/234fce79
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/234fce79
Branch: refs/heads/branch_7_0
Commit: 234fce796c0495ce0088b0e5666df2bbf0d27411
Parents: fa513ea
Author: Steve Rowe <sa...@apache.org>
Authored: Tue Jul 18 16:07:28 2017 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Tue Jul 18 16:07:54 2017 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 1 +
.../solr/collection1/conf/schema-multiword-synonyms.xml | 2 +-
.../test-files/solr/collection1/conf/schema-psuedo-fields.xml | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/234fce79/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 159bda7..df80f6b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -427,6 +427,7 @@ Other Changes
- SOLR-11102: Randomize PointFields in schema-rest.xml and all affected tests (hossman)
- SOLR-11112: Randomize PointFields in schema-folding.xml and all affected tests (hossman)
- SOLR-11111: Randomize PointFields in collection1/conf/: schemasurround.xml, schema-sql.xml, and schema-spatial.xml (Steve Rowe)
+ - SOLR-11115: Randomize PointFields in schema-psuedo-fields.xml, schema-multiword-synonyms.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/234fce79/solr/core/src/test-files/solr/collection1/conf/schema-multiword-synonyms.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-multiword-synonyms.xml b/solr/core/src/test-files/solr/collection1/conf/schema-multiword-synonyms.xml
index 5544e22..0343142 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-multiword-synonyms.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-multiword-synonyms.xml
@@ -19,7 +19,7 @@
<schema name="test-multi-word-synonyms" version="1.6">
<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"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
<fieldType name="text" class="solr.TextField" positionIncrementGap="100">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/234fce79/solr/core/src/test-files/solr/collection1/conf/schema-psuedo-fields.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-psuedo-fields.xml b/solr/core/src/test-files/solr/collection1/conf/schema-psuedo-fields.xml
index 5e048bd..b4e2ecd 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-psuedo-fields.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-psuedo-fields.xml
@@ -37,8 +37,8 @@
<uniqueKey>id</uniqueKey>
<fieldType name="ignored" class="solr.StrField" indexed="false" stored="false"/>
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true" />
<fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
geo="true" distErrPct="0.025" maxDistErr="0.001" distanceUnits="kilometers" />