This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/arrow-flight-sql-postgresql.git
The following commit(s) were added to refs/heads/main by this push:
new 9366707 Add CI jobs for PostgreSQL 17 (#196)
9366707 is described below
commit 9366707ce41303233f99f81d681f88695ddb5ab8
Author: Sutou Kouhei <[email protected]>
AuthorDate: Wed Jan 1 16:21:38 2025 +0900
Add CI jobs for PostgreSQL 17 (#196)
Closes GH-195
---
.github/workflows/package.yaml | 2 ++
.github/workflows/test.yaml | 1 +
.github/workflows/verify-rc.yaml | 1 +
ci/scripts/prepare-ubuntu.sh | 6 ++--
package/apt/test.sh | 6 ++--
.../arrow-flight-sql-postgresql-package-task.rb | 2 ++
.../apt/debian-bookworm-amd64/Dockerfile | 7 ++--
.../apt/ubuntu-jammy-amd64/Dockerfile | 7 ++--
.../apt/debian-bookworm-amd64/Dockerfile | 7 ++--
.../apt/ubuntu-jammy-amd64/Dockerfile | 7 ++--
package/postgresql-17-pgdg/Dockerfile | 36 +++++++++++++++++++
package/postgresql-17-pgdg/Rakefile | 32 +++++++++++++++++
.../apt/debian-bookworm-amd64/Dockerfile | 9 +++--
.../apt/ubuntu-noble-amd64}/Dockerfile | 11 +++---
package/postgresql-17-pgdg/debian/changelog | 0
package/postgresql-17-pgdg/debian/control | 41 ++++++++++++++++++++++
package/postgresql-17-pgdg/debian/copyright | 26 ++++++++++++++
package/postgresql-17-pgdg/debian/rules | 37 +++++++++++++++++++
src/afs.cc | 5 ++-
test/helper/sandbox.rb | 4 +--
20 files changed, 225 insertions(+), 22 deletions(-)
diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
index 0ad4a1f..2ff4fa7 100644
--- a/.github/workflows/package.yaml
+++ b/.github/workflows/package.yaml
@@ -80,6 +80,8 @@ jobs:
- "ubuntu-jammy-amd64-postgresql-15-pgdg"
- "debian-bookworm-amd64-postgresql-16-pgdg"
- "ubuntu-jammy-amd64-postgresql-16-pgdg"
+ - "debian-bookworm-amd64-postgresql-17-pgdg"
+ - "ubuntu-noble-amd64-postgresql-17-pgdg"
steps:
- uses: actions/checkout@v4
with:
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 93a1baa..78dd0e6 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -42,6 +42,7 @@ jobs:
postgresql-version:
- "15"
- "16"
+ - "17"
steps:
- uses: actions/checkout@v4
- name: Prepare
diff --git a/.github/workflows/verify-rc.yaml b/.github/workflows/verify-rc.yaml
index 86a966b..d9a5a3f 100644
--- a/.github/workflows/verify-rc.yaml
+++ b/.github/workflows/verify-rc.yaml
@@ -41,6 +41,7 @@ jobs:
postgresql-version:
- "15"
- "16"
+ - "17"
steps:
- uses: actions/checkout@v4
- name: Prepare
diff --git a/ci/scripts/prepare-ubuntu.sh b/ci/scripts/prepare-ubuntu.sh
index 41770d4..7e5d8b1 100755
--- a/ci/scripts/prepare-ubuntu.sh
+++ b/ci/scripts/prepare-ubuntu.sh
@@ -35,12 +35,14 @@ wget
https://apache.jfrog.io/artifactory/arrow/${os}/${apt_source_deb}
sudo apt install -y -V ./${apt_source_deb}
wget -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \
- sudo gpg --no-default-keyring --keyring /usr/share/keyrings/pgdg.gpg
--import -
+ gpg --no-default-keyring --keyring ./pgdg.kbx --import -
+gpg --no-default-keyring --keyring ./pgdg.kbx --export --armor | \
+ tee /usr/share/keyrings/pgdg.asc
(echo "Types: deb"; \
echo "URIs: http://apt.postgresql.org/pub/repos/apt";; \
echo "Suites: ${code_name}-pgdg"; \
echo "Components: main"; \
- echo "Signed-By: /usr/share/keyrings/pgdg.gpg") | \
+ echo "Signed-By: /usr/share/keyrings/pgdg.asc") | \
sudo tee /etc/apt/sources.list.d/pgdg.sources
sudo apt update
diff --git a/package/apt/test.sh b/package/apt/test.sh
index 27113df..81e8631 100755
--- a/package/apt/test.sh
+++ b/package/apt/test.sh
@@ -96,12 +96,14 @@ case "${TYPE}" in
esac
wget -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \
- gpg --no-default-keyring --keyring /usr/share/keyrings/pgdg.gpg --import -
+ gpg --no-default-keyring --keyring ./pgdg.kbx --import -
+gpg --no-default-keyring --keyring ./pgdg.kbx --export --armor | \
+ tee /usr/share/keyrings/pgdg.asc
(echo "Types: deb"; \
echo "URIs: http://apt.postgresql.org/pub/repos/apt";; \
echo "Suites: ${code_name}-pgdg"; \
echo "Components: main"; \
- echo "Signed-By: /usr/share/keyrings/pgdg.gpg") | \
+ echo "Signed-By: /usr/share/keyrings/pgdg.asc") | \
tee /etc/apt/sources.list.d/pgdg.sources
echo "::endgroup::"
diff --git a/package/arrow-flight-sql-postgresql-package-task.rb
b/package/arrow-flight-sql-postgresql-package-task.rb
index 072fb49..099942c 100644
--- a/package/arrow-flight-sql-postgresql-package-task.rb
+++ b/package/arrow-flight-sql-postgresql-package-task.rb
@@ -75,6 +75,8 @@ class ArrowFlightSQLPostgreSQLPackageTask < PackageTask
# "debian-bookworm-arm64",
"ubuntu-jammy-amd64",
# "ubuntu-jammy-arm64",
+ "ubuntu-noble-amd64",
+ # "ubuntu-noble-arm64",
]
end
diff --git a/package/postgresql-15-pgdg/apt/debian-bookworm-amd64/Dockerfile
b/package/postgresql-15-pgdg/apt/debian-bookworm-amd64/Dockerfile
index 546a8ac..475f6ec 100644
--- a/package/postgresql-15-pgdg/apt/debian-bookworm-amd64/Dockerfile
+++ b/package/postgresql-15-pgdg/apt/debian-bookworm-amd64/Dockerfile
@@ -46,12 +46,15 @@ RUN \
./apache-arrow-apt-source-latest-${code_name}.deb && \
rm apache-arrow-apt-source-latest-${code_name}.deb && \
wget -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \
- gpg --no-default-keyring --keyring /usr/share/keyrings/pgdg.gpg --import -
&& \
+ gpg --no-default-keyring --keyring ./pgdg.kbx --import - && \
+ gpg --no-default-keyring --keyring ./pgdg.kbx --export --armor > \
+ /usr/share/keyrings/pgdg.asc && \
+ rm pgdg.kbx && \
(echo "Types: deb"; \
echo "URIs: http://apt.postgresql.org/pub/repos/apt";; \
echo "Suites: ${code_name}-pgdg"; \
echo "Components: main"; \
- echo "Signed-By: /usr/share/keyrings/pgdg.gpg") | \
+ echo "Signed-By: /usr/share/keyrings/pgdg.asc") | \
tee /etc/apt/sources.list.d/pgdg.sources && \
apt update && \
apt install -y -V ${quiet} \
diff --git a/package/postgresql-15-pgdg/apt/ubuntu-jammy-amd64/Dockerfile
b/package/postgresql-15-pgdg/apt/ubuntu-jammy-amd64/Dockerfile
index 174e15e..a936980 100644
--- a/package/postgresql-15-pgdg/apt/ubuntu-jammy-amd64/Dockerfile
+++ b/package/postgresql-15-pgdg/apt/ubuntu-jammy-amd64/Dockerfile
@@ -42,12 +42,15 @@ RUN \
./apache-arrow-apt-source-latest-${code_name}.deb && \
rm apache-arrow-apt-source-latest-${code_name}.deb && \
wget -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \
- gpg --no-default-keyring --keyring /usr/share/keyrings/pgdg.gpg --import -
&& \
+ gpg --no-default-keyring --keyring ./pgdg.kbx --import - && \
+ gpg --no-default-keyring --keyring ./pgdg.kbx --export --armor > \
+ /usr/share/keyrings/pgdg.asc && \
+ rm pgdg.kbx && \
(echo "Types: deb"; \
echo "URIs: http://apt.postgresql.org/pub/repos/apt";; \
echo "Suites: ${code_name}-pgdg"; \
echo "Components: main"; \
- echo "Signed-By: /usr/share/keyrings/pgdg.gpg") | \
+ echo "Signed-By: /usr/share/keyrings/pgdg.asc") | \
tee /etc/apt/sources.list.d/pgdg.sources && \
apt update && \
apt install -y -V ${quiet} \
diff --git a/package/postgresql-16-pgdg/apt/debian-bookworm-amd64/Dockerfile
b/package/postgresql-16-pgdg/apt/debian-bookworm-amd64/Dockerfile
index 01e6e4b..4a6c25f 100644
--- a/package/postgresql-16-pgdg/apt/debian-bookworm-amd64/Dockerfile
+++ b/package/postgresql-16-pgdg/apt/debian-bookworm-amd64/Dockerfile
@@ -46,12 +46,15 @@ RUN \
./apache-arrow-apt-source-latest-${code_name}.deb && \
rm apache-arrow-apt-source-latest-${code_name}.deb && \
wget -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \
- gpg --no-default-keyring --keyring /usr/share/keyrings/pgdg.gpg --import -
&& \
+ gpg --no-default-keyring --keyring ./pgdg.kbx --import - && \
+ gpg --no-default-keyring --keyring ./pgdg.kbx --export --armor > \
+ /usr/share/keyrings/pgdg.asc && \
+ rm pgdg.kbx && \
(echo "Types: deb"; \
echo "URIs: http://apt.postgresql.org/pub/repos/apt";; \
echo "Suites: ${code_name}-pgdg"; \
echo "Components: main"; \
- echo "Signed-By: /usr/share/keyrings/pgdg.gpg") | \
+ echo "Signed-By: /usr/share/keyrings/pgdg.asc") | \
tee /etc/apt/sources.list.d/pgdg.sources && \
apt update && \
apt install -y -V ${quiet} \
diff --git a/package/postgresql-16-pgdg/apt/ubuntu-jammy-amd64/Dockerfile
b/package/postgresql-16-pgdg/apt/ubuntu-jammy-amd64/Dockerfile
index 18105ff..7038947 100644
--- a/package/postgresql-16-pgdg/apt/ubuntu-jammy-amd64/Dockerfile
+++ b/package/postgresql-16-pgdg/apt/ubuntu-jammy-amd64/Dockerfile
@@ -42,12 +42,15 @@ RUN \
./apache-arrow-apt-source-latest-${code_name}.deb && \
rm apache-arrow-apt-source-latest-${code_name}.deb && \
wget -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \
- gpg --no-default-keyring --keyring /usr/share/keyrings/pgdg.gpg --import -
&& \
+ gpg --no-default-keyring --keyring ./pgdg.kbx --import - && \
+ gpg --no-default-keyring --keyring ./pgdg.kbx --export --armor > \
+ /usr/share/keyrings/pgdg.asc && \
+ rm pgdg.kbx && \
(echo "Types: deb"; \
echo "URIs: http://apt.postgresql.org/pub/repos/apt";; \
echo "Suites: ${code_name}-pgdg"; \
echo "Components: main"; \
- echo "Signed-By: /usr/share/keyrings/pgdg.gpg") | \
+ echo "Signed-By: /usr/share/keyrings/pgdg.asc") | \
tee /etc/apt/sources.list.d/pgdg.sources && \
apt update && \
apt install -y -V ${quiet} \
diff --git a/package/postgresql-17-pgdg/Dockerfile
b/package/postgresql-17-pgdg/Dockerfile
new file mode 100644
index 0000000..ab706be
--- /dev/null
+++ b/package/postgresql-17-pgdg/Dockerfile
@@ -0,0 +1,36 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+FROM postgres:17-bookworm
+
+COPY package/docker/postgresql-17-pgdg-apache-arrow-flight-sql_*_amd64.deb ./
+RUN \
+ apt update && \
+ apt install -y -V lsb-release wget && \
+ wget
https://apache.jfrog.io/artifactory/arrow/debian/apache-arrow-apt-source-latest-$(lsb_release
--codename --short).deb && \
+ apt install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename
--short).deb && \
+ rm apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb && \
+ apt update && \
+ apt install -y -V \
+ ./postgresql-17-pgdg-apache-arrow-flight-sql_*.deb && \
+ rm -f postgresql-17-pgdg-apache-arrow-flight-sql_*.deb && \
+ apt clean && \
+ rm -rf /var/lib/apt/lists/*
+
+COPY package/docker/apache-arrow-flight-sql-enable.sh
/docker-entrypoint-initdb.d/
+
+EXPOSE 15432
diff --git a/package/postgresql-17-pgdg/Rakefile
b/package/postgresql-17-pgdg/Rakefile
new file mode 100644
index 0000000..eba15f4
--- /dev/null
+++ b/package/postgresql-17-pgdg/Rakefile
@@ -0,0 +1,32 @@
+# -*- ruby -*-
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require_relative "../arrow-flight-sql-postgresql-package-task"
+
+class PostgreSQL17PGDGPackageTask < ArrowFlightSQLPostgreSQLPackageTask
+ def initialize
+ super("postgresql-17-pgdg-apache-arrow-flight-sql")
+ end
+
+ def enable_yum?
+ false
+ end
+end
+
+PostgreSQL17PGDGPackageTask.new.define
diff --git a/package/postgresql-15-pgdg/apt/debian-bookworm-amd64/Dockerfile
b/package/postgresql-17-pgdg/apt/debian-bookworm-amd64/Dockerfile
similarity index 88%
copy from package/postgresql-15-pgdg/apt/debian-bookworm-amd64/Dockerfile
copy to package/postgresql-17-pgdg/apt/debian-bookworm-amd64/Dockerfile
index 546a8ac..5a41e05 100644
--- a/package/postgresql-15-pgdg/apt/debian-bookworm-amd64/Dockerfile
+++ b/package/postgresql-17-pgdg/apt/debian-bookworm-amd64/Dockerfile
@@ -46,12 +46,15 @@ RUN \
./apache-arrow-apt-source-latest-${code_name}.deb && \
rm apache-arrow-apt-source-latest-${code_name}.deb && \
wget -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \
- gpg --no-default-keyring --keyring /usr/share/keyrings/pgdg.gpg --import -
&& \
+ gpg --no-default-keyring --keyring ./pgdg.kbx --import - && \
+ gpg --no-default-keyring --keyring ./pgdg.kbx --export --armor > \
+ /usr/share/keyrings/pgdg.asc && \
+ rm pgdg.kbx && \
(echo "Types: deb"; \
echo "URIs: http://apt.postgresql.org/pub/repos/apt";; \
echo "Suites: ${code_name}-pgdg"; \
echo "Components: main"; \
- echo "Signed-By: /usr/share/keyrings/pgdg.gpg") | \
+ echo "Signed-By: /usr/share/keyrings/pgdg.asc") | \
tee /etc/apt/sources.list.d/pgdg.sources && \
apt update && \
apt install -y -V ${quiet} \
@@ -64,5 +67,5 @@ RUN \
libkrb5-dev \
meson \
ninja-build \
- postgresql-server-dev-15 && \
+ postgresql-server-dev-17 && \
apt clean
diff --git a/package/postgresql-15-pgdg/apt/ubuntu-jammy-amd64/Dockerfile
b/package/postgresql-17-pgdg/apt/ubuntu-noble-amd64/Dockerfile
similarity index 87%
copy from package/postgresql-15-pgdg/apt/ubuntu-jammy-amd64/Dockerfile
copy to package/postgresql-17-pgdg/apt/ubuntu-noble-amd64/Dockerfile
index 174e15e..5a733a7 100644
--- a/package/postgresql-15-pgdg/apt/ubuntu-jammy-amd64/Dockerfile
+++ b/package/postgresql-17-pgdg/apt/ubuntu-noble-amd64/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-ARG FROM=ubuntu:22.04
+ARG FROM=ubuntu:24.04
FROM ${FROM}
RUN \
@@ -42,12 +42,15 @@ RUN \
./apache-arrow-apt-source-latest-${code_name}.deb && \
rm apache-arrow-apt-source-latest-${code_name}.deb && \
wget -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | \
- gpg --no-default-keyring --keyring /usr/share/keyrings/pgdg.gpg --import -
&& \
+ gpg --no-default-keyring --keyring ./pgdg.kbx --import - && \
+ gpg --no-default-keyring --keyring ./pgdg.kbx --export --armor > \
+ /usr/share/keyrings/pgdg.asc && \
+ rm pgdg.kbx && \
(echo "Types: deb"; \
echo "URIs: http://apt.postgresql.org/pub/repos/apt";; \
echo "Suites: ${code_name}-pgdg"; \
echo "Components: main"; \
- echo "Signed-By: /usr/share/keyrings/pgdg.gpg") | \
+ echo "Signed-By: /usr/share/keyrings/pgdg.asc") | \
tee /etc/apt/sources.list.d/pgdg.sources && \
apt update && \
apt install -y -V ${quiet} \
@@ -61,5 +64,5 @@ RUN \
meson \
ninja-build \
pkg-config \
- postgresql-server-dev-15 && \
+ postgresql-server-dev-17 && \
apt clean
diff --git a/package/postgresql-17-pgdg/debian/changelog
b/package/postgresql-17-pgdg/debian/changelog
new file mode 100644
index 0000000..e69de29
diff --git a/package/postgresql-17-pgdg/debian/control
b/package/postgresql-17-pgdg/debian/control
new file mode 100644
index 0000000..56af282
--- /dev/null
+++ b/package/postgresql-17-pgdg/debian/control
@@ -0,0 +1,41 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+Source: postgresql-17-pgdg-apache-arrow-flight-sql
+Section: database
+Priority: optional
+Maintainer: Apache Arrow Developers <[email protected]>
+Build-Depends:
+ cmake,
+ debhelper-compat (= 13),
+ libarrow-flight-sql-dev,
+ libkrb5-dev,
+ meson,
+ postgresql-server-dev-17
+Standards-Version: 4.6.0
+Homepage: https://arrow.apache.org/flight-sql-postgresql/
+
+Package: postgresql-17-pgdg-apache-arrow-flight-sql
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ postgresql-17
+Description: Apache Arrow Flight SQL adapter for PostgreSQL
+ .
+ It provides a PostgreSQL module that adds Apache Arrow Flight SQL
+ interface to PostgreSQL.
diff --git a/package/postgresql-17-pgdg/debian/copyright
b/package/postgresql-17-pgdg/debian/copyright
new file mode 100644
index 0000000..c2452ee
--- /dev/null
+++ b/package/postgresql-17-pgdg/debian/copyright
@@ -0,0 +1,26 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Contact: Apache Arrow Developers <[email protected]>
+Source: https://packages.groonga.org/source/pgroonga/
+
+Files: *
+Copyright: 2022-2023 Apache Arrow Developers <[email protected]>
+License: Apache-2.0
+
+License: Apache-2.0
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ .
+ https://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the full text of the Apache Software License version 2 can
+ be found in the file `/usr/share/common-licenses/Apache-2.0'.
diff --git a/package/postgresql-17-pgdg/debian/rules
b/package/postgresql-17-pgdg/debian/rules
new file mode 100755
index 0000000..1f4fdc9
--- /dev/null
+++ b/package/postgresql-17-pgdg/debian/rules
@@ -0,0 +1,37 @@
+#!/usr/bin/make -f
+# -*- makefile-gmake -*-
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+export DEB_BUILD_MAINT_OPTIONS=reproducible=-timeless
+
+%:
+ dh $@
+
+override_dh_auto_configure:
+ dh_auto_configure \
+ --buildsystem=meson+ninja \
+ -- \
+ --buildtype=debugoptimized
+
+override_dh_auto_test:
diff --git a/src/afs.cc b/src/afs.cc
index 37f5bab..eb24161 100644
--- a/src/afs.cc
+++ b/src/afs.cc
@@ -578,7 +578,10 @@ static dshash_parameters SessionsParams = {
sizeof(SharedSessionData),
dshash_memcmp,
dshash_memhash,
- 0, // Set later because this is determined dynamically.
+#if PG_VERSION_NUM >= 170000
+ dshash_memcpy,
+#endif
+ /* .tranche_id = */ 0, // Set later because this is determined
dynamically.
};
struct SharedData {
diff --git a/test/helper/sandbox.rb b/test/helper/sandbox.rb
index bbbf9b9..a4b0c6e 100644
--- a/test/helper/sandbox.rb
+++ b/test/helper/sandbox.rb
@@ -57,8 +57,8 @@ module Helper
def run_command(*args)
pid, output_read, error_read = spawn_process(*args)
- output = ""
- error = ""
+ output = +""
+ error = +""
status = nil
timeout = 1
loop do
