On 05.12.25 17:38, Heikki Linnakangas wrote:
#if 0
Oid subtype = PG_GETARG_OID(3);
#endif
is yet another option. It keeps the indentation, although you won't get
the compiler checking.
After some reflection, I like this approach. It keeps the indentation
and enables syntax highlighting, so it makes some of these blocks much
easier to read.
Here is an updated patch with this approach, except for jsonb_set_lax(),
where the correct fix was to delete the commented out code, as
previously discussed.
From efd643cd35e29e7a70dd4c284ba7a226cd0ea0af Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <[email protected]>
Date: Tue, 20 Jan 2026 09:35:46 +0100
Subject: [PATCH v2 1/2] Remove incorrect commented out code
These calls, if activated, are happening before null checks, so they
are not correct. Also, the "in" variable is shadowed later. Remove
them to avoid confusion and bad examples.
Discussion:
https://www.postgresql.org/message-id/flat/328e4371-9a4c-4196-9df9-1f23afc900df%40eisentraut.org
---
src/backend/utils/adt/jsonfuncs.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/backend/utils/adt/jsonfuncs.c
b/src/backend/utils/adt/jsonfuncs.c
index f2f1f59013a..1e5b60801e4 100644
--- a/src/backend/utils/adt/jsonfuncs.c
+++ b/src/backend/utils/adt/jsonfuncs.c
@@ -4898,10 +4898,6 @@ jsonb_set(PG_FUNCTION_ARGS)
Datum
jsonb_set_lax(PG_FUNCTION_ARGS)
{
- /* Jsonb *in = PG_GETARG_JSONB_P(0); */
- /* ArrayType *path = PG_GETARG_ARRAYTYPE_P(1); */
- /* Jsonb *newval = PG_GETARG_JSONB_P(2); */
- /* bool create = PG_GETARG_BOOL(3); */
text *handle_null;
char *handle_val;
base-commit: 7ebb64c557570647e3fcf6f5f1549e882ed26489
--
2.52.0
From 3f76042203b85b5a38c33daf6e089cd765b68a30 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <[email protected]>
Date: Tue, 20 Jan 2026 09:37:54 +0100
Subject: [PATCH v2 2/2] Mark commented out code as unused
There were many PG_GETARG_* calls, mostly around gin, gist, spgist
code, that were commented out, presumably to indicate that the
argument was unused and to indicate that it wasn't forgotten or
miscounted. But keeping commented-out code updated with refactorings
and style changes is annoying. So this commit changes them to #if 0
blocks. That way, at least the indentation and syntax highlighting
works correctly, making some of these blocks much easier to read.
An alternative would be to just delete that code, but there is some
value in making unused arguments explicit, and some of this arguably
serves as example code for index AM APIs.
Discussion:
https://www.postgresql.org/message-id/flat/328e4371-9a4c-4196-9df9-1f23afc900df%40eisentraut.org
---
contrib/btree_gist/btree_bit.c | 5 +--
contrib/btree_gist/btree_bool.c | 5 +--
contrib/btree_gist/btree_bytea.c | 5 +--
contrib/btree_gist/btree_cash.c | 10 +++---
contrib/btree_gist/btree_date.c | 10 +++---
contrib/btree_gist/btree_enum.c | 5 +--
contrib/btree_gist/btree_float4.c | 10 +++---
contrib/btree_gist/btree_float8.c | 10 +++---
contrib/btree_gist/btree_inet.c | 5 +--
contrib/btree_gist/btree_int2.c | 10 +++---
contrib/btree_gist/btree_int4.c | 10 +++---
contrib/btree_gist/btree_int8.c | 10 +++---
contrib/btree_gist/btree_interval.c | 10 +++---
contrib/btree_gist/btree_macaddr.c | 5 +--
contrib/btree_gist/btree_macaddr8.c | 5 +--
contrib/btree_gist/btree_numeric.c | 5 +--
contrib/btree_gist/btree_oid.c | 10 +++---
contrib/btree_gist/btree_text.c | 10 +++---
contrib/btree_gist/btree_time.c | 15 ++++----
contrib/btree_gist/btree_ts.c | 20 ++++++-----
contrib/btree_gist/btree_uuid.c | 5 +--
contrib/cube/cube.c | 5 +--
contrib/hstore/hstore_gin.c | 10 +++---
contrib/hstore/hstore_gist.c | 5 +--
contrib/intarray/_int_gin.c | 5 +--
contrib/intarray/_int_gist.c | 5 +--
contrib/intarray/_intbig_gist.c | 5 +--
contrib/ltree/_ltree_gist.c | 5 +--
contrib/ltree/ltree_gist.c | 5 +--
contrib/pg_trgm/trgm_gin.c | 20 ++++++-----
contrib/pg_trgm/trgm_gist.c | 10 +++---
contrib/seg/seg.c | 5 +--
doc/src/sgml/gist.sgml | 10 ++++--
src/backend/access/gin/ginarrayproc.c | 34 +++++++++++--------
src/backend/access/gist/gistproc.c | 32 ++++++++++-------
src/backend/access/spgist/spgkdtreeproc.c | 4 ++-
src/backend/access/spgist/spgquadtreeproc.c | 4 ++-
src/backend/access/spgist/spgtextproc.c | 4 ++-
src/backend/utils/adt/datum.c | 4 ++-
src/backend/utils/adt/jsonb_gin.c | 20 ++++++-----
src/backend/utils/adt/network_gist.c | 5 +--
src/backend/utils/adt/network_spgist.c | 4 ++-
src/backend/utils/adt/rangetypes_spgist.c | 4 ++-
src/backend/utils/adt/tsginidx.c | 30 +++++++++-------
src/backend/utils/adt/tsgistidx.c | 7 ++--
src/backend/utils/adt/tsquery_gist.c | 5 +--
src/backend/utils/adt/varlena.c | 4 ++-
.../modules/spgist_name_ops/spgist_name_ops.c | 4 ++-
48 files changed, 266 insertions(+), 169 deletions(-)
diff --git a/contrib/btree_gist/btree_bit.c b/contrib/btree_gist/btree_bit.c
index 9199f886097..06dd9a05e37 100644
--- a/contrib/btree_gist/btree_bit.c
+++ b/contrib/btree_gist/btree_bit.c
@@ -139,8 +139,9 @@ gbt_bit_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
void *query = DatumGetByteaP(PG_GETARG_DATUM(1));
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
bool retval;
GBT_VARKEY *key = (GBT_VARKEY *) DatumGetPointer(entry->key);
diff --git a/contrib/btree_gist/btree_bool.c b/contrib/btree_gist/btree_bool.c
index 344f059c78f..ed92d3193d7 100644
--- a/contrib/btree_gist/btree_bool.c
+++ b/contrib/btree_gist/btree_bool.c
@@ -108,8 +108,9 @@ gbt_bool_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
bool query = PG_GETARG_INT16(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
boolKEY *kkk = (boolKEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
diff --git a/contrib/btree_gist/btree_bytea.c b/contrib/btree_gist/btree_bytea.c
index 26f8710fad5..18ea791f590 100644
--- a/contrib/btree_gist/btree_bytea.c
+++ b/contrib/btree_gist/btree_bytea.c
@@ -101,8 +101,9 @@ gbt_bytea_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
void *query = DatumGetByteaP(PG_GETARG_DATUM(1));
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
bool retval;
GBT_VARKEY *key = (GBT_VARKEY *) DatumGetPointer(entry->key);
diff --git a/contrib/btree_gist/btree_cash.c b/contrib/btree_gist/btree_cash.c
index 282d5c5731f..ff38536ef4a 100644
--- a/contrib/btree_gist/btree_cash.c
+++ b/contrib/btree_gist/btree_cash.c
@@ -139,8 +139,9 @@ gbt_cash_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
Cash query = PG_GETARG_CASH(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
cashKEY *kkk = (cashKEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
@@ -161,8 +162,9 @@ gbt_cash_distance(PG_FUNCTION_ARGS)
{
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
Cash query = PG_GETARG_CASH(1);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
cashKEY *kkk = (cashKEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
diff --git a/contrib/btree_gist/btree_date.c b/contrib/btree_gist/btree_date.c
index 1f1a3f32b56..1a33c23e850 100644
--- a/contrib/btree_gist/btree_date.c
+++ b/contrib/btree_gist/btree_date.c
@@ -154,8 +154,9 @@ gbt_date_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
DateADT query = PG_GETARG_DATEADT(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
dateKEY *kkk = (dateKEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
@@ -176,8 +177,9 @@ gbt_date_distance(PG_FUNCTION_ARGS)
{
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
DateADT query = PG_GETARG_DATEADT(1);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
dateKEY *kkk = (dateKEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
diff --git a/contrib/btree_gist/btree_enum.c b/contrib/btree_gist/btree_enum.c
index 8f1ffff4696..a36ff2bab78 100644
--- a/contrib/btree_gist/btree_enum.c
+++ b/contrib/btree_gist/btree_enum.c
@@ -126,8 +126,9 @@ gbt_enum_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
Oid query = PG_GETARG_OID(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
oidKEY *kkk = (oidKEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
diff --git a/contrib/btree_gist/btree_float4.c
b/contrib/btree_gist/btree_float4.c
index d9c859835da..e8c61d204ad 100644
--- a/contrib/btree_gist/btree_float4.c
+++ b/contrib/btree_gist/btree_float4.c
@@ -133,8 +133,9 @@ gbt_float4_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
float4 query = PG_GETARG_FLOAT4(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
float4KEY *kkk = (float4KEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
@@ -155,8 +156,9 @@ gbt_float4_distance(PG_FUNCTION_ARGS)
{
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
float4 query = PG_GETARG_FLOAT4(1);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
float4KEY *kkk = (float4KEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
diff --git a/contrib/btree_gist/btree_float8.c
b/contrib/btree_gist/btree_float8.c
index 567beede178..10cdcd4eacb 100644
--- a/contrib/btree_gist/btree_float8.c
+++ b/contrib/btree_gist/btree_float8.c
@@ -141,8 +141,9 @@ gbt_float8_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
float8 query = PG_GETARG_FLOAT8(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
float8KEY *kkk = (float8KEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
@@ -163,8 +164,9 @@ gbt_float8_distance(PG_FUNCTION_ARGS)
{
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
float8 query = PG_GETARG_FLOAT8(1);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
float8KEY *kkk = (float8KEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c
index e726375f61d..cbc2359e5e0 100644
--- a/contrib/btree_gist/btree_inet.c
+++ b/contrib/btree_gist/btree_inet.c
@@ -120,8 +120,9 @@ gbt_inet_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
Datum dquery = PG_GETARG_DATUM(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
inetKEY *kkk = (inetKEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
diff --git a/contrib/btree_gist/btree_int2.c b/contrib/btree_gist/btree_int2.c
index faf456997bb..81ecbacf3b4 100644
--- a/contrib/btree_gist/btree_int2.c
+++ b/contrib/btree_gist/btree_int2.c
@@ -139,8 +139,9 @@ gbt_int2_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
int16 query = PG_GETARG_INT16(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
int16KEY *kkk = (int16KEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
@@ -160,8 +161,9 @@ gbt_int2_distance(PG_FUNCTION_ARGS)
{
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
int16 query = PG_GETARG_INT16(1);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
int16KEY *kkk = (int16KEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
diff --git a/contrib/btree_gist/btree_int4.c b/contrib/btree_gist/btree_int4.c
index 0bdb9e58c56..ea65d9506cc 100644
--- a/contrib/btree_gist/btree_int4.c
+++ b/contrib/btree_gist/btree_int4.c
@@ -137,8 +137,9 @@ gbt_int4_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
int32 query = PG_GETARG_INT32(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
int32KEY *kkk = (int32KEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
@@ -158,8 +159,9 @@ gbt_int4_distance(PG_FUNCTION_ARGS)
{
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
int32 query = PG_GETARG_INT32(1);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
int32KEY *kkk = (int32KEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
diff --git a/contrib/btree_gist/btree_int8.c b/contrib/btree_gist/btree_int8.c
index a9a7b569278..a675eef5712 100644
--- a/contrib/btree_gist/btree_int8.c
+++ b/contrib/btree_gist/btree_int8.c
@@ -139,8 +139,9 @@ gbt_int8_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
int64 query = PG_GETARG_INT64(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
int64KEY *kkk = (int64KEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
@@ -160,8 +161,9 @@ gbt_int8_distance(PG_FUNCTION_ARGS)
{
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
int64 query = PG_GETARG_INT64(1);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
int64KEY *kkk = (int64KEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
diff --git a/contrib/btree_gist/btree_interval.c
b/contrib/btree_gist/btree_interval.c
index 1fc27f60384..afda7e3816e 100644
--- a/contrib/btree_gist/btree_interval.c
+++ b/contrib/btree_gist/btree_interval.c
@@ -211,8 +211,9 @@ gbt_intv_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
Interval *query = PG_GETARG_INTERVAL_P(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
intvKEY *kkk = (intvKEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
@@ -233,8 +234,9 @@ gbt_intv_distance(PG_FUNCTION_ARGS)
{
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
Interval *query = PG_GETARG_INTERVAL_P(1);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
intvKEY *kkk = (intvKEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
diff --git a/contrib/btree_gist/btree_macaddr.c
b/contrib/btree_gist/btree_macaddr.c
index c444a709853..f40ca47c3e6 100644
--- a/contrib/btree_gist/btree_macaddr.c
+++ b/contrib/btree_gist/btree_macaddr.c
@@ -126,8 +126,9 @@ gbt_macad_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
macaddr *query = (macaddr *) PG_GETARG_POINTER(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
macKEY *kkk = (macKEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
diff --git a/contrib/btree_gist/btree_macaddr8.c
b/contrib/btree_gist/btree_macaddr8.c
index 6d9837d90a3..52f6a418f10 100644
--- a/contrib/btree_gist/btree_macaddr8.c
+++ b/contrib/btree_gist/btree_macaddr8.c
@@ -125,8 +125,9 @@ gbt_macad8_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
macaddr8 *query = (macaddr8 *) PG_GETARG_POINTER(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
mac8KEY *kkk = (mac8KEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
diff --git a/contrib/btree_gist/btree_numeric.c
b/contrib/btree_gist/btree_numeric.c
index 7ca097abb74..5a715bec24d 100644
--- a/contrib/btree_gist/btree_numeric.c
+++ b/contrib/btree_gist/btree_numeric.c
@@ -106,8 +106,9 @@ gbt_numeric_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
void *query = DatumGetNumeric(PG_GETARG_DATUM(1));
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
bool retval;
GBT_VARKEY *key = (GBT_VARKEY *) DatumGetPointer(entry->key);
diff --git a/contrib/btree_gist/btree_oid.c b/contrib/btree_gist/btree_oid.c
index b8f2f661076..9576dee33e0 100644
--- a/contrib/btree_gist/btree_oid.c
+++ b/contrib/btree_gist/btree_oid.c
@@ -139,8 +139,9 @@ gbt_oid_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
Oid query = PG_GETARG_OID(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
oidKEY *kkk = (oidKEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
@@ -160,8 +161,9 @@ gbt_oid_distance(PG_FUNCTION_ARGS)
{
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
Oid query = PG_GETARG_OID(1);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
oidKEY *kkk = (oidKEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
diff --git a/contrib/btree_gist/btree_text.c b/contrib/btree_gist/btree_text.c
index ddee42504a1..c2ee6e5d9f2 100644
--- a/contrib/btree_gist/btree_text.c
+++ b/contrib/btree_gist/btree_text.c
@@ -193,8 +193,9 @@ gbt_text_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
void *query = DatumGetTextP(PG_GETARG_DATUM(1));
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
bool retval;
GBT_VARKEY *key = (GBT_VARKEY *) DatumGetPointer(entry->key);
@@ -220,8 +221,9 @@ gbt_bpchar_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
void *query = DatumGetTextP(PG_GETARG_DATUM(1));
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
bool retval;
GBT_VARKEY *key = (GBT_VARKEY *) DatumGetPointer(entry->key);
diff --git a/contrib/btree_gist/btree_time.c b/contrib/btree_gist/btree_time.c
index e744f1be017..07b6019d642 100644
--- a/contrib/btree_gist/btree_time.c
+++ b/contrib/btree_gist/btree_time.c
@@ -194,8 +194,9 @@ gbt_time_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
TimeADT query = PG_GETARG_TIMEADT(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
timeKEY *kkk = (timeKEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
@@ -215,8 +216,9 @@ gbt_time_distance(PG_FUNCTION_ARGS)
{
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
TimeADT query = PG_GETARG_TIMEADT(1);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
timeKEY *kkk = (timeKEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
@@ -233,8 +235,9 @@ gbt_timetz_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
TimeTzADT *query = PG_GETARG_TIMETZADT_P(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
timeKEY *kkk = (timeKEY *) DatumGetPointer(entry->key);
TimeADT qqq;
diff --git a/contrib/btree_gist/btree_ts.c b/contrib/btree_gist/btree_ts.c
index 3b163a729cb..ad165d18c0b 100644
--- a/contrib/btree_gist/btree_ts.c
+++ b/contrib/btree_gist/btree_ts.c
@@ -244,8 +244,9 @@ gbt_ts_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
Timestamp query = PG_GETARG_TIMESTAMP(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
tsKEY *kkk = (tsKEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
@@ -265,8 +266,9 @@ gbt_ts_distance(PG_FUNCTION_ARGS)
{
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
Timestamp query = PG_GETARG_TIMESTAMP(1);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
tsKEY *kkk = (tsKEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
@@ -283,8 +285,9 @@ gbt_tstz_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
TimestampTz query = PG_GETARG_TIMESTAMPTZ(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
char *kkk = (char *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
@@ -306,8 +309,9 @@ gbt_tstz_distance(PG_FUNCTION_ARGS)
{
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
TimestampTz query = PG_GETARG_TIMESTAMPTZ(1);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
char *kkk = (char *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
Timestamp qqq;
diff --git a/contrib/btree_gist/btree_uuid.c b/contrib/btree_gist/btree_uuid.c
index 1091af222d1..8451158cc4d 100644
--- a/contrib/btree_gist/btree_uuid.c
+++ b/contrib/btree_gist/btree_uuid.c
@@ -136,8 +136,9 @@ gbt_uuid_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
pg_uuid_t *query = PG_GETARG_UUID_P(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
uuidKEY *kkk = (uuidKEY *) DatumGetPointer(entry->key);
GBT_NUMKEY_R key;
diff --git a/contrib/cube/cube.c b/contrib/cube/cube.c
index 3600457cbc0..1700a7dec11 100644
--- a/contrib/cube/cube.c
+++ b/contrib/cube/cube.c
@@ -397,8 +397,9 @@ g_cube_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
NDBOX *query = PG_GETARG_NDBOX_P(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
bool res;
diff --git a/contrib/hstore/hstore_gin.c b/contrib/hstore/hstore_gin.c
index 2e5fa115924..689e7de6dc8 100644
--- a/contrib/hstore/hstore_gin.c
+++ b/contrib/hstore/hstore_gin.c
@@ -152,11 +152,13 @@ gin_consistent_hstore(PG_FUNCTION_ARGS)
{
bool *check = (bool *) PG_GETARG_POINTER(0);
StrategyNumber strategy = PG_GETARG_UINT16(1);
-
- /* HStore *query = PG_GETARG_HSTORE_P(2); */
+#if 0
+ HStore *query = PG_GETARG_HSTORE_P(2);
+#endif
int32 nkeys = PG_GETARG_INT32(3);
-
- /* Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4); */
+#if 0
+ Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(5);
bool res = true;
int32 i;
diff --git a/contrib/hstore/hstore_gist.c b/contrib/hstore/hstore_gist.c
index 36825ef867b..53d1c81e0cc 100644
--- a/contrib/hstore/hstore_gist.c
+++ b/contrib/hstore/hstore_gist.c
@@ -510,8 +510,9 @@ ghstore_consistent(PG_FUNCTION_ARGS)
{
GISTTYPE *entry = (GISTTYPE *) DatumGetPointer(((GISTENTRY *)
PG_GETARG_POINTER(0))->key);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
int siglen = GET_SIGLEN();
bool res = true;
diff --git a/contrib/intarray/_int_gin.c b/contrib/intarray/_int_gin.c
index c60616c3f77..39addebd683 100644
--- a/contrib/intarray/_int_gin.c
+++ b/contrib/intarray/_int_gin.c
@@ -112,8 +112,9 @@ ginint4_consistent(PG_FUNCTION_ARGS)
bool *check = (bool *) PG_GETARG_POINTER(0);
StrategyNumber strategy = PG_GETARG_UINT16(1);
int32 nkeys = PG_GETARG_INT32(3);
-
- /* Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4); */
+#if 0
+ Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(5);
bool res = false;
int32 i;
diff --git a/contrib/intarray/_int_gist.c b/contrib/intarray/_int_gist.c
index 90cf11c01a5..48d9a5469ae 100644
--- a/contrib/intarray/_int_gist.c
+++ b/contrib/intarray/_int_gist.c
@@ -49,8 +49,9 @@ g_int_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
ArrayType *query = PG_GETARG_ARRAYTYPE_P_COPY(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
bool retval = false; /* silence compiler warning */
diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c
index 6d6ff7413f9..5dd0fe93042 100644
--- a/contrib/intarray/_intbig_gist.c
+++ b/contrib/intarray/_intbig_gist.c
@@ -465,8 +465,9 @@ g_intbig_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
ArrayType *query = PG_GETARG_ARRAYTYPE_P(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
int siglen = GET_SIGLEN();
bool retval;
diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c
index 6383b37e53f..a15172bf7fc 100644
--- a/contrib/ltree/_ltree_gist.c
+++ b/contrib/ltree/_ltree_gist.c
@@ -506,8 +506,9 @@ _ltree_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
void *query = PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
int siglen = LTREE_GET_ASIGLEN();
ltree_gist *key = (ltree_gist *) DatumGetPointer(entry->key);
diff --git a/contrib/ltree/ltree_gist.c b/contrib/ltree/ltree_gist.c
index bb7f4634722..170eeed348b 100644
--- a/contrib/ltree/ltree_gist.c
+++ b/contrib/ltree/ltree_gist.c
@@ -618,8 +618,9 @@ ltree_consistent(PG_FUNCTION_ARGS)
{
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
int siglen = LTREE_GET_SIGLEN();
ltree_gist *key = (ltree_gist *) DatumGetPointer(entry->key);
diff --git a/contrib/pg_trgm/trgm_gin.c b/contrib/pg_trgm/trgm_gin.c
index 66ff6adde99..538e89da4df 100644
--- a/contrib/pg_trgm/trgm_gin.c
+++ b/contrib/pg_trgm/trgm_gin.c
@@ -72,11 +72,13 @@ gin_extract_query_trgm(PG_FUNCTION_ARGS)
text *val = (text *) PG_GETARG_TEXT_PP(0);
int32 *nentries = (int32 *) PG_GETARG_POINTER(1);
StrategyNumber strategy = PG_GETARG_UINT16(2);
-
- /* bool **pmatch = (bool **) PG_GETARG_POINTER(3); */
+#if 0
+ bool **pmatch = (bool **) PG_GETARG_POINTER(3);
+#endif
Pointer **extra_data = (Pointer **) PG_GETARG_POINTER(4);
-
- /* bool **nullFlags = (bool **) PG_GETARG_POINTER(5); */
+#if 0
+ bool **nullFlags = (bool **) PG_GETARG_POINTER(5);
+#endif
int32 *searchMode = (int32 *) PG_GETARG_POINTER(6);
Datum *entries = NULL;
TRGM *trg;
@@ -171,8 +173,9 @@ gin_trgm_consistent(PG_FUNCTION_ARGS)
{
bool *check = (bool *) PG_GETARG_POINTER(0);
StrategyNumber strategy = PG_GETARG_UINT16(1);
-
- /* text *query = PG_GETARG_TEXT_PP(2); */
+#if 0
+ text *query = PG_GETARG_TEXT_PP(2);
+#endif
int32 nkeys = PG_GETARG_INT32(3);
Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4);
bool *recheck = (bool *) PG_GETARG_POINTER(5);
@@ -269,8 +272,9 @@ gin_trgm_triconsistent(PG_FUNCTION_ARGS)
{
GinTernaryValue *check = (GinTernaryValue *) PG_GETARG_POINTER(0);
StrategyNumber strategy = PG_GETARG_UINT16(1);
-
- /* text *query = PG_GETARG_TEXT_PP(2); */
+#if 0
+ text *query = PG_GETARG_TEXT_PP(2);
+#endif
int32 nkeys = PG_GETARG_INT32(3);
Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4);
GinTernaryValue res = GIN_MAYBE;
diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c
index 5c7deb103a6..f39391656e3 100644
--- a/contrib/pg_trgm/trgm_gist.c
+++ b/contrib/pg_trgm/trgm_gist.c
@@ -199,8 +199,9 @@ gtrgm_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
text *query = PG_GETARG_TEXT_P(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
int siglen = GET_SIGLEN();
TRGM *key = (TRGM *) DatumGetPointer(entry->key);
@@ -454,8 +455,9 @@ gtrgm_distance(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
text *query = PG_GETARG_TEXT_P(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
int siglen = GET_SIGLEN();
TRGM *key = (TRGM *) DatumGetPointer(entry->key);
diff --git a/contrib/seg/seg.c b/contrib/seg/seg.c
index 2d3a048c73e..0db1cc94328 100644
--- a/contrib/seg/seg.c
+++ b/contrib/seg/seg.c
@@ -202,8 +202,9 @@ gseg_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
Datum query = PG_GETARG_DATUM(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
/* All cases served by this function are exact */
diff --git a/doc/src/sgml/gist.sgml b/doc/src/sgml/gist.sgml
index 1871f742721..cdfae8e2ef5 100644
--- a/doc/src/sgml/gist.sgml
+++ b/doc/src/sgml/gist.sgml
@@ -343,7 +343,9 @@ <title>Extensibility</title>
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
data_type *query = PG_GETARG_DATA_TYPE_P(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3); /* unused */
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
data_type *key = DatumGetDataType(entry->key);
bool retval;
@@ -830,8 +832,10 @@ <title>Extensibility</title>
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
data_type *query = PG_GETARG_DATA_TYPE_P(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
- /* Oid subtype = PG_GETARG_OID(3); */
- /* bool *recheck = (bool *) PG_GETARG_POINTER(4); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3); /* unused */
+ bool *recheck = (bool *) PG_GETARG_POINTER(4); /* unused */
+#endif
data_type *key = DatumGetDataType(entry->key);
double retval;
diff --git a/src/backend/access/gin/ginarrayproc.c
b/src/backend/access/gin/ginarrayproc.c
index cb35d1f6b31..5005aa814b1 100644
--- a/src/backend/access/gin/ginarrayproc.c
+++ b/src/backend/access/gin/ginarrayproc.c
@@ -82,9 +82,10 @@ ginqueryarrayextract(PG_FUNCTION_ARGS)
ArrayType *array = PG_GETARG_ARRAYTYPE_P_COPY(0);
int32 *nkeys = (int32 *) PG_GETARG_POINTER(1);
StrategyNumber strategy = PG_GETARG_UINT16(2);
-
- /* bool **pmatch = (bool **) PG_GETARG_POINTER(3); */
- /* Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4); */
+#if 0
+ bool **pmatch = (bool **) PG_GETARG_POINTER(3);
+ Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4);
+#endif
bool **nullFlags = (bool **) PG_GETARG_POINTER(5);
int32 *searchMode = (int32 *) PG_GETARG_POINTER(6);
int16 elmlen;
@@ -143,14 +144,17 @@ ginarrayconsistent(PG_FUNCTION_ARGS)
{
bool *check = (bool *) PG_GETARG_POINTER(0);
StrategyNumber strategy = PG_GETARG_UINT16(1);
-
- /* ArrayType *query = PG_GETARG_ARRAYTYPE_P(2); */
+#if 0
+ ArrayType *query = PG_GETARG_ARRAYTYPE_P(2);
+#endif
int32 nkeys = PG_GETARG_INT32(3);
-
- /* Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4); */
+#if 0
+ Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(5);
-
- /* Datum *queryKeys = (Datum *) PG_GETARG_POINTER(6); */
+#if 0
+ Datum *queryKeys = (Datum *) PG_GETARG_POINTER(6);
+#endif
bool *nullFlags = (bool *) PG_GETARG_POINTER(7);
bool res;
int32 i;
@@ -227,12 +231,14 @@ ginarraytriconsistent(PG_FUNCTION_ARGS)
{
GinTernaryValue *check = (GinTernaryValue *) PG_GETARG_POINTER(0);
StrategyNumber strategy = PG_GETARG_UINT16(1);
-
- /* ArrayType *query = PG_GETARG_ARRAYTYPE_P(2); */
+#if 0
+ ArrayType *query = PG_GETARG_ARRAYTYPE_P(2);
+#endif
int32 nkeys = PG_GETARG_INT32(3);
-
- /* Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4); */
- /* Datum *queryKeys = (Datum *) PG_GETARG_POINTER(5); */
+#if 0
+ Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4);
+ Datum *queryKeys = (Datum *) PG_GETARG_POINTER(5);
+#endif
bool *nullFlags = (bool *) PG_GETARG_POINTER(6);
GinTernaryValue res;
int32 i;
diff --git a/src/backend/access/gist/gistproc.c
b/src/backend/access/gist/gistproc.c
index c66e35079a1..c942fde2a72 100644
--- a/src/backend/access/gist/gistproc.c
+++ b/src/backend/access/gist/gistproc.c
@@ -115,8 +115,9 @@ gist_box_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
BOX *query = PG_GETARG_BOX_P(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
/* All cases served by this function are exact */
@@ -1064,8 +1065,9 @@ gist_poly_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
POLYGON *query = PG_GETARG_POLYGON_P(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
bool result;
@@ -1132,8 +1134,9 @@ gist_circle_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
CIRCLE *query = PG_GETARG_CIRCLE_P(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
BOX bbox;
bool result;
@@ -1502,9 +1505,10 @@ gist_box_distance(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
Datum query = PG_GETARG_DATUM(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
- /* bool *recheck = (bool *) PG_GETARG_POINTER(4); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+ bool *recheck = (bool *) PG_GETARG_POINTER(4);
+#endif
float8 distance;
distance = gist_bbox_distance(entry, query, strategy);
@@ -1528,8 +1532,9 @@ gist_circle_distance(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
Datum query = PG_GETARG_DATUM(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
float8 distance;
@@ -1545,8 +1550,9 @@ gist_poly_distance(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
Datum query = PG_GETARG_DATUM(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
float8 distance;
diff --git a/src/backend/access/spgist/spgkdtreeproc.c
b/src/backend/access/spgist/spgkdtreeproc.c
index 1ec0a4f59f3..29b852c583e 100644
--- a/src/backend/access/spgist/spgkdtreeproc.c
+++ b/src/backend/access/spgist/spgkdtreeproc.c
@@ -27,7 +27,9 @@
Datum
spg_kd_config(PG_FUNCTION_ARGS)
{
- /* spgConfigIn *cfgin = (spgConfigIn *) PG_GETARG_POINTER(0); */
+#if 0
+ spgConfigIn *cfgin = (spgConfigIn *) PG_GETARG_POINTER(0);
+#endif
spgConfigOut *cfg = (spgConfigOut *) PG_GETARG_POINTER(1);
cfg->prefixType = FLOAT8OID;
diff --git a/src/backend/access/spgist/spgquadtreeproc.c
b/src/backend/access/spgist/spgquadtreeproc.c
index 1b907d9186b..138944d8dd1 100644
--- a/src/backend/access/spgist/spgquadtreeproc.c
+++ b/src/backend/access/spgist/spgquadtreeproc.c
@@ -26,7 +26,9 @@
Datum
spg_quad_config(PG_FUNCTION_ARGS)
{
- /* spgConfigIn *cfgin = (spgConfigIn *) PG_GETARG_POINTER(0); */
+#if 0
+ spgConfigIn *cfgin = (spgConfigIn *) PG_GETARG_POINTER(0);
+#endif
spgConfigOut *cfg = (spgConfigOut *) PG_GETARG_POINTER(1);
cfg->prefixType = POINTOID;
diff --git a/src/backend/access/spgist/spgtextproc.c
b/src/backend/access/spgist/spgtextproc.c
index 2191f57b17b..c61923c36d0 100644
--- a/src/backend/access/spgist/spgtextproc.c
+++ b/src/backend/access/spgist/spgtextproc.c
@@ -95,7 +95,9 @@ typedef struct spgNodePtr
Datum
spg_text_config(PG_FUNCTION_ARGS)
{
- /* spgConfigIn *cfgin = (spgConfigIn *) PG_GETARG_POINTER(0); */
+#if 0
+ spgConfigIn *cfgin = (spgConfigIn *) PG_GETARG_POINTER(0);
+#endif
spgConfigOut *cfg = (spgConfigOut *) PG_GETARG_POINTER(1);
cfg->prefixType = TEXTOID;
diff --git a/src/backend/utils/adt/datum.c b/src/backend/utils/adt/datum.c
index e2472cd1444..9b151281060 100644
--- a/src/backend/utils/adt/datum.c
+++ b/src/backend/utils/adt/datum.c
@@ -396,7 +396,9 @@ datum_image_hash(Datum value, bool typByVal, int typLen)
Datum
btequalimage(PG_FUNCTION_ARGS)
{
- /* Oid opcintype = PG_GETARG_OID(0); */
+#if 0
+ Oid opcintype = PG_GETARG_OID(0);
+#endif
PG_RETURN_BOOL(true);
}
diff --git a/src/backend/utils/adt/jsonb_gin.c
b/src/backend/utils/adt/jsonb_gin.c
index 715a9ad0a95..fb5c45df735 100644
--- a/src/backend/utils/adt/jsonb_gin.c
+++ b/src/backend/utils/adt/jsonb_gin.c
@@ -931,8 +931,9 @@ gin_consistent_jsonb(PG_FUNCTION_ARGS)
{
bool *check = (bool *) PG_GETARG_POINTER(0);
StrategyNumber strategy = PG_GETARG_UINT16(1);
-
- /* Jsonb *query = PG_GETARG_JSONB_P(2); */
+#if 0
+ Jsonb *query = PG_GETARG_JSONB_P(2);
+#endif
int32 nkeys = PG_GETARG_INT32(3);
Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4);
@@ -1014,8 +1015,9 @@ gin_triconsistent_jsonb(PG_FUNCTION_ARGS)
{
GinTernaryValue *check = (GinTernaryValue *) PG_GETARG_POINTER(0);
StrategyNumber strategy = PG_GETARG_UINT16(1);
-
- /* Jsonb *query = PG_GETARG_JSONB_P(2); */
+#if 0
+ Jsonb *query = PG_GETARG_JSONB_P(2);
+#endif
int32 nkeys = PG_GETARG_INT32(3);
Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4);
GinTernaryValue res = GIN_MAYBE;
@@ -1220,8 +1222,9 @@ gin_consistent_jsonb_path(PG_FUNCTION_ARGS)
{
bool *check = (bool *) PG_GETARG_POINTER(0);
StrategyNumber strategy = PG_GETARG_UINT16(1);
-
- /* Jsonb *query = PG_GETARG_JSONB_P(2); */
+#if 0
+ Jsonb *query = PG_GETARG_JSONB_P(2);
+#endif
int32 nkeys = PG_GETARG_INT32(3);
Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4);
bool *recheck = (bool *) PG_GETARG_POINTER(5);
@@ -1271,8 +1274,9 @@ gin_triconsistent_jsonb_path(PG_FUNCTION_ARGS)
{
GinTernaryValue *check = (GinTernaryValue *) PG_GETARG_POINTER(0);
StrategyNumber strategy = PG_GETARG_UINT16(1);
-
- /* Jsonb *query = PG_GETARG_JSONB_P(2); */
+#if 0
+ Jsonb *query = PG_GETARG_JSONB_P(2);
+#endif
int32 nkeys = PG_GETARG_INT32(3);
Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4);
GinTernaryValue res = GIN_MAYBE;
diff --git a/src/backend/utils/adt/network_gist.c
b/src/backend/utils/adt/network_gist.c
index 2eec20b75e9..683e813ed6b 100644
--- a/src/backend/utils/adt/network_gist.c
+++ b/src/backend/utils/adt/network_gist.c
@@ -117,8 +117,9 @@ inet_gist_consistent(PG_FUNCTION_ARGS)
GISTENTRY *ent = (GISTENTRY *) PG_GETARG_POINTER(0);
inet *query = PG_GETARG_INET_PP(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
GistInetKey *key = DatumGetInetKeyP(ent->key);
int minbits,
diff --git a/src/backend/utils/adt/network_spgist.c
b/src/backend/utils/adt/network_spgist.c
index 47e16d78731..926feb52a6b 100644
--- a/src/backend/utils/adt/network_spgist.c
+++ b/src/backend/utils/adt/network_spgist.c
@@ -50,7 +50,9 @@ static int inet_spg_consistent_bitmap(const inet *prefix,
int nkeys,
Datum
inet_spg_config(PG_FUNCTION_ARGS)
{
- /* spgConfigIn *cfgin = (spgConfigIn *) PG_GETARG_POINTER(0); */
+#if 0
+ spgConfigIn *cfgin = (spgConfigIn *) PG_GETARG_POINTER(0);
+#endif
spgConfigOut *cfg = (spgConfigOut *) PG_GETARG_POINTER(1);
cfg->prefixType = CIDROID;
diff --git a/src/backend/utils/adt/rangetypes_spgist.c
b/src/backend/utils/adt/rangetypes_spgist.c
index b25b468b83d..d958a0d2fe0 100644
--- a/src/backend/utils/adt/rangetypes_spgist.c
+++ b/src/backend/utils/adt/rangetypes_spgist.c
@@ -59,7 +59,9 @@ static int adjacent_cmp_bounds(TypeCacheEntry *typcache,
const RangeBound *arg,
Datum
spg_range_quad_config(PG_FUNCTION_ARGS)
{
- /* spgConfigIn *cfgin = (spgConfigIn *) PG_GETARG_POINTER(0); */
+#if 0
+ spgConfigIn *cfgin = (spgConfigIn *) PG_GETARG_POINTER(0);
+#endif
spgConfigOut *cfg = (spgConfigOut *) PG_GETARG_POINTER(1);
cfg->prefixType = ANYRANGEOID;
diff --git a/src/backend/utils/adt/tsginidx.c b/src/backend/utils/adt/tsginidx.c
index 3e4c964e8ea..031a8a290a5 100644
--- a/src/backend/utils/adt/tsginidx.c
+++ b/src/backend/utils/adt/tsginidx.c
@@ -95,12 +95,14 @@ gin_extract_tsquery(PG_FUNCTION_ARGS)
{
TSQuery query = PG_GETARG_TSQUERY(0);
int32 *nentries = (int32 *) PG_GETARG_POINTER(1);
-
- /* StrategyNumber strategy = PG_GETARG_UINT16(2); */
+#if 0
+ StrategyNumber strategy = PG_GETARG_UINT16(2);
+#endif
bool **ptr_partialmatch = (bool **) PG_GETARG_POINTER(3);
Pointer **extra_data = (Pointer **) PG_GETARG_POINTER(4);
-
- /* bool **nullFlags = (bool **) PG_GETARG_POINTER(5); */
+#if 0
+ bool **nullFlags = (bool **) PG_GETARG_POINTER(5);
+#endif
int32 *searchMode = (int32 *) PG_GETARG_POINTER(6);
Datum *entries = NULL;
@@ -214,11 +216,13 @@ Datum
gin_tsquery_consistent(PG_FUNCTION_ARGS)
{
bool *check = (bool *) PG_GETARG_POINTER(0);
-
- /* StrategyNumber strategy = PG_GETARG_UINT16(1); */
+#if 0
+ StrategyNumber strategy = PG_GETARG_UINT16(1);
+#endif
TSQuery query = PG_GETARG_TSQUERY(2);
-
- /* int32 nkeys = PG_GETARG_INT32(3); */
+#if 0
+ int32 nkeys = PG_GETARG_INT32(3);
+#endif
Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4);
bool *recheck = (bool *) PG_GETARG_POINTER(5);
bool res = false;
@@ -263,11 +267,13 @@ Datum
gin_tsquery_triconsistent(PG_FUNCTION_ARGS)
{
GinTernaryValue *check = (GinTernaryValue *) PG_GETARG_POINTER(0);
-
- /* StrategyNumber strategy = PG_GETARG_UINT16(1); */
+#if 0
+ StrategyNumber strategy = PG_GETARG_UINT16(1);
+#endif
TSQuery query = PG_GETARG_TSQUERY(2);
-
- /* int32 nkeys = PG_GETARG_INT32(3); */
+#if 0
+ int32 nkeys = PG_GETARG_INT32(3);
+#endif
Pointer *extra_data = (Pointer *) PG_GETARG_POINTER(4);
GinTernaryValue res = GIN_FALSE;
diff --git a/src/backend/utils/adt/tsgistidx.c
b/src/backend/utils/adt/tsgistidx.c
index f90b93fb9e5..af97226cc9e 100644
--- a/src/backend/utils/adt/tsgistidx.c
+++ b/src/backend/utils/adt/tsgistidx.c
@@ -326,9 +326,10 @@ gtsvector_consistent(PG_FUNCTION_ARGS)
{
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
TSQuery query = PG_GETARG_TSQUERY(1);
-
- /* StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2); */
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
SignTSVector *key = (SignTSVector *) DatumGetPointer(entry->key);
diff --git a/src/backend/utils/adt/tsquery_gist.c
b/src/backend/utils/adt/tsquery_gist.c
index b54c4910394..dba93ff8fd9 100644
--- a/src/backend/utils/adt/tsquery_gist.c
+++ b/src/backend/utils/adt/tsquery_gist.c
@@ -55,8 +55,9 @@ gtsquery_consistent(PG_FUNCTION_ARGS)
GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
TSQuery query = PG_GETARG_TSQUERY(1);
StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-
- /* Oid subtype = PG_GETARG_OID(3); */
+#if 0
+ Oid subtype = PG_GETARG_OID(3);
+#endif
bool *recheck = (bool *) PG_GETARG_POINTER(4);
TSQuerySign key = DatumGetTSQuerySign(entry->key);
TSQuerySign sq = makeTSQuerySign(query);
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index c80191f0a22..a1f29a9a0c6 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -2267,7 +2267,9 @@ varstr_abbrev_abort(int memtupcount, SortSupport ssup)
Datum
btvarstrequalimage(PG_FUNCTION_ARGS)
{
- /* Oid opcintype = PG_GETARG_OID(0); */
+#if 0
+ Oid opcintype = PG_GETARG_OID(0);
+#endif
Oid collid = PG_GET_COLLATION();
pg_locale_t locale;
diff --git a/src/test/modules/spgist_name_ops/spgist_name_ops.c
b/src/test/modules/spgist_name_ops/spgist_name_ops.c
index 1634053f85c..661e239d280 100644
--- a/src/test/modules/spgist_name_ops/spgist_name_ops.c
+++ b/src/test/modules/spgist_name_ops/spgist_name_ops.c
@@ -33,7 +33,9 @@ PG_FUNCTION_INFO_V1(spgist_name_config);
Datum
spgist_name_config(PG_FUNCTION_ARGS)
{
- /* spgConfigIn *cfgin = (spgConfigIn *) PG_GETARG_POINTER(0); */
+#if 0
+ spgConfigIn *cfgin = (spgConfigIn *) PG_GETARG_POINTER(0);
+#endif
spgConfigOut *cfg = (spgConfigOut *) PG_GETARG_POINTER(1);
cfg->prefixType = TEXTOID;
--
2.52.0
