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.

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

Additional changes for graph indexer backport #5916

Merged
merged 8 commits into from
Nov 22, 2022

Conversation

laritakr
Copy link
Contributor

@laritakr laritakr commented Nov 21, 2022

Additional fixes to #5858

With the prior backport, collection nesting does not work with the graph indexer. This fixes remaining pieces.

Changes proposed in this pull request:

  • Remove nesting depth check when using graph indexer
  • NestingAttributes subclass is not applicable to graph indexer

@samvera/hyrax-code-reviewers

@laritakr laritakr marked this pull request as ready for review November 21, 2022 21:28
Copy link
Member

@orangewolf orangewolf left a comment

Choose a reason for hiding this comment

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

I pulled this in to Hyku tonight and tested with the indexer both on and off.

@laritakr laritakr merged commit e2c7913 into 3.x-stable Nov 22, 2022
@laritakr laritakr deleted the additional-backport-graph-indexer-fixes branch November 22, 2022 17:24
jeremyf added a commit to scientist-softserv/adventist-dl that referenced this pull request Nov 29, 2022
Prior to this commit, we had disabled the logic for indexing the parent
child relationships of objects.  This results in broken behavior
regarding nesting collections and works.  Were we to enable the
"classic" strategy for indexing, we created significant (and known)
performance issues.

With this commit, we are taking code that was backported to the 3.x
branch of Hyrax via [samvera/hyrax#5858][5858] and
[samvera/hyrax#5916][5916] and projecting that onto the 2.9.x
implementation.

This projection means that we are not directly backporting but instead
structuring the code such that if you include it, it assumes you using
SOLR's native graph indexing.  The aforementioned PRs put those changes
behind a configuration variable; which is not something that makes sense
given this "hack".

This PR aims to resolve three issues, which by their nature, are
inter-related.  The issues are:

- [x] Adding works to a collection [#59][59]
- [x] Backporting graph indexing [#68][68]
- [ ] Adding a collection to another collection [#70][70]

[59]:https://github.com/scientist-softserv/adventist-dl/issues/59
[68]:https://github.com/scientist-softserv/adventist-dl/issues/68
[70]:https://github.com/scientist-softserv/adventist-dl/issues/70
[5858]:samvera/hyrax#5858
[5916]:samvera/hyrax#5916
jeremyf added a commit to scientist-softserv/adventist-dl that referenced this pull request Nov 29, 2022
Prior to this commit, we had disabled the logic for indexing the parent
child relationships of objects.  This results in broken behavior
regarding nesting collections and works.  Were we to enable the
"classic" strategy for indexing, we created significant (and known)
performance issues.

With this commit, we are taking code that was backported to the 3.x
branch of Hyrax via [samvera/hyrax#5858][5858] and
[samvera/hyrax#5916][5916] and projecting that onto the 2.9.x
implementation.

This projection means that we are not directly backporting but instead
structuring the code such that if you include it, it assumes you using
SOLR's native graph indexing.  The aforementioned PRs put those changes
behind a configuration variable; which is not something that makes sense
given this "hack."

This PR aims to resolve three issues, which by their nature, are
inter-related.  The issues are:

- [x] Adding works to a collection [#59][59]
- [x] Backporting graph indexing [#68][68]
- [x] Adding a collection to another collection [#70][70]

[59]: https://github.com/scientist-softserv/adventist-dl/issues/59
[68]: https://github.com/scientist-softserv/adventist-dl/issues/68
[70]: https://github.com/scientist-softserv/adventist-dl/issues/70
[5858]: samvera/hyrax#5858
[5916]: samvera/hyrax#5916
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants