diff --git a/src/cdata.c b/src/cdata.c
index 32e8e4d0b8dbad51c5ec428d95b70543faefeca6..418ec0afa2fe42f3068584cb0551964b70527f0e 100644 (file)
--- a/src/cdata.c
+++ b/src/cdata.c
#include <errno.h>
#include <string.h>
+#include <math.h>
#include <postgres.h>
#include <fmgr.h>
PG_FUNCTION_INFO_V1(cdata_to_cdata);
PG_FUNCTION_INFO_V1(int32_to_cdata);
+PG_FUNCTION_INFO_V1(cdata_to_float8);
PG_FUNCTION_INFO_V1(cdata_update);
data->value = strtod(val_str, &endptr);
data->val_num = 1;
+ if (isnan(data->value)) {
+ data->undef_num = 1;
+ }
+
if ((endptr == val_str) || errno)
ereport(ERROR, (
errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
));
while ((*endptr != '\0') && isspace((int)*endptr))
+ ++endptr;
+
+ if (*endptr != '\0')
ereport(ERROR, (
errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
- errmsg("invalid input syntax for cdata: \"%s\"", orig)
+ errmsg("invalid input syntax for cdata: \"%s\"", orig),
+ errdetail("garbage found after number: \"%s\"", endptr)
));
if (typmod > 0)
data = PG_GETARG_CDATA_P(0);
- snprintf(cd_str, sizeof(cd_str), "%g (U:%i/%i)",
- data->value, data->undef_num, data->val_num);
+ snprintf(cd_str, sizeof(cd_str), "%g (%s U:%i/%i)",
+ data->value, CF_TO_STR(data->cf),
+ data->undef_num, data->val_num);
result = pstrdup(cd_str);
PG_RETURN_CSTRING(result);
PG_RETURN_CDATA_P(data);
} /* int32_to_cdata */
+Datum
+cdata_to_float8(PG_FUNCTION_ARGS)
+{
+ cdata_t *data;
+
+ if (PG_NARGS() != 1)
+ ereport(ERROR, (
+ errmsg("cdata_to_float8() expects one argument"),
+ errhint("Usage: cdata_to_float8(cdata)")
+ ));
+
+ data = PG_GETARG_CDATA_P(0);
+ PG_RETURN_FLOAT8(data->value);
+} /* cdata_to_float8 */
+
Datum
cdata_update(PG_FUNCTION_ARGS)
{
cdata_t *data;
cdata_t *update;
+ float8 value;
+ float8 u_value;
+
+ int32 val_num;
+ int32 u_val_num;
+
if (PG_NARGS() != 2)
ereport(ERROR, (
errmsg("cdata_update() expects two arguments"),
data = PG_GETARG_CDATA_P(0);
update = PG_GETARG_CDATA_P(1);
+ if (! data)
+ PG_RETURN_CDATA_P(update);
+
+ if (! update)
+ PG_RETURN_CDATA_P(data);
+
if ((data->cf != update->cf) && (update->val_num > 1))
ereport(ERROR, (
errcode(ERRCODE_INVALID_PARAMETER_VALUE),
"consolidation function")
));
+ value = data->value;
+ u_value = update->value;
+
+ val_num = data->val_num - data->undef_num;
+ u_val_num = update->val_num - update->undef_num;
+
+ data->undef_num += update->undef_num;
+ data->val_num += update->val_num;
+
+ if (isnan(value) || isnan(u_value)) {
+ data->value = isnan(value) ? u_value : value;
+ PG_RETURN_CDATA_P(data);
+ }
+
switch (data->cf) {
case CF_AVG:
- data->value = (data->value * (data->val_num - data->undef_num))
- + (update->value * (update->val_num - update->undef_num));
- data->value /= (data->val_num - data->undef_num)
- + (update->val_num - update->undef_num);
+ data->value = ((value * val_num) + (u_value * u_val_num))
+ / (val_num + u_val_num);
break;
case CF_MIN:
- data->value = (data->value <= update->value)
- ? data->value : update->value;
+ data->value = (value < u_value) ? value : u_value;
break;
case CF_MAX:
- data->value = (data->value >= update->value)
- ? data->value : update->value;
+ data->value = (value >= u_value) ? value : u_value;
break;
default:
ereport(ERROR, (
));
break;
}
-
- data->undef_num += update->undef_num;
- data->val_num += update->val_num;
PG_RETURN_CDATA_P(data);
} /* cdata_update */