[DO NOT SQAUSH MERGE] Community merge 16.X

[ayushdsh]

Description

Community commits to catch up to Stamp 16.13

Test PR for extension - babelfish-for-postgresql/babelfish_extensions#4698

Merge conflicts

src/test/perl/PostgreSQL/Test/BackgroundPsql.pm - Improve guards against false regex matches in BackgroundPsql.pm
Resolution - Updated banner removal to use community's $banner_match regex

<<<<<<< HEAD
	$self->{stdin} .= "\\echo $banner\n";
	$self->{run}->pump()
	  until $self->{stdout} =~ /$banner/ || $self->{timeout}->is_expired;
	$self->{stdout} = '';    # clear out banner
=======
	my $banner_match = qr/$banner\r?\n/;
	$self->{stdin} .= "\\echo '$banner'\n\\warn '$banner'\n";
	$self->{run}->pump()
	  until ($self->{stdout} =~ /$banner_match/
		  && $self->{stderr} =~ /$banner_match/)
	  || $self->{timeout}->is_expired;

	note "connect output:\n",
	  explain {
		stdout => $self->{stdout},
		stderr => $self->{stderr},
	  };

	# clear out banners
	$self->{stdout} = '';
	$self->{stderr} = '';
>>>>>>> 6548e4a10d1 (Improve guards against false regex matches in BackgroundPsql.pm.)

<<<<<<< HEAD
	# itself), and a separator echoed with \echo, that we can wait on.
	my $banner = "background_psql: QUERY_SEPARATOR";
	$self->{stdin} .= "$query\n;\n\\echo $banner\n";

	pump_until($self->{run}, $self->{timeout}, \$self->{stdout}, qr/$banner/);

	die "psql query timed out" if $self->{timeout}->is_expired;
=======
	# itself), and a separator echoed both with \echo and \warn, that we can
	# wait on.
	#
	# To avoid somehow confusing the separator from separately issued queries,
	# and to make it easier to debug, we include a per-psql query counter in
	# the separator.
	#
	# We need both \echo (printing to stdout) and \warn (printing to stderr),
	# because on windows we can get data on stdout before seeing data on
	# stderr (or vice versa), even if psql printed them in the opposite
	# order. We therefore wait on both.
	#
	# In interactive psql we emit \r\n, so we need to allow for that.
	# Also, include quotes around the banner string in the \echo and \warn
	# commands, not because the string needs quoting but so that $banner_match
	# can't match readline's echoing of these commands.
	my $banner = "background_psql: QUERY_SEPARATOR $query_cnt:";
	my $banner_match = qr/$banner\r?\n/;
	$self->{stdin} .= "$query\n;\n\\echo '$banner'\n\\warn '$banner'\n";
	$self->{run}->pump()
	  until ($self->{stdout} =~ /$banner_match/
		  && $self->{stderr} =~ /$banner_match/)
	  || $self->{timeout}->is_expired;

	note "results query $query_cnt:\n",
	  explain {
		stdout => $self->{stdout},
		stderr => $self->{stderr},
	  };

	die "psql query timed out" if $self->{timeout}->is_expired;

	# Remove banner from stdout and stderr, our caller doesn't want it.
	# Also remove the query output's trailing newline, if present (there
	# would not be one if consuming an empty query result).
	$banner_match = qr/\r?\n?$banner\r?\n/;
>>>>>>> 6548e4a10d1 (Improve guards against false regex matches in BackgroundPsql.pm.)

src/backend/utils/adt/like_match.c - Replace pg_mblen() with bounds-checked versions
Resolution - updated CHAREQ(p, e) calls to bounds-checked CHAREQ(p, plen, e, elen) signature

<<<<<<< HEAD
			/*
			 * If specified escape is '\', just copy the pattern as-is.
			 */
			if (*e == '\\')
=======
			if (CHAREQ(p, plen, e, elen) && !afterescape)
>>>>>>> d837fb02925 (Replace pg_mblen() with bounds-checked versions.)

src/include/utils/syscache.h - Add a syscache on pg_extension.oid.
Resolution - update SysCacheNoExtensionSize and accept rest of the incoming changes

<<<<<<< HEAD
	/* 
	 * Below are cache IDs for extensions. We need to have them defined here
	 * instead of their respective extension modules because we do not want 
	 * the IDs to conflict.
	 */
	SYSDATABASEOID,
	SYSDATABASENAME,
	PROCNAMENSPSIGNATURE,
	SYSNAMESPACENAME,
	AUTHIDUSEREXTROLENAME

#define SysCacheNoExtensionSize (USERMAPPINGUSERSERVER+ 1)
#define SysCacheSize (AUTHIDUSEREXTROLENAME + 1)
};

/*
 *		struct cachedesc: information defining a single syscache
 */
struct cachedesc
{
	Oid			reloid;			/* OID of the relation being cached */
	Oid			indoid;			/* OID of index relation for this cache */
	int			nkeys;			/* # of keys needed for cache lookup */
	int			key[4];			/* attribute numbers of key attrs */
	int			nbuckets;		/* number of hash buckets for this cache */
=======
	/* intentionally out of alphabetical order, to avoid an ABI break: */
	EXTENSIONOID

#define SysCacheSize (EXTENSIONOID + 1)
>>>>>>> d484bc26013 (Add a syscache on pg_extension.oid.)

Check List

• Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is under the terms of the PostgreSQL license, and grant any person obtaining a copy of the contribution permission to relicense all or a portion of my contribution to the PostgreSQL License solely to contribute all or a portion of my contribution to the PostgreSQL open source project.

For more information on following Developer Certificate of Origin and signing off your commits, please check here.