fix counting in gin_stat for versions >= 9.4

[gevel.git] / gevel.c

diff --git a/gevel.c b/gevel.c
index 6a62b85..59bec84 100644 (file)
--- a/gevel.c
+++ b/gevel.c
@@ -625,7 +625,7 @@ refindPosition(GinStatState *st)
 #endif
                if ( cmp == 0 )
                {
-                       if ( !st->index->rd_att->attrs[st->attnum]->attbyval )
+                       if ( st->curval && !st->index->rd_att->attrs[st->attnum]->attbyval )
                                pfree( (void*) st->curval );
                        return true;
                }
@@ -683,14 +683,24 @@ gin_setup_firstcall(FuncCallContext  *funcctx, text *name, int attnum) {
 static void
 processTuple( FuncCallContext  *funcctx,  GinStatState *st, IndexTuple itup ) {
        MemoryContext           oldcontext;
-#if PG_VERSION_NUM < 80400
+#if PG_VERSION_NUM >= 90100
+       Datum                           key;
+#elif PG_VERSION_NUM < 80400
        bool                            isnull;
 #endif
 
        oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
+
+#if PG_VERSION_NUM >= 90100
+       key = gintuple_get_key(&st->ginstate, itup, &st->category);
+
+       if (st->category != GIN_CAT_NORM_KEY)
+               st->curval = (Datum)0;
+       else
+#endif
        st->curval = datumCopy(
 #if PG_VERSION_NUM >= 90100
-                                       gintuple_get_key(&st->ginstate, itup, &st->category),
+                                       key,
 #elif PG_VERSION_NUM >= 80400
                                        gin_index_getattr(&st->ginstate, itup),
 #else
@@ -729,19 +739,20 @@ processTuple( FuncCallContext  *funcctx,  GinStatState *st, IndexTuple itup ) {
                list = GinDataLeafPageGetItems(page, &nlist, minItem);
                pfree(list);
                predictNumber = stack->predictNumber;
+               st->dvalues[1] = Int32GetDatum( predictNumber * nlist );
 #elif PG_VERSION_NUM >= 90100
                gdi = ginPrepareScanPostingTree(st->index, rootblkno, TRUE);
                entrybuffer = ginScanBeginPostingTree(gdi);
                page = BufferGetPage(entrybuffer);
                predictNumber = gdi->stack->predictNumber;
+               st->dvalues[1] = Int32GetDatum( predictNumber * GinPageGetOpaque(page)->maxoff );
 #else
                gdi = prepareScanPostingTree(st->index, rootblkno, TRUE);
                entrybuffer = scanBeginPostingTree(gdi);
                page = BufferGetPage(entrybuffer);
                predictNumber = gdi->stack->predictNumber;
-#endif
-
                st->dvalues[1] = Int32GetDatum( predictNumber * GinPageGetOpaque(page)->maxoff );
+#endif
 
 #if PG_VERSION_NUM < 90400
                LockBuffer(entrybuffer, GIN_UNLOCK);
@@ -1042,8 +1053,8 @@ typedef struct SPGistPrintStackElem {
 typedef struct SPGistPrint {
        SpGistState     state;
        Relation        index;
-       Datum           dvalues[7 /* see CreateTemplateTupleDesc call */];
-       char            nulls[7 /* see CreateTemplateTupleDesc call */];
+       Datum           dvalues[8 /* see CreateTemplateTupleDesc call */];
+       char            nulls[8 /* see CreateTemplateTupleDesc call */];
        List            *stack;
 } SPGistPrint;
 
@@ -1108,16 +1119,17 @@ spgist_print(PG_FUNCTION_ARGS)
                prst->index = index;
                initSpGistState(&prst->state, index);
 
-               tupdesc = CreateTemplateTupleDesc(3 /* types */ + 1 /* level */ + 1 /* nlabel */ +  2 /* tids */, false);
+               tupdesc = CreateTemplateTupleDesc(3 /* types */ + 1 /* level */ + 1 /* nlabel */ +  2 /* tids */ + 1, false);
                TupleDescInitEntry(tupdesc, 1, "tid", TIDOID, -1, 0);
-               TupleDescInitEntry(tupdesc, 2, "node", INT4OID, -1, 0);
-               TupleDescInitEntry(tupdesc, 3, "level", INT4OID, -1, 0);
-               TupleDescInitEntry(tupdesc, 4, "tid_pointer", TIDOID, -1, 0);
-               TupleDescInitEntry(tupdesc, 5, "prefix",
+               TupleDescInitEntry(tupdesc, 2, "allthesame", BOOLOID, -1, 0);
+               TupleDescInitEntry(tupdesc, 3, "node", INT4OID, -1, 0);
+               TupleDescInitEntry(tupdesc, 4, "level", INT4OID, -1, 0);
+               TupleDescInitEntry(tupdesc, 5, "tid_pointer", TIDOID, -1, 0);
+               TupleDescInitEntry(tupdesc, 6, "prefix",
                                (prst->state.attPrefixType.type == VOIDOID) ? INT4OID : prst->state.attPrefixType.type, -1, 0);
-               TupleDescInitEntry(tupdesc, 6, "label",
+               TupleDescInitEntry(tupdesc, 7, "label",
                                (prst->state.attLabelType.type == VOIDOID) ? INT4OID : prst->state.attLabelType.type, -1, 0);
-               TupleDescInitEntry(tupdesc, 7, "leaf",
+               TupleDescInitEntry(tupdesc, 8, "leaf",
                                (prst->state.attType.type == VOIDOID) ? INT4OID : prst->state.attType.type, -1, 0);
 
                funcctx->slot = TupleDescGetSlot(tupdesc);
@@ -1186,14 +1198,15 @@ next:
                                prst->dvalues[0] = PointerGetDatum(tid);
                                prst->nulls[0] = ISNOTNULL;
                                prst->nulls[1] = ISNULL;
-                               prst->dvalues[2]  = s->level;
-                               prst->nulls[2] = ISNOTNULL;
-                               prst->nulls[3] = ISNULL;
+                               prst->nulls[2] = ISNULL;
+                               prst->dvalues[3]  = s->level;
+                               prst->nulls[3] = ISNOTNULL;
                                prst->nulls[4] = ISNULL;
                                prst->nulls[5] = ISNULL;
-                               prst->dvalues[6]  = datumCopy(SGLTDATUM(leafTuple, &prst->state),
+                               prst->nulls[6] = ISNULL;
+                               prst->dvalues[7]  = datumCopy(SGLTDATUM(leafTuple, &prst->state),
                                                                                        prst->state.attType.attbyval, prst->state.attType.attlen);
-                               prst->nulls[6] = ISNOTNULL;
+                               prst->nulls[7] = ISNOTNULL;
                } else {
                        SpGistInnerTuple        innerTuple = (SpGistInnerTuple)dtuple;
                        int                             i;
@@ -1216,27 +1229,29 @@ next:
                        *tid = s->iptr;
                        prst->dvalues[0] = PointerGetDatum(tid);
                        prst->nulls[0] = ISNOTNULL;
-                       prst->dvalues[1] = Int32GetDatum(s->nlabel);
+                       prst->dvalues[1] = innerTuple->allTheSame;
                        prst->nulls[1] = ISNOTNULL;
-                       prst->dvalues[2]  = s->level;
+                       prst->dvalues[2] = Int32GetDatum(s->nlabel);
                        prst->nulls[2] = ISNOTNULL;
+                       prst->dvalues[3]  = s->level;
+                       prst->nulls[3] = ISNOTNULL;
                        tid = palloc(sizeof(ItemPointerData));
                        *tid = node->t_tid;
-                       prst->dvalues[3] = PointerGetDatum(tid);
-                       prst->nulls[3] = ISNOTNULL;
+                       prst->dvalues[4] = PointerGetDatum(tid);
+                       prst->nulls[5] = ISNOTNULL;
                        if (innerTuple->prefixSize > 0) {
-                               prst->dvalues[4]  = datumCopy(SGITDATUM(innerTuple, &prst->state),
+                               prst->dvalues[5]  = datumCopy(SGITDATUM(innerTuple, &prst->state),
                                                                                        prst->state.attPrefixType.attbyval, prst->state.attPrefixType.attlen);
-                               prst->nulls[4] = ISNOTNULL;
+                               prst->nulls[5] = ISNOTNULL;
                        } else
-                               prst->nulls[4] = ISNULL;
+                               prst->nulls[5] = ISNULL;
                        if (!IndexTupleHasNulls(node)) {
-                               prst->dvalues[5]  = datumCopy(SGNTDATUM(node, &prst->state),
+                               prst->dvalues[6]  = datumCopy(SGNTDATUM(node, &prst->state),
                                                                                        prst->state.attLabelType.attbyval, prst->state.attLabelType.attlen);
-                               prst->nulls[5] = ISNOTNULL;
+                               prst->nulls[6] = ISNOTNULL;
                        } else
-                               prst->nulls[5] = ISNULL;
-                       prst->nulls[6] = ISNULL;
+                               prst->nulls[6] = ISNULL;
+                       prst->nulls[7] = ISNULL;
 
                        pushSPGistPrint(funcctx, prst, &node->t_tid, s->level + 1);
                        s->nlabel = i + 1;