perf: Use cube loader in hierarchy fetching

visualize-admin · Nov 2, 2022 · fdcb09c · fdcb09c
1 parent c80a645
commit fdcb09c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 26 deletions.
diff --git a/app/graphql/resolvers/rdf.ts b/app/graphql/resolvers/rdf.ts
@@ -279,18 +279,26 @@ const getDimensionValuesLoader = (
 
 export const hierarchy: NonNullable<DimensionResolvers["hierarchy"]> = async (
   { data: { iri } },
-  { sourceUrl },
+  _unused,
   { setup },
   info
 ) => {
-  const { sparqlClient, sparqlClientStream } = await setup(info);
-  return queryHierarchy(
+  const { locale } = info.variableValues;
+  const cubeIri = info.variableValues.iri || info.variableValues.cubeIri;
+  const { sparqlClient, sparqlClientStream, loaders } = await setup(info);
+  const cube = await loaders.cube.load(cubeIri);
+
+  if (!cube) {
+    throw new Error("Could not find cube");
+  }
+  const res = await queryHierarchy(
+    cube,
     iri,
-    sourceUrl,
-    info.variableValues.locale,
+    locale,
     sparqlClient,
     sparqlClientStream
   );
+  return res;
 };
 
 export const dimensionValues: NonNullable<

diff --git a/app/rdf/query-hierarchies.ts b/app/rdf/query-hierarchies.ts
@@ -11,7 +11,7 @@ import { StreamClient } from "sparql-http-client";
 import { ParsingClient } from "sparql-http-client/ParsingClient";
 
 import { HierarchyValue } from "@/graphql/resolver-types";
-import { createSource, pragmas } from "@/rdf/create-source";
+import { pragmas } from "@/rdf/create-source";
 
 import * as ns from "./namespace";
 import { pruneTree, mapTree } from "./tree-utils";
@@ -82,31 +82,12 @@ const findHierarchyForDimension = (cube: Cube, dimensionIri: string) => {
 };
 
 export const queryHierarchy = async (
+  cube: Cube,
   dimensionIri: string,
-  sourceUrl: string,
   locale: string,
   sparqlClient: ParsingClient,
   sparqlClientStream: StreamClient
 ): Promise<HierarchyValue[] | null> => {
-  const source = createSource({ endpointUrl: sourceUrl });
-
-  const cubeQuery = SELECT`?cube`.WHERE`
-  ?cube ${ns.cube.observationConstraint} ?shape.
-  ?shape ?prop ?dimension.
-  ?dimension ${ns.sh.path} <${dimensionIri}>.
-  
-  FILTER NOT EXISTS { ?cube ${ns.schema.expires} ?any . }
-  `.prologue`${pragmas}`;
-  const cubeResults = await cubeQuery.execute(sparqlClient.query);
-  if (cubeResults.length === 0) {
-    throw new Error("Could not find cube");
-  }
-
-  const cubeIri = cubeResults[0].cube.value;
-  const cube = await source.cube(cubeIri);
-  if (!cube) {
-    throw new Error("Could not find cube");
-  }
   const hierarchy = findHierarchyForDimension(cube, dimensionIri);
 
   // @ts-ignore