Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions config/solr/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@
<fieldType name="string" class="solr.StrField" sortMissingLast="true" />
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>

<fieldType name="int" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
<fieldType name="float" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
<fieldType name="long" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
<fieldType name="double" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>

<!-- The format for this date field is of the form 1995-12-31T23:59:59Z.
The trailing "Z" designates UTC time and is mandatory.
A Trie based date field for faster date range queries and date faceting. -->
<fieldType name="date" class="solr.TrieDateField" precisionStep="6" positionIncrementGap="0"/>
<fieldType name="int" class="solr.IntPointField"/>
<fieldType name="float" class="solr.FloatPointField"/>
<fieldType name="long" class="solr.LongPointField"/>
<fieldType name="double" class="solr.DoublePointField"/>

<!-- The format for this date field is of the form 1995-12-31T23:59:59Z.
The trailing "Z" designates UTC time and is mandatory.
A Point-based date field for fast date range queries and date faceting. -->
<fieldType name="date" class="solr.DatePointField"/>

<!-- A DateRange based date field for truly faster date range queries. -->
<fieldType name="dateRange" class="solr.DateRangeField"/>
Expand Down
2 changes: 1 addition & 1 deletion solr/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM solr:8
FROM solr:9

COPY --chown=solr . /var/solr/data/
20 changes: 10 additions & 10 deletions solr/geodata-test/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
termVectors="true" termPositions="true" termOffsets="true"/>
<dynamicField name="*_tmi" type="text_en" stored="false" indexed="true" multiValued="true"
termVectors="true" termPositions="true" termOffsets="true"/>
<dynamicField name="*_sort" type="text_sort" stored="false" indexed="true" multiValued="false"/>
<dynamicField name="*_sort" type="text_sort" stored="false" indexed="true" docValues="true" multiValued="false"/>

<dynamicField name="*spell" type="textSpell" indexed="true" stored="false" multiValued="true" />

Expand All @@ -66,15 +66,15 @@
<fieldType name="string" class="solr.StrField" sortMissingLast="true" />
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>

<fieldType name="int" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
<fieldType name="float" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
<fieldType name="long" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
<fieldType name="double" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
<fieldType name="int" class="solr.IntPointField"/>
<fieldType name="float" class="solr.FloatPointField"/>
<fieldType name="long" class="solr.LongPointField"/>
<fieldType name="double" class="solr.DoublePointField"/>

<!-- The format for this date field is of the form 1995-12-31T23:59:59Z.
The trailing "Z" designates UTC time and is mandatory.
A Trie based date field for faster date range queries and date faceting. -->
<fieldType name="date" class="solr.TrieDateField" precisionStep="6" positionIncrementGap="0"/>
<fieldType name="date" class="solr.DatePointField"/>

<!-- A DateRange based date field for truly faster date range queries. -->
<fieldType name="dateRange" class="solr.DateRangeField"/>
Expand Down Expand Up @@ -107,12 +107,12 @@
</analyzer>
</fieldType>

<!-- for alpha sorting as a single token -->
<fieldType name="text_sort" class="solr.TextField" sortMissingLast="true" omitNorms="true">
<!-- Solr 9-compatible sortable text with normalization -->
<fieldType name="text_sort" class="solr.SortableTextField" sortMissingLast="true">
<analyzer>
<tokenizer class="solr.KeywordTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory" />
<filter class="solr.TrimFilterFactory" />
<filter class="solr.LowerCaseFilterFactory"/>
<filter class="solr.TrimFilterFactory"/>
<filter class="solr.PatternReplaceFilterFactory" pattern="([^a-z0-9 ])" replacement="" replace="all"/>
</analyzer>
</fieldType>
Expand Down
2 changes: 1 addition & 1 deletion solr/geodata-test/solrconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
<luceneMatchVersion>7.6</luceneMatchVersion>
<luceneMatchVersion>9.12.3</luceneMatchVersion>

<lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
<lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
Expand Down
26 changes: 13 additions & 13 deletions solr/geodata/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
termVectors="true" termPositions="true" termOffsets="true"/>
<dynamicField name="*_tmi" type="text_en" stored="false" indexed="true" multiValued="true"
termVectors="true" termPositions="true" termOffsets="true"/>
<dynamicField name="*_sort" type="text_sort" stored="false" indexed="true" multiValued="false"/>
<dynamicField name="*_sort" type="text_sort" stored="false" indexed="true" docValues="true" multiValued="false"/>

<dynamicField name="*spell" type="textSpell" indexed="true" stored="false" multiValued="true" />

Expand All @@ -66,15 +66,15 @@
<fieldType name="string" class="solr.StrField" sortMissingLast="true" />
<fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>

<fieldType name="int" class="solr.TrieIntField" precisionStep="8" positionIncrementGap="0"/>
<fieldType name="float" class="solr.TrieFloatField" precisionStep="8" positionIncrementGap="0"/>
<fieldType name="long" class="solr.TrieLongField" precisionStep="8" positionIncrementGap="0"/>
<fieldType name="double" class="solr.TrieDoubleField" precisionStep="8" positionIncrementGap="0"/>
<fieldType name="int" class="solr.IntPointField"/>
<fieldType name="float" class="solr.FloatPointField"/>
<fieldType name="long" class="solr.LongPointField"/>
<fieldType name="double" class="solr.DoublePointField"/>

<!-- The format for this date field is of the form 1995-12-31T23:59:59Z.
The trailing "Z" designates UTC time and is mandatory.
A Trie based date field for faster date range queries and date faceting. -->
<fieldType name="date" class="solr.TrieDateField" precisionStep="6" positionIncrementGap="0"/>
<!-- The format for this date field is of the form 1995-12-31T23:59:59Z.
The trailing "Z" designates UTC time and is mandatory.
A Point-based date field for fast date range queries and date faceting. -->
<fieldType name="date" class="solr.DatePointField"/>

<!-- A DateRange based date field for truly faster date range queries. -->
<fieldType name="dateRange" class="solr.DateRangeField"/>
Expand Down Expand Up @@ -107,12 +107,12 @@
</analyzer>
</fieldType>

<!-- for alpha sorting as a single token -->
<fieldType name="text_sort" class="solr.TextField" sortMissingLast="true" omitNorms="true">
<!-- Solr 9-compatible sortable text with normalization -->
<fieldType name="text_sort" class="solr.SortableTextField" sortMissingLast="true">
<analyzer>
<tokenizer class="solr.KeywordTokenizerFactory"/>
<filter class="solr.LowerCaseFilterFactory" />
<filter class="solr.TrimFilterFactory" />
<filter class="solr.LowerCaseFilterFactory"/>
<filter class="solr.TrimFilterFactory"/>
<filter class="solr.PatternReplaceFilterFactory" pattern="([^a-z0-9 ])" replacement="" replace="all"/>
</analyzer>
</fieldType>
Expand Down
2 changes: 1 addition & 1 deletion solr/geodata/solrconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
<luceneMatchVersion>7.6</luceneMatchVersion>
<luceneMatchVersion>9.12.3</luceneMatchVersion>

<lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
<lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
Expand Down
Loading