Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ jobs:
prefix-key: build-v1
- name: Build (debug)
if: steps.pgdog-bin.outputs.cache-hit != 'true'
run: cargo build --bin pgdog
run: cargo build --bin pgdog --features new_parser
- name: Build (release)
if: steps.pgdog-bin.outputs.cache-hit != 'true'
run: cargo build --release --bin pgdog
run: cargo build --release --bin pgdog --features new_parser
- name: Save pgdog binaries
if: steps.pgdog-bin.outputs.cache-hit != 'true'
uses: actions/cache/save@v5
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion benches/bench.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
2 changes: 1 addition & 1 deletion integration/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration/dev-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion integration/failover/dev-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion integration/load_balancer/pgdog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion integration/logical/log.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration/two_pc_crash_safety/rspec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion pgdog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ smallvec = "1"
reqwest.workspace = true
hex = "0.4"
x509-parser = "0.18"
pg_raw_parse = { git = "https://github.com/pgdogdev/pg_raw_parse.git", rev = "b2a15ec", optional = true }
pg_raw_parse = { git = "https://github.com/pgdogdev/pg_raw_parse.git", rev = "6421337", optional = true }
itertools = "0.15.0"

[target.'cfg(unix)'.dependencies]
Expand Down
1 change: 1 addition & 0 deletions pgdog/src/dont_poison_the_cache.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lol
Loading
Loading