pg_query 4.2.1 → 6.1.0

data/ext/pg_query/src_backend_parser_scansup.c

@@ -12,7 +12,7 @@
  * scansup.c
  *	  scanner support routines used by the core lexer
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -130,6 +130,7 @@ scanner_isspace(char ch)
 		ch == '\t' ||
 		ch == '\n' ||
 		ch == '\r' ||
+		ch == '\v' ||
 		ch == '\f')
 		return true;
 	return false;

data/ext/pg_query/src_backend_storage_ipc_ipc.c

@@ -15,7 +15,7 @@
  * exit-time cleanup for either a postmaster or a backend.
  *
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *

data/ext/pg_query/src_backend_tcop_postgres.c

@@ -1,12 +1,12 @@
 /*--------------------------------------------------------------------
  * Symbols referenced in this file:
  * - debug_query_string
- * - whereToSendOutput
- * - ProcessInterrupts
- * - check_stack_depth
  * - stack_is_too_deep
  * - stack_base_ptr
  * - max_stack_depth_bytes
+ * - whereToSendOutput
+ * - ProcessInterrupts
+ * - check_stack_depth
  * - max_stack_depth
  *--------------------------------------------------------------------
  */
@@ -16,7 +16,7 @@
  * postgres.c
  *	  POSTGRES C Backend Interface
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -36,17 +36,12 @@
 #include <limits.h>
 #include <signal.h>
 #include <unistd.h>
+#include <sys/resource.h>
 #include <sys/socket.h>
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-#ifdef HAVE_SYS_RESOURCE_H
 #include <sys/time.h>
-#include <sys/resource.h>
-#endif
 
-#ifndef HAVE_GETRUSAGE
-#include "rusagestub.h"
+#ifdef USE_VALGRIND
+#include <valgrind/valgrind.h>
 #endif
 
 #include "access/parallel.h"
@@ -54,6 +49,7 @@
 #include "access/xact.h"
 #include "catalog/pg_type.h"
 #include "commands/async.h"
+#include "commands/event_trigger.h"
 #include "commands/prepare.h"
 #include "common/pg_prng.h"
 #include "jit/jit.h"
@@ -88,12 +84,15 @@
 #include "tcop/pquery.h"
 #include "tcop/tcopprot.h"
 #include "tcop/utility.h"
+#include "utils/guc_hooks.h"
+#include "utils/injection_point.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/ps_status.h"
 #include "utils/snapmgr.h"
 #include "utils/timeout.h"
 #include "utils/timestamp.h"
+#include "utils/varlena.h"
 
 /* ----------------
  *		global variables
@@ -121,6 +120,9 @@ __thread int			max_stack_depth = 100;
 /* Time between checks that the client is still connected. */
 
 
+/* flags for non-system relation kinds to restrict use */
+
+
 /* ----------------
  *		private typedefs etc
  * ----------------
@@ -150,13 +152,6 @@ static __thread long max_stack_depth_bytes = 100 * 1024L;
 static __thread char *stack_base_ptr = NULL;
 
 
-/*
- * On IA64 we also have to remember the register stack base.
- */
-#if defined(__ia64__) || defined(__ia64)
-static char *register_stack_base_ptr = NULL;
-#endif
-
 /*
  * Flag to keep track of whether we have started a transaction.
  * For extended query protocol this has to be remembered across messages.
@@ -193,7 +188,6 @@ static char *register_stack_base_ptr = NULL;
 
 
 
-
 /* reused buffer to pass to SendRowDescriptionMessage() */
 
 
@@ -211,7 +205,6 @@ static bool check_log_statement(List *stmt_list);
 static int	errdetail_execute(List *raw_parsetree_list);
 static int	errdetail_params(ParamListInfo params);
 static int	errdetail_abort(void);
-static int	errdetail_recovery_conflict(void);
 static void bind_param_error_callback(void *arg);
 static void start_xact_command(void);
 static void finish_xact_command(void);
@@ -224,6 +217,36 @@ static void enable_statement_timeout(void);
 static void disable_statement_timeout(void);
 
 
+/* ----------------------------------------------------------------
+ *		infrastructure for valgrind debugging
+ * ----------------------------------------------------------------
+ */
+#ifdef USE_VALGRIND
+/* This variable should be set at the top of the main loop. */
+static unsigned int old_valgrind_error_count;
+
+/*
+ * If Valgrind detected any errors since old_valgrind_error_count was updated,
+ * report the current query as the cause.  This should be called at the end
+ * of message processing.
+ */
+static void
+valgrind_report_error_query(const char *query)
+{
+	unsigned int valgrind_error_count = VALGRIND_COUNT_ERRORS;
+
+	if (unlikely(valgrind_error_count != old_valgrind_error_count) &&
+		query != NULL)
+		VALGRIND_PRINTF("Valgrind detected %u error(s) during execution of \"%s\"\n",
+						valgrind_error_count - old_valgrind_error_count,
+						query);
+}
+
+#else							/* !USE_VALGRIND */
+#define valgrind_report_error_query(query) ((void) 0)
+#endif							/* USE_VALGRIND */
+
+
 /* ----------------------------------------------------------------
  *		routines to obtain user input
  * ----------------------------------------------------------------
@@ -305,6 +328,8 @@ static void disable_statement_timeout(void);
  */
 #ifdef COPY_PARSE_PLAN_TREES
 #endif
+#ifdef WRITE_READ_PARSE_PLAN_TREES
+#endif
 
 /*
  * Given a raw parsetree (gram.y output), and optionally information about
@@ -535,10 +560,18 @@ static void disable_statement_timeout(void);
 
 
 /*
- * RecoveryConflictInterrupt: out-of-line portion of recovery conflict
- * handling following receipt of SIGUSR1. Designed to be similar to die()
- * and StatementCancelHandler(). Called only by a normal user backend
- * that begins a transaction during recovery.
+ * Tell the next CHECK_FOR_INTERRUPTS() to check for a particular type of
+ * recovery conflict.  Runs in a SIGUSR1 handler.
+ */
+
+
+/*
+ * Check one individual conflict reason.
+ */
+
+
+/*
+ * Check each possible recovery conflict reason.
  */
 
 
@@ -558,45 +591,6 @@ static void disable_statement_timeout(void);
 void ProcessInterrupts(void) {}
 
 
-
-/*
- * IA64-specific code to fetch the AR.BSP register for stack depth checks.
- *
- * We currently support gcc, icc, and HP-UX's native compiler here.
- *
- * Note: while icc accepts gcc asm blocks on x86[_64], this is not true on
- * ia64 (at least not in icc versions before 12.x).  So we have to carry a
- * separate implementation for it.
- */
-#if defined(__ia64__) || defined(__ia64)
-
-#if defined(__hpux) && !defined(__GNUC__) && !defined(__INTEL_COMPILER)
-/* Assume it's HP-UX native compiler */
-#include <ia64/sys/inline.h>
-#define ia64_get_bsp() ((char *) (_Asm_mov_from_ar(_AREG_BSP, _NO_FENCE)))
-#elif defined(__INTEL_COMPILER)
-/* icc */
-#include <asm/ia64regs.h>
-#define ia64_get_bsp() ((char *) __getReg(_IA64_REG_AR_BSP))
-#else
-/* gcc */
-static __inline__ char *
-ia64_get_bsp(void)
-{
-	char	   *ret;
-
-	/* the ;; is a "stop", seems to be required before fetching BSP */
-	__asm__ __volatile__(
-						 ";;\n"
-						 "	mov	%0=ar.bsp	\n"
-:						 "=r"(ret));
-
-	return ret;
-}
-#endif
-#endif							/* IA64 */
-
-
 /*
  * set_stack_base: set up reference point for stack depth checking
  *
@@ -604,14 +598,9 @@ ia64_get_bsp(void)
  */
 #ifndef HAVE__BUILTIN_FRAME_ADDRESS
 #endif
-#if defined(__ia64__) || defined(__ia64)
-#else
-#endif
 #ifdef HAVE__BUILTIN_FRAME_ADDRESS
 #else
 #endif
-#if defined(__ia64__) || defined(__ia64)
-#endif
 
 /*
  * restore_stack_base: restore reference point for stack depth checking
@@ -622,9 +611,7 @@ ia64_get_bsp(void)
  * the main thread's stack, so it sets the base pointer before the call, and
  * restores it afterwards.
  */
-#if defined(__ia64__) || defined(__ia64)
-#else
-#endif
+
 
 /*
  * check_stack_depth/stack_is_too_deep: check for excessively deep recursion
@@ -680,22 +667,6 @@ stack_is_too_deep(void)
 		stack_base_ptr != NULL)
 		return true;
 
-	/*
-	 * On IA64 there is a separate "register" stack that requires its own
-	 * independent check.  For this, we have to measure the change in the
-	 * "BSP" pointer from PostgresMain to here.  Logic is just as above,
-	 * except that we know IA64's register stack grows up.
-	 *
-	 * Note we assume that the same max_stack_depth applies to both stacks.
-	 */
-#if defined(__ia64__) || defined(__ia64)
-	stack_depth = (long) (ia64_get_bsp() - register_stack_base_ptr);
-
-	if (stack_depth > max_stack_depth_bytes &&
-		register_stack_base_ptr != NULL)
-		return true;
-#endif							/* IA64 */
-
 	return false;
 }
 
@@ -705,6 +676,40 @@ stack_is_too_deep(void)
 /* GUC assign hook for max_stack_depth */
 
 
+/*
+ * GUC check_hook for client_connection_check_interval
+ */
+
+
+/*
+ * GUC check_hook for log_parser_stats, log_planner_stats, log_executor_stats
+ *
+ * This function and check_log_stats interact to prevent their variables from
+ * being set in a disallowed combination.  This is a hack that doesn't really
+ * work right; for example it might fail while applying pg_db_role_setting
+ * values even though the final state would have been acceptable.  However,
+ * since these variables are legacy settings with little production usage,
+ * we tolerate that.
+ */
+
+
+/*
+ * GUC check_hook for log_statement_stats
+ */
+
+
+/* GUC assign hook for transaction_timeout */
+
+
+/*
+ * GUC check_hook for restrict_nonsystem_relation_kind
+ */
+
+
+/*
+ * GUC assign_hook for restrict_nonsystem_relation_kind
+ */
+
 
 /*
  * set_debug_options --- apply "-d N" command line option
@@ -769,7 +774,8 @@ stack_is_too_deep(void)
  * if reasonably possible.
  * ----------------------------------------------------------------
  */
-
+#ifdef USE_VALGRIND
+#endif
 
 /*
  * Throw an error if we're a WAL sender process.
@@ -786,11 +792,8 @@ stack_is_too_deep(void)
  *
  * Return -1 if unknown
  */
-#if defined(HAVE_GETRLIMIT) && defined(RLIMIT_STACK)
-#else							/* no getrlimit */
-#if defined(WIN32) || defined(__CYGWIN__)
-#else							/* not windows ... give up */
-#endif
+#if defined(HAVE_GETRLIMIT)
+#else
 #endif
 
 
@@ -799,11 +802,11 @@ stack_is_too_deep(void)
 
 
 
-#if defined(HAVE_GETRUSAGE)
+#ifndef WIN32
 #if defined(__darwin__)
 #else
 #endif
-#endif							/* HAVE_GETRUSAGE */
+#endif							/* !WIN32 */
 
 /*
  * on_proc_exit handler to log end of session

data/ext/pg_query/src_backend_utils_activity_pgstat_database.c

@@ -14,7 +14,7 @@
  * storage implementation and the details about individual types of
  * statistics.
  *
- * Copyright (c) 2001-2022, PostgreSQL Global Development Group
+ * Copyright (c) 2001-2024, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/utils/activity/pgstat_database.c
@@ -23,9 +23,9 @@
 
 #include "postgres.h"
 
+#include "storage/procsignal.h"
 #include "utils/pgstat_internal.h"
 #include "utils/timestamp.h"
-#include "storage/procsignal.h"
 
 
 static bool pgstat_should_report_connstat(void);

data/ext/pg_query/src_backend_utils_adt_datum.c

@@ -11,7 +11,7 @@
  * datum.c
  *	  POSTGRES Datum (abstract data type) manipulation routines.
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -53,9 +53,9 @@
 #include "access/detoast.h"
 #include "common/hashfn.h"
 #include "fmgr.h"
-#include "utils/builtins.h"
 #include "utils/datum.h"
 #include "utils/expandeddatum.h"
+#include "utils/fmgrprotos.h"
 
 
 /*-------------------------------------------------------------------------

data/ext/pg_query/src_backend_utils_adt_expandeddatum.c

@@ -11,7 +11,7 @@
  * expandeddatum.c
  *	  Support functions for "expanded" value representations.
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *

data/ext/pg_query/src_backend_utils_adt_format_type.c

@@ -10,7 +10,7 @@
  *	  Display type names "nicely".
  *
  *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2024, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION