Merge branch 'apache:main' into main

Author: leborchuk

.github/workflows/build-cloudberry.yml

@@ -273,8 +273,7 @@ jobs:
                "make_configs":["src/test/isolation:installcheck-singlenode",
                                "src/test/singlenode_regress:installcheck-singlenode",
                                "src/test/singlenode_isolation2:installcheck-singlenode"],
-               "num_primary_mirror_pairs":0,
-               "pg_settings":{"optimizer":"off"}
+               "num_primary_mirror_pairs":0
               },
               {"test":"ic-resgroup-v2",
                "make_configs":["src/test/isolation2:installcheck-resgroup-v2"],
@@ -319,6 +318,9 @@ jobs:
               },
               {"test":"ic-parallel-retrieve-cursor",
                "make_configs":["src/test/isolation2:installcheck-parallel-retrieve-cursor"]
+              },
+              {"test":"ic-cbdb-parallel",
+               "make_configs":["src/test/regress:installcheck-cbdb-parallel"]
               }
             ]
           }'

.github/workflows/docker-cbdb-build-containers.yml

@@ -60,6 +60,7 @@ on:
     paths:
       - 'devops/deploy/docker/build/rocky8/**'
       - 'devops/deploy/docker/build/rocky9/**'
+      - 'devops/deploy/docker/build/ubuntu22.04/**'
   workflow_dispatch:  # Manual trigger
 
 # Prevent multiple workflow runs from interfering with each other
@@ -73,10 +74,10 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
 
-    # Matrix strategy to build for both Rocky Linux 8 and 9
+    # Matrix strategy to build for both Rocky Linux 8 and 9, Ubuntu 22.04
     strategy:
       matrix:
-        platform: ['rocky8', 'rocky9']
+        platform: ['rocky8', 'rocky9', 'ubuntu22.04']
 
     steps:
       # Checkout repository code with full history
@@ -103,6 +104,8 @@ jobs:
               - 'devops/deploy/docker/build/rocky8/**'
             rocky9:
               - 'devops/deploy/docker/build/rocky9/**'
+            ubuntu22.04:
+              - 'devops/deploy/docker/build/ubuntu22.04/**'
 
       # Set up QEMU for multi-architecture support
       # This allows building ARM64 images on AMD64 infrastructure and vice versa

.github/workflows/docker-cbdb-test-containers.yml

@@ -49,6 +49,7 @@ on:
     paths:
       - 'devops/deploy/docker/test/rocky8/**'
       - 'devops/deploy/docker/test/rocky9/**'
+      - 'devops/deploy/docker/test/ubuntu22.04/**'
   workflow_dispatch:  # Manual trigger
 
 # Prevent multiple workflow runs from interfering with each other
@@ -62,8 +63,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # Build for both Rocky Linux 8 and 9
-        platform: ['rocky8', 'rocky9']
+        # Build for both Rocky Linux 8 and 9, Ubuntu 22.04
+        platform: ['rocky8', 'rocky9', 'ubuntu22.04']
 
     steps:
       # Checkout repository code
@@ -87,6 +88,8 @@ jobs:
               - 'devops/deploy/docker/test/rocky8/**'
             rocky9:
               - 'devops/deploy/docker/test/rocky9/**'
+            ubuntu22.04:
+              - 'devops/deploy/docker/test/ubuntu22.04/**'
 
       # Skip if no changes for current platform
       - name: Skip if not relevant

contrib/interconnect/ic_internal.h

@@ -10,6 +10,11 @@
  */
 #ifndef INTER_CONNECT_INTERNAL_H
 #define INTER_CONNECT_INTERNAL_H
+#include <stdint.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <sys/queue.h>
+#include <pthread.h>
 
 #include "tcp/ic_tcp.h"
 #include "udp/ic_udpifc.h"
@@ -33,6 +38,27 @@ typedef enum MotionConnState
 	mcsEosSent
 }			MotionConnState;
 
+struct udp_send_vars
+{
+	/* send sequence variables */
+	uint32_t snd_una;		/* send unacknoledged */
+	uint32_t snd_wnd;		/* send window (unscaled) */
+
+	/* retransmission timeout variables */
+	uint8_t nrtx;			/* number of retransmission */
+	uint8_t max_nrtx;		/* max number of retransmission */
+	uint32_t rto;			/* retransmission timeout */
+	uint32_t ts_rto;		/* timestamp for retransmission timeout */
+
+	/* congestion control variables */
+	uint32_t cwnd;				/* congestion window */
+	uint32_t ssthresh;			/* slow start threshold */
+
+	TAILQ_ENTRY(MotionConnUDP) send_link;
+	TAILQ_ENTRY(MotionConnUDP) timer_link;		/* timer link (rto list) */
+
+};
+
 /*
  * Structure used for keeping track of a pt-to-pt connection between two
  * Cdb Entities (either QE or QD).
@@ -153,6 +179,32 @@ typedef struct MotionConnUDP
 	uint64		stat_count_resent;
 	uint64		stat_max_resent;
 	uint64		stat_count_dropped;
+
+	struct {
+			uint32_t ts_rto;
+			uint32_t rto;
+			uint32_t srtt;
+			uint32_t rttvar;
+			uint32_t snd_una;
+			uint16_t nrtx;
+			uint16_t max_nrtx;
+			uint32_t mss;
+			uint32_t cwnd;
+			uint32_t ssthresh;
+			uint32_t fss;
+			uint8_t loss_count;
+			uint32_t mdev;
+			uint32_t mdev_max;
+			uint32_t rtt_seq;		/* sequence number to update rttvar */
+			uint32_t ts_all_rto;
+			bool karn_mode;
+	} rttvar;
+	
+	uint8_t on_timewait_list;
+	int16_t on_rto_idx;
+
+	uint32_t snd_nxt;		/* send next */
+	struct udp_send_vars sndvar;
 }			MotionConnUDP;
 
 typedef struct MotionConnTCP

contrib/interconnect/test/ic_test_env.c

@@ -330,6 +330,7 @@ client_side_global_var_init(MotionIPCLayer * motion_ipc_layer, pid_t *ic_proxy_p
 
 	Gp_interconnect_queue_depth = 800;
 	Gp_interconnect_snd_queue_depth = 600;
+	Gp_interconnect_mem_size = 20;
 	Gp_interconnect_timer_period = 1;
 	Gp_interconnect_timer_checking_period = 2;
 	InitializeLatchSupport();
@@ -374,6 +375,7 @@ server_side_global_var_init(MotionIPCLayer * motion_ipc_layer, pid_t *ic_proxy_p
 
 	Gp_interconnect_queue_depth = 800;
 	Gp_interconnect_snd_queue_depth = 600;
+	Gp_interconnect_mem_size = 20;
 	Gp_interconnect_timer_period = 1;
 	Gp_interconnect_timer_checking_period = 2;
 	InitializeLatchSupport();