database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Replace direct assignments to VARATT_SIZEP(x) with SET_VARSIZE(x, len).

Browse Source 
Get rid of VARATT_SIZE and VARATT_DATA, which were simply redundant with
VARSIZE and VARDATA, and as a consequence almost no code was using the
longer names.  Rename the length fields of struct varlena and various
derived structures to catch anyplace that was accessing them directly;
and clean up various places so caught.  In itself this patch doesn't
change any behavior at all, but it is necessary infrastructure if we hope
to play any games with the representation of varlena headers.
Greg Stark and Tom Lane
This commit is contained in:
Tom Lane
2007-02-27 23:48:10 +00:00
parent 0459b591fc
commit 234a02b2a8
87 changed files with 483 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
contrib/cube/cube.c
View File

@ -1,5 +1,5 @@
/******************************************************************************
$PostgreSQL: pgsql/contrib/cube/cube.c,v 1.30 2006/10/04 00:29:44 momjian Exp $
$PostgreSQL: pgsql/contrib/cube/cube.c,v 1.31 2007/02/27 23:48:05 tgl Exp $
This file contains routines that can be bound to a Postgres backend and
called by the backend in the process of processing queries. The calling
@ -223,9 +223,8 @@ cube_a_f8_f8(PG_FUNCTION_ARGS)
dll = ARRPTR(ll);
size = offsetof(NDBOX, x[0]) + sizeof(double) * 2 * dim;
result = (NDBOX *) palloc(size);
memset(result, 0, size);
result->size = size;
result = (NDBOX *) palloc0(size);
SET_VARSIZE(result, size);
result->dim = dim;
for (i = 0; i < dim; i++)
@ -264,9 +263,8 @@ cube_a_f8(PG_FUNCTION_ARGS)
dur = ARRPTR(ur);
size = offsetof(NDBOX, x[0]) + sizeof(double) * 2 * dim;
result = (NDBOX *) palloc(size);
memset(result, 0, size);
result->size = size;
result = (NDBOX *) palloc0(size);
SET_VARSIZE(result, size);
result->dim = dim;
for (i = 0; i < dim; i++)
@ -303,9 +301,8 @@ cube_subset(PG_FUNCTION_ARGS)
dim = ARRNELEMS(idx);
size = offsetof(NDBOX, x[0]) + sizeof(double) * 2 * dim;
result = (NDBOX *) palloc(size);
memset(result, 0, size);
result->size = size;
result = (NDBOX *) palloc0(size);
SET_VARSIZE(result, size);
result->dim = dim;
for (i = 0; i < dim; i++)
@ -432,7 +429,7 @@ g_cube_union(PG_FUNCTION_ARGS)
/*
* sizep = sizeof(NDBOX); -- NDBOX has variable size
*/
*sizep = tmp->size;
*sizep = VARSIZE(tmp);
for (i = 1; i < entryvec->n; i++)
{
@ -744,7 +741,7 @@ g_cube_binary_union(NDBOX * r1, NDBOX * r2, int *sizep)
NDBOX *retval;
retval = cube_union_v0(r1, r2);
*sizep = retval->size;
*sizep = VARSIZE(retval);
return (retval);
}
@ -759,16 +756,14 @@ cube_union_v0(NDBOX * a, NDBOX * b)
if (a->dim >= b->dim)
{
result = palloc(a->size);
memset(result, 0, a->size);
result->size = a->size;
result = palloc0(VARSIZE(a));
SET_VARSIZE(result, VARSIZE(a));
result->dim = a->dim;
}
else
{
result = palloc(b->size);
memset(result, 0, b->size);
result->size = b->size;
result = palloc0(VARSIZE(b));
SET_VARSIZE(result, VARSIZE(b));
result->dim = b->dim;
}
@ -834,16 +829,14 @@ cube_inter(PG_FUNCTION_ARGS)
if (a->dim >= b->dim)
{
result = palloc(a->size);
memset(result, 0, a->size);
result->size = a->size;
result = palloc0(VARSIZE(a));
SET_VARSIZE(result, VARSIZE(a));
result->dim = a->dim;
}
else
{
result = palloc(b->size);
memset(result, 0, b->size);
result->size = b->size;
result = palloc0(VARSIZE(b));
SET_VARSIZE(result, VARSIZE(b));
result->dim = b->dim;
}
@ -1371,9 +1364,8 @@ cube_enlarge(PG_FUNCTION_ARGS)
if (a->dim > dim)
dim = a->dim;
size = offsetof(NDBOX, x[0]) + sizeof(double) * dim * 2;
result = (NDBOX *) palloc(size);
memset(result, 0, size);
result->size = size;
result = (NDBOX *) palloc0(size);
SET_VARSIZE(result, size);
result->dim = dim;
for (i = 0, j = dim, k = a->dim; i < a->dim; i++, j++, k++)
{
@ -1411,9 +1403,8 @@ cube_f8(PG_FUNCTION_ARGS)
int size;
size = offsetof(NDBOX, x[0]) + sizeof(double) * 2;
result = (NDBOX *) palloc(size);
memset(result, 0, size);
result->size = size;
result = (NDBOX *) palloc0(size);
SET_VARSIZE(result, size);
result->dim = 1;
result->x[0] = PG_GETARG_FLOAT8(0);
result->x[1] = result->x[0];
@ -1429,9 +1420,8 @@ cube_f8_f8(PG_FUNCTION_ARGS)
int size;
size = offsetof(NDBOX, x[0]) + sizeof(double) * 2;
result = (NDBOX *) palloc(size);
memset(result, 0, size);
result->size = size;
result = (NDBOX *) palloc0(size);
SET_VARSIZE(result, size);
result->dim = 1;
result->x[0] = PG_GETARG_FLOAT8(0);
result->x[1] = PG_GETARG_FLOAT8(1);
@ -1454,9 +1444,8 @@ cube_c_f8(PG_FUNCTION_ARGS)
x = PG_GETARG_FLOAT8(1);
size = offsetof(NDBOX, x[0]) + sizeof(double) * (c->dim + 1) *2;
result = (NDBOX *) palloc(size);
memset(result, 0, size);
result->size = size;
result = (NDBOX *) palloc0(size);
SET_VARSIZE(result, size);
result->dim = c->dim + 1;
for (i = 0; i < c->dim; i++)
{
@ -1485,9 +1474,8 @@ cube_c_f8_f8(PG_FUNCTION_ARGS)
x2 = PG_GETARG_FLOAT8(2);
size = offsetof(NDBOX, x[0]) + sizeof(double) * (c->dim + 1) *2;
result = (NDBOX *) palloc(size);
memset(result, 0, size);
result->size = size;
result = (NDBOX *) palloc0(size);
SET_VARSIZE(result, size);
result->dim = c->dim + 1;
for (i = 0; i < c->dim; i++)
{

5
contrib/cube/cubedata.h
View File

@ -1,9 +1,10 @@
/* $PostgreSQL: pgsql/contrib/cube/cubedata.h,v 1.7 2006/03/11 04:38:28 momjian Exp $ */
/* $PostgreSQL: pgsql/contrib/cube/cubedata.h,v 1.8 2007/02/27 23:48:05 tgl Exp $ */
#define CUBE_MAX_DIM (100)
typedef struct NDBOX
{
unsigned int size; /* required to be a Postgres varlena type */
int32 vl_len_; /* varlena header (do not touch directly!) */
unsigned int dim;
double x[1];
} NDBOX;

12
contrib/cube/cubeparse.y
View File

@ -2,7 +2,7 @@
/* NdBox = [(lowerleft),(upperright)] */
/* [(xLL(1)...xLL(N)),(xUR(1)...xUR(n))] */
/* $PostgreSQL: pgsql/contrib/cube/cubeparse.y,v 1.16 2006/03/11 04:38:28 momjian Exp $ */
/* $PostgreSQL: pgsql/contrib/cube/cubeparse.y,v 1.17 2007/02/27 23:48:05 tgl Exp $ */
#define YYPARSE_PARAM result /* need this to pass a pointer (void *) to yyparse */
#define YYSTYPE char *
@ -165,9 +165,8 @@ write_box(unsigned int dim, char *str1, char *str2)
int i;
int size = offsetof(NDBOX, x[0]) + sizeof(double) * dim * 2;
bp = palloc(size);
memset(bp, 0, size);
bp->size = size;
bp = palloc0(size);
SET_VARSIZE(bp, size);
bp->dim = dim;
s = str1;
@ -198,9 +197,8 @@ write_point_as_box(char *str, int dim)
size = offsetof(NDBOX, x[0]) + sizeof(double) * dim * 2;
bp = palloc(size);
memset(bp, 0, size);
bp->size = size;
bp = palloc0(size);
SET_VARSIZE(bp, size);
bp->dim = dim;
i = 0;