You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2017/07/17 23:00:22 UTC
[1/2] lucene-solr:branch_7x: SOLR-11098: Randomize PointFields in
cloud-managed-preanalyzed & schema-preanalyzed.xml
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7_0 266076d58 -> 6072288fa
refs/heads/branch_7x 9c3c67d56 -> 46e3d38ce
SOLR-11098: Randomize PointFields in cloud-managed-preanalyzed & schema-preanalyzed.xml
(cherry picked from commit 19221267053f1452f41031aafde27fa38ce3fa13)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/46e3d38c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/46e3d38c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/46e3d38c
Branch: refs/heads/branch_7x
Commit: 46e3d38ce25c0bcb8e0001623c9b46422ac68ee6
Parents: 9c3c67d
Author: Chris Hostetter <ho...@apache.org>
Authored: Mon Jul 17 15:44:41 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Mon Jul 17 15:45:36 2017 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 1 +
.../src/test-files/solr/collection1/conf/schema-preanalyzed.xml | 2 +-
.../configsets/cloud-managed-preanalyzed/conf/managed-schema | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/46e3d38c/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8ebce91..62337d2 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -479,6 +479,7 @@ Other Changes
- SOLR-11060: Randomize PointFields in schema-custom-field.xml and all related tests (Anshum Gupta)
- SOLR-11095: Randomize PointFields in doc-expiry & exitabe-directory test configsets (hossman)
- SOLR-11097: Randomize PointFields in schema-id-and-version-fields-only.xml and all affected tests (hossman)
+ - SOLR-11098: Randomize PointFields in cloud-managed-preanalyzed & schema-preanalyzed.xml and all affected tests (hossman)
* 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/46e3d38c/solr/core/src/test-files/solr/collection1/conf/schema-preanalyzed.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-preanalyzed.xml b/solr/core/src/test-files/solr/collection1/conf/schema-preanalyzed.xml
index 8a27392..7de08d6 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-preanalyzed.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-preanalyzed.xml
@@ -30,7 +30,7 @@
</analyzer>
</fieldType>
<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"/>
<field name="id" type="string" indexed="true" stored="true" required="true"/>
<field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/46e3d38c/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/managed-schema
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/managed-schema b/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/managed-schema
index 39e142e..d9a439d 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/managed-schema
+++ b/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/managed-schema
@@ -17,8 +17,8 @@
-->
<schema name="managed-preanalyzed" version="1.6">
<fieldType name="string" class="solr.StrField"/>
- <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="preanalyzed-no-analyzer" class="solr.PreAnalyzedField" parserImpl="json"/>
<fieldType name="preanalyzed-with-analyzer" class="solr.PreAnalyzedField">
[2/2] lucene-solr:branch_7_0: SOLR-11098: Randomize PointFields in
cloud-managed-preanalyzed & schema-preanalyzed.xml
Posted by ho...@apache.org.
SOLR-11098: Randomize PointFields in cloud-managed-preanalyzed & schema-preanalyzed.xml
(cherry picked from commit 19221267053f1452f41031aafde27fa38ce3fa13)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6072288f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6072288f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6072288f
Branch: refs/heads/branch_7_0
Commit: 6072288fa6b5050f67c26bd3424afdefd4439d8a
Parents: 266076d
Author: Chris Hostetter <ho...@apache.org>
Authored: Mon Jul 17 15:44:41 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Mon Jul 17 15:56:48 2017 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 1 +
.../src/test-files/solr/collection1/conf/schema-preanalyzed.xml | 2 +-
.../configsets/cloud-managed-preanalyzed/conf/managed-schema | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6072288f/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index cda6e1c..cf71a1b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -418,6 +418,7 @@ Other Changes
- SOLR-11060: Randomize PointFields in schema-custom-field.xml and all related tests (Anshum Gupta)
- SOLR-11095: Randomize PointFields in doc-expiry & exitabe-directory test configsets (hossman)
- SOLR-11097: Randomize PointFields in schema-id-and-version-fields-only.xml and all affected tests (hossman)
+ - SOLR-11098: Randomize PointFields in cloud-managed-preanalyzed & schema-preanalyzed.xml and all affected tests (hossman)
* 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/6072288f/solr/core/src/test-files/solr/collection1/conf/schema-preanalyzed.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-preanalyzed.xml b/solr/core/src/test-files/solr/collection1/conf/schema-preanalyzed.xml
index 8a27392..7de08d6 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-preanalyzed.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-preanalyzed.xml
@@ -30,7 +30,7 @@
</analyzer>
</fieldType>
<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"/>
<field name="id" type="string" indexed="true" stored="true" required="true"/>
<field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6072288f/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/managed-schema
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/managed-schema b/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/managed-schema
index 39e142e..d9a439d 100644
--- a/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/managed-schema
+++ b/solr/core/src/test-files/solr/configsets/cloud-managed-preanalyzed/conf/managed-schema
@@ -17,8 +17,8 @@
-->
<schema name="managed-preanalyzed" version="1.6">
<fieldType name="string" class="solr.StrField"/>
- <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="preanalyzed-no-analyzer" class="solr.PreAnalyzedField" parserImpl="json"/>
<fieldType name="preanalyzed-with-analyzer" class="solr.PreAnalyzedField">