Merge pull request #773 from NicoFrLy/homer11-duck-v1.5.3

Update DuckDB from v1.5.2 to v1.5.3

Author: adubovikov

.github/workflows/dev-release.yml

@@ -177,7 +177,7 @@ jobs:
           set -euo pipefail
           export VERSION="${VERSION#v}"
           if [ "${{ matrix.goarch }}" = "amd64" ]; then export EXT_PLATFORM=linux_amd64; else export EXT_PLATFORM=linux_arm64; fi
-          export DUCKDB_VERSION=v1.5.2
+          export DUCKDB_VERSION=v1.5.3
           ./scripts/download_duckdb_extensions.sh "$EXT_PLATFORM"
           # Only change nfpm arch line (global amd64→* breaks if the word appears elsewhere)
           sed -i 's/^arch: ".*"/arch: "${{ matrix.goarch }}"/' homer-core_workflow.yaml

.github/workflows/devel-homer11-packages.yml

@@ -186,7 +186,7 @@ jobs:
           set -euo pipefail
           export VERSION="${VERSION#v}"
           if [ "${{ matrix.goarch }}" = "amd64" ]; then export EXT_PLATFORM=linux_amd64; else export EXT_PLATFORM=linux_arm64; fi
-          export DUCKDB_VERSION=v1.5.2
+          export DUCKDB_VERSION=v1.5.3
           ./scripts/download_duckdb_extensions.sh "$EXT_PLATFORM"
           sed -i 's/^name: "homer-core"/name: "homer-core-devel"/' homer-core_workflow.yaml
           sed -i 's/^arch: ".*"/arch: "${{ matrix.goarch }}"/' homer-core_workflow.yaml

.github/workflows/release.yml

@@ -183,7 +183,7 @@ jobs:
           set -euo pipefail
           export VERSION="${VERSION#v}"
           if [ "${{ matrix.goarch }}" = "amd64" ]; then export EXT_PLATFORM=linux_amd64; else export EXT_PLATFORM=linux_arm64; fi
-          export DUCKDB_VERSION=v1.5.2
+          export DUCKDB_VERSION=v1.5.3
           ./scripts/download_duckdb_extensions.sh "$EXT_PLATFORM"
           sed -i 's/^arch: ".*"/arch: "${{ matrix.goarch }}"/' homer-core_workflow.yaml
           DUCKDB_VERSION="$DUCKDB_VERSION" EXT_PLATFORM="$EXT_PLATFORM" VERSION="$VERSION" \

Makefile

@@ -14,8 +14,8 @@ GIT_COMMIT := $(shell git rev-parse --short HEAD 2>/dev/null || echo "unknown")
 LDFLAGS := -s -w -X main.VERSION_APPLICATION=$(VERSION) -X main.BuildDate=$(BUILD_DATE) -X main.BuildTime=$(BUILD_TIME) -X main.GitCommit=$(GIT_COMMIT)
 
 # DuckDB extension bundle for deb/rpm — must match embedded DuckDB in src/go.mod
-# (github.com/duckdb/duckdb-go-bindings v0.10502.x → v1.5.2).
-DUCKDB_VERSION ?= v1.5.2
+# (github.com/duckdb/duckdb-go-bindings v0.10503.x → v1.5.3).
+DUCKDB_VERSION ?= v1.5.3
 
 # Used only by target glibc-polyfill (plain make release/all does not patch).
 # Example: make glibc-polyfill GLIBC_TARGET=2.28

docs/INGEST_PERFORMANCE.md

@@ -99,22 +99,10 @@ Artifacts after the script: `cpu.pb.gz`, `pprof-top.txt`, `homer.log` under `OUT
 
 ## `duckdb-go-bindings`: upstream vs fork
 
-Homer pulls DuckDB’s CGO stack through **`github.com/duckdb/duckdb-go/v2`**, which depends on the prebuilt static libs in **[`github.com/duckdb/duckdb-go-bindings`](https://github.com/duckdb/duckdb-go-bindings)** (see that repo for versioning, e.g. DuckDB `v1.5.2` → module tag **`v0.10502.0`**).
+Homer pulls DuckDB’s CGO stack through **`github.com/duckdb/duckdb-go/v2`**, which depends on the prebuilt static libs in **[`github.com/duckdb/duckdb-go-bindings`](https://github.com/duckdb/duckdb-go-bindings)** (see that repo for versioning, e.g. DuckDB `v1.5.3` → module tag **`v0.10503.0`**).
 
 By default **`src/go.mod` contains a `replace` directive** pointing to a fork that eliminates per-string CGO malloc/free in the Appender hot path (visible as `VectorAssignStringElementLen` + `duckdb_free` per-column in profiles). This fork has been benchmarked against upstream and showed a measurable reduction in CGO overhead at high PPS.
 
-The current `replace` in `src/go.mod`:
-
-```go
-replace github.com/duckdb/duckdb-go-bindings => github.com/adubovikov/duckdb-go-bindings v0.10502.0-homer.gcopt.3
-```
-
-To revert to upstream bindings, remove this `replace` line and run `go mod tidy`. For experiments (e.g. additional optimisations), you can update the fork reference:
-
-```go
-replace github.com/duckdb/duckdb-go-bindings => github.com/adubovikov/duckdb-go-bindings v0.10502.0-homer.gcopt.3
-```
-
 Then `go mod tidy`, rebuild, and compare with **`./scripts/profile_ingest_load.sh`** using the same `PROFILE_SEC`, `PPS`, and `OUT_DIR` naming. Use a **warm-up** (send traffic for several seconds before `profile?seconds=`) and **≥20–30 s** profiles so `runtime.cgocall` / Appender rows dominate over one-off init noise.
 
 Example A/B on one machine (same `PPS`/`PROFILE_SEC`): upstream vs fork showed **~1%** difference in total CPU sample time over 10 s (within run-to-run variance); treat small deltas as inconclusive until you repeat on your hardware and workload mix.

scripts/build_package.sh

@@ -127,15 +127,15 @@ sed -i "s|arch: \".*\"|arch: \"${ARCH}\"|g" "${NFPM_CONFIG}"
 
 echo "==> Downloading DuckDB extensions for ${ARCH} ..."
 if [ "$ARCH" = "amd64" ]; then EXT_PLATFORM=linux_amd64; else EXT_PLATFORM=linux_arm64; fi
-DUCKDB_VERSION=v1.5.2 "${BUILD_DIR}/scripts/download_duckdb_extensions.sh" "$EXT_PLATFORM"
+DUCKDB_VERSION=v1.5.3 "${BUILD_DIR}/scripts/download_duckdb_extensions.sh" "$EXT_PLATFORM"
 
 echo "==> Packaging ${PACKAGE}_${VERSION}_${ARCH}.deb ..."
-DUCKDB_VERSION=v1.5.2 EXT_PLATFORM="${EXT_PLATFORM}" VERSION="${VERSION}" "${BUILD_DIR}/nfpm" pkg \
+DUCKDB_VERSION=v1.5.3 EXT_PLATFORM="${EXT_PLATFORM}" VERSION="${VERSION}" "${BUILD_DIR}/nfpm" pkg \
   --config "${NFPM_CONFIG}" \
   --target "${BUILD_DIR}/${PACKAGE}_${VERSION}_${ARCH}.deb"
 
 echo "==> Packaging ${PACKAGE}_${VERSION}_${ARCH}.rpm ..."
-DUCKDB_VERSION=v1.5.2 EXT_PLATFORM="${EXT_PLATFORM}" VERSION="${VERSION}" "${BUILD_DIR}/nfpm" pkg \
+DUCKDB_VERSION=v1.5.3 EXT_PLATFORM="${EXT_PLATFORM}" VERSION="${VERSION}" "${BUILD_DIR}/nfpm" pkg \
   --config "${NFPM_CONFIG}" \
   --target "${BUILD_DIR}/${PACKAGE}_${VERSION}_${ARCH}.rpm"
 

scripts/download_duckdb_extensions.sh

@@ -4,15 +4,15 @@
 # -> ~/.duckdb/extensions/<version>/<platform>/...
 #
 # DUCKDB_VERSION must stay in sync with embedded DuckDB from
-# github.com/duckdb/duckdb-go-bindings in src/go.mod (e.g. v0.10502.x -> v1.5.2).
+# github.com/duckdb/duckdb-go-bindings in src/go.mod (e.g. v0.10503.x -> v1.5.3).
 #
 # Usage:
 #   ./scripts/download_duckdb_extensions.sh [EXT_PLATFORM]
 #   If EXT_PLATFORM is omitted, it is derived from uname (linux_amd64, …).
 
 set -euo pipefail
 
-DUCKDB_VERSION="${DUCKDB_VERSION:-v1.5.2}"
+DUCKDB_VERSION="${DUCKDB_VERSION:-v1.5.3}"
 
 if [ -n "${1:-}" ]; then
   EXT_PLATFORM="$1"

src/go.mod

@@ -12,7 +12,7 @@ require (
 	github.com/charmbracelet/bubbletea v1.3.10
 	github.com/charmbracelet/lipgloss v1.1.0
 	github.com/chzyer/readline v1.5.1
-	github.com/duckdb/duckdb-go/v2 v2.10502.0
+	github.com/duckdb/duckdb-go/v2 v2.10503.0
 	github.com/fasthttp/websocket v1.5.12
 	github.com/gaissmai/cidrtree v0.5.0
 	github.com/gnet-io/tls v0.0.0-20240508094059-f3c43f05f76d
@@ -61,12 +61,12 @@ require (
 	github.com/clipperhouse/displaywidth v0.9.0 // indirect
 	github.com/clipperhouse/stringish v0.1.1 // indirect
 	github.com/clipperhouse/uax29/v2 v2.5.0 // indirect
-	github.com/duckdb/duckdb-go-bindings v0.10502.0 // indirect
-	github.com/duckdb/duckdb-go-bindings/lib/darwin-amd64 v0.10502.0 // indirect
-	github.com/duckdb/duckdb-go-bindings/lib/darwin-arm64 v0.10502.0 // indirect
-	github.com/duckdb/duckdb-go-bindings/lib/linux-amd64 v0.10502.0 // indirect
-	github.com/duckdb/duckdb-go-bindings/lib/linux-arm64 v0.10502.0 // indirect
-	github.com/duckdb/duckdb-go-bindings/lib/windows-amd64 v0.10502.0 // indirect
+	github.com/duckdb/duckdb-go-bindings v0.10503.0 // indirect
+	github.com/duckdb/duckdb-go-bindings/lib/darwin-amd64 v0.10503.0 // indirect
+	github.com/duckdb/duckdb-go-bindings/lib/darwin-arm64 v0.10503.0 // indirect
+	github.com/duckdb/duckdb-go-bindings/lib/linux-amd64 v0.10503.0 // indirect
+	github.com/duckdb/duckdb-go-bindings/lib/linux-arm64 v0.10503.0 // indirect
+	github.com/duckdb/duckdb-go-bindings/lib/windows-amd64 v0.10503.0 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/gaissmai/extnetip v0.4.0 // indirect
@@ -139,10 +139,3 @@ require (
 	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 )
-
-// adubovikov fork: eliminates per-string CGO malloc/free in Appender hot path
-// (VectorAssignStringElementLen + duckdb_free per-column visible in perf)
-replace (
-	github.com/duckdb/duckdb-go-bindings => github.com/adubovikov/duckdb-go-bindings v0.10502.0-homer.gcopt.4
-	github.com/duckdb/duckdb-go/v2 => github.com/adubovikov/duckdb-go/v2 v2.10502.0-homer.1
-)

src/go.sum

@@ -4,10 +4,6 @@ github.com/Jeffail/gabs/v2 v2.7.0 h1:Y2edYaTcE8ZpRsR2AtmPu5xQdFDIthFG0jYhu5PY8kg
 github.com/Jeffail/gabs/v2 v2.7.0/go.mod h1:dp5ocw1FvBBQYssgHsG7I1WYsiLRtkUaB1FEtSwvNUw=
 github.com/VictoriaMetrics/fastcache v1.13.2 h1:2XTB49aLSuCex7e9P5rqrfQcMkzGjh5Vq3GMFa8YpCA=
 github.com/VictoriaMetrics/fastcache v1.13.2/go.mod h1:hHXhl4DA2fTL2HTZDJFXWgW0LNjo6B+4aj2Wmng3TjU=
-github.com/adubovikov/duckdb-go-bindings v0.10502.0-homer.gcopt.4 h1:POEhov9f6zTTe8ycVCAhw2oVb7vQRhnrh0ademlxfnc=
-github.com/adubovikov/duckdb-go-bindings v0.10502.0-homer.gcopt.4/go.mod h1:8KF3oEKrmYdSbZnQ1BPTdxAZDHRaM1LEv+oBvL2nSLk=
-github.com/adubovikov/duckdb-go/v2 v2.10502.0-homer.1 h1:r1h5DeqIKCUDVuL+2+dl9b69bP7hhpISJ6aD7hNQ7/g=
-github.com/adubovikov/duckdb-go/v2 v2.10502.0-homer.1/go.mod h1:hyw+B4IYFx9L5Aqc2qfHQdG4K01vivbguYcrZwQ5gF8=
 github.com/ajstarks/svgo v0.0.0-20200320125537-f189e35d30ca/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
 github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI=
 github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
@@ -61,16 +57,20 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/duckdb/duckdb-go-bindings/lib/darwin-amd64 v0.10502.0 h1:1GxSHSI1ef3sCdDVrJ9l8s6aTd7P1K788os9lHrs43g=
-github.com/duckdb/duckdb-go-bindings/lib/darwin-amd64 v0.10502.0/go.mod h1:EnAvZh1kNJHp5yF+M1ZHNEvapnmt6anq1xXHVrAGqMo=
-github.com/duckdb/duckdb-go-bindings/lib/darwin-arm64 v0.10502.0 h1:76gB6UiqKae6JptNiFLjwecD0oR87bXS5u6Lni9hSGI=
-github.com/duckdb/duckdb-go-bindings/lib/darwin-arm64 v0.10502.0/go.mod h1:IGLSeEcFhNeZF16aVjQCULD7TsFZKG5G7SyKJAXKp5c=
-github.com/duckdb/duckdb-go-bindings/lib/linux-amd64 v0.10502.0 h1:fcBKRy9keR5FLxppDD7ZjQ1EwqTRcA2kPLi2jWilPDw=
-github.com/duckdb/duckdb-go-bindings/lib/linux-amd64 v0.10502.0/go.mod h1:KAIynZ0GHCS7X5fRyuFnQMg/SZBPK/bS9OCOVojClxw=
-github.com/duckdb/duckdb-go-bindings/lib/linux-arm64 v0.10502.0 h1:pUwDWLQZIkm/v5aoGIu2cTAsgGqratxklRwP9zzsmiU=
-github.com/duckdb/duckdb-go-bindings/lib/linux-arm64 v0.10502.0/go.mod h1:81SGOYoEUs8qaAfSk1wRfM5oobrIJ5KI7AzYhK6/bvQ=
-github.com/duckdb/duckdb-go-bindings/lib/windows-amd64 v0.10502.0 h1:CDPf2ow6pP/9zYXfBdyT8a1GZ69eBWdMt5AhAsVgvyU=
-github.com/duckdb/duckdb-go-bindings/lib/windows-amd64 v0.10502.0/go.mod h1:K25pJL26ARblGDeuAkrdblFvUen92+CwksLtPEHRqqQ=
+github.com/duckdb/duckdb-go-bindings v0.10503.0 h1:nBms3habub5GB3N7zV7l1BwFP2mdRGrUepa+s5feZ1E=
+github.com/duckdb/duckdb-go-bindings v0.10503.0/go.mod h1:USV+K6f/1gJBElmujc08nbJLSqPde1tqGrYuw/xR518=
+github.com/duckdb/duckdb-go-bindings/lib/darwin-amd64 v0.10503.0 h1:O/yDkGeEZhWcRQwXGCy4SOioPqg8UNJEU/r4p6tMsgg=
+github.com/duckdb/duckdb-go-bindings/lib/darwin-amd64 v0.10503.0/go.mod h1:EnAvZh1kNJHp5yF+M1ZHNEvapnmt6anq1xXHVrAGqMo=
+github.com/duckdb/duckdb-go-bindings/lib/darwin-arm64 v0.10503.0 h1:gTYLRJZd9DcNtT3UkT+5NmMU1BgDZ22eP1vBGMjV2Z0=
+github.com/duckdb/duckdb-go-bindings/lib/darwin-arm64 v0.10503.0/go.mod h1:IGLSeEcFhNeZF16aVjQCULD7TsFZKG5G7SyKJAXKp5c=
+github.com/duckdb/duckdb-go-bindings/lib/linux-amd64 v0.10503.0 h1:XzD2yzX9trLosZJYrCAgf/WDek6ANJHCQOFaoH7hfzg=
+github.com/duckdb/duckdb-go-bindings/lib/linux-amd64 v0.10503.0/go.mod h1:KAIynZ0GHCS7X5fRyuFnQMg/SZBPK/bS9OCOVojClxw=
+github.com/duckdb/duckdb-go-bindings/lib/linux-arm64 v0.10503.0 h1:zYkiCNaQAmneI98Hfjj31TLR9QnPA+8IuablmWPthog=
+github.com/duckdb/duckdb-go-bindings/lib/linux-arm64 v0.10503.0/go.mod h1:81SGOYoEUs8qaAfSk1wRfM5oobrIJ5KI7AzYhK6/bvQ=
+github.com/duckdb/duckdb-go-bindings/lib/windows-amd64 v0.10503.0 h1:InTPj+kxhdsFmG8iip6FAqJoH8Oerx0tW4dzfxqkAEk=
+github.com/duckdb/duckdb-go-bindings/lib/windows-amd64 v0.10503.0/go.mod h1:K25pJL26ARblGDeuAkrdblFvUen92+CwksLtPEHRqqQ=
+github.com/duckdb/duckdb-go/v2 v2.10503.0 h1:cl8hbxl8Wn2rBuBWVyyDyJe/ZfCji7wrMPZ/EdFzN1Y=
+github.com/duckdb/duckdb-go/v2 v2.10503.0/go.mod h1:3trgI3LZo7TTgJYAP9+xCDJYdAF+E+TKE41JWKeWE5I=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=