Skip to content

SOLR-13309: Simplify references numeric-range classes #4254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gerlowskija wants to merge 1 commit into
base: main
Choose a base branch
from
Open

SOLR-13309: Simplify references numeric-range classes #4254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ public class SolrResourceLoader
"",
"analysis.",
"schema.",
"schema.numericrange.",
"handler.",
"handler.tagger.",
"search.",
Expand Down
4 changes: 2 additions & 2 deletions solr/core/src/java/org/apache/solr/schema/numericrange/DoubleRangeField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
* <h2>Schema Configuration</h2>
*
* <pre>
* &lt;fieldType name="doublerange" class="org.apache.solr.schema.numericrange.DoubleRangeField" numDimensions="1"/&gt;
* &lt;fieldType name="doublerange2d" class="org.apache.solr.schema.numericrange.DoubleRangeField" numDimensions="2"/&gt;
* &lt;fieldType name="doublerange" class="solr.DoubleRangeField" numDimensions="1"/&gt;
* &lt;fieldType name="doublerange2d" class="solr.DoubleRangeField" numDimensions="2"/&gt;
* &lt;field name="price_range" type="doublerange" indexed="true" stored="true"/&gt;
* &lt;field name="my_2d_range" type="doublerange2d" indexed="true" stored="true"/&gt;
* </pre>
Expand Down
4 changes: 2 additions & 2 deletions solr/core/src/java/org/apache/solr/schema/numericrange/FloatRangeField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
* <h2>Schema Configuration</h2>
*
* <pre>
* &lt;fieldType name="floatrange" class="org.apache.solr.schema.numericrange.FloatRangeField" numDimensions="1"/&gt;
* &lt;fieldType name="floatrange2d" class="org.apache.solr.schema.numericrange.FloatRangeField" numDimensions="2"/&gt;
* &lt;fieldType name="floatrange" class="solr.FloatRangeField" numDimensions="1"/&gt;
* &lt;fieldType name="floatrange2d" class="solr.FloatRangeField" numDimensions="2"/&gt;
* &lt;field name="price_range" type="floatrange" indexed="true" stored="true"/&gt;
* &lt;field name="my_2d_range" type="floatrange2d" indexed="true" stored="true"/&gt;
* </pre>
Expand Down
4 changes: 2 additions & 2 deletions solr/core/src/java/org/apache/solr/schema/numericrange/IntRangeField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
* <h2>Schema Configuration</h2>
*
* <pre>
* &lt;fieldType name="intrange" class="org.apache.solr.schema.numericrange.IntRangeField" numDimensions="1"/&gt;
* &lt;fieldType name="intrange2d" class="org.apache.solr.schema.numericrange.IntRangeField" numDimensions="2"/&gt;
* &lt;fieldType name="intrange" class="solr.IntRangeField" numDimensions="1"/&gt;
* &lt;fieldType name="intrange2d" class="solr.IntRangeField" numDimensions="2"/&gt;
* &lt;field name="price_range" type="intrange" indexed="true" stored="true"/&gt;
* &lt;field name="bbox" type="intrange2d" indexed="true" stored="true"/&gt;
* </pre>
Expand Down
4 changes: 2 additions & 2 deletions solr/core/src/java/org/apache/solr/schema/numericrange/LongRangeField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
* <h2>Schema Configuration</h2>
*
* <pre>
* &lt;fieldType name="longrange" class="org.apache.solr.schema.numericrange.LongRangeField" numDimensions="1"/&gt;
* &lt;fieldType name="longrange2d" class="org.apache.solr.schema.numericrange.LongRangeField" numDimensions="2"/&gt;
* &lt;fieldType name="longrange" class="solr.LongRangeField" numDimensions="1"/&gt;
* &lt;fieldType name="longrange2d" class="solr.LongRangeField" numDimensions="2"/&gt;
* &lt;field name="long_range" type="longrange" indexed="true" stored="true"/&gt;
* &lt;field name="long_range_2d" type="longrange2d" indexed="true" stored="true"/&gt;
* </pre>
Expand Down
32 changes: 16 additions & 16 deletions solr/core/src/test-files/solr/collection1/conf/schema-numericrange.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,28 @@
<fieldType name="long" class="solr.LongPointField"/>

<!-- IntRangeField types with different dimensions -->
<fieldType name="intrange" class="solr.numericrange.IntRangeField" numDimensions="1"/>
<fieldType name="intrange2d" class="solr.numericrange.IntRangeField" numDimensions="2"/>
<fieldType name="intrange3d" class="solr.numericrange.IntRangeField" numDimensions="3"/>
<fieldType name="intrange4d" class="solr.numericrange.IntRangeField" numDimensions="4"/>
<fieldType name="intrange" class="solr.IntRangeField" numDimensions="1"/>
<fieldType name="intrange2d" class="solr.IntRangeField" numDimensions="2"/>
<fieldType name="intrange3d" class="solr.IntRangeField" numDimensions="3"/>
<fieldType name="intrange4d" class="solr.IntRangeField" numDimensions="4"/>

<!-- LongRangeField types with different dimensions -->
<fieldType name="longrange" class="solr.numericrange.LongRangeField" numDimensions="1"/>
<fieldType name="longrange2d" class="solr.numericrange.LongRangeField" numDimensions="2"/>
<fieldType name="longrange3d" class="solr.numericrange.LongRangeField" numDimensions="3"/>
<fieldType name="longrange4d" class="solr.numericrange.LongRangeField" numDimensions="4"/>
<fieldType name="longrange" class="solr.LongRangeField" numDimensions="1"/>
<fieldType name="longrange2d" class="solr.LongRangeField" numDimensions="2"/>
<fieldType name="longrange3d" class="solr.LongRangeField" numDimensions="3"/>
<fieldType name="longrange4d" class="solr.LongRangeField" numDimensions="4"/>

<!-- FloatRangeField types with different dimensions -->
<fieldType name="floatrange" class="solr.numericrange.FloatRangeField" numDimensions="1"/>
<fieldType name="floatrange2d" class="solr.numericrange.FloatRangeField" numDimensions="2"/>
<fieldType name="floatrange3d" class="solr.numericrange.FloatRangeField" numDimensions="3"/>
<fieldType name="floatrange4d" class="solr.numericrange.FloatRangeField" numDimensions="4"/>
<fieldType name="floatrange" class="solr.FloatRangeField" numDimensions="1"/>
<fieldType name="floatrange2d" class="solr.FloatRangeField" numDimensions="2"/>
<fieldType name="floatrange3d" class="solr.FloatRangeField" numDimensions="3"/>
<fieldType name="floatrange4d" class="solr.FloatRangeField" numDimensions="4"/>

<!-- DoubleRangeField types with different dimensions -->
<fieldType name="doublerange" class="solr.numericrange.DoubleRangeField" numDimensions="1"/>
<fieldType name="doublerange2d" class="solr.numericrange.DoubleRangeField" numDimensions="2"/>
<fieldType name="doublerange3d" class="solr.numericrange.DoubleRangeField" numDimensions="3"/>
<fieldType name="doublerange4d" class="solr.numericrange.DoubleRangeField" numDimensions="4"/>
<fieldType name="doublerange" class="solr.DoubleRangeField" numDimensions="1"/>
<fieldType name="doublerange2d" class="solr.DoubleRangeField" numDimensions="2"/>
<fieldType name="doublerange3d" class="solr.DoubleRangeField" numDimensions="3"/>
<fieldType name="doublerange4d" class="solr.DoubleRangeField" numDimensions="4"/>

<!-- Field definitions -->
<field name="id" type="string" indexed="true" stored="true" required="true" multiValued="false"/>
Expand Down
8 changes: 4 additions & 4 deletions ...solr-ref-guide/modules/indexing-guide/pages/field-types-included-with-solr.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,17 +51,17 @@ The {solr-javadocs}/core/org/apache/solr/schema/package-summary.html[`org.apache

|IntPointField |Integer field (32-bit signed integer). This class encodes int values using a "Dimensional Points" based data structure that allows for very efficient searches for specific values, or ranges of values. For single valued fields, `docValues="true"` must be used to enable sorting.

|IntRangeField |Stores single or multi-dimensional ranges, using syntax like `[1 TO 4]` or `[1,2 TO 3,4]`. Up to 4 dimensions are supported. Dimensionality is specified on new field-types using a `numDimensions` property, and all values for a particular field must have exactly this number of dimensions. Field type is defined in the `org.apache.solr.schema.numericrange` package; fieldType definitions typically reference this as: `<fieldType name="intrange1D" class="solr.numericrange.IntRangeField" numDimensions="1"/>`. Field type does not support docValues. Typically queried using the xref:query-guide:other-parsers.adoc#numeric-range-query-parser[Numeric Range Query Parser], though the Lucene and other query parsers also support this field by assuming "contains" semantics for searches.
|IntRangeField |Stores single or multi-dimensional ranges, using syntax like `[1 TO 4]` or `[1,2 TO 3,4]`. Up to 4 dimensions are supported. Dimensionality is specified on new field-types using a `numDimensions` property, and all values for a particular field must have exactly this number of dimensions. Field type does not support docValues. Typically queried using the xref:query-guide:other-parsers.adoc#numeric-range-query-parser[Numeric Range Query Parser], though the Lucene and other query parsers also support this field by assuming "contains" semantics for searches.

|LatLonPointSpatialField |A latitude/longitude coordinate pair; possibly multi-valued for multiple points. Usually it's specified as "lat,lon" order with a comma. See the section xref:query-guide:spatial-search.adoc[] for more information.

|LongPointField |Long field (64-bit signed integer). This class encodes foo values using a "Dimensional Points" based data structure that allows for very efficient searches for specific values, or ranges of values. For single valued fields, `docValues="true"` must be used to enable sorting.

|LongRangeField |Stores single or multi-dimensional ranges of long integers, using syntax like `[1000000000 TO 4000000000]` or `[1,2 TO 3,4]`. Up to 4 dimensions are supported. Dimensionality is specified on new field-types using a `numDimensions` property, and all values for a particular field must have exactly this number of dimensions. Field type is defined in the `org.apache.solr.schema.numericrange` package; fieldType definitions typically reference this as: `<fieldType name="longrange1D" class="solr.numericrange.LongRangeField" numDimensions="1"/>`. Field type does not support docValues. Typically queried using the xref:query-guide:other-parsers.adoc#numeric-range-query-parser[Numeric Range Query Parser], though the Lucene and other query parsers also support this field by assuming "contains" semantics for searches.
|LongRangeField |Stores single or multi-dimensional ranges of long integers, using syntax like `[1000000000 TO 4000000000]` or `[1,2 TO 3,4]`. Up to 4 dimensions are supported. Dimensionality is specified on new field-types using a `numDimensions` property, and all values for a particular field must have exactly this number of dimensions. Field type does not support docValues. Typically queried using the xref:query-guide:other-parsers.adoc#numeric-range-query-parser[Numeric Range Query Parser], though the Lucene and other query parsers also support this field by assuming "contains" semantics for searches.

|DoubleRangeField |Stores single or multi-dimensional ranges of double-precision floating-point numbers, using syntax like `[1.5 TO 2.5]` or `[1.0,2.0 TO 3.0,4.0]`. Up to 4 dimensions are supported. Dimensionality is specified on new field-types using a `numDimensions` property, and all values for a particular field must have exactly this number of dimensions. Field type is defined in the `org.apache.solr.schema.numericrange` package; fieldType definitions typically reference this as: `<fieldType name="doublerange1D" class="solr.numericrange.DoubleRangeField" numDimensions="1"/>`. Field type does not support docValues. Typically queried using the xref:query-guide:other-parsers.adoc#numeric-range-query-parser[Numeric Range Query Parser], though the Lucene and other query parsers also support this field by assuming "contains" semantics for searches.
|DoubleRangeField |Stores single or multi-dimensional ranges of double-precision floating-point numbers, using syntax like `[1.5 TO 2.5]` or `[1.0,2.0 TO 3.0,4.0]`. Up to 4 dimensions are supported. Dimensionality is specified on new field-types using a `numDimensions` property, and all values for a particular field must have exactly this number of dimensions. Field type does not support docValues. Typically queried using the xref:query-guide:other-parsers.adoc#numeric-range-query-parser[Numeric Range Query Parser], though the Lucene and other query parsers also support this field by assuming "contains" semantics for searches.

|FloatRangeField |Stores single or multi-dimensional ranges of floating-point numbers, using syntax like `[1.5 TO 4.5]` or `[1.0,2.0 TO 3.0,4.0]`. Up to 4 dimensions are supported. Dimensionality is specified on new field-types using a `numDimensions` property, and all values for a particular field must have exactly this number of dimensions. Field type is defined in the `org.apache.solr.schema.numericrange` package; fieldType definitions typically reference this as: `<fieldType name="floatrange1D" class="solr.numericrange.FloatRangeField" numDimensions="1"/>`. Field type does not support docValues. Typically queried using the xref:query-guide:other-parsers.adoc#numeric-range-query-parser[Numeric Range Query Parser], though the Lucene and other query parsers also support this field by assuming "contains" semantics for searches.
|FloatRangeField |Stores single or multi-dimensional ranges of floating-point numbers, using syntax like `[1.5 TO 4.5]` or `[1.0,2.0 TO 3.0,4.0]`. Up to 4 dimensions are supported. Dimensionality is specified on new field-types using a `numDimensions` property, and all values for a particular field must have exactly this number of dimensions. Field type does not support docValues. Typically queried using the xref:query-guide:other-parsers.adoc#numeric-range-query-parser[Numeric Range Query Parser], though the Lucene and other query parsers also support this field by assuming "contains" semantics for searches.

|NestPathField | Specialized field type storing enhanced information, when xref:indexing-nested-documents.adoc#schema-configuration[working with nested documents].

Expand Down
Loading