From 1f265b0b68a2c9d75ef6e0764746de8d6a7b4879 Mon Sep 17 00:00:00 2001 From: Mark Dilger Date: Mon, 20 Jan 2020 19:31:06 -0800 Subject: [PATCH 04/11] Moving jsonapi.h to src/include/common In preparation for exposing this header for both frontend and backend use, moving it to src/include/common, and changing the #includes in other files to match. --- contrib/hstore/hstore_io.c | 2 +- src/backend/tsearch/to_tsany.c | 2 +- src/backend/tsearch/wparser.c | 2 +- src/backend/utils/adt/json.c | 2 +- src/backend/utils/adt/jsonb.c | 2 +- src/backend/utils/adt/jsonb_util.c | 2 +- src/backend/utils/adt/jsonfuncs.c | 2 +- src/include/{utils => common}/jsonapi.h | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) rename src/include/{utils => common}/jsonapi.h (98%) diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c index 10ec392775..f3174f2995 100644 --- a/contrib/hstore/hstore_io.c +++ b/contrib/hstore/hstore_io.c @@ -7,13 +7,13 @@ #include "access/htup_details.h" #include "catalog/pg_type.h" +#include "common/jsonapi.h" #include "funcapi.h" #include "hstore.h" #include "lib/stringinfo.h" #include "libpq/pqformat.h" #include "utils/builtins.h" #include "utils/json.h" -#include "utils/jsonapi.h" #include "utils/jsonb.h" #include "utils/lsyscache.h" #include "utils/memutils.h" diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c index cc694cda8c..9c356cbfd5 100644 --- a/src/backend/tsearch/to_tsany.c +++ b/src/backend/tsearch/to_tsany.c @@ -13,10 +13,10 @@ */ #include "postgres.h" +#include "common/jsonapi.h" #include "tsearch/ts_cache.h" #include "tsearch/ts_utils.h" #include "utils/builtins.h" -#include "utils/jsonapi.h" typedef struct MorphOpaque diff --git a/src/backend/tsearch/wparser.c b/src/backend/tsearch/wparser.c index 6b5960ecc1..25ef79ac6d 100644 --- a/src/backend/tsearch/wparser.c +++ b/src/backend/tsearch/wparser.c @@ -16,11 +16,11 @@ #include "catalog/namespace.h" #include "catalog/pg_type.h" #include "commands/defrem.h" +#include "common/jsonapi.h" #include "funcapi.h" #include "tsearch/ts_cache.h" #include "tsearch/ts_utils.h" #include "utils/builtins.h" -#include "utils/jsonapi.h" #include "utils/varlena.h" /******sql-level interface******/ diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c index b3f7bf1d32..6175fba447 100644 --- a/src/backend/utils/adt/json.c +++ b/src/backend/utils/adt/json.c @@ -16,6 +16,7 @@ #include "access/htup_details.h" #include "access/transam.h" #include "catalog/pg_type.h" +#include "common/jsonapi.h" #include "common/pg_wchar.h" #include "executor/spi.h" #include "funcapi.h" @@ -28,7 +29,6 @@ #include "utils/date.h" #include "utils/datetime.h" #include "utils/json.h" -#include "utils/jsonapi.h" #include "utils/lsyscache.h" #include "utils/mbutils.h" #include "utils/syscache.h" diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c index c4a4ec78b0..c95e112184 100644 --- a/src/backend/utils/adt/jsonb.c +++ b/src/backend/utils/adt/jsonb.c @@ -15,6 +15,7 @@ #include "access/htup_details.h" #include "access/transam.h" #include "catalog/pg_type.h" +#include "common/jsonapi.h" #include "funcapi.h" #include "libpq/pqformat.h" #include "miscadmin.h" @@ -23,7 +24,6 @@ #include "utils/date.h" #include "utils/datetime.h" #include "utils/json.h" -#include "utils/jsonapi.h" #include "utils/jsonb.h" #include "utils/lsyscache.h" #include "utils/syscache.h" diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c index 7c9da701dd..a63f06fdae 100644 --- a/src/backend/utils/adt/jsonb_util.c +++ b/src/backend/utils/adt/jsonb_util.c @@ -15,11 +15,11 @@ #include "catalog/pg_collation.h" #include "catalog/pg_type.h" +#include "common/jsonapi.h" #include "miscadmin.h" #include "utils/builtins.h" #include "utils/datetime.h" #include "utils/hashutils.h" -#include "utils/jsonapi.h" #include "utils/jsonb.h" #include "utils/memutils.h" #include "utils/varlena.h" diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c index 14aefd8fe2..e59e99c0d0 100644 --- a/src/backend/utils/adt/jsonfuncs.c +++ b/src/backend/utils/adt/jsonfuncs.c @@ -18,6 +18,7 @@ #include "access/htup_details.h" #include "catalog/pg_type.h" +#include "common/jsonapi.h" #include "common/pg_wchar.h" #include "fmgr.h" #include "funcapi.h" @@ -27,7 +28,6 @@ #include "utils/builtins.h" #include "utils/hsearch.h" #include "utils/json.h" -#include "utils/jsonapi.h" #include "utils/jsonb.h" #include "utils/lsyscache.h" #include "utils/memutils.h" diff --git a/src/include/utils/jsonapi.h b/src/include/common/jsonapi.h similarity index 98% rename from src/include/utils/jsonapi.h rename to src/include/common/jsonapi.h index f72f1cefd5..6f7a810172 100644 --- a/src/include/utils/jsonapi.h +++ b/src/include/common/jsonapi.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * src/include/utils/jsonapi.h + * src/include/common/jsonapi.h * *------------------------------------------------------------------------- */ @@ -14,7 +14,7 @@ #ifndef JSONAPI_H #define JSONAPI_H -#include "jsonb.h" +#include "utils/jsonb.h" #include "lib/stringinfo.h" typedef enum -- 2.21.1 (Apple Git-122.3)