pg_query 2.2.0 → 4.2.1

data/ext/pg_query/src_pl_plpgsql_src_pl_handler.c

@@ -10,7 +10,7 @@
  * pl_handler.c		- Handler for the PL/pgSQL
  *			  procedural language
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *

data/ext/pg_query/src_pl_plpgsql_src_pl_reserved_kwlist_d.h

@@ -12,7 +12,7 @@
  * pl_reserved_kwlist_d.h
  *    List of keywords represented as a ScanKeywordList.
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
@@ -89,13 +89,13 @@ static int
 ReservedPLKeywords_hash_func(const void *key, size_t keylen)
 {
 	static const int8 h[49] = {
-		    -2,    127,      7,    127,      0,    127,    127,    127,
-		    18,      5,    127,     27,    127,      0,    127,    127,
-		     0,     39,     32,     22,     10,    127,     19,    -26,
-		   127,    -11,      0,     12,    127,    127,     -1,     28,
-		    20,      0,     23,    127,      0,     14,     -8,    127,
-		   127,    127,     13,      5,    127,    -23,      1,      0,
-		   127,
+		127,   7,     127,   127,   -2,    127,   13,    127,
+		127,   5,     0,     23,    0,     2,     127,   0,
+		17,    0,     127,   19,    5,     127,   6,     2,
+		-3,    17,    0,     6,     127,   8,     18,    127,
+		-6,    3,     -5,    0,     127,   0,     0,     11,
+		15,    127,   127,   127,   13,    127,   0,     17,
+		127
 	};
 
 	const unsigned char *k = (const unsigned char *) key;
@@ -106,8 +106,8 @@ ReservedPLKeywords_hash_func(const void *key, size_t keylen)
 	{
 		unsigned char c = *k++ | 0x20;
 
-		a = a * 31 + c;
-		b = b * 127 + c;
+		a = a * 257 + c;
+		b = b * 8191 + c;
 	}
 	return h[a % 49] + h[b % 49];
 }

data/ext/pg_query/src_pl_plpgsql_src_pl_scanner.c

@@ -23,8 +23,8 @@
  * - plpgsql_scanner_errposition
  * - plpgsql_yyerror
  * - plpgsql_push_back_token
- * - plpgsql_token_is_unreserved_keyword
  * - plpgsql_peek
+ * - plpgsql_token_is_unreserved_keyword
  * - plpgsql_append_source_text
  * - plpgsql_peek2
  * - plpgsql_scanner_finish
@@ -38,7 +38,7 @@
  *	  lexical scanning for PL/pgSQL
  *
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *

data/ext/pg_query/src_pl_plpgsql_src_pl_unreserved_kwlist_d.h

@@ -12,7 +12,7 @@
  * pl_unreserved_kwlist_d.h
  *    List of keywords represented as a ScanKeywordList.
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
@@ -74,6 +74,7 @@ static const char UnreservedPLKeywords_kw_string[] =
 	"is\0"
 	"last\0"
 	"log\0"
+	"merge\0"
 	"message\0"
 	"message_text\0"
 	"move\0"
@@ -93,7 +94,6 @@ static const char UnreservedPLKeywords_kw_string[] =
 	"query\0"
 	"raise\0"
 	"relative\0"
-	"reset\0"
 	"return\0"
 	"returned_sqlstate\0"
 	"reverse\0"
@@ -103,7 +103,6 @@ static const char UnreservedPLKeywords_kw_string[] =
 	"schema\0"
 	"schema_name\0"
 	"scroll\0"
-	"set\0"
 	"slice\0"
 	"sqlstate\0"
 	"stacked\0"
@@ -160,25 +159,25 @@ static const uint16 UnreservedPLKeywords_kw_offsets[] = {
 	295,
 	300,
 	304,
-	312,
-	325,
-	330,
-	335,
-	338,
-	345,
-	350,
-	357,
-	365,
-	376,
-	393,
-	414,
-	434,
-	452,
-	472,
+	310,
+	318,
+	331,
+	336,
+	341,
+	344,
+	351,
+	356,
+	363,
+	371,
+	382,
+	399,
+	420,
+	440,
+	458,
 	478,
 	484,
 	490,
-	499,
+	496,
 	505,
 	512,
 	530,
@@ -189,59 +188,58 @@ static const uint16 UnreservedPLKeywords_kw_offsets[] = {
 	572,
 	584,
 	591,
-	595,
-	601,
-	610,
-	618,
-	624,
-	635,
-	640,
-	651,
-	664,
-	682,
+	597,
+	606,
+	614,
+	620,
+	631,
+	636,
+	647,
+	660,
+	678,
 };
 
-#define UNRESERVEDPLKEYWORDS_NUM_KEYWORDS 83
+#define UNRESERVEDPLKEYWORDS_NUM_KEYWORDS 82
 
 static int
 UnreservedPLKeywords_hash_func(const void *key, size_t keylen)
 {
-	static const int16 h[167] = {
-		    10,  32767,  32767,     57,  32767,     62,     21,  32767,
-		    54,     18,  32767,     58,     59,    -54,     47,      0,
-		   -22,    -64,  32767,    -22,     33,     44,     -5,  32767,
-		 32767,     43,     57,    102,  32767,    -65,      7,  32767,
-		    13,  32767,    -28,     14,  32767,  32767,     82,  32767,
-		     0,      0,  32767,      8,    -43,      0,     19,      8,
-		    75,    -58,  32767,  32767,      0,     22,     29,  32767,
-		   -50,      6,  32767,      0,     30,  32767,  32767,     29,
-		     0,    104,  32767,  32767,     26,      0,  32767,  32767,
-		    -9,      2,  32767,     50,     39,     38,     39,     80,
-		 32767,  32767,  32767,  32767,    -67,     89,  32767,    -40,
-		    64,  32767,  32767,     26,     10,     27,  32767,     19,
-		    51,    -13,     26,  32767,  32767,  32767,     84,     23,
-		     0,     66,     12,     -5,  32767,  32767,      0,     50,
-		   141,     72,     45,  32767,  32767,      0,    -22,      0,
-		 32767,  32767,    -34,      0,     19,     -5,  32767,  32767,
-		 32767,      0,     37,     13,  32767,  32767,  32767,  32767,
-		   -68,     -4,  32767,  32767,     78,  32767,  32767,      0,
-		    85,  32767,  32767,  32767,    -93,  32767,      0,      0,
-		 32767,     74,      5,  32767,  32767,     71,      0,  32767,
-		 32767,      0,  32767,  32767,  32767,     46,     70,
+	static const int16 h[165] = {
+		58,    0,     26,    32767, 0,     0,     9,     32767,
+		0,     32767, 37,    74,    32767, -7,    32767, 39,
+		58,    -5,    32767, 31,    32767, 32767, 75,    -23,
+		32767, 0,     32767, 32767, 32767, -14,   32767, 81,
+		32767, 32767, 32767, -36,   -9,    32767, 32767, 32767,
+		40,    32767, 54,    10,    11,    43,    32767, 0,
+		52,    105,   -22,   15,    32767, -33,   49,    -65,
+		48,    32767, 32767, 32767, 25,    49,    -47,   37,
+		21,    32767, 32767, -15,   70,    32767, 32767, 64,
+		-10,   126,   32767, 51,    0,     36,    32767, -55,
+		-22,   32767, 32767, 32767, 32767, 32767, -26,   -35,
+		32767, 61,    32767, 32767, 32767, -23,   98,    48,
+		23,    19,    32767, 7,     35,    5,     -18,   71,
+		28,    5,     32767, 32767, 32767, 74,    32767, 82,
+		32767, 0,     32767, 32767, 66,    0,     0,     50,
+		32767, 32767, 5,     2,     0,     32767, 55,    32767,
+		32767, 45,    79,    32767, 32767, 73,    22,    0,
+		103,   32767, -20,   72,    32767, 0,     29,    32767,
+		0,     32767, 32767, 0,     50,    28,    32767, -40,
+		32767, 32767, 34,    56,    32767, 32767, 32767, 17,
+		-36,   32767, 67,    32767, 0
 	};
 
 	const unsigned char *k = (const unsigned char *) key;
 	uint32		a = 0;
-	uint32		b = 1;
+	uint32		b = 0;
 
 	while (keylen--)
 	{
 		unsigned char c = *k++ | 0x20;
 
-		a = a * 31 + c;
-		b = b * 127 + c;
+		a = a * 257 + c;
+		b = b * 8191 + c;
 	}
-	return h[a % 167] + h[b % 167];
+	return h[a % 165] + h[b % 165];
 }
 
 static const ScanKeywordList UnreservedPLKeywords = {

data/ext/pg_query/src_port_pg_bitutils.c

@@ -10,7 +10,7 @@
  * pg_bitutils.c
  *	  Miscellaneous functions for bit-wise operations.
  *
- * Copyright (c) 2019-2020, PostgreSQL Global Development Group
+ * Copyright (c) 2019-2022, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/port/pg_bitutils.c
@@ -59,37 +59,21 @@
  */
 
 
-/*
- * On x86_64, we can use the hardware popcount instruction, but only if
- * we can verify that the CPU supports it via the cpuid instruction.
- *
- * Otherwise, we fall back to __builtin_popcount if the compiler has that,
- * or a hand-rolled implementation if not.
- */
-#ifdef HAVE_X86_64_POPCNTQ
-#if defined(HAVE__GET_CPUID) || defined(HAVE__CPUID)
-#define USE_POPCNT_ASM 1
-#endif
-#endif
-
 static int	pg_popcount32_slow(uint32 word);
 static int	pg_popcount64_slow(uint64 word);
 
-#ifdef USE_POPCNT_ASM
+#ifdef TRY_POPCNT_FAST
 static bool pg_popcount_available(void);
 static int	pg_popcount32_choose(uint32 word);
 static int	pg_popcount64_choose(uint64 word);
-static int	pg_popcount32_asm(uint32 word);
-static int	pg_popcount64_asm(uint64 word);
+static int	pg_popcount32_fast(uint32 word);
+static int	pg_popcount64_fast(uint64 word);
 
 int			(*pg_popcount32) (uint32 word) = pg_popcount32_choose;
 int			(*pg_popcount64) (uint64 word) = pg_popcount64_choose;
-#else
-
-int			(*pg_popcount64) (uint64 word) = pg_popcount64_slow;
-#endif							/* USE_POPCNT_ASM */
+#endif							/* TRY_POPCNT_FAST */
 
-#ifdef USE_POPCNT_ASM
+#ifdef TRY_POPCNT_FAST
 
 /*
  * Return true if CPUID indicates that the POPCNT instruction is available.
@@ -121,8 +105,8 @@ pg_popcount32_choose(uint32 word)
 {
 	if (pg_popcount_available())
 	{
-		pg_popcount32 = pg_popcount32_asm;
-		pg_popcount64 = pg_popcount64_asm;
+		pg_popcount32 = pg_popcount32_fast;
+		pg_popcount64 = pg_popcount64_fast;
 	}
 	else
 	{
@@ -138,8 +122,8 @@ pg_popcount64_choose(uint64 word)
 {
 	if (pg_popcount_available())
 	{
-		pg_popcount32 = pg_popcount32_asm;
-		pg_popcount64 = pg_popcount64_asm;
+		pg_popcount32 = pg_popcount32_fast;
+		pg_popcount64 = pg_popcount64_fast;
 	}
 	else
 	{
@@ -151,32 +135,40 @@ pg_popcount64_choose(uint64 word)
 }
 
 /*
- * pg_popcount32_asm
+ * pg_popcount32_fast
  *		Return the number of 1 bits set in word
  */
 static int
-pg_popcount32_asm(uint32 word)
+pg_popcount32_fast(uint32 word)
 {
+#ifdef _MSC_VER
+	return __popcnt(word);
+#else
 	uint32		res;
 
 __asm__ __volatile__(" popcntl %1,%0\n":"=q"(res):"rm"(word):"cc");
 	return (int) res;
+#endif
 }
 
 /*
- * pg_popcount64_asm
+ * pg_popcount64_fast
  *		Return the number of 1 bits set in word
  */
 static int
-pg_popcount64_asm(uint64 word)
+pg_popcount64_fast(uint64 word)
 {
+#ifdef _MSC_VER
+	return __popcnt64(word);
+#else
 	uint64		res;
 
 __asm__ __volatile__(" popcntq %1,%0\n":"=q"(res):"rm"(word):"cc");
 	return (int) res;
+#endif
 }
 
-#endif							/* USE_POPCNT_ASM */
+#endif							/* TRY_POPCNT_FAST */
 
 
 /*
@@ -215,6 +207,24 @@ pg_popcount64_slow(uint64 word)
 #endif							/* HAVE__BUILTIN_POPCOUNT */
 }
 
+#ifndef TRY_POPCNT_FAST
+
+/*
+ * When the POPCNT instruction is not available, there's no point in using
+ * function pointers to vary the implementation between the fast and slow
+ * method.  We instead just make these actual external functions when
+ * TRY_POPCNT_FAST is not defined.  The compiler should be able to inline
+ * the slow versions here.
+ */
+
+
+int
+pg_popcount64(uint64 word)
+{
+	return pg_popcount64_slow(word);
+}
+
+#endif							/* !TRY_POPCNT_FAST */
 
 /*
  * pg_popcount

data/ext/pg_query/src_port_pgsleep.c

@@ -10,7 +10,7 @@
  *	   Portable delay handling.
  *
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
  *
  * src/port/pgsleep.c
  *

data/ext/pg_query/src_port_pgstrcasecmp.c

@@ -24,7 +24,7 @@
  * C library thinks the locale is.
  *
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
  *
  * src/port/pgstrcasecmp.c
  *

data/ext/pg_query/src_port_qsort.c

@@ -1,240 +1,28 @@
 /*--------------------------------------------------------------------
  * Symbols referenced in this file:
- * - pg_qsort
- * - pg_qsort
- * - swapfunc
- * - med3
+ * - pg_qsort_strcmp
  *--------------------------------------------------------------------
  */
 
 /*
  *	qsort.c: standard quicksort algorithm
- *
- *	Modifications from vanilla NetBSD source:
- *	  Add do ... while() macro fix
- *	  Remove __inline, _DIAGASSERTs, __P
- *	  Remove ill-considered "swap_cnt" switch to insertion sort,
- *	  in favor of a simple check for presorted input.
- *	  Take care to recurse on the smaller partition, to bound stack usage.
- *
- *	CAUTION: if you change this file, see also qsort_arg.c, gen_qsort_tuple.pl
- *
- *	src/port/qsort.c
- */
-
-/*	$NetBSD: qsort.c,v 1.13 2003/08/07 16:43:42 agc Exp $	*/
-
-/*-
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *	  notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	  notice, this list of conditions and the following disclaimer in the
- *	  documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *	  may be used to endorse or promote products derived from this software
- *	  without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
  */
 
 #include "c.h"
 
-
-static char *med3(char *a, char *b, char *c,
-				  int (*cmp) (const void *, const void *));
-static void swapfunc(char *, char *, size_t, int);
+#define ST_SORT pg_qsort
+#define ST_ELEMENT_TYPE_VOID
+#define ST_COMPARE_RUNTIME_POINTER
+#define ST_SCOPE
+#define ST_DECLARE
+#define ST_DEFINE
+#include "lib/sort_template.h"
 
 /*
- * Qsort routine based on J. L. Bentley and M. D. McIlroy,
- * "Engineering a sort function",
- * Software--Practice and Experience 23 (1993) 1249-1265.
- *
- * We have modified their original by adding a check for already-sorted input,
- * which seems to be a win per discussions on pgsql-hackers around 2006-03-21.
- *
- * Also, we recurse on the smaller partition and iterate on the larger one,
- * which ensures we cannot recurse more than log(N) levels (since the
- * partition recursed to is surely no more than half of the input).  Bentley
- * and McIlroy explicitly rejected doing this on the grounds that it's "not
- * worth the effort", but we have seen crashes in the field due to stack
- * overrun, so that judgment seems wrong.
+ * qsort comparator wrapper for strcmp.
  */
-
-#define swapcode(TYPE, parmi, parmj, n) \
-do {		\
-	size_t i = (n) / sizeof (TYPE);			\
-	TYPE *pi = (TYPE *)(void *)(parmi);			\
-	TYPE *pj = (TYPE *)(void *)(parmj);			\
-	do {						\
-		TYPE	t = *pi;			\
-		*pi++ = *pj;				\
-		*pj++ = t;				\
-		} while (--i > 0);				\
-} while (0)
-
-#define SWAPINIT(a, es) swaptype = ((char *)(a) - (char *)0) % sizeof(long) || \
-	(es) % sizeof(long) ? 2 : (es) == sizeof(long)? 0 : 1
-
-static void
-swapfunc(char *a, char *b, size_t n, int swaptype)
+int
+pg_qsort_strcmp(const void *a, const void *b)
 {
-	if (swaptype <= 1)
-		swapcode(long, a, b, n);
-	else
-		swapcode(char, a, b, n);
+	return strcmp(*(const char *const *) a, *(const char *const *) b);
 }
-
-#define swap(a, b)						\
-	if (swaptype == 0) {					\
-		long t = *(long *)(void *)(a);			\
-		*(long *)(void *)(a) = *(long *)(void *)(b);	\
-		*(long *)(void *)(b) = t;			\
-	} else							\
-		swapfunc(a, b, es, swaptype)
-
-#define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n, swaptype)
-
-static char *
-med3(char *a, char *b, char *c, int (*cmp) (const void *, const void *))
-{
-	return cmp(a, b) < 0 ?
-		(cmp(b, c) < 0 ? b : (cmp(a, c) < 0 ? c : a))
-		: (cmp(b, c) > 0 ? b : (cmp(a, c) < 0 ? a : c));
-}
-
-void
-pg_qsort(void *a, size_t n, size_t es, int (*cmp) (const void *, const void *))
-{
-	char	   *pa,
-			   *pb,
-			   *pc,
-			   *pd,
-			   *pl,
-			   *pm,
-			   *pn;
-	size_t		d1,
-				d2;
-	int			r,
-				swaptype,
-				presorted;
-
-loop:SWAPINIT(a, es);
-	if (n < 7)
-	{
-		for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
-			for (pl = pm; pl > (char *) a && cmp(pl - es, pl) > 0;
-				 pl -= es)
-				swap(pl, pl - es);
-		return;
-	}
-	presorted = 1;
-	for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
-	{
-		if (cmp(pm - es, pm) > 0)
-		{
-			presorted = 0;
-			break;
-		}
-	}
-	if (presorted)
-		return;
-	pm = (char *) a + (n / 2) * es;
-	if (n > 7)
-	{
-		pl = (char *) a;
-		pn = (char *) a + (n - 1) * es;
-		if (n > 40)
-		{
-			size_t		d = (n / 8) * es;
-
-			pl = med3(pl, pl + d, pl + 2 * d, cmp);
-			pm = med3(pm - d, pm, pm + d, cmp);
-			pn = med3(pn - 2 * d, pn - d, pn, cmp);
-		}
-		pm = med3(pl, pm, pn, cmp);
-	}
-	swap(a, pm);
-	pa = pb = (char *) a + es;
-	pc = pd = (char *) a + (n - 1) * es;
-	for (;;)
-	{
-		while (pb <= pc && (r = cmp(pb, a)) <= 0)
-		{
-			if (r == 0)
-			{
-				swap(pa, pb);
-				pa += es;
-			}
-			pb += es;
-		}
-		while (pb <= pc && (r = cmp(pc, a)) >= 0)
-		{
-			if (r == 0)
-			{
-				swap(pc, pd);
-				pd -= es;
-			}
-			pc -= es;
-		}
-		if (pb > pc)
-			break;
-		swap(pb, pc);
-		pb += es;
-		pc -= es;
-	}
-	pn = (char *) a + n * es;
-	d1 = Min(pa - (char *) a, pb - pa);
-	vecswap(a, pb - d1, d1);
-	d1 = Min(pd - pc, pn - pd - es);
-	vecswap(pb, pn - d1, d1);
-	d1 = pb - pa;
-	d2 = pd - pc;
-	if (d1 <= d2)
-	{
-		/* Recurse on left partition, then iterate on right partition */
-		if (d1 > es)
-			pg_qsort(a, d1 / es, es, cmp);
-		if (d2 > es)
-		{
-			/* Iterate rather than recurse to save stack space */
-			/* pg_qsort(pn - d2, d2 / es, es, cmp); */
-			a = pn - d2;
-			n = d2 / es;
-			goto loop;
-		}
-	}
-	else
-	{
-		/* Recurse on right partition, then iterate on left partition */
-		if (d2 > es)
-			pg_qsort(pn - d2, d2 / es, es, cmp);
-		if (d1 > es)
-		{
-			/* Iterate rather than recurse to save stack space */
-			/* pg_qsort(a, d1 / es, es, cmp); */
-			n = d1 / es;
-			goto loop;
-		}
-	}
-}
-
-/*
- * qsort comparator wrapper for strcmp.
- */
-