Skip to content
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.

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

Rename h3index_ops for btree and hash to match builtins #98

Merged
merged 2 commits into from
Nov 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .github/workflows/test-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Cache Cargo
uses: actions/cache@v3
with:
path: ~/.cargo
key: ${{ runner.os }}-cargo-2022

- name: Install pg_validate_extupgrade
run: cargo install --locked --git https://github.com/rjuju/pg_validate_extupgrade.git

Expand Down
2 changes: 1 addition & 1 deletion h3/sql/install/11-opclass_btree.sql
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ CREATE OR REPLACE FUNCTION h3index_sortsupport(internal)
LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;

--@ internal
CREATE OPERATOR CLASS btree_h3index_ops DEFAULT FOR TYPE h3index USING btree AS
CREATE OPERATOR CLASS h3index_ops DEFAULT FOR TYPE h3index USING btree AS
OPERATOR 1 < ,
OPERATOR 2 <= ,
OPERATOR 3 = ,
Expand Down
2 changes: 1 addition & 1 deletion h3/sql/install/12-opclass_hash.sql
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ CREATE OR REPLACE FUNCTION h3index_hash_extended(h3index, int8) RETURNS int8
AS 'h3' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;

--@ internal
CREATE OPERATOR CLASS hash_h3index_ops DEFAULT FOR TYPE h3index USING hash AS
CREATE OPERATOR CLASS h3index_ops DEFAULT FOR TYPE h3index USING hash AS
OPERATOR 1 = ,
FUNCTION 1 h3index_hash(h3index),
FUNCTION 2 h3index_hash_extended(h3index, int8);
6 changes: 6 additions & 0 deletions h3/sql/updates/h3--4.0.2--4.0.3.sql
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,9 @@ CREATE OPERATOR CLASS h3index_minmax_ops DEFAULT FOR TYPE h3index USING brin AS
FUNCTION 2 brin_minmax_add_value(internal, internal, internal, internal),
FUNCTION 3 brin_minmax_consistent(internal, internal, internal),
FUNCTION 4 brin_minmax_union(internal, internal, internal);

ALTER OPERATOR FAMILY btree_h3index_ops USING btree RENAME TO h3index_ops;
ALTER OPERATOR CLASS btree_h3index_ops USING btree RENAME TO h3index_ops;

ALTER OPERATOR FAMILY hash_h3index_ops USING hash RENAME TO h3index_ops;
ALTER OPERATOR CLASS hash_h3index_ops USING hash RENAME TO h3index_ops;