Skip to content
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

Jump to bottom

4938 solr search order #5080

Merged
merged 10 commits into from Oct 4, 2018
Merged

4938 solr search order #5080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7b3fce2
Move boost from spell to select #4938
matthew-a-dunlap Sep 21, 2018
f5f5dac
New boost larger spread #4938
matthew-a-dunlap Sep 21, 2018
4a60546
Additional boost documentation #4938
matthew-a-dunlap Sep 21, 2018
b42cb62
Merge branch 'develop' into 4938-solr-search-order
matthew-a-dunlap Sep 21, 2018
d7eef18
Reboosted with extra boost for phrase matching #4938
matthew-a-dunlap Oct 1, 2018
e7576ec
Merge branch 'develop' into 4938-solr-search-order
matthew-a-dunlap Oct 3, 2018
81fd45f
Boost non-harvested #4938
matthew-a-dunlap Oct 3, 2018
f6252d5
More boost tweaks #4938
matthew-a-dunlap Oct 3, 2018
f7cf14e
Cleanup, update docker solrconfig.xml #4938
matthew-a-dunlap Oct 3, 2018
8136af4
Merge branch 'develop' into 4938-solr-search-order
matthew-a-dunlap Oct 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
65 changes: 43 additions & 22 deletions conf/docker/solr/solrconfig_master.xml
View file
Open in desktop
Expand Up @@ -686,13 +686,55 @@
of SearchComponents (see below) and supports distributed
queries across multiple shards
-->
<requestHandler name="/select" class="solr.SearchHandler">
<requestHandler name="/select" class="solr.SearchHandler">
<!-- default values for query parameters can be specified, these
will be overridden by parameters in the request
-->
<lst name="defaults">
<str name="echoParams">explicit</str>
<int name="rows">10</int>
<str name="defType">edismax</str>
<float name="tie">0.075</float>
<str name="qf">
dvName^400
authorName^180
dvSubject^190
dvDescription^180
dvAffiliation^170
title^130
subject^120
keyword^110
topicClassValue^100
dsDescriptionValue^90
authorAffiliation^80
publicationCitation^60
producerName^50
fileName^30
fileDescription^30
variableLabel^20
variableName^10
text^1.0
</str>
<str name="pf">
dvName^200
authorName^100
dvSubject^100
dvDescription^100
dvAffiliation^100
title^75
subject^75
keyword^75
topicClassValue^75
dsDescriptionValue^75
authorAffiliation^75
publicationCitation^75
producerName^75
</str>
<!-- Even though this number is huge it only seems to apply a boost of ~1.5x to final result -MAD 4.9.3 -->
<str name="bq">
isHarvested:false^25000
</str>

<!-- Default search field
<str name="df">text</str>
-->
Expand Down Expand Up @@ -924,27 +966,6 @@
<str name="spellcheck.collateExtendedResults">true</str>
<str name="spellcheck.maxCollationTries">10</str>
<str name="spellcheck.maxCollations">5</str>
<str name="defType">edismax</str>
<str name="qf">
dvName^170
dvSubject^160
dvDescription^150
dvAffiliation^140
title^130
subject^120
keyword^110
topicClassValue^100
dsDescriptionValue^90
authorName^80
authorAffiliation^70
publicationCitation^60
producerName^50
fileName^40
fileDescription^30
variableLabel^20
variableName^10
text^1.0
</str>
</lst>
<arr name="last-components">
<str>spellcheck</str>
Expand Down
65 changes: 43 additions & 22 deletions conf/docker/solr/solrconfig_slave.xml
View file
Open in desktop
Expand Up @@ -686,13 +686,55 @@
of SearchComponents (see below) and supports distributed
queries across multiple shards
-->
<requestHandler name="/select" class="solr.SearchHandler">
<requestHandler name="/select" class="solr.SearchHandler">
<!-- default values for query parameters can be specified, these
will be overridden by parameters in the request
-->
<lst name="defaults">
<str name="echoParams">explicit</str>
<int name="rows">10</int>
<str name="defType">edismax</str>
<float name="tie">0.075</float>
<str name="qf">
dvName^400
authorName^180
dvSubject^190
dvDescription^180
dvAffiliation^170
title^130
subject^120
keyword^110
topicClassValue^100
dsDescriptionValue^90
authorAffiliation^80
publicationCitation^60
producerName^50
fileName^30
fileDescription^30
variableLabel^20
variableName^10
text^1.0
</str>
<str name="pf">
dvName^200
authorName^100
dvSubject^100
dvDescription^100
dvAffiliation^100
title^75
subject^75
keyword^75
topicClassValue^75
dsDescriptionValue^75
authorAffiliation^75
publicationCitation^75
producerName^75
</str>
<!-- Even though this number is huge it only seems to apply a boost of ~1.5x to final result -MAD 4.9.3 -->
<str name="bq">
isHarvested:false^25000
</str>

<!-- Default search field
<str name="df">text</str>
-->
Expand Down Expand Up @@ -924,27 +966,6 @@
<str name="spellcheck.collateExtendedResults">true</str>
<str name="spellcheck.maxCollationTries">10</str>
<str name="spellcheck.maxCollations">5</str>
<str name="defType">edismax</str>
<str name="qf">
dvName^170
dvSubject^160
dvDescription^150
dvAffiliation^140
title^130
subject^120
keyword^110
topicClassValue^100
dsDescriptionValue^90
authorName^80
authorAffiliation^70
publicationCitation^60
producerName^50
fileName^40
fileDescription^30
variableLabel^20
variableName^10
text^1.0
</str>
</lst>
<arr name="last-components">
<str>spellcheck</str>
Expand Down
63 changes: 42 additions & 21 deletions conf/solr/7.3.0/solrconfig.xml
View file
Open in desktop
Expand Up @@ -693,6 +693,48 @@
<lst name="defaults">
<str name="echoParams">explicit</str>
<int name="rows">10</int>
<str name="defType">edismax</str>
<float name="tie">0.075</float>
<str name="qf">
dvName^400
authorName^180
dvSubject^190
dvDescription^180
dvAffiliation^170
title^130
subject^120
keyword^110
topicClassValue^100
dsDescriptionValue^90
authorAffiliation^80
publicationCitation^60
producerName^50
fileName^30
fileDescription^30
variableLabel^20
variableName^10
text^1.0
</str>
<str name="pf">
dvName^200
authorName^100
dvSubject^100
dvDescription^100
dvAffiliation^100
title^75
subject^75
keyword^75
topicClassValue^75
dsDescriptionValue^75
authorAffiliation^75
publicationCitation^75
producerName^75
</str>
<!-- Even though this number is huge it only seems to apply a boost of ~1.5x to final result -MAD 4.9.3 -->
<str name="bq">
isHarvested:false^25000
</str>

<!-- Default search field
<str name="df">text</str>
-->
Expand Down Expand Up @@ -924,27 +966,6 @@
<str name="spellcheck.collateExtendedResults">true</str>
<str name="spellcheck.maxCollationTries">10</str>
<str name="spellcheck.maxCollations">5</str>
<str name="defType">edismax</str>
<str name="qf">
dvName^170
dvSubject^160
dvDescription^150
dvAffiliation^140
title^130
subject^120
keyword^110
topicClassValue^100
dsDescriptionValue^90
authorName^80
authorAffiliation^70
publicationCitation^60
producerName^50
fileName^40
fileDescription^30
variableLabel^20
variableName^10
text^1.0
</str>
</lst>
<arr name="last-components">
<str>spellcheck</str>
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx-guides/source/installation/prerequisites.rst
View file
Open in desktop
Expand Up @@ -212,7 +212,7 @@ You should already have a "dvinstall.zip" file that you downloaded from https://
cp /tmp/dvinstall/schema.xml /usr/local/solr/solr-7.3.0/server/solr/collection1/conf
cp /tmp/dvinstall/solrconfig.xml /usr/local/solr/solr-7.3.0/server/solr/collection1/conf

Note: Dataverse has customized Solr to boost results that come from certain indexed elements inside Dataverse, for example results matching on the name of a dataset. If you would like to remove this, edit your ``solrconfig.xml`` and remove the ``<str name="qf">`` element and its contents.
Note: Dataverse has customized Solr to boost results that come from certain indexed elements inside Dataverse, for example prioritizing results from Dataverses over Datasets. If you would like to remove this, edit your ``solrconfig.xml`` and remove the ``<str name="qf">`` element and its contents. If you have ideas about how this boosting could be improved, feel free to contact us through our Google Group https://groups.google.com/forum/#!forum/dataverse-dev .

Dataverse requires a change to the ``jetty.xml`` file that ships with Solr. Edit ``/usr/local/solr/solr-7.3.0/server/etc/jetty.xml`` , increasing ``requestHeaderSize`` from ``8192`` to ``102400``

Expand Down