Cherry-pick Resgroup related code from GreenPlum [Mar 2, 2022 - Feb 7, 2023]

concourse/scripts/ic_gpdb_resgroup.bash

@@ -75,7 +75,7 @@ run_resgroup_test() {
         scp /home/gpadmin/gpdb_src/src/test/regress/regress.so \
             gpadmin@sdw1:/home/gpadmin/gpdb_src/src/test/regress/
 
-        make installcheck-resgroup || (
+        make PGOPTIONS="-c optimizer=off" installcheck-resgroup || (
             errcode=\$?
             find src/test/isolation2 -name regression.diffs \
             | while read diff; do

contrib/interconnect/tcp/ic_tcp.c

@@ -140,28 +140,23 @@ setupTCPListeningSocket(int backlog, int *listenerSocketFd, int32 *listenerPort)
 	memset(&hints, 0, sizeof(struct addrinfo));
 	hints.ai_family = AF_UNSPEC;	/* Allow IPv4 or IPv6 */
 	hints.ai_socktype = SOCK_STREAM;	/* Two-way, out of band connection */
-	hints.ai_flags = AI_PASSIVE;	/* For wildcard IP address */
 	hints.ai_protocol = 0;		/* Any protocol - TCP implied for network use
 								 * due to SOCK_STREAM */
 
-	/*
-	 * We set interconnect_address on the primary to the local address of the
-	 * connection from QD to the primary, which is the primary's ADDRESS from
-	 * gp_segment_configuration, used for interconnection. However it's wrong
-	 * on the master. Because the connection from the client to the master may
-	 * have different IP addresses as its destination, which is very likely
-	 * not the master's ADDRESS in gp_segment_configuration.
-	 */
-	if (interconnect_address)
+	if (Gp_interconnect_address_type == INTERCONNECT_ADDRESS_TYPE_UNICAST)
 	{
-		/*
-		 * Restrict what IP address we will listen on to just the one that was
-		 * used to create this QE session.
-		 */
+		Assert(interconnect_address && strlen(interconnect_address) > 0);
 		hints.ai_flags |= AI_NUMERICHOST;
-		ereport(DEBUG1, (errmsg("binding to %s only", interconnect_address)));
-		if (gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG)
-			ereport(DEBUG4, (errmsg("binding listener %s", interconnect_address)));
+		ereportif(gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG, DEBUG3,
+				  (errmsg("getaddrinfo called with unicast address: %s",
+						  interconnect_address)));
+	}
+	else
+	{
+		Assert(interconnect_address == NULL);
+		hints.ai_flags |= AI_PASSIVE;
+		ereportif(gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG, DEBUG3,
+				  (errmsg("getaddrinfo called with wildcard address")));
 	}
 
 	s = getaddrinfo(interconnect_address, service, &hints, &addrs);

contrib/interconnect/udp/ic_udpifc.c

@@ -1193,7 +1193,6 @@ setupUDPListeningSocket(int *listenerSocketFd, int32 *listenerPort, int *txFamil
 	memset(&hints, 0, sizeof(struct addrinfo));
 	hints.ai_family = AF_UNSPEC;	/* Allow IPv4 or IPv6 */
 	hints.ai_socktype = SOCK_DGRAM; /* Datagram socket */
-	hints.ai_flags = AI_PASSIVE;	/* For wildcard IP address */
 	hints.ai_protocol = 0;		/* Any protocol - UDP implied for network use due to SOCK_DGRAM */
 
 #ifdef USE_ASSERT_CHECKING
@@ -1202,25 +1201,22 @@ setupUDPListeningSocket(int *listenerSocketFd, int32 *listenerPort, int *txFamil
 #endif
 
 	fun = "getaddrinfo";
-	/*
-	 * We set interconnect_address on the primary to the local address of the connection from QD
-	 * to the primary, which is the primary's ADDRESS from gp_segment_configuration,
-	 * used for interconnection.
-	 * However it's wrong on the master. Because the connection from the client to the master may
-	 * have different IP addresses as its destination, which is very likely not the master's
-	 * ADDRESS in gp_segment_configuration.
-	 */
-	if (interconnect_address)
+	if (Gp_interconnect_address_type == INTERCONNECT_ADDRESS_TYPE_UNICAST)
 	{
-		/*
-		 * Restrict what IP address we will listen on to just the one that was
-		 * used to create this QE session.
-		 */
+		Assert(interconnect_address && strlen(interconnect_address) > 0);
 		hints.ai_flags |= AI_NUMERICHOST;
-		ereport(DEBUG1, (errmsg("binding to %s only", interconnect_address)));
-		if (gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG)
-			ereport(DEBUG4, (errmsg("binding address %s", interconnect_address)));
+		ereportif(gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG, DEBUG3,
+				  (errmsg("getaddrinfo called with unicast address: %s",
+						  interconnect_address)));
 	}
+	else
+	{
+		Assert(interconnect_address == NULL);
+		hints.ai_flags |= AI_PASSIVE;
+		ereportif(gp_log_interconnect >= GPVARS_VERBOSITY_DEBUG, DEBUG3,
+				  (errmsg("getaddrinfo called with wildcard address")));
+	}
+
 	s = getaddrinfo(interconnect_address, service, &hints, &addrs);
 	if (s != 0)
 		elog(ERROR, "getaddrinfo says %s", gai_strerror(s));

doc/src/sgml/ref/allfiles.sgml

@@ -170,6 +170,7 @@ Complete list of usable sgml source files in this directory.
 <!ENTITY reindex            SYSTEM "reindex.sgml">
 <!ENTITY releaseSavepoint   SYSTEM "release_savepoint.sgml">
 <!ENTITY reset              SYSTEM "reset.sgml">
+<!ENTITY retrieve           SYSTEM "retrieve.sgml">
 <!ENTITY revoke             SYSTEM "revoke.sgml">
 <!ENTITY rollback           SYSTEM "rollback.sgml">
 <!ENTITY rollbackPrepared   SYSTEM "rollback_prepared.sgml">

doc/src/sgml/ref/alter_resource_group.sgml

@@ -25,11 +25,9 @@ PostgreSQL documentation
 ALTER RESOURCE GROUP name SET group_attribute value
 where group_attribute is one of:
    CONCURRENCY integer
-   CPU_RATE_LIMIT integer
+   CPU_HARD_QUOTA_LIMIT integer
+   CPU_SOFT_PRIORITY integer
    CPUSET tuple
-   MEMORY_LIMIT integer
-   MEMORY_SHARED_QUOTA integer
-   MEMORY_SPILL_RATIO integer
 
 </synopsis>
  </refsynopsisdiv>

doc/src/sgml/ref/create_resource_group.sgml

@@ -23,12 +23,9 @@ PostgreSQL documentation
 
 CREATE RESOURCE GROUP name WITH (group_attribute=value [, ... ]) 
 where group_attribute is:
-   CPU_RATE_LIMIT=integer | CPUSET=tuple
-   MEMORY_LIMIT=integer
+   CPU_HARD_QUOTA_LIMIT=integer | CPUSET=tuple
    [ CONCURRENCY=integer ]
-   [ MEMORY_SHARED_QUOTA=integer ]
-   [ MEMORY_SPILL_RATIO=integer ]
-   [ MEMORY_AUDITOR= {vmtracker | cgroup} ]
+   [ CPU_SOFT_PRIORITY=integer ]
 
 </synopsis>
  </refsynopsisdiv>

doc/src/sgml/ref/declare.sgml

@@ -21,13 +21,13 @@ PostgreSQL documentation
 
  <refnamediv>
   <refname>DECLARE</refname>
-  <refpurpose>define a cursor</refpurpose>
+  <refpurpose>define a cursor or a parallel retrieve cursor</refpurpose>
  </refnamediv>
 
  <refsynopsisdiv>
 <synopsis>
 DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ ASENSITIVE | INSENSITIVE ] [ [ NO ] SCROLL ]
-    CURSOR [ { WITH | WITHOUT } HOLD ] FOR <replaceable class="parameter">query</replaceable>
+  [ PARALLEL RETRIEVE ] CURSOR [ { WITH | WITHOUT } HOLD ] FOR <replaceable class="parameter">query</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -42,6 +42,22 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ ASENSITIV
    <link linkend="sql-fetch"><command>FETCH</command></link>.
   </para>
 
+  <para>
+    Like a normal cursor, user can declare a parallel retrieve cursor on
+    coordinator, then retrieve the query results on each segment directly.
+  </para>
+
+  <para>
+    Parallel retrieve cursor has similar declaration and syntax as normal cursor
+    does. However, some cursor operations are not supported in parallel retrieve
+    cursor(e.g. MOVE).
+  </para>
+
+  <para>
+    NOTE: Orca doesn't support PARALLEL RETRIEVE CURSOR for now. It would fall
+    back to postgres optimizer automatically.
+  </para>
+
   <note>
    <para>
     This page describes usage of cursors at the SQL command level.
@@ -113,6 +129,10 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ ASENSITIV
       <literal>SCROLL</literal>. See <xref linkend="sql-declare-notes"/>
       below for details.
      </para>
+
+     <para>
+      PARALLEL RETRIEVE CURSOR with <literal>WITH SCROLL</literal> is not supported.
+     </para>
     </listitem>
    </varlistentry>
 
@@ -128,6 +148,10 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ ASENSITIV
       <literal>WITH HOLD</literal> is specified, <literal>WITHOUT
       HOLD</literal> is the default.
      </para>
+
+     <para>
+      PARALLEL RETRIEVE CURSOR with <literal>WITH HOLD</literal> is not supported.
+     </para>
     </listitem>
    </varlistentry>
 

doc/src/sgml/ref/retrieve.sgml

@@ -0,0 +1,89 @@
+<!--
+doc/src/sgml/ref/retrieve.sgml
+PostgreSQL documentation
+-->
+
+<refentry id="sql-retrieve">
+ <indexterm zone="sql-retrieve">
+  <primary>RETRIEVE</primary>
+ </indexterm>
+
+ <refmeta>
+  <refentrytitle>RETRIEVE</refentrytitle>
+  <manvolnum>7</manvolnum>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>RETRIEVE</refname>
+  <refpurpose>retrieve from endpoint</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+<synopsis>
+RETRIEVE { ALL | <replaceable class="parameter">count</replaceable> } FROM ENDPOINT <replaceable class="parameter">endpoint_name</replaceable>;
+
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>RETRIEVE</command> retrieves data from endpoint.
+  </para>
+
+  <para>
+    In each retrieve session, the query result on that segment can be
+    retrieved by using statement "RETRIEVE" and its corresponding endpoint
+    name.
+  </para>
+
+  <para>
+    An empty set will be returned if no more
+    tuples for the endpoint.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>Parameters</title>
+
+  <variablelist>
+   <varlistentry>
+    <term><replaceable class="parameter">count</replaceable></term>
+    <listitem>
+     <para>
+      a positive integer value needs to be provided as the "count" to
+        specify how many rows to retrieve.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><literal>ALL</literal></term>
+    <listitem>
+     <para>
+      Parameter "ALL" means to retrieve all the results from the endpoint.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="PARAMETER">endpoint_name</replaceable></term>
+    <listitem>
+     <para>
+      The endpoint to retrieve data from, endpoint names can be listed from function gp_get_endpoints().
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-declare"></member>
+  </simplelist>
+ </refsect1>
+</refentry>

gpMgmt/bin/gpcheckresgroupimpl

@@ -44,12 +44,6 @@ class cgroup(object):
         if not self.compdirs:
             self.die("failed to detect cgroup component dirs.")
 
-        # 'memory' on 5X is special, although dir 'memory/gpdb' is optional,
-        # dir 'memory' is mandatory to provide 'memory.limit_in_bytes'.
-        # in such a case we must always put 'memory' in compdirs on 5X.
-        if gpver.version < [6, 0, 0] and 'memory' not in self.compdirs:
-            self.compdirs['memory'] = ''
-
         self.validate_permission("cpu", "gpdb/", "rwx")
         self.validate_permission("cpu", "gpdb/cgroup.procs", "rw")
         self.validate_permission("cpu", "gpdb/cpu.cfs_period_us", "rw")
@@ -61,16 +55,7 @@ class cgroup(object):
         self.validate_permission("cpuacct", "gpdb/cpuacct.usage", "r")
         self.validate_permission("cpuacct", "gpdb/cpuacct.stat", "r")
 
-        self.validate_permission("memory", "memory.limit_in_bytes", "r")
-
-        # resgroup memory auditor is introduced in 6.0 devel and backported
-        # to 5.x branch since 5.6.1.  To provide backward compatibilities
-        # memory permissions are only checked since 6.0.
         if gpver.version >= [6, 0, 0]:
-            self.validate_permission("memory", "gpdb/", "rwx")
-            self.validate_permission("memory", "gpdb/memory.limit_in_bytes", "rw")
-            self.validate_permission("memory", "gpdb/memory.usage_in_bytes", "r")
-
             self.validate_permission("cpuset", "gpdb/", "rwx")
             self.validate_permission("cpuset", "gpdb/cgroup.procs", "rw")
             self.validate_permission("cpuset", "gpdb/cpuset.cpus", "rw")
@@ -178,7 +163,7 @@ class cgroup(object):
     def required_comps(self):
         comps = ['cpu', 'cpuacct']
         if gpver.version >= [6, 0, 0]:
-            comps.extend(['cpuset', 'memory'])
+            comps.extend(['cpuset'])
         return comps
 
     def fallback_comp_dirs(self):