Skip to content

Removing duplicated test and using unnest #2695

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
cvvergara merged 2 commits into from
Dec 17, 2024
Merged

Removing duplicated test and using unnest #2695

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
6fce2fb
Removing duplicated test and using unnest
cvvergara Dec 17, 2024
a6e3549
Yet again another unnest fix
cvvergara Dec 17, 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
140 changes: 0 additions & 140 deletions pgtap/contraction/deadend/directed/big_ids.pg
View file
Open in desktop

This file was deleted.

64 changes: 36 additions & 28 deletions tools/testers/contraction_tapfuncs.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ vids BIGINT[] = ARRAY[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18];
x BIGINT;
q TEXT;
mainq TEXT;
otherq TEXT;
expected TEXT;
BEGIN
UPDATE edges
Expand Down Expand Up @@ -66,48 +67,55 @@ BEGIN
-1::BIGINT AS target,
-1::FLOAT AS cost$$);

q = format(mainq, ARRAY[vids[1], vids[2]], directed);
otherq = $d$ SELECT type, id, unnest(contracted_vertices) FROM pgr_contraction(
$$SELECT id, source, target, cost, reverse_cost FROM edges WHERE id = ANY('%1$s'::BIGINT[]) $$,
ARRAY[1]::integer[], 1, ARRAY[]::BIGINT[], '%2$s'::BOOLEAN)$d$;

RETURN QUERY
SELECT set_eq(q,
$$SELECT
'v'::CHAR AS type,
$$ || vids[10] || $$::BIGINT AS id,
ARRAY[ $$ || vids[5] || $$,$$ || vids[6] || $$]::BIGINT[] AS contracted_vertices,
-1::BIGINT AS source,
-1::BIGINT AS target,
-1::FLOAT AS cost$$);
q = format(otherq, ARRAY[vids[1], vids[2]], directed);

expected = format($d$
SELECT type, id, unnest
FROM (VALUES
('v'::TEXT, %1$s::BIGINT, %2$s::BIGINT),
('v', %1$s, %3$s)
) AS t(type, id, unnest)$d$,
vids[10], vids[5], vids[6]) ;

RETURN QUERY SELECT set_eq(q, expected);

q = format(mainq, ARRAY[vids[1], vids[2], vids[3]], directed);
q = format(otherq, ARRAY[vids[1], vids[2], vids[3]], directed);

expected = format($d$
SELECT type, id, contracted_vertices, source, target, cost
SELECT type, id, unnest
FROM (VALUES
('v'::CHAR, %1$s::BIGINT, '%2$s'::BIGINT[], -1::BIGINT, -1::BIGINT, -1::FLOAT)
) AS t(type, id, contracted_vertices, source, target, cost )$d$,
vids[6], ARRAY[vids[5], vids[10], vids[15]]) ;
('v'::TEXT, %1$s::BIGINT, %2$s::BIGINT),
('v', %1$s, %3$s),
('v', %1$s, %4$s)
) AS t(type, id, unnest)$d$,
vids[6], vids[5], vids[10], vids[15]) ;

RETURN QUERY
SELECT set_eq(q, expected);

q = format($d$ SELECT * FROM pgr_contraction(
q = format($d$ SELECT type, id, unnest(contracted_vertices) FROM pgr_contraction(
$$SELECT id, source, target, cost, reverse_cost FROM edges$$,
ARRAY[1]::integer[], 1, ARRAY[]::BIGINT[], '%1$s'::BOOLEAN)$d$, directed);

expected = format($d$
SELECT type, id, contracted_vertices, source, target, cost
SELECT type, id, unnest
FROM (VALUES
('v'::CHAR, %1$s::BIGINT, '%2$s'::BIGINT[], -1::BIGINT, -1::BIGINT, -1::FLOAT),
('v', %3$s, '%4$s'::BIGINT[], -1, -1, -1),
('v', %5$s, '%6$s'::BIGINT[], -1, -1, -1),
('v', %7$s, '%8$s'::BIGINT[], -1, -1, -1),
('v', %9$s, '%10$s'::BIGINT[], -1, -1, -1)
) AS t(type, id, contracted_vertices, source, target, cost )$d$,
vids[4], ARRAY[vids[2]],
vids[6], ARRAY[vids[5]],
vids[7], ARRAY[vids[1], vids[3]],
vids[8], ARRAY[vids[9]],
vids[14], ARRAY[vids[13]]);
('v'::CHAR, %1$s::BIGINT, %2$s),
('v', %3$s, %4$s),
('v', %5$s, %6$s),
('v', %5$s, %7$s),
('v', %8$s, %9$s),
('v', %10$s, %11$s)
) AS t(type, id, unnest)$d$,
vids[4], vids[2],
vids[6], vids[5],
vids[7], vids[1], vids[3],
vids[8], vids[9],
vids[14], vids[13]);

RETURN QUERY
SELECT set_eq(q, expected);
Expand Down
Loading