Skip to content

Commit f6e5de3

Browse files
authored
Merge branch 'main' into AddMDBLocale
2 parents 2510f35 + 9d86458 commit f6e5de3

File tree

59 files changed

+3236
-244
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+3236
-244
lines changed

.github/workflows/build-cloudberry.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,7 @@ jobs:
273273
"make_configs":["src/test/isolation:installcheck-singlenode",
274274
"src/test/singlenode_regress:installcheck-singlenode",
275275
"src/test/singlenode_isolation2:installcheck-singlenode"],
276-
"num_primary_mirror_pairs":0,
277-
"pg_settings":{"optimizer":"off"}
276+
"num_primary_mirror_pairs":0
278277
},
279278
{"test":"ic-resgroup-v2",
280279
"make_configs":["src/test/isolation2:installcheck-resgroup-v2"],
@@ -319,6 +318,9 @@ jobs:
319318
},
320319
{"test":"ic-parallel-retrieve-cursor",
321320
"make_configs":["src/test/isolation2:installcheck-parallel-retrieve-cursor"]
321+
},
322+
{"test":"ic-cbdb-parallel",
323+
"make_configs":["src/test/regress:installcheck-cbdb-parallel"]
322324
}
323325
]
324326
}'

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ on:
6060
paths:
6161
- 'devops/deploy/docker/build/rocky8/**'
6262
- 'devops/deploy/docker/build/rocky9/**'
63+
- 'devops/deploy/docker/build/ubuntu22.04/**'
6364
workflow_dispatch: # Manual trigger
6465

6566
# Prevent multiple workflow runs from interfering with each other
@@ -73,10 +74,10 @@ jobs:
7374
timeout-minutes: 60
7475
runs-on: ubuntu-latest
7576

76-
# Matrix strategy to build for both Rocky Linux 8 and 9
77+
# Matrix strategy to build for both Rocky Linux 8 and 9, Ubuntu 22.04
7778
strategy:
7879
matrix:
79-
platform: ['rocky8', 'rocky9']
80+
platform: ['rocky8', 'rocky9', 'ubuntu22.04']
8081

8182
steps:
8283
# Checkout repository code with full history
@@ -103,6 +104,8 @@ jobs:
103104
- 'devops/deploy/docker/build/rocky8/**'
104105
rocky9:
105106
- 'devops/deploy/docker/build/rocky9/**'
107+
ubuntu22.04:
108+
- 'devops/deploy/docker/build/ubuntu22.04/**'
106109
107110
# Set up QEMU for multi-architecture support
108111
# This allows building ARM64 images on AMD64 infrastructure and vice versa

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ on:
4949
paths:
5050
- 'devops/deploy/docker/test/rocky8/**'
5151
- 'devops/deploy/docker/test/rocky9/**'
52+
- 'devops/deploy/docker/test/ubuntu22.04/**'
5253
workflow_dispatch: # Manual trigger
5354

5455
# Prevent multiple workflow runs from interfering with each other
@@ -62,8 +63,8 @@ jobs:
6263
runs-on: ubuntu-latest
6364
strategy:
6465
matrix:
65-
# Build for both Rocky Linux 8 and 9
66-
platform: ['rocky8', 'rocky9']
66+
# Build for both Rocky Linux 8 and 9, Ubuntu 22.04
67+
platform: ['rocky8', 'rocky9', 'ubuntu22.04']
6768

6869
steps:
6970
# Checkout repository code
@@ -87,6 +88,8 @@ jobs:
8788
- 'devops/deploy/docker/test/rocky8/**'
8889
rocky9:
8990
- 'devops/deploy/docker/test/rocky9/**'
91+
ubuntu22.04:
92+
- 'devops/deploy/docker/test/ubuntu22.04/**'
9093
9194
# Skip if no changes for current platform
9295
- name: Skip if not relevant

contrib/interconnect/ic_internal.h

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
*/
1111
#ifndef INTER_CONNECT_INTERNAL_H
1212
#define INTER_CONNECT_INTERNAL_H
13+
#include <stdint.h>
14+
#include <stdlib.h>
15+
#include <sys/time.h>
16+
#include <sys/queue.h>
17+
#include <pthread.h>
1318

1419
#include "tcp/ic_tcp.h"
1520
#include "udp/ic_udpifc.h"
@@ -33,6 +38,27 @@ typedef enum MotionConnState
3338
mcsEosSent
3439
} MotionConnState;
3540

41+
struct udp_send_vars
42+
{
43+
/* send sequence variables */
44+
uint32_t snd_una; /* send unacknoledged */
45+
uint32_t snd_wnd; /* send window (unscaled) */
46+
47+
/* retransmission timeout variables */
48+
uint8_t nrtx; /* number of retransmission */
49+
uint8_t max_nrtx; /* max number of retransmission */
50+
uint32_t rto; /* retransmission timeout */
51+
uint32_t ts_rto; /* timestamp for retransmission timeout */
52+
53+
/* congestion control variables */
54+
uint32_t cwnd; /* congestion window */
55+
uint32_t ssthresh; /* slow start threshold */
56+
57+
TAILQ_ENTRY(MotionConnUDP) send_link;
58+
TAILQ_ENTRY(MotionConnUDP) timer_link; /* timer link (rto list) */
59+
60+
};
61+
3662
/*
3763
* Structure used for keeping track of a pt-to-pt connection between two
3864
* Cdb Entities (either QE or QD).
@@ -153,6 +179,32 @@ typedef struct MotionConnUDP
153179
uint64 stat_count_resent;
154180
uint64 stat_max_resent;
155181
uint64 stat_count_dropped;
182+
183+
struct {
184+
uint32_t ts_rto;
185+
uint32_t rto;
186+
uint32_t srtt;
187+
uint32_t rttvar;
188+
uint32_t snd_una;
189+
uint16_t nrtx;
190+
uint16_t max_nrtx;
191+
uint32_t mss;
192+
uint32_t cwnd;
193+
uint32_t ssthresh;
194+
uint32_t fss;
195+
uint8_t loss_count;
196+
uint32_t mdev;
197+
uint32_t mdev_max;
198+
uint32_t rtt_seq; /* sequence number to update rttvar */
199+
uint32_t ts_all_rto;
200+
bool karn_mode;
201+
} rttvar;
202+
203+
uint8_t on_timewait_list;
204+
int16_t on_rto_idx;
205+
206+
uint32_t snd_nxt; /* send next */
207+
struct udp_send_vars sndvar;
156208
} MotionConnUDP;
157209

158210
typedef struct MotionConnTCP

contrib/interconnect/test/ic_test_env.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,7 @@ client_side_global_var_init(MotionIPCLayer * motion_ipc_layer, pid_t *ic_proxy_p
330330

331331
Gp_interconnect_queue_depth = 800;
332332
Gp_interconnect_snd_queue_depth = 600;
333+
Gp_interconnect_mem_size = 20;
333334
Gp_interconnect_timer_period = 1;
334335
Gp_interconnect_timer_checking_period = 2;
335336
InitializeLatchSupport();
@@ -374,6 +375,7 @@ server_side_global_var_init(MotionIPCLayer * motion_ipc_layer, pid_t *ic_proxy_p
374375

375376
Gp_interconnect_queue_depth = 800;
376377
Gp_interconnect_snd_queue_depth = 600;
378+
Gp_interconnect_mem_size = 20;
377379
Gp_interconnect_timer_period = 1;
378380
Gp_interconnect_timer_checking_period = 2;
379381
InitializeLatchSupport();

0 commit comments

Comments
 (0)