9.3 support

diff --git a/expected/int4g.out b/expected/int4g.out
index dfa75f6..fd234b5 100644 (file)
--- a/expected/int4g.out
+++ b/expected/int4g.out
@@ -12,7 +12,6 @@ CREATE TABLE int4_stat (
     value   int4 UNIQUE,
        ndoc    int4 NOT NULL CHECK (ndoc>0)
 );
     value   int4 UNIQUE,
        ndoc    int4 NOT NULL CHECK (ndoc>0)
 );

-NOTICE:  CREATE TABLE / UNIQUE will create implicit index "int4_stat_value_key" for table "int4_stat"

 INSERT INTO int4_stat (
     SELECT
                q.w,
 INSERT INTO int4_stat (
     SELECT
                q.w,

diff --git a/expected/int8g.out b/expected/int8g.out
index c77879d..432fa35 100644 (file)
--- a/expected/int8g.out
+++ b/expected/int8g.out
@@ -12,7 +12,6 @@ CREATE TABLE int8_stat (
     value   int8 UNIQUE,
        ndoc    int4 NOT NULL CHECK (ndoc>0)
 );
     value   int8 UNIQUE,
        ndoc    int4 NOT NULL CHECK (ndoc>0)
 );

-NOTICE:  CREATE TABLE / UNIQUE will create implicit index "int8_stat_value_key" for table "int8_stat"

 INSERT INTO int8_stat (
     SELECT
                q.w,
 INSERT INTO int8_stat (
     SELECT
                q.w,

diff --git a/expected/intervalg.out b/expected/intervalg.out
index 9b963de..6731e3c 100644 (file)
--- a/expected/intervalg.out
+++ b/expected/intervalg.out
@@ -12,7 +12,6 @@ CREATE TABLE interval_stat (
     value   interval UNIQUE,
        ndoc    int4 NOT NULL CHECK (ndoc>0)
 );
     value   interval UNIQUE,
        ndoc    int4 NOT NULL CHECK (ndoc>0)
 );

-NOTICE:  CREATE TABLE / UNIQUE will create implicit index "interval_stat_value_key" for table "interval_stat"

 INSERT INTO interval_stat (
     SELECT
                q.w,
 INSERT INTO interval_stat (
     SELECT
                q.w,

diff --git a/expected/textg.out b/expected/textg.out
index 3b94270..a48cb24 100644 (file)
--- a/expected/textg.out
+++ b/expected/textg.out
@@ -12,7 +12,6 @@ CREATE TABLE text_stat (
     value   text UNIQUE,
        ndoc    int4 NOT NULL CHECK (ndoc>0)
 );
     value   text UNIQUE,
        ndoc    int4 NOT NULL CHECK (ndoc>0)
 );

-NOTICE:  CREATE TABLE / UNIQUE will create implicit index "text_stat_value_key" for table "text_stat"

 INSERT INTO text_stat (
     SELECT
                q.w,
 INSERT INTO text_stat (
     SELECT
                q.w,

diff --git a/smlar.c b/smlar.c
index 84fc344..7b34c6e 100644 (file)
--- a/smlar.c
+++ b/smlar.c
@@ -3,6 +3,7 @@
 #include "fmgr.h"
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "fmgr.h"
 #include "access/genam.h"
 #include "access/heapam.h"

+#include "access/htup_details.h"

 #include "access/nbtree.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_am.h"
 #include "access/nbtree.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_am.h"


@@ -11,6 +12,7 @@
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_type.h"
 #include "executor/spi.h"
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_type.h"
 #include "executor/spi.h"

+#include "utils/catcache.h"

 #include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"

diff --git a/smlar_gist.c b/smlar_gist.c
index 3520e41..e064b32 100644 (file)
--- a/smlar_gist.c
+++ b/smlar_gist.c
@@ -105,15 +105,15 @@ compareint(const void *va, const void *vb)
 }
 
 /*
 }
 
 /*

- * Removes duplicates from an array of int4. 'l' is
+ * Removes duplicates from an array of int32. 'l' is

  * size of the input array. Returns the new size of the array.
  */
 static int
  * size of the input array. Returns the new size of the array.
  */
 static int

-uniqueint(uint32 *a, int4 l, int4 *max)
+uniqueint(uint32 *a, int32 l, int32 *max)

 {
        uint32      *ptr,
                           *res;
 {
        uint32      *ptr,
                           *res;

-       int4       cnt = 0;
+       int32      cnt = 0;

 
        *max = 1;
 
 
        *max = 1;
 


@@ -149,7 +149,7 @@ Array2HashedArray(ProcTypeInfo info, ArrayType *a)
 {
        SimpleArray *s = Array2SimpleArray(info, a);
        SmlSign         *sign;
 {
        SimpleArray *s = Array2SimpleArray(info, a);
        SmlSign         *sign;

-       int4            len, i;
+       int32           len, i;

        uint32          *ptr;
 
        len = CALCGTSIZE( ARRKEY, s->nelems );
        uint32          *ptr;
 
        len = CALCGTSIZE( ARRKEY, s->nelems );


@@ -198,7 +198,7 @@ HashedElemCmp(const void *va, const void *vb)
 }
 
 static int
 }
 
 static int

-uniqueHashedElem(HashedElem *a, int4 l)
+uniqueHashedElem(HashedElem *a, int32 l)

 {
        HashedElem      *ptr,
                                          *res;
 {
        HashedElem      *ptr,
                                          *res;


@@ -324,7 +324,7 @@ hasHashedElem(SmlSign  *a, uint32 h)
 static void
 makesign(BITVECP sign, SmlSign *a)
 {
 static void
 makesign(BITVECP sign, SmlSign *a)
 {

-       int4    i;
+       int32   i;

        uint32  *ptr = GETARR(a);
 
        MemSet((void *) sign, 0, sizeof(BITVEC));
        uint32  *ptr = GETARR(a);
 
        MemSet((void *) sign, 0, sizeof(BITVEC));


@@ -334,10 +334,10 @@ makesign(BITVECP sign, SmlSign    *a)
                HASH(sign, ptr[i]);
 }
 
                HASH(sign, ptr[i]);
 }
 

-static int4
+static int32

 sizebitvec(BITVECP sign)
 {
 sizebitvec(BITVECP sign)
 {

-       int4    size = 0,
+       int32   size = 0,

                        i;
 
        LOOPBYTE
                        i;
 
        LOOPBYTE


@@ -391,8 +391,8 @@ gsmlsign_compress(PG_FUNCTION_ARGS)
 
                if ( sign->size == SIGLENBIT )
                {
 
                if ( sign->size == SIGLENBIT )
                {

-                       int4    len = CALCGTSIZE(SIGNKEY | ALLISTRUE, 0);
-                       int4    maxrepeat = sign->maxrepeat;
+                       int32   len = CALCGTSIZE(SIGNKEY | ALLISTRUE, 0);
+                       int32   maxrepeat = sign->maxrepeat;

 
                        sign = (SmlSign *) palloc(len);
                        SET_VARSIZE(sign, len);
 
                        sign = (SmlSign *) palloc(len);
                        SET_VARSIZE(sign, len);


@@ -439,7 +439,7 @@ gsmlsign_decompress(PG_FUNCTION_ARGS)
 static bool
 unionkey(BITVECP sbase, SmlSign *add)
 {
 static bool
 unionkey(BITVECP sbase, SmlSign *add)
 {

-       int4    i;
+       int32   i;

 
        if (ISSIGNKEY(add))
        {
 
        if (ISSIGNKEY(add))
        {


@@ -470,10 +470,10 @@ gsmlsign_union(PG_FUNCTION_ARGS)
        GistEntryVector *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
        int        *size = (int *) PG_GETARG_POINTER(1);
        BITVEC      base;
        GistEntryVector *entryvec = (GistEntryVector *) PG_GETARG_POINTER(0);
        int        *size = (int *) PG_GETARG_POINTER(1);
        BITVEC      base;

-       int4            i,
+       int32           i,

                                len,
                                maxrepeat = 1;
                                len,
                                maxrepeat = 1;

-       int4        flag = 0;
+       int32           flag = 0;

        SmlSign    *result;
 
        MemSet((void *) base, 0, sizeof(BITVEC));
        SmlSign    *result;
 
        MemSet((void *) base, 0, sizeof(BITVEC));


@@ -534,7 +534,7 @@ gsmlsign_same(PG_FUNCTION_ARGS)
                }
                else
                {
                }
                else
                {

-                       int4    i;
+                       int32   i;

                        BITVECP sa = GETSIGN(a),
                                        sb = GETSIGN(b);
 
                        BITVECP sa = GETSIGN(a),
                                        sb = GETSIGN(b);
 


@@ -557,7 +557,7 @@ gsmlsign_same(PG_FUNCTION_ARGS)
        {
                uint32  *ptra = GETARR(a),
                                *ptrb = GETARR(b);
        {
                uint32  *ptra = GETARR(a),
                                *ptrb = GETARR(b);

-               int4    i;
+               int32   i;

 
                *result = true;
                for (i = 0; i < a->size; i++)
 
                *result = true;
                for (i = 0; i < a->size; i++)


@@ -671,7 +671,7 @@ fillcache(CACHESIGN *item, SmlSign *key)
 typedef struct
 {
        OffsetNumber pos;
 typedef struct
 {
        OffsetNumber pos;

-       int4        cost;
+       int32        cost;

 } SPLITCOST;
 
 static int
 } SPLITCOST;
 
 static int


@@ -715,11 +715,11 @@ gsmlsign_picksplit(PG_FUNCTION_ARGS)
                                *datum_r;
        BITVECP     union_l,
                                union_r;
                                *datum_r;
        BITVECP     union_l,
                                union_r;

-       int4        size_alpha,
+       int32       size_alpha,

                                size_beta;
                                size_beta;

-       int4        size_waste,
+       int32       size_waste,

                                waste = -1;
                                waste = -1;

-       int4        nbytes;
+       int32       nbytes;

        OffsetNumber seed_1 = 0,
                                seed_2 = 0;
        OffsetNumber *left,
        OffsetNumber seed_1 = 0,
                                seed_2 = 0;
        OffsetNumber *left,


@@ -939,7 +939,7 @@ gsmlsign_consistent(PG_FUNCTION_ARGS)
        int                             res = false;
        SmlSign                 *query;
        SimpleArray             *s;
        int                             res = false;
        SmlSign                 *query;
        SimpleArray             *s;

-       int4                    i;
+       int32                   i;

 
        fcinfo->flinfo->fn_extra = SearchArrayCache(
                                                                        fcinfo->flinfo->fn_extra,
 
        fcinfo->flinfo->fn_extra = SearchArrayCache(
                                                                        fcinfo->flinfo->fn_extra,


@@ -1107,7 +1107,7 @@ gsmlsign_consistent(PG_FUNCTION_ARGS)
        else
        {       /* signature */
                BITVECP sign = GETSIGN(key);
        else
        {       /* signature */
                BITVECP sign = GETSIGN(key);

-               int4    count = 0;
+               int32   count = 0;

 
                fillHashVal(fcinfo->flinfo->fn_extra, s);
 
 
                fillHashVal(fcinfo->flinfo->fn_extra, s);