Skip to content
New issue

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

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

Already on GitHub? # to your account

EZP-30835: Added support for Solr 7.7 #136

Merged
merged 1 commit into from
Oct 4, 2019
Merged

EZP-30835: Added support for Solr 7.7 #136

merged 1 commit into from
Oct 4, 2019

Conversation

adamwojs
Copy link
Member

@adamwojs adamwojs commented Apr 17, 2019

JIRA: https://jira.ez.no/browse/EZP-30835

Related SOLR issues

https://issues.apache.org/jira/browse/SOLR-11501:

Starting a query string with local-params {!myparser ...} is used to switch the
query parser to another, and is intended for use by Solr system developers, not end users doing searches. To reduce negative side-effects of unintended hack-ability, we've limited the cases that local-params will be parsed to only contexts in which the default parser is "lucene" or "func". So if defType=edismax then q={!myparser ...} won't work. In that example, put the desired query parser into defType. Another example is if deftype=edismax then hl.q={!myparser ...} won't work for the same reason. In that example, either put the desired query parser into hl.qparser or set hl.qparser=lucene. Most users won't run into these cases but some will and must change. If you must have full backwards compatibility, use luceneMatchVersion=7.1.0 or something earlier.

Ref. https://github.com/ezsystems/ezplatform-solr-search-engine/pull/136/files#diff-d75c9ba9fe393b04edf2db8762aa77b7L65

https://issues.apache.org/jira/browse/SOLR-10503:

CurrencyField has been deprecated in favor of new CurrencyFieldType

Dropped as is not used by eZ Platform

https://issues.apache.org/jira/browse/SOLR-10729:

Deprecated LatLonType, GeoHashField, SpatialPointVectorFieldType, and SpatialTermQueryPrefixTreeFieldType. Instead, switch to LatLonPointSpatialField or SpatialRecursivePrefixTreeFieldType or RptWithGeometrySpatialField.

Will be processed as a separate task: https://jira.ez.no/browse/EZP-30977

https://issues.apache.org/jira/browse/SOLR-?????:

Deprecated: All Trie* numeric and date field types have been deprecated in favor of *Point field types.

Replaced according to suggestion

https://issues.apache.org/jira/browse/SOLR-12770:

The 'shards' parameter handling logic changes to use a new config element to determine what hosts can be requested.

This is CI only related issue

https://issues.apache.org/jira/browse/SOLR-?????:

Index-time boosts have been removed from Lucene, and are no longer available from Solr. If any boosts are provided, they will be ignored by the indexing chain. As a replacement, index-time scoring factors should be indexed in a separate field and combined with the query score using a function query. See the section Function Queries for more information.

Ref. https://lucene.apache.org/solr/guide/7_2/major-changes-in-solr-7.html

Release

Due to the major changes in Solr, support for 7.X will be part of the ezplatform-solr-search-engine 2.0 release which will be compatible with eZ Platform 2.5 release. Solr 6.X will be dropped in this release.

Solr 7.X and Solr 8.X will be officialy supported in ezplatform-solr-search-engine 3.0 release which will be compatible with eZ Platform 3.X.

TODO
  • Add entries to the test matrix
  • Adjust bin/generate-solr-config.sh
  • Adjust schema.xml

@adamwojs adamwojs changed the title [Travis] Add coverage for Solr 7.7.1 [WIP][Travis] Add coverage for Solr 7.7.1 Apr 18, 2019
@adamwojs adamwojs self-assigned this Apr 18, 2019
@andrerom
Copy link
Contributor

Will this also pass on Solr 6.6 or we drop support for that in 1.6?

@adamwojs
Copy link
Member Author

Will this also pass on Solr 6.6 or we drop support for that in 1.6?

I will check 😉 IMHO we should drop Solr 6.6 support in release with Solr 7. Changelog for Solr/Lucene between 6.6 and 7.X is big (includes BC breaks) which might make hard to have the support of the same feature set for both versions.

@andrerom
Copy link
Contributor

andrerom commented May 29, 2019

ok 👍

@@ -44,7 +44,7 @@ fi
download() {
case ${SOLR_VERSION} in
# PS!!: Append versions and don't remove old once, kernel uses this script!
6.3.0|6.4.1|6.4.2|6.5.1|6.6.0|6.6.5 )
6.3.0|6.4.1|6.4.2|6.5.1|6.6.0|6.6.5|7.7.1 )
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: 7.7.2 is out
Also, any idea how much they have broken in 8 in terms of also testing this branch on Solr 8.2?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nitpick: 7.7.2 is out

Thanks for the information! I will update PR.

Also, any idea how much they have broken in 8 in terms of also testing this branch on Solr 8.2?

Let's add 8.2 to the test matrix and we will see 😉

@adamwojs adamwojs changed the title [WIP][Travis] Add coverage for Solr 7.7.1 [WIP][Travis] Add coverage for Solr 7.7.2 Aug 1, 2019
bin/.travis/init_solr.sh Outdated Show resolved Hide resolved
@andrerom
Copy link
Contributor

andrerom commented Aug 23, 2019

@adamwojs we kind of need this in 2.5 as well, people are expecting to be able to use 7.7LTS given 6.6 is starting to show its age.

Another issue is Debian 10 coming with Java 11, however don't seems like any Solr version supports it yet, so it's more likely to be added in upcoming Solr 8.x release.

@adamwojs adamwojs changed the title [WIP][Travis] Add coverage for Solr 7.7.2 [WIP][Travis] Add coverage for Solr 7.7 and 8.2 Aug 29, 2019
@adamwojs adamwojs changed the title [WIP][Travis] Add coverage for Solr 7.7 and 8.2 [WIP] Support for Solr 7.7 and 8.2 Sep 22, 2019
@adamwojs adamwojs force-pushed the solr_77 branch 2 times, most recently from 29d12fb to d8c7400 Compare September 23, 2019 18:00
@adamwojs adamwojs changed the title [WIP] Support for Solr 7.7 and 8.2 [WIP] EZP-30835: Support for Solr 7.7 and 8.2 Sep 25, 2019
@adamwojs adamwojs force-pushed the solr_77 branch 2 times, most recently from 5097963 to 31d145e Compare September 25, 2019 12:16
@adamwojs adamwojs changed the base branch from master to 2.0 September 26, 2019 11:12
@adamwojs adamwojs force-pushed the solr_77 branch 2 times, most recently from 0c43666 to ec9adee Compare September 26, 2019 11:15
@adamwojs adamwojs changed the title [WIP] EZP-30835: Support for Solr 7.7 and 8.2 EZP-30835: Added support for Solr 7.7 Sep 26, 2019
@adamwojs
Copy link
Member Author

adamwojs commented Sep 26, 2019

@andrerom I discussed with @lserwatka Solr 7+ support in eZ Platform 2.5 and we decided to go as described in "Release" section in the PR description.

adamwojs added a commit that referenced this pull request Sep 30, 2019
Updated branch-alias for dev-master in composer.json according to #136

> Due to the major changes in Solr, support for 7.X will be part of the ezplatform-solr-search-engine 2.0 release which will be compatible with eZ Platform 2.5 release. Solr 6.X will be dropped in this release.

> Solr 7.X and Solr 8.X will be officialy supported in ezplatform-solr-search-engine 3.0 release which will be compatible with eZ Platform 3.X.
lserwatka pushed a commit that referenced this pull request Sep 30, 2019
Updated branch-alias for dev-master in composer.json according to #136

> Due to the major changes in Solr, support for 7.X will be part of the ezplatform-solr-search-engine 2.0 release which will be compatible with eZ Platform 2.5 release. Solr 6.X will be dropped in this release.

> Solr 7.X and Solr 8.X will be officialy supported in ezplatform-solr-search-engine 3.0 release which will be compatible with eZ Platform 3.X.
Copy link
Member

@alongosz alongosz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general I'd see README.md updated as well, to remember which version of Solr Bundle supports which Solr engine version.

@@ -44,7 +44,7 @@ fi
download() {
case ${SOLR_VERSION} in
# PS!!: Append versions and don't remove old once, kernel uses this script!
6.3.0|6.4.1|6.4.2|6.5.1|6.6.0|6.6.5 )
6.3.0|6.4.1|6.4.2|6.5.1|6.6.0|6.6.5|7.7.2 )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we decided to drop support for Solr 6.x in 2.0 of this bundle, we probably should remove them here as well, to avoid suggestion we still support it.


files+=("${config_dir}/currency.xml")
if [[ $SOLR_VERSION =~ ^(7) ]]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this check if we support 7.x only now?

files+=("${config_dir}/elevate.xml")
files+=("${config_dir}/solrconfig.xml")

if [[ ! $SOLR_VERSION =~ ^(7) ]]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same question here

cp ${SOLR_INSTALL_DIR}/server/solr/configsets/basic_configs/conf/{currency.xml,solrconfig.xml,stopwords.txt,synonyms.txt,elevate.xml} $DESTINATION_DIR

if [[ $SOLR_VERSION =~ ^(7|8) ]]; then
cp ${SOLR_INSTALL_DIR}/server/solr/configsets/_default/conf/{solrconfig.xml,stopwords.txt,synonyms.txt} $DESTINATION_DIR
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and here

Copy link
Member

@kmadejski kmadejski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Besides previous comments it looks good to me, great job @adamwojs!

@adamwojs
Copy link
Member Author

adamwojs commented Oct 1, 2019

PR updated according to @alongosz code review suggestions.

composer.json Outdated
@@ -12,7 +12,7 @@
],
"require": {
"php": "^7.1",
"ezsystems/ezpublish-kernel": "^7.5@dev",
"ezsystems/ezpublish-kernel": "dev-solr_77 as 7.5",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Friendly reminder ;)

@m-tyrala
Copy link

m-tyrala commented Oct 3, 2019

Everything's fine for me, QA approve.

@adamwojs
Copy link
Member Author

adamwojs commented Oct 4, 2019

PR has been rebased and squashed.

@alongosz
Copy link
Member

alongosz commented Oct 4, 2019

Requires ezsystems/ezpublish-kernel#2775 for tests to pass, so merging now.

@alongosz alongosz merged commit da9056d into 2.0 Oct 4, 2019
@alongosz alongosz deleted the solr_77 branch October 4, 2019 07:36
@alongosz
Copy link
Member

alongosz commented Oct 4, 2019

@adamwojs could you merge up?

@adamwojs
Copy link
Member Author

adamwojs commented Oct 4, 2019

Done.

# for free to join this conversation on GitHub. Already have an account? # to comment
Development

Successfully merging this pull request may close these issues.

5 participants