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/06/15 17:59:44 UTC
[5/5] lucene-solr:branch_6x: SOLR-10834: Fixed tests and test configs
to stop using numeric uniqueKey fields
SOLR-10834: Fixed tests and test configs to stop using numeric uniqueKey fields
Squashed commit of the following (from jira/SOLR-10834 branch):
commit 8f1043840f38533864b2c713daf066b6c3509147
commit 7b95773bd524cd86aaccc56cc33a003a9aff2004
commit b26bf9d60e2b94e0cdc365d1e2c0a37c33e24198
commit df11992106f8c338503b6e3e9a27ba6ddcfa2953
commit fcf98132410ed247e451bb449a8337a09bd857ce
commit 05e8e226de359a6d7bc99219eaec161a32268f17
commit 6dce948294351560948a32b64679b1879657af79
commit 53f97845caaa8adc25862e4017b94f3091063552
commit d5bfb5f57016341fbeaf73b5e4c9ed10dc3816d0
commit d333f7b1eee10893a81532ac2f5a77a46716d90b
commit 15983ceec4702dc8c7562250d59cd8231c67d46a
commit e18e2e771fb4678cb911a62bbc7c74a873466bf0
commit 134e210bdf601600a9d90dd0720a35cb122896b0
commit ec03260265f8a3bbdfd7f9b015de16a4950a05eb
commit 5d430057ed335801a524e1e7666061075ab6d859
commit 1625df3d21b8fa27815d7a7b89a55fc338eeb23b
(cherry picked from commit f1e2be64519a9ec815785b59e6187c3e99f7d998)
Conflicts:
solr/core/src/test/org/apache/solr/cloud/FullThrottleStoppableIndexingThread.java
solr/core/src/test/org/apache/solr/cloud/SegmentTerminateEarlyTestState.java
solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java
solr/core/src/test/org/apache/solr/core/MockInfoBean.java
solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java
solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java
solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java
solr/core/src/test/org/apache/solr/search/mlt/SimpleMLTQParserTest.java
solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/625b1cba
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/625b1cba
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/625b1cba
Branch: refs/heads/branch_6x
Commit: 625b1cba8be77cca061c72420050aa0c766aab39
Parents: ddc128b
Author: Chris Hostetter <ho...@apache.org>
Authored: Thu Jun 15 09:14:24 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Thu Jun 15 10:57:09 2017 -0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +
.../collection1/conf/schema-icucollate-dv.xml | 4 +-
.../solr/collection1/conf/schema-icucollate.xml | 4 +-
.../conf/schema-icucollateoptions.xml | 4 +-
.../solr/schema/TestICUCollationField.java | 28 +-
.../schema/TestICUCollationFieldDocValues.java | 28 +-
.../schema/TestICUCollationFieldOptions.java | 26 +-
.../solr/analysisconfs/analysis-err-schema.xml | 4 +-
.../collection1/conf/schema-binaryfield.xml | 2 +-
.../conf/schema-blockjoinfacetcomponent.xml | 4 +-
.../solr/collection1/conf/schema-bm25.xml | 4 +-
.../collection1/conf/schema-charfilters.xml | 4 +-
.../solr/collection1/conf/schema-collate-dv.xml | 4 +-
.../solr/collection1/conf/schema-collate.xml | 4 +-
.../collection1/conf/schema-copyfield-test.xml | 2 +-
.../collection1/conf/schema-custom-field.xml | 6 +-
.../collection1/conf/schema-customfield.xml | 3 +-
.../solr/collection1/conf/schema-dfi.xml | 4 +-
.../solr/collection1/conf/schema-dfr.xml | 4 +-
.../conf/schema-distributed-missing-sort.xml | 6 +-
.../solr/collection1/conf/schema-docValues.xml | 5 +-
.../conf/schema-field-sort-values.xml | 2 +-
.../solr/collection1/conf/schema-hash.xml | 2 +-
.../solr/collection1/conf/schema-ib.xml | 4 +-
.../collection1/conf/schema-lmdirichlet.xml | 4 +-
.../collection1/conf/schema-lmjelinekmercer.xml | 4 +-
.../conf/schema-not-required-unique-key.xml | 2 +-
.../collection1/conf/schema-phrasesuggest.xml | 4 +-
.../conf/schema-postingshighlight.xml | 4 +-
.../collection1/conf/schema-replication1.xml | 2 +-
.../collection1/conf/schema-replication2.xml | 2 +-
.../collection1/conf/schema-required-fields.xml | 2 +-
.../solr/collection1/conf/schema-reversed.xml | 2 +-
.../conf/schema-sim-default-override.xml | 4 +-
.../solr/collection1/conf/schema-sim.xml | 4 +-
.../collection1/conf/schema-simpleqpplugin.xml | 4 +-
.../solr/collection1/conf/schema-sorts.xml | 2 +-
.../solr/collection1/conf/schema-sql.xml | 2 +-
.../solr/collection1/conf/schema-sweetspot.xml | 4 +-
.../conf/schema-synonym-tokenizer.xml | 6 +-
.../solr/collection1/conf/schema-tfidf.xml | 4 +-
.../collection1/conf/schema-tokenizer-test.xml | 5 +-
.../solr/collection1/conf/schema-trie.xml | 2 +-
.../conf/schema-unifiedhighlight.xml | 4 +-
.../test-files/solr/collection1/conf/schema.xml | 5 +-
.../solr/collection1/conf/schema11.xml | 6 +-
.../solr/configsets/configset-2/conf/schema.xml | 4 +-
.../test-files/solr/crazy-path-to-schema.xml | 4 +-
.../org/apache/solr/BasicFunctionalityTest.java | 36 +--
.../test/org/apache/solr/CursorPagingTest.java | 58 ++--
.../apache/solr/DisMaxRequestHandlerTest.java | 22 +-
.../src/test/org/apache/solr/SampleTest.java | 4 +-
.../apache/solr/TestDistributedGrouping.java | 18 +-
.../apache/solr/TestDistributedMissingSort.java | 60 ++--
.../org/apache/solr/TestDistributedSearch.java | 20 +-
.../org/apache/solr/TestTolerantSearch.java | 4 +-
.../PathHierarchyTokenizerFactoryTest.java | 32 +--
.../apache/solr/analysis/TestCharFilters.java | 8 +-
.../solr/cloud/BasicDistributedZk2Test.java | 8 +-
.../solr/cloud/BasicDistributedZkTest.java | 10 +-
.../test/org/apache/solr/cloud/BasicZkTest.java | 4 +-
.../solr/cloud/DistribCursorPagingTest.java | 10 +-
.../cloud/DistribJoinFromCollectionTest.java | 8 +-
.../apache/solr/cloud/HttpPartitionTest.java | 2 +-
.../cloud/SegmentTerminateEarlyTestState.java | 30 +-
.../test/org/apache/solr/core/HelloStream.java | 2 +-
.../test/org/apache/solr/core/SOLR749Test.java | 12 +-
.../core/snapshots/TestSolrCloudSnapshots.java | 2 +-
.../core/snapshots/TestSolrCoreSnapshots.java | 2 +-
.../solr/handler/MoreLikeThisHandlerTest.java | 20 +-
.../handler/StandardRequestHandlerTest.java | 24 +-
.../org/apache/solr/handler/TestSQLHandler.java | 32 +--
.../handler/XsltUpdateRequestHandlerTest.java | 2 +-
.../admin/PropertiesRequestHandlerTest.java | 2 +-
.../DistributedExpandComponentTest.java | 40 +--
.../component/DistributedMLTComponentTest.java | 12 +-
...DistributedQueryComponentCustomSortTest.java | 38 +--
.../DistributedQueryElevationComponentTest.java | 4 +-
.../component/QueryElevationComponentTest.java | 90 +++---
.../handler/component/StatsComponentTest.java | 20 +-
...estDistributedStatsComponentCardinality.java | 4 +-
.../handler/component/TestExpandComponent.java | 100 +++----
.../apache/solr/request/SimpleFacetsTest.java | 144 +++++-----
.../org/apache/solr/request/TestFaceting.java | 14 +-
.../transform/TestChildDocTransformer.java | 120 ++++----
.../org/apache/solr/rest/TestRestManager.java | 2 +-
.../solr/schema/AbstractCurrencyFieldTest.java | 82 +++---
.../org/apache/solr/schema/CopyFieldTest.java | 12 +-
.../solr/schema/CurrencyFieldXmlFileTest.java | 4 +-
.../apache/solr/schema/DateRangeFieldTest.java | 2 +-
.../org/apache/solr/schema/DocValuesTest.java | 256 ++++++++---------
.../schema/IndexSchemaRuntimeFieldTest.java | 4 +-
.../org/apache/solr/schema/IndexSchemaTest.java | 6 +-
.../org/apache/solr/schema/TestBinaryField.java | 6 +-
.../apache/solr/schema/TestCollationField.java | 32 +--
.../schema/TestCollationFieldDocValues.java | 32 +--
.../solr/schema/TestHalfAndHalfDocValues.java | 6 +-
.../apache/solr/schema/TestOmitPositions.java | 4 +-
.../apache/solr/search/SpatialFilterTest.java | 2 +-
.../solr/search/TestCollapseQParserPlugin.java | 280 +++++++++----------
.../TestComplexPhraseLeadingWildcard.java | 2 +-
.../org/apache/solr/search/TestCustomSort.java | 20 +-
.../apache/solr/search/TestFieldSortValues.java | 10 +-
.../solr/search/TestFoldingMultitermQuery.java | 2 +-
.../search/TestGraphTermsQParserPlugin.java | 34 +--
.../solr/search/TestHashQParserPlugin.java | 14 +-
.../org/apache/solr/search/TestQueryTypes.java | 22 +-
.../org/apache/solr/search/TestRangeQuery.java | 4 +-
.../solr/search/TestReRankQParserPlugin.java | 208 +++++++-------
.../test/org/apache/solr/search/TestReload.java | 2 +-
.../org/apache/solr/search/TestSearchPerf.java | 2 +-
.../apache/solr/search/TestSolrQueryParser.java | 2 +-
.../org/apache/solr/search/facet/DebugAgg.java | 2 +-
.../search/function/SortByFunctionTest.java | 68 ++---
.../solr/search/function/TestFunctionQuery.java | 43 +--
.../function/TestMinMaxOnMultiValuedField.java | 8 +-
.../solr/search/mlt/SimpleMLTQParserTest.java | 86 +++---
.../solr/search/stats/TestDistribIDF.java | 14 +-
.../solr/security/MockAuthorizationPlugin.java | 2 +-
.../apache/solr/servlet/NoCacheHeaderTest.java | 2 +-
.../solr/spelling/suggest/SuggesterTest.java | 19 +-
.../suggest/TestAnalyzeInfixSuggestions.java | 2 +-
.../suggest/TestFreeTextSuggestions.java | 2 +-
.../update/processor/AtomicUpdatesTest.java | 36 +--
.../ClassificationUpdateProcessorTest.java | 2 +-
.../org/apache/solr/util/PrimUtilsTest.java | 2 +-
.../org/apache/solr/util/UtilsToolTest.java | 2 +-
.../org/apache/solr/util/hll/BitVectorTest.java | 2 +-
.../apache/solr/util/hll/ExplicitHLLTest.java | 2 +-
.../org/apache/solr/util/hll/FullHLLTest.java | 2 +-
.../collection1/conf/schema-replication1.xml | 2 +-
.../solrj/solr/collection1/conf/schema-sql.xml | 2 +-
.../solrj/solr/collection1/conf/schema.xml | 2 +-
.../solrj/solr/crazy-path-to-schema.xml | 4 +-
134 files changed, 1321 insertions(+), 1301 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d25a973..20722f2 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -178,6 +178,8 @@ Other Changes
* SOLR-10891: BBoxField should support point-based number sub-fields. (Steve Rowe)
+* SOLR-10834: Fixed tests and test configs to stop using numeric uniqueKey fields (hossman)
+
================== 6.6.1 ==================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml
index 1e2029d..63f7330 100644
--- a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml
+++ b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate-dv.xml
@@ -20,7 +20,7 @@
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
<fieldType name="text" class="solr.TextField">
@@ -37,7 +37,7 @@
<fieldType name="sort_da_t" class="solr.ICUCollationField" locale="da" strength="primary"/>
<fieldType name="sort_custom_t" class="solr.ICUCollationField" custom="customrules.dat" strength="primary"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="sort_ar" type="sort_ar_t" indexed="false" stored="false" multiValued="false" docValues="true"/>
<field name="sort_de" type="sort_de_t" indexed="false" stored="false" multiValued="false" docValues="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
index 1d121f2..9698013 100644
--- a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
+++ b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollate.xml
@@ -20,7 +20,7 @@
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
<fieldType name="text" class="solr.TextField">
@@ -37,7 +37,7 @@
<fieldType name="sort_da_t" class="solr.ICUCollationField" locale="da" strength="primary"/>
<fieldType name="sort_custom_t" class="solr.ICUCollationField" custom="customrules.dat" strength="primary"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="sort_ar" type="sort_ar_t" indexed="true" stored="false" multiValued="false"/>
<field name="sort_de" type="sort_de_t" indexed="true" stored="false" multiValued="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
index cc8e340..59b8d25 100644
--- a/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
+++ b/solr/contrib/analysis-extras/src/test-files/analysis-extras/solr/collection1/conf/schema-icucollateoptions.xml
@@ -20,7 +20,7 @@
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
<fieldType name="text" class="solr.TextField">
@@ -47,7 +47,7 @@
locale="en" strength="tertiary" caseFirst="upper"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="sort_ignore_punctuation" type="sort_ignore_punctuation_t" indexed="true" stored="false"
multiValued="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
index 4cff7fa..f164080 100644
--- a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
+++ b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java
@@ -108,8 +108,8 @@ public class TestICUCollationField extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_de:tone", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=7]"
);
}
@@ -122,8 +122,8 @@ public class TestICUCollationField extends SolrTestCaseJ4 {
assertQ("Collated RangeQ: ",
req("fl", "id", "q", "sort_de:[tone TO tp]", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=7]"
);
}
@@ -134,8 +134,8 @@ public class TestICUCollationField extends SolrTestCaseJ4 {
assertQ("Collated Sort: ",
req("fl", "id", "q", "sort_da:[tz TO töz]", "sort", "sort_da asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=11]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=11]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
}
@@ -147,8 +147,8 @@ public class TestICUCollationField extends SolrTestCaseJ4 {
assertQ("Collated Sort: ",
req("fl", "id", "q", "sort_ar:[\u0698 TO \u0633\u0633]", "sort", "sort_ar asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=12]",
- "//result/doc[2]/int[@name='id'][.=1]"
+ "//result/doc[1]/str[@name='id'][.=12]",
+ "//result/doc[2]/str[@name='id'][.=1]"
);
}
@@ -171,9 +171,9 @@ public class TestICUCollationField extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_tr_canon:\"I Will Use Turkish Casıng\"", "sort", "id asc" ),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=3]",
- "//result/doc[3]/int[@name='id'][.=5]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=3]",
+ "//result/doc[3]/str[@name='id'][.=5]"
);
}
@@ -183,10 +183,10 @@ public class TestICUCollationField extends SolrTestCaseJ4 {
*/
public void testCustomCollation() {
assertQ("Collated TQ: ",
- req("fl", "id", "q", "sort_custom:toene", "sort", "id asc" ),
+ req("fl", "id", "q", "sort_custom:toene"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=10]"
+ "//result/doc/str[@name='id'][.=4]",
+ "//result/doc/str[@name='id'][.=10]"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
index bdddc98..57b403a 100644
--- a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
+++ b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java
@@ -96,8 +96,8 @@ public class TestICUCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_de:tone", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=7]"
);
}
@@ -110,8 +110,8 @@ public class TestICUCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated RangeQ: ",
req("fl", "id", "q", "sort_de:[tone TO tp]", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=7]"
+ "//result/doc[1]/str[@name='id'][.=4]",
+ "//result/doc[2]/str[@name='id'][.=7]"
);
}
@@ -122,8 +122,8 @@ public class TestICUCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated Sort: ",
req("fl", "id", "q", "sort_da:[tz TO töz]", "sort", "sort_da asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=11]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=11]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
}
@@ -135,8 +135,8 @@ public class TestICUCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated Sort: ",
req("fl", "id", "q", "sort_ar:[\u0698 TO \u0633\u0633]", "sort", "sort_ar asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=12]",
- "//result/doc[2]/int[@name='id'][.=1]"
+ "//result/doc[1]/str[@name='id'][.=12]",
+ "//result/doc[2]/str[@name='id'][.=1]"
);
}
@@ -159,9 +159,9 @@ public class TestICUCollationFieldDocValues extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_tr_canon:\"I Will Use Turkish Casıng\"", "sort", "id asc" ),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=3]",
- "//result/doc[3]/int[@name='id'][.=5]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=3]",
+ "//result/doc[3]/str[@name='id'][.=5]"
);
}
@@ -171,10 +171,10 @@ public class TestICUCollationFieldDocValues extends SolrTestCaseJ4 {
*/
public void testCustomCollation() {
assertQ("Collated TQ: ",
- req("fl", "id", "q", "sort_custom:toene", "sort", "id asc" ),
+ req("fl", "id", "q", "sort_custom:toene"),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=4]",
- "//result/doc[2]/int[@name='id'][.=10]"
+ "//result/doc/str[@name='id'][.=4]",
+ "//result/doc/str[@name='id'][.=10]"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldOptions.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldOptions.java b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldOptions.java
index 7a5dca7..0b198b7 100644
--- a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldOptions.java
+++ b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldOptions.java
@@ -52,9 +52,9 @@ public class TestICUCollationFieldOptions extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_ignore_punctuation:foobar", "sort", "id asc" ),
"//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=2]",
- "//result/doc[3]/int[@name='id'][.=3]"
+ "//result/doc[1]/str[@name='id'][.=1]",
+ "//result/doc[2]/str[@name='id'][.=2]",
+ "//result/doc[3]/str[@name='id'][.=3]"
);
}
@@ -66,8 +66,8 @@ public class TestICUCollationFieldOptions extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_ignore_space:\"foo bar\"", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=2]",
- "//result/doc[2]/int[@name='id'][.=3]"
+ "//result/doc[1]/str[@name='id'][.=2]",
+ "//result/doc[2]/str[@name='id'][.=3]"
);
}
@@ -79,8 +79,8 @@ public class TestICUCollationFieldOptions extends SolrTestCaseJ4 {
assertQ("Collated sort: ",
req("fl", "id", "q", "id:[4 TO 5]", "sort", "sort_numerics asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=5]",
- "//result/doc[2]/int[@name='id'][.=4]"
+ "//result/doc[1]/str[@name='id'][.=5]",
+ "//result/doc[2]/str[@name='id'][.=4]"
);
}
@@ -92,15 +92,15 @@ public class TestICUCollationFieldOptions extends SolrTestCaseJ4 {
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_ignore_accents:resume", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=6]",
- "//result/doc[2]/int[@name='id'][.=9]"
+ "//result/doc[1]/str[@name='id'][.=6]",
+ "//result/doc[2]/str[@name='id'][.=9]"
);
assertQ("Collated TQ: ",
req("fl", "id", "q", "sort_ignore_accents:Resume", "sort", "id asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=7]",
- "//result/doc[2]/int[@name='id'][.=8]"
+ "//result/doc[1]/str[@name='id'][.=7]",
+ "//result/doc[2]/str[@name='id'][.=8]"
);
}
@@ -112,8 +112,8 @@ public class TestICUCollationFieldOptions extends SolrTestCaseJ4 {
assertQ("Collated sort: ",
req("fl", "id", "q", "id:6 OR id:8", "sort", "sort_uppercase_first asc" ),
"//*[@numFound='2']",
- "//result/doc[1]/int[@name='id'][.=8]",
- "//result/doc[2]/int[@name='id'][.=6]"
+ "//result/doc[1]/str[@name='id'][.=8]",
+ "//result/doc[2]/str[@name='id'][.=6]"
);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml b/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
index 168df6b..eedf4b7 100644
--- a/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
+++ b/solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml
@@ -22,7 +22,7 @@
<schema name="test" version="1.6">
<fieldType name="long" class="solr.TrieLongField" stored="true" indexed="true"/>
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0"/>
+ <fieldType name="string" class="solr.StrField" />
<fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
@@ -32,7 +32,7 @@
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false"/>
<field name="text" type="text" indexed="true" stored="true"/>
<field name="_version_" type="long"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml b/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml
index eb33896..26a428d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml
@@ -67,7 +67,7 @@
<fieldType name="date" class="solr.TrieDateField" sortMissingLast="true"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="true"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
<field name="data" type="binary" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-blockjoinfacetcomponent.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-blockjoinfacetcomponent.xml b/solr/core/src/test-files/solr/collection1/conf/schema-blockjoinfacetcomponent.xml
index e262b73..dc23b84 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-blockjoinfacetcomponent.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-blockjoinfacetcomponent.xml
@@ -22,9 +22,9 @@
<fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldtype name="string" class="solr.StrField" sortMissingLast="true"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
- <field name="_root_" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="_root_" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="name" type="string" indexed="true" stored="true"/>
<dynamicField name="*_s" type="string" indexed="true" stored="true" multiValued="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml b/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml
index 13924b7..7c31f15 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-bm25.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for BM25SimilarityFactory -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
<fieldType name="text" class="solr.TextField">
@@ -37,7 +37,7 @@
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="text_params" type="text_params" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml b/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml
index 11e2aa7..1adb7aa 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-charfilters.xml
@@ -16,7 +16,7 @@
-->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="4" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- charfilter only at query-time -->
<fieldType name="text" class="solr.TextField">
<analyzer type="index">
@@ -38,7 +38,7 @@
</analyzer>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="true"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
<field name="content" type="text" indexed="true" stored="true"/>
<field name="content2" type="text2" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml b/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml
index af74654..0a2953d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-collate-dv.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for CollationField -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
<fieldType name="text" class="solr.TextField">
@@ -37,7 +37,7 @@
<fieldType name="sort_da_t" class="solr.CollationField" language="da" strength="primary"/>
<fieldType name="sort_custom_t" class="solr.CollationField" custom="customrules.dat" strength="primary"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="sort_ar" type="sort_ar_t" indexed="false" stored="false" multiValued="false" docValues="true"/>
<field name="sort_de" type="sort_de_t" indexed="false" stored="false" multiValued="false" docValues="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml b/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml
index d5c4d69..bfe65b1 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-collate.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for CollationField -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
<fieldType name="text" class="solr.TextField">
@@ -37,7 +37,7 @@
<fieldType name="sort_da_t" class="solr.CollationField" language="da" strength="primary"/>
<fieldType name="sort_custom_t" class="solr.CollationField" custom="customrules.dat" strength="primary"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="sort_ar" type="sort_ar_t" indexed="true" stored="false" multiValued="false"/>
<field name="sort_de" type="sort_de_t" indexed="true" stored="false" multiValued="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml b/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
index c16bf55..96adf2d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml
@@ -333,7 +333,7 @@
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="name" type="nametext" indexed="true" stored="true"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="subject" type="text" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml b/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
index 58c40d5..23999e4 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-custom-field.xml
@@ -26,7 +26,7 @@
</analyzer>
</fieldType>
<fieldType class="org.apache.solr.schema.SortableBinaryField" name="sortable_binary"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
@@ -34,6 +34,10 @@
stored="true" multiValued="false" docValues="true" required="true"/>
<dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
+ <!-- int varient of id, adding this here simplifies some indexing to do numeric sorting -->
+ <field name="id_i" type="int" indexed="true" stored="true" multiValued="false" />
+ <copyField source="id" dest="id_i" />
+
<!-- catchall wildcard to help ensure we aren't breaking function sorting -->
<dynamicField name="*" type="string" indexed="true" stored="true"/>
<uniqueKey>id</uniqueKey>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml b/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml
index 4d0cbfd..83948b7 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-customfield.xml
@@ -32,6 +32,7 @@
attribute and any other attributes determine the real type and
behavior of the fieldType.
-->
+ <fieldType name="string" class="solr.StrField"/>
<!--
Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
@@ -65,7 +66,7 @@
<fieldType name="customtrieintfield" class="org.apache.solr.schema.TrieIntPrefixActsAsRangeQueryFieldType"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="true"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
<field name="intfield" type="int" indexed="true" stored="true"/>
<field name="swap_foo_bar_in_prefix_query" type="customfield" indexed="true" stored="true" multiValued="true"/>
<field name="int_prefix_as_range" type="customtrieintfield" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml b/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
index c3dc509..184f142 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-dfi.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for DFISimilarityFactory -->
<schema name="dfi" version="1.5">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
<fieldType name="text" class="solr.TextField">
@@ -39,7 +39,7 @@
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="text_params" type="text_params" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml b/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
index 4b27707..3083510 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-dfr.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for DFRSimilarityFactory -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
<fieldType name="text" class="solr.TextField">
@@ -54,7 +54,7 @@
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="text_params" type="text_params" indexed="true" stored="false"/>
<field name="text_paramc" type="text_paramc" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml b/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
index 822d2be..13daf46 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-distributed-missing-sort.xml
@@ -45,7 +45,7 @@
<fieldType name="string_ml" class="solr.StrField" sortMissingLast="true"/>
<fieldType name="string_mf" class="solr.StrField" sortMissingFirst="true"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string_ml" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
<field name="signatureField" type="string_ml" indexed="true" stored="false"/>
@@ -77,6 +77,10 @@
<dynamicField name="*_mfacet" type="string_ml" indexed="true" stored="false" multiValued="true"/>
<dynamicField name="*_sS" type="string_ml" indexed="false" stored="true"/>
+
+ <!-- int varient of id, adding this here simplifies some indexing and test assertions -->
+ <field name="id_i" type="int" indexed="true" stored="true" multiValued="false" />
+ <copyField source="id" dest="id_i" />
<uniqueKey>id</uniqueKey>
</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
index 9e4286d..0216791 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValues.xml
@@ -53,7 +53,10 @@
<fieldType name="uuid" class="solr.UUIDField"/>
- <field name="id" type="int" required="true"/>
+ <field name="id" type="string" required="true"/>
+ <!-- int varient of id, adding this here simplifies some indexing to do numeric sorting -->
+ <field name="id_i" type="int" indexed="true" stored="true" multiValued="false" />
+ <copyField source="id" dest="id_i" />
<field name="floatdv" type="float" indexed="false" stored="false" docValues="true" default="1"/>
<field name="intdv" type="int" indexed="false" stored="false" docValues="true" default="2"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml b/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
index 0cd22b0..94485f6 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-field-sort-values.xml
@@ -26,7 +26,7 @@
</analyzer>
</fieldType>
<fieldType class="org.apache.solr.schema.WrappedIntField" name="wrapped_int"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="payload" type="wrapped_int" indexed="false"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml b/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml
index 07ef7b1..5389614 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-hash.xml
@@ -436,7 +436,7 @@
-->
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
<field name="uuid" type="uuid" stored="true"/>
<field name="name" type="nametext" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml b/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml
index e477e25..7e66bb5 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-ib.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for IBSimilarityFactory -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
<fieldType name="text" class="solr.TextField">
@@ -42,7 +42,7 @@
</similarity>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="text_params" type="text_params" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml b/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml
index a51685e..3c25098 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-lmdirichlet.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for LMDirichletSimilarityFactory -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
<fieldType name="text" class="solr.TextField">
@@ -35,7 +35,7 @@
</similarity>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="text_params" type="text_params" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml b/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml
index 7c0fcd3..a90fd65 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-lmjelinekmercer.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for LMJelinekMercerSimilarityFactory -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
<fieldType name="text" class="solr.TextField">
@@ -35,7 +35,7 @@
</similarity>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="text_params" type="text_params" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml b/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
index e2bbef3..d38952f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml
@@ -31,7 +31,7 @@
</analyzer>
</fieldType>
- <field name="id" type="int" multiValued="false" indexed="true" stored="true" required="false"/>
+ <field name="id" type="string" multiValued="false" indexed="true" stored="true" required="false"/>
<field name="subject" type="text" indexed="true" stored="true"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
<dynamicField name="*_sS" type="string" indexed="false" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml b/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
index 0bc78d6..7059cd3 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-phrasesuggest.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for phrase suggestions -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
<fieldType name="text" class="solr.TextField">
@@ -48,7 +48,7 @@
</analyzer>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="stext" type="text" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml b/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
index 18aa51a..e68ba0f 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-postingshighlight.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for PostingsHighlighter -->
<schema name="postingshighlight" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field: no offsets! -->
<fieldType name="text" class="solr.TextField">
@@ -37,7 +37,7 @@
</analyzer>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text_offsets" indexed="true" stored="true"/>
<field name="text2" type="text" indexed="true" stored="true"/>
<field name="text3" type="text_offsets" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml b/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml
index b647fa2..eeb51bd 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml
@@ -30,7 +30,7 @@
<fieldType name="integer" class="solr.TrieIntField" precisionStep="0"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
- <field name="id" type="integer" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="name" type="string" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml b/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml
index 8c8c49d..ade7bf5 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml
@@ -30,7 +30,7 @@
<fieldType name="integer" class="solr.TrieIntField" precisionStep="0"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
- <field name="id" type="integer" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="name" type="string" indexed="true" stored="true"/>
<!--adding new field newname in replication test.-->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml b/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml
index f394bbb..551ac1d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml
@@ -316,7 +316,7 @@
</fieldType>
- <field name="id" type="int" multiValued="false" indexed="true"
+ <field name="id" type="string" multiValued="false" indexed="true"
stored="true"/> <!-- the uniqueKey is required by default -->
<field name="name" type="nametext" indexed="true" stored="true" required="true"/>
<field name="text" type="text" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml b/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml
index 63887cb..3bb52eb 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-reversed.xml
@@ -66,7 +66,7 @@
</fieldType>
- <field name="id" type="integer" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="one" type="srev" indexed="true" stored="false"/>
<field name="two" type="rev" indexed="true" stored="false"/>
<field name="three" type="text" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-sim-default-override.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sim-default-override.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sim-default-override.xml
index 100caaf..2764324 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sim-default-override.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sim-default-override.xml
@@ -50,7 +50,7 @@
</analyzer>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="sim1text" type="sim-explicit" indexed="true" stored="true"/>
<field name="sim2text" type="sim-used-as-default-override" indexed="true" stored="true"/>
<field name="sim3text" type="sim-none-get-default" indexed="true" stored="true"/>
@@ -60,7 +60,7 @@
<dynamicField name="*_sim2" type="sim-used-as-default-override" indexed="true" stored="true"/>
<dynamicField name="*_sim3" type="sim-none-get-default" indexed="true" stored="true"/>
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<uniqueKey>id</uniqueKey>
</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml
index 68c4d6d..b941571 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sim.xml
@@ -19,7 +19,7 @@
<!-- Per-field similarity example for testing -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- some per-field similarity examples -->
<!-- specify a Similarity classname directly -->
<fieldType name="sim1" class="solr.TextField">
@@ -46,7 +46,7 @@
</analyzer>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="sim1text" type="sim1" indexed="true" stored="true"/>
<field name="sim2text" type="sim2" indexed="true" stored="true"/>
<field name="sim3text" type="sim3" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml b/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml
index 1183fd0..0ed7e10 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-simpleqpplugin.xml
@@ -20,7 +20,7 @@
<!-- Test schema file for SimpleQParserPlugin. -->
<schema name="simpleqp" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field: no offsets -->
<fieldType name="text" class="solr.TextField">
@@ -50,7 +50,7 @@
</analyzer>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text0" type="text" indexed="true" stored="true"/>
<field name="text1" type="text" indexed="true" stored="true"/>
<field name="text-keyword0" type="text-keyword" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
index 8497318..1ff68c1 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
@@ -25,7 +25,7 @@ NOTE: Tests expect every field in this schema to be sortable.
<schema name="sortable" version="1.6">
<uniqueKey>id</uniqueKey>
- <field name="id" type="int"/>
+ <field name="id" type="str"/>
<field name="_version_" type="long"/>
<field name="str" type="str"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml
index efa110c..e73c9c9 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sql.xml
@@ -436,7 +436,7 @@
-->
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
<field name="s_multi" type="string" indexed="true" stored="true" docValues="true" multiValued="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml b/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml
index ba021a2..080faab 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-sweetspot.xml
@@ -19,7 +19,7 @@
<!-- Test schema file for SweetSpotSimilarityFactory -->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
<fieldType name="text" class="solr.TextField"
@@ -59,7 +59,7 @@
</similarity>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text"/>
<field name="text_baseline" type="text_baseline"/>
<field name="text_hyperbolic" type="text_hyperbolic"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml b/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
index 09792f9..8ab64af 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-synonym-tokenizer.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for SynonymGraphFilterFactory argument "tokenizerFactory" -->
<schema name="synonym-test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="text_synonyms" class="solr.TextField" positionIncrementGap="100">
<analyzer type="index">
@@ -33,8 +33,8 @@
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text_synonyms" indexed="true" stored="false"/>
<uniqueKey>id</uniqueKey>
-</schema>
\ No newline at end of file
+</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml b/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
index 0bec86f..df05e82 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-tfidf.xml
@@ -38,7 +38,7 @@
</similarity>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<uniqueKey>id</uniqueKey>
</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-tokenizer-test.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-tokenizer-test.xml b/solr/core/src/test-files/solr/collection1/conf/schema-tokenizer-test.xml
index af28016..174787e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-tokenizer-test.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-tokenizer-test.xml
@@ -32,7 +32,8 @@ more concise example.
attribute and any other attributes determine the real type and
behavior of the fieldType.
-->
-
+ <fieldType name="string" class="solr.StrField" />
+
<!--
Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
-->
@@ -127,7 +128,7 @@ more concise example.
</analyzer>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="true"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
<field name="letter" type="letterfieldType" indexed="true" stored="true"/>
<field name="lowerCase" type="lowerCasefieldType" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml b/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml
index 8cab0c8..775ec9d 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml
@@ -273,7 +273,7 @@
-->
<!-- for testing, a type that does a transform to see if it's correctly done everywhere -->
- <field name="id" type="tfloat" indexed="true" stored="true" required="true"/>
+ <field name="id" type="string" indexed="true" stored="true" required="true"/>
<field name="text" type="text" indexed="true" stored="false"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema-unifiedhighlight.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-unifiedhighlight.xml b/solr/core/src/test-files/solr/collection1/conf/schema-unifiedhighlight.xml
index 3e093f3..0c9a083 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-unifiedhighlight.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-unifiedhighlight.xml
@@ -18,7 +18,7 @@
<!-- Test schema file for UnifiedHighlighter -->
<schema name="unifiedhighlight" version="1.6" >
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="string" class="solr.StrField" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field: no offsets! -->
<fieldType name="text" class="solr.TextField">
@@ -36,7 +36,7 @@
</analyzer>
</fieldType>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="text" type="text_offsets" indexed="true" stored="true"/>
<field name="text2" type="text" indexed="true" stored="true"/>
<field name="text3" type="text_offsets" indexed="true" stored="true" large="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema.xml b/solr/core/src/test-files/solr/collection1/conf/schema.xml
index d0e2f95..611a3d9 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema.xml
@@ -497,8 +497,8 @@
</fieldType>
<fieldType name="severityType" class="solr.EnumField" enumsConfig="enumsConfig.xml" enumName="severity"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
- <field name="_root_" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="_root_" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
<field name="uuid" type="uuid" stored="true"/>
@@ -807,6 +807,7 @@
<copyField source="*_t" dest="text"/>
<copyField source="id" dest="range_facet_l"/>
+ <copyField source="id" dest="id_i1"/>
<copyField source="range_facet_f" dest="range_facet_d"/>
<copyField source="range_facet_f1" dest="range_facet_f1_dv"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/collection1/conf/schema11.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema11.xml b/solr/core/src/test-files/solr/collection1/conf/schema11.xml
index 8b0b06c..5c124c7 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema11.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema11.xml
@@ -319,8 +319,10 @@ valued. -->
best performance.
-->
- <!-- for testing, a type that does a transform to see if it's correctly done everywhere -->
- <field name="id" type="float" indexed="true" stored="true" required="true" />
+ <field name="id" type="string" indexed="true" stored="true" required="true" />
+ <!-- int varient of id, adding this here simplifies some indexing to do numeric sorting -->
+ <field name="id_i" type="int" indexed="true" stored="true" multiValued="false" />
+ <copyField source="id" dest="id_i" />
<field name="text" type="text" indexed="true" stored="false" />
<!-- Test a point field for distances -->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml b/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml
index 981e522..73f59c8 100644
--- a/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml
+++ b/solr/core/src/test-files/solr/configsets/configset-2/conf/schema.xml
@@ -18,8 +18,8 @@
<schema name="minimal" version="1.1">
<fieldType name="string" class="solr.StrField"/>
<fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
- <field name="_root_" type="int" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
+ <field name="_root_" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
<dynamicField name="*" type="string" indexed="true" stored="true"/>
<uniqueKey>id</uniqueKey>
</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test-files/solr/crazy-path-to-schema.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/crazy-path-to-schema.xml b/solr/core/src/test-files/solr/crazy-path-to-schema.xml
index ef9ce3a..5b443ea 100644
--- a/solr/core/src/test-files/solr/crazy-path-to-schema.xml
+++ b/solr/core/src/test-files/solr/crazy-path-to-schema.xml
@@ -23,7 +23,7 @@
<schema name="test" version="1.0">
<types>
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0"/>
+ <fieldType name="string" class="solr.StrField" />
<fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
@@ -37,7 +37,7 @@
<fields>
- <field name="id" type="int" indexed="true" stored="true" multiValued="false"/>
+ <field name="id" type="string" indexed="true" stored="true" multiValued="false"/>
<field name="subject" type="text" indexed="true" stored="true"/>
</fields>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/625b1cba/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
index ab6d28d..50a1337 100644
--- a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
+++ b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java
@@ -108,7 +108,7 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
assertQ("query with ignored field",
req("bar_ignored:yo id:42")
,"//*[@numFound='1']"
- ,"//int[@name='id'][.='42']"
+ ,"//str[@name='id'][.='42']"
);
}
@@ -143,13 +143,13 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
assertQ("backslash escaping semicolon",
req("id:42 AND val_s:aa\\;bb")
,"//*[@numFound='1']"
- ,"//int[@name='id'][.='42']"
+ ,"//str[@name='id'][.='42']"
);
assertQ("quote escaping semicolon",
req("id:42 AND val_s:\"aa;bb\"")
,"//*[@numFound='1']"
- ,"//int[@name='id'][.='42']"
+ ,"//str[@name='id'][.='42']"
);
assertQ("no escaping semicolon",
@@ -268,15 +268,15 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
);
assertQ(req("{!lucene q.op=AND df=text}grape green")
,"//*[@numFound='1']"
- ,"//int[@name='id'][.='103']"
+ ,"//str[@name='id'][.='103']"
);
assertQ(req("-_val_:\"{!lucene q.op=AND df=text}grape green\"")
,"//*[@numFound='5']"
- ,"//int[@name='id'][.='101']"
- ,"//int[@name='id'][.='102']"
- ,"//int[@name='id'][.='104']"
- ,"//int[@name='id'][.='105']"
- ,"//int[@name='id'][.='106']"
+ ,"//str[@name='id'][.='101']"
+ ,"//str[@name='id'][.='102']"
+ ,"//str[@name='id'][.='104']"
+ ,"//str[@name='id'][.='105']"
+ ,"//str[@name='id'][.='106']"
);
// tests
@@ -291,26 +291,26 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
assertU(commit());
assertQ(req("*:*")
,"//*[@numFound='4']"
- ,"//int[@name='id'][.='101']"
- ,"//int[@name='id'][.='102']"
- ,"//int[@name='id'][.='103']"
- ,"//int[@name='id'][.='106']"
+ ,"//str[@name='id'][.='101']"
+ ,"//str[@name='id'][.='102']"
+ ,"//str[@name='id'][.='103']"
+ ,"//str[@name='id'][.='106']"
);
assertU(delQ("{!term f=id}106"));
assertU(commit());
assertQ(req("*:*")
,"//*[@numFound='3']"
- ,"//int[@name='id'][.='101']"
- ,"//int[@name='id'][.='102']"
- ,"//int[@name='id'][.='103']"
+ ,"//str[@name='id'][.='101']"
+ ,"//str[@name='id'][.='102']"
+ ,"//str[@name='id'][.='103']"
);
assertU(delQ("-_val_:\"{!lucene q.op=AND df=text}grape green\""));
assertU(commit());
assertQ(req("*:*")
,"//*[@numFound='1']"
- ,"//int[@name='id'][.='103']"
+ ,"//str[@name='id'][.='103']"
);
assertU(delQ("-text:doesnotexist"));
@@ -902,7 +902,7 @@ public class BasicFunctionalityTest extends SolrTestCaseJ4 {
assertQ("check math on field query: " + q,
req("q", q),
"*[count(//doc)=1]",
- "//int[@name='id'][.='1']");
+ "//str[@name='id'][.='1']");
}
// range queries using date math