Skip to content

Commit

Permalink
deadlock duckDB patch (#3665)
Browse files Browse the repository at this point in the history
  • Loading branch information
k-anshul authored and mindspank committed Dec 18, 2023
1 parent 7d943ea commit 3f8e28f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
7 changes: 1 addition & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ require (
github.com/eapache/go-resiliency v1.3.0
github.com/envoyproxy/protoc-gen-validate v1.0.2
github.com/fatih/color v1.15.0
github.com/frankban/quicktest v1.14.4
github.com/go-git/go-git/v5 v5.7.0
github.com/go-logr/zapr v1.2.4
github.com/go-playground/validator/v10 v10.14.0
Expand Down Expand Up @@ -106,16 +105,12 @@ require (
github.com/dvsekhvalnov/jose2go v1.5.0 // indirect
github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect
github.com/jackc/pgtype v1.12.0 // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/mtibben/percent v0.2.1 // indirect
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
)

Expand Down Expand Up @@ -288,7 +283,7 @@ replace github.com/apache/calcite-avatica-go/v5 v5.2.0 => github.com/rilldata/ca

// using a patch with changes to support decimal256
// revert to original SDK on next duckDB release
replace github.com/marcboeker/go-duckdb v1.5.4 => github.com/rilldata/go-duckdb v0.0.0-20231130085954-877986834115
replace github.com/marcboeker/go-duckdb v1.5.4 => github.com/rilldata/go-duckdb v0.0.0-20231208152512-5e40f2025fc4

// snowflake uses arrow v12 but we need arrow v14 so we need to use a fork of snowflake upgraded to v14
// revert to original SDK once this PR is merged : https://github.com/snowflakedb/gosnowflake/pull/977
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1886,8 +1886,8 @@ github.com/richardlehane/msoleps v1.0.3 h1:aznSZzrwYRl3rLKRT3gUk9am7T/mLNSnJINvN
github.com/richardlehane/msoleps v1.0.3/go.mod h1:BWev5JBpU9Ko2WAgmZEuiz4/u3ZYTKbjLycmwiWUfWg=
github.com/rilldata/calcite-avatica-go/v5 v5.0.0-20231129075938-4645f00ea1f7 h1:VajkCy8DusWxmKR/4sAaPGFrFDWMgvRPSgiIyEryhvU=
github.com/rilldata/calcite-avatica-go/v5 v5.0.0-20231129075938-4645f00ea1f7/go.mod h1:+YWcYNcfM/D8qp3ykLq8Z0a9LjVZy3RW1d3+8Xbn4Q0=
github.com/rilldata/go-duckdb v0.0.0-20231130085954-877986834115 h1:vQEUi9BSB+Zfa/hX5JfwLDvZ6pnsfJ6/tGF3D0JY2GU=
github.com/rilldata/go-duckdb v0.0.0-20231130085954-877986834115/go.mod h1:wm91jO2GNKa6iO9NTcjXIRsW+/ykPoJbQcHSXhdAl28=
github.com/rilldata/go-duckdb v0.0.0-20231208152512-5e40f2025fc4 h1:gmcQnIR19x/RfPXqKys1f+jVP1G0sfReruQUW2Pip2g=
github.com/rilldata/go-duckdb v0.0.0-20231208152512-5e40f2025fc4/go.mod h1:wm91jO2GNKa6iO9NTcjXIRsW+/ykPoJbQcHSXhdAl28=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
Expand Down

0 comments on commit 3f8e28f

Please sign in to comment.