Skip to content

Commit

Permalink
Merge branch 'main' into feature
Browse files Browse the repository at this point in the history
  • Loading branch information
hiirrxnn authored Jan 11, 2024
2 parents 777adda + c91aeae commit 4ec6e3b
Show file tree
Hide file tree
Showing 13 changed files with 919 additions and 214 deletions.
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,4 @@ tokio = { version = "1", features = ["macros"] }
typed-builder = "^0.18"
url = "2"
urlencoding = "2"
uuid = "1.6.1"

uuid = "1.6.1"
1 change: 1 addition & 0 deletions crates/iceberg/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,5 @@ uuid = { workspace = true }
[dev-dependencies]
pretty_assertions = { workspace = true }
tempfile = { workspace = true }
tera = { workspace = true }
tokio = { workspace = true }
2 changes: 2 additions & 0 deletions crates/iceberg/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,8 @@ define_from_err!(
"Failed to convert decimal literal to rust decimal"
);

define_from_err!(std::io::Error, ErrorKind::Unexpected, "IO Operation failed");

/// Helper macro to check arguments.
///
///
Expand Down
2 changes: 2 additions & 0 deletions crates/iceberg/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ mod avro;
pub mod io;
pub mod spec;

mod scan;

#[allow(dead_code)]
pub mod expr;
pub mod transaction;
Expand Down
Loading

0 comments on commit 4ec6e3b

Please sign in to comment.