← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/postgresql-9.1/oneiric-updates

« back to all changes in this revision

Viewing changes to src/backend/access/gin/ginutil.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2011-06-14 09:53:29 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110614095329-kerawur7tb6p8s71
Tags: 9.1~beta2-1
* New upstream beta release.
* Drop 03-cmsgcred-size.patch, fixed upstream.
* debian/postgresql-9.1.install: Install new pg_basebackup translations.
* debian/control: Fix the server-dev dependency to p-common to also work for
  backports.
* debian/watch: Fix for beta versions.
* debian/copyright: Add pointers to GPL and Artistic licenses for the Perl
  terms.
* debian/postgresql-9.1.preinst: Fail the package upgrade early when
  upgrading from beta-1, as the DB format changed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/backend/access/gin/ginutil.c
94
94
                 * type for a noncollatable indexed data type (for instance, hstore
95
95
                 * uses text index entries).  If there's no index collation then
96
96
                 * specify default collation in case the support functions need
97
 
                 * collation.  This is harmless if the support functions don't
98
 
                 * care about collation, so we just do it unconditionally.  (We could
 
97
                 * collation.  This is harmless if the support functions don't care
 
98
                 * about collation, so we just do it unconditionally.  (We could
99
99
                 * alternatively call get_typcollation, but that seems like expensive
100
100
                 * overkill --- there aren't going to be any cases where a GIN storage
101
101
                 * type has a nondefault collation.)
293
293
 
294
294
        /* both not null, so safe to call the compareFn */
295
295
        return DatumGetInt32(FunctionCall2Coll(&ginstate->compareFn[attnum - 1],
296
 
                                                                                   ginstate->supportCollation[attnum - 1],
 
296
                                                                          ginstate->supportCollation[attnum - 1],
297
297
                                                                                   a, b));
298
298
}
299
299
 
400
400
        nullFlags = NULL;                       /* in case extractValue doesn't set it */
401
401
        entries = (Datum *)
402
402
                DatumGetPointer(FunctionCall3Coll(&ginstate->extractValueFn[attnum - 1],
403
 
                                                                                  ginstate->supportCollation[attnum - 1],
 
403
                                                                          ginstate->supportCollation[attnum - 1],
404
404
                                                                                  value,
405
405
                                                                                  PointerGetDatum(nentries),
406
406
                                                                                  PointerGetDatum(&nullFlags)));