Skip to content
Merged
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
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ debug = true
debug = "line-tables-only"

[workspace.dependencies]
delta_kernel = { version = "0.15.2", features = [
delta_kernel = { version = "0.16.0", features = [
"arrow-56",
"default-engine-rustls",
"internal-api",
Expand Down Expand Up @@ -93,4 +93,4 @@ arro3 = "arro3"
Arro3 = "Arro3"
AKS = "AKS"
# to avoid using 'type' as a field name.
tpe = "tpe"
tpe = "tpe"
8 changes: 4 additions & 4 deletions crates/aws/tests/integration_s3_dynamodb.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ async fn test_create_s3_table() -> TestResult<()> {
let table_name = format!("{}_{}", "create_test", Uuid::new_v4());
let table_uri = context.uri_for_table(TestTables::Custom(table_name.to_owned()));

let schema = StructType::new(vec![StructField::new(
let schema = StructType::try_new(vec![StructField::new(
"id".to_string(),
DataType::Primitive(PrimitiveType::Integer),
true,
)]);
)])?;
let storage_options: HashMap<String, String> = HashMap::from([
(
deltalake_aws::constants::AWS_ALLOW_HTTP.into(),
Expand Down Expand Up @@ -454,11 +454,11 @@ fn add_action(name: &str) -> Action {
async fn prepare_table(context: &IntegrationContext, table_name: &str) -> TestResult<DeltaTable> {
let table_name = format!("{table_name}_{}", Uuid::new_v4());
let table_uri = context.uri_for_table(TestTables::Custom(table_name.to_owned()));
let schema = StructType::new(vec![StructField::new(
let schema = StructType::try_new(vec![StructField::new(
"Id".to_string(),
DataType::Primitive(PrimitiveType::Integer),
true,
)]);
)])?;
let table_url = Url::parse(&table_uri).unwrap();
let table = DeltaTableBuilder::from_uri(table_url)
.unwrap()
Expand Down
6 changes: 2 additions & 4 deletions crates/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,8 @@ parking_lot = "0.12"
percent-encoding = "2"
tracing = { workspace = true }
rand = "0.8"
maplit = "1"
sqlparser = { version = "0.56.0" }
humantime = { version = "2.1.0" }
humantime = { version = "2.1.0", optional = true }
validator = { version = "0.19", features = ["derive"] }

[dev-dependencies]
Expand All @@ -94,7 +93,6 @@ datatest-stable = "0.2"
deltalake-test = { path = "../test" }
dotenvy = "0"
fs_extra = "1.2.0"
maplit = "1"
pretty_assertions = "1.2.1"
pretty_env_logger = "0.5.0"
rstest = { version = "0.26.1" }
Expand All @@ -110,7 +108,7 @@ json = ["parquet/json"]
python = ["arrow/pyarrow"]
native-tls = ["delta_kernel/default-engine-native-tls"]
rustls = ["delta_kernel/default-engine-rustls"]
cloud = ["object_store/cloud"]
cloud = ["object_store/cloud", "dep:humantime"]

# enable caching some file I/O operations when scanning delta logs
delta-cache = ["foyer", "tempfile", "url/serde"]
Expand Down
33 changes: 20 additions & 13 deletions crates/core/src/delta_datafusion/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ mod test {
}

async fn setup_table() -> DeltaTable {
let schema = StructType::new(vec![
let schema = StructType::try_new(vec![
StructField::new(
"id".to_string(),
DataType::Primitive(PrimitiveType::String),
Expand Down Expand Up @@ -668,18 +668,24 @@ mod test {
),
StructField::new(
"_struct".to_string(),
DataType::Struct(Box::new(StructType::new(vec![
StructField::new("a", DataType::Primitive(PrimitiveType::Integer), true),
StructField::new(
"nested",
DataType::Struct(Box::new(StructType::new(vec![StructField::new(
"b",
DataType::Primitive(PrimitiveType::Integer),
DataType::Struct(Box::new(
StructType::try_new(vec![
StructField::new("a", DataType::Primitive(PrimitiveType::Integer), true),
StructField::new(
"nested",
DataType::Struct(Box::new(
StructType::try_new(vec![StructField::new(
"b",
DataType::Primitive(PrimitiveType::Integer),
true,
)])
.unwrap(),
)),
true,
)]))),
true,
),
]))),
),
])
.unwrap(),
)),
true,
),
StructField::new(
Expand All @@ -690,7 +696,8 @@ mod test {
))),
true,
),
]);
])
.unwrap();

let table = DeltaOps::new_in_memory()
.create()
Expand Down
4 changes: 2 additions & 2 deletions crates/core/src/delta_datafusion/table_provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1193,7 +1193,7 @@ mod tests {
let tmp_dir = TempDir::new().unwrap();
let table_path = tmp_dir.path().to_str().unwrap();

let schema = StructType::new(vec![
let schema = StructType::try_new(vec![
StructField::new(
"id".to_string(),
DataType::Primitive(PrimitiveType::Long),
Expand All @@ -1204,7 +1204,7 @@ mod tests {
DataType::Primitive(PrimitiveType::String),
false,
),
]);
])?;

CreateBuilder::new()
.with_location(table_path)
Expand Down
Loading
Loading