Skip to content

Martin/protobuf rust #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
0xcaff wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Martin/protobuf rust #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8f4e3fe
move to rust-protobuf
0xcaff Jul 21, 2025
44c1fef
fix read for optional paths
0xcaff Jul 21, 2025
62e0208
vendor protobuf
0xcaff Jul 21, 2025
aec2b73
add position tracking
0xcaff Jul 21, 2025
cc474b2
attempt to fix segfault
0xcaff Jul 21, 2025
6ddc876
attempt adding with location
0xcaff Jul 21, 2025
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
56 changes: 24 additions & 32 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ members = [
"packages/vendor/duckdb",
"packages/vendor/duckdb-loadable-macros",
"packages/vendor/libduckdb-sys",
"packages/vendor/protobuf",
"packages/duckdb_metadata",
"packages/duckdb_metadata_bin",
"packages/duckdb_protobuf"
Expand All @@ -14,3 +15,4 @@ members = [
duckdb = { path = 'packages/vendor/duckdb' }
duckdb-loadable-macros = { path = 'packages/vendor/duckdb-loadable-macros' }
libduckdb-sys = { path = 'packages/vendor/libduckdb-sys' }
protobuf = { path = 'packages/vendor/protobuf' }
13 changes: 13 additions & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,28 @@
patches = [ patches/libduckdb-sys+1.0.0.patch ];
};

protobufCrate = applyPatch {
src = pkgs.fetchCrate {
pname = "protobuf";
version = "3.5.0";
sha256 = "sha256-xU9CAl/LQT9Gk0OdnbZuViQUeeD1tbvJcmxc9ohuZM8=";
};
patches = [ patches/protobuf+3.5.0-range.patch patches/protobuf+3.5.0-reflection-range.patch ];
};

vendorScript = pkgs.writeShellScriptBin "vendor-deps" ''
set -euo pipefail
mkdir -p packages/vendor/duckdb
mkdir -p packages/vendor/duckdb-loadable-macros
mkdir -p packages/vendor/libduckdb-sys
mkdir -p packages/vendor/protobuf

cp -r ${duckdbCrate}/* packages/vendor/duckdb/
cp -r ${duckdbLoadableMacrosCrate}/* packages/vendor/duckdb-loadable-macros/
cp -r ${libduckdbSysCrate}/* packages/vendor/libduckdb-sys/
cp -r ${protobufCrate}/* packages/vendor/protobuf/

chmod -R +w packages/vendor
'';

vendoredSrc = pkgs.stdenvNoCC.mkDerivation {
Expand Down
8 changes: 4 additions & 4 deletions packages/duckdb_protobuf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ crate-type = ["cdylib"]

[dependencies]
anyhow = "1.0.86"
duckdb = { version = "1.0.0", features = ["vtab-loadable", "loadable_extension"] }
duckdb = { version = "1.0.0", features = [
"vtab-loadable",
"loadable_extension",
] }
duckdb-loadable-macros = "0.1.2"
prost = "0.13.0"
prost-reflect = "0.14.0"
protobuf = "3.5.0"
glob = "0.3.1"
byteorder = "1.5.0"
Expand All @@ -28,4 +29,3 @@ prost-build = "0.13.1"
[[test]]
name = "it"
path = "tests/it/main.rs"

59 changes: 0 additions & 59 deletions packages/duckdb_protobuf/src/filtered_dynamic_message.rs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion packages/duckdb_protobuf/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
mod filtered_dynamic_message;
mod io;
mod read;
mod types;
Expand Down
Loading