Skip to content

Commit fbc395c

Browse files
authored
Merge branch 'main' into 19151-make-date_add-nullable
2 parents 85152c2 + 4ddee14 commit fbc395c

File tree

10 files changed

+1532
-83
lines changed

10 files changed

+1532
-83
lines changed

Cargo.lock

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

datafusion/common/src/types/builtin.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// under the License.
1717

1818
use arrow::datatypes::IntervalUnit::*;
19+
use arrow::datatypes::TimeUnit::*;
1920

2021
use crate::types::{LogicalTypeRef, NativeType};
2122
use std::sync::{Arc, LazyLock};
@@ -82,3 +83,17 @@ singleton_variant!(
8283
Interval,
8384
MonthDayNano
8485
);
86+
87+
singleton_variant!(
88+
LOGICAL_INTERVAL_YEAR_MONTH,
89+
logical_interval_year_month,
90+
Interval,
91+
YearMonth
92+
);
93+
94+
singleton_variant!(
95+
LOGICAL_DURATION_MICROSECOND,
96+
logical_duration_microsecond,
97+
Duration,
98+
Microsecond
99+
);

datafusion/ffi/Cargo.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,15 @@ arrow-schema = { workspace = true }
4747
async-ffi = { version = "0.5.0", features = ["abi_stable"] }
4848
async-trait = { workspace = true }
4949
datafusion = { workspace = true, default-features = false }
50+
datafusion-catalog = { workspace = true }
5051
datafusion-common = { workspace = true }
52+
datafusion-datasource = { workspace = true }
5153
datafusion-execution = { workspace = true }
5254
datafusion-expr = { workspace = true }
5355
datafusion-functions-aggregate-common = { workspace = true }
5456
datafusion-physical-expr = { workspace = true }
5557
datafusion-physical-expr-common = { workspace = true }
58+
datafusion-physical-plan = { workspace = true }
5659
datafusion-proto = { workspace = true }
5760
datafusion-proto-common = { workspace = true }
5861
futures = { workspace = true }
@@ -63,6 +66,10 @@ tokio = { workspace = true }
6366

6467
[dev-dependencies]
6568
datafusion = { workspace = true, default-features = false, features = ["sql"] }
69+
datafusion-functions = { workspace = true }
70+
datafusion-functions-aggregate = { workspace = true }
71+
datafusion-functions-aggregate-common = { workspace = true }
72+
datafusion-functions-window = { workspace = true }
6673
doc-comment = { workspace = true }
6774

6875
[features]

datafusion/ffi/src/execution_plan.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ impl ExecutionPlan for ForeignExecutionPlan {
301301
}
302302

303303
#[cfg(test)]
304-
mod tests {
304+
pub(crate) mod tests {
305305
use super::*;
306306
use arrow::datatypes::{DataType, Field, Schema};
307307
use datafusion::{

datafusion/ffi/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ pub mod expr;
3434
pub mod insert_op;
3535
pub mod physical_expr;
3636
pub mod plan_properties;
37+
pub mod proto;
3738
pub mod record_batch_stream;
3839
pub mod schema_provider;
3940
pub mod session_config;

0 commit comments

Comments
 (0)