Prevent to use magic constants

Use macroses for definition amstrategies/amsupport fields instead of
hardcoded values.

Author: Nikolay Shaplov with addition for contrib/bloom

diff --git a/contrib/bloom/blutils.c b/contrib/bloom/blutils.c
index 71a93e0cd4683166d06bc9a20fd663f9fa8a37cc..05dbe87614326f67de30fa1f14b0aa2f1357a892 100644 (file)
--- a/contrib/bloom/blutils.c
+++ b/contrib/bloom/blutils.c
@@ -73,8 +73,8 @@ blhandler(PG_FUNCTION_ARGS)
 {
    IndexAmRoutine *amroutine = makeNode(IndexAmRoutine);
 
-   amroutine->amstrategies = 1;
-   amroutine->amsupport = 1;
+   amroutine->amstrategies = BLOOM_NSTRATEGIES;
+   amroutine->amsupport = BLOOM_NPROC;
    amroutine->amcanorder = false;
    amroutine->amcanorderbyop = false;
    amroutine->amcanbackward = false;

diff --git a/src/backend/access/gin/ginutil.c b/src/backend/access/gin/ginutil.c
index 94502678abb7210bce3eb75698e1bf4f5165950a..a2450f4687eaa8aadad4c163b9bfc98799befcc6 100644 (file)
--- a/src/backend/access/gin/ginutil.c
+++ b/src/backend/access/gin/ginutil.c
@@ -35,7 +35,7 @@ ginhandler(PG_FUNCTION_ARGS)
    IndexAmRoutine *amroutine = makeNode(IndexAmRoutine);
 
    amroutine->amstrategies = 0;
-   amroutine->amsupport = 6;
+   amroutine->amsupport = GINNProcs;
    amroutine->amcanorder = false;
    amroutine->amcanorderbyop = false;
    amroutine->amcanbackward = false;

diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 996363c2ded5386673b55c5bbc8e5bbc209a129a..a29088728d26d04ed6ad6126d85c592e64058a3d 100644 (file)
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -57,7 +57,7 @@ gisthandler(PG_FUNCTION_ARGS)
    IndexAmRoutine *amroutine = makeNode(IndexAmRoutine);
 
    amroutine->amstrategies = 0;
-   amroutine->amsupport = 9;
+   amroutine->amsupport = GISTNProcs;
    amroutine->amcanorder = false;
    amroutine->amcanorderbyop = true;
    amroutine->amcanbackward = false;

diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index 8c89ee7108b05f2853c69dd0d428f3146abac0f6..4fececeab8c9ef2b2c12b5a437f44496a9c3fad3 100644 (file)
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -51,8 +51,8 @@ hashhandler(PG_FUNCTION_ARGS)
 {
    IndexAmRoutine *amroutine = makeNode(IndexAmRoutine);
 
-   amroutine->amstrategies = 1;
-   amroutine->amsupport = 1;
+   amroutine->amstrategies = HTMaxStrategyNumber;
+   amroutine->amsupport = HASHNProcs;
    amroutine->amcanorder = false;
    amroutine->amcanorderbyop = false;
    amroutine->amcanbackward = true;

diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index bf8ade375d187d3809a452d410ed0b3830492469..013394c5b62d8f09b97945277ae17d4b15f36a37 100644 (file)
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -84,8 +84,8 @@ bthandler(PG_FUNCTION_ARGS)
 {
    IndexAmRoutine *amroutine = makeNode(IndexAmRoutine);
 
-   amroutine->amstrategies = 5;
-   amroutine->amsupport = 2;
+   amroutine->amstrategies = BTMaxStrategyNumber;
+   amroutine->amsupport = BTNProcs;
    amroutine->amcanorder = true;
    amroutine->amcanorderbyop = false;
    amroutine->amcanbackward = true;

diff --git a/src/backend/access/spgist/spgutils.c b/src/backend/access/spgist/spgutils.c
index 201203f91a306bda263e0c3d1f90947bf24df59e..bc679bf75a0605b9ad620835d55c5d55da43210c 100644 (file)
--- a/src/backend/access/spgist/spgutils.c
+++ b/src/backend/access/spgist/spgutils.c
@@ -36,7 +36,7 @@ spghandler(PG_FUNCTION_ARGS)
    IndexAmRoutine *amroutine = makeNode(IndexAmRoutine);
 
    amroutine->amstrategies = 0;
-   amroutine->amsupport = 5;
+   amroutine->amsupport = SPGISTNProc;
    amroutine->amcanorder = false;
    amroutine->amcanorderbyop = false;
    amroutine->amcanbackward = false;

diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 3a6839047396badcabd75f56a57177fc85bb5159..fa3f9b61caa1273039cea3ba438ee9fbf2d5d593 100644 (file)
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -239,6 +239,7 @@ typedef HashMetaPageData *HashMetaPage;
  * Since we only have one such proc in amproc, it's number 1.
  */
 #define HASHPROC       1
+#define HASHNProcs     1
 
 
 /* public routines */

diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index ca5034907dd6b27633aa75513fa63924804a70b9..d9569008d479eaa68a8831ede1de9588954091c1 100644 (file)
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -454,6 +454,7 @@ typedef struct xl_btree_newroot
 
 #define BTORDER_PROC       1
 #define BTSORTSUPPORT_PROC 2
+#define BTNProcs           2
 
 /*
  * We need to be able to tell the difference between read and write