npgsql batch research

Author: Vasilyev Dmitriy Viktorovich

.github/workflows/build-packages.yaml

@@ -45,7 +45,7 @@ jobs:
           wget -q https://static.rust-lang.org/dist/rust-1.84.1-x86_64-unknown-linux-gnu.tar.gz -O /tmp/rust.tar.gz &&
           cd /tmp && tar xf rust.tar.gz && ./rust-*-x86_64-unknown-linux-gnu/install.sh
       - name: Build binaries in release mode
-        run: cargo build --release
+        run: JEMALLOC_SYS_WITH_MALLOC_CONF="dirty_decay_ms:30000,muzzy_decay_ms:30000,background_thread:true,metadata_thp:auto" cargo build --release
       - name: Prepare output dir
         run: mkdir -p ./build_package/usr/bin && install ./target/release/pg_doorman ./build_package/usr/bin && mkdir -p ./out/
       - name: Check versions
@@ -88,7 +88,7 @@ jobs:
           wget -q https://static.rust-lang.org/dist/rust-1.84.1-x86_64-unknown-linux-gnu.tar.gz -O /tmp/rust.tar.gz &&
           cd /tmp && tar xf rust.tar.gz && ./rust-*-x86_64-unknown-linux-gnu/install.sh
       - name: Build binaries in release mode
-        run: cargo build --release
+        run: JEMALLOC_SYS_WITH_MALLOC_CONF="dirty_decay_ms:30000,muzzy_decay_ms:30000,background_thread:true,metadata_thp:auto" cargo build --release
       - name: Prepare output dir
         run: mkdir -p ./build_package/usr/bin && install ./target/release/pg_doorman ./build_package/usr/bin && mkdir -p ./out/
       - name: Check versions

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.8.1 (Apr 06th, 2025)
+
+### Fixed
+
+- fix config value of prepared_statements #21.
+- close declared cursors #23.
+- proxy server parameters #25.
+
 # 1.8.0 (Mar 20th, 2025)
 
 ### Fixed

Makefile

@@ -19,7 +19,8 @@ install: build
 
 test:
 	cargo test
-	./tests/tests.sh
 
 clippy:
 	cargo clippy -- --deny "warnings"
+
+include docker-compose-tests.mk

README.md

@@ -60,6 +60,7 @@ With docker compose:
 2. Run `cargo build --release` to get better benchmarks.
 3. Adjust the configuration in `pg_doorman.toml` to match your setup (this step is optional, given next).
 4. Execute `cargo run --release`. You're now ready to go!
+5. Also, you can use `make docker-compose-test-all` for testing with docker.
 
 ### Benchmarks
 

docker-compose-tests.mk

@@ -0,0 +1,37 @@
+docker-compose-test-all: docker-compose-test-go docker-compose-test-dotnet docker-compose-test-nodejs docker-compose-test-python docker-compose-test-ruby
+	echo ok
+
+docker-compose-up:
+	docker compose down --remove-orphans
+	docker compose up -d
+	sleep 2
+
+docker-compose-test-go: docker-compose-up
+	docker compose exec -T go_test /bin/bash -ec ' \
+		cd /tests && source ./env && \
+		go test -v .'
+
+docker-compose-test-python: docker-compose-up
+	docker compose exec -T python_test /bin/bash -ec ' \
+		cd /tests && \
+		python ./test_async.py && \
+		python ./test_psycopg2.py && \
+		python ./test_session_cursors.py'
+
+docker-compose-test-nodejs: docker-compose-up
+	docker compose exec -T nodejs_test /bin/bash -ec ' \
+		cd /tests && npm install pg && \
+		nodejs ./run.js'
+
+docker-compose-test-ruby: docker-compose-up
+	docker compose exec -T ruby_test /bin/bash -ec ' \
+	  cd /tests && bundle config path ruby && cd ruby && bundle install && \
+      bundle exec ruby test.rb && \
+      install /usr/bin/pg_doorman /tests/ && \
+      bundle exec rspec *_spec.rb'
+
+docker-compose-test-dotnet: docker-compose-up
+	docker compose exec -T dotnet_test /bin/bash -ec 'mkdir -p /tests/prj && cd /tests/prj && \
+      rm -rf ./batch && mkdir -p ./batch && cd ./batch && dotnet new sln --name Batch && dotnet new console --output . && dotnet add package Npgsql && cp -av ../../data/batch.cs ./Program.cs && dotnet run Program.cs && \
+      cd .. && rm -rf ./prepared && mkdir -p ./prepared && cd ./prepared && dotnet new sln --name Prepared && dotnet new console --output . && dotnet add package Npgsql && cp -av ../../data/prepared.cs ./Program.cs && dotnet run Program.cs && \
+      cd .. && rm -rf ./pbde2 && mkdir -p ./pbde2 && cd ./pbde2 && dotnet new sln --name PBDE2 && dotnet new console --output . && dotnet add package Npgsql && cp -av ../../data/PBDE_PBDE_S.cs ./Program.cs && dotnet run Program.cs'

docker-compose.yaml

@@ -12,8 +12,6 @@ services:
       - POSTGRES_HOST_AUTH_METHOD=trust
     volumes:
       - ./tests/fixture.sql:/docker-entrypoint-initdb.d/fixture.sql
-    ports:
-      - "5432:5432"
     healthcheck:
       test: [ "CMD-SHELL", "pg_isready -U postgres" ]
       interval: 30s
@@ -25,8 +23,6 @@ services:
 
   pg_doorman:
     network_mode: "host"
-    ports:
-      - "6433:6433"
     build:
       dockerfile: tests/pg_doorman.Dockerfile
     working_dir: /
@@ -42,35 +38,38 @@ services:
       dockerfile: tests/go_cache.Dockerfile
     working_dir: /
     network_mode: "host"
-    profiles:
-      - tests
-      - tests-go
     volumes:
       - ./tests/go:/tests
-    command: /bin/bash -ec 'cd /tests && source ./env && go test -v .'
-    restart: no
+    command: /bin/sleep infinity
 
   python_test:
     build:
       dockerfile: tests/python_cache.Dockerfile
     network_mode: "host"
-    profiles:
-      - tests
-      - tests-python
     volumes:
       - ./tests/python:/tests
-    command: /bin/bash -ec 'cd /tests && python ./test_async.py && python ./test_psycopg2.py && python ./test_session_cursors.py'
-    restart: no
+    command: /bin/sleep infinity
+
+  nodejs_test:
+    build:
+      dockerfile: tests/nodejs_test.Dockerfile
+    network_mode: "host"
+    volumes:
+      - ./tests/nodejs:/tests
+    command: /bin/sleep infinity
+
+  ruby_test:
+    build:
+      dockerfile: tests/ruby_test.Dockerfile
+    network_mode: "host"
+    volumes:
+      - ./tests:/tests
+    command: /bin/sleep infinity
 
   dotnet_test:
     build:
       dockerfile: tests/dotnet_test.Dockerfile
     network_mode: "host"
-    profiles:
-      - tests
-      - tests-dotnet
     volumes:
       - ./tests/dotnet:/tests
-    command: /bin/bash -ec 'cd /tests/prj &&
-      rm -rf ./batch && mkdir -p ./batch && cd ./batch && dotnet new sln --name Batch && dotnet new console --output . && dotnet add package Npgsql && cp -av ../../data/batch.cs ./Program.cs && dotnet run Program.cs'
-    restart: no
+    command: /bin/sleep infinity

tests/nodejs_test.Dockerfile

@@ -0,0 +1 @@
+FROM node:23-bookworm

tests/ruby_test.Dockerfile

@@ -0,0 +1,28 @@
+FROM rust:1.75.0-slim-bookworm AS builder
+
+RUN apt-get update && \
+    apt-get install -y build-essential pkg-config libssl-dev
+
+# cache
+COPY Cargo.toml Cargo.lock ./
+COPY patches ./patches
+RUN mkdir src && echo "fn main() {}" > src/main.rs
+RUN cargo fetch
+RUN cargo build --release
+RUN rm -rf src
+
+# build doorman
+COPY src ./src
+RUN cargo build --release
+
+FROM ubuntu:24.04
+
+RUN apt-get update && apt-get install -y ruby-bundler ruby-dev build-essential  \
+    bison openssl curl git-core zlib1g zlib1g-dev libssl-dev libyaml-dev  \
+    libxml2-dev autoconf libc6-dev ncurses-dev automake libtool postgresql-server-dev-all
+WORKDIR /tests
+RUN bundle config path ruby
+COPY ./tests/ruby/Gemfile .
+RUN bundle install
+
+COPY --from=builder /target/release/pg_doorman /usr/bin/pg_doorman