From a8dedf8a4ac0b24bc9870d50a03617829a495bbf Mon Sep 17 00:00:00 2001 From: Sage Griffin Date: Mon, 6 Jul 2026 14:14:02 -0600 Subject: [PATCH] CI run for new parser (ignore) --- Dockerfile | 2 +- benches/bench.sh | 2 +- integration/common.sh | 2 +- integration/dev-server.sh | 2 +- integration/failover/dev-server.sh | 2 +- integration/load_balancer/pgdog.sh | 2 +- integration/logical/log.sh | 2 +- integration/two_pc_crash_safety/rspec_helper.rb | 2 +- pgdog/tests/flame/profile.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index a73e59d89..cd4322986 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN source ~/.cargo/env && \ export RUSTFLAGS="-Ctarget-feature=+lse"; \ fi && \ cd pgdog && \ - cargo build --release && \ + cargo build --release --features new_parser && \ cd .. && \ cargo build --release -p pgdog-primary-only-tables diff --git a/benches/bench.sh b/benches/bench.sh index b2d0341db..d615d8c0c 100644 --- a/benches/bench.sh +++ b/benches/bench.sh @@ -41,7 +41,7 @@ bench_run() { local root_dir root_dir="$(cd "${BENCH_DIR}/.." && pwd)" echo "Building pgdog (release)..." - cargo build --release --manifest-path "${root_dir}/Cargo.toml" + cargo build --release --features new_parser --manifest-path "${root_dir}/Cargo.toml" export PGDOG_BIN="${root_dir}/target/release/pgdog" fi echo "Binary: $(${PGDOG_BIN} --version 2>&1 || true)" diff --git a/integration/common.sh b/integration/common.sh index a6e590689..9c73063b2 100644 --- a/integration/common.sh +++ b/integration/common.sh @@ -31,7 +31,7 @@ function run_pgdog() { local pid_file="${COMMON_DIR}/pgdog.pid" local config_file="${COMMON_DIR}/pgdog.config" if [ -z "${binary}" ]; then - cargo build + cargo build --features new_parser binary="target/debug/pgdog" fi if [ -f "${pid_file}" ]; then diff --git a/integration/dev-server.sh b/integration/dev-server.sh index 2f17f6de2..fede9aaa5 100755 --- a/integration/dev-server.sh +++ b/integration/dev-server.sh @@ -5,7 +5,7 @@ source ${THIS_SCRIPT_DIR}/setup.sh source ${THIS_SCRIPT_DIR}/toxi/setup.sh pushd ${THIS_SCRIPT_DIR}/../ export NODE_ID=pgdog-dev-1 -CMD="cargo run -- --config ${THIS_SCRIPT_DIR}/pgdog.toml --users ${THIS_SCRIPT_DIR}/users.toml" +CMD="cargo run -ppgdog --features new_parser -- --config ${THIS_SCRIPT_DIR}/pgdog.toml --users ${THIS_SCRIPT_DIR}/users.toml" if [[ -z "$1" ]]; then cargo watch --shell "${CMD}" diff --git a/integration/failover/dev-server.sh b/integration/failover/dev-server.sh index 513f06312..e78f3dd83 100644 --- a/integration/failover/dev-server.sh +++ b/integration/failover/dev-server.sh @@ -3,5 +3,5 @@ set -e THIS_SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source ${THIS_SCRIPT_DIR}/../toxi/setup.sh pushd ${THIS_SCRIPT_DIR} -cargo run +cargo run --features new_parser popd diff --git a/integration/load_balancer/pgdog.sh b/integration/load_balancer/pgdog.sh index 2a319afdc..3ebe8915b 100644 --- a/integration/load_balancer/pgdog.sh +++ b/integration/load_balancer/pgdog.sh @@ -3,4 +3,4 @@ set -e SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) pushd ${SCRIPT_DIR}/../../ -cargo run -- --config ${SCRIPT_DIR}/pgdog.toml --users ${SCRIPT_DIR}/users.toml +cargo run --features new_parser -- --config ${SCRIPT_DIR}/pgdog.toml --users ${SCRIPT_DIR}/users.toml diff --git a/integration/logical/log.sh b/integration/logical/log.sh index da663d270..5317cd4f5 100644 --- a/integration/logical/log.sh +++ b/integration/logical/log.sh @@ -1,6 +1,6 @@ #!/bin/bash touch log.txt -cargo run > log.txt 2>&1 & +cargo run --features new_parser > log.txt 2>&1 & pid=$! trap shutdown INT diff --git a/integration/two_pc_crash_safety/rspec_helper.rb b/integration/two_pc_crash_safety/rspec_helper.rb index 3801eb026..f7362cb70 100644 --- a/integration/two_pc_crash_safety/rspec_helper.rb +++ b/integration/two_pc_crash_safety/rspec_helper.rb @@ -52,7 +52,7 @@ def spawn_pgdog(config_dir, wal_dir: nil) wal_dir ||= Dir.mktmpdir('pgdog_wal_') binary = ENV['PGDOG_BIN'] || File.expand_path('../../target/release/pgdog', __dir__) unless File.exist?(binary) - system('cargo', 'build', '--release', chdir: File.expand_path('../..', __dir__)) || + system('cargo', 'build', '--release', '--features', 'new_parser', chdir: File.expand_path('../..', __dir__)) || raise('cargo build failed') end log_path = File.join(config_dir, 'pgdog.log') diff --git a/pgdog/tests/flame/profile.sh b/pgdog/tests/flame/profile.sh index 9f09ba483..1cfe3035d 100644 --- a/pgdog/tests/flame/profile.sh +++ b/pgdog/tests/flame/profile.sh @@ -15,7 +15,7 @@ if [ ! -f ${PGDOG_BIN} ]; then echo "PgDog is not compiled in release mode (target/release/pgdog is missing)" echo "Please compile PgDog with:" echo - printf "\tcargo build --release" + printf "\tcargo build --release --features new_parser" echo echo exit 1