archive-gh-me/pointcloud
1
0
Fork 0
mirror of https://github.com/pgpointcloud/pointcloud.git synced 2025-12-08 20:36:04 +00:00
Code Issues Projects Releases Wiki Activity

Change names of generic aggregate functions

Browse Source
This commit is contained in:
Paul Ramsey 2013-03-04 09:31:52 -08:00
parent c7060031b5
commit 5329ee0051
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pgsql/pc_access.c
View File

@ -18,9 +18,9 @@ Datum pcpatch_from_pcpoint_array(PG_FUNCTION_ARGS);
/* Aggregation functions */
Datum pcpoint_agg_final_pcpatch(PG_FUNCTION_ARGS);
Datum pcpoint_agg_final_array(PG_FUNCTION_ARGS);
Datum pcpoint_agg_transfn(PG_FUNCTION_ARGS);
Datum pcpoint_abs_in(PG_FUNCTION_ARGS);
Datum pcpoint_abs_out(PG_FUNCTION_ARGS);
Datum pointcloud_agg_transfn(PG_FUNCTION_ARGS);
Datum pointcloud_abs_in(PG_FUNCTION_ARGS);
Datum pointcloud_abs_out(PG_FUNCTION_ARGS);
/* Deaggregation functions */
Datum pcpatch_unnest(PG_FUNCTION_ARGS);
@ -68,7 +68,7 @@ array_get_isnull(const bits8 *nullbitmap, int offset)
}
static PCPATCH *
pcpatch_from_array(ArrayType *array, FunctionCallInfoData *fcinfo)
pcpatch_from_point_array(ArrayType *array, FunctionCallInfoData *fcinfo)
{
int nelems;
bits8 *bitmap;
@ -150,7 +150,7 @@ Datum pcpatch_from_pcpoint_array(PG_FUNCTION_ARGS)
PG_RETURN_NULL();
array = DatumGetArrayTypeP(PG_GETARG_DATUM(0));
pa = pcpatch_from_array(array, fcinfo);
pa = pcpatch_from_point_array(array, fcinfo);
if ( ! pa )
PG_RETURN_NULL();
@ -164,25 +164,25 @@ typedef struct
ArrayBuildState *s;
} abs_trans;
PG_FUNCTION_INFO_V1(pcpoint_abs_in);
Datum pcpoint_abs_in(PG_FUNCTION_ARGS)
PG_FUNCTION_INFO_V1(pointcloud_abs_in);
Datum pointcloud_abs_in(PG_FUNCTION_ARGS)
{
ereport(ERROR,(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("function pcpoint_abs_in not implemented")));
errmsg("function pointcloud_abs_in not implemented")));
PG_RETURN_POINTER(NULL);
}
PG_FUNCTION_INFO_V1(pcpoint_abs_out);
Datum pcpoint_abs_out(PG_FUNCTION_ARGS)
PG_FUNCTION_INFO_V1(pointcloud_abs_out);
Datum pointcloud_abs_out(PG_FUNCTION_ARGS)
{
ereport(ERROR,(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("function pcpoint_abs_out not implemented")));
errmsg("function pointcloud_abs_out not implemented")));
PG_RETURN_POINTER(NULL);
}
PG_FUNCTION_INFO_V1(pcpoint_agg_transfn);
Datum pcpoint_agg_transfn(PG_FUNCTION_ARGS)
PG_FUNCTION_INFO_V1(pointcloud_agg_transfn);
Datum pointcloud_agg_transfn(PG_FUNCTION_ARGS)
{
Oid arg1_typeid = get_fn_expr_argtype(fcinfo->flinfo, 1);
MemoryContext aggcontext;
@ -206,7 +206,7 @@ Datum pcpoint_agg_transfn(PG_FUNCTION_ARGS)
else
{
/* cannot be called directly because of dummy-type argument */
elog(ERROR, "pcpoint_agg_transfn called in non-aggregate context");
elog(ERROR, "pointcloud_agg_transfn called in non-aggregate context");
aggcontext = NULL; /* keep compiler quiet */
}
@ -277,7 +277,7 @@ Datum pcpoint_agg_final_pcpatch(PG_FUNCTION_ARGS)
a = (abs_trans*) PG_GETARG_POINTER(0);
array = DatumGetArrayTypeP(pcpoint_agg_final(a, CurrentMemoryContext, fcinfo));
pa = pcpatch_from_array(array, fcinfo);
pa = pcpatch_from_point_array(array, fcinfo);
if ( ! pa )
PG_RETURN_NULL();

28
pgsql/pointcloud--1.0.sql
View File

@ -125,18 +125,18 @@ CREATE OR REPLACE FUNCTION PC_Envelope(p pcpatch)
-- AGGREGATE / EXPLODE
-------------------------------------------------------------------
CREATE OR REPLACE FUNCTION pcpoint_abs_in(cstring)
RETURNS pcpoint_abs AS 'MODULE_PATHNAME'
CREATE OR REPLACE FUNCTION pointcloud_abs_in(cstring)
RETURNS pointcloud_abs AS 'MODULE_PATHNAME'
LANGUAGE 'c';
CREATE OR REPLACE FUNCTION pcpoint_abs_out(pcpoint_abs)
CREATE OR REPLACE FUNCTION pointcloud_abs_out(pointcloud_abs)
RETURNS cstring AS 'MODULE_PATHNAME'
LANGUAGE 'c';
CREATE TYPE pcpoint_abs (
CREATE TYPE pointcloud_abs (
internallength = 8,
input = pcpoint_abs_in,
output = pcpoint_abs_out,
input = pointcloud_abs_in,
output = pointcloud_abs_out,
alignment = double
);
@ -145,29 +145,29 @@ CREATE FUNCTION PC_Patch(pcpoint[])
LANGUAGE 'c' IMMUTABLE STRICT;
CREATE FUNCTION pcpoint_agg_transfn (pcpoint_abs, pcpoint)
RETURNS pcpoint_abs AS'MODULE_PATHNAME', 'pcpoint_agg_transfn'
CREATE FUNCTION pointcloud_agg_transfn (pointcloud_abs, pcpoint)
RETURNS pointcloud_abs AS'MODULE_PATHNAME', 'pointcloud_agg_transfn'
LANGUAGE 'c';
CREATE FUNCTION pcpoint_agg_final_array (pcpoint_abs)
CREATE FUNCTION pcpoint_agg_final_array (pointcloud_abs)
RETURNS pcpoint[] AS 'MODULE_PATHNAME', 'pcpoint_agg_final_array'
LANGUAGE 'c';
CREATE FUNCTION pcpoint_agg_final_pcpatch (pcpoint_abs)
CREATE FUNCTION pcpoint_agg_final_pcpatch (pointcloud_abs)
RETURNS pcpatch AS 'MODULE_PATHNAME', 'pcpoint_agg_final_pcpatch'
LANGUAGE 'c';
CREATE AGGREGATE PC_Patch (
BASETYPE = pcpoint,
SFUNC = pcpoint_agg_transfn,
STYPE = pcpoint_abs,
SFUNC = pointcloud_agg_transfn,
STYPE = pointcloud_abs,
FINALFUNC = pcpoint_agg_final_pcpatch
);
CREATE AGGREGATE PC_Point_Agg (
BASETYPE = pcpoint,
SFUNC = pcpoint_agg_transfn,
STYPE = pcpoint_abs,
SFUNC = pointcloud_agg_transfn,
STYPE = pointcloud_abs,
FINALFUNC = pcpoint_agg_final_array
);