-
Notifications
You must be signed in to change notification settings - Fork 5
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
Search Improvements (OS/ES support) #298
base: master
Are you sure you want to change the base?
Conversation
…/icatproject/icat.server into 277_filterReadAccess_improvement
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will continue reviewing the rest of the changes after I re-review the changes you have made in the icat.lucene PR.
src/main/java/org/icatproject/core/manager/EntityBeanManager.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/EntityBeanManager.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/EntityBeanManager.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/EntityBeanManager.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/SearchManager.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/SearchManager.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/FacetDimension.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/FacetLabel.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/SearchApi.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/SearchApi.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/LuceneApi.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/LuceneApi.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/LuceneApi.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/OpensearchQueryBuilder.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/OpensearchQueryBuilder.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/OpensearchQueryBuilder.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/OpensearchScriptBuilder.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/OpensearchScriptBuilder.java
Show resolved
Hide resolved
@patrick-austin I have finished reviewing this PR so feel free to start addressing and pushing changes. Let me know when you are done and I will review your changes. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking much nicer, thanks for making the changes. Just a few docstring related comments which once address will make this PR ready to be merged.
src/main/java/org/icatproject/core/manager/search/OpensearchQuery.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/OpensearchQuery.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/OpensearchQuery.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/OpensearchQuery.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/OpensearchQuery.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/OpensearchQuery.java
Outdated
Show resolved
Hide resolved
src/main/java/org/icatproject/core/manager/search/OpensearchQuery.java
Outdated
Show resolved
Hide resolved
Co-authored-by: Viktor Bozhinov <45173816+VKTB@users.noreply.github.com>
6c27f0d
to
200cb3a
Compare
Covers a variety of improvements to free text search functionality.
Closes #267
Changes to functionality
Investigation
/Dataset
/Datafile
), we also use the public steps/tables to safely return nested information (such as aDatafileParameter
without additional time spent authorising)Changes to code
getDoc
either added or expanded, alongside the addition ofgetDocumentFields
which enforces that the search component does not return metadata that isn't allowed by the ICAT public steps/tablesICATRest
and added new endpointssearch/documents
andfacet/documents
EntityBeanManager
to support new search callsGateKeeper
to allow the publicly allowed search fields to be marked as stale and updated as public steps/tables are updatedPropertyHandler
to support differentSearchEngine
s as config options as well as other new config parametersLuceneManager
replaced with genericSearchManager
which interacts with the search engine via an instance ofSearchApi
SearchApi
, and abstract class for interfacing with search engine implementationsLuceneApi
modified extensively, and now extendsSearchApi
OpensearchApi
which extendsSearchApi
and supports either Opensearch or Elasticsearch clusters by building generic JSON. Also has some static functionality refactored into supporting classes:OpensearchQueryBuilder
OpensearchScriptBuilder
FacetDimension
andFacetLabel
to represent facets of results, and replacingLuceneSearchResult
withSearchResult
which has facet supportluceneAbc
tosearchAbc
to reflect what is or isn't specific to theicat.lucene
search engineInterdependencies on other components