mirror of
https://github.com/pgvector/pgvector.git
synced 2026-07-13 16:16:56 +08:00
Added concatenate operator for vectors [skip ci]
This commit is contained in:
@@ -5,6 +5,7 @@
|
|||||||
- Added `jaccard_distance` function
|
- Added `jaccard_distance` function
|
||||||
- Added `quantize_binary` function
|
- Added `quantize_binary` function
|
||||||
- Added `subvector` function
|
- Added `subvector` function
|
||||||
|
- Added concatenate operator for vectors
|
||||||
- Updated comparison operators to support vectors with different dimensions
|
- Updated comparison operators to support vectors with different dimensions
|
||||||
|
|
||||||
## 0.6.2 (2024-03-18)
|
## 0.6.2 (2024-03-18)
|
||||||
|
|||||||
@@ -725,6 +725,7 @@ Operator | Description | Added
|
|||||||
\+ | element-wise addition |
|
\+ | element-wise addition |
|
||||||
\- | element-wise subtraction |
|
\- | element-wise subtraction |
|
||||||
\* | element-wise multiplication | 0.5.0
|
\* | element-wise multiplication | 0.5.0
|
||||||
|
\|\| | concatenate | unreleased
|
||||||
<-> | Euclidean distance |
|
<-> | Euclidean distance |
|
||||||
<#> | negative inner product |
|
<#> | negative inner product |
|
||||||
<=> | cosine distance |
|
<=> | cosine distance |
|
||||||
|
|||||||
@@ -7,6 +7,13 @@ CREATE FUNCTION quantize_binary(vector) RETURNS bit
|
|||||||
CREATE FUNCTION subvector(vector, int, int) RETURNS vector
|
CREATE FUNCTION subvector(vector, int, int) RETURNS vector
|
||||||
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
|
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
|
||||||
|
|
||||||
|
CREATE FUNCTION vector_concat(vector, vector) RETURNS vector
|
||||||
|
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
|
||||||
|
|
||||||
|
CREATE OPERATOR || (
|
||||||
|
LEFTARG = vector, RIGHTARG = vector, PROCEDURE = vector_concat
|
||||||
|
);
|
||||||
|
|
||||||
CREATE FUNCTION hamming_distance(bit, bit) RETURNS float8
|
CREATE FUNCTION hamming_distance(bit, bit) RETURNS float8
|
||||||
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
|
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
|
||||||
|
|
||||||
|
|||||||
@@ -105,6 +105,9 @@ CREATE FUNCTION vector_avg(double precision[]) RETURNS vector
|
|||||||
CREATE FUNCTION vector_combine(double precision[], double precision[]) RETURNS double precision[]
|
CREATE FUNCTION vector_combine(double precision[], double precision[]) RETURNS double precision[]
|
||||||
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
|
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
|
||||||
|
|
||||||
|
CREATE FUNCTION vector_concat(vector, vector) RETURNS vector
|
||||||
|
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
|
||||||
|
|
||||||
-- vector aggregates
|
-- vector aggregates
|
||||||
|
|
||||||
CREATE AGGREGATE avg(vector) (
|
CREATE AGGREGATE avg(vector) (
|
||||||
@@ -194,6 +197,10 @@ CREATE OPERATOR * (
|
|||||||
COMMUTATOR = *
|
COMMUTATOR = *
|
||||||
);
|
);
|
||||||
|
|
||||||
|
CREATE OPERATOR || (
|
||||||
|
LEFTARG = vector, RIGHTARG = vector, PROCEDURE = vector_concat
|
||||||
|
);
|
||||||
|
|
||||||
CREATE OPERATOR < (
|
CREATE OPERATOR < (
|
||||||
LEFTARG = vector, RIGHTARG = vector, PROCEDURE = vector_lt,
|
LEFTARG = vector, RIGHTARG = vector, PROCEDURE = vector_lt,
|
||||||
COMMUTATOR = > , NEGATOR = >= ,
|
COMMUTATOR = > , NEGATOR = >= ,
|
||||||
|
|||||||
24
src/vector.c
24
src/vector.c
@@ -909,6 +909,30 @@ subvector(PG_FUNCTION_ARGS)
|
|||||||
PG_RETURN_POINTER(result);
|
PG_RETURN_POINTER(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Concatenate vectors
|
||||||
|
*/
|
||||||
|
PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_concat);
|
||||||
|
Datum
|
||||||
|
vector_concat(PG_FUNCTION_ARGS)
|
||||||
|
{
|
||||||
|
Vector *a = PG_GETARG_VECTOR_P(0);
|
||||||
|
Vector *b = PG_GETARG_VECTOR_P(1);
|
||||||
|
Vector *result;
|
||||||
|
int dim = a->dim + b->dim;
|
||||||
|
|
||||||
|
CheckDim(dim);
|
||||||
|
result = InitVector(dim);
|
||||||
|
|
||||||
|
for (int i = 0; i < a->dim; i++)
|
||||||
|
result->x[i] = a->x[i];
|
||||||
|
|
||||||
|
for (int i = 0; i < b->dim; i++)
|
||||||
|
result->x[i + a->dim] = b->x[i];
|
||||||
|
|
||||||
|
PG_RETURN_POINTER(result);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Internal helper to compare vectors
|
* Internal helper to compare vectors
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -24,6 +24,14 @@ SELECT '[1e37]'::vector * '[1e37]';
|
|||||||
ERROR: value out of range: overflow
|
ERROR: value out of range: overflow
|
||||||
SELECT '[1e-37]'::vector * '[1e-37]';
|
SELECT '[1e-37]'::vector * '[1e-37]';
|
||||||
ERROR: value out of range: underflow
|
ERROR: value out of range: underflow
|
||||||
|
SELECT '[1,2,3]'::vector || '[4,5]'::vector;
|
||||||
|
?column?
|
||||||
|
-------------
|
||||||
|
[1,2,3,4,5]
|
||||||
|
(1 row)
|
||||||
|
|
||||||
|
SELECT array_fill(0, ARRAY[16000])::vector || '[1]'::vector;
|
||||||
|
ERROR: vector cannot have more than 16000 dimensions
|
||||||
SELECT '[1,2,3]'::vector < '[1,2,3]';
|
SELECT '[1,2,3]'::vector < '[1,2,3]';
|
||||||
?column?
|
?column?
|
||||||
----------
|
----------
|
||||||
|
|||||||
@@ -6,6 +6,9 @@ SELECT '[1,2,3]'::vector * '[4,5,6]';
|
|||||||
SELECT '[1e37]'::vector * '[1e37]';
|
SELECT '[1e37]'::vector * '[1e37]';
|
||||||
SELECT '[1e-37]'::vector * '[1e-37]';
|
SELECT '[1e-37]'::vector * '[1e-37]';
|
||||||
|
|
||||||
|
SELECT '[1,2,3]'::vector || '[4,5]'::vector;
|
||||||
|
SELECT array_fill(0, ARRAY[16000])::vector || '[1]'::vector;
|
||||||
|
|
||||||
SELECT '[1,2,3]'::vector < '[1,2,3]';
|
SELECT '[1,2,3]'::vector < '[1,2,3]';
|
||||||
SELECT '[1,2,3]'::vector < '[1,2]';
|
SELECT '[1,2,3]'::vector < '[1,2]';
|
||||||
SELECT '[1,2,3]'::vector <= '[1,2,3]';
|
SELECT '[1,2,3]'::vector <= '[1,2,3]';
|
||||||
|
|||||||
Reference in New Issue
Block a user