fix wrong check of attbyval

[gevel.git] / gevel.c

diff --git a/gevel.c b/gevel.c
index d13c724..0715710 100644 (file)
--- a/gevel.c
+++ b/gevel.c
@@ -63,7 +63,7 @@ PG_MODULE_MAGIC;
 
 static Relation
 gist_index_open(RangeVar *relvar) {
-#if PG_VERSION_NUM <= 90100 
+#if PG_VERSION_NUM < 90200 
        Oid relOid = RangeVarGetRelid(relvar, false);
 #else
        Oid relOid = RangeVarGetRelid(relvar, NoLock, false);
@@ -76,7 +76,7 @@ gist_index_open(RangeVar *relvar) {
 
 static Relation
 gin_index_open(RangeVar *relvar) {
-#if PG_VERSION_NUM <= 90100 
+#if PG_VERSION_NUM < 90200 
        Oid relOid = RangeVarGetRelid(relvar, false);
 #else
        Oid relOid = RangeVarGetRelid(relvar, NoLock, false);
@@ -883,7 +883,7 @@ spgist_stat(PG_FUNCTION_ARGS)
 
        totalPages = RelationGetNumberOfBlocks(index);
 
-       for (blkno = SPGIST_HEAD_BLKNO; blkno < totalPages; blkno++)
+       for (blkno = SPGIST_ROOT_BLKNO; blkno < totalPages; blkno++)
        {
                Buffer    buffer;
                Page            page;
@@ -1072,7 +1072,7 @@ spgist_print(PG_FUNCTION_ARGS)
 
                MemoryContextSwitchTo(oldcontext);
 
-               ItemPointerSet(&ipd, SPGIST_HEAD_BLKNO, FirstOffsetNumber);
+               ItemPointerSet(&ipd, SPGIST_ROOT_BLKNO, FirstOffsetNumber);
                prst->stack = NIL;
                pushSPGistPrint(funcctx, prst, &ipd, 1);
 
@@ -1169,13 +1169,13 @@ next:
                        *tid = node->t_tid;
                        prst->dvalues[3] = PointerGetDatum(tid);
                        prst->nulls[3] = ' ';
-                       if (prst->state.attPrefixType.attbyval != VOIDOID && innerTuple->prefixSize > 0) {
+                       if (prst->state.attPrefixType.attbyval == false && innerTuple->prefixSize > 0) {
                                prst->dvalues[4]  = datumCopy(SGITDATUM(innerTuple, &prst->state), 
                                                                                        prst->state.attPrefixType.attbyval, prst->state.attPrefixType.attlen); 
                                prst->nulls[4] = ' ';
                        } else
                                prst->nulls[4] = 'n';
-                       if (prst->state.attLabelType.attbyval != VOIDOID && !IndexTupleHasNulls(node)) {
+                       if (prst->state.attLabelType.attbyval == false && !IndexTupleHasNulls(node)) {
                                prst->dvalues[5]  = datumCopy(SGNTDATUM(node, &prst->state), 
                                                                                        prst->state.attLabelType.attbyval, prst->state.attLabelType.attlen); 
                                prst->nulls[5] = ' ';