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

Use referenceindexentity table as leftmost table for [rev]includes #18

Draft
wants to merge 2 commits into
base: remove-resourcetype
Choose a base branch
from
Draft

Use referenceindexentity table as leftmost table for [rev]includes #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0419c5
Use referenceindexentity table as leftmost table for [rev]includes
LZRS Nov 26, 2024
7423494
Merge branch 'remove-resourcetype' into refactor-leftmost-reference-q…
dubdabasoduba Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions engine/src/main/java/com/google/android/fhir/search/MoreSearch.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ internal fun Search.getRevIncludeQuery(includeIds: List<String>): SearchQuery {
val filterQuery = generateFilterQuery(it)
"""
SELECT rie.index_name, rie.index_value, re.serializedResource
FROM ResourceEntity re
JOIN ReferenceIndexEntity rie
FROM ReferenceIndexEntity rie
JOIN ResourceEntity re
ON re.resourceUuid = rie.resourceUuid
${join.query}
WHERE rie.resourceType = ? AND rie.index_name = ? AND rie.index_value IN ($uuidsString)
Expand Down Expand Up @@ -210,8 +210,8 @@ internal fun Search.getIncludeQuery(includeIds: List<UUID>): SearchQuery {
val filterQuery = generateFilterQuery(it)
"""
SELECT rie.index_name, rie.resourceUuid, re.serializedResource
FROM ResourceEntity re
JOIN ReferenceIndexEntity rie
FROM ReferenceIndexEntity rie
JOIN ResourceEntity re
ON re.resourceType||"/"||re.resourceId = rie.index_value
${join.query}
WHERE rie.resourceType = ? AND rie.index_name = ? AND rie.resourceUuid IN ($uuidsString)
Expand Down
40 changes: 20 additions & 20 deletions engine/src/test/java/com/google/android/fhir/search/SearchTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2188,8 +2188,8 @@ class SearchTest {
"""
SELECT * FROM (
SELECT rie.index_name, rie.resourceUuid, re.serializedResource
FROM ResourceEntity re
JOIN ReferenceIndexEntity rie
FROM ReferenceIndexEntity rie
JOIN ResourceEntity re
ON re.resourceType||"/"||re.resourceId = rie.index_value
WHERE rie.resourceType = ? AND rie.index_name = ? AND rie.resourceUuid IN (?, ?)
AND re.resourceType = ?
Expand Down Expand Up @@ -2231,8 +2231,8 @@ class SearchTest {
"""
SELECT * FROM (
SELECT rie.index_name, rie.resourceUuid, re.serializedResource
FROM ResourceEntity re
JOIN ReferenceIndexEntity rie
FROM ReferenceIndexEntity rie
JOIN ResourceEntity re
ON re.resourceType||"/"||re.resourceId = rie.index_value
WHERE rie.resourceType = ? AND rie.index_name = ? AND rie.resourceUuid IN (?, ?)
AND re.resourceUuid IN (
Expand Down Expand Up @@ -2280,8 +2280,8 @@ class SearchTest {
"""
SELECT * FROM (
SELECT rie.index_name, rie.resourceUuid, re.serializedResource
FROM ResourceEntity re
JOIN ReferenceIndexEntity rie
FROM ReferenceIndexEntity rie
JOIN ResourceEntity re
ON re.resourceType||"/"||re.resourceId = rie.index_value
LEFT JOIN StringIndexEntity b
ON re.resourceUuid = b.resourceUuid AND b.index_name = ?
Expand Down Expand Up @@ -2340,8 +2340,8 @@ class SearchTest {
"""
SELECT * FROM (
SELECT rie.index_name, rie.resourceUuid, re.serializedResource
FROM ResourceEntity re
JOIN ReferenceIndexEntity rie
FROM ReferenceIndexEntity rie
JOIN ResourceEntity re
ON re.resourceType||"/"||re.resourceId = rie.index_value
LEFT JOIN StringIndexEntity b
ON re.resourceUuid = b.resourceUuid AND b.index_name = ?
Expand All @@ -2357,8 +2357,8 @@ class SearchTest {
UNION ALL
SELECT * FROM (
SELECT rie.index_name, rie.resourceUuid, re.serializedResource
FROM ResourceEntity re
JOIN ReferenceIndexEntity rie
FROM ReferenceIndexEntity rie
JOIN ResourceEntity re
ON re.resourceType||"/"||re.resourceId = rie.index_value
LEFT JOIN StringIndexEntity b
ON re.resourceUuid = b.resourceUuid AND b.index_name = ?
Expand Down Expand Up @@ -2410,8 +2410,8 @@ class SearchTest {
"""
SELECT * FROM (
SELECT rie.index_name, rie.index_value, re.serializedResource
FROM ResourceEntity re
JOIN ReferenceIndexEntity rie
FROM ReferenceIndexEntity rie
JOIN ResourceEntity re
ON re.resourceUuid = rie.resourceUuid
WHERE rie.resourceType = ? AND rie.index_name = ? AND rie.index_value IN (?, ?)
AND re.resourceType = ?
Expand Down Expand Up @@ -2449,8 +2449,8 @@ class SearchTest {
"""
SELECT * FROM (
SELECT rie.index_name, rie.index_value, re.serializedResource
FROM ResourceEntity re
JOIN ReferenceIndexEntity rie
FROM ReferenceIndexEntity rie
JOIN ResourceEntity re
ON re.resourceUuid = rie.resourceUuid
WHERE rie.resourceType = ? AND rie.index_name = ? AND rie.index_value IN (?, ?)
AND re.resourceUuid IN (
Expand Down Expand Up @@ -2501,8 +2501,8 @@ class SearchTest {
"""
SELECT * FROM (
SELECT rie.index_name, rie.index_value, re.serializedResource
FROM ResourceEntity re
JOIN ReferenceIndexEntity rie
FROM ReferenceIndexEntity rie
JOIN ResourceEntity re
ON re.resourceUuid = rie.resourceUuid
LEFT JOIN DateIndexEntity b
ON re.resourceUuid = b.resourceUuid AND b.index_name = ?
Expand Down Expand Up @@ -2579,8 +2579,8 @@ class SearchTest {
"""
SELECT * FROM (
SELECT rie.index_name, rie.index_value, re.serializedResource
FROM ResourceEntity re
JOIN ReferenceIndexEntity rie
FROM ReferenceIndexEntity rie
JOIN ResourceEntity re
ON re.resourceUuid = rie.resourceUuid
LEFT JOIN DateIndexEntity b
ON re.resourceUuid = b.resourceUuid AND b.index_name = ?
Expand All @@ -2598,8 +2598,8 @@ class SearchTest {
UNION ALL
SELECT * FROM (
SELECT rie.index_name, rie.index_value, re.serializedResource
FROM ResourceEntity re
JOIN ReferenceIndexEntity rie
FROM ReferenceIndexEntity rie
JOIN ResourceEntity re
ON re.resourceUuid = rie.resourceUuid
LEFT JOIN DateIndexEntity b
ON re.resourceUuid = b.resourceUuid AND b.index_name = ?
Expand Down