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/03 04:35:15 UTC
[3/3] lucene-solr:jira/SOLR-10807: SOLR-10807: first start at brute
forcing PointFields to replace Tries in all test schemas to see what features
break
SOLR-10807: first start at brute forcing PointFields to replace Tries in all test schemas to see what features break
lots of missleading failures due to test schemas using numeric uniqueKey fields
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c76a79b5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c76a79b5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c76a79b5
Branch: refs/heads/jira/SOLR-10807
Commit: c76a79b5bb47e9b2903b90b84958c6bdeb043d52
Parents: 038baae
Author: Chris Hostetter <ho...@apache.org>
Authored: Fri Jun 2 21:34:50 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Fri Jun 2 21:34:50 2017 -0700
----------------------------------------------------------------------
.../collection1/conf/schema-icucollate-dv.xml | 2 +-
.../solr/collection1/conf/schema-icucollate.xml | 2 +-
.../conf/schema-icucollateoptions.xml | 2 +-
.../solr/collection1/conf/schema-analytics.xml | 10 ++--
.../clustering/solr/collection1/conf/schema.xml | 18 +++---
.../conf/dataimport-schema-no-unique-key.xml | 18 +++---
.../solr/collection1/conf/dataimport-schema.xml | 10 ++--
.../conf/dataimport-solr_id-schema.xml | 18 +++---
.../extraction/solr/collection1/conf/schema.xml | 18 +++---
.../test-files/solr/collection1/conf/schema.xml | 10 ++--
.../uima/solr/collection1/conf/schema.xml | 20 +++----
.../test-files/uima/uima-tokenizers-schema.xml | 20 +++----
.../solr/handler/component/StatsComponent.java | 6 +-
.../org/apache/solr/request/SimpleFacets.java | 6 +-
.../apache/solr/schema/ExternalFileField.java | 18 +++---
.../org/apache/solr/schema/IndexSchema.java | 14 +++++
.../java/org/apache/solr/schema/PointField.java | 30 ++++++++++
.../solr/analysisconfs/analysis-err-schema.xml | 4 +-
.../conf/bad-schema-dup-fieldType.xml | 4 +-
.../conf/bad-schema-external-filefield.xml | 2 +-
.../conf/schema-HighlighterMaxOffsetTest.xml | 2 +-
...chema-add-schema-fields-update-processor.xml | 12 ++--
.../solr/collection1/conf/schema-behavior.xml | 6 +-
.../collection1/conf/schema-binaryfield.xml | 18 +++---
.../conf/schema-blockjoinfacetcomponent.xml | 6 +-
.../solr/collection1/conf/schema-bm25.xml | 2 +-
.../collection1/conf/schema-charfilters.xml | 2 +-
.../solr/collection1/conf/schema-collate-dv.xml | 2 +-
.../solr/collection1/conf/schema-collate.xml | 2 +-
.../collection1/conf/schema-copyfield-test.xml | 18 +++---
.../collection1/conf/schema-custom-field.xml | 4 +-
.../collection1/conf/schema-customfield.xml | 16 +++---
.../solr/collection1/conf/schema-dfi.xml | 2 +-
.../solr/collection1/conf/schema-dfr.xml | 2 +-
.../conf/schema-distrib-interval-faceting.xml | 10 ++--
.../conf/schema-distributed-missing-sort.xml | 28 ++++-----
.../solr/collection1/conf/schema-docValues.xml | 10 ++--
.../conf/schema-docValuesFaceting.xml | 10 ++--
.../collection1/conf/schema-docValuesJoin.xml | 10 ++--
.../conf/schema-docValuesMissing.xml | 10 ++--
.../collection1/conf/schema-docValuesMulti.xml | 10 ++--
.../solr/collection1/conf/schema-enums.xml | 2 +-
.../conf/schema-field-sort-values.xml | 4 +-
.../solr/collection1/conf/schema-folding.xml | 10 ++--
.../solr/collection1/conf/schema-graph.xml | 2 +-
.../solr/collection1/conf/schema-hash.xml | 20 +++----
.../solr/collection1/conf/schema-ib.xml | 2 +-
.../conf/schema-id-and-version-fields-only.xml | 2 +-
.../collection1/conf/schema-inplace-updates.xml | 6 +-
.../collection1/conf/schema-lmdirichlet.xml | 2 +-
.../collection1/conf/schema-lmjelinekmercer.xml | 2 +-
.../conf/schema-luceneMatchVersion.xml | 2 +-
.../conf/schema-minimal-atomic-stress.xml | 2 +-
.../conf/schema-multiword-synonyms.xml | 2 +-
.../conf/schema-non-stored-docvalues.xml | 22 +++----
.../conf/schema-not-required-unique-key.xml | 2 +-
.../solr/collection1/conf/schema-numeric.xml | 30 +++++-----
.../collection1/conf/schema-phrasesuggest.xml | 2 +-
.../solr/collection1/conf/schema-point.xml | 10 ++--
.../conf/schema-postingshighlight.xml | 2 +-
.../collection1/conf/schema-preanalyzed.xml | 2 +-
.../collection1/conf/schema-psuedo-fields.xml | 4 +-
.../collection1/conf/schema-replication1.xml | 2 +-
.../collection1/conf/schema-replication2.xml | 2 +-
.../collection1/conf/schema-required-fields.xml | 18 +++---
.../solr/collection1/conf/schema-rest.xml | 20 +++----
.../solr/collection1/conf/schema-reversed.xml | 4 +-
.../conf/schema-sim-default-override.xml | 2 +-
.../solr/collection1/conf/schema-sim.xml | 2 +-
.../collection1/conf/schema-simpleqpplugin.xml | 2 +-
.../collection1/conf/schema-sortingresponse.xml | 10 ++--
.../solr/collection1/conf/schema-sorts.xml | 60 ++++++++++----------
.../solr/collection1/conf/schema-spatial.xml | 10 ++--
.../solr/collection1/conf/schema-sql.xml | 20 +++----
.../solr/collection1/conf/schema-sweetspot.xml | 2 +-
.../conf/schema-synonym-tokenizer.xml | 4 +-
.../solr/collection1/conf/schema-tfidf.xml | 2 +-
.../collection1/conf/schema-tokenizer-test.xml | 8 +--
.../solr/collection1/conf/schema-trie.xml | 22 +++----
.../conf/schema-unifiedhighlight.xml | 2 +-
.../solr/collection1/conf/schema-version-dv.xml | 2 +-
.../collection1/conf/schema-version-indexed.xml | 2 +-
.../test-files/solr/collection1/conf/schema.xml | 22 +++----
.../solr/collection1/conf/schema11.xml | 32 +++++------
.../solr/collection1/conf/schema12.xml | 20 +++----
.../solr/collection1/conf/schema15.xml | 22 +++----
.../solr/collection1/conf/schema_latest.xml | 20 +++----
.../solr/collection1/conf/schemasurround.xml | 20 +++----
.../cdcr-source-disabled/conf/schema.xml | 2 +-
.../solr/configsets/cdcr-source/conf/schema.xml | 2 +-
.../solr/configsets/cdcr-target/conf/schema.xml | 2 +-
.../configsets/cloud-dynamic/conf/schema.xml | 20 +++----
.../solr/configsets/cloud-hdfs/conf/schema.xml | 4 +-
.../conf/managed-schema | 4 +-
.../cloud-managed-upgrade/conf/schema.xml | 4 +-
.../cloud-managed/conf/managed-schema | 4 +-
.../conf/schema.xml | 4 +-
.../cloud-minimal-jmx/conf/schema.xml | 4 +-
.../configsets/cloud-minimal/conf/schema.xml | 4 +-
.../configsets/cloud-subdirs/conf/schema.xml | 4 +-
.../solr/configsets/configset-2/conf/schema.xml | 2 +-
.../solr/configsets/doc-expiry/conf/schema.xml | 20 +++----
.../exitable-directory/conf/schema.xml | 4 +-
.../test-files/solr/crazy-path-to-schema.xml | 2 +-
.../solr/cloud/DocValuesNotIndexedTest.java | 6 +-
.../TestStressCloudBlindAtomicUpdates.java | 2 +-
.../solr/cloud/TestStressInPlaceUpdates.java | 12 ----
.../solr/rest/schema/TestFieldTypeResource.java | 4 +-
.../solr/schema/ChangedSchemaMergeTest.java | 4 +-
.../org/apache/solr/schema/IndexSchemaTest.java | 2 +-
.../TestCloudManagedSchemaConcurrent.java | 4 +-
.../solr/update/TestInPlaceUpdatesDistrib.java | 12 ----
.../update/TestInPlaceUpdatesStandalone.java | 12 ----
.../org/apache/solr/update/UpdateLogTest.java | 9 ---
.../collection1/conf/schema-replication1.xml | 2 +-
.../solrj/solr/collection1/conf/schema-sql.xml | 20 +++----
.../solrj/solr/collection1/conf/schema.xml | 20 +++----
.../solrj/solr/configsets/ml/conf/schema.xml | 20 +++----
.../solr/configsets/shared/conf/schema.xml | 2 +-
.../solr/configsets/streaming/conf/schema.xml | 20 +++----
.../solrj/solr/crazy-path-to-schema.xml | 2 +-
.../solrj/solr/multicore/core0/conf/schema.xml | 2 +-
.../solrj/solr/multicore/core1/conf/schema.xml | 2 +-
.../solr/client/solrj/request/SchemaTest.java | 8 +--
.../java/org/apache/solr/SolrTestCaseJ4.java | 56 +++++++++++++++++-
125 files changed, 621 insertions(+), 564 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/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..bd3cbe1 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="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
<fieldType name="text" class="solr.TextField">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/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..d746060 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="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
<fieldType name="text" class="solr.TextField">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/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..09bd11d 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="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
<fieldType name="text" class="solr.TextField">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml b/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml
index 2d90359..86f280c 100644
--- a/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml
+++ b/solr/contrib/analytics/src/test-files/solr/collection1/conf/schema-analytics.xml
@@ -39,14 +39,14 @@
These are provided more for backward compatability, allowing one
to create a schema that matches an existing lucene index.
-->
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
-->
- <fieldType name="date" class="solr.TrieDateField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="date" class="${solr.tests.DateClassName:solr.DatePointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="boolean" class="solr.BoolField"/>
<fieldType name="string" class="solr.StrField"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml b/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
index 66a6223..4b3b866 100644
--- a/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
+++ b/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
@@ -72,10 +72,10 @@
<!--
Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
-->
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="0" positionIncrementGap="0"/>
<!--
Numeric field types that index each value at various levels of precision
@@ -87,10 +87,10 @@
indexed per value, slightly larger index size, and faster range queries.
A precisionStep of 0 disables indexing at different precision levels.
-->
- <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tint" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tfloat" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tlong" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tdouble" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="8" positionIncrementGap="0"/>
<!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
@@ -113,7 +113,7 @@
Consult the TrieDateField javadocs for more information.
-->
- <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true" omitNorms="true"/>
+ <fieldType name="date" class="${solr.tests.DateClassName:solr.DatePointField}" sortMissingLast="true" omitNorms="true"/>
<!-- The "RandomSortField" is not used to store or search any
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml b/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml
index ad01778..7cb975e 100644
--- a/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml
+++ b/solr/contrib/dataimporthandler-extras/src/test-files/dihextras/solr/collection1/conf/dataimport-schema-no-unique-key.xml
@@ -73,10 +73,10 @@
<!--
Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
-->
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="0" positionIncrementGap="0"/>
<fieldType name="latLon" class="solr.LatLonType" subFieldType="double"/>
@@ -90,10 +90,10 @@
indexed per value, slightly larger index size, and faster range queries.
A precisionStep of 0 disables indexing at different precision levels.
-->
- <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tint" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tfloat" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tlong" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tdouble" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="8" positionIncrementGap="0"/>
<!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
@@ -116,7 +116,7 @@
Consult the TrieDateField javadocs for more information.
-->
- <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true" omitNorms="true"/>
+ <fieldType name="date" class="${solr.tests.DateClassName:solr.DatePointField}" sortMissingLast="true" omitNorms="true"/>
<!-- The "RandomSortField" is not used to store or search any
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml
index 7f34e00..b0766d4 100644
--- a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml
+++ b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-schema.xml
@@ -2,11 +2,11 @@
<fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" omitNorms="true"/>
- <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true" omitNorms="true"/>
+ <fieldType name="tint" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tfloat" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tlong" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tdouble" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="date" class="${solr.tests.DateClassName:solr.DatePointField}" sortMissingLast="true" omitNorms="true"/>
<fieldType name="text" class="solr.TextField" positionIncrementGap="100">
<analyzer type="index">
<tokenizer class="solr.MockTokenizerFactory"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml
index fabe7e2..72c3912 100644
--- a/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml
+++ b/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml
@@ -73,10 +73,10 @@
<!--
Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
-->
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="0" positionIncrementGap="0"/>
<!--
Numeric field types that index each value at various levels of precision
@@ -88,10 +88,10 @@
indexed per value, slightly larger index size, and faster range queries.
A precisionStep of 0 disables indexing at different precision levels.
-->
- <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tint" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tfloat" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tlong" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tdouble" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="8" positionIncrementGap="0"/>
<!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
@@ -114,7 +114,7 @@
Consult the TrieDateField javadocs for more information.
-->
- <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true" omitNorms="true"/>
+ <fieldType name="date" class="${solr.tests.DateClassName:solr.DatePointField}" sortMissingLast="true" omitNorms="true"/>
<!-- The "RandomSortField" is not used to store or search any
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml b/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml
index 2865653..06a19c5 100644
--- a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml
+++ b/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml
@@ -31,10 +31,10 @@
<!--
Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
-->
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="0" positionIncrementGap="0"/>
<!--
Numeric field types that index each value at various levels of precision
@@ -46,10 +46,10 @@
indexed per value, slightly larger index size, and faster range queries.
A precisionStep of 0 disables indexing at different precision levels.
-->
- <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tint" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tfloat" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tlong" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tdouble" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="8" positionIncrementGap="0"/>
<!-- Field type demonstrating an Analyzer failure -->
<fieldType name="failtype1" class="solr.TextField">
@@ -105,7 +105,7 @@
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
-->
- <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true" omitNorms="true"/>
+ <fieldType name="date" class="${solr.tests.DateClassName:solr.DatePointField}" sortMissingLast="true" omitNorms="true"/>
<!-- solr.TextField allows the specification of custom
text analyzers specified as a tokenizer and a list
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/contrib/ltr/src/test-files/solr/collection1/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test-files/solr/collection1/conf/schema.xml b/solr/contrib/ltr/src/test-files/solr/collection1/conf/schema.xml
index f27f092..e3bb4e8 100644
--- a/solr/contrib/ltr/src/test-files/solr/collection1/conf/schema.xml
+++ b/solr/contrib/ltr/src/test-files/solr/collection1/conf/schema.xml
@@ -41,11 +41,11 @@
<types>
<fieldType name="string" class="solr.StrField" sortMissingLast="true" />
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="date" class="solr.TrieDateField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="date" class="${solr.tests.DateClassName:solr.DatePointField}" precisionStep="0" positionIncrementGap="0"/>
<fieldtype name="binary" class="solr.BinaryField"/>
<fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml b/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml
index 35d3131..8a3ea81 100644
--- a/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml
+++ b/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml
@@ -94,13 +94,13 @@
Default numeric field types. For faster range queries, consider
the tint/tfloat/tlong/tdouble types.
-->
- <fieldType name="int" class="solr.TrieIntField"
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}"
precisionStep="0" omitNorms="true" positionIncrementGap="0" />
- <fieldType name="float" class="solr.TrieFloatField"
+ <fieldType name="float" class="${solr.tests.FloatClassName:solr.FloatPointField}"
precisionStep="0" omitNorms="true" positionIncrementGap="0" />
- <fieldType name="long" class="solr.TrieLongField"
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}"
precisionStep="0" omitNorms="true" positionIncrementGap="0" />
- <fieldType name="double" class="solr.TrieDoubleField"
+ <fieldType name="double" class="${solr.tests.DoubleClassName:solr.DoublePointField}"
precisionStep="0" omitNorms="true" positionIncrementGap="0" />
<!--
@@ -113,13 +113,13 @@
queries. A precisionStep of 0 disables indexing at different
precision levels.
-->
- <fieldType name="tint" class="solr.TrieIntField"
+ <fieldType name="tint" class="${solr.tests.IntClassName:solr.IntPointField}"
precisionStep="8" omitNorms="true" positionIncrementGap="0" />
- <fieldType name="tfloat" class="solr.TrieFloatField"
+ <fieldType name="tfloat" class="${solr.tests.FloatClassName:solr.FloatPointField}"
precisionStep="8" omitNorms="true" positionIncrementGap="0" />
- <fieldType name="tlong" class="solr.TrieLongField"
+ <fieldType name="tlong" class="${solr.tests.LongClassName:solr.LongPointField}"
precisionStep="8" omitNorms="true" positionIncrementGap="0" />
- <fieldType name="tdouble" class="solr.TrieDoubleField"
+ <fieldType name="tdouble" class="${solr.tests.DoubleClassName:solr.DoublePointField}"
precisionStep="8" omitNorms="true" positionIncrementGap="0" />
<!--
@@ -137,14 +137,14 @@
the TrieDateField javadocs for more information. Note: For faster
range queries, consider the tdate type
-->
- <fieldType name="date" class="solr.TrieDateField"
+ <fieldType name="date" class="${solr.tests.DateClassName:solr.DatePointField}"
omitNorms="true" precisionStep="0" positionIncrementGap="0" />
<!--
A Trie based date field for faster date range queries and date
faceting.
-->
- <fieldType name="tdate" class="solr.TrieDateField"
+ <fieldType name="tdate" class="${solr.tests.DateClassName:solr.DatePointField}"
omitNorms="true" precisionStep="6" positionIncrementGap="0" />
<!--
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml b/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml
index bf4c72d..e28ace2 100644
--- a/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml
+++ b/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml
@@ -94,13 +94,13 @@
Default numeric field types. For faster range queries, consider
the tint/tfloat/tlong/tdouble types.
-->
- <fieldType name="int" class="solr.TrieIntField"
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}"
precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField"
+ <fieldType name="float" class="${solr.tests.FloatClassName:solr.FloatPointField}"
precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField"
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}"
precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField"
+ <fieldType name="double" class="${solr.tests.DoubleClassName:solr.DoublePointField}"
precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!--
@@ -113,13 +113,13 @@
queries. A precisionStep of 0 disables indexing at different
precision levels.
-->
- <fieldType name="tint" class="solr.TrieIntField"
+ <fieldType name="tint" class="${solr.tests.IntClassName:solr.IntPointField}"
precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="tfloat" class="solr.TrieFloatField"
+ <fieldType name="tfloat" class="${solr.tests.FloatClassName:solr.FloatPointField}"
precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="tlong" class="solr.TrieLongField"
+ <fieldType name="tlong" class="${solr.tests.LongClassName:solr.LongPointField}"
precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="tdouble" class="solr.TrieDoubleField"
+ <fieldType name="tdouble" class="${solr.tests.DoubleClassName:solr.DoublePointField}"
precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
<!--
@@ -137,14 +137,14 @@
the TrieDateField javadocs for more information. Note: For faster
range queries, consider the tdate type
-->
- <fieldType name="date" class="solr.TrieDateField"
+ <fieldType name="date" class="${solr.tests.DateClassName:solr.DatePointField}"
omitNorms="true" precisionStep="0" positionIncrementGap="0"/>
<!--
A Trie based date field for faster date range queries and date
faceting.
-->
- <fieldType name="tdate" class="solr.TrieDateField"
+ <fieldType name="tdate" class="${solr.tests.DateClassName:solr.DatePointField}"
omitNorms="true" precisionStep="6" positionIncrementGap="0"/>
<!--
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java b/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java
index 8ecd51c..b5714b3 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java
@@ -46,9 +46,11 @@ public class StatsComponent extends SearchComponent {
rb.doStats = true;
rb._statsInfo = new StatsInfo(rb);
for (StatsField statsField : rb._statsInfo.getStatsFields()) {
- if (statsField.getSchemaField() != null && statsField.getSchemaField().getType().isPointField() && !statsField.getSchemaField().hasDocValues()) {
+ // nocommit: not sure if we should be encouraging this (uninversion of single valued points)...
+ // nocommit: if this change is in fact made, it should be in it's own jira
+ if (statsField.getSchemaField() != null && statsField.getSchemaField().getType().isPointField() && statsField.getSchemaField().multiValued() && !statsField.getSchemaField().hasDocValues()) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
- "Can't calculate stats on a PointField without docValues");
+ "Can't calculate stats on a multivalued PointField without docValues");
}
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
index 406a4ed..2d7a118 100644
--- a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
+++ b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
@@ -437,9 +437,11 @@ public class SimpleFacets {
NamedList<Integer> counts;
SchemaField sf = searcher.getSchema().getField(field);
- if (sf.getType().isPointField() && !sf.hasDocValues()) {
+ // nocommit: not sure if we should be encouraging this (uninversion of single valued points)...
+ // nocommit: if this change is in fact made, it should be in it's own jira
+ if (sf.getType().isPointField() && sf.multiValued() && !sf.hasDocValues()) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST,
- "Can't facet on a PointField without docValues");
+ "Can't facet on a multivalued PointField without docValues");
}
FieldType ft = sf.getType();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java b/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java
index feba4e0..03ec299 100644
--- a/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java
+++ b/solr/core/src/java/org/apache/solr/schema/ExternalFileField.java
@@ -68,13 +68,17 @@ public class ExternalFileField extends FieldType implements SchemaAware {
// valType has never been used for anything except to throw an error, so make it optional since the
// code (see getValueSource) gives you a FileFloatSource.
String ftypeS = args.remove("valType");
- if (ftypeS != null) {
- ftype = schema.getFieldTypes().get(ftypeS);
- if (ftype != null && !(ftype instanceof TrieFloatField)) {
- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
- "Only float (TrieFloatField) is currently supported as external field type. Got " + ftypeS);
- }
- }
+
+ // // nocommit: dead code. removing this should be in it's own jira
+ //
+ // if (ftypeS != null) {
+ // ftype = schema.getFieldTypes().get(ftypeS);
+ // if (ftype != null && !(ftype instanceof TrieFloatField)) {
+ // throw new SolrException(SolrException.ErrorCode.SERVER_ERROR,
+ // "Only float (TrieFloatField) is currently supported as external field type. Got " + ftypeS);
+ // }
+ // }
+
keyFieldName = args.remove("keyField");
String defValS = args.remove("defVal");
defVal = defValS == null ? 0 : Float.parseFloat(defValS);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
index 04f64d5..94f6368 100644
--- a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
+++ b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
@@ -534,8 +534,22 @@ public class IndexSchema {
log.error(msg);
throw new SolrException(ErrorCode.SERVER_ERROR, msg);
}
+
uniqueKeyFieldName=uniqueKeyField.getName();
uniqueKeyFieldType=uniqueKeyField.getType();
+
+ // nocommit: really basic stuff like deleteById don't work on points (but do work on trie numerics)
+ // nocommit: ...because point fields don't have any "Term" to use for the id.
+ // nocommit: other things like QEC also fail (on init!) if the uniqueKeyField is points based
+ // nocommit: unless we fix usages of uniqueKeyField to support points, this should be a new jira
+ if (uniqueKeyFieldType.isPointField()) {
+ // nocommit: better error?
+ String msg = "nocommit: " + UNIQUE_KEY + " field ("+uniqueKeyFieldName+
+ ") can not use a Point based field type => " + uniqueKeyFieldType.getClass();
+ log.error(msg);
+ throw new SolrException(ErrorCode.SERVER_ERROR, msg);
+ }
+
// Unless the uniqueKeyField is marked 'required=false' then make sure it exists
if( Boolean.FALSE != explicitRequiredProp.get( uniqueKeyFieldName ) ) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/core/src/java/org/apache/solr/schema/PointField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/PointField.java b/solr/core/src/java/org/apache/solr/schema/PointField.java
index cad3c7e..f883fb7 100644
--- a/solr/core/src/java/org/apache/solr/schema/PointField.java
+++ b/solr/core/src/java/org/apache/solr/schema/PointField.java
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.SortedNumericDocValuesField;
@@ -57,6 +58,35 @@ public abstract class PointField extends NumericFieldType {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ /**
+ * HACK: The Test framework can set this global variable to instruct PointField that
+ * (on init) it should be tollerant of the <code>precisionStep</code> argument used by TrieFields.
+ * This allows for simple randomization of TrieFields and PointFields w/o extensive duplication
+ * of <code><fieldType/></code> declarations.
+ *
+ * <p>
+ * nocommit: Do not let this land on master w/o explicit consensus from at least one other person that it's not completely insane.
+ * </p>
+ *
+ * @lucene.internal
+ * @lucene.experimental
+ */
+ public static boolean TEST_HACK_IGNORE_USELESS_TRIEFIELD_ARGS = false;
+
+
+ /**
+ * nocommit: method should be removed completely if
+ * {@link TEST_HACK_IGNORE_USELESS_TRIEFIELD_ARGS} is removed
+ */
+ @Override
+ protected void init(IndexSchema schema, Map<String, String> args) {
+ super.init(schema, args);
+ if (TEST_HACK_IGNORE_USELESS_TRIEFIELD_ARGS) {
+ args.remove("precisionStep");
+ args.remove("type");
+ }
+ }
+
@Override
public boolean isPointField() {
return true;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/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..e3f2317 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
@@ -21,8 +21,8 @@
-->
<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="long" class="${solr.tests.LongClassName:solr.LongPointField}" stored="true" indexed="true"/>
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0"/>
<fieldType name="text" class="solr.TextField">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml
index cd60df5..bcb7e45 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-dup-fieldType.xml
@@ -22,8 +22,8 @@
<fieldType name="string" class="solr.StrField"/>
<!-- BEGIN BAD STUFF -->
- <fieldType name="ftAgain" class="solr.TrieIntField"/>
- <fieldType name="ftAgain" class="solr.TrieIntField"/>
+ <fieldType name="ftAgain" class="${solr.tests.IntClassName:solr.IntPointField}"/>
+ <fieldType name="ftAgain" class="${solr.tests.IntClassName:solr.IntPointField}"/>
<!-- END BAD STUFF -->
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="false"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/core/src/test-files/solr/collection1/conf/bad-schema-external-filefield.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/bad-schema-external-filefield.xml b/solr/core/src/test-files/solr/collection1/conf/bad-schema-external-filefield.xml
index 75d6a30..211e943 100644
--- a/solr/core/src/test-files/solr/collection1/conf/bad-schema-external-filefield.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/bad-schema-external-filefield.xml
@@ -16,7 +16,7 @@
-->
<schema name="bad-schema-external-filefield" version="1.0">
- <fieldType name="tint" class="solr.TrieIntField" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="tint" class="${solr.tests.IntClassName:solr.IntPointField}" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="eff_none" keyField="id" defVal="0"
stored="false" indexed="true"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml b/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
index c447222..adb6e73 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-HighlighterMaxOffsetTest.xml
@@ -40,7 +40,7 @@ Test for HighlighterMaxOffsetTest which requires the use of ReversedWildcardFilt
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" positionIncrementGap="0"/>
<!-- Just like text_general except it reverses the characters of
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml b/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml
index 7f24944..c7fad6e 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-add-schema-fields-update-processor.xml
@@ -18,14 +18,14 @@
<schema name="add-schema-fields-update-processor" version="1.6">
- <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" multiValued="true" positionIncrementGap="0"/>
- <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" multiValued="true" positionIncrementGap="0"/>
- <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" multiValued="true" positionIncrementGap="0"/>
- <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" multiValued="true" positionIncrementGap="0"/>
- <fieldType name="tdate" class="solr.TrieDateField" precisionStep="6" multiValued="true" positionIncrementGap="0"/>
+ <fieldType name="tint" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="8" multiValued="true" positionIncrementGap="0"/>
+ <fieldType name="tfloat" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="8" multiValued="true" positionIncrementGap="0"/>
+ <fieldType name="tlong" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="8" multiValued="true" positionIncrementGap="0"/>
+ <fieldType name="tdouble" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="8" multiValued="true" positionIncrementGap="0"/>
+ <fieldType name="tdate" class="${solr.tests.DateClassName:solr.DatePointField}" precisionStep="6" multiValued="true" positionIncrementGap="0"/>
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" multiValued="true"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" positionIncrementGap="0"/>
<fieldType name="text" class="solr.TextField" multiValued="true" positionIncrementGap="100">
<analyzer>
<tokenizer class="solr.StandardTokenizerFactory"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/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..3899f8c 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.IntClassName:solr.IntPointField}"/>
<!-- 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.IntClassName:solr.IntPointField}" useDocValuesAsStored="true"/>
+ <fieldType name="int_dvas_f" class="${solr.tests.IntClassName:solr.IntPointField}" useDocValuesAsStored="false"/>
<!-- all behavior is default -->
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/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..806c525 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
@@ -36,10 +36,10 @@
<!--
Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
-->
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="0" positionIncrementGap="0"/>
<!--
Numeric field types that index each value at various levels of precision
@@ -51,10 +51,10 @@
indexed per value, slightly larger index size, and faster range queries.
A precisionStep of 0 disables indexing at different precision levels.
-->
- <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tint" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tfloat" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tlong" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tdouble" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="8" positionIncrementGap="0"/>
<fieldType name="binary" class="solr.BinaryField"/>
@@ -64,7 +64,7 @@
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
-->
- <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true"/>
+ <fieldType name="date" class="${solr.tests.DateClassName:solr.DatePointField}" sortMissingLast="true"/>
<field name="id" type="int" indexed="true" stored="true" multiValued="false" required="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/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..f06ac6a 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
@@ -17,9 +17,9 @@
-->
<schema name="test" version="1.0">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" 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"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/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..8ccc390 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="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
<fieldType name="text" class="solr.TextField">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/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..425adae 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="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="4" omitNorms="true" positionIncrementGap="0"/>
<!-- charfilter only at query-time -->
<fieldType name="text" class="solr.TextField">
<analyzer type="index">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/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..f8fcbb3 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="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
<fieldType name="text" class="solr.TextField">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/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..ed54b2b 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="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- basic text field -->
<fieldType name="text" class="solr.TextField">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/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..974d120 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
@@ -36,10 +36,10 @@
<!--
Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
-->
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="0" positionIncrementGap="0"/>
<!--
Numeric field types that index each value at various levels of precision
@@ -51,10 +51,10 @@
indexed per value, slightly larger index size, and faster range queries.
A precisionStep of 0 disables indexing at different precision levels.
-->
- <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tint" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tfloat" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tlong" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tdouble" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="8" positionIncrementGap="0"/>
<!-- Field type demonstrating an Analyzer failure -->
<fieldType name="failtype1" class="solr.TextField">
@@ -94,7 +94,7 @@
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
-->
- <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true"/>
+ <fieldType name="date" class="${solr.tests.DateClassName:solr.DatePointField}" sortMissingLast="true"/>
<!-- solr.TextField allows the specification of custom
text analyzers specified as a tokenizer and a list
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/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..23197aa 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
@@ -17,8 +17,8 @@
-->
<schema name="test-custom-field-sort" version="1.6">
- <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.IntClassName:solr.IntPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<fieldType name="text" class="solr.TextField">
<analyzer>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/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..f7e2c22 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
@@ -36,10 +36,10 @@
<!--
Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
-->
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="0" positionIncrementGap="0"/>
<!--
Numeric field types that index each value at various levels of precision
@@ -51,10 +51,10 @@
indexed per value, slightly larger index size, and faster range queries.
A precisionStep of 0 disables indexing at different precision levels.
-->
- <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
- <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tint" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tfloat" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tlong" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="8" positionIncrementGap="0"/>
+ <fieldType name="tdouble" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="8" positionIncrementGap="0"/>
<fieldType name="customfield" class="org.apache.solr.schema.MyCrazyCustomField" multiValued="true"
positionIncrementGap="100">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/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..3776963 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="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
<fieldType name="text" class="solr.TextField">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/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..e84e4ed 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="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- default parameters -->
<fieldType name="text" class="solr.TextField">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml b/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml
index 37da642..73d22da 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-distrib-interval-faceting.xml
@@ -17,11 +17,11 @@
-->
<schema name="test" version="1.6">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="date" class="solr.TrieDateField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="date" class="${solr.tests.DateClassName:solr.DatePointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/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..1bcaf49 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
@@ -17,29 +17,29 @@
-->
<schema name="test-distributed-missing-sort" version="1.6">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="tint" class="solr.TrieIntField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="tint" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="tlong" class="solr.TrieLongField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="tlong" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="tfloat" class="solr.TrieFloatField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="tfloat" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="tdouble" class="solr.TrieDoubleField" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="tdouble" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="8" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="date" class="solr.TrieDateField" precisionStep="0"/>
- <fieldType name="tdate" class="solr.TrieDateField" precisionStep="6"/>
+ <fieldType name="date" class="${solr.tests.DateClassName:solr.DatePointField}" precisionStep="0"/>
+ <fieldType name="tdate" class="${solr.tests.DateClassName:solr.DatePointField}" precisionStep="6"/>
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
- <fieldType name="int_ml" class="solr.TrieIntField" precisionStep="0" sortMissingLast="true"/>
- <fieldType name="int_mf" class="solr.TrieIntField" precisionStep="0" sortMissingFirst="true"/>
+ <fieldType name="int_ml" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" sortMissingLast="true"/>
+ <fieldType name="int_mf" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" sortMissingFirst="true"/>
- <fieldType name="long_ml" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"
+ <fieldType name="long_ml" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"
sortMissingLast="true"/>
- <fieldType name="long_mf" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"
+ <fieldType name="long_mf" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"
sortMissingFirst="true"/>
<fieldType name="string_ml" class="solr.StrField" sortMissingLast="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/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..d6525a2 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
@@ -38,14 +38,14 @@
These are provided more for backward compatability, allowing one
to create a schema that matches an existing lucene index.
-->
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
seconds part (.999) is optional.
-->
- <fieldType name="date" class="solr.TrieDateField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="date" class="${solr.tests.DateClassName:solr.DatePointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="boolean" class="solr.BoolField"/>
<fieldType name="string" class="solr.StrField"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml
index 571d915..6fea1f5 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesFaceting.xml
@@ -17,11 +17,11 @@
-->
<schema name="test" version="1.6">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="date" class="solr.TrieDateField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="date" class="${solr.tests.DateClassName:solr.DatePointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<fieldType name="pint" class="solr.IntPointField"/>
<fieldType name="plong" class="solr.LongPointField"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml
index d2188fc..fb9c179 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml
@@ -29,11 +29,11 @@
1.5: omitNorms defaults to true for primitive field types (int, float, boolean, string...)
1.6: useDocValuesAsStored defaults to true.
-->
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="date" class="solr.TrieDateField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="date" class="${solr.tests.DateClassName:solr.DatePointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldtype name="string" class="solr.StrField" sortMissingLast="true" useDocValuesAsStored="false"/>
<fieldType name="text" class="solr.TextField" positionIncrementGap="100" autoGeneratePhraseQueries="true">
<analyzer type="index">
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c76a79b5/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml
index ac319e2..93488df 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-docValuesMissing.xml
@@ -19,11 +19,11 @@
<!-- schema file for testing sorting/faceting/functions on single-valued DV with missing values -->
<schema name="schema-docValuesMissing" version="1.6">
- <fieldType name="int" class="solr.TrieIntField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="float" class="solr.TrieFloatField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="long" class="solr.TrieLongField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="double" class="solr.TrieDoubleField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
- <fieldType name="date" class="solr.TrieDateField" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="int" class="${solr.tests.IntClassName:solr.IntPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="float" class="${solr.tests.FloatClassName:solr.FloatPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="long" class="${solr.tests.LongClassName:solr.LongPointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="double" class="${solr.tests.DoubleClassName:solr.DoublePointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
+ <fieldType name="date" class="${solr.tests.DateClassName:solr.DatePointField}" precisionStep="0" omitNorms="true" positionIncrementGap="0"/>
<fieldType name="string" class="solr.StrField"/>
<fieldType name="boolean" class="solr.BoolField"/>