Skip to content

Update duckdb-rs to DuckDB v1.0.0 #336

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

Merged
merged 6 commits into from
Jul 10, 2024
Merged

Update duckdb-rs to DuckDB v1.0.0 #336

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9bda125
Update Rust to v1.0.0
Mytherin Jun 10, 2024
dbf06e7
Remove define again
Mytherin Jun 15, 2024
9aa955e
Update crates/libduckdb-sys/build.rs
Mytherin Jun 17, 2024
c44bc24
Update build.rs
Mytherin Jun 18, 2024
2b31cb2
Remove patch again
Mytherin Jun 20, 2024
9f69269
Disable Windows for now
Mytherin Jul 10, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/rust.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
name: Download duckdb
with:
repository: "duckdb/duckdb"
tag: "v0.10.1"
tag: "v1.0.0"
fileName: ${{ matrix.duckdb }}
out-file-path: .

Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ members = [
]

[workspace.package]
version = "0.10.2"
version = "1.0.0"
authors = ["wangfenjin <[email protected]>"]
edition = "2021"
repository = "https://github.com/wangfenjin/duckdb-rs"
Expand All @@ -19,8 +19,8 @@ license = "MIT"
categories = ["database"]

[workspace.dependencies]
duckdb = { version = "0.10.2", path = "crates/duckdb" }
libduckdb-sys = { version = "0.10.2", path = "crates/libduckdb-sys" }
duckdb = { version = "1.0.0", path = "crates/duckdb" }
libduckdb-sys = { version = "1.0.0", path = "crates/libduckdb-sys" }
duckdb-loadable-macros = { version = "0.1.1", path = "crates/duckdb-loadable-macros" }
autocfg = "1.0"
bindgen = { version = "0.69", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion crates/duckdb/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "duckdb"
version = "0.10.2"
version = "1.0.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If duckdb and libduckdb-sys share the same version, this can simply be defined in the root manifest.

Suggested change
version = "1.0.0"
version.workspace = true

authors.workspace = true
edition.workspace = true
repository.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/libduckdb-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "libduckdb-sys"
version = "0.10.2"
version = "1.0.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment, could share the version from the root manifest.

Suggested change
version = "1.0.0"
version.workspace = true

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When i tried this previously it didnt work due to the "publish crates" CI job not understanding workspace properties.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/duckdb/duckdb-rs/actions/runs/9369017132/job/25793098113

I ended up updating the action anyway so it might be fixed now idk.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Maxxen
Might have been fixed: katyo/publish-crates#669

authors.workspace = true
edition.workspace = true
license.workspace = true
Expand Down
Binary file modified crates/libduckdb-sys/duckdb.tar.gz
View file
Open in desktop
Binary file not shown.
3,107 changes: 1 addition & 3,106 deletions crates/libduckdb-sys/src/bindgen_bundled_version.rs
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions crates/libduckdb-sys/update_sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ def get_sources(extensions):
)

subprocess.check_call(
'find "' + SCRIPT_DIR + '/../target" -type f -name bindgen.rs -exec rm {} \;',
'find "' + SCRIPT_DIR + '/../../target" -type f -name bindgen.rs -exec rm {} \;',
shell=True,
)

Expand All @@ -87,14 +87,14 @@ def get_sources(extensions):
print(
'find "'
+ SCRIPT_DIR
+ '/../target" -type f -name "bindgen.rs" -exec cp {} "'
+ '/../../target" -type f -name "bindgen.rs" -exec cp {} "'
+ SRC_DIR
+ '/bindgen_bundled_version.rs" \;'
)
subprocess.check_call(
'find "'
+ SCRIPT_DIR
+ '/../target" -type f -name "bindgen.rs" -exec cp {} "'
+ '/../../target" -type f -name "bindgen.rs" -exec cp {} "'
+ SRC_DIR
+ '/bindgen_bundled_version.rs" \;',
shell=True,
Expand Down
8 changes: 4 additions & 4 deletions crates/libduckdb-sys/upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ CUR_DIR=$(pwd -P)
echo "$SCRIPT_DIR"
cd "$SCRIPT_DIR" || { echo "fatal error" >&2; exit 1; }
cargo clean
mkdir -p "$SCRIPT_DIR/../target" "$SCRIPT_DIR/duckdb"
mkdir -p "$SCRIPT_DIR/../../target" "$SCRIPT_DIR/duckdb"
export DUCKDB_LIB_DIR="$SCRIPT_DIR/duckdb"
export DU_INCLUDE_DIR="$DUCKDB_LIB_DIR"

# Download and extract amalgamation
DUCKDB_VERSION=v0.10.2
DUCKDB_VERSION=v1.0.0
git submodule update --init --checkout
cd "$SCRIPT_DIR/duckdb-sources" || { echo "fatal error" >&2; exit 1; }
git fetch
Expand All @@ -22,9 +22,9 @@ python3 "$SCRIPT_DIR/update_sources.py"
rm -f "$SCRIPT_DIR/src/bindgen_bundled_version.rs"
cargo update
# Just to make sure there is only one bindgen.rs file in target dir
find "$SCRIPT_DIR/../target" -type f -name bindgen.rs -exec rm {} \;
find "$SCRIPT_DIR/../../target" -type f -name bindgen.rs -exec rm {} \;
env LIBDUCKDB_SYS_BUNDLING=1 cargo test --features "extensions-full buildtime_bindgen"
find "$SCRIPT_DIR/../target" -type f -name bindgen.rs -exec cp {} "$SCRIPT_DIR/src/bindgen_bundled_version.rs" \;
find "$SCRIPT_DIR/../../target" -type f -name bindgen.rs -exec cp {} "$SCRIPT_DIR/src/bindgen_bundled_version.rs" \;

# Sanity checks
cd "$SCRIPT_DIR/.." || { echo "fatal error" >&2; exit 1; }
Expand Down
4 changes: 2 additions & 2 deletions upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ fi

echo "Start to upgrade from $duckdb_rs_version to $duckdb_version"

sed -i '' "s/$duckdb_rs_version/$duckdb_version/g" Cargo.toml libduckdb-sys/upgrade.sh libduckdb-sys/Cargo.toml .github/workflows/rust.yaml
./libduckdb-sys/upgrade.sh
sed -i '' "s/$duckdb_rs_version/$duckdb_version/g" Cargo.toml crates/libduckdb-sys/upgrade.sh crates/libduckdb-sys/Cargo.toml .github/workflows/rust.yaml
./crates/libduckdb-sys/upgrade.sh