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

Issues 1921, 1923, and 2499 - whole-system search updates and related changes #2519

Merged
merged 34 commits into from
Jun 25, 2021
Merged

Issues 1921, 1923, and 2499 - whole-system search updates and related changes #2519

merged 34 commits into from
Jun 25, 2021

Conversation

prb112
Copy link
Contributor

@prb112 prb112 commented Jun 16, 2021 •
edited by lmsurpre
Loading

Addresses #1921, #1923, and #2499.

Also includes schema updates associated with #2195 and partially addresses #2348 by introducing ParameterTableSupport

@punktilious
issue 1921 - populate whole system search tables. Incl. 1923
18893ad 
Signed-off-by: Robin Arnold <robin.arnold23@ibm.com>
@punktilious
issue 1921 - populate whole system search tables. Incl. 1923. Added c…
9b221f8 
…anonical url parsing

Signed-off-by: Robin Arnold <robin.arnold23@ibm.com>
@punktilious
issue 1921 - populate whole system search tables. Incl. 1923. Add tags
d9b2cd9 
Signed-off-by: Robin Arnold <robin.arnold23@ibm.com>
@punktilious
issue 1921/1923 fixed migration and profile/tags persistence
adc5ade 
Signed-off-by: Robin Arnold <robin.arnold23@ibm.com>
@punktilious
issue 1921/1923 updated new query builder to use new profile and tag …
d08d958 
…param tables

Signed-off-by: Robin Arnold <robin.arnold23@ibm.com>
@punktilious
issue 1921/1923 fixed check for when to add tag and profile data
e708d61 
Signed-off-by: Robin Arnold <robin.arnold23@ibm.com>
@punktilious
issue-2499 - fix schema-name argument handling in fhir-bucket
0676ad4 
Signed-off-by: Robin Arnold <robin.arnold23@ibm.com>
@punktilious
issue 2499 - use schema-name from fhir-bucket cli
7e49bec 
Signed-off-by: Robin Arnold <robin.arnold23@ibm.com>
@punktilious
issue 2155 - schema V0015 added parameter_hash to logical_resources
3d47a09 
Signed-off-by: Robin Arnold <robin.arnold23@ibm.com>
@punktilious
issue-1922 add dedicated tables for security search params
bf6b18a 
Signed-off-by: Robin Arnold <robin.arnold23@ibm.com>
tbieste
tbieste reviewed Jun 21, 2021
View reviewed changes
fhir-bucket/src/main/java/com/ibm/fhir/bucket/interop/InteropWorkload.java Show resolved Hide resolved
fhir-bucket/src/main/java/com/ibm/fhir/bucket/persistence/GetLastProcessedLineNumber.java Outdated Show resolved Hide resolved
...tence-jdbc/src/main/java/com/ibm/fhir/persistence/jdbc/cache/CommonTokenValuesCacheImpl.java Outdated Show resolved Hide resolved
...nce-jdbc/src/main/java/com/ibm/fhir/persistence/jdbc/cache/FHIRPersistenceJDBCCacheUtil.java Show resolved Hide resolved
...ence-jdbc/src/main/java/com/ibm/fhir/persistence/jdbc/connection/CreateTempTablesAction.java Outdated Show resolved Hide resolved
fhir-persistence-jdbc/src/main/java/com/ibm/fhir/persistence/jdbc/dto/CompositeParmVal.java Outdated Show resolved Hide resolved
fhir-persistence-jdbc/src/main/java/com/ibm/fhir/persistence/jdbc/dto/DateParmVal.java Show resolved Hide resolved
fhir-persistence-jdbc/src/main/java/com/ibm/fhir/persistence/jdbc/dto/StringParmVal.java Outdated Show resolved Hide resolved
fhir-persistence-jdbc/src/main/java/com/ibm/fhir/persistence/jdbc/dto/UriParmVal.java Show resolved Hide resolved
...ence-jdbc/src/main/java/com/ibm/fhir/persistence/jdbc/impl/ParameterTransactionDataImpl.java Show resolved Hide resolved
@punktilious
issue-1922 merged with main and fixed minor args error with issue-2211
6c18b9b 
Signed-off-by: Robin Arnold <robin.arnold23@ibm.com>
@lmsurpre lmsurpre changed the title Feature Branch Issues 1921, 1923, and 2499 - whole-system search updates and related changes Jun 22, 2021
@lmsurpre
Copy link
Member

deprecates UriParmVal.java

lmsurpre
lmsurpre reviewed Jun 23, 2021
View reviewed changes
...tence-schema/src/main/java/com/ibm/fhir/schema/control/InitializeLogicalResourceDenorms.java
updateStatement.setLong(3, logicalResourceId);
updateStatement.setInt(4, versionId);
updateStatement.setInt(3, versionId);
updateStatement.setLong(4, logicalResourceId);
Copy link
Member

Choose a reason for hiding this comment

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

this is a good catch but what was the result of the previous code? I guess InitializeLogicalResourceDenorms.java was just broken for Derby?

Copy link
Collaborator

@punktilious punktilious Jun 25, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

yes - I expect it would fail with FK violations

michaelwschroeder and others added 7 commits June 23, 2021 07:25
@michaelwschroeder
Issue #1922 - updates for old query builder to work with new tables
1b06d61 
Signed-off-by: Mike Schroeder <mschroed@us.ibm.com>
@michaelwschroeder
Issue #1922 - add union support, implement whole-system with _type
2ccfb79 
Signed-off-by: Mike Schroeder <mschroed@us.ibm.com>
@michaelwschroeder
Issue #1922 - support _tag text and sort searches
44bd4b6 
Signed-off-by: Mike Schroeder <mschroed@us.ibm.com>
@michaelwschroeder
Issue #1922 - fix tag value search (:in, :not-in, :above, :below)
00dd116 
Signed-off-by: Mike Schroeder <mschroed@us.ibm.com>
@michaelwschroeder
Issue #1922 - updates after rebasing
19ca8d3 
Signed-off-by: Mike Schroeder <mschroed@us.ibm.com>
@michaelwschroeder
Issue #1922 - support _source parm, address review comments, add tests
ff2edf3 
Signed-off-by: Mike Schroeder <mschroed@us.ibm.com>
@punktilious
Merge pull request #2490 from IBM/issue-1922
5ff0b83 
Issue #1922 - implement whole-system search in new query builder
lmsurpre
lmsurpre reviewed Jun 23, 2021
View reviewed changes
...-persistence-jdbc/src/main/java/com/ibm/fhir/persistence/jdbc/dao/api/JDBCIdentityCache.java
* Get the set of all resource type names.
* @return
*/
Set<String> getResourceTypeNames() throws FHIRPersistenceException;
Copy link
Member

Choose a reason for hiding this comment

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

In ModelSupport we have a similar method which takes an argument for whether or not you want it to include "abstract" types.
At the very least I think we should clearly document whether this list will include those types or not (seems like yes at the moment, but should it?)

Copy link
Collaborator

Choose a reason for hiding this comment

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

We should fix this when we properly implement support for a subset of resources (so that the whole-system search union only selects from the tables which are actually provisioned in the schema).

Copy link
Member

Choose a reason for hiding this comment

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

Added as a comment to #819 (comment) but I still think we should update the javadoc to indicate that it current returns abstract types in the meantime.

punktilious and others added 12 commits June 23, 2021 15:41
@punktilious
issue-1922 use common method for parameter table delete
1498d61 
Signed-off-by: Robin Arnold <robin.arnold23@ibm.com>
@michaelwschroeder
Issue #1922 - don't run reindex tests during search tests
39ffcfe 
Signed-off-by: Mike Schroeder <mschroed@us.ibm.com>
@michaelwschroeder
Issue #1922 - fix reindex test
ee4e10b 
Signed-off-by: Mike Schroeder <mschroed@us.ibm.com>
@prb112
Adding logging
e6ed1f0 
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
@prb112
Update
e1b7777 
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
@prb112
Update
2a326ba 
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
@punktilious
issues 2155 1922 address review comments
0e08b1d 
Signed-off-by: Robin Arnold <robin.arnold23@ibm.com>
@prb112
Update for SortingTest
43868bf 
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
@prb112
Update
a593928 
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
@prb112
update to turn down logging
6b62c97 
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
@punktilious
issue 1922 review comment to tighten isWholeSystem to specific list o…
7c992d1 
…f parameter codes

Signed-off-by: Robin Arnold <robin.arnold23@ibm.com>
@michaelwschroeder
Merge pull request #2552 from IBM/issue-1922b
3cf996c 
Issue #1922 - don't run reindex tests during search tests
michaelwschroeder
michaelwschroeder approved these changes Jun 25, 2021
View reviewed changes
Copy link
Contributor

@michaelwschroeder michaelwschroeder left a comment

Choose a reason for hiding this comment

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

LGTM - just some minor documentation comments

...ersistence-jdbc/src/main/java/com/ibm/fhir/persistence/jdbc/dao/impl/ResourceProfileRec.java Show resolved Hide resolved
fhir-persistence-jdbc/src/main/java/com/ibm/fhir/persistence/jdbc/derby/DerbyResourceDAO.java Show resolved Hide resolved
...rsistence-jdbc/src/main/java/com/ibm/fhir/persistence/jdbc/impl/FHIRPersistenceJDBCImpl.java Show resolved Hide resolved
...rsistence-jdbc/src/main/java/com/ibm/fhir/persistence/jdbc/postgres/PostgresResourceDAO.java Show resolved Hide resolved
...nce-jdbc/src/main/java/com/ibm/fhir/persistence/jdbc/postgres/PostgresResourceNoProcDAO.java Show resolved Hide resolved
...nce-jdbc/src/main/java/com/ibm/fhir/persistence/jdbc/postgres/PostgresResourceNoProcDAO.java Show resolved Hide resolved
fhir-persistence-schema/derby2.properties Outdated Show resolved Hide resolved
@lmsurpre lmsurpre changed the title Issues 1921, 1923, and 2499 - whole-system search updates and related changes Issues 1921, 1923, 2348, and 2499 - whole-system search updates and related changes Jun 25, 2021
@lmsurpre lmsurpre mentioned this pull request Jun 25, 2021
Closed
@lmsurpre lmsurpre self-requested a review June 25, 2021 17:36
lmsurpre
lmsurpre approved these changes Jun 25, 2021
View reviewed changes
Copy link
Member

@lmsurpre lmsurpre left a comment

Choose a reason for hiding this comment

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

LGTM

@punktilious punktilious merged commit 583b798 into main Jun 25, 2021
@punktilious punktilious deleted the robin-perf-eval branch June 25, 2021 18:44
@lmsurpre lmsurpre changed the title Issues 1921, 1923, 2348, and 2499 - whole-system search updates and related changes Issues 1921, 1923, and 2499 - whole-system search updates and related changes Jun 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tbieste tbieste tbieste left review comments

@punktilious punktilious punktilious left review comments

@michaelwschroeder michaelwschroeder michaelwschroeder approved these changes

@lmsurpre lmsurpre lmsurpre approved these changes

Assignees
No one assigned
Labels
deprecation
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@prb112 @lmsurpre @punktilious @tbieste @michaelwschroeder