From 1cc66543bec9ff16e235be0409cf3c5158b2f2d0 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Fri, 26 Apr 2024 17:50:26 -0700 Subject: [PATCH] Reordered types in sql files [skip ci] --- sql/vector--0.6.2--0.7.0.sql | 78 +++++++++++++++---------------- sql/vector.sql | 90 ++++++++++++++++++------------------ 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/sql/vector--0.6.2--0.7.0.sql b/sql/vector--0.6.2--0.7.0.sql index e9d9c25..85c8d6d 100644 --- a/sql/vector--0.6.2--0.7.0.sql +++ b/sql/vector--0.6.2--0.7.0.sql @@ -22,18 +22,18 @@ CREATE OPERATOR || ( LEFTARG = vector, RIGHTARG = vector, PROCEDURE = vector_concat ); -CREATE FUNCTION ivfflat_bit_support(internal) RETURNS internal - AS 'MODULE_PATHNAME' LANGUAGE C; - CREATE FUNCTION ivfflat_halfvec_support(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C; -CREATE FUNCTION hnsw_bit_support(internal) RETURNS internal +CREATE FUNCTION ivfflat_bit_support(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C; CREATE FUNCTION hnsw_halfvec_support(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C; +CREATE FUNCTION hnsw_bit_support(internal) RETURNS internal + AS 'MODULE_PATHNAME' LANGUAGE C; + CREATE FUNCTION hnsw_sparsevec_support(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C; @@ -42,41 +42,6 @@ CREATE OPERATOR CLASS vector_l1_ops OPERATOR 1 <+> (vector, vector) FOR ORDER BY float_ops, FUNCTION 1 l1_distance(vector, vector); -CREATE FUNCTION hamming_distance(bit, bit) RETURNS float8 - AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION jaccard_distance(bit, bit) RETURNS float8 - AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; - -CREATE OPERATOR <~> ( - LEFTARG = bit, RIGHTARG = bit, PROCEDURE = hamming_distance, - COMMUTATOR = '<~>' -); - -CREATE OPERATOR <%> ( - LEFTARG = bit, RIGHTARG = bit, PROCEDURE = jaccard_distance, - COMMUTATOR = '<%>' -); - -CREATE OPERATOR CLASS bit_hamming_ops - FOR TYPE bit USING ivfflat AS - OPERATOR 1 <~> (bit, bit) FOR ORDER BY float_ops, - FUNCTION 1 hamming_distance(bit, bit), - FUNCTION 3 hamming_distance(bit, bit), - FUNCTION 5 ivfflat_bit_support(internal); - -CREATE OPERATOR CLASS bit_hamming_ops - FOR TYPE bit USING hnsw AS - OPERATOR 1 <~> (bit, bit) FOR ORDER BY float_ops, - FUNCTION 1 hamming_distance(bit, bit), - FUNCTION 3 hnsw_bit_support(internal); - -CREATE OPERATOR CLASS bit_jaccard_ops - FOR TYPE bit USING hnsw AS - OPERATOR 1 <%> (bit, bit) FOR ORDER BY float_ops, - FUNCTION 1 jaccard_distance(bit, bit), - FUNCTION 3 hnsw_bit_support(internal); - CREATE TYPE halfvec; CREATE FUNCTION halfvec_in(cstring, oid, integer) RETURNS halfvec @@ -377,6 +342,41 @@ CREATE OPERATOR CLASS halfvec_l1_ops FUNCTION 1 l1_distance(halfvec, halfvec), FUNCTION 3 hnsw_halfvec_support(internal); +CREATE FUNCTION hamming_distance(bit, bit) RETURNS float8 + AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION jaccard_distance(bit, bit) RETURNS float8 + AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; + +CREATE OPERATOR <~> ( + LEFTARG = bit, RIGHTARG = bit, PROCEDURE = hamming_distance, + COMMUTATOR = '<~>' +); + +CREATE OPERATOR <%> ( + LEFTARG = bit, RIGHTARG = bit, PROCEDURE = jaccard_distance, + COMMUTATOR = '<%>' +); + +CREATE OPERATOR CLASS bit_hamming_ops + FOR TYPE bit USING ivfflat AS + OPERATOR 1 <~> (bit, bit) FOR ORDER BY float_ops, + FUNCTION 1 hamming_distance(bit, bit), + FUNCTION 3 hamming_distance(bit, bit), + FUNCTION 5 ivfflat_bit_support(internal); + +CREATE OPERATOR CLASS bit_hamming_ops + FOR TYPE bit USING hnsw AS + OPERATOR 1 <~> (bit, bit) FOR ORDER BY float_ops, + FUNCTION 1 hamming_distance(bit, bit), + FUNCTION 3 hnsw_bit_support(internal); + +CREATE OPERATOR CLASS bit_jaccard_ops + FOR TYPE bit USING hnsw AS + OPERATOR 1 <%> (bit, bit) FOR ORDER BY float_ops, + FUNCTION 1 jaccard_distance(bit, bit), + FUNCTION 3 hnsw_bit_support(internal); + CREATE TYPE sparsevec; CREATE FUNCTION sparsevec_in(cstring, oid, integer) RETURNS sparsevec diff --git a/sql/vector.sql b/sql/vector.sql index 58ff773..32eb834 100644 --- a/sql/vector.sql +++ b/sql/vector.sql @@ -263,18 +263,18 @@ COMMENT ON ACCESS METHOD hnsw IS 'hnsw index access method'; -- access method private functions -CREATE FUNCTION ivfflat_bit_support(internal) RETURNS internal - AS 'MODULE_PATHNAME' LANGUAGE C; - CREATE FUNCTION ivfflat_halfvec_support(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C; -CREATE FUNCTION hnsw_bit_support(internal) RETURNS internal +CREATE FUNCTION ivfflat_bit_support(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C; CREATE FUNCTION hnsw_halfvec_support(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C; +CREATE FUNCTION hnsw_bit_support(internal) RETURNS internal + AS 'MODULE_PATHNAME' LANGUAGE C; + CREATE FUNCTION hnsw_sparsevec_support(internal) RETURNS internal AS 'MODULE_PATHNAME' LANGUAGE C; @@ -331,47 +331,6 @@ CREATE OPERATOR CLASS vector_l1_ops OPERATOR 1 <+> (vector, vector) FOR ORDER BY float_ops, FUNCTION 1 l1_distance(vector, vector); --- bit functions - -CREATE FUNCTION hamming_distance(bit, bit) RETURNS float8 - AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; - -CREATE FUNCTION jaccard_distance(bit, bit) RETURNS float8 - AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; - --- bit operators - -CREATE OPERATOR <~> ( - LEFTARG = bit, RIGHTARG = bit, PROCEDURE = hamming_distance, - COMMUTATOR = '<~>' -); - -CREATE OPERATOR <%> ( - LEFTARG = bit, RIGHTARG = bit, PROCEDURE = jaccard_distance, - COMMUTATOR = '<%>' -); - --- bit opclasses - -CREATE OPERATOR CLASS bit_hamming_ops - FOR TYPE bit USING ivfflat AS - OPERATOR 1 <~> (bit, bit) FOR ORDER BY float_ops, - FUNCTION 1 hamming_distance(bit, bit), - FUNCTION 3 hamming_distance(bit, bit), - FUNCTION 5 ivfflat_bit_support(internal); - -CREATE OPERATOR CLASS bit_hamming_ops - FOR TYPE bit USING hnsw AS - OPERATOR 1 <~> (bit, bit) FOR ORDER BY float_ops, - FUNCTION 1 hamming_distance(bit, bit), - FUNCTION 3 hnsw_bit_support(internal); - -CREATE OPERATOR CLASS bit_jaccard_ops - FOR TYPE bit USING hnsw AS - OPERATOR 1 <%> (bit, bit) FOR ORDER BY float_ops, - FUNCTION 1 jaccard_distance(bit, bit), - FUNCTION 3 hnsw_bit_support(internal); - -- halfvec type CREATE TYPE halfvec; @@ -688,6 +647,47 @@ CREATE OPERATOR CLASS halfvec_l1_ops FUNCTION 1 l1_distance(halfvec, halfvec), FUNCTION 3 hnsw_halfvec_support(internal); +-- bit functions + +CREATE FUNCTION hamming_distance(bit, bit) RETURNS float8 + AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; + +CREATE FUNCTION jaccard_distance(bit, bit) RETURNS float8 + AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE; + +-- bit operators + +CREATE OPERATOR <~> ( + LEFTARG = bit, RIGHTARG = bit, PROCEDURE = hamming_distance, + COMMUTATOR = '<~>' +); + +CREATE OPERATOR <%> ( + LEFTARG = bit, RIGHTARG = bit, PROCEDURE = jaccard_distance, + COMMUTATOR = '<%>' +); + +-- bit opclasses + +CREATE OPERATOR CLASS bit_hamming_ops + FOR TYPE bit USING ivfflat AS + OPERATOR 1 <~> (bit, bit) FOR ORDER BY float_ops, + FUNCTION 1 hamming_distance(bit, bit), + FUNCTION 3 hamming_distance(bit, bit), + FUNCTION 5 ivfflat_bit_support(internal); + +CREATE OPERATOR CLASS bit_hamming_ops + FOR TYPE bit USING hnsw AS + OPERATOR 1 <~> (bit, bit) FOR ORDER BY float_ops, + FUNCTION 1 hamming_distance(bit, bit), + FUNCTION 3 hnsw_bit_support(internal); + +CREATE OPERATOR CLASS bit_jaccard_ops + FOR TYPE bit USING hnsw AS + OPERATOR 1 <%> (bit, bit) FOR ORDER BY float_ops, + FUNCTION 1 jaccard_distance(bit, bit), + FUNCTION 3 hnsw_bit_support(internal); + --- sparsevec type CREATE TYPE sparsevec;