Skip to content

P
Postgres FD Implementation
Commit 339cd6b9 authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

Run pgindent on _int.c, for Tom Lane. I had skipped this file because 

of a complex macro that pgindent complained about.  Hand-adjusted macro
for pgindent run.
parent 69a2c2ba
Show whitespace changes
Inline Side-by-side
Showing with 939 additions and 748 deletions
contrib/intarray/_int.c
View file @ 339cd6b9
...@@ -66,7 +66,8 @@ ...@@ -66,7 +66,8 @@
#define SIGLENBIT (SIGLEN*BITBYTE) #define SIGLENBIT (SIGLEN*BITBYTE)
typedef char BITVEC[SIGLEN]; typedef char BITVEC[SIGLEN];
typedef char* BITVECP; typedef char *BITVECP;
#define SIGPTR(x) ( (BITVECP) ARR_DATA_PTR(x) ) #define SIGPTR(x) ( (BITVECP) ARR_DATA_PTR(x) )
...@@ -88,59 +89,67 @@ typedef char* BITVECP; ...@@ -88,59 +89,67 @@ typedef char* BITVECP;
#ifdef GIST_DEBUG #ifdef GIST_DEBUG
static void printarr ( ArrayType * a, int num ) { static void
printarr(ArrayType *a, int num)
{
char bbb[16384]; char bbb[16384];
char *cur; char *cur;
int l; int l;
int *d; int *d;
d = ARRPTR( a );
d = ARRPTR(a);
*bbb = '\0'; *bbb = '\0';
cur = bbb; cur = bbb;
for(l=0; l<min( num, ARRNELEMS( a ));l++) { for (l = 0; l < min(num, ARRNELEMS(a)); l++)
sprintf(cur,"%d ", d[l] ); {
cur = strchr( cur, '\0' ) ; sprintf(cur, "%d ", d[l]);
cur = strchr(cur, '\0');
} }
elog(NOTICE, "\t\t%s", bbb); elog(NOTICE, "\t\t%s", bbb);
} }
static void printbitvec( BITVEC bv ) { static void
printbitvec(BITVEC bv)
{
int i; int i;
char str[ SIGLENBIT+1 ]; char str[SIGLENBIT + 1];
str[ SIGLENBIT ] ='\0';
LOOPBIT( str[i] = ( GETBIT(bv,i) ) ? '1' : '0' ); str[SIGLENBIT] = '\0';
LOOPBIT(str[i] = (GETBIT(bv, i)) ? '1' : '0');
elog(NOTICE,"BV: %s", str); elog(NOTICE, "BV: %s", str);
} }
#endif #endif
/* /*
** types for functions ** types for functions
*/ */
typedef ArrayType * (*formarray) (ArrayType*, ArrayType*); typedef ArrayType *(*formarray) (ArrayType *, ArrayType *);
typedef void (*formfloat) (ArrayType*, float*); typedef void (*formfloat) (ArrayType *, float *);
/* /*
** usefull function ** usefull function
*/ */
static bool isort( int *a, const int len ); static bool isort(int *a, const int len);
static ArrayType * new_intArrayType( int num ); static ArrayType *new_intArrayType(int num);
static ArrayType * copy_intArrayType( ArrayType * a ); static ArrayType *copy_intArrayType(ArrayType *a);
static ArrayType * resize_intArrayType( ArrayType * a, int num ); static ArrayType *resize_intArrayType(ArrayType *a, int num);
static int internal_size( int *a, int len ); static int internal_size(int *a, int len);
static ArrayType * _int_unique( ArrayType * a ); static ArrayType *_int_unique(ArrayType *a);
/* common GiST function*/ /* common GiST function*/
static GIST_SPLITVEC * _int_common_picksplit(bytea *entryvec, static GIST_SPLITVEC *_int_common_picksplit(bytea *entryvec,
GIST_SPLITVEC *v, GIST_SPLITVEC *v,
formarray unionf, formarray unionf,
formarray interf, formarray interf,
formfloat sizef, formfloat sizef,
float coef); float coef);
static float * _int_common_penalty(GISTENTRY *origentry, static float *_int_common_penalty(GISTENTRY *origentry,
GISTENTRY *newentry, GISTENTRY *newentry,
float *result, float *result,
formarray unionf, formarray unionf,
formfloat sizef); formfloat sizef);
static ArrayType * _int_common_union(bytea *entryvec, static ArrayType *_int_common_union(bytea *entryvec,
int *sizep, int *sizep,
formarray unionf); formarray unionf);
...@@ -148,12 +157,12 @@ static ArrayType * _int_common_union(bytea *entryvec, ...@@ -148,12 +157,12 @@ static ArrayType * _int_common_union(bytea *entryvec,
** GiST support methods ** GiST support methods
*/ */
bool g_int_consistent(GISTENTRY *entry, ArrayType *query, StrategyNumber strategy); bool g_int_consistent(GISTENTRY *entry, ArrayType *query, StrategyNumber strategy);
GISTENTRY * g_int_compress(GISTENTRY *entry); GISTENTRY *g_int_compress(GISTENTRY *entry);
GISTENTRY * g_int_decompress(GISTENTRY *entry); GISTENTRY *g_int_decompress(GISTENTRY *entry);
float * g_int_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result); float *g_int_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result);
GIST_SPLITVEC * g_int_picksplit(bytea *entryvec, GIST_SPLITVEC *v); GIST_SPLITVEC *g_int_picksplit(bytea *entryvec, GIST_SPLITVEC *v);
ArrayType * g_int_union(bytea *entryvec, int *sizep); ArrayType *g_int_union(bytea *entryvec, int *sizep);
bool * g_int_same(ArrayType *b1, ArrayType *b2, bool *result); bool *g_int_same(ArrayType *b1, ArrayType *b2, bool *result);
/* /*
...@@ -161,35 +170,36 @@ bool * g_int_same(ArrayType *b1, ArrayType *b2, bool *result); ...@@ -161,35 +170,36 @@ bool * g_int_same(ArrayType *b1, ArrayType *b2, bool *result);
*/ */
bool inner_int_contains(ArrayType *a, ArrayType *b); bool inner_int_contains(ArrayType *a, ArrayType *b);
bool inner_int_overlap(ArrayType *a, ArrayType *b); bool inner_int_overlap(ArrayType *a, ArrayType *b);
ArrayType * inner_int_union(ArrayType *a, ArrayType *b); ArrayType *inner_int_union(ArrayType *a, ArrayType *b);
ArrayType * inner_int_inter(ArrayType *a, ArrayType *b); ArrayType *inner_int_inter(ArrayType *a, ArrayType *b);
bool _int_different(ArrayType *a, ArrayType *b); bool _int_different(ArrayType *a, ArrayType *b);
bool _int_same(ArrayType *a, ArrayType *b); bool _int_same(ArrayType *a, ArrayType *b);
bool _int_contains(ArrayType *a, ArrayType *b); bool _int_contains(ArrayType *a, ArrayType *b);
bool _int_contained(ArrayType *a, ArrayType *b); bool _int_contained(ArrayType *a, ArrayType *b);
bool _int_overlap(ArrayType *a, ArrayType *b); bool _int_overlap(ArrayType *a, ArrayType *b);
ArrayType * _int_union(ArrayType *a, ArrayType *b); ArrayType *_int_union(ArrayType *a, ArrayType *b);
ArrayType * _int_inter(ArrayType *a, ArrayType *b); ArrayType *_int_inter(ArrayType *a, ArrayType *b);
void rt__int_size(ArrayType *a, float* sz); void rt__int_size(ArrayType *a, float *sz);
/* /*
** _intbig methods ** _intbig methods
*/ */
bool g_intbig_consistent(GISTENTRY *entry, ArrayType *query, StrategyNumber strategy); bool g_intbig_consistent(GISTENTRY *entry, ArrayType *query, StrategyNumber strategy);
GISTENTRY * g_intbig_compress(GISTENTRY *entry); GISTENTRY *g_intbig_compress(GISTENTRY *entry);
GISTENTRY * g_intbig_decompress(GISTENTRY *entry); GISTENTRY *g_intbig_decompress(GISTENTRY *entry);
float * g_intbig_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result); float *g_intbig_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result);
GIST_SPLITVEC * g_intbig_picksplit(bytea *entryvec, GIST_SPLITVEC *v); GIST_SPLITVEC *g_intbig_picksplit(bytea *entryvec, GIST_SPLITVEC *v);
ArrayType * g_intbig_union(bytea *entryvec, int *sizep); ArrayType *g_intbig_union(bytea *entryvec, int *sizep);
bool * g_intbig_same(ArrayType *a, ArrayType *b, bool *result); bool *g_intbig_same(ArrayType *a, ArrayType *b, bool *result);
static bool _intbig_contains(ArrayType *a, ArrayType *b); static bool _intbig_contains(ArrayType *a, ArrayType *b);
static bool _intbig_overlap(ArrayType *a, ArrayType *b); static bool _intbig_overlap(ArrayType *a, ArrayType *b);
static ArrayType * _intbig_union(ArrayType *a, ArrayType *b); static ArrayType *_intbig_union(ArrayType *a, ArrayType *b);
/*static ArrayType * _intbig_inter(ArrayType *a, ArrayType *b);*/ /*static ArrayType * _intbig_inter(ArrayType *a, ArrayType *b);*/
static void rt__intbig_size(ArrayType *a, float* sz); static void rt__intbig_size(ArrayType *a, float *sz);
static void gensign(BITVEC sign, int * a, int len); static void gensign(BITVEC sign, int *a, int len);
/***************************************************************************** /*****************************************************************************
* GiST functions * GiST functions
...@@ -211,30 +221,32 @@ g_int_consistent(GISTENTRY *entry, ...@@ -211,30 +221,32 @@ g_int_consistent(GISTENTRY *entry,
/* sort query for fast search, key is already sorted */ /* sort query for fast search, key is already sorted */
/* XXX are we sure it's safe to scribble on the query object here? */ /* XXX are we sure it's safe to scribble on the query object here? */
/* XXX what about toasted input? */ /* XXX what about toasted input? */
if ( ARRISNULL( query ) ) return FALSE; if (ARRISNULL(query))
PREPAREARR( query ); return FALSE;
PREPAREARR(query);
switch(strategy) { switch (strategy)
{
case RTOverlapStrategyNumber: case RTOverlapStrategyNumber:
retval = (bool)inner_int_overlap((ArrayType *)(entry->pred), query); retval = (bool) inner_int_overlap((ArrayType *) (entry->pred), query);
break; break;
case RTSameStrategyNumber: case RTSameStrategyNumber:
case RTContainsStrategyNumber: case RTContainsStrategyNumber:
retval = (bool)inner_int_contains((ArrayType *)(entry->pred), query); retval = (bool) inner_int_contains((ArrayType *) (entry->pred), query);
break; break;
case RTContainedByStrategyNumber: case RTContainedByStrategyNumber:
retval = (bool)inner_int_overlap((ArrayType *)(entry->pred), query); retval = (bool) inner_int_overlap((ArrayType *) (entry->pred), query);
break; break;
default: default:
retval = FALSE; retval = FALSE;
} }
return(retval); return (retval);
} }
ArrayType * ArrayType *
g_int_union(bytea *entryvec, int *sizep) g_int_union(bytea *entryvec, int *sizep)
{ {
return _int_common_union( entryvec, sizep, inner_int_union ); return _int_common_union(entryvec, sizep, inner_int_union);
} }
/* /*
...@@ -244,133 +256,149 @@ GISTENTRY * ...@@ -244,133 +256,149 @@ GISTENTRY *
g_int_compress(GISTENTRY *entry) g_int_compress(GISTENTRY *entry)
{ {
GISTENTRY *retval; GISTENTRY *retval;
ArrayType * r; ArrayType *r;
int len; int len;
int *dr; int *dr;
int i,min,cand; int i,
min,
cand;
retval = palloc(sizeof(GISTENTRY)); retval = palloc(sizeof(GISTENTRY));
#ifdef PGSQL71 #ifdef PGSQL71
if ( entry->pred ) if (entry->pred)
r = (ArrayType *)PG_DETOAST_DATUM_COPY( entry->pred ); r = (ArrayType *) PG_DETOAST_DATUM_COPY(entry->pred);
else else
r = NULL; r = NULL;
#else #else
r = copy_intArrayType( (ArrayType *) entry->pred ); r = copy_intArrayType((ArrayType *) entry->pred);
#endif #endif
if ( ARRISNULL( r ) ) { if (ARRISNULL(r))
{
#ifdef GIST_DEBUG #ifdef GIST_DEBUG
elog(NOTICE,"COMP IN: NULL"); elog(NOTICE, "COMP IN: NULL");
#endif #endif
if ( r ) if ( (char*)r != (char*)entry->pred ) pfree(r); if (r)
if ((char *) r != (char *) entry->pred)
pfree(r);
gistentryinit(*retval, (char *)NULL, entry->rel, entry->page, entry->offset, gistentryinit(*retval, (char *) NULL, entry->rel, entry->page, entry->offset,
0, FALSE); 0, FALSE);
return( retval ); return (retval);
} }
if ( entry->leafkey ) PREPAREARR( r ); if (entry->leafkey)
len = ARRNELEMS( r ); PREPAREARR(r);
len = ARRNELEMS(r);
#ifdef GIST_DEBUG #ifdef GIST_DEBUG
elog(NOTICE, "COMP IN: %d leaf; %d rel; %d page; %d offset; %d bytes; %d elems", entry->leafkey, (int)entry->rel, (int)entry->page, (int)entry->offset, (int)entry->bytes, len); elog(NOTICE, "COMP IN: %d leaf; %d rel; %d page; %d offset; %d bytes; %d elems", entry->leafkey, (int) entry->rel, (int) entry->page, (int) entry->offset, (int) entry->bytes, len);
#endif #endif
if ( len >= 2*MAXNUMRANGE ) { /*compress*/ if (len >= 2 * MAXNUMRANGE)
r = resize_intArrayType( r, 2*( len ) ); { /* compress */
r = resize_intArrayType(r, 2 * (len));
dr = ARRPTR( r ); dr = ARRPTR(r);
for(i=len-1; i>=0;i--) for (i = len - 1; i >= 0; i--)
dr[2*i] = dr[2*i+1] = dr[i]; dr[2 * i] = dr[2 * i + 1] = dr[i];
len *= 2; len *= 2;
cand = 1; cand = 1;
while( len > MAXNUMRANGE * 2 ) { while (len > MAXNUMRANGE * 2)
{
min = 0x7fffffff; min = 0x7fffffff;
for( i=2; i<len;i+=2 ) for (i = 2; i < len; i += 2)
if ( min > (dr[i] - dr[i-1]) ) { if (min > (dr[i] - dr[i - 1]))
min = (dr[i] - dr[i-1]); {
min = (dr[i] - dr[i - 1]);
cand = i; cand = i;
} }
memmove( (void*)&dr[cand-1], (void*)&dr[cand+1], (len - cand - 1)*sizeof(int) ); memmove((void *) &dr[cand - 1], (void *) &dr[cand + 1], (len - cand - 1) * sizeof(int));
len -= 2; len -= 2;
} }
r = resize_intArrayType(r, len ); r = resize_intArrayType(r, len);
} }
gistentryinit(*retval, (char *)r, entry->rel, entry->page, entry->offset, VARSIZE( r ), FALSE); gistentryinit(*retval, (char *) r, entry->rel, entry->page, entry->offset, VARSIZE(r), FALSE);
return(retval); return (retval);
} }
GISTENTRY * GISTENTRY *
g_int_decompress(GISTENTRY *entry) g_int_decompress(GISTENTRY *entry)
{ {
GISTENTRY *retval; GISTENTRY *retval;
ArrayType * r; ArrayType *r;
int *dr, lenr; int *dr,
ArrayType * in; lenr;
ArrayType *in;
int lenin; int lenin;
int *din; int *din;
int i,j; int i,
j;
#ifdef PGSQL71 #ifdef PGSQL71
if ( entry->pred ) if (entry->pred)
in = (ArrayType *)PG_DETOAST_DATUM( entry->pred ); in = (ArrayType *) PG_DETOAST_DATUM(entry->pred);
else else
in = NULL; in = NULL;
#else #else
in = (ArrayType *) entry->pred; in = (ArrayType *) entry->pred;
#endif #endif
if ( entry->bytes < ARR_OVERHEAD( NDIM ) || ARRISNULL( in ) ) { if (entry->bytes < ARR_OVERHEAD(NDIM) || ARRISNULL(in))
{
retval = palloc(sizeof(GISTENTRY)); retval = palloc(sizeof(GISTENTRY));
#ifdef PGSQL71 #ifdef PGSQL71
if ( in ) if ( (char*)in != (char*)entry->pred ) pfree(in); if (in)
if ((char *) in != (char *) entry->pred)
pfree(in);
#endif #endif
gistentryinit(*retval, (char *)NULL, entry->rel, entry->page, entry->offset, 0, FALSE); gistentryinit(*retval, (char *) NULL, entry->rel, entry->page, entry->offset, 0, FALSE);
#ifdef GIST_DEBUG #ifdef GIST_DEBUG
elog(NOTICE,"DECOMP IN: NULL"); elog(NOTICE, "DECOMP IN: NULL");
#endif #endif
return( retval ); return (retval);
} }
lenin = ARRNELEMS(in); lenin = ARRNELEMS(in);
din = ARRPTR(in); din = ARRPTR(in);
if ( lenin < 2*MAXNUMRANGE ) { /*not comressed value*/ if (lenin < 2 * MAXNUMRANGE)
{ /* not comressed value */
/* sometimes strange bytesize */ /* sometimes strange bytesize */
gistentryinit(*entry, (char *)in, entry->rel, entry->page, entry->offset, VARSIZE( in ), FALSE); gistentryinit(*entry, (char *) in, entry->rel, entry->page, entry->offset, VARSIZE(in), FALSE);
return (entry); return (entry);
} }
#ifdef GIST_DEBUG #ifdef GIST_DEBUG
elog(NOTICE, "DECOMP IN: %d leaf; %d rel; %d page; %d offset; %d bytes; %d elems", entry->leafkey, (int)entry->rel, (int)entry->page, (int)entry->offset, (int)entry->bytes, lenin); elog(NOTICE, "DECOMP IN: %d leaf; %d rel; %d page; %d offset; %d bytes; %d elems", entry->leafkey, (int) entry->rel, (int) entry->page, (int) entry->offset, (int) entry->bytes, lenin);
#endif #endif
lenr = internal_size(din, lenin); lenr = internal_size(din, lenin);
r = new_intArrayType( lenr ); r = new_intArrayType(lenr);
dr = ARRPTR( r ); dr = ARRPTR(r);
for(i=0;i<lenin;i+=2) for (i = 0; i < lenin; i += 2)
for(j=din[i]; j<=din[i+1]; j++) for (j = din[i]; j <= din[i + 1]; j++)
if ( (!i) || *(dr-1) != j ) if ((!i) || *(dr - 1) != j)
*dr++ = j; *dr++ = j;
#ifdef PGSQL71 #ifdef PGSQL71
if ( (char*)in != (char*)entry->pred ) pfree(in); if ((char *) in != (char *) entry->pred)
pfree(in);
#endif #endif
retval = palloc(sizeof(GISTENTRY)); retval = palloc(sizeof(GISTENTRY));
gistentryinit(*retval, (char *)r, entry->rel, entry->page, entry->offset, VARSIZE( r ), FALSE); gistentryinit(*retval, (char *) r, entry->rel, entry->page, entry->offset, VARSIZE(r), FALSE);
return(retval); return (retval);
} }
/* /*
...@@ -379,7 +407,7 @@ g_int_decompress(GISTENTRY *entry) ...@@ -379,7 +407,7 @@ g_int_decompress(GISTENTRY *entry)
float * float *
g_int_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result) g_int_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result)
{ {
return _int_common_penalty( origentry, newentry, result, inner_int_union, rt__int_size); return _int_common_penalty(origentry, newentry, result, inner_int_union, rt__int_size);
} }
...@@ -387,7 +415,7 @@ GIST_SPLITVEC * ...@@ -387,7 +415,7 @@ GIST_SPLITVEC *
g_int_picksplit(bytea *entryvec, g_int_picksplit(bytea *entryvec,
GIST_SPLITVEC *v) GIST_SPLITVEC *v)
{ {
return _int_common_picksplit( entryvec, v, return _int_common_picksplit(entryvec, v,
inner_int_union, inner_int_union,
inner_int_inter, inner_int_inter,
rt__int_size, rt__int_size,
...@@ -404,62 +432,77 @@ g_int_same(ArrayType *b1, ArrayType *b2, bool *result) ...@@ -404,62 +432,77 @@ g_int_same(ArrayType *b1, ArrayType *b2, bool *result)
{ {
if (_int_same(b1, b2)) if (_int_same(b1, b2))
*result = TRUE; *result = TRUE;
else *result = FALSE; else
*result = FALSE;
return(result); return (result);
} }
bool bool
_int_contained(ArrayType *a, ArrayType *b) _int_contained(ArrayType *a, ArrayType *b)
{ {
return ( _int_contains(b, a) ); return (_int_contains(b, a));
} }
bool bool
_int_contains ( ArrayType *a, ArrayType *b ) { _int_contains(ArrayType *a, ArrayType *b)
{
bool res; bool res;
ArrayType *an, *bn; ArrayType *an,
*bn;
if ( ARRISNULL( a ) || ARRISNULL( b ) ) return FALSE; if (ARRISNULL(a) || ARRISNULL(b))
return FALSE;
an = copy_intArrayType( a ); an = copy_intArrayType(a);
bn = copy_intArrayType( b ); bn = copy_intArrayType(b);
PREPAREARR(an); PREPAREARR(an);
PREPAREARR(bn); PREPAREARR(bn);
res = inner_int_contains( an, bn ); res = inner_int_contains(an, bn);
pfree( an ); pfree( bn ); pfree(an);
pfree(bn);
return res; return res;
} }
bool bool
inner_int_contains ( ArrayType *a, ArrayType *b ) { inner_int_contains(ArrayType *a, ArrayType *b)
int na, nb; {
int i,j, n; int na,
int *da, *db; nb;
int i,
if ( ARRISNULL( a ) || ARRISNULL( b ) ) return FALSE; j,
n;
int *da,
*db;
if (ARRISNULL(a) || ARRISNULL(b))
return FALSE;
na = ARRNELEMS( a ); na = ARRNELEMS(a);
nb = ARRNELEMS( b ); nb = ARRNELEMS(b);
da = ARRPTR( a ); da = ARRPTR(a);
db = ARRPTR( b ); db = ARRPTR(b);
#ifdef GIST_DEBUG #ifdef GIST_DEBUG
elog(NOTICE, "contains %d %d", na, nb); elog(NOTICE, "contains %d %d", na, nb);
#endif #endif
i = j = n = 0; i = j = n = 0;
while( i<na && j<nb ) while (i < na && j < nb)
if ( da[i] < db[j] ) if (da[i] < db[j])
i++; i++;
else if ( da[i] == db[j] ) { else if (da[i] == db[j])
n++; i++; j++; {
} else n++;
i++;
j++;
}
else
j++; j++;
return ( n == nb ) ? TRUE : FALSE; return (n == nb) ? TRUE : FALSE;
} }
/***************************************************************************** /*****************************************************************************
...@@ -469,46 +512,51 @@ inner_int_contains ( ArrayType *a, ArrayType *b ) { ...@@ -469,46 +512,51 @@ inner_int_contains ( ArrayType *a, ArrayType *b ) {
bool bool
_int_different(ArrayType *a, ArrayType *b) _int_different(ArrayType *a, ArrayType *b)
{ {
return ( !_int_same( a, b ) ); return (!_int_same(a, b));
} }
bool bool
_int_same ( ArrayType *a, ArrayType *b ) { _int_same(ArrayType *a, ArrayType *b)
int na , nb ; {
int na,
nb;
int n; int n;
int *da, *db; int *da,
*db;
bool result; bool result;
ArrayType *an, *bn; ArrayType *an,
bool anull = ARRISNULL( a ); *bn;
bool bnull = ARRISNULL( b ); bool anull = ARRISNULL(a);
bool bnull = ARRISNULL(b);
if ( anull || bnull ) if (anull || bnull)
return ( anull && bnull ) ? TRUE : FALSE; return (anull && bnull) ? TRUE : FALSE;
an = copy_intArrayType( a ); an = copy_intArrayType(a);
bn = copy_intArrayType( b ); bn = copy_intArrayType(b);
SORT( an ); SORT(an);
SORT( bn ); SORT(bn);
na = ARRNELEMS( an ); na = ARRNELEMS(an);
nb = ARRNELEMS( bn ); nb = ARRNELEMS(bn);
da = ARRPTR( an ); da = ARRPTR(an);
db = ARRPTR( bn ); db = ARRPTR(bn);
result = FALSE; result = FALSE;
if ( na == nb ) if (na == nb)
{ {
result = TRUE; result = TRUE;
for(n=0; n<na; n++) for (n = 0; n < na; n++)
if ( da[n] != db[n] ) if (da[n] != db[n])
{ {
result = FALSE; result = FALSE;
break; break;
} }
} }
pfree( an ); pfree( bn ); pfree(an);
pfree(bn);
return result; return result;
} }
...@@ -516,47 +564,56 @@ _int_same ( ArrayType *a, ArrayType *b ) { ...@@ -516,47 +564,56 @@ _int_same ( ArrayType *a, ArrayType *b ) {
/* _int_overlap -- does a overlap b? /* _int_overlap -- does a overlap b?
*/ */
bool bool
_int_overlap ( ArrayType *a, ArrayType *b ) { _int_overlap(ArrayType *a, ArrayType *b)
{
bool result; bool result;
ArrayType *an, *bn; ArrayType *an,
*bn;
if ( ARRISNULL( a ) || ARRISNULL( b ) ) return FALSE; if (ARRISNULL(a) || ARRISNULL(b))
return FALSE;
an = copy_intArrayType( a ); an = copy_intArrayType(a);
bn = copy_intArrayType( b ); bn = copy_intArrayType(b);
SORT(an); SORT(an);
SORT(bn); SORT(bn);
result = inner_int_overlap( an, bn ); result = inner_int_overlap(an, bn);
pfree( an ); pfree( bn ); pfree(an);
pfree(bn);
return result; return result;
} }
bool bool
inner_int_overlap ( ArrayType *a, ArrayType *b ) { inner_int_overlap(ArrayType *a, ArrayType *b)
int na , nb ; {
int i,j; int na,
int *da, *db; nb;
int i,
if ( ARRISNULL( a ) || ARRISNULL( b ) ) return FALSE; j;
int *da,
*db;
if (ARRISNULL(a) || ARRISNULL(b))
return FALSE;
na = ARRNELEMS( a ); na = ARRNELEMS(a);
nb = ARRNELEMS( b ); nb = ARRNELEMS(b);
da = ARRPTR( a ); da = ARRPTR(a);
db = ARRPTR( b ); db = ARRPTR(b);
#ifdef GIST_DEBUG #ifdef GIST_DEBUG
elog(NOTICE, "g_int_overlap"); elog(NOTICE, "g_int_overlap");
#endif #endif
i = j = 0; i = j = 0;
while( i<na && j<nb ) while (i < na && j < nb)
if ( da[i] < db[j] ) if (da[i] < db[j])
i++; i++;
else if ( da[i] == db[j] ) else if (da[i] == db[j])
return TRUE; return TRUE;
else else
j++; j++;
...@@ -565,135 +622,167 @@ inner_int_overlap ( ArrayType *a, ArrayType *b ) { ...@@ -565,135 +622,167 @@ inner_int_overlap ( ArrayType *a, ArrayType *b ) {
} }
ArrayType * ArrayType *
_int_union ( ArrayType *a, ArrayType *b ) { _int_union(ArrayType *a, ArrayType *b)
{
ArrayType *result; ArrayType *result;
ArrayType *an, *bn; ArrayType *an,
*bn;
an = copy_intArrayType( a ); an = copy_intArrayType(a);
bn = copy_intArrayType( b ); bn = copy_intArrayType(b);
if ( ! ARRISNULL( an ) ) SORT(an); if (!ARRISNULL(an))
if ( ! ARRISNULL( bn ) ) SORT(bn); SORT(an);
if (!ARRISNULL(bn))
SORT(bn);
result = inner_int_union( an, bn ); result = inner_int_union(an, bn);
if (an) pfree( an ); if (an)
if (bn) pfree( bn ); pfree(an);
if (bn)
pfree(bn);
return result; return result;
} }
ArrayType * ArrayType *
inner_int_union ( ArrayType *a, ArrayType *b ) { inner_int_union(ArrayType *a, ArrayType *b)
ArrayType * r = NULL; {
int na , nb; ArrayType *r = NULL;
int *da, *db, *dr; int na,
int i,j; nb;
int *da,
*db,
*dr;
int i,
j;
#ifdef GIST_DEBUG #ifdef GIST_DEBUG
elog(NOTICE, "inner_union %d %d", ARRISNULL( a ) , ARRISNULL( b ) ); elog(NOTICE, "inner_union %d %d", ARRISNULL(a), ARRISNULL(b));
#endif #endif
if ( ARRISNULL( a ) && ARRISNULL( b ) ) return new_intArrayType(0); if (ARRISNULL(a) && ARRISNULL(b))
if ( ARRISNULL( a ) ) r = copy_intArrayType( b ); return new_intArrayType(0);
if ( ARRISNULL( b ) ) r = copy_intArrayType( a ); if (ARRISNULL(a))
r = copy_intArrayType(b);
if (ARRISNULL(b))
r = copy_intArrayType(a);
if ( r ) { if (r)
dr = ARRPTR( r ); dr = ARRPTR(r);
} else { else
na = ARRNELEMS( a ); {
nb = ARRNELEMS( b ); na = ARRNELEMS(a);
da = ARRPTR( a ); nb = ARRNELEMS(b);
db = ARRPTR( b ); da = ARRPTR(a);
db = ARRPTR(b);
r = new_intArrayType( na + nb ); r = new_intArrayType(na + nb);
dr = ARRPTR( r ); dr = ARRPTR(r);
/* union */ /* union */
i = j = 0; i = j = 0;
while( i<na && j<nb ) while (i < na && j < nb)
if ( da[i] < db[j] ) if (da[i] < db[j])
*dr++ = da[i++]; *dr++ = da[i++];
else else
*dr++ = db[j++]; *dr++ = db[j++];
while( i<na ) *dr++ = da[i++]; while (i < na)
while( j<nb ) *dr++ = db[j++]; *dr++ = da[i++];
while (j < nb)
*dr++ = db[j++];
} }
if ( ARRNELEMS(r) > 1 ) if (ARRNELEMS(r) > 1)
r = _int_unique( r ); r = _int_unique(r);
return r; return r;
} }
ArrayType * ArrayType *
_int_inter ( ArrayType *a, ArrayType *b ) { _int_inter(ArrayType *a, ArrayType *b)
{
ArrayType *result; ArrayType *result;
ArrayType *an, *bn; ArrayType *an,
*bn;
if ( ARRISNULL( a ) || ARRISNULL( b ) ) return new_intArrayType(0); if (ARRISNULL(a) || ARRISNULL(b))
return new_intArrayType(0);
an = copy_intArrayType( a ); an = copy_intArrayType(a);
bn = copy_intArrayType( b ); bn = copy_intArrayType(b);
SORT(an); SORT(an);
SORT(bn); SORT(bn);
result = inner_int_inter( an, bn ); result = inner_int_inter(an, bn);
pfree( an ); pfree( bn ); pfree(an);
pfree(bn);
return result; return result;
} }
ArrayType * ArrayType *
inner_int_inter ( ArrayType *a, ArrayType *b ) { inner_int_inter(ArrayType *a, ArrayType *b)
ArrayType * r; {
int na , nb ; ArrayType *r;
int *da, *db, *dr; int na,
int i,j; nb;
int *da,
*db,
*dr;
int i,
j;
#ifdef GIST_DEBUG #ifdef GIST_DEBUG
elog(NOTICE, "inner_inter %d %d", ARRISNULL( a ), ARRISNULL( b ) ); elog(NOTICE, "inner_inter %d %d", ARRISNULL(a), ARRISNULL(b));
#endif #endif
if ( ARRISNULL( a ) || ARRISNULL( b ) ) return new_intArrayType(0); if (ARRISNULL(a) || ARRISNULL(b))
return new_intArrayType(0);
na = ARRNELEMS( a ); na = ARRNELEMS(a);
nb = ARRNELEMS( b ); nb = ARRNELEMS(b);
da = ARRPTR( a ); da = ARRPTR(a);
db = ARRPTR( b ); db = ARRPTR(b);
r = new_intArrayType( min(na, nb) ); r = new_intArrayType(min(na, nb));
dr = ARRPTR( r ); dr = ARRPTR(r);
i = j = 0; i = j = 0;
while( i<na && j<nb ) while (i < na && j < nb)
if ( da[i] < db[j] ) if (da[i] < db[j])
i++; i++;
else if ( da[i] == db[j] ) { else if (da[i] == db[j])
if ( i+j == 0 || ( i+j>0 && *(dr-1) != db[j] ) ) {
if (i + j == 0 || (i + j > 0 && *(dr - 1) != db[j]))
*dr++ = db[j]; *dr++ = db[j];
i++; j++; i++;
} else j++;
}
else
j++; j++;
if ( (dr - ARRPTR(r)) == 0 ) { if ((dr - ARRPTR(r)) == 0)
pfree( r ); {
pfree(r);
return new_intArrayType(0); return new_intArrayType(0);
} else }
return resize_intArrayType(r, dr - ARRPTR(r) ); else
return resize_intArrayType(r, dr - ARRPTR(r));
} }
void void
rt__int_size(ArrayType *a, float *size) rt__int_size(ArrayType *a, float *size)
{ {
if ( ARRISNULL( a ) ) if (ARRISNULL(a))
*size = 0.0; *size = 0.0;
else else
*size = (float)ARRNELEMS( a ); *size = (float) ARRNELEMS(a);
return; return;
} }
...@@ -705,32 +794,43 @@ rt__int_size(ArrayType *a, float *size) ...@@ -705,32 +794,43 @@ rt__int_size(ArrayType *a, float *size)
/* len >= 2 */ /* len >= 2 */
static bool static bool
isort ( int *a, int len ) { isort(int *a, int len)
int tmp, index; {
int *cur, *end; int tmp,
index;
int *cur,
*end;
bool r = FALSE; bool r = FALSE;
end = a + len; end = a + len;
do { do
{
index = 0; index = 0;
cur = a + 1; cur = a + 1;
while( cur < end ) { while (cur < end)
if( *(cur-1) > *cur ) { {
tmp=*(cur-1); *(cur-1) = *cur; *cur=tmp; if (*(cur - 1) > *cur)
{
tmp = *(cur - 1);
*(cur - 1) = *cur;
*cur = tmp;
index = 1; index = 1;
} else if ( ! r && *(cur-1) == *cur ) }
else if (!r && *(cur - 1) == *cur)
r = TRUE; r = TRUE;
cur++; cur++;
} }
} while( index ); } while (index);
return r; return r;
} }
static ArrayType * static ArrayType *
new_intArrayType( int num ) { new_intArrayType(int num)
ArrayType * r; {
int nbytes = ARR_OVERHEAD( NDIM ) + sizeof(int)*num; ArrayType *r;
int nbytes = ARR_OVERHEAD(NDIM) + sizeof(int) * num;
r = (ArrayType *) palloc( nbytes ); r = (ArrayType *) palloc(nbytes);
MemSet(r, 0, nbytes); MemSet(r, 0, nbytes);
r->size = nbytes; r->size = nbytes;
...@@ -738,127 +838,156 @@ new_intArrayType( int num ) { ...@@ -738,127 +838,156 @@ new_intArrayType( int num ) {
#ifndef PGSQL71 #ifndef PGSQL71
SET_LO_FLAG(false, r); SET_LO_FLAG(false, r);
#endif #endif
*( (int*)ARR_DIMS(r) ) = num; *((int *) ARR_DIMS(r)) = num;
*( (int*)ARR_LBOUND(r) ) = 1; *((int *) ARR_LBOUND(r)) = 1;
return r; return r;
} }
static ArrayType * static ArrayType *
resize_intArrayType( ArrayType * a, int num ) { resize_intArrayType(ArrayType *a, int num)
int nbytes = ARR_OVERHEAD( NDIM ) + sizeof(int)*num; {
int nbytes = ARR_OVERHEAD(NDIM) + sizeof(int) * num;
if ( num == ARRNELEMS(a) ) return a; if (num == ARRNELEMS(a))
return a;
a = (ArrayType *) repalloc( a, nbytes ); a = (ArrayType *) repalloc(a, nbytes);
a->size = nbytes; a->size = nbytes;
*( (int*)ARR_DIMS(a) ) = num; *((int *) ARR_DIMS(a)) = num;
return a; return a;
} }
static ArrayType * static ArrayType *
copy_intArrayType( ArrayType * a ) { copy_intArrayType(ArrayType *a)
ArrayType * r; {
if ( ARRISNULL(a) ) return NULL; ArrayType *r;
r = new_intArrayType( ARRNELEMS(a) );
memmove(r,a,VARSIZE(a)); if (ARRISNULL(a))
return NULL;
r = new_intArrayType(ARRNELEMS(a));
memmove(r, a, VARSIZE(a));
return r; return r;
} }
/* num for compressed key */ /* num for compressed key */
static int static int
internal_size (int *a, int len ) { internal_size(int *a, int len)
int i,size=0; {
int i,
size = 0;
for(i=0;i<len;i+=2) for (i = 0; i < len; i += 2)
if ( ! i || a[i] != a[i-1] ) /* do not count repeated range */ if (!i || a[i] != a[i - 1]) /* do not count repeated range */
size += a[i+1] - a[i] + 1; size += a[i + 1] - a[i] + 1;
return size; return size;
} }
/* r is sorted and size of r > 1 */ /* r is sorted and size of r > 1 */
static ArrayType * static ArrayType *
_int_unique( ArrayType * r ) { _int_unique(ArrayType *r)
int *tmp, *dr, *data; {
int *tmp,
*dr,
*data;
int num = ARRNELEMS(r); int num = ARRNELEMS(r);
data = tmp = dr = ARRPTR( r );
while( tmp - data < num ) data = tmp = dr = ARRPTR(r);
if ( *tmp != *dr ) while (tmp - data < num)
if (*tmp != *dr)
*(++dr) = *tmp++; *(++dr) = *tmp++;
else else
tmp++; tmp++;
return resize_intArrayType(r, dr + 1 - ARRPTR(r) ); return resize_intArrayType(r, dr + 1 - ARRPTR(r));
} }
/********************************************************************* /*********************************************************************
** intbig functions ** intbig functions
*********************************************************************/ *********************************************************************/
static void static void
gensign(BITVEC sign, int * a, int len) { gensign(BITVEC sign, int *a, int len)
{
int i; int i;
/* we assume that the sign vector is previously zeroed */ /* we assume that the sign vector is previously zeroed */
for(i=0; i<len; i++) { for (i = 0; i < len; i++)
SETBIT( sign, (*a)%SIGLENBIT ); {
SETBIT(sign, (*a) % SIGLENBIT);
a++; a++;
} }
} }
static bool static bool
_intbig_overlap(ArrayType *a, ArrayType *b) { _intbig_overlap(ArrayType *a, ArrayType *b)
{
int i; int i;
BITVECP da, db; BITVECP da,
db;
if ( ARRISNULL( a ) || ARRISNULL( b ) ) return FALSE; if (ARRISNULL(a) || ARRISNULL(b))
return FALSE;
da = SIGPTR(a); da = SIGPTR(a);
db = SIGPTR(b); db = SIGPTR(b);
LOOPBYTE( if ( da[i] & db[i] ) return TRUE ); LOOPBYTE(if (da[i] & db[i]) return TRUE);
return FALSE; return FALSE;
} }
static bool static bool
_intbig_contains(ArrayType *a, ArrayType *b) { _intbig_contains(ArrayType *a, ArrayType *b)
{
int i; int i;
BITVECP da, db; BITVECP da,
db;
if ( ARRISNULL( a ) || ARRISNULL( b ) ) return FALSE; if (ARRISNULL(a) || ARRISNULL(b))
return FALSE;
da = SIGPTR(a); da = SIGPTR(a);
db = SIGPTR(b); db = SIGPTR(b);
LOOPBYTE( if ( db[i] & ~da[i] ) return FALSE ); LOOPBYTE(if (db[i] & ~da[i]) return FALSE);
return TRUE; return TRUE;
} }
static void static void
rt__intbig_size(ArrayType *a, float* sz) { rt__intbig_size(ArrayType *a, float *sz)
int i, len=0; {
int i,
len = 0;
BITVECP bv; BITVECP bv;
if ( ARRISNULL( a ) ) { if (ARRISNULL(a))
*sz=0.0; {
*sz = 0.0;
return; return;
} }
bv = SIGPTR(a); bv = SIGPTR(a);
LOOPBIT( len += GETBIT(bv, i) ); LOOPBIT(len += GETBIT(bv, i));
*sz = (float) len; *sz = (float) len;
return; return;
} }
static ArrayType * static ArrayType *
_intbig_union(ArrayType *a, ArrayType *b) { _intbig_union(ArrayType *a, ArrayType *b)
ArrayType * r; {
BITVECP da, db, dr; ArrayType *r;
BITVECP da,
db,
dr;
int i; int i;
if ( ARRISNULL( a ) && ARRISNULL( b ) ) return new_intArrayType(0); if (ARRISNULL(a) && ARRISNULL(b))
if ( ARRISNULL( a ) ) return copy_intArrayType( b ); return new_intArrayType(0);
if ( ARRISNULL( b ) ) return copy_intArrayType( a ); if (ARRISNULL(a))
return copy_intArrayType(b);
if (ARRISNULL(b))
return copy_intArrayType(a);
r = new_intArrayType( SIGLENINT ); r = new_intArrayType(SIGLENINT);
da = SIGPTR(a); da = SIGPTR(a);
db = SIGPTR(b); db = SIGPTR(b);
...@@ -870,14 +999,18 @@ _intbig_union(ArrayType *a, ArrayType *b) { ...@@ -870,14 +999,18 @@ _intbig_union(ArrayType *a, ArrayType *b) {
} }
static ArrayType * static ArrayType *
_intbig_inter(ArrayType *a, ArrayType *b) { _intbig_inter(ArrayType *a, ArrayType *b)
ArrayType * r; {
BITVECP da, db, dr; ArrayType *r;
BITVECP da,
db,
dr;
int i; int i;
if ( ARRISNULL( a ) || ARRISNULL( b ) ) return new_intArrayType(0); if (ARRISNULL(a) || ARRISNULL(b))
return new_intArrayType(0);
r = new_intArrayType( SIGLENINT ); r = new_intArrayType(SIGLENINT);
da = SIGPTR(a); da = SIGPTR(a);
db = SIGPTR(b); db = SIGPTR(b);
...@@ -889,12 +1022,15 @@ _intbig_inter(ArrayType *a, ArrayType *b) { ...@@ -889,12 +1022,15 @@ _intbig_inter(ArrayType *a, ArrayType *b) {
} }
bool * bool *
g_intbig_same(ArrayType *a, ArrayType *b, bool *result) { g_intbig_same(ArrayType *a, ArrayType *b, bool *result)
BITVECP da, db; {
BITVECP da,
db;
int i; int i;
if ( ARRISNULL( a ) || ARRISNULL( b ) ) { if (ARRISNULL(a) || ARRISNULL(b))
*result = ( ARRISNULL( a ) && ARRISNULL( b ) ) ? TRUE : FALSE; {
*result = (ARRISNULL(a) && ARRISNULL(b)) ? TRUE : FALSE;
return result; return result;
} }
...@@ -902,7 +1038,8 @@ g_intbig_same(ArrayType *a, ArrayType *b, bool *result) { ...@@ -902,7 +1038,8 @@ g_intbig_same(ArrayType *a, ArrayType *b, bool *result) {
db = SIGPTR(b); db = SIGPTR(b);
LOOPBYTE( LOOPBYTE(
if ( da[i] != db[i] ) { if (da[i] != db[i])
{
*result = FALSE; *result = FALSE;
return result; return result;
} }
...@@ -913,54 +1050,67 @@ g_intbig_same(ArrayType *a, ArrayType *b, bool *result) { ...@@ -913,54 +1050,67 @@ g_intbig_same(ArrayType *a, ArrayType *b, bool *result) {
} }
GISTENTRY * GISTENTRY *
g_intbig_compress(GISTENTRY *entry) { g_intbig_compress(GISTENTRY *entry)
{
GISTENTRY *retval; GISTENTRY *retval;
ArrayType *r, *in; ArrayType *r,
*in;
#ifdef PGSQL71 #ifdef PGSQL71
if ( entry->pred ) if (entry->pred)
in = (ArrayType *)PG_DETOAST_DATUM( entry->pred ); in = (ArrayType *) PG_DETOAST_DATUM(entry->pred);
else else
in = NULL; in = NULL;
#else #else
in = (ArrayType *) entry->pred; in = (ArrayType *) entry->pred;
#endif #endif
if ( ! entry->leafkey ) return entry; if (!entry->leafkey)
return entry;
retval = palloc(sizeof(GISTENTRY)); retval = palloc(sizeof(GISTENTRY));
if ( ARRISNULL( in ) ) { if (ARRISNULL(in))
{
#ifdef PGSQL71 #ifdef PGSQL71
if ( in ) if ( (char*)in != (char*)entry->pred ) pfree(in); if (in)
if ((char *) in != (char *) entry->pred)
pfree(in);
#endif #endif
gistentryinit(*retval, (char *)NULL, entry->rel, entry->page, entry->offset,0, FALSE); gistentryinit(*retval, (char *) NULL, entry->rel, entry->page, entry->offset, 0, FALSE);
return( retval ); return (retval);
} }
r = new_intArrayType( SIGLENINT ); r = new_intArrayType(SIGLENINT);
gensign( SIGPTR( r ), gensign(SIGPTR(r),
ARRPTR ( in ), ARRPTR(in),
ARRNELEMS( in ) ); ARRNELEMS(in));
gistentryinit(*retval, (char *)r, entry->rel, entry->page, entry->offset, VARSIZE( r ), FALSE); gistentryinit(*retval, (char *) r, entry->rel, entry->page, entry->offset, VARSIZE(r), FALSE);
#ifdef PGSQL71 #ifdef PGSQL71
if ( in ) if ( (char*)in != (char*)entry->pred ) pfree(in); if (in)
if ((char *) in != (char *) entry->pred)
pfree(in);
#endif #endif
return(retval); return (retval);
} }
GISTENTRY * GISTENTRY *
g_intbig_decompress(GISTENTRY *entry) { g_intbig_decompress(GISTENTRY *entry)
{
#ifdef PGSQL71 #ifdef PGSQL71
ArrayType *key; ArrayType *key;
key = (ArrayType *)PG_DETOAST_DATUM( entry->pred );
if ( (char*)key != (char*)entry->pred ) { key = (ArrayType *) PG_DETOAST_DATUM(entry->pred);
if ((char *) key != (char *) entry->pred)
{
GISTENTRY *retval; GISTENTRY *retval;
retval = palloc(sizeof(GISTENTRY)); retval = palloc(sizeof(GISTENTRY));
gistentryinit(*retval, (char *)key, entry->rel, entry->page, entry->offset, VARSIZE( key ), FALSE); gistentryinit(*retval, (char *) key, entry->rel, entry->page, entry->offset, VARSIZE(key), FALSE);
return retval; return retval;
} }
#endif #endif
...@@ -968,8 +1118,9 @@ g_intbig_decompress(GISTENTRY *entry) { ...@@ -968,8 +1118,9 @@ g_intbig_decompress(GISTENTRY *entry) {
} }
GIST_SPLITVEC * GIST_SPLITVEC *
g_intbig_picksplit(bytea *entryvec, GIST_SPLITVEC *v) { g_intbig_picksplit(bytea *entryvec, GIST_SPLITVEC *v)
return _int_common_picksplit( entryvec, v, {
return _int_common_picksplit(entryvec, v,
_intbig_union, _intbig_union,
_intbig_inter, _intbig_inter,
rt__intbig_size, rt__intbig_size,
...@@ -978,45 +1129,50 @@ g_intbig_picksplit(bytea *entryvec, GIST_SPLITVEC *v) { ...@@ -978,45 +1129,50 @@ g_intbig_picksplit(bytea *entryvec, GIST_SPLITVEC *v) {
} }
ArrayType * ArrayType *
g_intbig_union(bytea *entryvec, int *sizep) { g_intbig_union(bytea *entryvec, int *sizep)
return _int_common_union( entryvec, sizep, _intbig_union ); {
return _int_common_union(entryvec, sizep, _intbig_union);
} }
float * float *
g_intbig_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result){ g_intbig_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result)
_int_common_penalty( origentry, newentry, result, _intbig_union, rt__intbig_size); {
_int_common_penalty(origentry, newentry, result, _intbig_union, rt__intbig_size);
return result; return result;
} }
bool bool
g_intbig_consistent(GISTENTRY *entry, ArrayType *query, StrategyNumber strategy) { g_intbig_consistent(GISTENTRY *entry, ArrayType *query, StrategyNumber strategy)
{
bool retval; bool retval;
ArrayType * q; ArrayType *q;
/* XXX what about toasted input? */ /* XXX what about toasted input? */
if ( ARRISNULL( query ) ) return FALSE; if (ARRISNULL(query))
return FALSE;
q = new_intArrayType( SIGLENINT ); q = new_intArrayType(SIGLENINT);
gensign( SIGPTR( q ), gensign(SIGPTR(q),
ARRPTR( query ), ARRPTR(query),
ARRNELEMS( query ) ); ARRNELEMS(query));
switch(strategy) { switch (strategy)
{
case RTOverlapStrategyNumber: case RTOverlapStrategyNumber:
retval = (bool)_intbig_overlap((ArrayType *)(entry->pred), q); retval = (bool) _intbig_overlap((ArrayType *) (entry->pred), q);
break; break;
case RTSameStrategyNumber: case RTSameStrategyNumber:
case RTContainsStrategyNumber: case RTContainsStrategyNumber:
retval = (bool)_intbig_contains((ArrayType *)(entry->pred), q); retval = (bool) _intbig_contains((ArrayType *) (entry->pred), q);
break; break;
case RTContainedByStrategyNumber: case RTContainedByStrategyNumber:
retval = (bool)_intbig_overlap((ArrayType *)(entry->pred), q); retval = (bool) _intbig_overlap((ArrayType *) (entry->pred), q);
break; break;
default: default:
retval = FALSE; retval = FALSE;
} }
pfree( q ); pfree(q);
return(retval); return (retval);
} }
/***************************************************************** /*****************************************************************
...@@ -1028,27 +1184,33 @@ g_intbig_consistent(GISTENTRY *entry, ArrayType *query, StrategyNumber strategy) ...@@ -1028,27 +1184,33 @@ g_intbig_consistent(GISTENTRY *entry, ArrayType *query, StrategyNumber strategy)
** returns the minimal set that encloses all the entries in entryvec ** returns the minimal set that encloses all the entries in entryvec
*/ */
ArrayType * ArrayType *
_int_common_union(bytea *entryvec, int *sizep, formarray unionf) { _int_common_union(bytea *entryvec, int *sizep, formarray unionf)
int numranges, i; {
ArrayType *out = (ArrayType *)NULL; int numranges,
i;
ArrayType *out = (ArrayType *) NULL;
ArrayType *tmp; ArrayType *tmp;
#ifdef GIST_DEBUG #ifdef GIST_DEBUG
elog(NOTICE, "_int_common_union in"); elog(NOTICE, "_int_common_union in");
#endif #endif
numranges = (VARSIZE(entryvec) - VARHDRSZ)/sizeof(GISTENTRY); numranges = (VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY);
tmp = (ArrayType *)(((GISTENTRY *)(VARDATA(entryvec)))[0]).pred; tmp = (ArrayType *) (((GISTENTRY *) (VARDATA(entryvec)))[0]).pred;
for (i = 1; i < numranges; i++) { for (i = 1; i < numranges; i++)
out = (*unionf)(tmp, (ArrayType *) {
(((GISTENTRY *)(VARDATA(entryvec)))[i]).pred); out = (*unionf) (tmp, (ArrayType *)
if (i > 1 && tmp) pfree(tmp); (((GISTENTRY *) (VARDATA(entryvec)))[i]).pred);
if (i > 1 && tmp)
pfree(tmp);
tmp = out; tmp = out;
} }
*sizep = VARSIZE( out ); *sizep = VARSIZE(out);
if ( *sizep == 0 ) { if (*sizep == 0)
pfree( out ); {
pfree(out);
#ifdef GIST_DEBUG #ifdef GIST_DEBUG
elog(NOTICE, "_int_common_union out1"); elog(NOTICE, "_int_common_union out1");
#endif #endif
...@@ -1057,7 +1219,7 @@ _int_common_union(bytea *entryvec, int *sizep, formarray unionf) { ...@@ -1057,7 +1219,7 @@ _int_common_union(bytea *entryvec, int *sizep, formarray unionf) {
#ifdef GIST_DEBUG #ifdef GIST_DEBUG
elog(NOTICE, "_int_common_union out"); elog(NOTICE, "_int_common_union out");
#endif #endif
return(out); return (out);
} }
...@@ -1071,22 +1233,23 @@ _int_common_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result, ...@@ -1071,22 +1233,23 @@ _int_common_penalty(GISTENTRY *origentry, GISTENTRY *newentry, float *result,
formfloat sizef) formfloat sizef)
{ {
Datum ud; Datum ud;
float tmp1, tmp2; float tmp1,
tmp2;
#ifdef GIST_DEBUG #ifdef GIST_DEBUG
elog(NOTICE, "penalty"); elog(NOTICE, "penalty");
#endif #endif
ud = (Datum)(*unionf)((ArrayType *)(origentry->pred), (ArrayType *)(newentry->pred)); ud = (Datum) (*unionf) ((ArrayType *) (origentry->pred), (ArrayType *) (newentry->pred));
(*sizef)((ArrayType *)ud, &tmp1); (*sizef) ((ArrayType *) ud, &tmp1);
(*sizef)((ArrayType *)(origentry->pred), &tmp2); (*sizef) ((ArrayType *) (origentry->pred), &tmp2);
*result = tmp1 - tmp2; *result = tmp1 - tmp2;
pfree((char *)ud); pfree((char *) ud);
#ifdef GIST_DEBUG #ifdef GIST_DEBUG
elog(NOTICE, "--penalty\t%g", *result); elog(NOTICE, "--penalty\t%g", *result);
#endif #endif
return(result); return (result);
} }
/* /*
...@@ -1101,25 +1264,37 @@ _int_common_picksplit(bytea *entryvec, ...@@ -1101,25 +1264,37 @@ _int_common_picksplit(bytea *entryvec,
formfloat sizef, formfloat sizef,
float coef) float coef)
{ {
OffsetNumber i, j; OffsetNumber i,
ArrayType *datum_alpha, *datum_beta; j;
ArrayType *datum_l, *datum_r; ArrayType *datum_alpha,
ArrayType *union_d, *union_dl, *union_dr; *datum_beta;
ArrayType *datum_l,
*datum_r;
ArrayType *union_d,
*union_dl,
*union_dr;
ArrayType *inter_d; ArrayType *inter_d;
bool firsttime; bool firsttime;
float size_alpha, size_beta, size_union, size_inter; float size_alpha,
float size_waste, waste; size_beta,
float size_l, size_r; size_union,
size_inter;
float size_waste,
waste;
float size_l,
size_r;
int nbytes; int nbytes;
OffsetNumber seed_1 = 0, seed_2 = 0; OffsetNumber seed_1 = 0,
OffsetNumber *left, *right; seed_2 = 0;
OffsetNumber *left,
*right;
OffsetNumber maxoff; OffsetNumber maxoff;
#ifdef GIST_DEBUG #ifdef GIST_DEBUG
elog(NOTICE, "--------picksplit %d",(VARSIZE(entryvec) - VARHDRSZ)/sizeof(GISTENTRY)); elog(NOTICE, "--------picksplit %d", (VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY));
#endif #endif
maxoff = ((VARSIZE(entryvec) - VARHDRSZ)/sizeof(GISTENTRY)) - 2; maxoff = ((VARSIZE(entryvec) - VARHDRSZ) / sizeof(GISTENTRY)) - 2;
nbytes = (maxoff + 2) * sizeof(OffsetNumber); nbytes = (maxoff + 2) * sizeof(OffsetNumber);
v->spl_left = (OffsetNumber *) palloc(nbytes); v->spl_left = (OffsetNumber *) palloc(nbytes);
v->spl_right = (OffsetNumber *) palloc(nbytes); v->spl_right = (OffsetNumber *) palloc(nbytes);
...@@ -1127,17 +1302,19 @@ _int_common_picksplit(bytea *entryvec, ...@@ -1127,17 +1302,19 @@ _int_common_picksplit(bytea *entryvec,
firsttime = true; firsttime = true;
waste = 0.0; waste = 0.0;
for (i = FirstOffsetNumber; i < maxoff; i = OffsetNumberNext(i)) { for (i = FirstOffsetNumber; i < maxoff; i = OffsetNumberNext(i))
datum_alpha = (ArrayType *)(((GISTENTRY *)(VARDATA(entryvec)))[i].pred); {
for (j = OffsetNumberNext(i); j <= maxoff; j = OffsetNumberNext(j)) { datum_alpha = (ArrayType *) (((GISTENTRY *) (VARDATA(entryvec)))[i].pred);
datum_beta = (ArrayType *)(((GISTENTRY *)(VARDATA(entryvec)))[j].pred); for (j = OffsetNumberNext(i); j <= maxoff; j = OffsetNumberNext(j))
{
datum_beta = (ArrayType *) (((GISTENTRY *) (VARDATA(entryvec)))[j].pred);
/* compute the wasted space by unioning these guys */ /* compute the wasted space by unioning these guys */
/* size_waste = size_union - size_inter; */ /* size_waste = size_union - size_inter; */
union_d = (*unionf)(datum_alpha, datum_beta); union_d = (*unionf) (datum_alpha, datum_beta);
(*sizef)(union_d, &size_union); (*sizef) (union_d, &size_union);
inter_d = (*interf)(datum_alpha, datum_beta); inter_d = (*interf) (datum_alpha, datum_beta);
(*sizef)(inter_d, &size_inter); (*sizef) (inter_d, &size_inter);
size_waste = size_union - size_inter; size_waste = size_union - size_inter;
pfree(union_d); pfree(union_d);
...@@ -1146,11 +1323,12 @@ _int_common_picksplit(bytea *entryvec, ...@@ -1146,11 +1323,12 @@ _int_common_picksplit(bytea *entryvec,
pfree(inter_d); pfree(inter_d);
/* /*
* are these a more promising split that what we've * are these a more promising split that what we've already
* already seen? * seen?
*/ */
if (size_waste > waste || firsttime) { if (size_waste > waste || firsttime)
{
waste = size_waste; waste = size_waste;
seed_1 = i; seed_1 = i;
seed_2 = j; seed_2 = j;
...@@ -1164,64 +1342,74 @@ _int_common_picksplit(bytea *entryvec, ...@@ -1164,64 +1342,74 @@ _int_common_picksplit(bytea *entryvec,
right = v->spl_right; right = v->spl_right;
v->spl_nright = 0; v->spl_nright = 0;
datum_alpha = (ArrayType *)(((GISTENTRY *)(VARDATA(entryvec)))[seed_1].pred); datum_alpha = (ArrayType *) (((GISTENTRY *) (VARDATA(entryvec)))[seed_1].pred);
datum_l = copy_intArrayType( datum_alpha ); datum_l = copy_intArrayType(datum_alpha);
(*sizef)((ArrayType *)datum_l, &size_l); (*sizef) ((ArrayType *) datum_l, &size_l);
datum_beta = (ArrayType *)(((GISTENTRY *)(VARDATA(entryvec)))[seed_2].pred); datum_beta = (ArrayType *) (((GISTENTRY *) (VARDATA(entryvec)))[seed_2].pred);
datum_r = copy_intArrayType( datum_beta ); datum_r = copy_intArrayType(datum_beta);
(*sizef)((ArrayType *)datum_r, &size_r); (*sizef) ((ArrayType *) datum_r, &size_r);
/* /*
* Now split up the regions between the two seeds. An important * Now split up the regions between the two seeds. An important
* property of this split algorithm is that the split vector v * property of this split algorithm is that the split vector v has the
* has the indices of items to be split in order in its left and * indices of items to be split in order in its left and right
* right vectors. We exploit this property by doing a merge in * vectors. We exploit this property by doing a merge in the code
* the code that actually splits the page. * that actually splits the page.
* *
* For efficiency, we also place the new index tuple in this loop. * For efficiency, we also place the new index tuple in this loop. This
* This is handled at the very end, when we have placed all the * is handled at the very end, when we have placed all the existing
* existing tuples and i == maxoff + 1. * tuples and i == maxoff + 1.
*/ */
maxoff = OffsetNumberNext(maxoff); maxoff = OffsetNumberNext(maxoff);
for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i)) { for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
{
/* /*
* If we've already decided where to place this item, just * If we've already decided where to place this item, just put it
* put it on the right list. Otherwise, we need to figure * on the right list. Otherwise, we need to figure out which page
* out which page needs the least enlargement in order to * needs the least enlargement in order to store the item.
* store the item.
*/ */
if (i == seed_1) { if (i == seed_1)
{
*left++ = i; *left++ = i;
v->spl_nleft++; v->spl_nleft++;
continue; continue;
} else if (i == seed_2) { }
else if (i == seed_2)
{
*right++ = i; *right++ = i;
v->spl_nright++; v->spl_nright++;
continue; continue;
} }
/* okay, which page needs least enlargement? */ /* okay, which page needs least enlargement? */
datum_alpha = (ArrayType *)(((GISTENTRY *)(VARDATA(entryvec)))[i].pred); datum_alpha = (ArrayType *) (((GISTENTRY *) (VARDATA(entryvec)))[i].pred);
union_dl = (ArrayType *)(*unionf)(datum_l, datum_alpha); union_dl = (ArrayType *) (*unionf) (datum_l, datum_alpha);
union_dr = (ArrayType *)(*unionf)(datum_r, datum_alpha); union_dr = (ArrayType *) (*unionf) (datum_r, datum_alpha);
(*sizef)((ArrayType *)union_dl, &size_alpha); (*sizef) ((ArrayType *) union_dl, &size_alpha);
(*sizef)((ArrayType *)union_dr, &size_beta); (*sizef) ((ArrayType *) union_dr, &size_beta);
/* pick which page to add it to */ /* pick which page to add it to */
if (size_alpha - size_l < size_beta - size_r + WISH_F(v->spl_nleft, v->spl_nright, coef)) { if (size_alpha - size_l < size_beta - size_r + WISH_F(v->spl_nleft, v->spl_nright, coef))
if ( datum_l ) pfree(datum_l); {
if ( union_dr ) pfree(union_dr); if (datum_l)
pfree(datum_l);
if (union_dr)
pfree(union_dr);
datum_l = union_dl; datum_l = union_dl;
size_l = size_alpha; size_l = size_alpha;
*left++ = i; *left++ = i;
v->spl_nleft++; v->spl_nleft++;
} else { }
if ( datum_r ) pfree(datum_r); else
if ( union_dl ) pfree(union_dl); {
if (datum_r)
pfree(datum_r);
if (union_dl)
pfree(union_dl);
datum_r = union_dr; datum_r = union_dr;
size_r = size_beta; size_r = size_beta;
*right++ = i; *right++ = i;
...@@ -1229,19 +1417,22 @@ _int_common_picksplit(bytea *entryvec, ...@@ -1229,19 +1417,22 @@ _int_common_picksplit(bytea *entryvec,
} }
} }
if ( *(left-1) > *(right-1) ) { if (*(left - 1) > *(right - 1))
{
*right = FirstOffsetNumber; *right = FirstOffsetNumber;
*(left-1) = InvalidOffsetNumber; *(left - 1) = InvalidOffsetNumber;
} else { }
else
{
*left = FirstOffsetNumber; *left = FirstOffsetNumber;
*(right-1) = InvalidOffsetNumber; *(right - 1) = InvalidOffsetNumber;
} }
v->spl_ldatum = (char *)datum_l; v->spl_ldatum = (char *) datum_l;
v->spl_rdatum = (char *)datum_r; v->spl_rdatum = (char *) datum_r;
#ifdef GIST_DEBUG #ifdef GIST_DEBUG
elog(NOTICE, "--------ENDpicksplit %d %d",v->spl_nleft, v->spl_nright); elog(NOTICE, "--------ENDpicksplit %d %d", v->spl_nleft, v->spl_nright);
#endif #endif
return v; return v;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment