Skip to content

Commit 925af1e

Browse files
authored
Merge branch 'main' into cache-install
2 parents bfbab39 + bd9d4e6 commit 925af1e

231 files changed

Lines changed: 117265 additions & 10238 deletions

File tree

Some content is hidden

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

.git-blame-ignore-revs

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,21 @@
55
#
66
# $ git config blame.ignoreRevsFile .git-blame-ignore-revs
77

8-
# formatting with pgindent
8+
# Formatting
99
32c45b75b27e3f690236a9d1c8d13a025316ad2f
10-
# Fix formatting to comply with pgindent
1110
2ec065b53823e50dd1ac1d7cf925ae5f90e293ea
12-
# Fix formatting issues
1311
3e42150e3b0402ae865d9a827d8d178568a0d27e
14-
# Run clang-format on code
1512
34edba16a9385a4b0353e8e07a19dba98d7e3fb9
16-
# Run pg_format on SQL files
13+
20f223ca728a02a67578564496b0946b39cc401b
1714
3f5872ec61650519e2c5e6fe1dfb60d07696cac7
18-
# Fix various misspellings
1915
68aec9593c0f37dddbaa4f2e2b34a9ba3f5b11d9
20-
# Switch to clang-format-14
2116
7758f5959c8ed64499ab0e6bb66c30464b11dd81
22-
# Remove trailing whitespaces from test code
2317
a4356f342f1732857a1d8057f71219b50f1919b2
24-
# Cosmetic changes to create.c
25-
230f368f4e5d146ce5f919cc5999b236997befaf
18+
5c0939e0354055a5571bd5c9d1e03f9cc251467d
19+
20+
# Test output normalization
21+
272ab4fe6a6f6e00ef7613ec99397a8de02c3282
22+
cdb815d92175949cf0d7c95d5c91accee3f35664
2623

2724
# Adding python and yaml linters
2825
9133319081aef92705f1405087822fc281d215d4
@@ -36,4 +33,11 @@ f862212c8ca19b1af56c7608a68f22b7dd0c985e
3633
ecf34132c69e1709cd393eab43b5fcbfd7c201db
3734
e75274ee7c6eef1dafc9b4f4d9f71e8e88f76813
3835
a3ef0384655d57200e83ad7b13c91a31177b97c1
36+
fc827c154a14013e806ff650af9a2c5255a3d30d
37+
38+
# Columnar Scan Rename
39+
11cfd275c355b47b791762e0b518d44f08e0cf43
40+
cb14558c990a38dccefce61f86bda6816e805a7e
3941

42+
# pragma once
43+
cfd65680cd5ab8545ddcf8241239bc4f5fed0e71

.github/ci_settings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
PG18_LATEST_WIN = "18.4"
2727
PG18_ABI_MIN = "18.0"
2828

29-
PG19_EARLIEST = "19beta1"
30-
PG19_LATEST = "19beta1"
29+
PG19_EARLIEST = "19beta2"
30+
PG19_LATEST = "19beta2"
3131
PG19_LATEST_WIN = None
3232
PG19_ABI_MIN = None
3333

.github/gh_matrix_builder.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ def macos_config(overrides):
196196
{
197197
"pg": PG19_LATEST,
198198
"tsdb_build_args": "-DWARNINGS_AS_ERRORS=ON -DEXPERIMENTAL=ON",
199-
"installcheck": False,
200-
"pginstallcheck": False,
199+
"pginstallcheck": True,
201200
}
202201
)
203202
)
@@ -322,6 +321,15 @@ def macos_config(overrides):
322321
}
323322
)
324323
)
324+
m["include"].append(
325+
build_debug_config(
326+
{
327+
"pg": 19,
328+
"snapshot": "snapshot",
329+
"tsdb_build_args": "-DWARNINGS_AS_ERRORS=ON -DEXPERIMENTAL=ON",
330+
}
331+
)
332+
)
325333
elif len(sys.argv) > 2:
326334
# Check if we need to check for the flaky tests. Determine which test files
327335
# have been changed in the PR. The sql files might include other files that

.github/workflows/linux-32bit-build-and-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
append-*
6666
bgw_db_scheduler*
6767
chunkwise_agg_cost
68-
columnar_scan_cost
68+
columnar_scan_cost*
6969
compress_bloom
7070
compress_bloom_sparse_compat
7171
compress_bloom_sparse_debug

.github/workflows/linux-build-and-test.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,14 @@ jobs:
220220
build/compile_commands.json
221221
222222
- name: Check exported symbols
223+
background: true
223224
run: ./build/scripts/export_prefix_check.sh
224225

226+
- name: pginstallcheck
227+
background: true
228+
if: matrix.pginstallcheck
229+
run: make -C build pginstallcheck
230+
225231
- name: make installcheck
226232
if: matrix.installcheck
227233
run: |
@@ -230,9 +236,8 @@ jobs:
230236
SKIPS="${{ join(matrix.skipped_tests, ' ') }}" ${{ matrix.installcheck_args }} \
231237
| tee installcheck.log
232238
233-
- name: pginstallcheck
234-
if: matrix.pginstallcheck
235-
run: make -C build pginstallcheck
239+
- name: Wait for checks to finish
240+
wait-all:
236241

237242
- name: coverage
238243
if: matrix.coverage

.unreleased/bugfix_10254

Lines changed: 0 additions & 1 deletion
This file was deleted.

.unreleased/columnar-wrong-null

Lines changed: 0 additions & 1 deletion
This file was deleted.

.unreleased/enable-disable-trigger-columnstore

Lines changed: 0 additions & 2 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixes: #10282 Only count directly compressed rows toward the command tag when the insert sets it
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fixes: #10281 Disable Direct Compress when the destination table has an exclusion constraint so the constraint is still enforced

0 commit comments

Comments
 (0)