pg_query 2.0.3 → 5.1.0

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-2023, 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-2023, 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-2023, 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-2023, 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"
@@ -88,12 +89,12 @@ static const char UnreservedPLKeywords_kw_string[] =
 	"pg_exception_context\0"
 	"pg_exception_detail\0"
 	"pg_exception_hint\0"
+	"pg_routine_oid\0"
 	"print_strict_params\0"
 	"prior\0"
 	"query\0"
 	"raise\0"
 	"relative\0"
-	"reset\0"
 	"return\0"
 	"returned_sqlstate\0"
 	"reverse\0"
@@ -103,7 +104,6 @@ static const char UnreservedPLKeywords_kw_string[] =
 	"schema\0"
 	"schema_name\0"
 	"scroll\0"
-	"set\0"
 	"slice\0"
 	"sqlstate\0"
 	"stacked\0"
@@ -160,45 +160,45 @@ static const uint16 UnreservedPLKeywords_kw_offsets[] = {
 	295,
 	300,
 	304,
-	312,
-	325,
-	330,
-	335,
-	338,
-	345,
-	350,
-	357,
-	365,
-	376,
-	393,
-	414,
-	434,
-	452,
-	472,
-	478,
-	484,
-	490,
+	310,
+	318,
+	331,
+	336,
+	341,
+	344,
+	351,
+	356,
+	363,
+	371,
+	382,
+	399,
+	420,
+	440,
+	458,
+	473,
+	493,
 	499,
 	505,
-	512,
-	530,
-	538,
-	547,
-	557,
-	565,
+	511,
+	520,
+	527,
+	545,
+	553,
+	562,
 	572,
-	584,
-	591,
-	595,
-	601,
-	610,
-	618,
-	624,
+	580,
+	587,
+	599,
+	606,
+	612,
+	621,
+	629,
 	635,
-	640,
+	646,
 	651,
-	664,
-	682,
+	662,
+	675,
+	693,
 };
 
 #define UNRESERVEDPLKEYWORDS_NUM_KEYWORDS 83
@@ -207,27 +207,27 @@ 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,
+		0,     -26,   32767, 0,     74,    -36,   32767, 32767,
+		93,    0,     35,    14,    34,    -65,   -42,   78,
+		-22,   8,     10,    0,     5,     32767, 10,    26,
+		32767, 4,     32767, 32767, -81,   -9,    -25,   32767,
+		-17,   11,    0,     -43,   11,    8,     45,    0,
+		32767, 32767, 32767, 12,    0,     32767, 32,    32767,
+		0,     32767, -18,   64,    32767, -2,    31,    32767,
+		50,    80,    -75,   32767, 32767, 32767, 0,     32767,
+		32767, 0,     54,    82,    32767, 32767, 69,    60,
+		43,    32767, 0,     95,    21,    1,     27,    0,
+		120,   32767, -46,   32767, -57,   32767, 32767, 55,
+		70,    32767, 28,    32767, 0,     -14,   -38,   32767,
+		57,    0,     32767, 19,    98,    0,     32767, 68,
+		32767, 32767, 32767, 32767, -26,   13,    27,    35,
+		37,    32767, 49,    -44,   65,    -35,   0,     32767,
+		32767, 32767, 30,    0,     0,     32767, 26,    42,
+		7,     32767, 72,    -43,   32767, 0,     32767, 89,
+		36,    48,    32767, 32,    38,    3,     32767, 49,
+		32767, 0,     51,    0,     32767, 73,    32767, 32767,
+		79,    32767, 30,    32767, 0,     0,     50,    32767,
+		0,     32767, 32767, 32767, 0,     32767, 32767
 	};
 
 	const unsigned char *k = (const unsigned char *) key;
@@ -238,8 +238,8 @@ UnreservedPLKeywords_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 % 167] + h[b % 167];
 }

data/ext/pg_query/src_port_pg_bitutils.c

@@ -1,14 +1,12 @@
 /*--------------------------------------------------------------------
  * Symbols referenced in this file:
  * - pg_popcount64
- * - pg_popcount64_choose
+ * - pg_popcount64_slow
  * - pg_popcount32
- * - pg_popcount32_choose
- * - pg_popcount_available
- * - pg_popcount32_asm
- * - pg_popcount64_asm
  * - pg_popcount32_slow
- * - pg_popcount64_slow
+ * - pg_leftmost_one_pos
+ * - pg_rightmost_one_pos
+ * - pg_number_of_ones
  *--------------------------------------------------------------------
  */
 
@@ -17,7 +15,7 @@
  * pg_bitutils.c
  *	  Miscellaneous functions for bit-wise operations.
  *
- * Copyright (c) 2019-2020, PostgreSQL Global Development Group
+ * Copyright (c) 2019-2023, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/port/pg_bitutils.c
@@ -45,7 +43,24 @@
  * HAVE__BUILTIN_CLZ is defined, but we provide it anyway, so that
  * extensions possibly compiled with a different compiler can use it.
  */
-
+const uint8 pg_leftmost_one_pos[256] = {
+	0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3,
+	4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+	5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+	5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
+	7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
+};
 
 /*
  * Array giving the position of the right-most set bit for each possible
@@ -56,7 +71,24 @@
  * HAVE__BUILTIN_CTZ is defined, but we provide it anyway, so that
  * extensions possibly compiled with a different compiler can use it.
  */
-
+const uint8 pg_rightmost_one_pos[256] = {
+	0, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+	4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+	5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+	4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+	6, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+	4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+	5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+	4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+	7, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+	4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+	5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+	4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+	6, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+	4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+	5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
+	4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0
+};
 
 /*
  * Array giving the number of 1-bits in each possible byte value.
@@ -64,39 +96,40 @@
  * Note: we export this for use by functions in which explicit use
  * of the popcount functions seems unlikely to be a win.
  */
-
-
-/*
- * 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
+const uint8 pg_number_of_ones[256] = {
+	0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4,
+	1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+	1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+	2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+	1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+	2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+	2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+	3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+	1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+	2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+	2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+	3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+	2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+	3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+	3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+	4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8
+};
 
 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_popcount32) (uint32 word) = pg_popcount32_slow;
-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.
@@ -128,8 +161,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
 	{
@@ -145,8 +178,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
 	{
@@ -158,32 +191,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 */
 
 
 /*
@@ -236,6 +277,28 @@ 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_popcount32(uint32 word)
+{
+	return pg_popcount32_slow(word);
+}
+
+int
+pg_popcount64(uint64 word)
+{
+	return pg_popcount64_slow(word);
+}
+
+#endif							/* !TRY_POPCNT_FAST */
 
 /*
  * pg_popcount

data/ext/pg_query/src_port_pgstrcasecmp.c

@@ -1,5 +1,6 @@
 /*--------------------------------------------------------------------
  * Symbols referenced in this file:
+ * - pg_strcasecmp
  * - pg_toupper
  *--------------------------------------------------------------------
  */
@@ -24,7 +25,7 @@
  * C library thinks the locale is.
  *
  *
- * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
  *
  * src/port/pgstrcasecmp.c
  *
@@ -38,7 +39,34 @@
 /*
  * Case-independent comparison of two null-terminated strings.
  */
+int
+pg_strcasecmp(const char *s1, const char *s2)
+{
+	for (;;)
+	{
+		unsigned char ch1 = (unsigned char) *s1++;
+		unsigned char ch2 = (unsigned char) *s2++;
+
+		if (ch1 != ch2)
+		{
+			if (ch1 >= 'A' && ch1 <= 'Z')
+				ch1 += 'a' - 'A';
+			else if (IS_HIGHBIT_SET(ch1) && isupper(ch1))
+				ch1 = tolower(ch1);
 
+			if (ch2 >= 'A' && ch2 <= 'Z')
+				ch2 += 'a' - 'A';
+			else if (IS_HIGHBIT_SET(ch2) && isupper(ch2))
+				ch2 = tolower(ch2);
+
+			if (ch1 != ch2)
+				return (int) ch1 - (int) ch2;
+		}
+		if (ch1 == 0)
+			break;
+	}
+	return 0;
+}
 
 /*
  * Case-independent comparison of two not-necessarily-null-terminated strings.