mirror of
https://github.com/pgvector/pgvector.git
synced 2025-04-18 11:24:01 +03:00
Added casts for arrays to sparsevec - #604
Co-authored-by: Narek Galstyan <narekg@berkeley.edu> Co-authored-by: Di Qi <di@lantern.dev>
This commit is contained in:
parent
b738ffecc1
commit
3fb05eb847
@ -1,5 +1,6 @@
|
||||
## 0.8.0 (unreleased)
|
||||
|
||||
- Added casts for arrays to `sparsevec`
|
||||
- Reduced memory usage for HNSW index scans
|
||||
- Dropped support for Postgres 12
|
||||
|
||||
|
26
sql/vector--0.7.4--0.8.0.sql
Normal file
26
sql/vector--0.7.4--0.8.0.sql
Normal file
@ -0,0 +1,26 @@
|
||||
-- complain if script is sourced in psql, rather than via CREATE EXTENSION
|
||||
\echo Use "ALTER EXTENSION vector UPDATE TO '0.8.0'" to load this file. \quit
|
||||
|
||||
CREATE FUNCTION array_to_sparsevec(integer[], integer, boolean) RETURNS sparsevec
|
||||
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
|
||||
|
||||
CREATE FUNCTION array_to_sparsevec(real[], integer, boolean) RETURNS sparsevec
|
||||
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
|
||||
|
||||
CREATE FUNCTION array_to_sparsevec(double precision[], integer, boolean) RETURNS sparsevec
|
||||
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
|
||||
|
||||
CREATE FUNCTION array_to_sparsevec(numeric[], integer, boolean) RETURNS sparsevec
|
||||
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
|
||||
|
||||
CREATE CAST (integer[] AS sparsevec)
|
||||
WITH FUNCTION array_to_sparsevec(integer[], integer, boolean) AS ASSIGNMENT;
|
||||
|
||||
CREATE CAST (real[] AS sparsevec)
|
||||
WITH FUNCTION array_to_sparsevec(real[], integer, boolean) AS ASSIGNMENT;
|
||||
|
||||
CREATE CAST (double precision[] AS sparsevec)
|
||||
WITH FUNCTION array_to_sparsevec(double precision[], integer, boolean) AS ASSIGNMENT;
|
||||
|
||||
CREATE CAST (numeric[] AS sparsevec)
|
||||
WITH FUNCTION array_to_sparsevec(numeric[], integer, boolean) AS ASSIGNMENT;
|
@ -782,6 +782,18 @@ CREATE FUNCTION halfvec_to_sparsevec(halfvec, integer, boolean) RETURNS sparseve
|
||||
CREATE FUNCTION sparsevec_to_halfvec(sparsevec, integer, boolean) RETURNS halfvec
|
||||
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
|
||||
|
||||
CREATE FUNCTION array_to_sparsevec(integer[], integer, boolean) RETURNS sparsevec
|
||||
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
|
||||
|
||||
CREATE FUNCTION array_to_sparsevec(real[], integer, boolean) RETURNS sparsevec
|
||||
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
|
||||
|
||||
CREATE FUNCTION array_to_sparsevec(double precision[], integer, boolean) RETURNS sparsevec
|
||||
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
|
||||
|
||||
CREATE FUNCTION array_to_sparsevec(numeric[], integer, boolean) RETURNS sparsevec
|
||||
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
|
||||
|
||||
-- sparsevec casts
|
||||
|
||||
CREATE CAST (sparsevec AS sparsevec)
|
||||
@ -799,6 +811,18 @@ CREATE CAST (sparsevec AS halfvec)
|
||||
CREATE CAST (halfvec AS sparsevec)
|
||||
WITH FUNCTION halfvec_to_sparsevec(halfvec, integer, boolean) AS IMPLICIT;
|
||||
|
||||
CREATE CAST (integer[] AS sparsevec)
|
||||
WITH FUNCTION array_to_sparsevec(integer[], integer, boolean) AS ASSIGNMENT;
|
||||
|
||||
CREATE CAST (real[] AS sparsevec)
|
||||
WITH FUNCTION array_to_sparsevec(real[], integer, boolean) AS ASSIGNMENT;
|
||||
|
||||
CREATE CAST (double precision[] AS sparsevec)
|
||||
WITH FUNCTION array_to_sparsevec(double precision[], integer, boolean) AS ASSIGNMENT;
|
||||
|
||||
CREATE CAST (numeric[] AS sparsevec)
|
||||
WITH FUNCTION array_to_sparsevec(numeric[], integer, boolean) AS ASSIGNMENT;
|
||||
|
||||
-- sparsevec operators
|
||||
|
||||
CREATE OPERATOR <-> (
|
||||
|
122
src/sparsevec.c
122
src/sparsevec.c
@ -3,6 +3,7 @@
|
||||
#include <limits.h>
|
||||
#include <math.h>
|
||||
|
||||
#include "catalog/pg_type.h"
|
||||
#include "common/string.h"
|
||||
#include "fmgr.h"
|
||||
#include "halfutils.h"
|
||||
@ -11,6 +12,7 @@
|
||||
#include "sparsevec.h"
|
||||
#include "utils/array.h"
|
||||
#include "utils/builtins.h"
|
||||
#include "utils/lsyscache.h"
|
||||
#include "vector.h"
|
||||
|
||||
#if PG_VERSION_NUM >= 120000
|
||||
@ -670,6 +672,126 @@ halfvec_to_sparsevec(PG_FUNCTION_ARGS)
|
||||
PG_RETURN_POINTER(result);
|
||||
}
|
||||
|
||||
/*
|
||||
* Convert array to sparse vector
|
||||
*/
|
||||
FUNCTION_PREFIX PG_FUNCTION_INFO_V1(array_to_sparsevec);
|
||||
Datum
|
||||
array_to_sparsevec(PG_FUNCTION_ARGS)
|
||||
{
|
||||
ArrayType *array = PG_GETARG_ARRAYTYPE_P(0);
|
||||
int32 typmod = PG_GETARG_INT32(1);
|
||||
SparseVector *result;
|
||||
int16 typlen;
|
||||
bool typbyval;
|
||||
char typalign;
|
||||
Datum *elemsp;
|
||||
int nelemsp;
|
||||
int nnz = 0;
|
||||
float *values;
|
||||
int j = 0;
|
||||
|
||||
if (ARR_NDIM(array) > 1)
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_DATA_EXCEPTION),
|
||||
errmsg("array must be 1-D")));
|
||||
|
||||
if (ARR_HASNULL(array) && array_contains_nulls(array))
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
|
||||
errmsg("array must not contain nulls")));
|
||||
|
||||
get_typlenbyvalalign(ARR_ELEMTYPE(array), &typlen, &typbyval, &typalign);
|
||||
deconstruct_array(array, ARR_ELEMTYPE(array), typlen, typbyval, typalign, &elemsp, NULL, &nelemsp);
|
||||
|
||||
CheckDim(nelemsp);
|
||||
CheckExpectedDim(typmod, nelemsp);
|
||||
|
||||
if (ARR_ELEMTYPE(array) == INT4OID)
|
||||
{
|
||||
for (int i = 0; i < nelemsp; i++)
|
||||
nnz += ((float) DatumGetInt32(elemsp[i])) != 0;
|
||||
}
|
||||
else if (ARR_ELEMTYPE(array) == FLOAT8OID)
|
||||
{
|
||||
for (int i = 0; i < nelemsp; i++)
|
||||
nnz += ((float) DatumGetFloat8(elemsp[i])) != 0;
|
||||
}
|
||||
else if (ARR_ELEMTYPE(array) == FLOAT4OID)
|
||||
{
|
||||
for (int i = 0; i < nelemsp; i++)
|
||||
nnz += (DatumGetFloat4(elemsp[i]) != 0);
|
||||
}
|
||||
else if (ARR_ELEMTYPE(array) == NUMERICOID)
|
||||
{
|
||||
for (int i = 0; i < nelemsp; i++)
|
||||
nnz += (DatumGetFloat4(DirectFunctionCall1(numeric_float4, elemsp[i])) != 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_DATA_EXCEPTION),
|
||||
errmsg("unsupported array type")));
|
||||
}
|
||||
|
||||
result = InitSparseVector(nelemsp, nnz);
|
||||
values = SPARSEVEC_VALUES(result);
|
||||
|
||||
#define PROCESS_ARRAY_ELEM(elem) \
|
||||
do { \
|
||||
float v = (float) (elem); \
|
||||
if (v != 0) { \
|
||||
/* Safety check */ \
|
||||
if (j >= result->nnz) \
|
||||
elog(ERROR, "safety check failed"); \
|
||||
result->indices[j] = i; \
|
||||
values[j] = v; \
|
||||
j++; \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
if (ARR_ELEMTYPE(array) == INT4OID)
|
||||
{
|
||||
for (int i = 0; i < nelemsp; i++)
|
||||
PROCESS_ARRAY_ELEM(DatumGetInt32(elemsp[i]));
|
||||
}
|
||||
else if (ARR_ELEMTYPE(array) == FLOAT8OID)
|
||||
{
|
||||
for (int i = 0; i < nelemsp; i++)
|
||||
PROCESS_ARRAY_ELEM(DatumGetFloat8(elemsp[i]));
|
||||
}
|
||||
else if (ARR_ELEMTYPE(array) == FLOAT4OID)
|
||||
{
|
||||
for (int i = 0; i < nelemsp; i++)
|
||||
PROCESS_ARRAY_ELEM(DatumGetFloat4(elemsp[i]));
|
||||
}
|
||||
else if (ARR_ELEMTYPE(array) == NUMERICOID)
|
||||
{
|
||||
for (int i = 0; i < nelemsp; i++)
|
||||
PROCESS_ARRAY_ELEM(DatumGetFloat4(DirectFunctionCall1(numeric_float4, elemsp[i])));
|
||||
}
|
||||
else
|
||||
{
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_DATA_EXCEPTION),
|
||||
errmsg("unsupported array type")));
|
||||
}
|
||||
|
||||
#undef PROCESS_ARRAY_ELEM
|
||||
|
||||
/*
|
||||
* Free allocation from deconstruct_array. Do not free individual elements
|
||||
* when pass-by-reference since they point to original array.
|
||||
*/
|
||||
pfree(elemsp);
|
||||
|
||||
/* Check elements */
|
||||
for (int i = 0; i < result->nnz; i++)
|
||||
CheckElement(values[i]);
|
||||
|
||||
PG_RETURN_POINTER(result);
|
||||
}
|
||||
|
||||
/*
|
||||
* Get the L2 squared distance between sparse vectors
|
||||
*/
|
||||
|
@ -208,6 +208,62 @@ SELECT '{1:1e-8}/1'::sparsevec::halfvec;
|
||||
[0]
|
||||
(1 row)
|
||||
|
||||
SELECT ARRAY[1,0,2,0,3,0]::sparsevec;
|
||||
array
|
||||
-----------------
|
||||
{1:1,3:2,5:3}/6
|
||||
(1 row)
|
||||
|
||||
SELECT ARRAY[1.0,0.0,2.0,0.0,3.0,0.0]::sparsevec;
|
||||
array
|
||||
-----------------
|
||||
{1:1,3:2,5:3}/6
|
||||
(1 row)
|
||||
|
||||
SELECT ARRAY[1,0,2,0,3,0]::float4[]::sparsevec;
|
||||
array
|
||||
-----------------
|
||||
{1:1,3:2,5:3}/6
|
||||
(1 row)
|
||||
|
||||
SELECT ARRAY[1,0,2,0,3,0]::float8[]::sparsevec;
|
||||
array
|
||||
-----------------
|
||||
{1:1,3:2,5:3}/6
|
||||
(1 row)
|
||||
|
||||
SELECT ARRAY[1,0,2,0,3,0]::numeric[]::sparsevec;
|
||||
array
|
||||
-----------------
|
||||
{1:1,3:2,5:3}/6
|
||||
(1 row)
|
||||
|
||||
SELECT '{1,0,2,0,3,0}'::real[]::sparsevec;
|
||||
sparsevec
|
||||
-----------------
|
||||
{1:1,3:2,5:3}/6
|
||||
(1 row)
|
||||
|
||||
SELECT '{1,0,2,0,3,0}'::real[]::sparsevec(6);
|
||||
sparsevec
|
||||
-----------------
|
||||
{1:1,3:2,5:3}/6
|
||||
(1 row)
|
||||
|
||||
SELECT '{1,0,2,0,3,0}'::real[]::sparsevec(5);
|
||||
ERROR: expected 5 dimensions, not 6
|
||||
SELECT '{NULL}'::real[]::sparsevec;
|
||||
ERROR: array must not contain nulls
|
||||
SELECT '{NaN}'::real[]::sparsevec;
|
||||
ERROR: NaN not allowed in sparsevec
|
||||
SELECT '{Infinity}'::real[]::sparsevec;
|
||||
ERROR: infinite value not allowed in sparsevec
|
||||
SELECT '{-Infinity}'::real[]::sparsevec;
|
||||
ERROR: infinite value not allowed in sparsevec
|
||||
SELECT '{}'::real[]::sparsevec;
|
||||
ERROR: sparsevec must have at least 1 dimension
|
||||
SELECT '{{1}}'::real[]::sparsevec;
|
||||
ERROR: array must be 1-D
|
||||
SELECT array_agg(n)::vector FROM generate_series(1, 16001) n;
|
||||
ERROR: vector cannot have more than 16000 dimensions
|
||||
SELECT array_to_vector(array_agg(n), 16001, false) FROM generate_series(1, 16001) n;
|
||||
|
@ -58,6 +58,22 @@ SELECT '{}/16001'::sparsevec::halfvec;
|
||||
SELECT '{1:65520}/1'::sparsevec::halfvec;
|
||||
SELECT '{1:1e-8}/1'::sparsevec::halfvec;
|
||||
|
||||
SELECT ARRAY[1,0,2,0,3,0]::sparsevec;
|
||||
SELECT ARRAY[1.0,0.0,2.0,0.0,3.0,0.0]::sparsevec;
|
||||
SELECT ARRAY[1,0,2,0,3,0]::float4[]::sparsevec;
|
||||
SELECT ARRAY[1,0,2,0,3,0]::float8[]::sparsevec;
|
||||
SELECT ARRAY[1,0,2,0,3,0]::numeric[]::sparsevec;
|
||||
|
||||
SELECT '{1,0,2,0,3,0}'::real[]::sparsevec;
|
||||
SELECT '{1,0,2,0,3,0}'::real[]::sparsevec(6);
|
||||
SELECT '{1,0,2,0,3,0}'::real[]::sparsevec(5);
|
||||
SELECT '{NULL}'::real[]::sparsevec;
|
||||
SELECT '{NaN}'::real[]::sparsevec;
|
||||
SELECT '{Infinity}'::real[]::sparsevec;
|
||||
SELECT '{-Infinity}'::real[]::sparsevec;
|
||||
SELECT '{}'::real[]::sparsevec;
|
||||
SELECT '{{1}}'::real[]::sparsevec;
|
||||
|
||||
SELECT array_agg(n)::vector FROM generate_series(1, 16001) n;
|
||||
SELECT array_to_vector(array_agg(n), 16001, false) FROM generate_series(1, 16001) n;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user