← Back to branch summary

~ubuntu-branches/ubuntu/lucid/postgresql-8.4/lucid-proposed

« back to all changes in this revision

Viewing changes to src/backend/access/gist/gistproc.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-07-11 16:59:35 UTC
  • mfrom: (5.1.1 karmic)
  • Revision ID: james.westby@ubuntu.com-20090711165935-jfwin6gfrxf0gfsi
Tags: 8.4.0-2
http://bugs.debian.org/536139
* debian/libpq-dev.install: Ship catalog/genbki.h. (Closes: #536139)
* debian/rules: Drop --enable-cassert for final release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/backend/access/gist/gistproc.c
10
10
 * Portions Copyright (c) 1994, Regents of the University of California
11
11
 *
12
12
 * IDENTIFICATION
13
 
 *      $PostgreSQL: pgsql/src/backend/access/gist/gistproc.c,v 1.16 2009/04/06 14:27:27 teodor Exp $
 
13
 *      $PostgreSQL: pgsql/src/backend/access/gist/gistproc.c,v 1.17 2009/06/11 14:48:53 momjian Exp $
14
14
 *
15
15
 *-------------------------------------------------------------------------
16
16
 */
86
86
        GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
87
87
        BOX                *query = PG_GETARG_BOX_P(1);
88
88
        StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
 
89
 
89
90
        /* Oid          subtype = PG_GETARG_OID(3); */
90
91
        bool       *recheck = (bool *) PG_GETARG_POINTER(4);
91
92
 
279
280
static void
280
281
fallbackSplit(GistEntryVector *entryvec, GIST_SPLITVEC *v)
281
282
{
282
 
        OffsetNumber    i, 
283
 
                                        maxoff;
284
 
        BOX                        *unionL = NULL,
285
 
                                   *unionR = NULL;
286
 
        int                             nbytes;
 
283
        OffsetNumber i,
 
284
                                maxoff;
 
285
        BOX                *unionL = NULL,
 
286
                           *unionR = NULL;
 
287
        int                     nbytes;
287
288
 
288
289
        maxoff = entryvec->n - 1;
289
290
 
294
295
 
295
296
        for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
296
297
        {
297
 
                BOX * cur = DatumGetBoxP(entryvec->vector[i].key);
 
298
                BOX                *cur = DatumGetBoxP(entryvec->vector[i].key);
298
299
 
299
300
                if (i <= (maxoff - FirstOffsetNumber + 1) / 2)
300
301
                {
767
768
        GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
768
769
        POLYGON    *query = PG_GETARG_POLYGON_P(1);
769
770
        StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
 
771
 
770
772
        /* Oid          subtype = PG_GETARG_OID(3); */
771
773
        bool       *recheck = (bool *) PG_GETARG_POINTER(4);
772
774
        bool            result;
843
845
        GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
844
846
        CIRCLE     *query = PG_GETARG_CIRCLE_P(1);
845
847
        StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
 
848
 
846
849
        /* Oid          subtype = PG_GETARG_OID(3); */
847
850
        bool       *recheck = (bool *) PG_GETARG_POINTER(4);
848
851
        BOX                     bbox;