Skip to content

Use DISTINCT for counting entities #155

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

Merged
karelklima merged 1 commit into from
Aug 6, 2025
Merged

Use DISTINCT for counting entities #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion library/lens/query_builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@ export class QueryBuilder {
const innerQuery = max === undefined
? quads
: SELECT`?iri`.WHERE`${quads}`.LIMIT(max);
return SELECT`(count(?iri) as ?count)`.WHERE`${innerQuery}`.build();
return SELECT`(COUNT(DISTINCT ?iri) as ?count)`.WHERE`${innerQuery}`
.build();
}

getQuery(
Expand Down
41 changes: 32 additions & 9 deletions tests/lens_common.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { assert, assertEquals, equal } from "./test_deps.ts";
import { initStore, ttl, x } from "./test_utils.ts";

import { createLens } from "ldkit";
import { rdf, xsd } from "ldkit/namespaces";
import { ldkit, rdf, xsd } from "ldkit/namespaces";
import { DataFactory } from "ldkit/rdf";

const assertContainsEqual = (haystack: unknown[], needle: unknown) => {
Expand All @@ -28,6 +28,11 @@ const Instant = {
const Director = {
"@type": x.Director,
name: x.name,
movies: {
"@id": x.movie,
"@type": ldkit.IRI,
"@array": true,
},
} as const;

const Movie = {
Expand All @@ -47,10 +52,12 @@ const Movie = {
const defaultStoreContent = ttl(`
x:StanleyKubrick
a x:Director ;
x:name "Stanley Kubrick" .
x:name "Stanley Kubrick" ;
x:movie x:FullMetalJacket, x:Shining .
x:QuentinTarantino
a x:Director ;
x:name "Quentin Tarantino" .
x:name "Quentin Tarantino" ;
x:movie x:PulpFiction .
x:FullMetalJacket
a x:Movie;
x:name "Full Metal Jacket" ;
Expand All @@ -65,13 +72,19 @@ const defaultStoreContent = ttl(`
x:director x:QuentinTarantino .
`);

const createDirector = ($id: string, name: string) => ({
const createDirector = ($id: string, name: string, movies: string[]) => ({
$id: x[$id],
name,
movies,
});

const Tarantino = createDirector("QuentinTarantino", "Quentin Tarantino");
const Kubrick = createDirector("StanleyKubrick", "Stanley Kubrick");
const Tarantino = createDirector("QuentinTarantino", "Quentin Tarantino", [
x.PulpFiction,
]);
const Kubrick = createDirector("StanleyKubrick", "Stanley Kubrick", [
x.FullMetalJacket,
x.Shining,
]);

const _ = new DataFactory();

Expand Down Expand Up @@ -151,7 +164,7 @@ Deno.test("Lens / Common / Count resources max", async () => {
Deno.test("Lens / Common / Count resources where", async () => {
const { directors } = init();
const count = await directors.count({
where: { name: { $strStarts: "Quentin" } },
where: { name: { $strStarts: "Stanley" } },
});
assertEquals(count, 1);
});
Expand Down Expand Up @@ -181,10 +194,12 @@ Deno.test("Lens / Common / Insert multiple resources", async () => {
assertStore(`
x:StanleyKubrick
a x:Director ;
x:name "Stanley Kubrick" .
x:name "Stanley Kubrick" ;
x:movie x:FullMetalJacket, x:Shining .
x:QuentinTarantino
a x:Director ;
x:name "Quentin Tarantino" .
x:name "Quentin Tarantino" ;
x:movie x:PulpFiction .
`);
});

Expand Down Expand Up @@ -239,11 +254,17 @@ Deno.test("Lens / Common / Insert data", async () => {
_.namedNode(x.name),
_.literal("Christopher Nolan"),
),
_.quad(
_.namedNode(x.ChristopherNolan),
_.namedNode(x.movie),
_.namedNode(x.Inception),
),
);
const result = await directors.findByIri(x.ChristopherNolan);
assertEquals(result, {
$id: x.ChristopherNolan,
name: "Christopher Nolan",
movies: [x.Inception],
});
});

Expand All @@ -252,6 +273,7 @@ Deno.test("Lens / Common / Delete data", async () => {
await directors.insert({
$id: x.ChristopherNolan,
name: "Christopher Nolan",
movies: [x.Inception],
});
await directors.deleteData(
_.quad(
Expand All @@ -264,5 +286,6 @@ Deno.test("Lens / Common / Delete data", async () => {
assertEquals(result, {
$id: x.ChristopherNolan,
name: "Christopher Nolan",
movies: [x.Inception],
});
});