liuyu/pgvector
1
0
Fork 0
mirror of https://github.com/pgvector/pgvector.git synced 2026-07-10 14:46:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplified sum aggregate

Browse Source
This commit is contained in:
Andrew Kane
2023-07-16 15:30:03 -07:00
parent f9d9d64a4e
commit a0c7f618ff
5 changed files with 7 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/vector--0.4.4--0.5.0.sql
View File

@@ -12,14 +12,9 @@ CREATE OPERATOR * (
COMMUTATOR = * COMMUTATOR = *
); );
CREATE FUNCTION vector_sum(double precision[]) RETURNS vector
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
CREATE AGGREGATE sum(vector) ( CREATE AGGREGATE sum(vector) (
SFUNC = vector_accum, SFUNC = vector_add,
STYPE = double precision[], STYPE = vector,
FINALFUNC = vector_sum, COMBINEFUNC = vector_add,
COMBINEFUNC = vector_combine,
INITCOND = '{0}',
PARALLEL = SAFE PARALLEL = SAFE
); );

11
sql/vector.sql
View File

@@ -99,9 +99,6 @@ 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_sum(double precision[]) RETURNS vector
AS 'MODULE_PATHNAME' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
-- aggregates -- aggregates
CREATE AGGREGATE avg(vector) ( CREATE AGGREGATE avg(vector) (
@@ -114,11 +111,9 @@ CREATE AGGREGATE avg(vector) (
); );
CREATE AGGREGATE sum(vector) ( CREATE AGGREGATE sum(vector) (
SFUNC = vector_accum, SFUNC = vector_add,
STYPE = double precision[], STYPE = vector,
FINALFUNC = vector_sum, COMBINEFUNC = vector_add,
COMBINEFUNC = vector_combine,
INITCOND = '{0}',
PARALLEL = SAFE PARALLEL = SAFE
); );

39
src/vector.c
View File

@@ -1090,42 +1090,3 @@ vector_avg(PG_FUNCTION_ARGS)
PG_RETURN_POINTER(result); PG_RETURN_POINTER(result);
} }
/*
* Sum vectors
*/
PGDLLEXPORT PG_FUNCTION_INFO_V1(vector_sum);
Datum
vector_sum(PG_FUNCTION_ARGS)
{
ArrayType *statearray = PG_GETARG_ARRAYTYPE_P(0);
float8 *statevalues;
float8 n;
uint16 dim;
Vector *result;
/* Check array before using */
statevalues = CheckStateArray(statearray, "vector_sum");
n = statevalues[0];
/* SQL defines AVG of no values to be NULL */
if (n == 0.0)
PG_RETURN_NULL();
/* Create vector */
dim = STATE_DIMS(statearray);
CheckDim(dim);
result = InitVector(dim);
for (int i = 0; i < dim; i++)
{
result->x[i] = statevalues[i + 1];
/* Check for overflow */
if (isinf(result->x[i]))
float_overflow_error();
CheckElement(result->x[i]);
}
PG_RETURN_POINTER(result);
}

4
test/expected/functions.out
View File

@@ -157,8 +157,6 @@ SELECT sum(v) FROM unnest(ARRAY[]::vector[]) v;
(1 row) (1 row)
SELECT sum(v) FROM unnest(ARRAY['[1,2]'::vector, '[3]']) v; SELECT sum(v) FROM unnest(ARRAY['[1,2]'::vector, '[3]']) v;
ERROR: expected 2 dimensions, not 1 ERROR: different vector dimensions 2 and 1
SELECT sum(v) FROM unnest(ARRAY['[3e38]'::vector, '[3e38]']) v; SELECT sum(v) FROM unnest(ARRAY['[3e38]'::vector, '[3e38]']) v;
ERROR: value out of range: overflow ERROR: value out of range: overflow
SELECT vector_sum(array_agg(n)) FROM generate_series(1, 16002) n;
ERROR: vector cannot have more than 16000 dimensions

1
test/sql/functions.sql
View File

@@ -41,4 +41,3 @@ SELECT sum(v) FROM unnest(ARRAY['[1,2,3]'::vector, '[3,5,7]', NULL]) v;
SELECT sum(v) FROM unnest(ARRAY[]::vector[]) v; SELECT sum(v) FROM unnest(ARRAY[]::vector[]) v;
SELECT sum(v) FROM unnest(ARRAY['[1,2]'::vector, '[3]']) v; SELECT sum(v) FROM unnest(ARRAY['[1,2]'::vector, '[3]']) v;
SELECT sum(v) FROM unnest(ARRAY['[3e38]'::vector, '[3e38]']) v; SELECT sum(v) FROM unnest(ARRAY['[3e38]'::vector, '[3e38]']) v;
SELECT vector_sum(array_agg(n)) FROM generate_series(1, 16002) n;