Skip to content

Commit

Permalink
Merge branch 'main' into scan_builder
Browse files Browse the repository at this point in the history
  • Loading branch information
OussamaSaoudi-db authored Nov 21, 2024
2 parents 3496adb + 38eb938 commit ed7d23d
Show file tree
Hide file tree
Showing 16 changed files with 118 additions and 93 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,27 @@ jobs:
- uses: Swatinem/rust-cache@v2
- name: format
run: cargo fmt -- --check
msrv:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install minimal stable and cargo msrv
uses: actions-rs/toolchain@v1
with:
profile: default
toolchain: stable
override: true
- uses: Swatinem/rust-cache@v2
- name: Install cargo-msrv
shell: bash
run: |
cargo install cargo-msrv --locked
- name: verify-msrv
run: |
cargo msrv --path kernel/ verify --all-features
cargo msrv --path derive-macros/ verify --all-features
cargo msrv --path ffi/ verify --all-features
cargo msrv --path ffi-proc-macros/ verify --all-features
docs:
runs-on: ubuntu-latest
env:
Expand Down
158 changes: 79 additions & 79 deletions CHANGELOG.md

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ edition = "2021"
homepage = "https://delta.io"
keywords = ["deltalake", "delta", "datalake"]
license = "Apache-2.0"
repository = "https://github.com/delta-incubator/delta-kernel-rs"
repository = "https://github.com/delta-io/delta-kernel-rs"
readme = "README.md"
rust-version = "1.80"
version = "0.4.0"

[workspace.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ Some design principles which should be considered:
[delta-github]: https://github.com/delta-io/delta
[java-kernel]: https://github.com/delta-io/delta/tree/master/kernel
[rustup]: https://rustup.rs
[architecture.md]: https://github.com/delta-incubator/delta-kernel-rs/tree/master/architecture.md
[architecture.md]: https://github.com/delta-io/delta-kernel-rs/tree/master/architecture.md
[dat]: https://github.com/delta-incubator/dat
[derive-macros]: https://doc.rust-lang.org/reference/procedural-macros.html
[API Docs]: https://docs.rs/delta_kernel/latest/delta_kernel/
Expand Down
1 change: 1 addition & 0 deletions acceptance/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ license.workspace = true
repository.workspace = true
readme.workspace = true
version.workspace = true
rust-version.workspace = true

[dependencies]
arrow-array = { workspace = true }
Expand Down
3 changes: 1 addition & 2 deletions derive-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ license.workspace = true
repository.workspace = true
readme.workspace = true
version.workspace = true
rust-version.workspace = true

[lib]
proc-macro = true
Expand All @@ -16,5 +17,3 @@ proc-macro = true
proc-macro2 = "1"
syn = { version = "2.0", features = ["extra-traits"] }
quote = "1.0"


3 changes: 2 additions & 1 deletion ffi-proc-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ keywords.workspace = true
license.workspace = true
repository.workspace = true
readme.workspace = true
rust-version.workspace = true
version.workspace = true

[lib]
proc-macro = true

[dependencies]
proc-macro2 = "1"
syn = { version = "2.0", features = ["extra-traits"] }
syn = { version = "2.0", features = ["extra-traits", "full"] }
quote = "1.0"
1 change: 1 addition & 0 deletions ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ license.workspace = true
repository.workspace = true
readme.workspace = true
version.workspace = true
rust-version.workspace = true
build = "build.rs"

[lib]
Expand Down
2 changes: 1 addition & 1 deletion ffi/src/expressions/kernel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ type VisitUnaryFn = extern "C" fn(data: *mut c_void, sibling_list_id: usize, chi
/// to visitor methods
/// TODO: Visit type information in struct field and null. This will likely involve using the schema
/// visitor. Note that struct literals are currently in flux, and may change significantly. Here is the relevant
/// issue: https://github.com/delta-incubator/delta-kernel-rs/issues/412
/// issue: https://github.com/delta-io/delta-kernel-rs/issues/412
#[repr(C)]
pub struct EngineExpressionVisitor {
/// An opaque engine state pointer
Expand Down
1 change: 1 addition & 0 deletions kernel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ readme.workspace = true
version.workspace = true
# exclude golden tests + golden test data since they push us over 10MB crate size limit
exclude = ["tests/golden_tables.rs", "tests/golden_data/" ]
rust-version.workspace = true

[package.metadata.docs.rs]
all-features = true
Expand Down
2 changes: 1 addition & 1 deletion kernel/src/engine/parquet_row_group_skipping.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ impl<'a> ParquetStatsProvider for RowGroupFilter<'a> {
// actually exists in the table's logical schema, and that any necessary logical to
// physical name mapping has been performed. Because we currently lack both the
// validation and the name mapping support, we must disable this optimization for the
// time being. See https://github.com/delta-incubator/delta-kernel-rs/issues/434.
// time being. See https://github.com/delta-io/delta-kernel-rs/issues/434.
return Some(self.get_parquet_rowcount_stat()).filter(|_| false);
};

Expand Down
2 changes: 1 addition & 1 deletion kernel/src/expressions/scalars.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ impl ArrayData {
}

#[deprecated(
note = "These fields will be removed eventually and are unstable. See https://github.com/delta-incubator/delta-kernel-rs/issues/291"
note = "These fields will be removed eventually and are unstable. See https://github.com/delta-io/delta-kernel-rs/issues/291"
)]
pub fn array_elements(&self) -> &[Scalar] {
&self.elements
Expand Down
4 changes: 2 additions & 2 deletions kernel/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
//! [read-table-single-threaded] example (and for a more complex multi-threaded reader see the
//! [read-table-multi-threaded] example).
//!
//! [read-table-single-threaded]: https://github.com/delta-incubator/delta-kernel-rs/tree/main/kernel/examples/read-table-single-threaded
//! [read-table-multi-threaded]: https://github.com/delta-incubator/delta-kernel-rs/tree/main/kernel/examples/read-table-multi-threaded
//! [read-table-single-threaded]: https://github.com/delta-io/delta-kernel-rs/tree/main/kernel/examples/read-table-single-threaded
//! [read-table-multi-threaded]: https://github.com/delta-io/delta-kernel-rs/tree/main/kernel/examples/read-table-multi-threaded
//!
//! # Engine traits
//!
Expand Down
4 changes: 2 additions & 2 deletions kernel/src/log_segment/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ fn test_replay_for_metadata() {
//
// NOTE: Each checkpoint part is a single-row file -- guaranteed to produce one row group.
//
// WARNING: https://github.com/delta-incubator/delta-kernel-rs/issues/434 -- We currently
// WARNING: https://github.com/delta-io/delta-kernel-rs/issues/434 -- We currently
// read parts 1 and 5 (4 in all instead of 2) because row group skipping is disabled for
// missing columns, but can still skip part 3 because has valid nullcount stats for P&M.
assert_eq!(data.len(), 4);
Expand Down Expand Up @@ -260,7 +260,7 @@ fn build_snapshot_with_bad_checkpoint_hint_fails() {
#[ignore]
#[test]
fn build_snapshot_with_missing_checkpoint_part_no_hint() {
// TODO: Handle checkpoints correctly so that this test passes: https://github.com/delta-incubator/delta-kernel-rs/issues/497
// TODO: Handle checkpoints correctly so that this test passes: https://github.com/delta-io/delta-kernel-rs/issues/497

// Part 2 of 3 is missing from checkpoint 5. The Snapshot should be made of checkpoint
// number 3 and commit files 4 to 7.
Expand Down
2 changes: 1 addition & 1 deletion kernel/src/scan/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@ mod tests {
// Predicate over a logically valid but physically missing column. No data files should be
// returned because the column is inferred to be all-null.
//
// WARNING: https://github.com/delta-incubator/delta-kernel-rs/issues/434 - This
// WARNING: https://github.com/delta-io/delta-kernel-rs/issues/434 - This
// optimization is currently disabled, so the one data file is still returned.
let predicate = Arc::new(column_expr!("missing").lt(1000i64));
let scan = snapshot
Expand Down
2 changes: 1 addition & 1 deletion kernel/tests/read.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,7 @@ fn predicate_references_invalid_missing_column() -> Result<(), Box<dyn std::erro
// Attempted skipping over a logically valid but physically missing column. We should be able to
// skip the data file because the missing column is inferred to be all-null.
//
// WARNING: https://github.com/delta-incubator/delta-kernel-rs/issues/434 -- currently disabled.
// WARNING: https://github.com/delta-io/delta-kernel-rs/issues/434 -- currently disabled.
//
//let expected = vec![
// "+--------+",
Expand Down

0 comments on commit ed7d23d

Please sign in to comment.