From 26df7066cc229887d4defdf1d105c0a22b8a88fb Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Fri, 15 May 2015 17:03:16 -0300 Subject: Move strategy numbers to include/access/stratnum.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For upcoming BRIN opclasses, it's convenient to have strategy numbers defined in a single place. Since there's nothing appropriate, create it. The StrategyNumber typedef now lives there, as well as existing strategy numbers for B-trees (from skey.h) and R-tree-and-friends (from gist.h). skey.h is forced to include stratnum.h because of the StrategyNumber typedef, but gist.h is not; extensions that currently rely on gist.h for rtree strategy numbers might need to add a new A few .c files can stop including skey.h and/or gist.h, which is a nice side benefit. Per discussion: https://www.postgresql.org/message-id/20150514232132.GZ2523@alvh.no-ip.org Authored by Emre Hasegeli and Álvaro. (It's not clear to me why bootscanner.l has any #include lines at all.) --- src/backend/utils/adt/network_gist.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/backend/utils/adt/network_gist.c') diff --git a/src/backend/utils/adt/network_gist.c b/src/backend/utils/adt/network_gist.c index cd2b8b19a77..2e3ee1e8ba7 100644 --- a/src/backend/utils/adt/network_gist.c +++ b/src/backend/utils/adt/network_gist.c @@ -48,23 +48,23 @@ #include #include "access/gist.h" -#include "access/skey.h" +#include "access/stratnum.h" #include "utils/inet.h" /* * Operator strategy numbers used in the GiST inet_ops opclass */ -#define INETSTRAT_OVERLAPS 3 -#define INETSTRAT_EQ 18 -#define INETSTRAT_NE 19 -#define INETSTRAT_LT 20 -#define INETSTRAT_LE 21 -#define INETSTRAT_GT 22 -#define INETSTRAT_GE 23 -#define INETSTRAT_SUB 24 -#define INETSTRAT_SUBEQ 25 -#define INETSTRAT_SUP 26 -#define INETSTRAT_SUPEQ 27 +#define INETSTRAT_OVERLAPS RTOverlapStrategyNumber +#define INETSTRAT_EQ RTEqualStrategyNumber +#define INETSTRAT_NE RTNotEqualStrategyNumber +#define INETSTRAT_LT RTLessStrategyNumber +#define INETSTRAT_LE RTLessEqualStrategyNumber +#define INETSTRAT_GT RTGreaterStrategyNumber +#define INETSTRAT_GE RTGreaterEqualStrategyNumber +#define INETSTRAT_SUB RTSubStrategyNumber +#define INETSTRAT_SUBEQ RTSubOrEqualStrategyNumber +#define INETSTRAT_SUP RTSuperStrategyNumber +#define INETSTRAT_SUPEQ RTSuperOrEqualStrategyNumber /* -- cgit v1.2.3