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
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ arrow-data = "57.1.0"
arrow-flight = "57.1.0"
arrow-ipc = "57.1.0"
arrow-json = "57.1.0"
arrow-row = "57.1.0"
arrow-schema = "57.1.0"
approx = "0.5.1"
arc-swap = "1.7.1"
Expand Down
3 changes: 2 additions & 1 deletion src/common/scan-info/src/expr_rewriter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ use std::collections::HashMap;

use common_error::DaftResult;
use daft_algebra::boolean::split_conjunction;
use daft_core::prelude::Operator;
use daft_dsl::{
Column, Expr, ExprRef, Operator, ResolvedColumn,
Column, Expr, ExprRef, ResolvedColumn,
common_treenode::{Transformed, TreeNode, TreeNodeRecursion},
functions::{FunctionExpr, partitioning},
null_lit, resolved_col,
Expand Down
4 changes: 2 additions & 2 deletions src/daft-algebra/src/boolean.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use std::{collections::HashSet, sync::Arc};

use common_error::DaftResult;
use common_treenode::{Transformed, TreeNode, TreeNodeRecursion};
use daft_core::lit::Literal;
use daft_dsl::{Expr, ExprRef, Operator, null_lit};
use daft_core::{lit::Literal, prelude::Operator};
use daft_dsl::{Expr, ExprRef, null_lit};
use daft_schema::{dtype::DataType, schema::SchemaRef};

use crate::simplify_expr;
Expand Down
7 changes: 4 additions & 3 deletions src/daft-algebra/src/simplify/boolean.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use common_error::DaftResult;
use common_treenode::Transformed;
use daft_core::lit::Literal;
use daft_dsl::{Expr, ExprRef, Operator, lit};
use daft_core::{lit::Literal, prelude::Operator};
use daft_dsl::{Expr, ExprRef, lit};
use daft_schema::{dtype::DataType, schema::SchemaRef};
use indexmap::IndexSet;

Expand Down Expand Up @@ -296,7 +296,8 @@ mod tests {

use common_error::DaftResult;
use common_treenode::Transformed;
use daft_dsl::{Column, Expr, ExprRef, Operator, ResolvedColumn, lit};
use daft_core::prelude::Operator;
use daft_dsl::{Column, Expr, ExprRef, ResolvedColumn, lit};
use daft_schema::{dtype::DataType, field::Field, schema::Schema};

use crate::simplify::boolean::simplify_binary_compare;
Expand Down
4 changes: 2 additions & 2 deletions src/daft-algebra/src/simplify/null.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use common_error::DaftResult;
use common_treenode::Transformed;
use daft_core::lit::Literal;
use daft_dsl::{Expr, ExprRef, Operator, lit, null_lit};
use daft_core::{lit::Literal, prelude::Operator};
use daft_dsl::{Expr, ExprRef, lit, null_lit};
use daft_schema::schema::SchemaRef;

fn is_null(expr: &Expr) -> bool {
Expand Down
7 changes: 4 additions & 3 deletions src/daft-algebra/src/simplify/numeric.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use common_error::DaftResult;
use common_treenode::Transformed;
use daft_core::lit::Literal;
use daft_dsl::{Expr, ExprRef, Operator};
use daft_core::{lit::Literal, prelude::Operator};
use daft_dsl::{Expr, ExprRef};
use daft_schema::schema::SchemaRef;

static POWS_OF_TEN: [i128; 38] = [
Expand Down Expand Up @@ -120,7 +120,8 @@ mod tests {

use common_error::DaftResult;
use common_treenode::Transformed;
use daft_dsl::{Column, Expr, ExprRef, Operator, ResolvedColumn, lit};
use daft_core::prelude::Operator;
use daft_dsl::{Column, Expr, ExprRef, ResolvedColumn, lit};
use daft_schema::schema::Schema;

use crate::simplify::numeric::simplify_numeric_expr;
Expand Down
1 change: 1 addition & 0 deletions src/daft-core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[dependencies]
arrow = {workspace = true}
arrow-row = {workspace = true}
bincode = {workspace = true}
daft-arrow = {path = "../daft-arrow"}
chrono = {workspace = true}
Expand Down
Loading
Loading