You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2017/06/09 23:43:34 UTC
[1/2] lucene-solr:master: SOLR-10761: Switch trie numeric/date fields
to points in data-driven-enabled example and test schemas
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 74904dbd6 -> 9ea90f78e
refs/heads/master f434e34d5 -> 566fcfce1
SOLR-10761: Switch trie numeric/date fields to points in data-driven-enabled example and test schemas
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/566fcfce
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/566fcfce
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/566fcfce
Branch: refs/heads/master
Commit: 566fcfce1337d09553a85d17bb4f552b14768646
Parents: f434e34
Author: Steve Rowe <sa...@apache.org>
Authored: Fri Jun 9 19:43:01 2017 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 9 19:43:01 2017 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 3 ++
.../AddSchemaFieldsUpdateProcessorFactory.java | 12 +++----
...chema-add-schema-fields-update-processor.xml | 22 +++++++++++++
.../solr/collection1/conf/schema-rest.xml | 33 +++++++++++++++++++-
...dd-schema-fields-update-processor-chains.xml | 30 +++++++++---------
.../collection1/conf/solrconfig-schemaless.xml | 6 ++--
.../schema/TestFieldCollectionResource.java | 10 +++---
...dSchemaFieldsUpdateProcessorFactoryTest.java | 16 +++++-----
solr/example/files/conf/managed-schema | 20 ++++++++++++
solr/example/files/conf/solrconfig.xml | 6 ++--
.../basic_configs/conf/solrconfig.xml | 6 ++--
.../conf/solrconfig.xml | 6 ++--
solr/solr-ref-guide/src/schemaless-mode.adoc | 6 ++--
13 files changed, 126 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/566fcfce/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e5eb0c1..d99a075 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -389,6 +389,9 @@ Other Changes
* SOLR-10501: Test sortMissing{First,Last} with points fields. (Steve Rowe)
+* SOLR-10761: Switch trie numeric/date fields to points in data-driven-enabled example and test schemas.
+ (Steve Rowe)
+
================== 6.6.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/566fcfce/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
index 4758972..c4a122d 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
@@ -92,31 +92,31 @@ import static org.apache.solr.core.ConfigSetProperties.IMMUTABLE_CONFIGSET_ARG;
* <str name="defaultFieldType">text_general</str>
* <lst name="typeMapping">
* <str name="valueClass">Boolean</str>
- * <str name="fieldType">boolean</str>
+ * <str name="fieldType">booleans</str>
* </lst>
* <lst name="typeMapping">
* <str name="valueClass">Integer</str>
- * <str name="fieldType">tint</str>
+ * <str name="fieldType">pints</str>
* </lst>
* <lst name="typeMapping">
* <str name="valueClass">Float</str>
- * <str name="fieldType">tfloat</str>
+ * <str name="fieldType">pfloats</str>
* </lst>
* <lst name="typeMapping">
* <str name="valueClass">Date</str>
- * <str name="fieldType">tdate</str>
+ * <str name="fieldType">pdates</str>
* </lst>
* <lst name="typeMapping">
* <str name="valueClass">Long</str>
* <str name="valueClass">Integer</str>
- * <str name="fieldType">tlong</str>
+ * <str name="fieldType">plongs</str>
* </lst>
* <lst name="typeMapping">
* <arr name="valueClass">
* <str>Double</str>
* <str>Float</str>
* </arr>
- * <str name="fieldType">tdouble</str>
+ * <str name="fieldType">pdoubles</str>
* </lst>
* </processor></pre>
*/
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/566fcfce/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..aa8d860 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
@@ -33,6 +33,17 @@
</analyzer>
</fieldType>
+ <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
+ <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
+ <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
+ <fieldType name="pints" class="solr.IntPointField" docValues="true" multiValued="true"/>
+ <fieldType name="pfloats" class="solr.FloatPointField" docValues="true" multiValued="true"/>
+ <fieldType name="plongs" class="solr.LongPointField" docValues="true" multiValued="true"/>
+ <fieldType name="pdoubles" class="solr.DoublePointField" docValues="true" multiValued="true"/>
+ <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
+ <fieldType name="pdates" class="solr.DatePointField" docValues="true" multiValued="true"/>
+
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
<field name="_version_" type="long" indexed="true" stored="true"/>
<field name="_root_" type="string" indexed="true" stored="true" multiValued="false"/>
@@ -44,6 +55,17 @@
<dynamicField name="*_td" type="tdouble" indexed="true" stored="true"/>
<dynamicField name="*_tdt" type="tdate" indexed="true" stored="true"/>
+ <dynamicField name="*_pi" type="pint" indexed="true" stored="true"/>
+ <dynamicField name="*_pis" type="pints" indexed="true" stored="true"/>
+ <dynamicField name="*_pl" type="plong" indexed="true" stored="true"/>
+ <dynamicField name="*_pls" type="plongs" indexed="true" stored="true"/>
+ <dynamicField name="*_pf" type="pfloat" indexed="true" stored="true"/>
+ <dynamicField name="*_pfs" type="pfloats" indexed="true" stored="true"/>
+ <dynamicField name="*_pd" type="pdouble" indexed="true" stored="true"/>
+ <dynamicField name="*_pds" type="pdoubles" indexed="true" stored="true"/>
+ <dynamicField name="*_pdt" type="pdate" indexed="true" stored="true"/>
+ <dynamicField name="*_pdts" type="pdates" indexed="true" stored="true"/>
+
<uniqueKey>id</uniqueKey>
</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/566fcfce/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml b/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
index 58b05eb..89c2623 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
@@ -90,6 +90,7 @@
<fieldType name="highlittext" class="solr.TextField"/>
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
+ <fieldType name="booleans" class="solr.BoolField" sortMissingLast="true" multiValued="true"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
@@ -540,7 +541,25 @@
<filter class="solr.ManagedSynonymGraphFilterFactory" managed="germangraph"/>
</analyzer>
</fieldType>
-
+
+ <!--
+ Numeric field types that index values using KD-trees. *Point fields are faster and more efficient than Trie* fields both, at
+ search time and at index time, but some features are still not supported.
+ Point fields don't support FieldCache, so they must have docValues="true" if needed for sorting, faceting, functions, etc.
+ -->
+ <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
+ <fieldType name="pints" class="solr.IntPointField" docValues="true" multiValued="true"/>
+ <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
+ <fieldType name="pfloats" class="solr.FloatPointField" docValues="true" multiValued="true"/>
+ <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="plongs" class="solr.LongPointField" docValues="true" multiValued="true"/>
+ <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
+ <fieldType name="pdoubles" class="solr.DoublePointField" docValues="true" multiValued="true"/>
+
+ <!-- KD-tree versions of date fields -->
+ <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
+ <fieldType name="pdates" class="solr.DatePointField" docValues="true" multiValued="true"/>
+
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
<field name="uuid" type="uuid" stored="true"/>
@@ -681,6 +700,18 @@
<dynamicField name="*_td" type="tdouble" indexed="true" stored="true"/>
<dynamicField name="*_tdt" type="tdate" indexed="true" stored="true"/>
+ <!-- KD-tree (point) numerics -->
+ <dynamicField name="*_pi" type="pint" indexed="true" stored="true"/>
+ <dynamicField name="*_pis" type="pints" indexed="true" stored="true"/>
+ <dynamicField name="*_pl" type="plong" indexed="true" stored="true"/>
+ <dynamicField name="*_pls" type="plongs" indexed="true" stored="true"/>
+ <dynamicField name="*_pf" type="pfloat" indexed="true" stored="true"/>
+ <dynamicField name="*_pfs" type="pfloats" indexed="true" stored="true"/>
+ <dynamicField name="*_pd" type="pdouble" indexed="true" stored="true"/>
+ <dynamicField name="*_pds" type="pdoubles" indexed="true" stored="true"/>
+ <dynamicField name="*_pdt" type="pdate" indexed="true" stored="true"/>
+ <dynamicField name="*_pdts" type="pdates" indexed="true" stored="true"/>
+
<dynamicField name="ignored_*" type="ignored" multiValued="true"/>
<dynamicField name="attr_*" type="text" indexed="true" stored="true" multiValued="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/566fcfce/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
index e574575..4541fbc 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
@@ -40,27 +40,27 @@
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tint</str>
+ <str name="fieldType">pints</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Float</str>
- <str name="fieldType">tfloat</str>
+ <str name="fieldType">pfloats</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.util.Date</str>
- <str name="fieldType">tdate</str>
+ <str name="fieldType">pdates</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Long</str>
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tlong</str>
+ <str name="fieldType">plongs</str>
</lst>
<lst name="typeMapping">
<arr name="valueClass">
<str>java.lang.Double</str>
<str>java.lang.Float</str>
</arr>
- <str name="fieldType">tdouble</str>
+ <str name="fieldType">pdoubles</str>
</lst>
</processor>
</updateRequestProcessorChain>
@@ -74,24 +74,24 @@
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tint</str>
+ <str name="fieldType">pints</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Float</str>
- <str name="fieldType">tfloat</str>
+ <str name="fieldType">pfloats</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.util.Date</str>
- <str name="fieldType">tdate</str>
+ <str name="fieldType">pdates</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Long</str>
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tlong</str>
+ <str name="fieldType">plongs</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Number</str>
- <str name="fieldType">tdouble</str>
+ <str name="fieldType">pdoubles</str>
</lst>
</processor>
<processor class="solr.LogUpdateProcessorFactory" />
@@ -132,24 +132,24 @@
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tint</str>
+ <str name="fieldType">pints</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Float</str>
- <str name="fieldType">tfloat</str>
+ <str name="fieldType">pfloats</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.util.Date</str>
- <str name="fieldType">tdate</str>
+ <str name="fieldType">pdates</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Long</str>
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tlong</str>
+ <str name="fieldType">plongs</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Number</str>
- <str name="fieldType">tdouble</str>
+ <str name="fieldType">pdoubles</str>
</lst>
</processor>
<processor class="solr.LogUpdateProcessorFactory" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/566fcfce/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
index 8247d69..ac8321b 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
@@ -85,16 +85,16 @@
</lst>
<lst name="typeMapping">
<str name="valueClass">java.util.Date</str>
- <str name="fieldType">tdate</str>
+ <str name="fieldType">pdates</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Long</str>
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tlong</str>
+ <str name="fieldType">plongs</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Number</str>
- <str name="fieldType">tdouble</str>
+ <str name="fieldType">pdoubles</str>
</lst>
</processor>
<processor class="solr.LogUpdateProcessorFactory"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/566fcfce/solr/core/src/test/org/apache/solr/rest/schema/TestFieldCollectionResource.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestFieldCollectionResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestFieldCollectionResource.java
index f3de92b..8d2b555 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/TestFieldCollectionResource.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/TestFieldCollectionResource.java
@@ -77,11 +77,11 @@ public class TestFieldCollectionResource extends SolrRestletTestBase {
"/fields/[0]/name=='HTMLstandardtok'",
"/fields/[1]/name=='HTMLwhitetok'",
"/fields/[2]/name=='_version_'",
- "/fields/[98]/name=='*_d'",
- "/fields/[97]/name=='*_f'",
- "/fields/[96]/name=='*_b'",
- "/fields/[95]/name=='*_t'",
- "/fields/[94]/name=='*_l'"
+ "/fields/[108]/name=='*_d'",
+ "/fields/[107]/name=='*_f'",
+ "/fields/[106]/name=='*_b'",
+ "/fields/[105]/name=='*_t'",
+ "/fields/[104]/name=='*_l'"
);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/566fcfce/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java
index 8b59d0e..64d1abf 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java
@@ -67,7 +67,7 @@ public class AddSchemaFieldsUpdateProcessorFactoryTest extends UpdateProcessorTe
assertNotNull(d);
schema = h.getCore().getLatestSchema();
assertNotNull(schema.getFieldOrNull(fieldName));
- assertEquals("tdate", schema.getFieldType(fieldName).getTypeName());
+ assertEquals("pdates", schema.getFieldType(fieldName).getTypeName());
}
public void testSingleFieldRoundTrip() throws Exception {
@@ -79,7 +79,7 @@ public class AddSchemaFieldsUpdateProcessorFactoryTest extends UpdateProcessorTe
assertNotNull(d);
schema = h.getCore().getLatestSchema();
assertNotNull(schema.getFieldOrNull(fieldName));
- assertEquals("tfloat", schema.getFieldType(fieldName).getTypeName());
+ assertEquals("pfloats", schema.getFieldType(fieldName).getTypeName());
assertU(commit());
assertQ(req("id:2"), "//arr[@name='" + fieldName + "']/float[.='" + floatValue.toString() + "']");
}
@@ -95,7 +95,7 @@ public class AddSchemaFieldsUpdateProcessorFactoryTest extends UpdateProcessorTe
assertNotNull(d);
schema = h.getCore().getLatestSchema();
assertNotNull(schema.getFieldOrNull(fieldName));
- assertEquals("tdouble", schema.getFieldType(fieldName).getTypeName());
+ assertEquals("pdoubles", schema.getFieldType(fieldName).getTypeName());
assertU(commit());
assertQ(req("id:3")
,"//arr[@name='" + fieldName + "']/double[.='" + fieldValue1.toString() + "']"
@@ -141,8 +141,8 @@ public class AddSchemaFieldsUpdateProcessorFactoryTest extends UpdateProcessorTe
schema = h.getCore().getLatestSchema();
assertNotNull(schema.getFieldOrNull(fieldName1));
assertNotNull(schema.getFieldOrNull(fieldName2));
- assertEquals("tdouble", schema.getFieldType(fieldName1).getTypeName());
- assertEquals("tlong", schema.getFieldType(fieldName2).getTypeName());
+ assertEquals("pdoubles", schema.getFieldType(fieldName1).getTypeName());
+ assertEquals("plongs", schema.getFieldType(fieldName2).getTypeName());
assertU(commit());
assertQ(req("id:5")
,"//arr[@name='" + fieldName1 + "']/double[.='" + field1Value1.toString() + "']"
@@ -194,10 +194,10 @@ public class AddSchemaFieldsUpdateProcessorFactoryTest extends UpdateProcessorTe
assertNotNull(schema.getFieldOrNull(fieldName2));
assertNotNull(schema.getFieldOrNull(fieldName3));
assertNotNull(schema.getFieldOrNull(fieldName4));
- assertEquals("tdouble", schema.getFieldType(fieldName1).getTypeName());
- assertEquals("tlong", schema.getFieldType(fieldName2).getTypeName());
+ assertEquals("pdoubles", schema.getFieldType(fieldName1).getTypeName());
+ assertEquals("plongs", schema.getFieldType(fieldName2).getTypeName());
assertEquals("text", schema.getFieldType(fieldName3).getTypeName());
- assertEquals("tdate", schema.getFieldType(fieldName4).getTypeName());
+ assertEquals("pdates", schema.getFieldType(fieldName4).getTypeName());
assertU(commit());
assertQ(req("id:6")
,"//arr[@name='" + fieldName1 + "']/double[.='" + field1Value1.toString() + "']"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/566fcfce/solr/example/files/conf/managed-schema
----------------------------------------------------------------------
diff --git a/solr/example/files/conf/managed-schema b/solr/example/files/conf/managed-schema
index 3c47c35..bf154f4 100644
--- a/solr/example/files/conf/managed-schema
+++ b/solr/example/files/conf/managed-schema
@@ -47,6 +47,16 @@
<filter class="solr.DoubleMetaphoneFilterFactory" inject="false"/>
</analyzer>
</fieldType>
+ <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
+ <fieldType name="pdates" class="solr.DatePointField" docValues="true" multiValued="true"/>
+ <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
+ <fieldType name="pdoubles" class="solr.DoublePointField" docValues="true" multiValued="true"/>
+ <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
+ <fieldType name="pfloats" class="solr.FloatPointField" docValues="true" multiValued="true"/>
+ <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
+ <fieldType name="pints" class="solr.IntPointField" docValues="true" multiValued="true"/>
+ <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="plongs" class="solr.LongPointField" docValues="true" multiValued="true"/>
<fieldType name="point" class="solr.PointType" subFieldSuffix="_d" dimension="2"/>
<fieldType name="random" class="solr.RandomSortField" indexed="true"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
@@ -493,6 +503,7 @@
<dynamicField name="*_srpt" type="location_rpt" indexed="true" stored="true"/>
<dynamicField name="*_tdts" type="tdates" indexed="true" stored="true"/>
<dynamicField name="attr_*" type="text_general" multiValued="true" indexed="true" stored="true"/>
+ <dynamicField name="*_pdts" type="pdates" indexed="true" stored="true"/>
<dynamicField name="*_txt" type="text_general" indexed="true" stored="true"/>
<dynamicField name="*_dts" type="date" multiValued="true" indexed="true" stored="true"/>
<dynamicField name="*_tis" type="tints" indexed="true" stored="true"/>
@@ -500,6 +511,11 @@
<dynamicField name="*_tfs" type="tfloats" indexed="true" stored="true"/>
<dynamicField name="*_tds" type="tdoubles" indexed="true" stored="true"/>
<dynamicField name="*_tdt" type="tdate" indexed="true" stored="true"/>
+ <dynamicField name="*_pds" type="pdoubles" indexed="true" stored="true"/>
+ <dynamicField name="*_pdt" type="pdate" indexed="true" stored="true"/>
+ <dynamicField name="*_pfs" type="pfloats" indexed="true" stored="true"/>
+ <dynamicField name="*_pis" type="pints" indexed="true" stored="true"/>
+ <dynamicField name="*_pls" type="plongs" indexed="true" stored="true"/>
<dynamicField name="*_is" type="ints" indexed="true" stored="true"/>
<dynamicField name="*_ss" type="strings" indexed="true" stored="true"/>
<dynamicField name="*_ls" type="longs" indexed="true" stored="true"/>
@@ -512,6 +528,10 @@
<dynamicField name="*_tf" type="tfloat" indexed="true" stored="true"/>
<dynamicField name="*_td" type="tdouble" indexed="true" stored="true"/>
<dynamicField name="*_ws" type="text_ws" indexed="true" stored="true"/>
+ <dynamicField name="*_pd" type="pdouble" indexed="true" stored="true"/>
+ <dynamicField name="*_pf" type="pfloat" indexed="true" stored="true"/>
+ <dynamicField name="*_pi" type="pint" indexed="true" stored="true"/>
+ <dynamicField name="*_pl" type="plong" indexed="true" stored="true"/>
<dynamicField name="*_i" type="int" indexed="true" stored="true"/>
<dynamicField name="*_s" type="string" indexed="true" stored="true"/>
<dynamicField name="*_l" type="long" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/566fcfce/solr/example/files/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/files/conf/solrconfig.xml b/solr/example/files/conf/solrconfig.xml
index 71da510..35ec28e 100644
--- a/solr/example/files/conf/solrconfig.xml
+++ b/solr/example/files/conf/solrconfig.xml
@@ -1229,16 +1229,16 @@
</lst>
<lst name="typeMapping">
<str name="valueClass">java.util.Date</str>
- <str name="fieldType">tdates</str>
+ <str name="fieldType">pdates</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Long</str>
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tlongs</str>
+ <str name="fieldType">plongs</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Number</str>
- <str name="fieldType">tdoubles</str>
+ <str name="fieldType">pdoubles</str>
</lst>
</processor>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/566fcfce/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml b/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
index 53f74c3..770ac60 100644
--- a/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
@@ -1223,16 +1223,16 @@
</lst>
<lst name="typeMapping">
<str name="valueClass">java.util.Date</str>
- <str name="fieldType">tdates</str>
+ <str name="fieldType">pdates</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Long</str>
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tlongs</str>
+ <str name="fieldType">plongs</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Number</str>
- <str name="fieldType">tdoubles</str>
+ <str name="fieldType">pdoubles</str>
</lst>
</processor>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/566fcfce/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
index 48d47e3..33ef773 100644
--- a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
@@ -1222,16 +1222,16 @@
</lst>
<lst name="typeMapping">
<str name="valueClass">java.util.Date</str>
- <str name="fieldType">tdates</str>
+ <str name="fieldType">pdates</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Long</str>
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tlongs</str>
+ <str name="fieldType">plongs</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Number</str>
- <str name="fieldType">tdoubles</str>
+ <str name="fieldType">pdoubles</str>
</lst>
</processor>
<processor class="solr.LogUpdateProcessorFactory"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/566fcfce/solr/solr-ref-guide/src/schemaless-mode.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/schemaless-mode.adoc b/solr/solr-ref-guide/src/schemaless-mode.adoc
index fdf97ba..45ae8dd 100644
--- a/solr/solr-ref-guide/src/schemaless-mode.adoc
+++ b/solr/solr-ref-guide/src/schemaless-mode.adoc
@@ -139,16 +139,16 @@ The UpdateRequestProcessorChain allows Solr to guess field types, and you can de
</lst>
<lst name="typeMapping">
<str name="valueClass">java.util.Date</str>
- <str name="fieldType">tdates</str>
+ <str name="fieldType">pdates</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Long</str>
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tlongs</str>
+ <str name="fieldType">plongs</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Number</str>
- <str name="fieldType">tdoubles</str>
+ <str name="fieldType">pdoubles</str>
</lst>
</processor>
<processor class="solr.LogUpdateProcessorFactory"/>
[2/2] lucene-solr:branch_6x: SOLR-10761: Switch trie numeric/date
fields to points in data-driven-enabled example and test schemas
Posted by sa...@apache.org.
SOLR-10761: Switch trie numeric/date fields to points in data-driven-enabled example and test schemas
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9ea90f78
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9ea90f78
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9ea90f78
Branch: refs/heads/branch_6x
Commit: 9ea90f78ee5ca20655894f2de84ace4b8caf9c47
Parents: 74904db
Author: Steve Rowe <sa...@apache.org>
Authored: Fri Jun 9 19:43:01 2017 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 9 19:43:22 2017 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 3 ++
.../AddSchemaFieldsUpdateProcessorFactory.java | 12 +++----
...chema-add-schema-fields-update-processor.xml | 22 +++++++++++++
.../solr/collection1/conf/schema-rest.xml | 33 +++++++++++++++++++-
...dd-schema-fields-update-processor-chains.xml | 30 +++++++++---------
.../collection1/conf/solrconfig-schemaless.xml | 6 ++--
.../schema/TestFieldCollectionResource.java | 10 +++---
...dSchemaFieldsUpdateProcessorFactoryTest.java | 16 +++++-----
solr/example/files/conf/managed-schema | 20 ++++++++++++
solr/example/files/conf/solrconfig.xml | 6 ++--
.../basic_configs/conf/solrconfig.xml | 6 ++--
.../conf/solrconfig.xml | 6 ++--
solr/solr-ref-guide/src/schemaless-mode.adoc | 6 ++--
13 files changed, 126 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ea90f78/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index cc44ccb..7ac9fa3 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -149,6 +149,9 @@ Other Changes
* SOLR-10501: Test sortMissing{First,Last} with points fields. (Steve Rowe)
+* SOLR-10761: Switch trie numeric/date fields to points in data-driven-enabled example and test schemas.
+ (Steve Rowe)
+
================== 6.6.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ea90f78/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
index 4758972..c4a122d 100644
--- a/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
+++ b/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java
@@ -92,31 +92,31 @@ import static org.apache.solr.core.ConfigSetProperties.IMMUTABLE_CONFIGSET_ARG;
* <str name="defaultFieldType">text_general</str>
* <lst name="typeMapping">
* <str name="valueClass">Boolean</str>
- * <str name="fieldType">boolean</str>
+ * <str name="fieldType">booleans</str>
* </lst>
* <lst name="typeMapping">
* <str name="valueClass">Integer</str>
- * <str name="fieldType">tint</str>
+ * <str name="fieldType">pints</str>
* </lst>
* <lst name="typeMapping">
* <str name="valueClass">Float</str>
- * <str name="fieldType">tfloat</str>
+ * <str name="fieldType">pfloats</str>
* </lst>
* <lst name="typeMapping">
* <str name="valueClass">Date</str>
- * <str name="fieldType">tdate</str>
+ * <str name="fieldType">pdates</str>
* </lst>
* <lst name="typeMapping">
* <str name="valueClass">Long</str>
* <str name="valueClass">Integer</str>
- * <str name="fieldType">tlong</str>
+ * <str name="fieldType">plongs</str>
* </lst>
* <lst name="typeMapping">
* <arr name="valueClass">
* <str>Double</str>
* <str>Float</str>
* </arr>
- * <str name="fieldType">tdouble</str>
+ * <str name="fieldType">pdoubles</str>
* </lst>
* </processor></pre>
*/
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ea90f78/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..aa8d860 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
@@ -33,6 +33,17 @@
</analyzer>
</fieldType>
+ <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
+ <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
+ <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
+ <fieldType name="pints" class="solr.IntPointField" docValues="true" multiValued="true"/>
+ <fieldType name="pfloats" class="solr.FloatPointField" docValues="true" multiValued="true"/>
+ <fieldType name="plongs" class="solr.LongPointField" docValues="true" multiValued="true"/>
+ <fieldType name="pdoubles" class="solr.DoublePointField" docValues="true" multiValued="true"/>
+ <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
+ <fieldType name="pdates" class="solr.DatePointField" docValues="true" multiValued="true"/>
+
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
<field name="_version_" type="long" indexed="true" stored="true"/>
<field name="_root_" type="string" indexed="true" stored="true" multiValued="false"/>
@@ -44,6 +55,17 @@
<dynamicField name="*_td" type="tdouble" indexed="true" stored="true"/>
<dynamicField name="*_tdt" type="tdate" indexed="true" stored="true"/>
+ <dynamicField name="*_pi" type="pint" indexed="true" stored="true"/>
+ <dynamicField name="*_pis" type="pints" indexed="true" stored="true"/>
+ <dynamicField name="*_pl" type="plong" indexed="true" stored="true"/>
+ <dynamicField name="*_pls" type="plongs" indexed="true" stored="true"/>
+ <dynamicField name="*_pf" type="pfloat" indexed="true" stored="true"/>
+ <dynamicField name="*_pfs" type="pfloats" indexed="true" stored="true"/>
+ <dynamicField name="*_pd" type="pdouble" indexed="true" stored="true"/>
+ <dynamicField name="*_pds" type="pdoubles" indexed="true" stored="true"/>
+ <dynamicField name="*_pdt" type="pdate" indexed="true" stored="true"/>
+ <dynamicField name="*_pdts" type="pdates" indexed="true" stored="true"/>
+
<uniqueKey>id</uniqueKey>
</schema>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ea90f78/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml b/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
index 58b05eb..89c2623 100644
--- a/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/schema-rest.xml
@@ -90,6 +90,7 @@
<fieldType name="highlittext" class="solr.TextField"/>
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
+ <fieldType name="booleans" class="solr.BoolField" sortMissingLast="true" multiValued="true"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
<!-- format for date is 1995-12-31T23:59:59.999Z and only the fractional
@@ -540,7 +541,25 @@
<filter class="solr.ManagedSynonymGraphFilterFactory" managed="germangraph"/>
</analyzer>
</fieldType>
-
+
+ <!--
+ Numeric field types that index values using KD-trees. *Point fields are faster and more efficient than Trie* fields both, at
+ search time and at index time, but some features are still not supported.
+ Point fields don't support FieldCache, so they must have docValues="true" if needed for sorting, faceting, functions, etc.
+ -->
+ <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
+ <fieldType name="pints" class="solr.IntPointField" docValues="true" multiValued="true"/>
+ <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
+ <fieldType name="pfloats" class="solr.FloatPointField" docValues="true" multiValued="true"/>
+ <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="plongs" class="solr.LongPointField" docValues="true" multiValued="true"/>
+ <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
+ <fieldType name="pdoubles" class="solr.DoublePointField" docValues="true" multiValued="true"/>
+
+ <!-- KD-tree versions of date fields -->
+ <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
+ <fieldType name="pdates" class="solr.DatePointField" docValues="true" multiValued="true"/>
+
<field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
<field name="signatureField" type="string" indexed="true" stored="false"/>
<field name="uuid" type="uuid" stored="true"/>
@@ -681,6 +700,18 @@
<dynamicField name="*_td" type="tdouble" indexed="true" stored="true"/>
<dynamicField name="*_tdt" type="tdate" indexed="true" stored="true"/>
+ <!-- KD-tree (point) numerics -->
+ <dynamicField name="*_pi" type="pint" indexed="true" stored="true"/>
+ <dynamicField name="*_pis" type="pints" indexed="true" stored="true"/>
+ <dynamicField name="*_pl" type="plong" indexed="true" stored="true"/>
+ <dynamicField name="*_pls" type="plongs" indexed="true" stored="true"/>
+ <dynamicField name="*_pf" type="pfloat" indexed="true" stored="true"/>
+ <dynamicField name="*_pfs" type="pfloats" indexed="true" stored="true"/>
+ <dynamicField name="*_pd" type="pdouble" indexed="true" stored="true"/>
+ <dynamicField name="*_pds" type="pdoubles" indexed="true" stored="true"/>
+ <dynamicField name="*_pdt" type="pdate" indexed="true" stored="true"/>
+ <dynamicField name="*_pdts" type="pdates" indexed="true" stored="true"/>
+
<dynamicField name="ignored_*" type="ignored" multiValued="true"/>
<dynamicField name="attr_*" type="text" indexed="true" stored="true" multiValued="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ea90f78/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
index e574575..4541fbc 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-add-schema-fields-update-processor-chains.xml
@@ -40,27 +40,27 @@
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tint</str>
+ <str name="fieldType">pints</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Float</str>
- <str name="fieldType">tfloat</str>
+ <str name="fieldType">pfloats</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.util.Date</str>
- <str name="fieldType">tdate</str>
+ <str name="fieldType">pdates</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Long</str>
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tlong</str>
+ <str name="fieldType">plongs</str>
</lst>
<lst name="typeMapping">
<arr name="valueClass">
<str>java.lang.Double</str>
<str>java.lang.Float</str>
</arr>
- <str name="fieldType">tdouble</str>
+ <str name="fieldType">pdoubles</str>
</lst>
</processor>
</updateRequestProcessorChain>
@@ -74,24 +74,24 @@
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tint</str>
+ <str name="fieldType">pints</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Float</str>
- <str name="fieldType">tfloat</str>
+ <str name="fieldType">pfloats</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.util.Date</str>
- <str name="fieldType">tdate</str>
+ <str name="fieldType">pdates</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Long</str>
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tlong</str>
+ <str name="fieldType">plongs</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Number</str>
- <str name="fieldType">tdouble</str>
+ <str name="fieldType">pdoubles</str>
</lst>
</processor>
<processor class="solr.LogUpdateProcessorFactory" />
@@ -132,24 +132,24 @@
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tint</str>
+ <str name="fieldType">pints</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Float</str>
- <str name="fieldType">tfloat</str>
+ <str name="fieldType">pfloats</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.util.Date</str>
- <str name="fieldType">tdate</str>
+ <str name="fieldType">pdates</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Long</str>
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tlong</str>
+ <str name="fieldType">plongs</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Number</str>
- <str name="fieldType">tdouble</str>
+ <str name="fieldType">pdoubles</str>
</lst>
</processor>
<processor class="solr.LogUpdateProcessorFactory" />
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ea90f78/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
----------------------------------------------------------------------
diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
index 8247d69..ac8321b 100644
--- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
+++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
@@ -85,16 +85,16 @@
</lst>
<lst name="typeMapping">
<str name="valueClass">java.util.Date</str>
- <str name="fieldType">tdate</str>
+ <str name="fieldType">pdates</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Long</str>
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tlong</str>
+ <str name="fieldType">plongs</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Number</str>
- <str name="fieldType">tdouble</str>
+ <str name="fieldType">pdoubles</str>
</lst>
</processor>
<processor class="solr.LogUpdateProcessorFactory"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ea90f78/solr/core/src/test/org/apache/solr/rest/schema/TestFieldCollectionResource.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestFieldCollectionResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestFieldCollectionResource.java
index f3de92b..8d2b555 100644
--- a/solr/core/src/test/org/apache/solr/rest/schema/TestFieldCollectionResource.java
+++ b/solr/core/src/test/org/apache/solr/rest/schema/TestFieldCollectionResource.java
@@ -77,11 +77,11 @@ public class TestFieldCollectionResource extends SolrRestletTestBase {
"/fields/[0]/name=='HTMLstandardtok'",
"/fields/[1]/name=='HTMLwhitetok'",
"/fields/[2]/name=='_version_'",
- "/fields/[98]/name=='*_d'",
- "/fields/[97]/name=='*_f'",
- "/fields/[96]/name=='*_b'",
- "/fields/[95]/name=='*_t'",
- "/fields/[94]/name=='*_l'"
+ "/fields/[108]/name=='*_d'",
+ "/fields/[107]/name=='*_f'",
+ "/fields/[106]/name=='*_b'",
+ "/fields/[105]/name=='*_t'",
+ "/fields/[104]/name=='*_l'"
);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ea90f78/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java
index 8b59d0e..64d1abf 100644
--- a/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java
+++ b/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java
@@ -67,7 +67,7 @@ public class AddSchemaFieldsUpdateProcessorFactoryTest extends UpdateProcessorTe
assertNotNull(d);
schema = h.getCore().getLatestSchema();
assertNotNull(schema.getFieldOrNull(fieldName));
- assertEquals("tdate", schema.getFieldType(fieldName).getTypeName());
+ assertEquals("pdates", schema.getFieldType(fieldName).getTypeName());
}
public void testSingleFieldRoundTrip() throws Exception {
@@ -79,7 +79,7 @@ public class AddSchemaFieldsUpdateProcessorFactoryTest extends UpdateProcessorTe
assertNotNull(d);
schema = h.getCore().getLatestSchema();
assertNotNull(schema.getFieldOrNull(fieldName));
- assertEquals("tfloat", schema.getFieldType(fieldName).getTypeName());
+ assertEquals("pfloats", schema.getFieldType(fieldName).getTypeName());
assertU(commit());
assertQ(req("id:2"), "//arr[@name='" + fieldName + "']/float[.='" + floatValue.toString() + "']");
}
@@ -95,7 +95,7 @@ public class AddSchemaFieldsUpdateProcessorFactoryTest extends UpdateProcessorTe
assertNotNull(d);
schema = h.getCore().getLatestSchema();
assertNotNull(schema.getFieldOrNull(fieldName));
- assertEquals("tdouble", schema.getFieldType(fieldName).getTypeName());
+ assertEquals("pdoubles", schema.getFieldType(fieldName).getTypeName());
assertU(commit());
assertQ(req("id:3")
,"//arr[@name='" + fieldName + "']/double[.='" + fieldValue1.toString() + "']"
@@ -141,8 +141,8 @@ public class AddSchemaFieldsUpdateProcessorFactoryTest extends UpdateProcessorTe
schema = h.getCore().getLatestSchema();
assertNotNull(schema.getFieldOrNull(fieldName1));
assertNotNull(schema.getFieldOrNull(fieldName2));
- assertEquals("tdouble", schema.getFieldType(fieldName1).getTypeName());
- assertEquals("tlong", schema.getFieldType(fieldName2).getTypeName());
+ assertEquals("pdoubles", schema.getFieldType(fieldName1).getTypeName());
+ assertEquals("plongs", schema.getFieldType(fieldName2).getTypeName());
assertU(commit());
assertQ(req("id:5")
,"//arr[@name='" + fieldName1 + "']/double[.='" + field1Value1.toString() + "']"
@@ -194,10 +194,10 @@ public class AddSchemaFieldsUpdateProcessorFactoryTest extends UpdateProcessorTe
assertNotNull(schema.getFieldOrNull(fieldName2));
assertNotNull(schema.getFieldOrNull(fieldName3));
assertNotNull(schema.getFieldOrNull(fieldName4));
- assertEquals("tdouble", schema.getFieldType(fieldName1).getTypeName());
- assertEquals("tlong", schema.getFieldType(fieldName2).getTypeName());
+ assertEquals("pdoubles", schema.getFieldType(fieldName1).getTypeName());
+ assertEquals("plongs", schema.getFieldType(fieldName2).getTypeName());
assertEquals("text", schema.getFieldType(fieldName3).getTypeName());
- assertEquals("tdate", schema.getFieldType(fieldName4).getTypeName());
+ assertEquals("pdates", schema.getFieldType(fieldName4).getTypeName());
assertU(commit());
assertQ(req("id:6")
,"//arr[@name='" + fieldName1 + "']/double[.='" + field1Value1.toString() + "']"
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ea90f78/solr/example/files/conf/managed-schema
----------------------------------------------------------------------
diff --git a/solr/example/files/conf/managed-schema b/solr/example/files/conf/managed-schema
index 3c47c35..bf154f4 100644
--- a/solr/example/files/conf/managed-schema
+++ b/solr/example/files/conf/managed-schema
@@ -47,6 +47,16 @@
<filter class="solr.DoubleMetaphoneFilterFactory" inject="false"/>
</analyzer>
</fieldType>
+ <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
+ <fieldType name="pdates" class="solr.DatePointField" docValues="true" multiValued="true"/>
+ <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
+ <fieldType name="pdoubles" class="solr.DoublePointField" docValues="true" multiValued="true"/>
+ <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
+ <fieldType name="pfloats" class="solr.FloatPointField" docValues="true" multiValued="true"/>
+ <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
+ <fieldType name="pints" class="solr.IntPointField" docValues="true" multiValued="true"/>
+ <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
+ <fieldType name="plongs" class="solr.LongPointField" docValues="true" multiValued="true"/>
<fieldType name="point" class="solr.PointType" subFieldSuffix="_d" dimension="2"/>
<fieldType name="random" class="solr.RandomSortField" indexed="true"/>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
@@ -493,6 +503,7 @@
<dynamicField name="*_srpt" type="location_rpt" indexed="true" stored="true"/>
<dynamicField name="*_tdts" type="tdates" indexed="true" stored="true"/>
<dynamicField name="attr_*" type="text_general" multiValued="true" indexed="true" stored="true"/>
+ <dynamicField name="*_pdts" type="pdates" indexed="true" stored="true"/>
<dynamicField name="*_txt" type="text_general" indexed="true" stored="true"/>
<dynamicField name="*_dts" type="date" multiValued="true" indexed="true" stored="true"/>
<dynamicField name="*_tis" type="tints" indexed="true" stored="true"/>
@@ -500,6 +511,11 @@
<dynamicField name="*_tfs" type="tfloats" indexed="true" stored="true"/>
<dynamicField name="*_tds" type="tdoubles" indexed="true" stored="true"/>
<dynamicField name="*_tdt" type="tdate" indexed="true" stored="true"/>
+ <dynamicField name="*_pds" type="pdoubles" indexed="true" stored="true"/>
+ <dynamicField name="*_pdt" type="pdate" indexed="true" stored="true"/>
+ <dynamicField name="*_pfs" type="pfloats" indexed="true" stored="true"/>
+ <dynamicField name="*_pis" type="pints" indexed="true" stored="true"/>
+ <dynamicField name="*_pls" type="plongs" indexed="true" stored="true"/>
<dynamicField name="*_is" type="ints" indexed="true" stored="true"/>
<dynamicField name="*_ss" type="strings" indexed="true" stored="true"/>
<dynamicField name="*_ls" type="longs" indexed="true" stored="true"/>
@@ -512,6 +528,10 @@
<dynamicField name="*_tf" type="tfloat" indexed="true" stored="true"/>
<dynamicField name="*_td" type="tdouble" indexed="true" stored="true"/>
<dynamicField name="*_ws" type="text_ws" indexed="true" stored="true"/>
+ <dynamicField name="*_pd" type="pdouble" indexed="true" stored="true"/>
+ <dynamicField name="*_pf" type="pfloat" indexed="true" stored="true"/>
+ <dynamicField name="*_pi" type="pint" indexed="true" stored="true"/>
+ <dynamicField name="*_pl" type="plong" indexed="true" stored="true"/>
<dynamicField name="*_i" type="int" indexed="true" stored="true"/>
<dynamicField name="*_s" type="string" indexed="true" stored="true"/>
<dynamicField name="*_l" type="long" indexed="true" stored="true"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ea90f78/solr/example/files/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/example/files/conf/solrconfig.xml b/solr/example/files/conf/solrconfig.xml
index 3a9f1a5..8383cac 100644
--- a/solr/example/files/conf/solrconfig.xml
+++ b/solr/example/files/conf/solrconfig.xml
@@ -1229,16 +1229,16 @@
</lst>
<lst name="typeMapping">
<str name="valueClass">java.util.Date</str>
- <str name="fieldType">tdates</str>
+ <str name="fieldType">pdates</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Long</str>
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tlongs</str>
+ <str name="fieldType">plongs</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Number</str>
- <str name="fieldType">tdoubles</str>
+ <str name="fieldType">pdoubles</str>
</lst>
</processor>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ea90f78/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml b/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
index d4d6ce9..e14b621 100644
--- a/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
@@ -1223,16 +1223,16 @@
</lst>
<lst name="typeMapping">
<str name="valueClass">java.util.Date</str>
- <str name="fieldType">tdates</str>
+ <str name="fieldType">pdates</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Long</str>
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tlongs</str>
+ <str name="fieldType">plongs</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Number</str>
- <str name="fieldType">tdoubles</str>
+ <str name="fieldType">pdoubles</str>
</lst>
</processor>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ea90f78/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
----------------------------------------------------------------------
diff --git a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
index 2d089cd..56738e0 100644
--- a/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
+++ b/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
@@ -1222,16 +1222,16 @@
</lst>
<lst name="typeMapping">
<str name="valueClass">java.util.Date</str>
- <str name="fieldType">tdates</str>
+ <str name="fieldType">pdates</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Long</str>
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tlongs</str>
+ <str name="fieldType">plongs</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Number</str>
- <str name="fieldType">tdoubles</str>
+ <str name="fieldType">pdoubles</str>
</lst>
</processor>
<processor class="solr.LogUpdateProcessorFactory"/>
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9ea90f78/solr/solr-ref-guide/src/schemaless-mode.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/schemaless-mode.adoc b/solr/solr-ref-guide/src/schemaless-mode.adoc
index fdf97ba..45ae8dd 100644
--- a/solr/solr-ref-guide/src/schemaless-mode.adoc
+++ b/solr/solr-ref-guide/src/schemaless-mode.adoc
@@ -139,16 +139,16 @@ The UpdateRequestProcessorChain allows Solr to guess field types, and you can de
</lst>
<lst name="typeMapping">
<str name="valueClass">java.util.Date</str>
- <str name="fieldType">tdates</str>
+ <str name="fieldType">pdates</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Long</str>
<str name="valueClass">java.lang.Integer</str>
- <str name="fieldType">tlongs</str>
+ <str name="fieldType">plongs</str>
</lst>
<lst name="typeMapping">
<str name="valueClass">java.lang.Number</str>
- <str name="fieldType">tdoubles</str>
+ <str name="fieldType">pdoubles</str>
</lst>
</processor>
<processor class="solr.LogUpdateProcessorFactory"/>