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:35:26 UTC
[2/3] lucene-solr:branch_7x: SOLR-11117: Randomize PointFields in
schema-behavior.xml, schema-enums.xml, and all affected tests
SOLR-11117: Randomize PointFields in schema-behavior.xml, schema-enums.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/7bca513f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7bca513f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7bca513f
Branch: refs/heads/branch_7x
Commit: 7bca513f5616fefb1bd19a2da8544994426132bd
Parents: ba3c562
Author: Steve Rowe <sa...@apache.org>
Authored: Tue Jul 18 16:34:56 2017 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Tue Jul 18 16:35:12 2017 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 1 +
.../src/test-files/solr/collection1/conf/schema-behavior.xml | 6 +++---
.../core/src/test-files/solr/collection1/conf/schema-enums.xml | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7bca513f/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 77b51f8..9017c28 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -493,6 +493,7 @@ Other Changes
- 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-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-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/7bca513f/solr/core/src/test-files/solr/collection1/conf/schema-behavior.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-behavior.xml b/solr/core/src/test-files/solr/collection1/conf/schema-behavior.xml
index 9a0b6d3..2fb50c7 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-behavior.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-behavior.xml
@@ -26,7 +26,7 @@
<fieldType name="text" class="solr.TextField"/>
<fieldType name="bool" class="solr.BoolField"/>
<fieldType name="str" class="solr.StrField"/>
- <fieldType name="int" class="solr.TrieIntField"/>
+ <fieldType name="int" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}"/>
<!-- explicit props on type -->
<fieldType name="multi_f" class="solr.StrField" multiValued="false"/>
@@ -47,8 +47,8 @@
<fieldType name="txt_phrase_t" class="solr.TextField"
autoGeneratePhraseQueries="true"/>
- <fieldType name="int_dvas_t" class="solr.TrieIntField" useDocValuesAsStored="true"/>
- <fieldType name="int_dvas_f" class="solr.TrieIntField" useDocValuesAsStored="false"/>
+ <fieldType name="int_dvas_t" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" useDocValuesAsStored="true"/>
+ <fieldType name="int_dvas_f" class="${solr.tests.IntegerFieldType}" docValues="${solr.tests.numeric.dv}" useDocValuesAsStored="false"/>
<!-- all behavior is default -->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7bca513f/solr/core/src/test-files/solr/collection1/conf/schema-enums.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-enums.xml b/solr/core/src/test-files/solr/collection1/conf/schema-enums.xml
index b3a9515..85b4ffa 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-enums.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-enums.xml
@@ -34,6 +34,6 @@
but you can always add new values to the end. -->
<fieldType name="severityType" class="solr.EnumField" enumsConfig="enumsConfig.xml" enumName="severity"/>
<fieldType name="string" class="solr.StrField"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongFieldType}" docValues="${solr.tests.numeric.dv}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
</schema>