Skip to content

Commit 68f4f99

Browse files
feikesteenbergencevian
authored andcommitted
Default to PostgreSQL 16 for development
This includes a bump in the pgrx version used
1 parent 604f0b5 commit 68f4f99

File tree

9 files changed

+24
-26
lines changed

9 files changed

+24
-26
lines changed

.github/matrix/dependencies.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"0.0.0": {
33
"pg-version": [
4-
"15.4"
4+
"16.1"
55
],
66
"ts-version": [
7-
"2.11.x"
7+
"2.13.x"
88
]
99
}
1010
}

.github/workflows/deb-packager.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ on:
77
required: true
88
default: ''
99
PG:
10-
description: 'PG major version. Default: 15'
10+
description: 'PG major version. Default: 16'
1111
required: false
12-
default: '15'
12+
default: '16'
1313
PG_MIN:
14-
description: 'PG minor version. Default: 4'
14+
description: 'PG minor version. Default: 1'
1515
required: false
16-
default: '4'
16+
default: '1'
1717

1818
jobs:
1919
packager:

.github/workflows/docker.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
cloud_image_tag_prefix:
20-
- pg15
20+
- pg16
2121
pgversion:
22-
- 15
22+
- 16
2323
tsversion:
24-
- 2.11
24+
- 2.13
2525
steps:
2626
- name: Checkout Timescale Vector
2727
uses: actions/checkout@v3

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# syntax=docker/dockerfile:1.3-labs
2-
ARG PG_VERSION=15
3-
ARG TIMESCALEDB_VERSION_MAJMIN=2.11
4-
ARG PGRX_VERSION=0.10.0
2+
ARG PG_VERSION=16
3+
ARG TIMESCALEDB_VERSION_MAJMIN=2.13
4+
ARG PGRX_VERSION=0.11.1
55
ARG BASE_IMAGE=timescale/timescaledb-ha:pg${PG_VERSION}-ts${TIMESCALEDB_VERSION_MAJMIN}-all
66

77
FROM timescale/timescaledb-ha:pg${PG_VERSION}-ts${TIMESCALEDB_VERSION_MAJMIN}-all AS ha-build-tools
@@ -87,8 +87,8 @@ WORKDIR /build/timescale-vector
8787
RUN PG_CONFIG="/usr/lib/postgresql/${PG_VERSION}/bin/pg_config" make package
8888

8989
## COPY over the new files to the image. Done as a seperate stage so we don't
90-
## ship the build tools. Fixed pg15 image is intentional. The image ships with
91-
## PG 12, 13, 14 and 15 binaries. The PATH environment variable below is used
90+
## ship the build tools. Fixed pg16 image is intentional. The image ships with
91+
## PG 12, 13, 14, 15 and 16 binaries. The PATH environment variable below is used
9292
## to specify the runtime version.
9393
FROM ${BASE_IMAGE}
9494
ARG PG_VERSION

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
1010
and build tools, the postgres headers, in the preferred manner for your system. You may also need to install OpenSSl. For Ubuntu you can follow the postgres install instructions then run
1111

1212
```shell
13-
sudo apt-get install make gcc pkg-config clang postgresql-server-dev-15 libssl-dev
13+
sudo apt-get install make gcc pkg-config clang postgresql-server-dev-16 libssl-dev
1414
```
1515

1616
Next you need cargo-pgx, which can be installed with
@@ -22,7 +22,7 @@ You must reinstall cargo-pgx whenever you update your Rust compiler, since cargo
2222

2323
Finally, setup the pgx development environment with
2424
```shell
25-
cargo pgrx init --pg15 pg_config
25+
cargo pgrx init --pg16 pg_config
2626
```
2727

2828
Installing from source is also available on macOS and requires the same set of prerequisites and set up commands listed above.
@@ -48,7 +48,7 @@ The Timescale Vecotr project is still in the initial planning stage as we decide
4848
🔨 Testing
4949
See above for prerequisites and installation instructions.
5050

51-
You can run tests against a postgres version pg15 using
51+
You can run tests against a postgres version pg16 using
5252
```shell
5353
cargo pgrx test ${postgres_version}
5454
```

timescale_vector/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ edition = "2021"
77
crate-type = ["cdylib"]
88

99
[features]
10-
default = ["pg15"]
10+
default = ["pg16"]
1111
pg15 = ["pgrx/pg15", "pgrx-tests/pg15"]
12+
pg16 = ["pgrx/pg16", "pgrx-tests/pg16"]
1213
pg_test = []
1314

1415
[dependencies]
1516
memoffset = "0.9.0"
16-
pgrx = "=0.10.0"
17+
pgrx = "=0.11.1"
1718
rkyv = { version="0.7.42", features=["validation"]}
1819
simdeez = {version = "1.0"}
1920
reductive = { version = "0.9.0"}
@@ -28,7 +29,7 @@ rayon = "1"
2829

2930

3031
[dev-dependencies]
31-
pgrx-tests = "=0.10.0"
32+
pgrx-tests = "=0.11.1"
3233

3334
[profile.dev]
3435
panic = "unwind"

timescale_vector/src/access_method/distance_x86.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
use simdeez::scalar::*;
44
use simdeez::sse2::*;
55
use simdeez::sse41::*;
6-
use simdeez::*;
76
//use simdeez::avx::*;
87
use simdeez::avx2::*;
98

timescale_vector/src/access_method/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ mod pq;
2424
")]
2525
fn amhandler(_fcinfo: pg_sys::FunctionCallInfo) -> PgBox<pg_sys::IndexAmRoutine> {
2626
let mut amroutine =
27-
unsafe { PgBox::<pg_sys::IndexAmRoutine>::alloc_node(pg_sys::NodeTag_T_IndexAmRoutine) };
27+
unsafe { PgBox::<pg_sys::IndexAmRoutine>::alloc_node(pg_sys::NodeTag::T_IndexAmRoutine) };
2828

2929
amroutine.amstrategies = 0;
3030
amroutine.amsupport = 0; //TODO

timescale_vector/src/access_method/options.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
use memoffset::*;
2-
use pgrx::pg_sys::AsPgCStr;
3-
use pgrx::prelude::*;
4-
use pgrx::*;
2+
use pgrx::{pg_sys::AsPgCStr, prelude::*, set_varsize, PgRelation};
53
use std::fmt::Debug;
64

75
#[derive(Copy, Clone, Debug, PartialEq)]
@@ -84,7 +82,7 @@ pub unsafe extern "C" fn amoptions(
8482
build_relopts(reloptions, validate, tab)
8583
}
8684

87-
#[cfg(any(feature = "pg13", feature = "pg14", feature = "pg15"))]
85+
#[cfg(any(feature = "pg13", feature = "pg14", feature = "pg15", feature = "pg16"))]
8886
unsafe fn build_relopts(
8987
reloptions: pg_sys::Datum,
9088
validate: bool,

0 commit comments

Comments
 (0)