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

No need to manually free memory on errors

Browse Source
This commit is contained in:
Andrew Kane
2023-06-11 09:42:20 -07:00
parent 2b939edfee
commit 5fdf5573a0
1 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/vector.c
View File

@@ -72,27 +72,17 @@ CheckDim(int dim)
* Ensure finite elements * Ensure finite elements
*/ */
static inline void static inline void
CheckElementOrFree(float value, Vector * vec) CheckElement(float value)
{ {
if (isnan(value)) if (isnan(value))
{
if (vec != NULL)
pfree(vec);
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATA_EXCEPTION), (errcode(ERRCODE_DATA_EXCEPTION),
errmsg("NaN not allowed in vector"))); errmsg("NaN not allowed in vector")));
}
if (isinf(value)) if (isinf(value))
{
if (vec != NULL)
pfree(vec);
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_DATA_EXCEPTION), (errcode(ERRCODE_DATA_EXCEPTION),
errmsg("infinite value not allowed in vector"))); errmsg("infinite value not allowed in vector")));
}
} }
/* /*
@@ -198,7 +188,7 @@ vector_in(PG_FUNCTION_ARGS)
/* Use strtof like float4in to avoid a double-rounding problem */ /* Use strtof like float4in to avoid a double-rounding problem */
x[dim] = strtof(pt, &stringEnd); x[dim] = strtof(pt, &stringEnd);
CheckElementOrFree(x[dim], NULL); CheckElement(x[dim]);
dim++; dim++;
if (stringEnd == pt) if (stringEnd == pt)
@@ -372,7 +362,7 @@ vector_recv(PG_FUNCTION_ARGS)
for (i = 0; i < dim; i++) for (i = 0; i < dim; i++)
{ {
result->x[i] = pq_getmsgfloat4(buf); result->x[i] = pq_getmsgfloat4(buf);
CheckElementOrFree(result->x[i], result); CheckElement(result->x[i]);
} }
PG_RETURN_POINTER(result); PG_RETURN_POINTER(result);
@@ -464,7 +454,7 @@ array_to_vector(PG_FUNCTION_ARGS)
(errcode(ERRCODE_DATA_EXCEPTION), (errcode(ERRCODE_DATA_EXCEPTION),
errmsg("unsupported array type"))); errmsg("unsupported array type")));
CheckElementOrFree(result->x[i], result); CheckElement(result->x[i]);
} }
PG_RETURN_POINTER(result); PG_RETURN_POINTER(result);
@@ -706,10 +696,7 @@ vector_add(PG_FUNCTION_ARGS)
for (int i = 0, imax = a->dim; i < imax; i++) for (int i = 0, imax = a->dim; i < imax; i++)
{ {
if (isinf(rx[i])) if (isinf(rx[i]))
{
pfree(result);
float_overflow_error(); float_overflow_error();
}
} }
PG_RETURN_POINTER(result); PG_RETURN_POINTER(result);
@@ -742,10 +729,7 @@ vector_sub(PG_FUNCTION_ARGS)
for (int i = 0, imax = a->dim; i < imax; i++) for (int i = 0, imax = a->dim; i < imax; i++)
{ {
if (isinf(rx[i])) if (isinf(rx[i]))
{
pfree(result);
float_overflow_error(); float_overflow_error();
}
} }
PG_RETURN_POINTER(result); PG_RETURN_POINTER(result);
@@ -908,10 +892,7 @@ vector_accum(PG_FUNCTION_ARGS)
/* Check for overflow */ /* Check for overflow */
if (isinf(v)) if (isinf(v))
{
pfree(statedatums);
float_overflow_error(); float_overflow_error();
}
statedatums[i + 1] = Float8GetDatum(v); statedatums[i + 1] = Float8GetDatum(v);
} }
@@ -980,10 +961,7 @@ vector_combine(PG_FUNCTION_ARGS)
/* Check for overflow */ /* Check for overflow */
if (isinf(v)) if (isinf(v))
{
pfree(statedatums);
float_overflow_error(); float_overflow_error();
}
statedatums[i] = Float8GetDatum(v); statedatums[i] = Float8GetDatum(v);
} }
@@ -1028,7 +1006,7 @@ vector_avg(PG_FUNCTION_ARGS)
for (int i = 0; i < dim; i++) for (int i = 0; i < dim; i++)
{ {
result->x[i] = statevalues[i + 1] / n; result->x[i] = statevalues[i + 1] / n;
CheckElementOrFree(result->x[i], result); CheckElement(result->x[i]);
} }
PG_RETURN_POINTER(result); PG_RETURN_POINTER(result);