Skip to content
Closed
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
8 changes: 3 additions & 5 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
# This has a matcher for test panics, so we use it even though elsewhere
# we use actions-rs/toolchain.
- uses: hecrj/setup-rust-action@v1
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
rust-version: stable${{ matrix.host }}
targets: ${{ matrix.target }}
toolchain: stable
target: ${{ matrix.target }}
components: 'rustfmt, clippy'

# cargo publish
Expand Down
50 changes: 40 additions & 10 deletions .github/workflows/rust.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,18 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
# This has a matcher for test panics, so we use it even though elsewhere
# we use actions-rs/toolchain.
- uses: hecrj/setup-rust-action@v1
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
rust-version: stable${{ matrix.host }}
targets: ${{ matrix.target }}
toolchain: stable
target: ${{ matrix.target }}
components: 'rustfmt, clippy'

# download libduckdb
- uses: robinraju/[email protected]
name: Download duckdb
with:
repository: "duckdb/duckdb"
tag: "v1.2.0"
tag: "v1.2.1"
fileName: ${{ matrix.duckdb }}
out-file-path: .

Expand Down Expand Up @@ -112,9 +110,41 @@ jobs:
key: index-${{ runner.os }}-${{ github.run_number }}
restore-keys: |
index-${{ runner.os }}-
- uses: hecrj/setup-rust-action@v1
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
rust-version: stable
targets: x86_64-pc-windows-msvc
toolchain: stable
target: x86_64-pc-windows-msvc

- run: cargo install cargo-examples
- run: cargo install cargo-examples

Sanitizer:
name: Address Sanitizer
needs: test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
# Need nightly rust.
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: nightly
components: 'rust-src'

- name: Tests with asan
env:
RUSTFLAGS: -Zsanitizer=address -C debuginfo=0
RUSTDOCFLAGS: -Zsanitizer=address
ASAN_OPTIONS: "detect_stack_use_after_return=1:detect_leaks=1"
# Work around https://github.com/rust-lang/rust/issues/59125 by
# disabling backtraces. In an ideal world we'd probably suppress the
# leak sanitization, but we don't care about backtraces here, so long
# as the other tests have them.
RUST_BACKTRACE: "0"
run: |
cargo -Z build-std test --features "modern-full" --target x86_64-unknown-linux-gnu --package duckdb
- name: publish crates --dry-run
uses: katyo/publish-crates@v2
with:
path: './'
args: --allow-dirty --all-features
dry-run: true
ignore-unpublished-changes: true
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ members = [
]

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

[workspace.dependencies]
duckdb = { version = "1.2.0", path = "crates/duckdb" }
libduckdb-sys = { version = "1.2.0", path = "crates/libduckdb-sys" }
duckdb-loadable-macros = { version = "0.1.4", path = "crates/duckdb-loadable-macros" }
duckdb = { version = "1.2.1", path = "crates/duckdb" }
libduckdb-sys = { version = "1.2.1", path = "crates/libduckdb-sys" }
duckdb-loadable-macros = { version = "0.1.5", path = "crates/duckdb-loadable-macros" }
autocfg = "1.0"
bindgen = { version = "0.71.1", default-features = false }
byteorder = "1.3"
Expand Down
2 changes: 1 addition & 1 deletion crates/duckdb-loadable-macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "duckdb-loadable-macros"
version = "0.1.4"
version = "0.1.5"
authors.workspace = true
edition.workspace = true
license.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/duckdb/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "duckdb"
version = "1.2.0"
version = "1.2.1"
authors.workspace = true
edition.workspace = true
repository.workspace = true
Expand Down
1 change: 1 addition & 0 deletions crates/duckdb/src/types/string.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ pub struct DuckString<'a> {
}

impl<'a> DuckString<'a> {
#[allow(dead_code)]
pub(crate) fn new(ptr: &'a mut duckdb_string_t) -> Self {
DuckString { ptr }
}
Expand Down
5 changes: 3 additions & 2 deletions crates/duckdb/src/vtab/arrow.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
use super::{BindInfo, DataChunkHandle, InitInfo, LogicalTypeHandle, LogicalTypeId, TableFunctionInfo, VTab};
use super::{BindInfo, DataChunkHandle, InitInfo, LogicalTypeHandle, TableFunctionInfo, VTab};
use std::sync::Arc;
use std::sync::{atomic::AtomicBool, Mutex};

use crate::{
core::{ArrayVector, FlatVector, Inserter, ListVector, StructVector, Vector},
core::{ArrayVector, FlatVector, Inserter, ListVector, LogicalTypeId, StructVector, Vector},
types::DuckString,
};

use arrow::array::as_map_array;
use arrow::{
array::{
Expand Down
4 changes: 2 additions & 2 deletions crates/duckdb/src/vtab/excel.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::sync::atomic::{self, AtomicUsize};

use super::{BindInfo, DataChunkHandle, InitInfo, LogicalTypeHandle, LogicalTypeId, TableFunctionInfo, VTab};
use crate::core::Inserter;
use super::{BindInfo, DataChunkHandle, InitInfo, LogicalTypeHandle, TableFunctionInfo, VTab};
use crate::core::{Inserter, LogicalTypeId};
use calamine::{open_workbook_auto, DataType, Range, Reader};

#[repr(C)]
Expand Down
2 changes: 1 addition & 1 deletion crates/duckdb/src/vtab/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ mod excel;
pub use function::{BindInfo, InitInfo, TableFunction, TableFunctionInfo};
pub use value::Value;

use crate::core::{DataChunkHandle, LogicalTypeHandle, LogicalTypeId};
use crate::core::{DataChunkHandle, LogicalTypeHandle};
use ffi::{duckdb_bind_info, duckdb_data_chunk, duckdb_function_info, duckdb_init_info};

/// Given a raw pointer to a box, free the box and the data contained within it.
Expand Down
2 changes: 1 addition & 1 deletion crates/libduckdb-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "libduckdb-sys"
version = "1.2.0"
version = "1.2.1"
authors.workspace = true
edition.workspace = true
license.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/libduckdb-sys/duckdb-sources
Submodule duckdb-sources updated 272 files
Binary file modified crates/libduckdb-sys/duckdb.tar.gz
Binary file not shown.
Loading
Loading