perf: Optimize Browse page queries #1236
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -121,7 +121,7 @@ export const searchCubes = async ({ | |
| ?.filter((x) => x.type === "DataCubeOrganization") | ||
| .map((v) => v.value) ?? []; | ||
|
|
||
| let scoresQuery = SELECT` | ||
| ?iri ?title ?status ?datePublished ?description ?publisher ?creatorIri ?creatorLabel | ||
| (GROUP_CONCAT(DISTINCT ?themeIri; SEPARATOR="${GROUP_SEPARATOR}") AS ?themeIris) (GROUP_CONCAT(DISTINCT ?themeLabel; SEPARATOR="${GROUP_SEPARATOR}") AS ?themeLabels) | ||
| (GROUP_CONCAT(DISTINCT ?subthemeIri; SEPARATOR="${GROUP_SEPARATOR}") AS ?subthemeIris) (GROUP_CONCAT(DISTINCT ?subthemeLabel; SEPARATOR="${GROUP_SEPARATOR}") AS ?subthemeLabels) | ||
|
|
@@ -152,7 +152,7 @@ export const searchCubes = async ({ | |
| )} | ||
| } | ||
| } | ||
| ${creatorValues.length ? makeInFilter("creatorIri", creatorValues) : ""} | ||
|
|
||
| OPTIONAL { | ||
| ?iri ${ns.dcat.theme} ?themeIri . | ||
|
|
@@ -166,7 +166,6 @@ export const searchCubes = async ({ | |
| })} | ||
| } | ||
| } | ||
|
|
||
| # Add more subtheme termsets here when they are available | ||
| ${ | ||
|
|
@@ -238,11 +237,16 @@ export const searchCubes = async ({ | |
| )` | ||
ptbrowne marked this conversation as resolved.
Show resolved
Hide resolved
bprusinowski marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| : "" | ||
| } | ||
| `.GROUP().BY`?iri`.THEN.BY`?title`.THEN.BY`?status`.THEN.BY`?datePublished` | ||
| .THEN.BY`?description`.THEN.BY`?publisher`.THEN.BY`?creatorIri`.THEN | ||
| .BY`?creatorLabel`.prologue`${pragmas}`; | ||
|
|
||
| if (themeValues.length) { | ||
| scoresQuery = scoresQuery.HAVING`${themeValues | ||
|
There was a problem hiding this comment. @bprusinowski what was the issue with There was a problem hiding this comment. As we removed organizations and themes queries, when we filter by e.g. Administration theme, we still need to retrieve all themes attached to a given cube, not only the Administration theme, as this would distort the left filter panel – that's why we can't use FILTER, but rather retrieve all themes, and only filter by concatenated string afterwards 👀 There was a problem hiding this comment. But it doesn't look like it affected the performance in any noticeable way There was a problem hiding this comment. OK, you don't want to loose the other themes on the selected cubes, right? There was a problem hiding this comment. Yup, you are right – I updated the query 🎉 |
||
| .map((iri) => `CONTAINS(LCASE(?themeIris), LCASE("${iri}"))`) | ||
| .join(" || ")}` as any; | ||
| } | ||
|
|
||
| const scoreResults = await scoresQuery.execute(sparqlClient.query, { | ||
| operation: "postUrlencoded", | ||
| }); | ||
|
|
||
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.
Curiosity : Why do we need another graph for themes ?
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 think it's better for the performance if we narrow down the graph, so it doesn't need to look everywhere to find the things? @Rdataflow might have a better understanding here :)
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.
@bprusinowski well understood 😄 it's about narrowing down the lookup to one
GRAPH(a.k.a. one partition of the SPARQL database)