Skip to content

Fix agtype B-tree comparison strategy numbers #2577

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
MuhammadTahaNaveed merged 1 commit into from
Oct 11, 2026
+224 −5
Merged

Fix agtype B-tree comparison strategy numbers #2577

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
35 changes: 35 additions & 0 deletions age--1.8.0--y.y.y.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,38 @@ CREATE FUNCTION ag_catalog.load_edges_from_file(graph_name name,
RETURNS void
LANGUAGE c
AS 'MODULE_PATHNAME';

DO $$
DECLARE
btree_family oid;
BEGIN
SELECT opcfamily INTO STRICT btree_family
FROM pg_catalog.pg_opclass
WHERE opcnamespace = 'ag_catalog'::regnamespace
AND opcname = 'agtype_ops_btree'
AND opcmethod = (SELECT oid FROM pg_catalog.pg_am WHERE amname = 'btree');

UPDATE pg_catalog.pg_amop
SET amopstrategy = amopstrategy + 10
WHERE amopfamily = btree_family
AND amoplefttype = 'ag_catalog.agtype'::regtype
AND amoprighttype = 'ag_catalog.agtype'::regtype
AND amopstrategy IN (4, 5);

UPDATE pg_catalog.pg_amop
SET amopstrategy = CASE amopopr
WHEN 'ag_catalog.>=(ag_catalog.agtype,ag_catalog.agtype)'::regoperator THEN 4
WHEN 'ag_catalog.>(ag_catalog.agtype,ag_catalog.agtype)'::regoperator THEN 5
END
WHERE amopfamily = btree_family
AND amoplefttype = 'ag_catalog.agtype'::regtype
AND amoprighttype = 'ag_catalog.agtype'::regtype
AND amopstrategy IN (14, 15);
Comment thread
jrgemignani marked this conversation as resolved.

UPDATE pg_catalog.pg_opclass
SET opcfamily = btree_family
WHERE opcnamespace = 'ag_catalog'::regnamespace
AND opcname = 'agtype_ops_btree'
AND opcfamily = btree_family;
Comment thread
MuhammadTahaNaveed marked this conversation as resolved.
END
$$;
38 changes: 38 additions & 0 deletions regress/expected/age_upgrade.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,19 @@ BEGIN
END;
$$;
RESET check_function_bodies;
BEGIN;
CREATE TEMP TABLE agtype_upgrade_test (value agtype);
INSERT INTO agtype_upgrade_test VALUES ('1'), ('2'), ('2'), ('3');
CREATE INDEX agtype_upgrade_test_idx ON agtype_upgrade_test USING btree (value);
SELECT value FROM agtype_upgrade_test ORDER BY value DESC;
value
-------
3
2
2
1
(4 rows)

-- Step 11: Upgrade to the current (default) version via the stamped template.
DO $$
DECLARE curr_ver text;
Expand All @@ -246,6 +259,31 @@ FROM pg_available_extensions WHERE name = 'age';
t
(1 row)

SET LOCAL enable_seqscan = off;
SET LOCAL enable_bitmapscan = off;
SELECT count(*) AS greater FROM agtype_upgrade_test WHERE value > '2'::agtype;
greater
---------
1
(1 row)

SELECT count(*) AS greater_equal FROM agtype_upgrade_test WHERE value >= '2'::agtype;
greater_equal
---------------
3
(1 row)

SELECT value FROM agtype_upgrade_test ORDER BY value DESC;
value
-------
3
2
2
1
(4 rows)

DROP TABLE agtype_upgrade_test;
COMMIT;
-- =====================================================================
-- UPGRADED INSTALL SNAPSHOTS (Steps 13-18b)
-- Capture the catalog state after upgrade from initial to current.
Expand Down
101 changes: 98 additions & 3 deletions regress/expected/index.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,11 +574,12 @@ SELECT * FROM cypher('cypher_index', $$
RETURN a.name
ORDER BY a.city_id
$$) as (name agtype);
name
-------------
name
---------------
"Mexico City"
"Monterrey"
"Tijuana"
(2 rows)
(3 rows)

-- Create expression index on west_coast boolean property
CREATE INDEX city_west_coast_idx ON cypher_index."City"
Expand Down Expand Up @@ -754,6 +755,100 @@ DROP INDEX cypher_index.city_id_idx;
DROP INDEX cypher_index.city_west_coast_idx;
DROP INDEX cypher_index.country_life_exp_idx;
--
-- Section 5: Agtype B-tree range boundaries
--
BEGIN;
SET LOCAL enable_seqscan = off;
SET LOCAL enable_bitmapscan = off;
SET LOCAL enable_indexonlyscan = off;
CREATE TEMP TABLE agtype_btree_test (value agtype);
INSERT INTO agtype_btree_test VALUES ('1'), ('2'), ('2'), ('3');
CREATE INDEX agtype_btree_test_idx ON agtype_btree_test USING btree (value);
ANALYZE agtype_btree_test;
EXPLAIN (COSTS OFF)
SELECT value FROM agtype_btree_test WHERE value > '2'::agtype ORDER BY value;
QUERY PLAN
-------------------------------------------------------------
Index Scan using agtype_btree_test_idx on agtype_btree_test
Index Cond: (value > '2'::agtype)
(2 rows)

SELECT value FROM agtype_btree_test WHERE value > '2'::agtype ORDER BY value;
value
-------
3
(1 row)

EXPLAIN (COSTS OFF)
SELECT value FROM agtype_btree_test WHERE value >= '2'::agtype ORDER BY value;
QUERY PLAN
-------------------------------------------------------------
Index Scan using agtype_btree_test_idx on agtype_btree_test
Index Cond: (value >= '2'::agtype)
(2 rows)

SELECT value FROM agtype_btree_test WHERE value >= '2'::agtype ORDER BY value;
value
-------
2
2
3
(3 rows)

EXPLAIN (COSTS OFF)
SELECT value FROM agtype_btree_test WHERE value > '2'::agtype ORDER BY value DESC;
QUERY PLAN
----------------------------------------------------------------------
Index Scan Backward using agtype_btree_test_idx on agtype_btree_test
Index Cond: (value > '2'::agtype)
(2 rows)

SELECT value FROM agtype_btree_test WHERE value > '2'::agtype ORDER BY value DESC;
value
-------
3
(1 row)

EXPLAIN (COSTS OFF)
SELECT value FROM agtype_btree_test WHERE value >= '2'::agtype ORDER BY value DESC;
QUERY PLAN
----------------------------------------------------------------------
Index Scan Backward using agtype_btree_test_idx on agtype_btree_test
Index Cond: (value >= '2'::agtype)
(2 rows)

SELECT value FROM agtype_btree_test WHERE value >= '2'::agtype ORDER BY value DESC;
value
-------
3
2
2
(3 rows)

SELECT value FROM agtype_btree_test WHERE value < '2'::agtype ORDER BY value;
value
-------
1
(1 row)

SELECT value FROM agtype_btree_test WHERE value <= '2'::agtype ORDER BY value;
value
-------
1
2
2
(3 rows)

SELECT value FROM agtype_btree_test WHERE value = '2'::agtype ORDER BY value;
value
-------
2
2
(2 rows)

DROP TABLE agtype_btree_test;
COMMIT;
--
-- General Cleanup
--
SELECT drop_graph('cypher_index', true);
Expand Down
15 changes: 15 additions & 0 deletions regress/sql/age_upgrade.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,13 @@ END;
$$;
RESET check_function_bodies;

BEGIN;
CREATE TEMP TABLE agtype_upgrade_test (value agtype);
INSERT INTO agtype_upgrade_test VALUES ('1'), ('2'), ('2'), ('3');
CREATE INDEX agtype_upgrade_test_idx ON agtype_upgrade_test USING btree (value);

SELECT value FROM agtype_upgrade_test ORDER BY value DESC;

-- Step 11: Upgrade to the current (default) version via the stamped template.
DO $$
DECLARE curr_ver text;
Expand All @@ -254,6 +261,14 @@ $$;
SELECT installed_version = default_version AS upgraded_to_current
FROM pg_available_extensions WHERE name = 'age';

SET LOCAL enable_seqscan = off;
SET LOCAL enable_bitmapscan = off;
SELECT count(*) AS greater FROM agtype_upgrade_test WHERE value > '2'::agtype;
SELECT count(*) AS greater_equal FROM agtype_upgrade_test WHERE value >= '2'::agtype;
SELECT value FROM agtype_upgrade_test ORDER BY value DESC;
DROP TABLE agtype_upgrade_test;
COMMIT;

-- =====================================================================
-- UPGRADED INSTALL SNAPSHOTS (Steps 13-18b)
-- Capture the catalog state after upgrade from initial to current.
Expand Down
36 changes: 36 additions & 0 deletions regress/sql/index.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,42 @@ DROP INDEX cypher_index.city_id_idx;
DROP INDEX cypher_index.city_west_coast_idx;
DROP INDEX cypher_index.country_life_exp_idx;

--
-- Section 5: Agtype B-tree range boundaries
--
BEGIN;
SET LOCAL enable_seqscan = off;
SET LOCAL enable_bitmapscan = off;
SET LOCAL enable_indexonlyscan = off;

CREATE TEMP TABLE agtype_btree_test (value agtype);
INSERT INTO agtype_btree_test VALUES ('1'), ('2'), ('2'), ('3');
CREATE INDEX agtype_btree_test_idx ON agtype_btree_test USING btree (value);
ANALYZE agtype_btree_test;

EXPLAIN (COSTS OFF)
SELECT value FROM agtype_btree_test WHERE value > '2'::agtype ORDER BY value;
SELECT value FROM agtype_btree_test WHERE value > '2'::agtype ORDER BY value;

EXPLAIN (COSTS OFF)
SELECT value FROM agtype_btree_test WHERE value >= '2'::agtype ORDER BY value;
SELECT value FROM agtype_btree_test WHERE value >= '2'::agtype ORDER BY value;

EXPLAIN (COSTS OFF)
SELECT value FROM agtype_btree_test WHERE value > '2'::agtype ORDER BY value DESC;
SELECT value FROM agtype_btree_test WHERE value > '2'::agtype ORDER BY value DESC;

EXPLAIN (COSTS OFF)
SELECT value FROM agtype_btree_test WHERE value >= '2'::agtype ORDER BY value DESC;
SELECT value FROM agtype_btree_test WHERE value >= '2'::agtype ORDER BY value DESC;

SELECT value FROM agtype_btree_test WHERE value < '2'::agtype ORDER BY value;
SELECT value FROM agtype_btree_test WHERE value <= '2'::agtype ORDER BY value;
SELECT value FROM agtype_btree_test WHERE value = '2'::agtype ORDER BY value;

DROP TABLE agtype_btree_test;
COMMIT;

--
-- General Cleanup
--
Expand Down
4 changes: 2 additions & 2 deletions sql/agtype_comparison.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1440,8 +1440,8 @@ CREATE OPERATOR CLASS agtype_ops_btree
OPERATOR 1 <,
OPERATOR 2 <=,
OPERATOR 3 =,
OPERATOR 4 >,
OPERATOR 5 >=,
OPERATOR 4 >=,
OPERATOR 5 >,
FUNCTION 1 ag_catalog.agtype_btree_cmp(agtype, agtype);

CREATE FUNCTION ag_catalog.agtype_hash_cmp(agtype)
Expand Down
Loading