diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 722980a02..f35011fca 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -50,8 +50,9 @@ jobs: - name: Standard tests run: cargo test -- --skip slt_datasource_ --skip slt_tpch --skip slt_tpcds --skip slt_hybrid - - name: SLTs Hybrid - run: cargo test slt_hybrid + # TODO + # - name: SLTs Hybrid + # run: cargo test slt_hybrid - name: SLTs Parquet env: diff --git a/Cargo.lock b/Cargo.lock index ee9d2aca1..90e5e4048 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -707,7 +707,6 @@ name = "docgen" version = "0.0.93" dependencies = [ "logutil", - "rayexec_bullet", "rayexec_csv", "rayexec_debug", "rayexec_delta", @@ -1793,8 +1792,8 @@ dependencies = [ "num-bigint", "paste", "rand", - "rayexec_bullet", "rayexec_error", + "rayexec_execution", "seq-macro", "serde", "serde_json", @@ -2198,7 +2197,6 @@ dependencies = [ "csv-core", "erased-serde", "futures", - "rayexec_bullet", "rayexec_error", "rayexec_execution", "rayexec_io", @@ -2216,7 +2214,6 @@ dependencies = [ "bytes", "futures", "parking_lot", - "rayexec_bullet", "rayexec_error", "rayexec_execution", "rayexec_io", @@ -2235,7 +2232,6 @@ dependencies = [ "erased-serde", "futures", "parquet", - "rayexec_bullet", "rayexec_error", "rayexec_execution", "rayexec_io", @@ -2270,12 +2266,12 @@ dependencies = [ "half", "hashbrown 0.14.5", "indexmap", + "num", "num-traits", "num_cpus", "once_cell", "parking_lot", "rand", - "rayexec_bullet", "rayexec_error", "rayexec_io", "rayexec_parser", @@ -2289,6 +2285,7 @@ dependencies = [ "similar-asserts", "smallvec", "strsim", + "textwrap", "tokio", "tracing", "url", @@ -2303,7 +2300,6 @@ dependencies = [ "bytes", "futures", "parquet", - "rayexec_bullet", "rayexec_error", "rayexec_execution", "rayexec_io", @@ -2346,7 +2342,6 @@ dependencies = [ "erased-serde", "futures", "parquet", - "rayexec_bullet", "rayexec_error", "rayexec_execution", "rayexec_io", @@ -2375,7 +2370,6 @@ version = "0.0.93" dependencies = [ "erased-serde", "futures", - "rayexec_bullet", "rayexec_error", "rayexec_execution", "rayexec_proto", @@ -2462,7 +2456,6 @@ version = "0.0.93" dependencies = [ "futures", "parking_lot", - "rayexec_bullet", "rayexec_error", "rayexec_execution", "rayexec_parser", @@ -2481,7 +2474,6 @@ dependencies = [ "futures", "libtest-mimic", "rand", - "rayexec_bullet", "rayexec_error", "rayexec_execution", "rayexec_rt_native", @@ -2497,7 +2489,6 @@ name = "rayexec_unity_catalog" version = "0.0.93" dependencies = [ "futures", - "rayexec_bullet", "rayexec_error", "rayexec_execution", "rayexec_io", @@ -2517,7 +2508,6 @@ dependencies = [ "js-sys", "once_cell", "parking_lot", - "rayexec_bullet", "rayexec_csv", "rayexec_delta", "rayexec_error", @@ -3159,7 +3149,6 @@ dependencies = [ name = "test_bin" version = "0.0.93" dependencies = [ - "rayexec_bullet", "rayexec_csv", "rayexec_debug", "rayexec_delta", diff --git a/crates/docgen/Cargo.toml b/crates/docgen/Cargo.toml index fa9c0cca9..e7edc59e3 100644 --- a/crates/docgen/Cargo.toml +++ b/crates/docgen/Cargo.toml @@ -10,7 +10,6 @@ rayexec_execution = { path = '../rayexec_execution' } rayexec_server = { path = '../rayexec_server' } rayexec_shell = { path = '../rayexec_shell' } rayexec_rt_native = { path = '../rayexec_rt_native' } -rayexec_bullet = { path = '../rayexec_bullet' } rayexec_postgres = { path = '../rayexec_postgres' } rayexec_parquet = { path = '../rayexec_parquet' } rayexec_csv = { path = '../rayexec_csv' } diff --git a/crates/docgen/src/markdown_table.rs b/crates/docgen/src/markdown_table.rs index ef0cea532..70a6dc4e8 100644 --- a/crates/docgen/src/markdown_table.rs +++ b/crates/docgen/src/markdown_table.rs @@ -1,9 +1,9 @@ use std::fmt; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::field::Schema; -use rayexec_bullet::format::{FormatOptions, Formatter}; use rayexec_error::Result; +use rayexec_execution::arrays::batch::Batch; +use rayexec_execution::arrays::field::Schema; +use rayexec_execution::arrays::format::{FormatOptions, Formatter}; const FORMATTER: Formatter = Formatter::new(FormatOptions { null: "", @@ -54,9 +54,9 @@ pub fn write_markdown_table<'a>( #[cfg(test)] mod tests { - use rayexec_bullet::array::Array; - use rayexec_bullet::datatype::DataType; - use rayexec_bullet::field::Field; + use rayexec_execution::arrays::array::Array; + use rayexec_execution::arrays::datatype::DataType; + use rayexec_execution::arrays::field::Field; use super::*; diff --git a/crates/parquet/Cargo.toml b/crates/parquet/Cargo.toml index ed59d904a..bd5489076 100644 --- a/crates/parquet/Cargo.toml +++ b/crates/parquet/Cargo.toml @@ -26,7 +26,7 @@ rust-version = "1.70.0" [dependencies] rayexec_error = { path = "../rayexec_error" } -rayexec_bullet = { path = "../rayexec_bullet" } +rayexec_execution = { path = "../rayexec_execution" } ahash = { workspace = true } bytes = { version = "1.1", default-features = false, features = ["std"] } thrift = { version = "0.17", default-features = false } diff --git a/crates/parquet/src/encodings/decoding/view.rs b/crates/parquet/src/encodings/decoding/view.rs index f42165936..d85b9b272 100644 --- a/crates/parquet/src/encodings/decoding/view.rs +++ b/crates/parquet/src/encodings/decoding/view.rs @@ -5,7 +5,7 @@ //! since that's hard to work with. use bytes::Bytes; -use rayexec_bullet::executor::builder::{ArrayDataBuffer, GermanVarlenBuffer}; +use rayexec_execution::arrays::executor::builder::{ArrayDataBuffer, GermanVarlenBuffer}; use super::Encoding; use crate::encodings::rle::RleDecoder; diff --git a/crates/rayexec_bullet/src/bitutil.rs b/crates/rayexec_bullet/src/bitutil.rs deleted file mode 100644 index 62e90178e..000000000 --- a/crates/rayexec_bullet/src/bitutil.rs +++ /dev/null @@ -1,9 +0,0 @@ -/// Get the number of bytes that can fit `num_bits`. -pub const fn byte_ceil(num_bits: usize) -> usize { - ceil(num_bits, 8) -} - -/// Get the ceil of n/divisor. -pub const fn ceil(n: usize, divisor: usize) -> usize { - n / divisor + (0 != n % divisor) as usize -} diff --git a/crates/rayexec_bullet/src/ipc/batch.rs b/crates/rayexec_bullet/src/ipc/batch.rs index e072867bb..537aa0307 100644 --- a/crates/rayexec_bullet/src/ipc/batch.rs +++ b/crates/rayexec_bullet/src/ipc/batch.rs @@ -9,21 +9,6 @@ use super::compression::CompressionType; use super::gen::message::{FieldNode as IpcFieldNode, RecordBatch as IpcRecordBatch}; use super::gen::schema::Buffer as IpcBuffer; use super::IpcConfig; -use crate::array::{Array, ArrayData, BinaryData}; -use crate::batch::Batch; -use crate::bitmap::Bitmap; -use crate::bitutil::byte_ceil; -use crate::datatype::DataType; -use crate::executor::physical_type::PhysicalType; -use crate::field::Schema; -use crate::ipc::gen::message::RecordBatchBuilder; -use crate::scalar::interval::Interval; -use crate::storage::{ - BooleanStorage, - GermanVarlenStorage, - PrimitiveStorage, - UnionedGermanMetadata, -}; pub fn ipc_to_batch( batch: IpcRecordBatch, diff --git a/crates/rayexec_bullet/src/ipc/mod.rs b/crates/rayexec_bullet/src/ipc/mod.rs index ef0818012..267bfb5cd 100644 --- a/crates/rayexec_bullet/src/ipc/mod.rs +++ b/crates/rayexec_bullet/src/ipc/mod.rs @@ -1,12 +1,12 @@ //! Arrow IPC compatability. //! //! Spec: -pub mod stream; +// pub mod stream; -mod batch; -mod compression; -mod gen; -mod schema; +// mod batch; +// mod compression; +// mod gen; +// mod schema; #[derive(Debug, Clone, Default)] pub struct IpcConfig {} diff --git a/crates/rayexec_bullet/src/lib.rs b/crates/rayexec_bullet/src/lib.rs index 2debd4816..ce14ad3b0 100644 --- a/crates/rayexec_bullet/src/lib.rs +++ b/crates/rayexec_bullet/src/lib.rs @@ -1,18 +1 @@ -//! A suspiciously Arrow-like columnar storage implementation. -pub mod array; -pub mod batch; -pub mod bitmap; -pub mod compute; -pub mod datatype; -pub mod executor; -pub mod field; -pub mod format; pub mod ipc; -pub mod row; -pub mod scalar; -pub mod selection; -pub mod storage; - -pub mod testutil; - -mod bitutil; diff --git a/crates/rayexec_csv/Cargo.toml b/crates/rayexec_csv/Cargo.toml index 73a521589..4889cb57b 100644 --- a/crates/rayexec_csv/Cargo.toml +++ b/crates/rayexec_csv/Cargo.toml @@ -6,7 +6,6 @@ edition.workspace = true [dependencies] rayexec_proto = { path = '../rayexec_proto' } rayexec_execution = { path = '../rayexec_execution' } -rayexec_bullet = { path = '../rayexec_bullet' } rayexec_error = { path = '../rayexec_error' } rayexec_io = { path = '../rayexec_io' } futures = { workspace = true } diff --git a/crates/rayexec_csv/src/copy_to.rs b/crates/rayexec_csv/src/copy_to.rs index 6709bda23..aef93f92e 100644 --- a/crates/rayexec_csv/src/copy_to.rs +++ b/crates/rayexec_csv/src/copy_to.rs @@ -1,8 +1,8 @@ use futures::future::BoxFuture; use futures::FutureExt; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::field::Schema; use rayexec_error::Result; +use rayexec_execution::arrays::batch::Batch; +use rayexec_execution::arrays::field::Schema; use rayexec_execution::execution::operators::sink::PartitionSink; use rayexec_execution::functions::copy::CopyToFunction; use rayexec_execution::runtime::Runtime; diff --git a/crates/rayexec_csv/src/datatable.rs b/crates/rayexec_csv/src/datatable.rs index e16c6e304..197822514 100644 --- a/crates/rayexec_csv/src/datatable.rs +++ b/crates/rayexec_csv/src/datatable.rs @@ -1,8 +1,8 @@ use std::fmt::{self, Debug}; use futures::future::BoxFuture; -use rayexec_bullet::batch::Batch; use rayexec_error::Result; +use rayexec_execution::arrays::batch::Batch; use rayexec_execution::runtime::Runtime; use rayexec_execution::storage::table_storage::{ DataTable, diff --git a/crates/rayexec_csv/src/read_csv.rs b/crates/rayexec_csv/src/read_csv.rs index d6b949bc2..864df6543 100644 --- a/crates/rayexec_csv/src/read_csv.rs +++ b/crates/rayexec_csv/src/read_csv.rs @@ -3,9 +3,9 @@ use std::sync::Arc; use futures::future::BoxFuture; use futures::{FutureExt, StreamExt}; -use rayexec_bullet::datatype::DataTypeId; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::{RayexecError, Result}; +use rayexec_execution::arrays::datatype::DataTypeId; +use rayexec_execution::arrays::scalar::OwnedScalarValue; use rayexec_execution::database::DatabaseContext; use rayexec_execution::expr; use rayexec_execution::functions::table::{ diff --git a/crates/rayexec_csv/src/reader.rs b/crates/rayexec_csv/src/reader.rs index 0582cdfcf..448bedebf 100644 --- a/crates/rayexec_csv/src/reader.rs +++ b/crates/rayexec_csv/src/reader.rs @@ -22,15 +22,20 @@ use std::fmt; use bytes::Bytes; use futures::stream::BoxStream; use futures::StreamExt; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::bitmap::Bitmap; -use rayexec_bullet::compute::cast::parse::{BoolParser, Float64Parser, Int64Parser, Parser}; -use rayexec_bullet::datatype::{DataType, TimeUnit, TimestampTypeMeta}; -use rayexec_bullet::executor::builder::{ArrayDataBuffer, GermanVarlenBuffer}; -use rayexec_bullet::field::{Field, Schema}; -use rayexec_bullet::storage::{BooleanStorage, PrimitiveStorage}; use rayexec_error::{RayexecError, Result}; +use rayexec_execution::arrays::array::{Array, ArrayData}; +use rayexec_execution::arrays::batch::Batch; +use rayexec_execution::arrays::bitmap::Bitmap; +use rayexec_execution::arrays::compute::cast::parse::{ + BoolParser, + Float64Parser, + Int64Parser, + Parser, +}; +use rayexec_execution::arrays::datatype::{DataType, TimeUnit, TimestampTypeMeta}; +use rayexec_execution::arrays::executor::builder::{ArrayDataBuffer, GermanVarlenBuffer}; +use rayexec_execution::arrays::field::{Field, Schema}; +use rayexec_execution::arrays::storage::{BooleanStorage, PrimitiveStorage}; use rayexec_io::FileSource; use serde::{Deserialize, Serialize}; diff --git a/crates/rayexec_csv/src/writer.rs b/crates/rayexec_csv/src/writer.rs index dea5d3259..d6034f225 100644 --- a/crates/rayexec_csv/src/writer.rs +++ b/crates/rayexec_csv/src/writer.rs @@ -1,10 +1,10 @@ use std::io::Write as _; use csv::ByteRecord; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::field::Schema; -use rayexec_bullet::format::{FormatOptions, Formatter}; use rayexec_error::{Result, ResultExt}; +use rayexec_execution::arrays::batch::Batch; +use rayexec_execution::arrays::field::Schema; +use rayexec_execution::arrays::format::{FormatOptions, Formatter}; use crate::reader::DialectOptions; diff --git a/crates/rayexec_debug/Cargo.toml b/crates/rayexec_debug/Cargo.toml index 9ee5f37b4..b599d63e4 100644 --- a/crates/rayexec_debug/Cargo.toml +++ b/crates/rayexec_debug/Cargo.toml @@ -6,7 +6,6 @@ edition.workspace = true [dependencies] rayexec_proto = { path = '../rayexec_proto' } rayexec_execution = { path = '../rayexec_execution' } -rayexec_bullet = { path = '../rayexec_bullet' } rayexec_error = { path = '../rayexec_error' } rayexec_io = { path = '../rayexec_io' } futures = { workspace = true } diff --git a/crates/rayexec_debug/src/discard.rs b/crates/rayexec_debug/src/discard.rs index 7f78b5e92..5ffab5eca 100644 --- a/crates/rayexec_debug/src/discard.rs +++ b/crates/rayexec_debug/src/discard.rs @@ -1,7 +1,7 @@ use futures::future::BoxFuture; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::field::Schema; use rayexec_error::Result; +use rayexec_execution::arrays::batch::Batch; +use rayexec_execution::arrays::field::Schema; use rayexec_execution::execution::operators::sink::PartitionSink; use rayexec_execution::functions::copy::CopyToFunction; use rayexec_io::location::FileLocation; diff --git a/crates/rayexec_debug/src/lib.rs b/crates/rayexec_debug/src/lib.rs index 70ccc8597..be4176c2e 100644 --- a/crates/rayexec_debug/src/lib.rs +++ b/crates/rayexec_debug/src/lib.rs @@ -6,8 +6,8 @@ use std::sync::Arc; use discard::DiscardCopyToFunction; use futures::future::BoxFuture; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::{RayexecError, Result}; +use rayexec_execution::arrays::scalar::OwnedScalarValue; use rayexec_execution::database::catalog_entry::TableEntry; use rayexec_execution::database::memory_catalog::MemoryCatalog; use rayexec_execution::datasource::{DataSource, DataSourceConnection, DataSourceCopyTo}; diff --git a/crates/rayexec_debug/src/table_storage.rs b/crates/rayexec_debug/src/table_storage.rs index 5c8e4430b..a3fb00e5c 100644 --- a/crates/rayexec_debug/src/table_storage.rs +++ b/crates/rayexec_debug/src/table_storage.rs @@ -2,9 +2,9 @@ use std::sync::Arc; use futures::future::BoxFuture; use parking_lot::Mutex; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::field::Field; use rayexec_error::{RayexecError, Result}; +use rayexec_execution::arrays::batch::Batch; +use rayexec_execution::arrays::field::Field; use rayexec_execution::database::catalog_entry::CatalogEntry; use rayexec_execution::execution::operators::sink::PartitionSink; use rayexec_execution::storage::table_storage::{ diff --git a/crates/rayexec_delta/Cargo.toml b/crates/rayexec_delta/Cargo.toml index 150badeea..3b5b2830f 100644 --- a/crates/rayexec_delta/Cargo.toml +++ b/crates/rayexec_delta/Cargo.toml @@ -6,7 +6,6 @@ edition.workspace = true [dependencies] rayexec_proto = { path = '../rayexec_proto' } rayexec_execution = { path = '../rayexec_execution' } -rayexec_bullet = { path = '../rayexec_bullet' } rayexec_error = { path = '../rayexec_error' } rayexec_io = { path = '../rayexec_io' } rayexec_parquet = { path = '../rayexec_parquet' } diff --git a/crates/rayexec_delta/src/datatable.rs b/crates/rayexec_delta/src/datatable.rs index 852aa280c..003182e7c 100644 --- a/crates/rayexec_delta/src/datatable.rs +++ b/crates/rayexec_delta/src/datatable.rs @@ -1,8 +1,8 @@ use std::sync::Arc; use futures::future::BoxFuture; -use rayexec_bullet::batch::Batch; use rayexec_error::Result; +use rayexec_execution::arrays::batch::Batch; use rayexec_execution::storage::table_storage::{DataTable, DataTableScan, Projections}; use crate::protocol::table::{Table, TableScan}; diff --git a/crates/rayexec_delta/src/protocol/table.rs b/crates/rayexec_delta/src/protocol/table.rs index 8a5ab4874..2e99e2d7b 100644 --- a/crates/rayexec_delta/src/protocol/table.rs +++ b/crates/rayexec_delta/src/protocol/table.rs @@ -2,11 +2,11 @@ use std::collections::VecDeque; use std::sync::Arc; use futures::{StreamExt, TryStreamExt}; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::datatype::{DataType, DecimalTypeMeta, TimeUnit, TimestampTypeMeta}; -use rayexec_bullet::field::{Field, Schema}; -use rayexec_bullet::scalar::decimal::{Decimal128Type, DecimalType}; use rayexec_error::{not_implemented, RayexecError, Result, ResultExt}; +use rayexec_execution::arrays::batch::Batch; +use rayexec_execution::arrays::datatype::{DataType, DecimalTypeMeta, TimeUnit, TimestampTypeMeta}; +use rayexec_execution::arrays::field::{Field, Schema}; +use rayexec_execution::arrays::scalar::decimal::{Decimal128Type, DecimalType}; use rayexec_execution::storage::table_storage::Projections; use rayexec_io::location::{AccessConfig, FileLocation}; use rayexec_io::{FileProvider, FileSource}; diff --git a/crates/rayexec_delta/src/read_delta.rs b/crates/rayexec_delta/src/read_delta.rs index 7c9f51b9f..9c0d9d702 100644 --- a/crates/rayexec_delta/src/read_delta.rs +++ b/crates/rayexec_delta/src/read_delta.rs @@ -3,9 +3,9 @@ use std::sync::Arc; use futures::future::BoxFuture; use futures::FutureExt; -use rayexec_bullet::datatype::DataTypeId; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::Result; +use rayexec_execution::arrays::datatype::DataTypeId; +use rayexec_execution::arrays::scalar::OwnedScalarValue; use rayexec_execution::database::DatabaseContext; use rayexec_execution::expr; use rayexec_execution::functions::table::{ diff --git a/crates/rayexec_execution/Cargo.toml b/crates/rayexec_execution/Cargo.toml index fe854c462..cf3426671 100644 --- a/crates/rayexec_execution/Cargo.toml +++ b/crates/rayexec_execution/Cargo.toml @@ -7,7 +7,7 @@ edition = { workspace = true } rayexec_error = { path = "../rayexec_error" } rayexec_proto = { path = "../rayexec_proto" } rayexec_parser = { path = "../rayexec_parser" } -rayexec_bullet = { path = "../rayexec_bullet" } +# rayexec_bullet = { path = "../rayexec_bullet" } rayexec_io = { path = "../rayexec_io" } fmtutil = { path = "../fmtutil" } # stackutil = { path = "../stackutil" } TODO: psm hash issues when compiling to wasm on macos @@ -18,6 +18,7 @@ chrono = { workspace = true } futures = { workspace = true } hashbrown = { workspace = true, features = ["raw"] } num-traits = "0.2.19" +num = "0.4.3" num_cpus = "1.16.0" once_cell = { workspace = true } parking_lot = { workspace = true } @@ -38,6 +39,7 @@ strsim = "0.11.1" scc = { workspace = true } indexmap = "2.7.0" half = { workspace = true } +textwrap = { version = "0.16.1", default-features = false, features = ["unicode-width"] } [dev-dependencies] similar-asserts = "1.5.0" diff --git a/crates/rayexec_bullet/src/array/mod.rs b/crates/rayexec_execution/src/arrays/array/mod.rs similarity index 98% rename from crates/rayexec_bullet/src/array/mod.rs rename to crates/rayexec_execution/src/arrays/array/mod.rs index db4b0b7fe..1278c58ec 100644 --- a/crates/rayexec_bullet/src/array/mod.rs +++ b/crates/rayexec_execution/src/arrays/array/mod.rs @@ -7,10 +7,15 @@ use half::f16; use rayexec_error::{not_implemented, RayexecError, Result, ResultExt}; use shared_or_owned::SharedOrOwned; -use crate::bitmap::Bitmap; -use crate::datatype::DataType; -use crate::executor::builder::{ArrayBuilder, BooleanBuffer, GermanVarlenBuffer, PrimitiveBuffer}; -use crate::executor::physical_type::{ +use crate::arrays::bitmap::Bitmap; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ + ArrayBuilder, + BooleanBuffer, + GermanVarlenBuffer, + PrimitiveBuffer, +}; +use crate::arrays::executor::physical_type::{ PhysicalAny, PhysicalBinary, PhysicalBool, @@ -31,13 +36,13 @@ use crate::executor::physical_type::{ PhysicalU8, PhysicalUtf8, }; -use crate::executor::scalar::UnaryExecutor; -use crate::scalar::decimal::{Decimal128Scalar, Decimal64Scalar}; -use crate::scalar::interval::Interval; -use crate::scalar::timestamp::TimestampScalar; -use crate::scalar::ScalarValue; -use crate::selection::SelectionVector; -use crate::storage::{ +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::scalar::decimal::{Decimal128Scalar, Decimal64Scalar}; +use crate::arrays::scalar::interval::Interval; +use crate::arrays::scalar::timestamp::TimestampScalar; +use crate::arrays::scalar::ScalarValue; +use crate::arrays::selection::SelectionVector; +use crate::arrays::storage::{ AddressableStorage, BooleanStorage, ContiguousVarlenStorage, diff --git a/crates/rayexec_bullet/src/array/shared_or_owned.rs b/crates/rayexec_execution/src/arrays/array/shared_or_owned.rs similarity index 100% rename from crates/rayexec_bullet/src/array/shared_or_owned.rs rename to crates/rayexec_execution/src/arrays/array/shared_or_owned.rs diff --git a/crates/rayexec_bullet/src/batch.rs b/crates/rayexec_execution/src/arrays/batch.rs similarity index 96% rename from crates/rayexec_bullet/src/batch.rs rename to crates/rayexec_execution/src/arrays/batch.rs index 1bdd05317..61e6b2628 100644 --- a/crates/rayexec_bullet/src/batch.rs +++ b/crates/rayexec_execution/src/arrays/batch.rs @@ -2,10 +2,10 @@ use std::sync::Arc; use rayexec_error::{RayexecError, Result}; -use crate::array::Array; -use crate::executor::scalar::concat_with_exact_total_len; -use crate::row::ScalarRow; -use crate::selection::SelectionVector; +use crate::arrays::array::Array; +use crate::arrays::executor::scalar::concat_with_exact_total_len; +use crate::arrays::row::ScalarRow; +use crate::arrays::selection::SelectionVector; /// A batch of same-length arrays. #[derive(Debug, Clone, PartialEq)] diff --git a/crates/rayexec_bullet/src/bitmap/mod.rs b/crates/rayexec_execution/src/arrays/bitmap/mod.rs similarity index 99% rename from crates/rayexec_bullet/src/bitmap/mod.rs rename to crates/rayexec_execution/src/arrays/bitmap/mod.rs index 8485dc800..918c1ae8b 100644 --- a/crates/rayexec_bullet/src/bitmap/mod.rs +++ b/crates/rayexec_execution/src/arrays/bitmap/mod.rs @@ -5,7 +5,7 @@ use std::fmt; use rayexec_error::{RayexecError, Result}; -use crate::compute::util::IntoExtactSizeIterator; +use crate::arrays::compute::util::IntoExtactSizeIterator; /// An LSB ordered bitmap. #[derive(Clone, Default, PartialEq, Eq)] @@ -27,10 +27,6 @@ impl Bitmap { } } - pub(crate) fn data(&self) -> &[u8] { - &self.data - } - /// Create a new bitmap of a given length with all values initialized to the /// given value. pub fn new_with_val(val: bool, len: usize) -> Self { diff --git a/crates/rayexec_bullet/src/bitmap/zip.rs b/crates/rayexec_execution/src/arrays/bitmap/zip.rs similarity index 100% rename from crates/rayexec_bullet/src/bitmap/zip.rs rename to crates/rayexec_execution/src/arrays/bitmap/zip.rs diff --git a/crates/rayexec_bullet/src/compute/cast/array.rs b/crates/rayexec_execution/src/arrays/compute/cast/array.rs similarity index 97% rename from crates/rayexec_bullet/src/compute/cast/array.rs rename to crates/rayexec_execution/src/arrays/compute/cast/array.rs index 65af83f92..76845aa06 100644 --- a/crates/rayexec_bullet/src/compute/cast/array.rs +++ b/crates/rayexec_execution/src/arrays/compute/cast/array.rs @@ -48,11 +48,16 @@ use super::parse::{ UInt64Parser, UInt8Parser, }; -use crate::array::{Array, ArrayData}; -use crate::bitmap::Bitmap; -use crate::datatype::{DataType, TimeUnit}; -use crate::executor::builder::{ArrayBuilder, BooleanBuffer, GermanVarlenBuffer, PrimitiveBuffer}; -use crate::executor::physical_type::{ +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::bitmap::Bitmap; +use crate::arrays::datatype::{DataType, TimeUnit}; +use crate::arrays::executor::builder::{ + ArrayBuilder, + BooleanBuffer, + GermanVarlenBuffer, + PrimitiveBuffer, +}; +use crate::arrays::executor::physical_type::{ PhysicalBool, PhysicalF16, PhysicalF32, @@ -70,9 +75,9 @@ use crate::executor::physical_type::{ PhysicalU8, PhysicalUtf8, }; -use crate::executor::scalar::UnaryExecutor; -use crate::scalar::decimal::{Decimal128Type, Decimal64Type, DecimalType}; -use crate::storage::{AddressableStorage, PrimitiveStorage}; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::scalar::decimal::{Decimal128Type, Decimal64Type, DecimalType}; +use crate::arrays::storage::{AddressableStorage, PrimitiveStorage}; pub fn cast_array(arr: &Array, to: DataType, behavior: CastFailBehavior) -> Result { if arr.datatype() == &to { @@ -723,8 +728,8 @@ where #[cfg(test)] mod tests { use super::*; - use crate::datatype::DecimalTypeMeta; - use crate::scalar::ScalarValue; + use crate::arrays::datatype::DecimalTypeMeta; + use crate::arrays::scalar::ScalarValue; #[test] fn array_cast_utf8_to_i32() { diff --git a/crates/rayexec_bullet/src/compute/cast/behavior.rs b/crates/rayexec_execution/src/arrays/compute/cast/behavior.rs similarity index 98% rename from crates/rayexec_bullet/src/compute/cast/behavior.rs rename to crates/rayexec_execution/src/arrays/compute/cast/behavior.rs index 8da4fe027..f81ca0e32 100644 --- a/crates/rayexec_bullet/src/compute/cast/behavior.rs +++ b/crates/rayexec_execution/src/arrays/compute/cast/behavior.rs @@ -1,6 +1,6 @@ use rayexec_error::{RayexecError, Result}; -use crate::array::Array; +use crate::arrays::array::Array; /// Behavior when a cast fail due to under/overflow. #[derive(Debug, Clone, Copy, PartialEq, Eq)] diff --git a/crates/rayexec_bullet/src/compute/cast/format.rs b/crates/rayexec_execution/src/arrays/compute/cast/format.rs similarity index 99% rename from crates/rayexec_bullet/src/compute/cast/format.rs rename to crates/rayexec_execution/src/arrays/compute/cast/format.rs index 6169e4cd1..f5e946efb 100644 --- a/crates/rayexec_bullet/src/compute/cast/format.rs +++ b/crates/rayexec_execution/src/arrays/compute/cast/format.rs @@ -5,8 +5,8 @@ use std::marker::PhantomData; use chrono::{DateTime, Utc}; use half::f16; -use crate::compute::date::SECONDS_IN_DAY; -use crate::scalar::interval::Interval; +use crate::arrays::compute::date::SECONDS_IN_DAY; +use crate::arrays::scalar::interval::Interval; /// Logic for formatting and writing a type to a buffer. pub trait Formatter { diff --git a/crates/rayexec_bullet/src/compute/cast/mod.rs b/crates/rayexec_execution/src/arrays/compute/cast/mod.rs similarity index 100% rename from crates/rayexec_bullet/src/compute/cast/mod.rs rename to crates/rayexec_execution/src/arrays/compute/cast/mod.rs diff --git a/crates/rayexec_bullet/src/compute/cast/parse.rs b/crates/rayexec_execution/src/arrays/compute/cast/parse.rs similarity index 98% rename from crates/rayexec_bullet/src/compute/cast/parse.rs rename to crates/rayexec_execution/src/arrays/compute/cast/parse.rs index 61c721d28..4c1153530 100644 --- a/crates/rayexec_bullet/src/compute/cast/parse.rs +++ b/crates/rayexec_execution/src/arrays/compute/cast/parse.rs @@ -7,8 +7,8 @@ use chrono::{Datelike, NaiveDate}; use half::f16; use num::PrimInt; -use crate::compute::date::EPOCH_DAYS_FROM_CE; -use crate::scalar::interval::Interval; +use crate::arrays::compute::date::EPOCH_DAYS_FROM_CE; +use crate::arrays::scalar::interval::Interval; /// Logic for parsing a string into some type. pub trait Parser { @@ -352,7 +352,7 @@ impl Parser for IntervalParser { #[cfg(test)] mod tests { use super::*; - use crate::compute::date::EPOCH_NAIVE_DATE; + use crate::arrays::compute::date::EPOCH_NAIVE_DATE; #[test] fn epoch_days() { diff --git a/crates/rayexec_bullet/src/compute/cast/scalar.rs b/crates/rayexec_execution/src/arrays/compute/cast/scalar.rs similarity index 98% rename from crates/rayexec_bullet/src/compute/cast/scalar.rs rename to crates/rayexec_execution/src/arrays/compute/cast/scalar.rs index 33843c89b..3c8d73448 100644 --- a/crates/rayexec_bullet/src/compute/cast/scalar.rs +++ b/crates/rayexec_execution/src/arrays/compute/cast/scalar.rs @@ -18,10 +18,10 @@ use super::parse::{ UInt64Parser, UInt8Parser, }; -use crate::compute::cast::parse::{BoolParser, Date32Parser, IntervalParser}; -use crate::datatype::DataType; -use crate::scalar::decimal::{Decimal128Scalar, Decimal64Scalar}; -use crate::scalar::{OwnedScalarValue, ScalarValue}; +use crate::arrays::compute::cast::parse::{BoolParser, Date32Parser, IntervalParser}; +use crate::arrays::datatype::DataType; +use crate::arrays::scalar::decimal::{Decimal128Scalar, Decimal64Scalar}; +use crate::arrays::scalar::{OwnedScalarValue, ScalarValue}; // TODO: Try to remove this. pub fn cast_scalar(scalar: ScalarValue, to: &DataType) -> Result { diff --git a/crates/rayexec_bullet/src/compute/date.rs b/crates/rayexec_execution/src/arrays/compute/date.rs similarity index 96% rename from crates/rayexec_bullet/src/compute/date.rs rename to crates/rayexec_execution/src/arrays/compute/date.rs index 42298f4c8..7e02e1498 100644 --- a/crates/rayexec_bullet/src/compute/date.rs +++ b/crates/rayexec_execution/src/arrays/compute/date.rs @@ -1,12 +1,12 @@ use chrono::{DateTime, Datelike, NaiveDate, Timelike, Utc}; use rayexec_error::{not_implemented, RayexecError, Result}; -use crate::array::Array; -use crate::datatype::{DataType, DecimalTypeMeta, TimeUnit}; -use crate::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use crate::executor::physical_type::{PhysicalI32, PhysicalI64}; -use crate::executor::scalar::UnaryExecutor; -use crate::scalar::decimal::{Decimal64Type, DecimalType}; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DecimalTypeMeta, TimeUnit}; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::{PhysicalI32, PhysicalI64}; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::scalar::decimal::{Decimal64Type, DecimalType}; pub const EPOCH_NAIVE_DATE: NaiveDate = match NaiveDate::from_ymd_opt(1970, 1, 1) { Some(date) => date, diff --git a/crates/rayexec_bullet/src/compute/mod.rs b/crates/rayexec_execution/src/arrays/compute/mod.rs similarity index 100% rename from crates/rayexec_bullet/src/compute/mod.rs rename to crates/rayexec_execution/src/arrays/compute/mod.rs diff --git a/crates/rayexec_bullet/src/compute/util.rs b/crates/rayexec_execution/src/arrays/compute/util.rs similarity index 100% rename from crates/rayexec_bullet/src/compute/util.rs rename to crates/rayexec_execution/src/arrays/compute/util.rs diff --git a/crates/rayexec_bullet/src/datatype.rs b/crates/rayexec_execution/src/arrays/datatype.rs similarity index 99% rename from crates/rayexec_bullet/src/datatype.rs rename to crates/rayexec_execution/src/arrays/datatype.rs index ce2b606d0..b6ba28fc3 100644 --- a/crates/rayexec_bullet/src/datatype.rs +++ b/crates/rayexec_execution/src/arrays/datatype.rs @@ -4,9 +4,9 @@ use rayexec_error::{not_implemented, OptionExt, RayexecError, Result, ResultExt} use rayexec_proto::ProtoConv; use serde::{Deserialize, Serialize}; -use crate::executor::physical_type::PhysicalType; -use crate::field::Field; -use crate::scalar::decimal::{Decimal128Type, Decimal64Type, DecimalType}; +use crate::arrays::executor::physical_type::PhysicalType; +use crate::arrays::field::Field; +use crate::arrays::scalar::decimal::{Decimal128Type, Decimal64Type, DecimalType}; /// The 'type' of the dataype. /// diff --git a/crates/rayexec_bullet/src/executor/aggregate/binary.rs b/crates/rayexec_execution/src/arrays/executor/aggregate/binary.rs similarity index 93% rename from crates/rayexec_bullet/src/executor/aggregate/binary.rs rename to crates/rayexec_execution/src/arrays/executor/aggregate/binary.rs index 929187956..26e2f30bd 100644 --- a/crates/rayexec_bullet/src/executor/aggregate/binary.rs +++ b/crates/rayexec_execution/src/arrays/executor/aggregate/binary.rs @@ -1,11 +1,11 @@ use rayexec_error::{RayexecError, Result}; use super::{AggregateState, RowToStateMapping}; -use crate::array::Array; -use crate::executor::physical_type::PhysicalStorage; -use crate::executor::scalar::check_validity; -use crate::selection; -use crate::storage::AddressableStorage; +use crate::arrays::array::Array; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::check_validity; +use crate::arrays::selection; +use crate::arrays::storage::AddressableStorage; /// Updates aggregate states for an aggregate that accepts two inputs. #[derive(Debug, Clone, Copy)] @@ -77,7 +77,7 @@ impl BinaryNonNullUpdater { #[cfg(test)] mod tests { use super::*; - use crate::executor::physical_type::PhysicalI32; + use crate::arrays::executor::physical_type::PhysicalI32; // SUM(col) + PRODUCT(col) #[derive(Debug)] diff --git a/crates/rayexec_bullet/src/executor/aggregate/mod.rs b/crates/rayexec_execution/src/arrays/executor/aggregate/mod.rs similarity index 97% rename from crates/rayexec_bullet/src/executor/aggregate/mod.rs rename to crates/rayexec_execution/src/arrays/executor/aggregate/mod.rs index bdd4c8f72..cfacfefd9 100644 --- a/crates/rayexec_bullet/src/executor/aggregate/mod.rs +++ b/crates/rayexec_execution/src/arrays/executor/aggregate/mod.rs @@ -11,8 +11,8 @@ use rayexec_error::Result; pub use unary::*; use super::builder::{ArrayBuilder, ArrayDataBuffer}; -use crate::array::Array; -use crate::bitmap::Bitmap; +use crate::arrays::array::Array; +use crate::arrays::bitmap::Bitmap; /// State for a single group's aggregate. /// diff --git a/crates/rayexec_bullet/src/executor/aggregate/unary.rs b/crates/rayexec_execution/src/arrays/executor/aggregate/unary.rs similarity index 95% rename from crates/rayexec_bullet/src/executor/aggregate/unary.rs rename to crates/rayexec_execution/src/arrays/executor/aggregate/unary.rs index 64d513482..512f4e1e2 100644 --- a/crates/rayexec_bullet/src/executor/aggregate/unary.rs +++ b/crates/rayexec_execution/src/arrays/executor/aggregate/unary.rs @@ -1,10 +1,10 @@ use rayexec_error::Result; use super::{AggregateState, RowToStateMapping}; -use crate::array::Array; -use crate::executor::physical_type::PhysicalStorage; -use crate::selection; -use crate::storage::AddressableStorage; +use crate::arrays::array::Array; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::selection; +use crate::arrays::storage::AddressableStorage; /// Updates aggregate states for an aggregate that accepts one input. #[derive(Debug, Clone, Copy)] @@ -60,7 +60,7 @@ impl UnaryNonNullUpdater { #[cfg(test)] mod tests { use super::*; - use crate::executor::physical_type::{PhysicalI32, PhysicalUtf8}; + use crate::arrays::executor::physical_type::{PhysicalI32, PhysicalUtf8}; #[derive(Debug, Default)] struct TestSumState { diff --git a/crates/rayexec_bullet/src/executor/builder.rs b/crates/rayexec_execution/src/arrays/executor/builder.rs similarity index 97% rename from crates/rayexec_bullet/src/executor/builder.rs rename to crates/rayexec_execution/src/arrays/executor/builder.rs index 77b192988..a634dc552 100644 --- a/crates/rayexec_bullet/src/executor/builder.rs +++ b/crates/rayexec_execution/src/arrays/executor/builder.rs @@ -2,10 +2,10 @@ use std::marker::PhantomData; use std::sync::Arc; use super::physical_type::{AsBytes, VarlenType}; -use crate::array::{ArrayData, BinaryData}; -use crate::bitmap::Bitmap; -use crate::datatype::DataType; -use crate::storage::{ +use crate::arrays::array::{ArrayData, BinaryData}; +use crate::arrays::bitmap::Bitmap; +use crate::arrays::datatype::DataType; +use crate::arrays::storage::{ BooleanStorage, GermanLargeMetadata, GermanMetadata, diff --git a/crates/rayexec_bullet/src/executor/mod.rs b/crates/rayexec_execution/src/arrays/executor/mod.rs similarity index 100% rename from crates/rayexec_bullet/src/executor/mod.rs rename to crates/rayexec_execution/src/arrays/executor/mod.rs diff --git a/crates/rayexec_bullet/src/executor/physical_type.rs b/crates/rayexec_execution/src/arrays/executor/physical_type.rs similarity index 99% rename from crates/rayexec_bullet/src/executor/physical_type.rs rename to crates/rayexec_execution/src/arrays/executor/physical_type.rs index 36dbfaf63..516b9831f 100644 --- a/crates/rayexec_bullet/src/executor/physical_type.rs +++ b/crates/rayexec_execution/src/arrays/executor/physical_type.rs @@ -5,9 +5,9 @@ use rayexec_error::{RayexecError, Result, ResultExt}; use rayexec_proto::ProtoConv; use super::builder::{ArrayDataBuffer, BooleanBuffer, GermanVarlenBuffer, PrimitiveBuffer}; -use crate::array::{Array, ArrayData, BinaryData}; -use crate::scalar::interval::Interval; -use crate::storage::{ +use crate::arrays::array::{Array, ArrayData, BinaryData}; +use crate::arrays::scalar::interval::Interval; +use crate::arrays::storage::{ AddressableStorage, BooleanStorageRef, ContiguousVarlenStorageSlice, diff --git a/crates/rayexec_bullet/src/executor/scalar/binary.rs b/crates/rayexec_execution/src/arrays/executor/scalar/binary.rs similarity index 90% rename from crates/rayexec_bullet/src/executor/scalar/binary.rs rename to crates/rayexec_execution/src/arrays/executor/scalar/binary.rs index 5c8bed1ce..f289147c9 100644 --- a/crates/rayexec_bullet/src/executor/scalar/binary.rs +++ b/crates/rayexec_execution/src/arrays/executor/scalar/binary.rs @@ -1,13 +1,13 @@ use rayexec_error::Result; use super::check_validity; -use crate::array::Array; -use crate::bitmap::Bitmap; -use crate::executor::builder::{ArrayBuilder, ArrayDataBuffer, OutputBuffer}; -use crate::executor::physical_type::PhysicalStorage; -use crate::executor::scalar::validate_logical_len; -use crate::selection; -use crate::storage::AddressableStorage; +use crate::arrays::array::Array; +use crate::arrays::bitmap::Bitmap; +use crate::arrays::executor::builder::{ArrayBuilder, ArrayDataBuffer, OutputBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::validate_logical_len; +use crate::arrays::selection; +use crate::arrays::storage::AddressableStorage; #[derive(Debug, Clone, Copy)] pub struct BinaryExecutor; @@ -95,10 +95,10 @@ mod tests { use selection::SelectionVector; use super::*; - use crate::datatype::DataType; - use crate::executor::builder::{GermanVarlenBuffer, PrimitiveBuffer}; - use crate::executor::physical_type::{PhysicalI32, PhysicalUtf8}; - use crate::scalar::ScalarValue; + use crate::arrays::datatype::DataType; + use crate::arrays::executor::builder::{GermanVarlenBuffer, PrimitiveBuffer}; + use crate::arrays::executor::physical_type::{PhysicalI32, PhysicalUtf8}; + use crate::arrays::scalar::ScalarValue; #[test] fn binary_simple_add() { diff --git a/crates/rayexec_bullet/src/executor/scalar/fill.rs b/crates/rayexec_execution/src/arrays/executor/scalar/fill.rs similarity index 97% rename from crates/rayexec_bullet/src/executor/scalar/fill.rs rename to crates/rayexec_execution/src/arrays/executor/scalar/fill.rs index 5765e2c75..8029004ba 100644 --- a/crates/rayexec_bullet/src/executor/scalar/fill.rs +++ b/crates/rayexec_execution/src/arrays/executor/scalar/fill.rs @@ -2,17 +2,17 @@ use std::borrow::Borrow; use rayexec_error::{RayexecError, Result}; -use crate::array::{Array, ArrayData}; -use crate::bitmap::Bitmap; -use crate::datatype::DataType; -use crate::executor::builder::{ +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::bitmap::Bitmap; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ ArrayBuilder, ArrayDataBuffer, BooleanBuffer, GermanVarlenBuffer, PrimitiveBuffer, }; -use crate::executor::physical_type::{ +use crate::arrays::executor::physical_type::{ PhysicalBinary, PhysicalBool, PhysicalF16, @@ -34,9 +34,9 @@ use crate::executor::physical_type::{ PhysicalU8, PhysicalUtf8, }; -use crate::executor::scalar::UnaryExecutor; -use crate::selection; -use crate::storage::{ +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::selection; +use crate::arrays::storage::{ AddressableStorage, ListItemMetadata, ListStorage, @@ -548,10 +548,10 @@ where #[cfg(test)] mod tests { use super::*; - use crate::datatype::DataType; - use crate::executor::builder::PrimitiveBuffer; - use crate::executor::physical_type::PhysicalI32; - use crate::scalar::ScalarValue; + use crate::arrays::datatype::DataType; + use crate::arrays::executor::builder::PrimitiveBuffer; + use crate::arrays::executor::physical_type::PhysicalI32; + use crate::arrays::scalar::ScalarValue; #[test] fn fill_simple_linear() { diff --git a/crates/rayexec_bullet/src/executor/scalar/hash.rs b/crates/rayexec_execution/src/arrays/executor/scalar/hash.rs similarity index 98% rename from crates/rayexec_bullet/src/executor/scalar/hash.rs rename to crates/rayexec_execution/src/arrays/executor/scalar/hash.rs index 7f4a35a05..548bcb850 100644 --- a/crates/rayexec_bullet/src/executor/scalar/hash.rs +++ b/crates/rayexec_execution/src/arrays/executor/scalar/hash.rs @@ -2,8 +2,8 @@ use ahash::RandomState; use half::f16; use rayexec_error::{RayexecError, Result}; -use crate::array::{Array, ArrayData}; -use crate::executor::physical_type::{ +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::executor::physical_type::{ PhysicalBinary, PhysicalBool, PhysicalF16, @@ -25,9 +25,9 @@ use crate::executor::physical_type::{ PhysicalUntypedNull, PhysicalUtf8, }; -use crate::scalar::interval::Interval; -use crate::selection; -use crate::storage::{AddressableStorage, UntypedNull}; +use crate::arrays::scalar::interval::Interval; +use crate::arrays::selection; +use crate::arrays::storage::{AddressableStorage, UntypedNull}; /// State used for all hashing operations during physical execution. pub const HASH_RANDOM_STATE: RandomState = RandomState::with_seeds(0, 0, 0, 0); diff --git a/crates/rayexec_bullet/src/executor/scalar/list.rs b/crates/rayexec_execution/src/arrays/executor/scalar/list.rs similarity index 93% rename from crates/rayexec_bullet/src/executor/scalar/list.rs rename to crates/rayexec_execution/src/arrays/executor/scalar/list.rs index 70622af65..f1b0ff63d 100644 --- a/crates/rayexec_bullet/src/executor/scalar/list.rs +++ b/crates/rayexec_execution/src/arrays/executor/scalar/list.rs @@ -1,12 +1,16 @@ use rayexec_error::{not_implemented, RayexecError, Result}; -use crate::array::{Array, ArrayData}; -use crate::bitmap::Bitmap; -use crate::executor::builder::{ArrayBuilder, ArrayDataBuffer}; -use crate::executor::physical_type::{PhysicalList, PhysicalStorage}; -use crate::executor::scalar::{can_skip_validity_check, check_validity, validate_logical_len}; -use crate::selection::{self, SelectionVector}; -use crate::storage::{AddressableStorage, ListItemMetadata}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::bitmap::Bitmap; +use crate::arrays::executor::builder::{ArrayBuilder, ArrayDataBuffer}; +use crate::arrays::executor::physical_type::{PhysicalList, PhysicalStorage}; +use crate::arrays::executor::scalar::{ + can_skip_validity_check, + check_validity, + validate_logical_len, +}; +use crate::arrays::selection::{self, SelectionVector}; +use crate::arrays::storage::{AddressableStorage, ListItemMetadata}; pub trait BinaryListReducer { fn new(left_len: i32, right_len: i32) -> Self; diff --git a/crates/rayexec_bullet/src/executor/scalar/mod.rs b/crates/rayexec_execution/src/arrays/executor/scalar/mod.rs similarity index 96% rename from crates/rayexec_bullet/src/executor/scalar/mod.rs rename to crates/rayexec_execution/src/arrays/executor/scalar/mod.rs index 2949752df..e2477f180 100644 --- a/crates/rayexec_bullet/src/executor/scalar/mod.rs +++ b/crates/rayexec_execution/src/arrays/executor/scalar/mod.rs @@ -35,8 +35,8 @@ pub use fill::*; use rayexec_error::{RayexecError, Result}; use super::builder::ArrayDataBuffer; -use crate::array::Array; -use crate::bitmap::Bitmap; +use crate::arrays::array::Array; +use crate::arrays::bitmap::Bitmap; #[inline] pub fn check_validity(idx: usize, validity: Option<&Bitmap>) -> bool { diff --git a/crates/rayexec_bullet/src/executor/scalar/select.rs b/crates/rayexec_execution/src/arrays/executor/scalar/select.rs similarity index 93% rename from crates/rayexec_bullet/src/executor/scalar/select.rs rename to crates/rayexec_execution/src/arrays/executor/scalar/select.rs index 1e0a87a82..7e7e37e2d 100644 --- a/crates/rayexec_bullet/src/executor/scalar/select.rs +++ b/crates/rayexec_execution/src/arrays/executor/scalar/select.rs @@ -1,9 +1,9 @@ use rayexec_error::Result; -use crate::array::Array; -use crate::executor::physical_type::{PhysicalBool, PhysicalStorage}; -use crate::selection::{self, SelectionVector}; -use crate::storage::AddressableStorage; +use crate::arrays::array::Array; +use crate::arrays::executor::physical_type::{PhysicalBool, PhysicalStorage}; +use crate::arrays::selection::{self, SelectionVector}; +use crate::arrays::storage::AddressableStorage; #[derive(Debug, Clone)] pub struct SelectExecutor; diff --git a/crates/rayexec_bullet/src/executor/scalar/ternary.rs b/crates/rayexec_execution/src/arrays/executor/scalar/ternary.rs similarity index 90% rename from crates/rayexec_bullet/src/executor/scalar/ternary.rs rename to crates/rayexec_execution/src/arrays/executor/scalar/ternary.rs index 89b8d285d..cdde8aee2 100644 --- a/crates/rayexec_bullet/src/executor/scalar/ternary.rs +++ b/crates/rayexec_execution/src/arrays/executor/scalar/ternary.rs @@ -3,13 +3,13 @@ use std::fmt::Debug; use rayexec_error::Result; use super::check_validity; -use crate::array::Array; -use crate::bitmap::Bitmap; -use crate::executor::builder::{ArrayBuilder, ArrayDataBuffer, OutputBuffer}; -use crate::executor::physical_type::PhysicalStorage; -use crate::executor::scalar::validate_logical_len; -use crate::selection; -use crate::storage::AddressableStorage; +use crate::arrays::array::Array; +use crate::arrays::bitmap::Bitmap; +use crate::arrays::executor::builder::{ArrayBuilder, ArrayDataBuffer, OutputBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::validate_logical_len; +use crate::arrays::selection; +use crate::arrays::storage::AddressableStorage; #[derive(Debug, Clone, Copy)] pub struct TernaryExecutor; diff --git a/crates/rayexec_bullet/src/executor/scalar/unary.rs b/crates/rayexec_execution/src/arrays/executor/scalar/unary.rs similarity index 94% rename from crates/rayexec_bullet/src/executor/scalar/unary.rs rename to crates/rayexec_execution/src/arrays/executor/scalar/unary.rs index 91b0affd7..778ff7838 100644 --- a/crates/rayexec_bullet/src/executor/scalar/unary.rs +++ b/crates/rayexec_execution/src/arrays/executor/scalar/unary.rs @@ -1,12 +1,12 @@ use rayexec_error::Result; use super::validate_logical_len; -use crate::array::Array; -use crate::bitmap::Bitmap; -use crate::executor::builder::{ArrayBuilder, ArrayDataBuffer, OutputBuffer}; -use crate::executor::physical_type::PhysicalStorage; -use crate::selection; -use crate::storage::AddressableStorage; +use crate::arrays::array::Array; +use crate::arrays::bitmap::Bitmap; +use crate::arrays::executor::builder::{ArrayBuilder, ArrayDataBuffer, OutputBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::selection; +use crate::arrays::storage::AddressableStorage; #[derive(Debug, Clone)] pub struct UnaryExecutor; @@ -152,10 +152,10 @@ mod tests { use selection::SelectionVector; use super::*; - use crate::datatype::DataType; - use crate::executor::builder::{GermanVarlenBuffer, PrimitiveBuffer}; - use crate::executor::physical_type::{PhysicalI32, PhysicalUtf8}; - use crate::scalar::ScalarValue; + use crate::arrays::datatype::DataType; + use crate::arrays::executor::builder::{GermanVarlenBuffer, PrimitiveBuffer}; + use crate::arrays::executor::physical_type::{PhysicalI32, PhysicalUtf8}; + use crate::arrays::scalar::ScalarValue; #[test] fn int32_inc_by_2() { diff --git a/crates/rayexec_bullet/src/executor/scalar/uniform.rs b/crates/rayexec_execution/src/arrays/executor/scalar/uniform.rs similarity index 92% rename from crates/rayexec_bullet/src/executor/scalar/uniform.rs rename to crates/rayexec_execution/src/arrays/executor/scalar/uniform.rs index dbf8bde67..7a7b01083 100644 --- a/crates/rayexec_bullet/src/executor/scalar/uniform.rs +++ b/crates/rayexec_execution/src/arrays/executor/scalar/uniform.rs @@ -1,13 +1,13 @@ use rayexec_error::{RayexecError, Result}; use super::check_validity; -use crate::array::Array; -use crate::bitmap::Bitmap; -use crate::executor::builder::{ArrayBuilder, ArrayDataBuffer, OutputBuffer}; -use crate::executor::physical_type::PhysicalStorage; -use crate::executor::scalar::validate_logical_len; -use crate::selection; -use crate::storage::AddressableStorage; +use crate::arrays::array::Array; +use crate::arrays::bitmap::Bitmap; +use crate::arrays::executor::builder::{ArrayBuilder, ArrayDataBuffer, OutputBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::validate_logical_len; +use crate::arrays::selection; +use crate::arrays::storage::AddressableStorage; #[derive(Debug, Clone, Copy)] pub struct UniformExecutor; @@ -109,10 +109,10 @@ mod tests { use selection::SelectionVector; use super::*; - use crate::datatype::DataType; - use crate::executor::builder::GermanVarlenBuffer; - use crate::executor::physical_type::PhysicalUtf8; - use crate::scalar::ScalarValue; + use crate::arrays::datatype::DataType; + use crate::arrays::executor::builder::GermanVarlenBuffer; + use crate::arrays::executor::physical_type::PhysicalUtf8; + use crate::arrays::scalar::ScalarValue; #[test] fn uniform_string_concat_row_wise() { diff --git a/crates/rayexec_bullet/src/field.rs b/crates/rayexec_execution/src/arrays/field.rs similarity index 99% rename from crates/rayexec_bullet/src/field.rs rename to crates/rayexec_execution/src/arrays/field.rs index 42a296378..fca963c8a 100644 --- a/crates/rayexec_bullet/src/field.rs +++ b/crates/rayexec_execution/src/arrays/field.rs @@ -2,7 +2,7 @@ use rayexec_error::{OptionExt, Result}; use rayexec_proto::ProtoConv; use serde::{Deserialize, Serialize}; -use crate::datatype::DataType; +use crate::arrays::datatype::DataType; /// A named field. #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)] diff --git a/crates/rayexec_bullet/src/format/mod.rs b/crates/rayexec_execution/src/arrays/format/mod.rs similarity index 97% rename from crates/rayexec_bullet/src/format/mod.rs rename to crates/rayexec_execution/src/arrays/format/mod.rs index eccf5b3af..106625af5 100644 --- a/crates/rayexec_bullet/src/format/mod.rs +++ b/crates/rayexec_execution/src/arrays/format/mod.rs @@ -5,8 +5,8 @@ use std::fmt; use rayexec_error::Result; -use crate::array::Array; -use crate::scalar::ScalarValue; +use crate::arrays::array::Array; +use crate::arrays::scalar::ScalarValue; /// Formatting options for arrays and scalars. #[derive(Debug, Clone, PartialEq, Eq)] diff --git a/crates/rayexec_bullet/src/format/pretty/components.rs b/crates/rayexec_execution/src/arrays/format/pretty/components.rs similarity index 100% rename from crates/rayexec_bullet/src/format/pretty/components.rs rename to crates/rayexec_execution/src/arrays/format/pretty/components.rs diff --git a/crates/rayexec_bullet/src/format/pretty/display.rs b/crates/rayexec_execution/src/arrays/format/pretty/display.rs similarity index 99% rename from crates/rayexec_bullet/src/format/pretty/display.rs rename to crates/rayexec_execution/src/arrays/format/pretty/display.rs index 7ef3ead8c..68e8fc1a3 100644 --- a/crates/rayexec_bullet/src/format/pretty/display.rs +++ b/crates/rayexec_execution/src/arrays/format/pretty/display.rs @@ -1,7 +1,7 @@ use std::fmt::{self, Write as _}; use super::table::ColumnValues; -use crate::format::pretty::components::DEFAULT_COMPONENTS; +use crate::arrays::format::pretty::components::DEFAULT_COMPONENTS; #[derive(Debug, Clone, PartialEq, Eq)] pub struct PrettyHeader { diff --git a/crates/rayexec_bullet/src/format/pretty/mod.rs b/crates/rayexec_execution/src/arrays/format/pretty/mod.rs similarity index 100% rename from crates/rayexec_bullet/src/format/pretty/mod.rs rename to crates/rayexec_execution/src/arrays/format/pretty/mod.rs diff --git a/crates/rayexec_bullet/src/format/pretty/table.rs b/crates/rayexec_execution/src/arrays/format/pretty/table.rs similarity index 99% rename from crates/rayexec_bullet/src/format/pretty/table.rs rename to crates/rayexec_execution/src/arrays/format/pretty/table.rs index 5297fefc3..3896f95a2 100644 --- a/crates/rayexec_bullet/src/format/pretty/table.rs +++ b/crates/rayexec_execution/src/arrays/format/pretty/table.rs @@ -7,11 +7,11 @@ use textwrap::core::display_width; use textwrap::{fill_inplace, wrap}; use super::display::{table_width, Alignment, PrettyFooter, PrettyHeader, PrettyValues}; -use crate::array::Array; -use crate::batch::Batch; -use crate::datatype::DataType; -use crate::field::Schema; -use crate::format::{FormatOptions, Formatter}; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; +use crate::arrays::datatype::DataType; +use crate::arrays::field::Schema; +use crate::arrays::format::{FormatOptions, Formatter}; /// How many values to use for the avg width calculation. const NUM_VALS_FOR_AVG: usize = 30; @@ -742,7 +742,7 @@ const fn elide_index(v: &[T]) -> usize { #[cfg(test)] mod tests { use super::*; - use crate::field::Field; + use crate::arrays::field::Field; #[test] fn test_truncate_string() { diff --git a/crates/rayexec_bullet/src/format/ugly.rs b/crates/rayexec_execution/src/arrays/format/ugly.rs similarity index 93% rename from crates/rayexec_bullet/src/format/ugly.rs rename to crates/rayexec_execution/src/arrays/format/ugly.rs index 2963db0ad..f52d5565a 100644 --- a/crates/rayexec_bullet/src/format/ugly.rs +++ b/crates/rayexec_execution/src/arrays/format/ugly.rs @@ -2,9 +2,9 @@ use std::fmt::Write as _; use rayexec_error::Result; -use crate::batch::Batch; -use crate::field::Schema; -use crate::format::{FormatOptions, Formatter}; +use crate::arrays::batch::Batch; +use crate::arrays::field::Schema; +use crate::arrays::format::{FormatOptions, Formatter}; pub fn ugly_format_no_schema<'a, I>(batches: I) -> Result where diff --git a/crates/rayexec_execution/src/arrays/mod.rs b/crates/rayexec_execution/src/arrays/mod.rs new file mode 100644 index 000000000..d35785fe0 --- /dev/null +++ b/crates/rayexec_execution/src/arrays/mod.rs @@ -0,0 +1,14 @@ +pub mod array; +pub mod batch; +pub mod bitmap; +pub mod compute; +pub mod datatype; +pub mod executor; +pub mod field; +pub mod format; +pub mod row; +pub mod scalar; +pub mod selection; +pub mod storage; + +pub mod testutil; diff --git a/crates/rayexec_bullet/src/row/encoding.rs b/crates/rayexec_execution/src/arrays/row/encoding.rs similarity index 99% rename from crates/rayexec_bullet/src/row/encoding.rs rename to crates/rayexec_execution/src/arrays/row/encoding.rs index f63ee79be..67d059e0f 100644 --- a/crates/rayexec_bullet/src/row/encoding.rs +++ b/crates/rayexec_execution/src/arrays/row/encoding.rs @@ -1,8 +1,8 @@ use half::f16; use rayexec_error::{not_implemented, RayexecError, Result}; -use crate::array::{Array, ArrayData, BinaryData}; -use crate::executor::physical_type::{ +use crate::arrays::array::{Array, ArrayData, BinaryData}; +use crate::arrays::executor::physical_type::{ AsBytes, PhysicalBinary, PhysicalBool, @@ -22,8 +22,8 @@ use crate::executor::physical_type::{ PhysicalU64, PhysicalU8, }; -use crate::executor::scalar::UnaryExecutor; -use crate::scalar::interval::Interval; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::scalar::interval::Interval; /// Binary-encoded rows suitable for comparisons. #[derive(Debug)] diff --git a/crates/rayexec_bullet/src/row/mod.rs b/crates/rayexec_execution/src/arrays/row/mod.rs similarity index 95% rename from crates/rayexec_bullet/src/row/mod.rs rename to crates/rayexec_execution/src/arrays/row/mod.rs index 77f8a8ca4..ed1ce3d72 100644 --- a/crates/rayexec_bullet/src/row/mod.rs +++ b/crates/rayexec_execution/src/arrays/row/mod.rs @@ -2,8 +2,8 @@ pub mod encoding; use rayexec_error::Result; -use crate::array::Array; -use crate::scalar::ScalarValue; +use crate::arrays::array::Array; +use crate::arrays::scalar::ScalarValue; /// Scalar representation of a single row. #[derive(Debug, Clone, PartialEq, Eq)] diff --git a/crates/rayexec_bullet/src/scalar/decimal.rs b/crates/rayexec_execution/src/arrays/scalar/decimal.rs similarity index 98% rename from crates/rayexec_bullet/src/scalar/decimal.rs rename to crates/rayexec_execution/src/arrays/scalar/decimal.rs index b21a454d5..041a7aca5 100644 --- a/crates/rayexec_bullet/src/scalar/decimal.rs +++ b/crates/rayexec_execution/src/arrays/scalar/decimal.rs @@ -5,7 +5,7 @@ use rayexec_error::{RayexecError, Result, ResultExt}; use rayexec_proto::ProtoConv; use serde::{Deserialize, Serialize}; -use crate::executor::physical_type::{PhysicalI128, PhysicalI64, PhysicalStorage}; +use crate::arrays::executor::physical_type::{PhysicalI128, PhysicalI64, PhysicalStorage}; pub trait DecimalPrimitive: PrimInt + FromPrimitive + Signed + Default + Debug + Display + Sync + Send diff --git a/crates/rayexec_bullet/src/scalar/interval.rs b/crates/rayexec_execution/src/arrays/scalar/interval.rs similarity index 97% rename from crates/rayexec_bullet/src/scalar/interval.rs rename to crates/rayexec_execution/src/arrays/scalar/interval.rs index 965f3a198..d8119b704 100644 --- a/crates/rayexec_bullet/src/scalar/interval.rs +++ b/crates/rayexec_execution/src/arrays/scalar/interval.rs @@ -4,7 +4,7 @@ use rayexec_error::Result; use rayexec_proto::ProtoConv; use serde::{Deserialize, Serialize}; -use crate::compute::cast::format::{Formatter, IntervalFormatter}; +use crate::arrays::compute::cast::format::{Formatter, IntervalFormatter}; /// A representation of an interval with nanosecond resolution. #[derive( diff --git a/crates/rayexec_bullet/src/scalar/mod.rs b/crates/rayexec_execution/src/arrays/scalar/mod.rs similarity index 98% rename from crates/rayexec_bullet/src/scalar/mod.rs rename to crates/rayexec_execution/src/arrays/scalar/mod.rs index e2529c3a0..fb0741a82 100644 --- a/crates/rayexec_bullet/src/scalar/mod.rs +++ b/crates/rayexec_execution/src/arrays/scalar/mod.rs @@ -14,9 +14,9 @@ use rayexec_proto::ProtoConv; use serde::{Deserialize, Serialize}; use timestamp::TimestampScalar; -use crate::array::{Array, ArrayData}; -use crate::bitmap::Bitmap; -use crate::compute::cast::format::{ +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::bitmap::Bitmap; +use crate::arrays::compute::cast::format::{ BoolFormatter, Date32Formatter, Date64Formatter, @@ -42,10 +42,16 @@ use crate::compute::cast::format::{ UInt64Formatter, UInt8Formatter, }; -use crate::datatype::{DataType, DecimalTypeMeta, ListTypeMeta, TimeUnit, TimestampTypeMeta}; -use crate::executor::scalar::concat; -use crate::selection::SelectionVector; -use crate::storage::{ +use crate::arrays::datatype::{ + DataType, + DecimalTypeMeta, + ListTypeMeta, + TimeUnit, + TimestampTypeMeta, +}; +use crate::arrays::executor::scalar::concat; +use crate::arrays::selection::SelectionVector; +use crate::arrays::storage::{ BooleanStorage, GermanVarlenStorage, ListItemMetadata, diff --git a/crates/rayexec_bullet/src/scalar/timestamp.rs b/crates/rayexec_execution/src/arrays/scalar/timestamp.rs similarity index 94% rename from crates/rayexec_bullet/src/scalar/timestamp.rs rename to crates/rayexec_execution/src/arrays/scalar/timestamp.rs index 5c55195c7..bcded12de 100644 --- a/crates/rayexec_bullet/src/scalar/timestamp.rs +++ b/crates/rayexec_execution/src/arrays/scalar/timestamp.rs @@ -2,7 +2,7 @@ use rayexec_error::Result; use rayexec_proto::ProtoConv; use serde::{Deserialize, Serialize}; -use crate::datatype::TimeUnit; +use crate::arrays::datatype::TimeUnit; #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Hash)] pub struct TimestampScalar { diff --git a/crates/rayexec_bullet/src/selection.rs b/crates/rayexec_execution/src/arrays/selection.rs similarity index 100% rename from crates/rayexec_bullet/src/selection.rs rename to crates/rayexec_execution/src/arrays/selection.rs diff --git a/crates/rayexec_bullet/src/storage/boolean.rs b/crates/rayexec_execution/src/arrays/storage/boolean.rs similarity index 96% rename from crates/rayexec_bullet/src/storage/boolean.rs rename to crates/rayexec_execution/src/arrays/storage/boolean.rs index db1aba4c0..73ae325b1 100644 --- a/crates/rayexec_bullet/src/storage/boolean.rs +++ b/crates/rayexec_execution/src/arrays/storage/boolean.rs @@ -1,5 +1,5 @@ use super::AddressableStorage; -use crate::bitmap::Bitmap; +use crate::arrays::bitmap::Bitmap; #[derive(Debug, Clone, PartialEq, Eq)] pub struct BooleanStorage(pub(crate) Bitmap); diff --git a/crates/rayexec_bullet/src/storage/german.rs b/crates/rayexec_execution/src/arrays/storage/german.rs similarity index 99% rename from crates/rayexec_bullet/src/storage/german.rs rename to crates/rayexec_execution/src/arrays/storage/german.rs index 32c3d55c9..1a8c15c43 100644 --- a/crates/rayexec_bullet/src/storage/german.rs +++ b/crates/rayexec_execution/src/arrays/storage/german.rs @@ -3,7 +3,7 @@ use std::fmt; use rayexec_error::Result; use super::{AddressableStorage, PrimitiveStorage}; -use crate::executor::physical_type::AsBytes; +use crate::arrays::executor::physical_type::AsBytes; /// Byte length threshold for inlining varlen data in the array's metadata. pub(crate) const INLINE_THRESHOLD: i32 = 12; diff --git a/crates/rayexec_bullet/src/storage/list.rs b/crates/rayexec_execution/src/arrays/storage/list.rs similarity index 98% rename from crates/rayexec_bullet/src/storage/list.rs rename to crates/rayexec_execution/src/arrays/storage/list.rs index 6e47d8d89..f2107de67 100644 --- a/crates/rayexec_bullet/src/storage/list.rs +++ b/crates/rayexec_execution/src/arrays/storage/list.rs @@ -1,7 +1,7 @@ use rayexec_error::{RayexecError, Result}; use super::PrimitiveStorage; -use crate::array::Array; +use crate::arrays::array::Array; #[derive(Debug, Clone, Copy, Default, PartialEq, Eq)] pub struct ListItemMetadata { diff --git a/crates/rayexec_bullet/src/storage/mod.rs b/crates/rayexec_execution/src/arrays/storage/mod.rs similarity index 100% rename from crates/rayexec_bullet/src/storage/mod.rs rename to crates/rayexec_execution/src/arrays/storage/mod.rs diff --git a/crates/rayexec_bullet/src/storage/primitive.rs b/crates/rayexec_execution/src/arrays/storage/primitive.rs similarity index 100% rename from crates/rayexec_bullet/src/storage/primitive.rs rename to crates/rayexec_execution/src/arrays/storage/primitive.rs diff --git a/crates/rayexec_bullet/src/storage/untyped_null.rs b/crates/rayexec_execution/src/arrays/storage/untyped_null.rs similarity index 100% rename from crates/rayexec_bullet/src/storage/untyped_null.rs rename to crates/rayexec_execution/src/arrays/storage/untyped_null.rs diff --git a/crates/rayexec_bullet/src/storage/varlen.rs b/crates/rayexec_execution/src/arrays/storage/varlen.rs similarity index 100% rename from crates/rayexec_bullet/src/storage/varlen.rs rename to crates/rayexec_execution/src/arrays/storage/varlen.rs diff --git a/crates/rayexec_bullet/src/testutil.rs b/crates/rayexec_execution/src/arrays/testutil.rs similarity index 93% rename from crates/rayexec_bullet/src/testutil.rs rename to crates/rayexec_execution/src/arrays/testutil.rs index 243051010..e2d84d947 100644 --- a/crates/rayexec_bullet/src/testutil.rs +++ b/crates/rayexec_execution/src/arrays/testutil.rs @@ -5,8 +5,8 @@ //! //! Should not be used outside of tests. -use crate::array::Array; -use crate::batch::Batch; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; /// Asserts that two arrays are logically equal. pub fn assert_arrays_eq(a: &Array, b: &Array) { @@ -37,7 +37,7 @@ pub fn assert_batches_eq(a: &Batch, b: &Batch) { #[cfg(test)] mod tests { use super::*; - use crate::selection::SelectionVector; + use crate::arrays::selection::SelectionVector; #[test] fn arrays_eq() { diff --git a/crates/rayexec_execution/src/config/session.rs b/crates/rayexec_execution/src/config/session.rs index da2be9443..9e5b837e4 100644 --- a/crates/rayexec_execution/src/config/session.rs +++ b/crates/rayexec_execution/src/config/session.rs @@ -1,9 +1,9 @@ use std::collections::HashMap; use std::sync::LazyLock; -use rayexec_bullet::scalar::{OwnedScalarValue, ScalarValue}; use rayexec_error::{RayexecError, Result}; +use crate::arrays::scalar::{OwnedScalarValue, ScalarValue}; use crate::runtime::{PipelineExecutor, Runtime}; /// Configuration for the session. diff --git a/crates/rayexec_execution/src/database/catalog_entry.rs b/crates/rayexec_execution/src/database/catalog_entry.rs index 9ce19a088..e2040bc85 100644 --- a/crates/rayexec_execution/src/database/catalog_entry.rs +++ b/crates/rayexec_execution/src/database/catalog_entry.rs @@ -1,11 +1,11 @@ use std::fmt; use std::sync::Arc; -use rayexec_bullet::field::Field; use rayexec_error::{OptionExt, RayexecError, Result}; use rayexec_proto::ProtoConv; use super::DatabaseContext; +use crate::arrays::field::Field; use crate::functions::aggregate::AggregateFunction; use crate::functions::copy::CopyToFunction; use crate::functions::scalar::ScalarFunction; diff --git a/crates/rayexec_execution/src/database/create.rs b/crates/rayexec_execution/src/database/create.rs index 9c0c54dac..11a2ae8ca 100644 --- a/crates/rayexec_execution/src/database/create.rs +++ b/crates/rayexec_execution/src/database/create.rs @@ -1,8 +1,8 @@ //! Various create messages/structs. -use rayexec_bullet::field::Field; use rayexec_error::{RayexecError, Result}; use rayexec_proto::ProtoConv; +use crate::arrays::field::Field; use crate::functions::aggregate::AggregateFunction; use crate::functions::copy::CopyToFunction; use crate::functions::scalar::ScalarFunction; diff --git a/crates/rayexec_execution/src/database/mod.rs b/crates/rayexec_execution/src/database/mod.rs index 308e08859..d91cd42d2 100644 --- a/crates/rayexec_execution/src/database/mod.rs +++ b/crates/rayexec_execution/src/database/mod.rs @@ -15,10 +15,10 @@ use std::sync::Arc; use catalog::CatalogTx; use create::{CreateSchemaInfo, OnConflict}; use memory_catalog::MemoryCatalog; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::{RayexecError, Result}; use rayexec_proto::ProtoConv; +use crate::arrays::scalar::OwnedScalarValue; use crate::storage::catalog_storage::CatalogStorage; use crate::storage::memory::MemoryTableStorage; use crate::storage::table_storage::TableStorage; diff --git a/crates/rayexec_execution/src/datasource.rs b/crates/rayexec_execution/src/datasource.rs index 57c799f40..2f6f2c727 100644 --- a/crates/rayexec_execution/src/datasource.rs +++ b/crates/rayexec_execution/src/datasource.rs @@ -3,10 +3,10 @@ use std::fmt::Debug; use std::sync::Arc; use futures::future::BoxFuture; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::{RayexecError, Result}; use regex::Regex; +use crate::arrays::scalar::OwnedScalarValue; use crate::functions::copy::CopyToFunction; use crate::functions::table::TableFunction; use crate::runtime::Runtime; diff --git a/crates/rayexec_execution/src/engine/result.rs b/crates/rayexec_execution/src/engine/result.rs index 3c31a9981..2b5fef6d7 100644 --- a/crates/rayexec_execution/src/engine/result.rs +++ b/crates/rayexec_execution/src/engine/result.rs @@ -5,12 +5,12 @@ use std::task::{Context, Poll, Waker}; use futures::future::BoxFuture; use futures::{Future, Stream}; use parking_lot::Mutex; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::field::Schema; use rayexec_error::{RayexecError, Result}; use tracing::warn; use super::profiler::PlanningProfileData; +use crate::arrays::batch::Batch; +use crate::arrays::field::Schema; use crate::database::DatabaseContext; use crate::execution::operators::sink::{PartitionSink, SinkOperation}; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; diff --git a/crates/rayexec_execution/src/engine/server_state.rs b/crates/rayexec_execution/src/engine/server_state.rs index 384baf194..b0b3d3228 100644 --- a/crates/rayexec_execution/src/engine/server_state.rs +++ b/crates/rayexec_execution/src/engine/server_state.rs @@ -1,11 +1,11 @@ use std::sync::Arc; use dashmap::DashMap; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::field::{Field, Schema}; use rayexec_error::{not_implemented, RayexecError, Result}; use uuid::Uuid; +use crate::arrays::batch::Batch; +use crate::arrays::field::{Field, Schema}; use crate::config::execution::{ExecutablePlanConfig, IntermediatePlanConfig}; use crate::config::session::SessionConfig; use crate::database::catalog::CatalogTx; diff --git a/crates/rayexec_execution/src/engine/session.rs b/crates/rayexec_execution/src/engine/session.rs index 89a012fc1..c6283cb23 100644 --- a/crates/rayexec_execution/src/engine/session.rs +++ b/crates/rayexec_execution/src/engine/session.rs @@ -1,7 +1,6 @@ use std::sync::Arc; use hashbrown::HashMap; -use rayexec_bullet::field::{Field, Schema}; use rayexec_error::{OptionExt, RayexecError, Result}; use rayexec_parser::parser; use rayexec_parser::statement::RawStatement; @@ -11,6 +10,7 @@ use super::profiler::PlanningProfileData; use super::result::{new_results_sinks, ExecutionResult, ResultErrorSink, ResultStream}; use super::verifier::QueryVerifier; use super::DataSourceRegistry; +use crate::arrays::field::{Field, Schema}; use crate::config::execution::{ExecutablePlanConfig, IntermediatePlanConfig}; use crate::config::session::SessionConfig; use crate::database::catalog::CatalogTx; diff --git a/crates/rayexec_execution/src/execution/computed_batch.rs b/crates/rayexec_execution/src/execution/computed_batch.rs index 380d810da..2086c4800 100644 --- a/crates/rayexec_execution/src/execution/computed_batch.rs +++ b/crates/rayexec_execution/src/execution/computed_batch.rs @@ -1,8 +1,9 @@ use std::collections::VecDeque; -use rayexec_bullet::batch::Batch; use rayexec_error::Result; +use crate::arrays::batch::Batch; + /// Computed batch results from an operator. #[derive(Debug, PartialEq)] pub enum ComputedBatches { diff --git a/crates/rayexec_execution/src/execution/executable/pipeline.rs b/crates/rayexec_execution/src/execution/executable/pipeline.rs index 085592c4b..de96dd8fd 100644 --- a/crates/rayexec_execution/src/execution/executable/pipeline.rs +++ b/crates/rayexec_execution/src/execution/executable/pipeline.rs @@ -2,11 +2,11 @@ use std::fmt; use std::sync::Arc; use std::task::{Context, Poll}; -use rayexec_bullet::batch::Batch; use rayexec_error::{RayexecError, Result}; use tracing::trace; use super::profiler::OperatorProfileData; +use crate::arrays::batch::Batch; use crate::execution::computed_batch::ComputedBatches; use crate::execution::operators::{ ExecutableOperator, diff --git a/crates/rayexec_execution/src/execution/intermediate/planner/plan_describe.rs b/crates/rayexec_execution/src/execution/intermediate/planner/plan_describe.rs index 42680987c..3525b942d 100644 --- a/crates/rayexec_execution/src/execution/intermediate/planner/plan_describe.rs +++ b/crates/rayexec_execution/src/execution/intermediate/planner/plan_describe.rs @@ -1,10 +1,10 @@ use std::sync::Arc; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; use rayexec_error::{RayexecError, Result}; use super::{InProgressPipeline, IntermediatePipelineBuildState, PipelineIdGen}; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; use crate::execution::intermediate::pipeline::{IntermediateOperator, PipelineSource}; use crate::execution::operators::values::PhysicalValues; use crate::execution::operators::PhysicalOperator; diff --git a/crates/rayexec_execution/src/execution/intermediate/planner/plan_explain.rs b/crates/rayexec_execution/src/execution/intermediate/planner/plan_explain.rs index 0f33853f7..23dbc22e6 100644 --- a/crates/rayexec_execution/src/execution/intermediate/planner/plan_explain.rs +++ b/crates/rayexec_execution/src/execution/intermediate/planner/plan_explain.rs @@ -1,11 +1,11 @@ use std::sync::Arc; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; use rayexec_error::{not_implemented, RayexecError, Result}; use tracing::error; use super::{InProgressPipeline, IntermediatePipelineBuildState, Materializations, PipelineIdGen}; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; use crate::execution::intermediate::pipeline::{IntermediateOperator, PipelineSource}; use crate::execution::operators::values::PhysicalValues; use crate::execution::operators::PhysicalOperator; diff --git a/crates/rayexec_execution/src/execution/intermediate/planner/plan_scan.rs b/crates/rayexec_execution/src/execution/intermediate/planner/plan_scan.rs index 26e71f0f0..af92d317e 100644 --- a/crates/rayexec_execution/src/execution/intermediate/planner/plan_scan.rs +++ b/crates/rayexec_execution/src/execution/intermediate/planner/plan_scan.rs @@ -1,10 +1,10 @@ use std::sync::Arc; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; use rayexec_error::{not_implemented, RayexecError, Result, ResultExt}; use super::{InProgressPipeline, IntermediatePipelineBuildState, PipelineIdGen}; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; use crate::execution::intermediate::pipeline::{IntermediateOperator, PipelineSource}; use crate::execution::operators::scan::PhysicalScan; use crate::execution::operators::table_function::PhysicalTableFunction; diff --git a/crates/rayexec_execution/src/execution/intermediate/planner/plan_show_var.rs b/crates/rayexec_execution/src/execution/intermediate/planner/plan_show_var.rs index c6c6abc8c..5eb96bc88 100644 --- a/crates/rayexec_execution/src/execution/intermediate/planner/plan_show_var.rs +++ b/crates/rayexec_execution/src/execution/intermediate/planner/plan_show_var.rs @@ -1,10 +1,10 @@ use std::sync::Arc; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; use rayexec_error::{RayexecError, Result}; use super::{InProgressPipeline, IntermediatePipelineBuildState, PipelineIdGen}; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; use crate::execution::intermediate::pipeline::{IntermediateOperator, PipelineSource}; use crate::execution::operators::values::PhysicalValues; use crate::execution::operators::PhysicalOperator; diff --git a/crates/rayexec_execution/src/execution/operators/analyze.rs b/crates/rayexec_execution/src/execution/operators/analyze.rs index eeb41affd..ca4cb2deb 100644 --- a/crates/rayexec_execution/src/execution/operators/analyze.rs +++ b/crates/rayexec_execution/src/execution/operators/analyze.rs @@ -1,6 +1,5 @@ use std::task::Context; -use rayexec_bullet::batch::Batch; use rayexec_error::Result; use super::{ @@ -12,6 +11,7 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; diff --git a/crates/rayexec_execution/src/execution/operators/batch_resizer.rs b/crates/rayexec_execution/src/execution/operators/batch_resizer.rs index 160d03492..23c63d4d3 100644 --- a/crates/rayexec_execution/src/execution/operators/batch_resizer.rs +++ b/crates/rayexec_execution/src/execution/operators/batch_resizer.rs @@ -1,7 +1,6 @@ use std::sync::Arc; use std::task::{Context, Waker}; -use rayexec_bullet::batch::Batch; use rayexec_error::Result; use super::util::resizer::{BatchResizer, DEFAULT_TARGET_BATCH_SIZE}; @@ -15,6 +14,7 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::execution::computed_batch::ComputedBatches; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; diff --git a/crates/rayexec_execution/src/execution/operators/copy_to.rs b/crates/rayexec_execution/src/execution/operators/copy_to.rs index 7c02a4062..9cbaa05c1 100644 --- a/crates/rayexec_execution/src/execution/operators/copy_to.rs +++ b/crates/rayexec_execution/src/execution/operators/copy_to.rs @@ -1,9 +1,9 @@ -use rayexec_bullet::field::Schema; use rayexec_error::{OptionExt, Result}; use rayexec_io::location::FileLocation; use rayexec_proto::ProtoConv; use super::sink::{PartitionSink, SinkOperation, SinkOperator}; +use crate::arrays::field::Schema; use crate::database::DatabaseContext; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; use crate::functions::copy::CopyToFunction; diff --git a/crates/rayexec_execution/src/execution/operators/create_schema.rs b/crates/rayexec_execution/src/execution/operators/create_schema.rs index 16ee8fac9..39bbf69ff 100644 --- a/crates/rayexec_execution/src/execution/operators/create_schema.rs +++ b/crates/rayexec_execution/src/execution/operators/create_schema.rs @@ -4,7 +4,6 @@ use std::task::{Context, Poll}; use futures::future::BoxFuture; use futures::FutureExt; -use rayexec_bullet::batch::Batch; use rayexec_error::{OptionExt, RayexecError, Result}; use rayexec_proto::ProtoConv; @@ -18,6 +17,7 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::batch::Batch; use crate::database::catalog::CatalogTx; use crate::database::create::CreateSchemaInfo; use crate::database::DatabaseContext; diff --git a/crates/rayexec_execution/src/execution/operators/create_table.rs b/crates/rayexec_execution/src/execution/operators/create_table.rs index b6557f0eb..e58aab9e7 100644 --- a/crates/rayexec_execution/src/execution/operators/create_table.rs +++ b/crates/rayexec_execution/src/execution/operators/create_table.rs @@ -1,12 +1,12 @@ use std::fmt; use futures::future::BoxFuture; -use rayexec_bullet::batch::Batch; use rayexec_error::{OptionExt, RayexecError, Result}; use rayexec_proto::ProtoConv; use super::sink::{PartitionSink, SinkOperation, SinkOperator}; use super::util::barrier::PartitionBarrier; +use crate::arrays::batch::Batch; use crate::database::catalog::CatalogTx; use crate::database::create::CreateTableInfo; use crate::database::DatabaseContext; diff --git a/crates/rayexec_execution/src/execution/operators/create_view.rs b/crates/rayexec_execution/src/execution/operators/create_view.rs index cd14f6e1d..02a595433 100644 --- a/crates/rayexec_execution/src/execution/operators/create_view.rs +++ b/crates/rayexec_execution/src/execution/operators/create_view.rs @@ -4,7 +4,6 @@ use std::task::{Context, Poll}; use futures::future::BoxFuture; use futures::FutureExt; -use rayexec_bullet::batch::Batch; use rayexec_error::{RayexecError, Result}; use super::{ @@ -17,6 +16,7 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::batch::Batch; use crate::database::catalog::CatalogTx; use crate::database::create::CreateViewInfo; use crate::database::DatabaseContext; diff --git a/crates/rayexec_execution/src/execution/operators/drop.rs b/crates/rayexec_execution/src/execution/operators/drop.rs index 6f6d4f09f..cf1d78fc8 100644 --- a/crates/rayexec_execution/src/execution/operators/drop.rs +++ b/crates/rayexec_execution/src/execution/operators/drop.rs @@ -4,7 +4,6 @@ use std::task::{Context, Poll}; use futures::future::BoxFuture; use futures::FutureExt; -use rayexec_bullet::batch::Batch; use rayexec_error::{OptionExt, RayexecError, Result}; use rayexec_proto::ProtoConv; @@ -18,6 +17,7 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::batch::Batch; use crate::database::catalog::CatalogTx; use crate::database::drop::DropInfo; use crate::database::DatabaseContext; diff --git a/crates/rayexec_execution/src/execution/operators/empty.rs b/crates/rayexec_execution/src/execution/operators/empty.rs index aa63aee64..44ebb489e 100644 --- a/crates/rayexec_execution/src/execution/operators/empty.rs +++ b/crates/rayexec_execution/src/execution/operators/empty.rs @@ -1,7 +1,6 @@ use std::sync::Arc; use std::task::Context; -use rayexec_bullet::batch::Batch; use rayexec_error::{RayexecError, Result}; use super::{ @@ -13,6 +12,7 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::execution::operators::InputOutputStates; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; diff --git a/crates/rayexec_execution/src/execution/operators/filter.rs b/crates/rayexec_execution/src/execution/operators/filter.rs index 143865698..3315fcbf5 100644 --- a/crates/rayexec_execution/src/execution/operators/filter.rs +++ b/crates/rayexec_execution/src/execution/operators/filter.rs @@ -1,9 +1,9 @@ use std::sync::Arc; -use rayexec_bullet::batch::Batch; use rayexec_error::{OptionExt, Result}; use super::simple::{SimpleOperator, StatelessOperation}; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; use crate::expr::physical::PhysicalScalarExpression; diff --git a/crates/rayexec_execution/src/execution/operators/hash_aggregate/chunk.rs b/crates/rayexec_execution/src/execution/operators/hash_aggregate/chunk.rs index bcda66c6f..46caf2618 100644 --- a/crates/rayexec_execution/src/execution/operators/hash_aggregate/chunk.rs +++ b/crates/rayexec_execution/src/execution/operators/hash_aggregate/chunk.rs @@ -1,10 +1,10 @@ -use rayexec_bullet::array::Array; -use rayexec_bullet::executor::physical_type::PhysicalType; -use rayexec_bullet::executor::scalar::concat; use rayexec_error::Result; use super::hash_table::GroupAddress; use super::AggregateStates; +use crate::arrays::array::Array; +use crate::arrays::executor::physical_type::PhysicalType; +use crate::arrays::executor::scalar::concat; use crate::execution::operators::util::resizer::DEFAULT_TARGET_BATCH_SIZE; use crate::functions::aggregate::ChunkGroupAddressIter; diff --git a/crates/rayexec_execution/src/execution/operators/hash_aggregate/compare.rs b/crates/rayexec_execution/src/execution/operators/hash_aggregate/compare.rs index f8bdd25c5..74c781e5d 100644 --- a/crates/rayexec_execution/src/execution/operators/hash_aggregate/compare.rs +++ b/crates/rayexec_execution/src/execution/operators/hash_aggregate/compare.rs @@ -1,7 +1,11 @@ use std::collections::BTreeSet; -use rayexec_bullet::array::Array; -use rayexec_bullet::executor::physical_type::{ +use rayexec_error::{not_implemented, Result}; + +use super::chunk::GroupChunk; +use super::hash_table::GroupAddress; +use crate::arrays::array::Array; +use crate::arrays::executor::physical_type::{ PhysicalBinary, PhysicalBool, PhysicalF16, @@ -23,13 +27,9 @@ use rayexec_bullet::executor::physical_type::{ PhysicalUntypedNull, PhysicalUtf8, }; -use rayexec_bullet::executor::scalar::{can_skip_validity_check, check_validity}; -use rayexec_bullet::selection::{self, SelectionVector}; -use rayexec_bullet::storage::AddressableStorage; -use rayexec_error::{not_implemented, Result}; - -use super::chunk::GroupChunk; -use super::hash_table::GroupAddress; +use crate::arrays::executor::scalar::{can_skip_validity_check, check_validity}; +use crate::arrays::selection::{self, SelectionVector}; +use crate::arrays::storage::AddressableStorage; pub fn group_values_eq( inputs: &[Array], diff --git a/crates/rayexec_execution/src/execution/operators/hash_aggregate/distinct.rs b/crates/rayexec_execution/src/execution/operators/hash_aggregate/distinct.rs index c9ebfbeeb..ff21e4169 100644 --- a/crates/rayexec_execution/src/execution/operators/hash_aggregate/distinct.rs +++ b/crates/rayexec_execution/src/execution/operators/hash_aggregate/distinct.rs @@ -1,11 +1,11 @@ use std::sync::Arc; -use rayexec_bullet::array::Array; -use rayexec_bullet::executor::scalar::HashExecutor; -use rayexec_bullet::selection::SelectionVector; use rayexec_error::Result; use super::hash_table::HashTable; +use crate::arrays::array::Array; +use crate::arrays::executor::scalar::HashExecutor; +use crate::arrays::selection::SelectionVector; use crate::execution::operators::hash_aggregate::hash_table::GroupAddress; use crate::functions::aggregate::states::{AggregateGroupStates, OpaqueStatesMut}; use crate::functions::aggregate::ChunkGroupAddressIter; diff --git a/crates/rayexec_execution/src/execution/operators/hash_aggregate/drain.rs b/crates/rayexec_execution/src/execution/operators/hash_aggregate/drain.rs index 4b045ad1d..af73e0466 100644 --- a/crates/rayexec_execution/src/execution/operators/hash_aggregate/drain.rs +++ b/crates/rayexec_execution/src/execution/operators/hash_aggregate/drain.rs @@ -1,7 +1,7 @@ -use rayexec_bullet::batch::Batch; use rayexec_error::Result; use super::hash_table::HashTable; +use crate::arrays::batch::Batch; /// Drains a hash table. /// diff --git a/crates/rayexec_execution/src/execution/operators/hash_aggregate/hash_table.rs b/crates/rayexec_execution/src/execution/operators/hash_aggregate/hash_table.rs index 3cc7226ad..f6ce18a95 100644 --- a/crates/rayexec_execution/src/execution/operators/hash_aggregate/hash_table.rs +++ b/crates/rayexec_execution/src/execution/operators/hash_aggregate/hash_table.rs @@ -1,8 +1,6 @@ use std::collections::BTreeSet; use std::sync::Arc; -use rayexec_bullet::array::Array; -use rayexec_bullet::selection::SelectionVector; use rayexec_error::{RayexecError, Result}; use super::chunk::GroupChunk; @@ -10,6 +8,8 @@ use super::compare::group_values_eq; use super::drain::HashTableDrain; use super::entry::EntryKey; use super::Aggregate; +use crate::arrays::array::Array; +use crate::arrays::selection::SelectionVector; const LOAD_FACTOR: f64 = 0.7; @@ -479,10 +479,9 @@ const fn is_power_of_2(v: usize) -> bool { #[cfg(test)] mod tests { - use rayexec_bullet::bitmap::Bitmap; - use rayexec_bullet::datatype::DataType; - use super::*; + use crate::arrays::bitmap::Bitmap; + use crate::arrays::datatype::DataType; use crate::expr; use crate::functions::aggregate::builtin::sum::Sum; use crate::functions::aggregate::{AggregateFunction, PlannedAggregateFunction}; diff --git a/crates/rayexec_execution/src/execution/operators/hash_aggregate/mod.rs b/crates/rayexec_execution/src/execution/operators/hash_aggregate/mod.rs index a29118a13..b6c7ea605 100644 --- a/crates/rayexec_execution/src/execution/operators/hash_aggregate/mod.rs +++ b/crates/rayexec_execution/src/execution/operators/hash_aggregate/mod.rs @@ -13,18 +13,18 @@ use distinct::DistinctGroupedStates; use drain::HashTableDrain; use hash_table::HashTable; use parking_lot::Mutex; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::bitmap::Bitmap; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalU64; -use rayexec_bullet::executor::scalar::{HashExecutor, UnaryExecutor}; -use rayexec_bullet::scalar::ScalarValue; -use rayexec_bullet::selection::SelectionVector; use rayexec_error::{RayexecError, Result}; use super::{ExecutionStates, InputOutputStates, PollFinalize}; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; +use crate::arrays::bitmap::Bitmap; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalU64; +use crate::arrays::executor::scalar::{HashExecutor, UnaryExecutor}; +use crate::arrays::scalar::ScalarValue; +use crate::arrays::selection::SelectionVector; use crate::database::DatabaseContext; use crate::execution::computed_batch::ComputedBatches; use crate::execution::operators::util::hash::partition_for_hash; diff --git a/crates/rayexec_execution/src/execution/operators/hash_join/condition.rs b/crates/rayexec_execution/src/execution/operators/hash_join/condition.rs index 72dd32a37..355b64274 100644 --- a/crates/rayexec_execution/src/execution/operators/hash_join/condition.rs +++ b/crates/rayexec_execution/src/execution/operators/hash_join/condition.rs @@ -1,12 +1,12 @@ use std::fmt; use std::sync::Arc; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::executor::scalar::SelectExecutor; -use rayexec_bullet::selection::SelectionVector; use rayexec_error::{RayexecError, Result}; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; +use crate::arrays::executor::scalar::SelectExecutor; +use crate::arrays::selection::SelectionVector; use crate::expr::physical::PhysicalScalarExpression; use crate::functions::scalar::builtin::boolean::AndImpl; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/execution/operators/hash_join/global_hash_table.rs b/crates/rayexec_execution/src/execution/operators/hash_join/global_hash_table.rs index 3707610fc..a034c9964 100644 --- a/crates/rayexec_execution/src/execution/operators/hash_join/global_hash_table.rs +++ b/crates/rayexec_execution/src/execution/operators/hash_join/global_hash_table.rs @@ -3,9 +3,6 @@ use std::fmt; use std::sync::Arc; use hashbrown::raw::RawTable; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::selection::SelectionVector; use rayexec_error::Result; use super::condition::{ @@ -14,6 +11,9 @@ use super::condition::{ LeftPrecomputedJoinConditions, }; use super::partition_hash_table::{PartitionHashTable, RowKey}; +use crate::arrays::batch::Batch; +use crate::arrays::datatype::DataType; +use crate::arrays::selection::SelectionVector; use crate::execution::operators::util::outer_join_tracker::{ LeftOuterJoinTracker, RightOuterJoinTracker, diff --git a/crates/rayexec_execution/src/execution/operators/hash_join/mod.rs b/crates/rayexec_execution/src/execution/operators/hash_join/mod.rs index 9ded0b7be..f9cf3d145 100644 --- a/crates/rayexec_execution/src/execution/operators/hash_join/mod.rs +++ b/crates/rayexec_execution/src/execution/operators/hash_join/mod.rs @@ -10,9 +10,6 @@ use condition::HashJoinCondition; use global_hash_table::GlobalHashTable; use parking_lot::Mutex; use partition_hash_table::PartitionHashTable; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::scalar::HashExecutor; use rayexec_error::{OptionExt, RayexecError, Result}; use super::util::outer_join_tracker::{LeftOuterJoinDrainState, LeftOuterJoinTracker}; @@ -27,6 +24,9 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::batch::Batch; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::scalar::HashExecutor; use crate::database::DatabaseContext; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; use crate::logical::logical_join::JoinType; diff --git a/crates/rayexec_execution/src/execution/operators/hash_join/partition_hash_table.rs b/crates/rayexec_execution/src/execution/operators/hash_join/partition_hash_table.rs index b204d6ffe..22b42f751 100644 --- a/crates/rayexec_execution/src/execution/operators/hash_join/partition_hash_table.rs +++ b/crates/rayexec_execution/src/execution/operators/hash_join/partition_hash_table.rs @@ -1,10 +1,10 @@ use std::fmt; use hashbrown::raw::RawTable; -use rayexec_bullet::batch::Batch; use rayexec_error::Result; use super::condition::{HashJoinCondition, LeftPrecomputedJoinConditions}; +use crate::arrays::batch::Batch; /// Points to a row in the hash table. #[derive(Debug, Clone, Copy, PartialEq, Eq)] diff --git a/crates/rayexec_execution/src/execution/operators/limit.rs b/crates/rayexec_execution/src/execution/operators/limit.rs index abdb082c9..ee0fca6ff 100644 --- a/crates/rayexec_execution/src/execution/operators/limit.rs +++ b/crates/rayexec_execution/src/execution/operators/limit.rs @@ -1,7 +1,6 @@ use std::sync::Arc; use std::task::{Context, Waker}; -use rayexec_bullet::batch::Batch; use rayexec_error::Result; use super::{ @@ -14,6 +13,7 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; use crate::proto::DatabaseProtoConv; @@ -232,9 +232,8 @@ impl DatabaseProtoConv for PhysicalLimit { mod tests { use std::sync::Arc; - use rayexec_bullet::scalar::ScalarValue; - use super::*; + use crate::arrays::scalar::ScalarValue; use crate::execution::operators::test_util::{ logical_value, make_i32_batch, diff --git a/crates/rayexec_execution/src/execution/operators/materialize.rs b/crates/rayexec_execution/src/execution/operators/materialize.rs index fc9f6991f..d4e7510f1 100644 --- a/crates/rayexec_execution/src/execution/operators/materialize.rs +++ b/crates/rayexec_execution/src/execution/operators/materialize.rs @@ -1,11 +1,11 @@ use futures::future::BoxFuture; use parking_lot::Mutex; -use rayexec_bullet::batch::Batch; use rayexec_error::{RayexecError, Result}; use super::sink::{PartitionSink, SinkOperation}; use super::source::{PartitionSource, SourceOperation}; use super::util::broadcast::{BroadcastChannel, BroadcastReceiver}; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; use crate::logical::binder::bind_context::MaterializationRef; diff --git a/crates/rayexec_execution/src/execution/operators/mod.rs b/crates/rayexec_execution/src/execution/operators/mod.rs index 54bd7d486..1ceb06bcb 100644 --- a/crates/rayexec_execution/src/execution/operators/mod.rs +++ b/crates/rayexec_execution/src/execution/operators/mod.rs @@ -59,7 +59,6 @@ use limit::PhysicalLimit; use materialize::{MaterializeSourceOperation, MaterializedSinkOperation}; use nl_join::PhysicalNestedLoopJoin; use project::{PhysicalProject, ProjectOperation}; -use rayexec_bullet::batch::Batch; use rayexec_error::{not_implemented, OptionExt, Result}; use round_robin::PhysicalRoundRobinRepartition; use scan::{PhysicalScan, ScanPartitionState}; @@ -102,6 +101,7 @@ use self::sort::gather_sort::{ use self::sort::scatter_sort::ScatterSortPartitionState; use self::values::ValuesPartitionState; use super::computed_batch::ComputedBatches; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::engine::result::ResultSink; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; diff --git a/crates/rayexec_execution/src/execution/operators/nl_join.rs b/crates/rayexec_execution/src/execution/operators/nl_join.rs index bd7676322..aeb4af246 100644 --- a/crates/rayexec_execution/src/execution/operators/nl_join.rs +++ b/crates/rayexec_execution/src/execution/operators/nl_join.rs @@ -2,12 +2,12 @@ use std::sync::Arc; use std::task::{Context, Waker}; use parking_lot::Mutex; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::selection::SelectionVector; use rayexec_error::Result; use super::util::outer_join_tracker::LeftOuterJoinTracker; use super::ComputedBatches; +use crate::arrays::batch::Batch; +use crate::arrays::selection::SelectionVector; use crate::database::DatabaseContext; use crate::execution::operators::{ ExecutableOperator, diff --git a/crates/rayexec_execution/src/execution/operators/project.rs b/crates/rayexec_execution/src/execution/operators/project.rs index e66e25396..6bd1bc271 100644 --- a/crates/rayexec_execution/src/execution/operators/project.rs +++ b/crates/rayexec_execution/src/execution/operators/project.rs @@ -1,7 +1,7 @@ -use rayexec_bullet::batch::Batch; use rayexec_error::Result; use super::simple::{SimpleOperator, StatelessOperation}; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; use crate::expr::physical::PhysicalScalarExpression; diff --git a/crates/rayexec_execution/src/execution/operators/round_robin.rs b/crates/rayexec_execution/src/execution/operators/round_robin.rs index 7dac482b4..a3fb83271 100644 --- a/crates/rayexec_execution/src/execution/operators/round_robin.rs +++ b/crates/rayexec_execution/src/execution/operators/round_robin.rs @@ -5,10 +5,10 @@ use std::sync::Arc; use std::task::{Context, Waker}; use parking_lot::Mutex; -use rayexec_bullet::batch::Batch; use rayexec_error::{RayexecError, Result}; use super::{ExecutionStates, InputOutputStates, PollFinalize}; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::execution::operators::{ ExecutableOperator, diff --git a/crates/rayexec_execution/src/execution/operators/scan.rs b/crates/rayexec_execution/src/execution/operators/scan.rs index 1a379b8e7..b58989bc9 100644 --- a/crates/rayexec_execution/src/execution/operators/scan.rs +++ b/crates/rayexec_execution/src/execution/operators/scan.rs @@ -4,7 +4,6 @@ use std::task::{Context, Poll}; use futures::future::BoxFuture; use futures::FutureExt; -use rayexec_bullet::batch::Batch; use rayexec_error::{RayexecError, Result}; use super::util::futures::make_static; @@ -18,6 +17,7 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::batch::Batch; use crate::database::catalog::CatalogTx; use crate::database::catalog_entry::CatalogEntry; use crate::database::DatabaseContext; diff --git a/crates/rayexec_execution/src/execution/operators/simple.rs b/crates/rayexec_execution/src/execution/operators/simple.rs index c1966604b..1a34ba2b9 100644 --- a/crates/rayexec_execution/src/execution/operators/simple.rs +++ b/crates/rayexec_execution/src/execution/operators/simple.rs @@ -2,7 +2,6 @@ use std::fmt::Debug; use std::sync::Arc; use std::task::{Context, Waker}; -use rayexec_bullet::batch::Batch; use rayexec_error::Result; use super::{ @@ -15,6 +14,7 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; diff --git a/crates/rayexec_execution/src/execution/operators/sink.rs b/crates/rayexec_execution/src/execution/operators/sink.rs index f4e7b084c..098dcf968 100644 --- a/crates/rayexec_execution/src/execution/operators/sink.rs +++ b/crates/rayexec_execution/src/execution/operators/sink.rs @@ -5,8 +5,6 @@ use std::task::{Context, Poll, Waker}; use futures::future::BoxFuture; use futures::FutureExt; use parking_lot::Mutex; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; use rayexec_error::{RayexecError, Result}; use super::util::futures::make_static; @@ -20,6 +18,8 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; diff --git a/crates/rayexec_execution/src/execution/operators/sort/gather_sort.rs b/crates/rayexec_execution/src/execution/operators/sort/gather_sort.rs index ff282b5cd..e1968400c 100644 --- a/crates/rayexec_execution/src/execution/operators/sort/gather_sort.rs +++ b/crates/rayexec_execution/src/execution/operators/sort/gather_sort.rs @@ -2,12 +2,12 @@ use std::sync::Arc; use std::task::{Context, Waker}; use parking_lot::Mutex; -use rayexec_bullet::batch::Batch; use rayexec_error::Result; use super::util::merger::{KWayMerger, MergeResult}; use super::util::sort_keys::SortKeysExtractor; use super::util::sorted_batch::{PhysicallySortedBatch, SortedKeysIter}; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::execution::operators::sort::util::merger::IterState; use crate::execution::operators::{ diff --git a/crates/rayexec_execution/src/execution/operators/sort/scatter_sort.rs b/crates/rayexec_execution/src/execution/operators/sort/scatter_sort.rs index 6914288aa..3428ec7ec 100644 --- a/crates/rayexec_execution/src/execution/operators/sort/scatter_sort.rs +++ b/crates/rayexec_execution/src/execution/operators/sort/scatter_sort.rs @@ -1,12 +1,12 @@ use std::sync::Arc; use std::task::{Context, Waker}; -use rayexec_bullet::batch::Batch; use rayexec_error::Result; use super::util::merger::{IterState, KWayMerger, MergeResult}; use super::util::sort_keys::SortKeysExtractor; use super::util::sorted_batch::{IndexSortedBatch, SortedIndicesIter}; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::execution::operators::util::resizer::DEFAULT_TARGET_BATCH_SIZE; use crate::execution::operators::{ diff --git a/crates/rayexec_execution/src/execution/operators/sort/top_k.rs b/crates/rayexec_execution/src/execution/operators/sort/top_k.rs index 695bba26f..69e05dab8 100644 --- a/crates/rayexec_execution/src/execution/operators/sort/top_k.rs +++ b/crates/rayexec_execution/src/execution/operators/sort/top_k.rs @@ -1,8 +1,8 @@ use std::task::Context; -use rayexec_bullet::batch::Batch; use rayexec_error::Result; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::execution::operators::{ ExecutableOperator, diff --git a/crates/rayexec_execution/src/execution/operators/sort/util/accumulator.rs b/crates/rayexec_execution/src/execution/operators/sort/util/accumulator.rs index 3d30f8bd4..d28aa3917 100644 --- a/crates/rayexec_execution/src/execution/operators/sort/util/accumulator.rs +++ b/crates/rayexec_execution/src/execution/operators/sort/util/accumulator.rs @@ -1,7 +1,8 @@ -use rayexec_bullet::batch::Batch; -use rayexec_bullet::executor::scalar::interleave; use rayexec_error::{RayexecError, Result}; +use crate::arrays::batch::Batch; +use crate::arrays::executor::scalar::interleave; + /// Tracks the state per input into the merge. #[derive(Debug, Clone)] struct InputState { diff --git a/crates/rayexec_execution/src/execution/operators/sort/util/merger.rs b/crates/rayexec_execution/src/execution/operators/sort/util/merger.rs index fd7874fbf..b327100a5 100644 --- a/crates/rayexec_execution/src/execution/operators/sort/util/merger.rs +++ b/crates/rayexec_execution/src/execution/operators/sort/util/merger.rs @@ -1,11 +1,11 @@ use std::cmp::{Ordering, Reverse}; use std::collections::BinaryHeap; -use rayexec_bullet::batch::Batch; use rayexec_error::{RayexecError, Result}; use super::accumulator::IndicesAccumulator; use super::sorted_batch::RowReference; +use crate::arrays::batch::Batch; #[derive(Debug)] pub enum MergeResult { diff --git a/crates/rayexec_execution/src/execution/operators/sort/util/sort_keys.rs b/crates/rayexec_execution/src/execution/operators/sort/util/sort_keys.rs index 8e7728a55..b89ff7ad3 100644 --- a/crates/rayexec_execution/src/execution/operators/sort/util/sort_keys.rs +++ b/crates/rayexec_execution/src/execution/operators/sort/util/sort_keys.rs @@ -1,8 +1,8 @@ -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::row::encoding::{ComparableColumn, ComparableRowEncoder, ComparableRows}; use rayexec_error::{RayexecError, Result}; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; +use crate::arrays::row::encoding::{ComparableColumn, ComparableRowEncoder, ComparableRows}; use crate::expr::physical::PhysicalSortExpression; /// Extract sort keys from batches. diff --git a/crates/rayexec_execution/src/execution/operators/sort/util/sorted_batch.rs b/crates/rayexec_execution/src/execution/operators/sort/util/sorted_batch.rs index 7beacb9af..6853283a7 100644 --- a/crates/rayexec_execution/src/execution/operators/sort/util/sorted_batch.rs +++ b/crates/rayexec_execution/src/execution/operators/sort/util/sorted_batch.rs @@ -2,8 +2,8 @@ use std::cmp::Ordering; use std::fmt; use std::sync::Arc; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::row::encoding::{ComparableRow, ComparableRows}; +use crate::arrays::batch::Batch; +use crate::arrays::row::encoding::{ComparableRow, ComparableRows}; /// A batch that's been physically sorted. /// diff --git a/crates/rayexec_execution/src/execution/operators/source.rs b/crates/rayexec_execution/src/execution/operators/source.rs index 912ea57e1..5328111bd 100644 --- a/crates/rayexec_execution/src/execution/operators/source.rs +++ b/crates/rayexec_execution/src/execution/operators/source.rs @@ -5,7 +5,6 @@ use std::task::{Context, Poll}; use futures::future::BoxFuture; use futures::FutureExt; -use rayexec_bullet::batch::Batch; use rayexec_error::{RayexecError, Result}; use super::util::futures::make_static; @@ -19,6 +18,7 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; diff --git a/crates/rayexec_execution/src/execution/operators/table_function.rs b/crates/rayexec_execution/src/execution/operators/table_function.rs index c3e4de288..17f4a3eb1 100644 --- a/crates/rayexec_execution/src/execution/operators/table_function.rs +++ b/crates/rayexec_execution/src/execution/operators/table_function.rs @@ -4,7 +4,6 @@ use std::task::{Context, Poll}; use futures::future::BoxFuture; use futures::FutureExt; -use rayexec_bullet::batch::Batch; use rayexec_error::{RayexecError, Result}; use super::util::futures::make_static; @@ -18,6 +17,7 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; use crate::functions::table::{PlannedTableFunction, TableFunctionImpl}; diff --git a/crates/rayexec_execution/src/execution/operators/table_inout.rs b/crates/rayexec_execution/src/execution/operators/table_inout.rs index 22ab4a1f6..e047eb941 100644 --- a/crates/rayexec_execution/src/execution/operators/table_inout.rs +++ b/crates/rayexec_execution/src/execution/operators/table_inout.rs @@ -1,9 +1,6 @@ use std::sync::Arc; use std::task::Context; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::selection::SelectionVector; use rayexec_error::{RayexecError, Result}; use super::{ @@ -16,6 +13,9 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; +use crate::arrays::selection::SelectionVector; use crate::database::DatabaseContext; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; use crate::expr::physical::PhysicalScalarExpression; diff --git a/crates/rayexec_execution/src/execution/operators/test_util.rs b/crates/rayexec_execution/src/execution/operators/test_util.rs index 98119a494..65ef3bdde 100644 --- a/crates/rayexec_execution/src/execution/operators/test_util.rs +++ b/crates/rayexec_execution/src/execution/operators/test_util.rs @@ -3,9 +3,6 @@ use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::Arc; use std::task::{Context, Wake, Waker}; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::scalar::ScalarValue; use rayexec_error::Result; use super::{ @@ -16,6 +13,9 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; +use crate::arrays::scalar::ScalarValue; use crate::database::system::new_system_catalog; use crate::database::DatabaseContext; use crate::datasource::DataSourceRegistry; diff --git a/crates/rayexec_execution/src/execution/operators/ungrouped_aggregate.rs b/crates/rayexec_execution/src/execution/operators/ungrouped_aggregate.rs index 0e1b646b2..34efcad03 100644 --- a/crates/rayexec_execution/src/execution/operators/ungrouped_aggregate.rs +++ b/crates/rayexec_execution/src/execution/operators/ungrouped_aggregate.rs @@ -3,7 +3,6 @@ use std::sync::Arc; use std::task::{Context, Waker}; use parking_lot::Mutex; -use rayexec_bullet::batch::Batch; use rayexec_error::{RayexecError, Result}; use super::hash_aggregate::distinct::DistinctGroupedStates; @@ -17,6 +16,7 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::execution::operators::InputOutputStates; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; diff --git a/crates/rayexec_execution/src/execution/operators/union.rs b/crates/rayexec_execution/src/execution/operators/union.rs index 88d46a102..c5bc79a7f 100644 --- a/crates/rayexec_execution/src/execution/operators/union.rs +++ b/crates/rayexec_execution/src/execution/operators/union.rs @@ -2,7 +2,6 @@ use std::sync::Arc; use std::task::{Context, Waker}; use parking_lot::Mutex; -use rayexec_bullet::batch::Batch; use rayexec_error::Result; use super::{ @@ -15,6 +14,7 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; use crate::proto::DatabaseProtoConv; diff --git a/crates/rayexec_execution/src/execution/operators/unnest.rs b/crates/rayexec_execution/src/execution/operators/unnest.rs index 22d023580..9667554df 100644 --- a/crates/rayexec_execution/src/execution/operators/unnest.rs +++ b/crates/rayexec_execution/src/execution/operators/unnest.rs @@ -3,17 +3,29 @@ use std::sync::Arc; use std::task::{Context, Waker}; use half::f16; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::bitmap::Bitmap; -use rayexec_bullet::executor::builder::{ +use rayexec_error::{not_implemented, RayexecError, Result}; + +use super::{ + ExecutableOperator, + ExecutionStates, + InputOutputStates, + OperatorState, + PartitionState, + PollFinalize, + PollPull, + PollPush, +}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::batch::Batch; +use crate::arrays::bitmap::Bitmap; +use crate::arrays::executor::builder::{ ArrayBuilder, ArrayDataBuffer, BooleanBuffer, GermanVarlenBuffer, PrimitiveBuffer, }; -use rayexec_bullet::executor::physical_type::{ +use crate::arrays::executor::physical_type::{ PhysicalBinary, PhysicalBool, PhysicalF16, @@ -34,21 +46,9 @@ use rayexec_bullet::executor::physical_type::{ PhysicalU8, PhysicalUtf8, }; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::selection::{self, SelectionVector}; -use rayexec_bullet::storage::{AddressableStorage, ListItemMetadata}; -use rayexec_error::{not_implemented, RayexecError, Result}; - -use super::{ - ExecutableOperator, - ExecutionStates, - InputOutputStates, - OperatorState, - PartitionState, - PollFinalize, - PollPull, - PollPush, -}; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::selection::{self, SelectionVector}; +use crate::arrays::storage::{AddressableStorage, ListItemMetadata}; use crate::database::DatabaseContext; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; use crate::expr::physical::PhysicalScalarExpression; diff --git a/crates/rayexec_execution/src/execution/operators/util/broadcast.rs b/crates/rayexec_execution/src/execution/operators/util/broadcast.rs index 092eda219..beca52778 100644 --- a/crates/rayexec_execution/src/execution/operators/util/broadcast.rs +++ b/crates/rayexec_execution/src/execution/operators/util/broadcast.rs @@ -4,7 +4,8 @@ use std::sync::Arc; use std::task::{Context, Poll, Waker}; use parking_lot::Mutex; -use rayexec_bullet::batch::Batch; + +use crate::arrays::batch::Batch; #[derive(Debug)] pub struct BroadcastChannel { @@ -149,9 +150,9 @@ mod tests { use std::task::Wake; use futures::FutureExt; - use rayexec_bullet::array::Array; use super::*; + use crate::arrays::array::Array; struct NopWaker {} diff --git a/crates/rayexec_execution/src/execution/operators/util/outer_join_tracker.rs b/crates/rayexec_execution/src/execution/operators/util/outer_join_tracker.rs index 8cae99b85..12b385ce2 100644 --- a/crates/rayexec_execution/src/execution/operators/util/outer_join_tracker.rs +++ b/crates/rayexec_execution/src/execution/operators/util/outer_join_tracker.rs @@ -1,12 +1,13 @@ use std::sync::Arc; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::bitmap::Bitmap; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::selection::SelectionVector; use rayexec_error::Result; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::batch::Batch; +use crate::arrays::bitmap::Bitmap; +use crate::arrays::datatype::DataType; +use crate::arrays::selection::SelectionVector; + /// Bitmaps corresponding to rows in the batches collected on the left side of /// the join. /// diff --git a/crates/rayexec_execution/src/execution/operators/util/resizer.rs b/crates/rayexec_execution/src/execution/operators/util/resizer.rs index c678cb0ab..c2a7eb615 100644 --- a/crates/rayexec_execution/src/execution/operators/util/resizer.rs +++ b/crates/rayexec_execution/src/execution/operators/util/resizer.rs @@ -1,9 +1,9 @@ use std::sync::Arc; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::selection::SelectionVector; use rayexec_error::Result; +use crate::arrays::batch::Batch; +use crate::arrays::selection::SelectionVector; use crate::execution::computed_batch::ComputedBatches; // TODO: Shouldn't be a const, should be determined when we create the @@ -116,10 +116,9 @@ impl BatchResizer { #[cfg(test)] mod tests { - use rayexec_bullet::array::Array; - use rayexec_bullet::testutil::assert_batches_eq; - use super::*; + use crate::arrays::array::Array; + use crate::arrays::testutil::assert_batches_eq; #[test] fn push_within_target() { diff --git a/crates/rayexec_execution/src/execution/operators/values.rs b/crates/rayexec_execution/src/execution/operators/values.rs index b93a8e528..4fdfa7555 100644 --- a/crates/rayexec_execution/src/execution/operators/values.rs +++ b/crates/rayexec_execution/src/execution/operators/values.rs @@ -1,12 +1,7 @@ -use std::io::Cursor; use std::sync::Arc; use std::task::Context; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::field::{Field, Schema}; -use rayexec_bullet::ipc::stream::{StreamReader, StreamWriter}; -use rayexec_bullet::ipc::IpcConfig; -use rayexec_error::{OptionExt, RayexecError, Result}; +use rayexec_error::{RayexecError, Result}; use super::{ ExecutableOperator, @@ -18,6 +13,7 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; use crate::proto::DatabaseProtoConv; @@ -109,47 +105,49 @@ impl DatabaseProtoConv for PhysicalValues { type ProtoType = rayexec_proto::generated::execution::PhysicalValues; fn to_proto_ctx(&self, _context: &DatabaseContext) -> Result { - use rayexec_proto::generated::array::IpcStreamBatch; - - // TODO: Should empty values even be allowed? Is it allowed? - let schema = match self.batches.first() { - Some(batch) => Schema::new( - batch - .columns() - .iter() - .map(|c| Field::new("", c.datatype().clone(), true)), - ), - None => { - return Ok(Self::ProtoType { - batches: Some(IpcStreamBatch { ipc: Vec::new() }), - }) - } - }; - - let buf = Vec::new(); - let mut writer = StreamWriter::try_new(buf, &schema, IpcConfig {})?; - - for batch in &self.batches { - writer.write_batch(batch)? - } - - let buf = writer.into_writer(); - - Ok(Self::ProtoType { - batches: Some(IpcStreamBatch { ipc: buf }), - }) + unimplemented!() + // use rayexec_proto::generated::array::IpcStreamBatch; + + // // TODO: Should empty values even be allowed? Is it allowed? + // let schema = match self.batches.first() { + // Some(batch) => Schema::new( + // batch + // .columns() + // .iter() + // .map(|c| Field::new("", c.datatype().clone(), true)), + // ), + // None => { + // return Ok(Self::ProtoType { + // batches: Some(IpcStreamBatch { ipc: Vec::new() }), + // }) + // } + // }; + + // let buf = Vec::new(); + // let mut writer = StreamWriter::try_new(buf, &schema, IpcConfig {})?; + + // for batch in &self.batches { + // writer.write_batch(batch)? + // } + + // let buf = writer.into_writer(); + + // Ok(Self::ProtoType { + // batches: Some(IpcStreamBatch { ipc: buf }), + // }) } - fn from_proto_ctx(proto: Self::ProtoType, _context: &DatabaseContext) -> Result { - let ipc = proto.batches.required("batches")?.ipc; + fn from_proto_ctx(_proto: Self::ProtoType, _context: &DatabaseContext) -> Result { + unimplemented!() + // let ipc = proto.batches.required("batches")?.ipc; - let mut reader = StreamReader::try_new(Cursor::new(ipc), IpcConfig {})?; + // let mut reader = StreamReader::try_new(Cursor::new(ipc), IpcConfig {})?; - let mut batches = Vec::new(); - while let Some(batch) = reader.try_next_batch()? { - batches.push(batch); - } + // let mut batches = Vec::new(); + // while let Some(batch) = reader.try_next_batch()? { + // batches.push(batch); + // } - Ok(Self { batches }) + // Ok(Self { batches }) } } diff --git a/crates/rayexec_execution/src/execution/operators/window/mod.rs b/crates/rayexec_execution/src/execution/operators/window/mod.rs index 06ffd1156..36547a198 100644 --- a/crates/rayexec_execution/src/execution/operators/window/mod.rs +++ b/crates/rayexec_execution/src/execution/operators/window/mod.rs @@ -1,6 +1,5 @@ use std::task::Context; -use rayexec_bullet::batch::Batch; use rayexec_error::Result; use super::{ @@ -12,6 +11,7 @@ use super::{ PollPull, PollPush, }; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; diff --git a/crates/rayexec_execution/src/expr/aggregate_expr.rs b/crates/rayexec_execution/src/expr/aggregate_expr.rs index 5a743c991..700c2ad82 100644 --- a/crates/rayexec_execution/src/expr/aggregate_expr.rs +++ b/crates/rayexec_execution/src/expr/aggregate_expr.rs @@ -1,9 +1,9 @@ use std::fmt; -use rayexec_bullet::datatype::DataType; use rayexec_error::Result; use super::Expression; +use crate::arrays::datatype::DataType; use crate::explain::context_display::{ContextDisplay, ContextDisplayMode, ContextDisplayWrapper}; use crate::functions::aggregate::PlannedAggregateFunction; use crate::logical::binder::bind_context::BindContext; diff --git a/crates/rayexec_execution/src/expr/arith_expr.rs b/crates/rayexec_execution/src/expr/arith_expr.rs index 6e69ad2b3..7956d3dfe 100644 --- a/crates/rayexec_execution/src/expr/arith_expr.rs +++ b/crates/rayexec_execution/src/expr/arith_expr.rs @@ -1,9 +1,9 @@ use std::fmt; -use rayexec_bullet::datatype::DataType; use rayexec_error::Result; use super::{AsScalarFunction, Expression}; +use crate::arrays::datatype::DataType; use crate::explain::context_display::{ContextDisplay, ContextDisplayMode, ContextDisplayWrapper}; use crate::functions::scalar::builtin::arith; use crate::functions::scalar::ScalarFunction; diff --git a/crates/rayexec_execution/src/expr/case_expr.rs b/crates/rayexec_execution/src/expr/case_expr.rs index cc9997f6b..da9d75446 100644 --- a/crates/rayexec_execution/src/expr/case_expr.rs +++ b/crates/rayexec_execution/src/expr/case_expr.rs @@ -1,9 +1,9 @@ use std::fmt; -use rayexec_bullet::datatype::DataType; use rayexec_error::{RayexecError, Result}; use super::Expression; +use crate::arrays::datatype::DataType; use crate::explain::context_display::{ContextDisplay, ContextDisplayMode, ContextDisplayWrapper}; use crate::logical::binder::table_list::TableList; diff --git a/crates/rayexec_execution/src/expr/cast_expr.rs b/crates/rayexec_execution/src/expr/cast_expr.rs index 99bbeeb36..ae619ae31 100644 --- a/crates/rayexec_execution/src/expr/cast_expr.rs +++ b/crates/rayexec_execution/src/expr/cast_expr.rs @@ -1,8 +1,7 @@ use std::fmt; -use rayexec_bullet::datatype::DataType; - use super::Expression; +use crate::arrays::datatype::DataType; use crate::explain::context_display::{ContextDisplay, ContextDisplayMode, ContextDisplayWrapper}; #[derive(Debug, Clone, PartialEq, Eq, Hash)] diff --git a/crates/rayexec_execution/src/expr/column_expr.rs b/crates/rayexec_execution/src/expr/column_expr.rs index b7be02979..2fb56420b 100644 --- a/crates/rayexec_execution/src/expr/column_expr.rs +++ b/crates/rayexec_execution/src/expr/column_expr.rs @@ -1,8 +1,8 @@ use std::fmt; -use rayexec_bullet::datatype::DataType; use rayexec_error::Result; +use crate::arrays::datatype::DataType; use crate::explain::context_display::{ContextDisplay, ContextDisplayMode}; use crate::logical::binder::table_list::{TableList, TableRef}; diff --git a/crates/rayexec_execution/src/expr/grouping_set_expr.rs b/crates/rayexec_execution/src/expr/grouping_set_expr.rs index 710f37d6f..7fc8e0439 100644 --- a/crates/rayexec_execution/src/expr/grouping_set_expr.rs +++ b/crates/rayexec_execution/src/expr/grouping_set_expr.rs @@ -1,9 +1,9 @@ use std::fmt; use fmtutil::IntoDisplayableSlice; -use rayexec_bullet::datatype::DataType; use super::Expression; +use crate::arrays::datatype::DataType; use crate::explain::context_display::{ContextDisplay, ContextDisplayMode, ContextDisplayWrapper}; #[derive(Debug, Clone, PartialEq, Eq, Hash)] diff --git a/crates/rayexec_execution/src/expr/literal_expr.rs b/crates/rayexec_execution/src/expr/literal_expr.rs index 2f7886cb8..116dfa0ac 100644 --- a/crates/rayexec_execution/src/expr/literal_expr.rs +++ b/crates/rayexec_execution/src/expr/literal_expr.rs @@ -1,7 +1,6 @@ use std::fmt; -use rayexec_bullet::scalar::{OwnedScalarValue, ScalarValue}; - +use crate::arrays::scalar::{OwnedScalarValue, ScalarValue}; use crate::explain::context_display::{ContextDisplay, ContextDisplayMode}; #[derive(Debug, Clone, PartialEq, Eq, Hash)] diff --git a/crates/rayexec_execution/src/expr/mod.rs b/crates/rayexec_execution/src/expr/mod.rs index e2239e201..96b29ee70 100644 --- a/crates/rayexec_execution/src/expr/mod.rs +++ b/crates/rayexec_execution/src/expr/mod.rs @@ -32,14 +32,14 @@ use grouping_set_expr::GroupingSetExpr; use is_expr::IsExpr; use literal_expr::LiteralExpr; use negate_expr::NegateExpr; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::scalar::{OwnedScalarValue, ScalarValue}; use rayexec_error::{RayexecError, Result}; use scalar_function_expr::ScalarFunctionExpr; use subquery_expr::SubqueryExpr; use unnest_expr::UnnestExpr; use window_expr::WindowExpr; +use crate::arrays::datatype::DataType; +use crate::arrays::scalar::{OwnedScalarValue, ScalarValue}; use crate::explain::context_display::{ContextDisplay, ContextDisplayMode}; use crate::functions::scalar::{FunctionVolatility, ScalarFunction}; use crate::logical::binder::table_list::{TableList, TableRef}; diff --git a/crates/rayexec_execution/src/expr/negate_expr.rs b/crates/rayexec_execution/src/expr/negate_expr.rs index 1514a011c..8f2c3d7a5 100644 --- a/crates/rayexec_execution/src/expr/negate_expr.rs +++ b/crates/rayexec_execution/src/expr/negate_expr.rs @@ -1,9 +1,9 @@ use std::fmt; -use rayexec_bullet::datatype::DataType; use rayexec_error::Result; use super::{AsScalarFunction, Expression}; +use crate::arrays::datatype::DataType; use crate::explain::context_display::{ContextDisplay, ContextDisplayMode, ContextDisplayWrapper}; use crate::functions::scalar::builtin::negate; use crate::functions::scalar::ScalarFunction; diff --git a/crates/rayexec_execution/src/expr/physical/case_expr.rs b/crates/rayexec_execution/src/expr/physical/case_expr.rs index 5b00ed8a7..bafbb5db8 100644 --- a/crates/rayexec_execution/src/expr/physical/case_expr.rs +++ b/crates/rayexec_execution/src/expr/physical/case_expr.rs @@ -2,14 +2,14 @@ use std::borrow::Cow; use std::fmt; use std::sync::Arc; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::bitmap::Bitmap; -use rayexec_bullet::executor::scalar::{interleave, SelectExecutor}; -use rayexec_bullet::selection::SelectionVector; use rayexec_error::Result; use super::PhysicalScalarExpression; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; +use crate::arrays::bitmap::Bitmap; +use crate::arrays::executor::scalar::{interleave, SelectExecutor}; +use crate::arrays::selection::SelectionVector; #[derive(Debug, Clone)] pub struct PhysicalWhenThen { @@ -116,10 +116,9 @@ impl fmt::Display for PhysicalCaseExpr { #[cfg(test)] mod tests { - use rayexec_bullet::datatype::DataType; - use rayexec_bullet::scalar::ScalarValue; - use super::*; + use crate::arrays::datatype::DataType; + use crate::arrays::scalar::ScalarValue; use crate::expr::case_expr::{CaseExpr, WhenThen}; use crate::expr::physical::planner::PhysicalExpressionPlanner; use crate::expr::{self, Expression}; diff --git a/crates/rayexec_execution/src/expr/physical/cast_expr.rs b/crates/rayexec_execution/src/expr/physical/cast_expr.rs index c85dc201c..081e8b023 100644 --- a/crates/rayexec_execution/src/expr/physical/cast_expr.rs +++ b/crates/rayexec_execution/src/expr/physical/cast_expr.rs @@ -1,15 +1,15 @@ use std::borrow::Cow; use std::fmt; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::compute::cast::array::cast_array; -use rayexec_bullet::compute::cast::behavior::CastFailBehavior; -use rayexec_bullet::datatype::DataType; use rayexec_error::{OptionExt, Result}; use rayexec_proto::ProtoConv; use super::PhysicalScalarExpression; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; +use crate::arrays::compute::cast::array::cast_array; +use crate::arrays::compute::cast::behavior::CastFailBehavior; +use crate::arrays::datatype::DataType; use crate::database::DatabaseContext; use crate::proto::DatabaseProtoConv; diff --git a/crates/rayexec_execution/src/expr/physical/column_expr.rs b/crates/rayexec_execution/src/expr/physical/column_expr.rs index 3d8b96c83..6394383cb 100644 --- a/crates/rayexec_execution/src/expr/physical/column_expr.rs +++ b/crates/rayexec_execution/src/expr/physical/column_expr.rs @@ -1,10 +1,10 @@ use std::borrow::Cow; use std::fmt; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; use rayexec_error::{RayexecError, Result}; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::proto::DatabaseProtoConv; diff --git a/crates/rayexec_execution/src/expr/physical/literal_expr.rs b/crates/rayexec_execution/src/expr/physical/literal_expr.rs index bc5916f29..6f64288fd 100644 --- a/crates/rayexec_execution/src/expr/physical/literal_expr.rs +++ b/crates/rayexec_execution/src/expr/physical/literal_expr.rs @@ -1,12 +1,12 @@ use std::borrow::Cow; use std::fmt; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::{OptionExt, Result}; use rayexec_proto::ProtoConv; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; +use crate::arrays::scalar::OwnedScalarValue; use crate::database::DatabaseContext; use crate::proto::DatabaseProtoConv; diff --git a/crates/rayexec_execution/src/expr/physical/mod.rs b/crates/rayexec_execution/src/expr/physical/mod.rs index 2f21e6f59..223561832 100644 --- a/crates/rayexec_execution/src/expr/physical/mod.rs +++ b/crates/rayexec_execution/src/expr/physical/mod.rs @@ -13,13 +13,13 @@ use case_expr::PhysicalCaseExpr; use cast_expr::PhysicalCastExpr; use column_expr::PhysicalColumnExpr; use literal_expr::PhysicalLiteralExpr; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::executor::scalar::SelectExecutor; -use rayexec_bullet::selection::SelectionVector; use rayexec_error::{not_implemented, OptionExt, Result}; use scalar_function_expr::PhysicalScalarFunctionExpr; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; +use crate::arrays::executor::scalar::SelectExecutor; +use crate::arrays::selection::SelectionVector; use crate::database::DatabaseContext; use crate::functions::aggregate::PlannedAggregateFunction; use crate::proto::DatabaseProtoConv; @@ -190,9 +190,9 @@ impl DatabaseProtoConv for PhysicalSortExpression { #[cfg(test)] mod tests { use planner::PhysicalExpressionPlanner; - use rayexec_bullet::datatype::DataType; use super::*; + use crate::arrays::datatype::DataType; use crate::expr; use crate::logical::binder::table_list::TableList; diff --git a/crates/rayexec_execution/src/expr/physical/planner.rs b/crates/rayexec_execution/src/expr/physical/planner.rs index c052a46f9..cf40aed00 100644 --- a/crates/rayexec_execution/src/expr/physical/planner.rs +++ b/crates/rayexec_execution/src/expr/physical/planner.rs @@ -1,5 +1,4 @@ use fmtutil::IntoDisplayableSlice; -use rayexec_bullet::scalar::ScalarValue; use rayexec_error::{RayexecError, Result, ResultExt}; use super::case_expr::PhysicalCaseExpr; @@ -8,6 +7,7 @@ use super::column_expr::PhysicalColumnExpr; use super::literal_expr::PhysicalLiteralExpr; use super::scalar_function_expr::PhysicalScalarFunctionExpr; use super::PhysicalSortExpression; +use crate::arrays::scalar::ScalarValue; use crate::execution::operators::hash_join::condition::HashJoinCondition; use crate::expr::physical::case_expr::PhysicalWhenThen; use crate::expr::physical::PhysicalScalarExpression; diff --git a/crates/rayexec_execution/src/expr/physical/scalar_function_expr.rs b/crates/rayexec_execution/src/expr/physical/scalar_function_expr.rs index 41f8da8a4..676f6122f 100644 --- a/crates/rayexec_execution/src/expr/physical/scalar_function_expr.rs +++ b/crates/rayexec_execution/src/expr/physical/scalar_function_expr.rs @@ -2,11 +2,11 @@ use std::borrow::Cow; use std::fmt; use fmtutil::IntoDisplayableSlice; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; use rayexec_error::Result; use super::PhysicalScalarExpression; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::functions::scalar::PlannedScalarFunction; use crate::proto::DatabaseProtoConv; diff --git a/crates/rayexec_execution/src/expr/subquery_expr.rs b/crates/rayexec_execution/src/expr/subquery_expr.rs index 3a21c713d..cbf15e22f 100644 --- a/crates/rayexec_execution/src/expr/subquery_expr.rs +++ b/crates/rayexec_execution/src/expr/subquery_expr.rs @@ -1,11 +1,11 @@ use std::fmt; use std::hash::Hash; -use rayexec_bullet::datatype::DataType; use rayexec_error::Result; use super::comparison_expr::ComparisonOperator; use super::Expression; +use crate::arrays::datatype::DataType; use crate::explain::context_display::{ContextDisplay, ContextDisplayMode, ContextDisplayWrapper}; use crate::logical::binder::bind_context::{BindContext, BindScopeRef}; use crate::logical::binder::bind_query::BoundQuery; diff --git a/crates/rayexec_execution/src/expr/unnest_expr.rs b/crates/rayexec_execution/src/expr/unnest_expr.rs index 205495c30..aed9c3f87 100644 --- a/crates/rayexec_execution/src/expr/unnest_expr.rs +++ b/crates/rayexec_execution/src/expr/unnest_expr.rs @@ -1,9 +1,9 @@ use std::fmt; -use rayexec_bullet::datatype::DataType; use rayexec_error::{RayexecError, Result}; use super::Expression; +use crate::arrays::datatype::DataType; use crate::explain::context_display::{ContextDisplay, ContextDisplayMode, ContextDisplayWrapper}; use crate::logical::binder::table_list::TableList; diff --git a/crates/rayexec_execution/src/expr/window_expr.rs b/crates/rayexec_execution/src/expr/window_expr.rs index 3f7ea6ffe..3ce06aceb 100644 --- a/crates/rayexec_execution/src/expr/window_expr.rs +++ b/crates/rayexec_execution/src/expr/window_expr.rs @@ -1,10 +1,10 @@ use std::fmt; use fmtutil::IntoDisplayableSlice; -use rayexec_bullet::datatype::DataType; use rayexec_error::Result; use super::Expression; +use crate::arrays::datatype::DataType; use crate::explain::context_display::{ContextDisplay, ContextDisplayMode, ContextDisplayWrapper}; use crate::functions::aggregate::PlannedAggregateFunction; use crate::logical::binder::bind_context::BindContext; diff --git a/crates/rayexec_execution/src/functions/aggregate/builtin/avg.rs b/crates/rayexec_execution/src/functions/aggregate/builtin/avg.rs index 5c513f24a..205107c09 100644 --- a/crates/rayexec_execution/src/functions/aggregate/builtin/avg.rs +++ b/crates/rayexec_execution/src/functions/aggregate/builtin/avg.rs @@ -3,16 +3,16 @@ use std::marker::PhantomData; use std::ops::AddAssign; use num_traits::AsPrimitive; -use rayexec_bullet::array::Array; -use rayexec_bullet::bitmap::Bitmap; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::aggregate::AggregateState; -use rayexec_bullet::executor::builder::{ArrayBuilder, ArrayDataBuffer, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::{PhysicalF64, PhysicalI64}; -use rayexec_bullet::scalar::decimal::{Decimal128Type, Decimal64Type, DecimalType}; use rayexec_error::Result; use serde::{Deserialize, Serialize}; +use crate::arrays::array::Array; +use crate::arrays::bitmap::Bitmap; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::aggregate::AggregateState; +use crate::arrays::executor::builder::{ArrayBuilder, ArrayDataBuffer, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::{PhysicalF64, PhysicalI64}; +use crate::arrays::scalar::decimal::{Decimal128Type, Decimal64Type, DecimalType}; use crate::expr::Expression; use crate::functions::aggregate::states::{ new_unary_aggregate_states, diff --git a/crates/rayexec_execution/src/functions/aggregate/builtin/corr.rs b/crates/rayexec_execution/src/functions/aggregate/builtin/corr.rs index c5587a346..ad557baf5 100644 --- a/crates/rayexec_execution/src/functions/aggregate/builtin/corr.rs +++ b/crates/rayexec_execution/src/functions/aggregate/builtin/corr.rs @@ -1,12 +1,12 @@ use std::fmt::Debug; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::aggregate::AggregateState; -use rayexec_bullet::executor::physical_type::PhysicalF64; use rayexec_error::Result; use super::covar::{CovarPopFinalize, CovarState}; use super::stddev::{StddevPopFinalize, VarianceState}; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::aggregate::AggregateState; +use crate::arrays::executor::physical_type::PhysicalF64; use crate::expr::Expression; use crate::functions::aggregate::states::{ new_binary_aggregate_states, diff --git a/crates/rayexec_execution/src/functions/aggregate/builtin/count.rs b/crates/rayexec_execution/src/functions/aggregate/builtin/count.rs index a4f9832b8..68761f921 100644 --- a/crates/rayexec_execution/src/functions/aggregate/builtin/count.rs +++ b/crates/rayexec_execution/src/functions/aggregate/builtin/count.rs @@ -1,8 +1,8 @@ -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::aggregate::AggregateState; -use rayexec_bullet::executor::physical_type::PhysicalAny; use rayexec_error::Result; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::aggregate::AggregateState; +use crate::arrays::executor::physical_type::PhysicalAny; use crate::expr::{self, Expression}; use crate::functions::aggregate::states::{ new_unary_aggregate_states, diff --git a/crates/rayexec_execution/src/functions/aggregate/builtin/covar.rs b/crates/rayexec_execution/src/functions/aggregate/builtin/covar.rs index db08455eb..7de84c41f 100644 --- a/crates/rayexec_execution/src/functions/aggregate/builtin/covar.rs +++ b/crates/rayexec_execution/src/functions/aggregate/builtin/covar.rs @@ -1,11 +1,11 @@ use std::fmt::Debug; use std::marker::PhantomData; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::aggregate::AggregateState; -use rayexec_bullet::executor::physical_type::PhysicalF64; use rayexec_error::Result; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::aggregate::AggregateState; +use crate::arrays::executor::physical_type::PhysicalF64; use crate::expr::Expression; use crate::functions::aggregate::states::{ new_binary_aggregate_states, diff --git a/crates/rayexec_execution/src/functions/aggregate/builtin/first.rs b/crates/rayexec_execution/src/functions/aggregate/builtin/first.rs index c102c1ecc..d15fcc709 100644 --- a/crates/rayexec_execution/src/functions/aggregate/builtin/first.rs +++ b/crates/rayexec_execution/src/functions/aggregate/builtin/first.rs @@ -2,11 +2,13 @@ use std::fmt::Debug; use std::marker::PhantomData; use half::f16; -use rayexec_bullet::array::ArrayData; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::aggregate::{AggregateState, StateFinalizer}; -use rayexec_bullet::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; -use rayexec_bullet::executor::physical_type::{ +use rayexec_error::{not_implemented, Result}; + +use crate::arrays::array::ArrayData; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::aggregate::{AggregateState, StateFinalizer}; +use crate::arrays::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; +use crate::arrays::executor::physical_type::{ PhysicalBinary, PhysicalBool, PhysicalF16, @@ -27,10 +29,8 @@ use rayexec_bullet::executor::physical_type::{ PhysicalU8, PhysicalUntypedNull, }; -use rayexec_bullet::scalar::interval::Interval; -use rayexec_bullet::storage::{PrimitiveStorage, UntypedNull}; -use rayexec_error::{not_implemented, Result}; - +use crate::arrays::scalar::interval::Interval; +use crate::arrays::storage::{PrimitiveStorage, UntypedNull}; use crate::expr::Expression; use crate::functions::aggregate::states::{ boolean_finalize, diff --git a/crates/rayexec_execution/src/functions/aggregate/builtin/minmax.rs b/crates/rayexec_execution/src/functions/aggregate/builtin/minmax.rs index 02d60135c..50793c642 100644 --- a/crates/rayexec_execution/src/functions/aggregate/builtin/minmax.rs +++ b/crates/rayexec_execution/src/functions/aggregate/builtin/minmax.rs @@ -2,11 +2,13 @@ use std::fmt::Debug; use std::marker::PhantomData; use half::f16; -use rayexec_bullet::array::ArrayData; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::aggregate::{AggregateState, StateFinalizer}; -use rayexec_bullet::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; -use rayexec_bullet::executor::physical_type::{ +use rayexec_error::{not_implemented, Result}; + +use crate::arrays::array::ArrayData; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::aggregate::{AggregateState, StateFinalizer}; +use crate::arrays::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; +use crate::arrays::executor::physical_type::{ PhysicalBinary, PhysicalBool, PhysicalF16, @@ -27,10 +29,8 @@ use rayexec_bullet::executor::physical_type::{ PhysicalU8, PhysicalUntypedNull, }; -use rayexec_bullet::scalar::interval::Interval; -use rayexec_bullet::storage::{PrimitiveStorage, UntypedNull}; -use rayexec_error::{not_implemented, Result}; - +use crate::arrays::scalar::interval::Interval; +use crate::arrays::storage::{PrimitiveStorage, UntypedNull}; use crate::expr::Expression; use crate::functions::aggregate::states::{ boolean_finalize, diff --git a/crates/rayexec_execution/src/functions/aggregate/builtin/regr_avg.rs b/crates/rayexec_execution/src/functions/aggregate/builtin/regr_avg.rs index a742bc07f..040fd880b 100644 --- a/crates/rayexec_execution/src/functions/aggregate/builtin/regr_avg.rs +++ b/crates/rayexec_execution/src/functions/aggregate/builtin/regr_avg.rs @@ -1,11 +1,11 @@ use std::fmt::Debug; use std::marker::PhantomData; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::aggregate::AggregateState; -use rayexec_bullet::executor::physical_type::PhysicalF64; use rayexec_error::Result; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::aggregate::AggregateState; +use crate::arrays::executor::physical_type::PhysicalF64; use crate::expr::Expression; use crate::functions::aggregate::states::{ new_binary_aggregate_states, diff --git a/crates/rayexec_execution/src/functions/aggregate/builtin/regr_count.rs b/crates/rayexec_execution/src/functions/aggregate/builtin/regr_count.rs index bba6d0f5f..2a26b0169 100644 --- a/crates/rayexec_execution/src/functions/aggregate/builtin/regr_count.rs +++ b/crates/rayexec_execution/src/functions/aggregate/builtin/regr_count.rs @@ -1,10 +1,10 @@ use std::fmt::Debug; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::aggregate::AggregateState; -use rayexec_bullet::executor::physical_type::PhysicalAny; use rayexec_error::Result; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::aggregate::AggregateState; +use crate::arrays::executor::physical_type::PhysicalAny; use crate::expr::Expression; use crate::functions::aggregate::states::{ new_binary_aggregate_states, diff --git a/crates/rayexec_execution/src/functions/aggregate/builtin/regr_r2.rs b/crates/rayexec_execution/src/functions/aggregate/builtin/regr_r2.rs index f06d0ec28..11941ba7c 100644 --- a/crates/rayexec_execution/src/functions/aggregate/builtin/regr_r2.rs +++ b/crates/rayexec_execution/src/functions/aggregate/builtin/regr_r2.rs @@ -1,11 +1,11 @@ use std::fmt::Debug; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::aggregate::AggregateState; -use rayexec_bullet::executor::physical_type::PhysicalF64; use rayexec_error::Result; use super::corr::CorrelationState; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::aggregate::AggregateState; +use crate::arrays::executor::physical_type::PhysicalF64; use crate::expr::Expression; use crate::functions::aggregate::states::{ new_binary_aggregate_states, diff --git a/crates/rayexec_execution/src/functions/aggregate/builtin/regr_slope.rs b/crates/rayexec_execution/src/functions/aggregate/builtin/regr_slope.rs index d15d63bf6..4d4dd5ba7 100644 --- a/crates/rayexec_execution/src/functions/aggregate/builtin/regr_slope.rs +++ b/crates/rayexec_execution/src/functions/aggregate/builtin/regr_slope.rs @@ -1,12 +1,12 @@ use std::fmt::Debug; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::aggregate::AggregateState; -use rayexec_bullet::executor::physical_type::PhysicalF64; use rayexec_error::Result; use super::covar::{CovarPopFinalize, CovarState}; use super::stddev::{VariancePopFinalize, VarianceState}; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::aggregate::AggregateState; +use crate::arrays::executor::physical_type::PhysicalF64; use crate::expr::Expression; use crate::functions::aggregate::states::{ new_binary_aggregate_states, diff --git a/crates/rayexec_execution/src/functions/aggregate/builtin/stddev.rs b/crates/rayexec_execution/src/functions/aggregate/builtin/stddev.rs index 20b452ec6..0e66f7d67 100644 --- a/crates/rayexec_execution/src/functions/aggregate/builtin/stddev.rs +++ b/crates/rayexec_execution/src/functions/aggregate/builtin/stddev.rs @@ -1,11 +1,11 @@ use std::fmt::Debug; use std::marker::PhantomData; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::aggregate::AggregateState; -use rayexec_bullet::executor::physical_type::PhysicalF64; use rayexec_error::Result; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::aggregate::AggregateState; +use crate::arrays::executor::physical_type::PhysicalF64; use crate::expr::Expression; use crate::functions::aggregate::states::{ new_unary_aggregate_states, diff --git a/crates/rayexec_execution/src/functions/aggregate/builtin/string_agg.rs b/crates/rayexec_execution/src/functions/aggregate/builtin/string_agg.rs index 3965a0ec7..5484f9938 100644 --- a/crates/rayexec_execution/src/functions/aggregate/builtin/string_agg.rs +++ b/crates/rayexec_execution/src/functions/aggregate/builtin/string_agg.rs @@ -1,12 +1,12 @@ use std::fmt::Debug; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::aggregate::{AggregateState, StateFinalizer}; -use rayexec_bullet::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalUtf8; -use rayexec_bullet::scalar::ScalarValue; use rayexec_error::{RayexecError, Result}; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::aggregate::{AggregateState, StateFinalizer}; +use crate::arrays::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; +use crate::arrays::executor::physical_type::PhysicalUtf8; +use crate::arrays::scalar::ScalarValue; use crate::expr::Expression; use crate::functions::aggregate::states::{new_unary_aggregate_states, AggregateGroupStates}; use crate::functions::aggregate::{ diff --git a/crates/rayexec_execution/src/functions/aggregate/builtin/sum.rs b/crates/rayexec_execution/src/functions/aggregate/builtin/sum.rs index 479b06436..379d60935 100644 --- a/crates/rayexec_execution/src/functions/aggregate/builtin/sum.rs +++ b/crates/rayexec_execution/src/functions/aggregate/builtin/sum.rs @@ -3,14 +3,14 @@ use std::marker::PhantomData; use std::ops::AddAssign; use num_traits::CheckedAdd; -use rayexec_bullet::array::ArrayData; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::aggregate::AggregateState; -use rayexec_bullet::executor::physical_type::{PhysicalF64, PhysicalI64}; -use rayexec_bullet::scalar::decimal::{Decimal128Type, Decimal64Type, DecimalType}; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::Result; +use crate::arrays::array::ArrayData; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::aggregate::AggregateState; +use crate::arrays::executor::physical_type::{PhysicalF64, PhysicalI64}; +use crate::arrays::scalar::decimal::{Decimal128Type, Decimal64Type, DecimalType}; +use crate::arrays::storage::PrimitiveStorage; use crate::expr::Expression; use crate::functions::aggregate::states::{ new_unary_aggregate_states, @@ -221,10 +221,9 @@ impl AggregateState for SumStateAdd #[cfg(test)] mod tests { - use rayexec_bullet::array::Array; - use rayexec_bullet::scalar::ScalarValue; - use super::*; + use crate::arrays::array::Array; + use crate::arrays::scalar::ScalarValue; use crate::execution::operators::hash_aggregate::hash_table::GroupAddress; use crate::expr; use crate::functions::aggregate::ChunkGroupAddressIter; diff --git a/crates/rayexec_execution/src/functions/aggregate/mod.rs b/crates/rayexec_execution/src/functions/aggregate/mod.rs index 275e0be72..0bfa1baba 100644 --- a/crates/rayexec_execution/src/functions/aggregate/mod.rs +++ b/crates/rayexec_execution/src/functions/aggregate/mod.rs @@ -5,12 +5,12 @@ use std::fmt::Debug; use std::hash::Hash; use dyn_clone::DynClone; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::aggregate::RowToStateMapping; use rayexec_error::Result; use states::AggregateGroupStates; use super::FunctionInfo; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::aggregate::RowToStateMapping; use crate::execution::operators::hash_aggregate::hash_table::GroupAddress; use crate::expr::Expression; use crate::logical::binder::table_list::TableList; diff --git a/crates/rayexec_execution/src/functions/aggregate/states.rs b/crates/rayexec_execution/src/functions/aggregate/states.rs index c2dd97d59..c3926aa98 100644 --- a/crates/rayexec_execution/src/functions/aggregate/states.rs +++ b/crates/rayexec_execution/src/functions/aggregate/states.rs @@ -3,21 +3,21 @@ use std::any::Any; use std::fmt::Debug; use std::marker::PhantomData; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::aggregate::{ +use rayexec_error::{RayexecError, Result}; + +use super::ChunkGroupAddressIter; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::aggregate::{ AggregateState, BinaryNonNullUpdater, StateCombiner, StateFinalizer, UnaryNonNullUpdater, }; -use rayexec_bullet::executor::builder::{ArrayBuilder, BooleanBuffer, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalStorage; -use rayexec_bullet::storage::{AddressableStorage, PrimitiveStorage}; -use rayexec_error::{RayexecError, Result}; - -use super::ChunkGroupAddressIter; +use crate::arrays::executor::builder::{ArrayBuilder, BooleanBuffer, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::storage::{AddressableStorage, PrimitiveStorage}; pub struct TypedAggregateGroupStates { states: Vec, diff --git a/crates/rayexec_execution/src/functions/copy/mod.rs b/crates/rayexec_execution/src/functions/copy/mod.rs index 6ecb087cd..e92490d7a 100644 --- a/crates/rayexec_execution/src/functions/copy/mod.rs +++ b/crates/rayexec_execution/src/functions/copy/mod.rs @@ -2,14 +2,14 @@ use std::collections::HashMap; use std::fmt::Debug; use dyn_clone::DynClone; -use rayexec_bullet::field::Schema; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::{RayexecError, Result}; use rayexec_io::location::{AccessConfig, FileLocation}; use rayexec_io::s3::credentials::AwsCredentials; use rayexec_io::s3::S3Location; use serde::{Deserialize, Serialize}; +use crate::arrays::field::Schema; +use crate::arrays::scalar::OwnedScalarValue; use crate::execution::operators::sink::PartitionSink; pub const FORMAT_OPT_KEY: &str = "format"; diff --git a/crates/rayexec_execution/src/functions/implicit.rs b/crates/rayexec_execution/src/functions/implicit.rs index 44f6ab0b8..a56cdbf18 100644 --- a/crates/rayexec_execution/src/functions/implicit.rs +++ b/crates/rayexec_execution/src/functions/implicit.rs @@ -1,4 +1,4 @@ -use rayexec_bullet::datatype::{DataType, DataTypeId}; +use crate::arrays::datatype::{DataType, DataTypeId}; /// Score that should be used if no cast is needed. pub const NO_CAST_SCORE: u32 = 400; @@ -224,9 +224,8 @@ const fn float64_cast_score(want: DataTypeId) -> Option { #[cfg(test)] mod tests { - use rayexec_bullet::datatype::{TimeUnit, TimestampTypeMeta}; - use super::*; + use crate::arrays::datatype::{TimeUnit, TimestampTypeMeta}; #[test] fn implicit_cast_from_utf8() { diff --git a/crates/rayexec_execution/src/functions/mod.rs b/crates/rayexec_execution/src/functions/mod.rs index c4221355f..1b9596e5c 100644 --- a/crates/rayexec_execution/src/functions/mod.rs +++ b/crates/rayexec_execution/src/functions/mod.rs @@ -12,9 +12,10 @@ use std::fmt::Display; use documentation::Documentation; use fmtutil::IntoDisplayableSlice; use implicit::{implicit_cast_score, NO_CAST_SCORE}; -use rayexec_bullet::datatype::{DataType, DataTypeId}; use rayexec_error::{RayexecError, Result}; +use crate::arrays::datatype::{DataType, DataTypeId}; + /// Function signature. // TODO: Include named args. Also make sure to update PartialEq too. #[derive(Debug, Clone, Copy)] diff --git a/crates/rayexec_execution/src/functions/proto.rs b/crates/rayexec_execution/src/functions/proto.rs index 37a156f0c..ff5379846 100644 --- a/crates/rayexec_execution/src/functions/proto.rs +++ b/crates/rayexec_execution/src/functions/proto.rs @@ -1,6 +1,5 @@ use std::collections::HashMap; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::{OptionExt, Result}; use rayexec_proto::ProtoConv; @@ -8,6 +7,7 @@ use super::aggregate::{AggregateFunction, PlannedAggregateFunction}; use super::copy::{CopyToArgs, CopyToFunction}; use super::scalar::{PlannedScalarFunction, ScalarFunction}; use super::table::{PlannedTableFunction, TableFunction}; +use crate::arrays::scalar::OwnedScalarValue; use crate::database::catalog::CatalogTx; use crate::database::DatabaseContext; use crate::proto::DatabaseProtoConv; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/arith/add.rs b/crates/rayexec_execution/src/functions/scalar/builtin/arith/add.rs index 9b090465f..a3bd2318e 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/arith/add.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/arith/add.rs @@ -1,10 +1,12 @@ use std::fmt::Debug; use std::marker::PhantomData; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::{ +use rayexec_error::Result; + +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::{ PhysicalF16, PhysicalF32, PhysicalF64, @@ -20,10 +22,8 @@ use rayexec_bullet::executor::physical_type::{ PhysicalU64, PhysicalU8, }; -use rayexec_bullet::executor::scalar::BinaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; -use rayexec_error::Result; - +use crate::arrays::executor::scalar::BinaryExecutor; +use crate::arrays::storage::PrimitiveStorage; use crate::expr::Expression; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; use crate::functions::{invalid_input_types_error, plan_check_num_args, FunctionInfo, Signature}; @@ -223,9 +223,8 @@ where #[cfg(test)] mod tests { - use rayexec_bullet::datatype::DataType; - use super::*; + use crate::arrays::datatype::DataType; use crate::expr; use crate::functions::scalar::ScalarFunction; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/arith/div.rs b/crates/rayexec_execution/src/functions/scalar/builtin/arith/div.rs index 242834269..f5c27bd17 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/arith/div.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/arith/div.rs @@ -1,12 +1,14 @@ use std::fmt::Debug; use std::marker::PhantomData; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::compute::cast::array::cast_decimal_to_float; -use rayexec_bullet::compute::cast::behavior::CastFailBehavior; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::{ +use rayexec_error::Result; + +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::compute::cast::array::cast_decimal_to_float; +use crate::arrays::compute::cast::behavior::CastFailBehavior; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::{ PhysicalF16, PhysicalF32, PhysicalF64, @@ -22,11 +24,9 @@ use rayexec_bullet::executor::physical_type::{ PhysicalU64, PhysicalU8, }; -use rayexec_bullet::executor::scalar::BinaryExecutor; -use rayexec_bullet::scalar::decimal::{Decimal128Type, Decimal64Type, DecimalType}; -use rayexec_bullet::storage::PrimitiveStorage; -use rayexec_error::Result; - +use crate::arrays::executor::scalar::BinaryExecutor; +use crate::arrays::scalar::decimal::{Decimal128Type, Decimal64Type, DecimalType}; +use crate::arrays::storage::PrimitiveStorage; use crate::expr::Expression; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; use crate::functions::{invalid_input_types_error, plan_check_num_args, FunctionInfo, Signature}; @@ -260,9 +260,8 @@ where #[cfg(test)] mod tests { - use rayexec_bullet::datatype::DataType; - use super::*; + use crate::arrays::datatype::DataType; use crate::expr; use crate::functions::scalar::ScalarFunction; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/arith/mul.rs b/crates/rayexec_execution/src/functions/scalar/builtin/arith/mul.rs index 721753c13..1a2c3d9e9 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/arith/mul.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/arith/mul.rs @@ -2,10 +2,12 @@ use std::fmt::Debug; use std::marker::PhantomData; use num_traits::{NumCast, PrimInt}; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::{DataType, DataTypeId, DecimalTypeMeta}; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::{ +use rayexec_error::Result; + +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::{DataType, DataTypeId, DecimalTypeMeta}; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::{ PhysicalF16, PhysicalF32, PhysicalF64, @@ -22,12 +24,10 @@ use rayexec_bullet::executor::physical_type::{ PhysicalU64, PhysicalU8, }; -use rayexec_bullet::executor::scalar::BinaryExecutor; -use rayexec_bullet::scalar::decimal::{Decimal128Type, Decimal64Type, DecimalType}; -use rayexec_bullet::scalar::interval::Interval; -use rayexec_bullet::storage::PrimitiveStorage; -use rayexec_error::Result; - +use crate::arrays::executor::scalar::BinaryExecutor; +use crate::arrays::scalar::decimal::{Decimal128Type, Decimal64Type, DecimalType}; +use crate::arrays::scalar::interval::Interval; +use crate::arrays::storage::PrimitiveStorage; use crate::expr::Expression; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; use crate::functions::{invalid_input_types_error, plan_check_num_args, FunctionInfo, Signature}; @@ -333,9 +333,8 @@ where #[cfg(test)] mod tests { - use rayexec_bullet::datatype::DataType; - use super::*; + use crate::arrays::datatype::DataType; use crate::expr; use crate::functions::scalar::ScalarFunction; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/arith/rem.rs b/crates/rayexec_execution/src/functions/scalar/builtin/arith/rem.rs index 85ab0d93d..52beb91ff 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/arith/rem.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/arith/rem.rs @@ -1,10 +1,12 @@ use std::fmt::Debug; use std::marker::PhantomData; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::{ +use rayexec_error::Result; + +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::{ PhysicalF16, PhysicalF32, PhysicalF64, @@ -20,10 +22,8 @@ use rayexec_bullet::executor::physical_type::{ PhysicalU64, PhysicalU8, }; -use rayexec_bullet::executor::scalar::BinaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; -use rayexec_error::Result; - +use crate::arrays::executor::scalar::BinaryExecutor; +use crate::arrays::storage::PrimitiveStorage; use crate::expr::Expression; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; use crate::functions::{invalid_input_types_error, plan_check_num_args, FunctionInfo, Signature}; @@ -215,9 +215,8 @@ where #[cfg(test)] mod tests { - use rayexec_bullet::datatype::DataType; - use super::*; + use crate::arrays::datatype::DataType; use crate::expr; use crate::functions::scalar::ScalarFunction; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/arith/sub.rs b/crates/rayexec_execution/src/functions/scalar/builtin/arith/sub.rs index 5ee9db3c6..5936265ad 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/arith/sub.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/arith/sub.rs @@ -1,10 +1,12 @@ use std::fmt::Debug; use std::marker::PhantomData; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::{ +use rayexec_error::Result; + +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::{ PhysicalF16, PhysicalF32, PhysicalF64, @@ -20,10 +22,8 @@ use rayexec_bullet::executor::physical_type::{ PhysicalU64, PhysicalU8, }; -use rayexec_bullet::executor::scalar::BinaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; -use rayexec_error::Result; - +use crate::arrays::executor::scalar::BinaryExecutor; +use crate::arrays::storage::PrimitiveStorage; use crate::expr::Expression; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; use crate::functions::{invalid_input_types_error, plan_check_num_args, FunctionInfo, Signature}; @@ -230,9 +230,8 @@ where #[cfg(test)] mod tests { - use rayexec_bullet::datatype::DataType; - use super::*; + use crate::arrays::datatype::DataType; use crate::expr; use crate::functions::scalar::ScalarFunction; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/boolean.rs b/crates/rayexec_execution/src/functions/scalar/builtin/boolean.rs index d323e0c72..c72438ec5 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/boolean.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/boolean.rs @@ -1,15 +1,15 @@ use std::fmt::Debug; -use rayexec_bullet::array::Array; -use rayexec_bullet::bitmap::Bitmap; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, BooleanBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalBool; -use rayexec_bullet::executor::scalar::{BinaryExecutor, TernaryExecutor, UniformExecutor}; -use rayexec_bullet::storage::BooleanStorage; use rayexec_error::Result; use serde::{Deserialize, Serialize}; +use crate::arrays::array::Array; +use crate::arrays::bitmap::Bitmap; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, BooleanBuffer}; +use crate::arrays::executor::physical_type::PhysicalBool; +use crate::arrays::executor::scalar::{BinaryExecutor, TernaryExecutor, UniformExecutor}; +use crate::arrays::storage::BooleanStorage; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; @@ -219,9 +219,8 @@ impl ScalarFunctionImpl for OrImpl { #[cfg(test)] mod tests { - use rayexec_bullet::scalar::ScalarValue; - use super::*; + use crate::arrays::scalar::ScalarValue; use crate::expr; #[test] diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/comparison.rs b/crates/rayexec_execution/src/functions/scalar/builtin/comparison.rs index 1c21405f8..23ba23a54 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/comparison.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/comparison.rs @@ -2,12 +2,14 @@ use std::cmp::Ordering; use std::fmt::Debug; use std::marker::PhantomData; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::compute::cast::array::decimal_rescale; -use rayexec_bullet::compute::cast::behavior::CastFailBehavior; -use rayexec_bullet::datatype::{DataType, DataTypeId, DecimalTypeMeta}; -use rayexec_bullet::executor::builder::{ArrayBuilder, BooleanBuffer}; -use rayexec_bullet::executor::physical_type::{ +use rayexec_error::{RayexecError, Result}; + +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::compute::cast::array::decimal_rescale; +use crate::arrays::compute::cast::behavior::CastFailBehavior; +use crate::arrays::datatype::{DataType, DataTypeId, DecimalTypeMeta}; +use crate::arrays::executor::builder::{ArrayBuilder, BooleanBuffer}; +use crate::arrays::executor::physical_type::{ PhysicalBinary, PhysicalBool, PhysicalF16, @@ -29,11 +31,9 @@ use rayexec_bullet::executor::physical_type::{ PhysicalUntypedNull, PhysicalUtf8, }; -use rayexec_bullet::executor::scalar::{BinaryExecutor, BinaryListReducer, FlexibleListExecutor}; -use rayexec_bullet::scalar::decimal::{Decimal128Type, Decimal64Type, DecimalType}; -use rayexec_bullet::storage::PrimitiveStorage; -use rayexec_error::{RayexecError, Result}; - +use crate::arrays::executor::scalar::{BinaryExecutor, BinaryListReducer, FlexibleListExecutor}; +use crate::arrays::scalar::decimal::{Decimal128Type, Decimal64Type, DecimalType}; +use crate::arrays::storage::PrimitiveStorage; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/datetime/date_part.rs b/crates/rayexec_execution/src/functions/scalar/builtin/datetime/date_part.rs index cf197acbd..2e4044200 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/datetime/date_part.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/datetime/date_part.rs @@ -1,10 +1,10 @@ -use rayexec_bullet::array::Array; -use rayexec_bullet::compute::date::{self, extract_date_part}; -use rayexec_bullet::datatype::{DataType, DataTypeId, DecimalTypeMeta}; -use rayexec_bullet::scalar::decimal::{Decimal64Type, DecimalType}; use rayexec_error::Result; use rayexec_parser::ast; +use crate::arrays::array::Array; +use crate::arrays::compute::date::{self, extract_date_part}; +use crate::arrays::datatype::{DataType, DataTypeId, DecimalTypeMeta}; +use crate::arrays::scalar::decimal::{Decimal64Type, DecimalType}; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/datetime/date_trunc.rs b/crates/rayexec_execution/src/functions/scalar/builtin/datetime/date_trunc.rs index defe8227f..b677bd584 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/datetime/date_trunc.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/datetime/date_trunc.rs @@ -1,12 +1,12 @@ use std::str::FromStr; -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId, TimeUnit, TimestampTypeMeta}; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalI64; -use rayexec_bullet::executor::scalar::UnaryExecutor; use rayexec_error::{not_implemented, RayexecError, Result}; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId, TimeUnit, TimestampTypeMeta}; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalI64; +use crate::arrays::executor::scalar::UnaryExecutor; use crate::expr::Expression; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; use crate::functions::{invalid_input_types_error, plan_check_num_args, FunctionInfo, Signature}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/datetime/epoch.rs b/crates/rayexec_execution/src/functions/scalar/builtin/datetime/epoch.rs index 035fe4bae..536dee3ac 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/datetime/epoch.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/datetime/epoch.rs @@ -1,10 +1,10 @@ -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId, TimeUnit, TimestampTypeMeta}; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalI64; -use rayexec_bullet::executor::scalar::UnaryExecutor; use rayexec_error::Result; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId, TimeUnit, TimestampTypeMeta}; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalI64; +use crate::arrays::executor::scalar::UnaryExecutor; use crate::expr::Expression; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; use crate::functions::{invalid_input_types_error, plan_check_num_args, FunctionInfo, Signature}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/is.rs b/crates/rayexec_execution/src/functions/scalar/builtin/is.rs index d8c4986cb..69a221936 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/is.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/is.rs @@ -1,10 +1,10 @@ -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, BooleanBuffer}; -use rayexec_bullet::executor::physical_type::{PhysicalAny, PhysicalBool}; -use rayexec_bullet::executor::scalar::UnaryExecutor; use rayexec_error::Result; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, BooleanBuffer}; +use crate::arrays::executor::physical_type::{PhysicalAny, PhysicalBool}; +use crate::arrays::executor::scalar::UnaryExecutor; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/list/list_extract.rs b/crates/rayexec_execution/src/functions/scalar/builtin/list/list_extract.rs index 274247680..9c9287700 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/list/list_extract.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/list/list_extract.rs @@ -1,17 +1,20 @@ use std::borrow::Borrow; use half::f16; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::bitmap::Bitmap; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ +use rayexec_error::{not_implemented, RayexecError, Result}; +use serde::{Deserialize, Serialize}; + +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::bitmap::Bitmap; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ ArrayBuilder, ArrayDataBuffer, BooleanBuffer, GermanVarlenBuffer, PrimitiveBuffer, }; -use rayexec_bullet::executor::physical_type::{ +use crate::arrays::executor::physical_type::{ PhysicalBinary, PhysicalBool, PhysicalF16, @@ -32,10 +35,7 @@ use rayexec_bullet::executor::physical_type::{ PhysicalU8, PhysicalUtf8, }; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_error::{not_implemented, RayexecError, Result}; -use serde::{Deserialize, Serialize}; - +use crate::arrays::executor::scalar::UnaryExecutor; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/list/list_values.rs b/crates/rayexec_execution/src/functions/scalar/builtin/list/list_values.rs index 0d1efb229..b961085db 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/list/list_values.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/list/list_values.rs @@ -1,9 +1,9 @@ -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId, ListTypeMeta}; -use rayexec_bullet::executor::scalar::concat; -use rayexec_bullet::storage::ListStorage; use rayexec_error::{RayexecError, Result}; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId, ListTypeMeta}; +use crate::arrays::executor::scalar::concat; +use crate::arrays::storage::ListStorage; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/negate.rs b/crates/rayexec_execution/src/functions/scalar/builtin/negate.rs index 0a4985293..fc3099d39 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/negate.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/negate.rs @@ -1,9 +1,11 @@ use std::marker::PhantomData; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, BooleanBuffer, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::{ +use rayexec_error::Result; + +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, BooleanBuffer, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::{ PhysicalBool, PhysicalF16, PhysicalF32, @@ -15,10 +17,8 @@ use rayexec_bullet::executor::physical_type::{ PhysicalI8, PhysicalStorage, }; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; -use rayexec_error::Result; - +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::storage::PrimitiveStorage; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/abs.rs b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/abs.rs index a03bfc261..c47048fef 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/abs.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/abs.rs @@ -1,13 +1,13 @@ use num_traits::Float; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalStorage; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::Result; use super::{UnaryInputNumericOperation, UnaryInputNumericScalar}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::storage::PrimitiveStorage; pub type Abs = UnaryInputNumericScalar; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/acos.rs b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/acos.rs index 455d53548..ab989ab52 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/acos.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/acos.rs @@ -1,13 +1,13 @@ use num_traits::Float; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalStorage; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::Result; use super::{UnaryInputNumericOperation, UnaryInputNumericScalar}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::storage::PrimitiveStorage; pub type Acos = UnaryInputNumericScalar; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/asin.rs b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/asin.rs index e2326b707..d2721fa9d 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/asin.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/asin.rs @@ -1,13 +1,13 @@ use num_traits::Float; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalStorage; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::Result; use super::{UnaryInputNumericOperation, UnaryInputNumericScalar}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::storage::PrimitiveStorage; pub type Asin = UnaryInputNumericScalar; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/atan.rs b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/atan.rs index b5081f457..8a3aad508 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/atan.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/atan.rs @@ -1,13 +1,13 @@ use num_traits::Float; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalStorage; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::Result; use super::{UnaryInputNumericOperation, UnaryInputNumericScalar}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::storage::PrimitiveStorage; pub type Atan = UnaryInputNumericScalar; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/cbrt.rs b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/cbrt.rs index 16ffec654..fe97f1980 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/cbrt.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/cbrt.rs @@ -1,13 +1,13 @@ use num_traits::Float; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalStorage; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::Result; use super::{UnaryInputNumericOperation, UnaryInputNumericScalar}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::storage::PrimitiveStorage; pub type Cbrt = UnaryInputNumericScalar; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/ceil.rs b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/ceil.rs index 622f15cc8..49b0a14d4 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/ceil.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/ceil.rs @@ -1,13 +1,13 @@ use num_traits::Float; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalStorage; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::Result; use super::{UnaryInputNumericOperation, UnaryInputNumericScalar}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::storage::PrimitiveStorage; pub type Ceil = UnaryInputNumericScalar; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/cos.rs b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/cos.rs index 86b351539..35d3e82b7 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/cos.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/cos.rs @@ -1,13 +1,13 @@ use num_traits::Float; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalStorage; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::Result; use super::{UnaryInputNumericOperation, UnaryInputNumericScalar}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::storage::PrimitiveStorage; pub type Cos = UnaryInputNumericScalar; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/degrees.rs b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/degrees.rs index 84ebe45e5..634d2497c 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/degrees.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/degrees.rs @@ -1,13 +1,13 @@ use num_traits::Float; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalStorage; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::Result; use super::{UnaryInputNumericOperation, UnaryInputNumericScalar}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::storage::PrimitiveStorage; pub type Degrees = UnaryInputNumericScalar; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/exp.rs b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/exp.rs index 53653b7fa..a71e4a70f 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/exp.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/exp.rs @@ -1,13 +1,13 @@ use num_traits::Float; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalStorage; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::Result; use super::{UnaryInputNumericOperation, UnaryInputNumericScalar}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::storage::PrimitiveStorage; pub type Exp = UnaryInputNumericScalar; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/floor.rs b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/floor.rs index eacc57196..4e8ef22d3 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/floor.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/floor.rs @@ -1,13 +1,13 @@ use num_traits::Float; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalStorage; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::Result; use super::{UnaryInputNumericOperation, UnaryInputNumericScalar}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::storage::PrimitiveStorage; pub type Floor = UnaryInputNumericScalar; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/isnan.rs b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/isnan.rs index 4cb7fa41e..37d56a348 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/isnan.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/isnan.rs @@ -1,19 +1,19 @@ use std::marker::PhantomData; use num_traits::Float; -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, BooleanBuffer}; -use rayexec_bullet::executor::physical_type::{ +use rayexec_error::Result; + +use super::ScalarFunction; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, BooleanBuffer}; +use crate::arrays::executor::physical_type::{ PhysicalF16, PhysicalF32, PhysicalF64, PhysicalStorage, }; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_error::Result; - -use super::ScalarFunction; +use crate::arrays::executor::scalar::UnaryExecutor; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/ln.rs b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/ln.rs index 00554a823..6bd68c098 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/ln.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/ln.rs @@ -1,13 +1,13 @@ use num_traits::Float; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalStorage; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::Result; use super::{UnaryInputNumericOperation, UnaryInputNumericScalar}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::storage::PrimitiveStorage; pub type Ln = UnaryInputNumericScalar; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/log.rs b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/log.rs index 9ae50736d..c668a51e3 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/log.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/log.rs @@ -1,13 +1,13 @@ use num_traits::Float; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalStorage; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::Result; use super::{UnaryInputNumericOperation, UnaryInputNumericScalar}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::storage::PrimitiveStorage; pub type Log = UnaryInputNumericScalar; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/mod.rs b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/mod.rs index 02e306108..a2dcb12df 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/mod.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/mod.rs @@ -33,21 +33,21 @@ pub use ln::*; pub use log::*; use num_traits::Float; pub use radians::*; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::physical_type::{ +use rayexec_error::{RayexecError, Result}; +pub use sin::*; +pub use sqrt::*; +pub use tan::*; + +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::physical_type::{ PhysicalF16, PhysicalF32, PhysicalF64, PhysicalStorage, PhysicalType, }; -use rayexec_bullet::storage::PrimitiveStorage; -use rayexec_error::{RayexecError, Result}; -pub use sin::*; -pub use sqrt::*; -pub use tan::*; - +use crate::arrays::storage::PrimitiveStorage; use crate::expr::Expression; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; use crate::functions::{invalid_input_types_error, plan_check_num_args, FunctionInfo, Signature}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/radians.rs b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/radians.rs index 651c30b30..d4c71dbfa 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/radians.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/radians.rs @@ -1,13 +1,13 @@ use num_traits::Float; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalStorage; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::Result; use super::{UnaryInputNumericOperation, UnaryInputNumericScalar}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::storage::PrimitiveStorage; pub type Radians = UnaryInputNumericScalar; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/sin.rs b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/sin.rs index 9b0d0ff31..7561269c9 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/sin.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/sin.rs @@ -1,13 +1,13 @@ use num_traits::Float; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalStorage; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::Result; use super::{UnaryInputNumericOperation, UnaryInputNumericScalar}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::storage::PrimitiveStorage; pub type Sin = UnaryInputNumericScalar; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/sqrt.rs b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/sqrt.rs index 6219fb7bf..8770db9df 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/sqrt.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/sqrt.rs @@ -1,13 +1,13 @@ use num_traits::Float; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalStorage; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::Result; use super::{UnaryInputNumericOperation, UnaryInputNumericScalar}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::storage::PrimitiveStorage; pub type Sqrt = UnaryInputNumericScalar; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/tan.rs b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/tan.rs index 5c92ff8fa..67d0377af 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/numeric/tan.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/numeric/tan.rs @@ -1,13 +1,13 @@ use num_traits::Float; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalStorage; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::Result; use super::{UnaryInputNumericOperation, UnaryInputNumericScalar}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::DataType; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalStorage; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::storage::PrimitiveStorage; pub type Tan = UnaryInputNumericScalar; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/random.rs b/crates/rayexec_execution/src/functions/scalar/builtin/random.rs index 5f792c0ae..5909de01d 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/random.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/random.rs @@ -1,9 +1,9 @@ -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::Result; use serde::{Deserialize, Serialize}; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::storage::PrimitiveStorage; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation}; use crate::functions::scalar::{ diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/similarity/l2_distance.rs b/crates/rayexec_execution/src/functions/scalar/builtin/similarity/l2_distance.rs index c7a1924eb..8db1686f8 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/similarity/l2_distance.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/similarity/l2_distance.rs @@ -2,18 +2,18 @@ use std::marker::PhantomData; use std::ops::AddAssign; use num_traits::{AsPrimitive, Float}; -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::{ +use rayexec_error::Result; + +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::{ PhysicalF16, PhysicalF32, PhysicalF64, PhysicalStorage, }; -use rayexec_bullet::executor::scalar::{BinaryListReducer, ListExecutor}; -use rayexec_error::Result; - +use crate::arrays::executor::scalar::{BinaryListReducer, ListExecutor}; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/string/ascii.rs b/crates/rayexec_execution/src/functions/scalar/builtin/string/ascii.rs index e43b386fb..fc7beda38 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/string/ascii.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/string/ascii.rs @@ -1,10 +1,10 @@ -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalUtf8; -use rayexec_bullet::executor::scalar::UnaryExecutor; use rayexec_error::Result; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::PhysicalUtf8; +use crate::arrays::executor::scalar::UnaryExecutor; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/string/case.rs b/crates/rayexec_execution/src/functions/scalar/builtin/string/case.rs index 2b7966c27..2c8ed0a36 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/string/case.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/string/case.rs @@ -1,10 +1,10 @@ -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalUtf8; -use rayexec_bullet::executor::scalar::UnaryExecutor; use rayexec_error::{RayexecError, Result}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; +use crate::arrays::executor::physical_type::PhysicalUtf8; +use crate::arrays::executor::scalar::UnaryExecutor; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/string/concat.rs b/crates/rayexec_execution/src/functions/scalar/builtin/string/concat.rs index 1b123081f..1b7c5ae40 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/string/concat.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/string/concat.rs @@ -1,10 +1,10 @@ -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalUtf8; -use rayexec_bullet::executor::scalar::{BinaryExecutor, UniformExecutor}; use rayexec_error::Result; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; +use crate::arrays::executor::physical_type::PhysicalUtf8; +use crate::arrays::executor::scalar::{BinaryExecutor, UniformExecutor}; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/string/contains.rs b/crates/rayexec_execution/src/functions/scalar/builtin/string/contains.rs index 13fcd879a..8cda9192a 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/string/contains.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/string/contains.rs @@ -1,10 +1,10 @@ -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, BooleanBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalUtf8; -use rayexec_bullet::executor::scalar::{BinaryExecutor, UnaryExecutor}; use rayexec_error::Result; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, BooleanBuffer}; +use crate::arrays::executor::physical_type::PhysicalUtf8; +use crate::arrays::executor::scalar::{BinaryExecutor, UnaryExecutor}; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/string/ends_with.rs b/crates/rayexec_execution/src/functions/scalar/builtin/string/ends_with.rs index a640db94c..86d166b50 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/string/ends_with.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/string/ends_with.rs @@ -1,10 +1,10 @@ -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, BooleanBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalUtf8; -use rayexec_bullet::executor::scalar::{BinaryExecutor, UnaryExecutor}; use rayexec_error::Result; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, BooleanBuffer}; +use crate::arrays::executor::physical_type::PhysicalUtf8; +use crate::arrays::executor::scalar::{BinaryExecutor, UnaryExecutor}; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/string/length.rs b/crates/rayexec_execution/src/functions/scalar/builtin/string/length.rs index fde69ec5b..7943e24eb 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/string/length.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/string/length.rs @@ -1,10 +1,10 @@ -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, PrimitiveBuffer}; -use rayexec_bullet::executor::physical_type::{PhysicalBinary, PhysicalUtf8}; -use rayexec_bullet::executor::scalar::UnaryExecutor; use rayexec_error::Result; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, PrimitiveBuffer}; +use crate::arrays::executor::physical_type::{PhysicalBinary, PhysicalUtf8}; +use crate::arrays::executor::scalar::UnaryExecutor; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/string/like.rs b/crates/rayexec_execution/src/functions/scalar/builtin/string/like.rs index 4f6fd8e35..539b35255 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/string/like.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/string/like.rs @@ -1,11 +1,11 @@ -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, BooleanBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalUtf8; -use rayexec_bullet::executor::scalar::{BinaryExecutor, UnaryExecutor}; use rayexec_error::{Result, ResultExt}; use regex::{escape, Regex}; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, BooleanBuffer}; +use crate::arrays::executor::physical_type::PhysicalUtf8; +use crate::arrays::executor::scalar::{BinaryExecutor, UnaryExecutor}; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/string/pad.rs b/crates/rayexec_execution/src/functions/scalar/builtin/string/pad.rs index fbf20db71..ff554eea4 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/string/pad.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/string/pad.rs @@ -1,10 +1,10 @@ -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; -use rayexec_bullet::executor::physical_type::{PhysicalI64, PhysicalUtf8}; -use rayexec_bullet::executor::scalar::{BinaryExecutor, TernaryExecutor}; use rayexec_error::Result; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; +use crate::arrays::executor::physical_type::{PhysicalI64, PhysicalUtf8}; +use crate::arrays::executor::scalar::{BinaryExecutor, TernaryExecutor}; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/string/regexp_replace.rs b/crates/rayexec_execution/src/functions/scalar/builtin/string/regexp_replace.rs index 817b19f2e..34b2ca556 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/string/regexp_replace.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/string/regexp_replace.rs @@ -1,11 +1,11 @@ -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalUtf8; -use rayexec_bullet::executor::scalar::{BinaryExecutor, TernaryExecutor, UnaryExecutor}; use rayexec_error::{Result, ResultExt}; use regex::Regex; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; +use crate::arrays::executor::physical_type::PhysicalUtf8; +use crate::arrays::executor::scalar::{BinaryExecutor, TernaryExecutor, UnaryExecutor}; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/string/repeat.rs b/crates/rayexec_execution/src/functions/scalar/builtin/string/repeat.rs index 597a4a02f..b725787bc 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/string/repeat.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/string/repeat.rs @@ -1,12 +1,12 @@ use std::fmt::Debug; -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; -use rayexec_bullet::executor::physical_type::{PhysicalI64, PhysicalUtf8}; -use rayexec_bullet::executor::scalar::BinaryExecutor; use rayexec_error::Result; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; +use crate::arrays::executor::physical_type::{PhysicalI64, PhysicalUtf8}; +use crate::arrays::executor::scalar::BinaryExecutor; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/string/starts_with.rs b/crates/rayexec_execution/src/functions/scalar/builtin/string/starts_with.rs index 93708edc5..9c7113461 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/string/starts_with.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/string/starts_with.rs @@ -1,10 +1,10 @@ -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, BooleanBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalUtf8; -use rayexec_bullet::executor::scalar::{BinaryExecutor, UnaryExecutor}; use rayexec_error::Result; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, BooleanBuffer}; +use crate::arrays::executor::physical_type::PhysicalUtf8; +use crate::arrays::executor::scalar::{BinaryExecutor, UnaryExecutor}; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/string/substring.rs b/crates/rayexec_execution/src/functions/scalar/builtin/string/substring.rs index 8dc1ee71d..d338a27cc 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/string/substring.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/string/substring.rs @@ -1,10 +1,10 @@ -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; -use rayexec_bullet::executor::physical_type::{PhysicalI64, PhysicalUtf8}; -use rayexec_bullet::executor::scalar::{BinaryExecutor, TernaryExecutor}; use rayexec_error::Result; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; +use crate::arrays::executor::physical_type::{PhysicalI64, PhysicalUtf8}; +use crate::arrays::executor::scalar::{BinaryExecutor, TernaryExecutor}; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/string/trim.rs b/crates/rayexec_execution/src/functions/scalar/builtin/string/trim.rs index 938302966..d36f04e87 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/string/trim.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/string/trim.rs @@ -1,13 +1,13 @@ use std::fmt::Debug; use std::marker::PhantomData; -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; -use rayexec_bullet::executor::physical_type::PhysicalUtf8; -use rayexec_bullet::executor::scalar::{BinaryExecutor, UnaryExecutor}; use rayexec_error::Result; +use crate::arrays::array::Array; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::builder::{ArrayBuilder, GermanVarlenBuffer}; +use crate::arrays::executor::physical_type::PhysicalUtf8; +use crate::arrays::executor::scalar::{BinaryExecutor, UnaryExecutor}; use crate::expr::Expression; use crate::functions::documentation::{Category, Documentation, Example}; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction, ScalarFunctionImpl}; diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/struct_funcs.rs b/crates/rayexec_execution/src/functions/scalar/builtin/struct_funcs.rs index 0b261f331..e7e5cfbf8 100644 --- a/crates/rayexec_execution/src/functions/scalar/builtin/struct_funcs.rs +++ b/crates/rayexec_execution/src/functions/scalar/builtin/struct_funcs.rs @@ -1,8 +1,8 @@ use std::fmt::Debug; -use rayexec_bullet::datatype::DataTypeId; use rayexec_error::{not_implemented, Result}; +use crate::arrays::datatype::DataTypeId; use crate::expr::Expression; use crate::functions::scalar::{PlannedScalarFunction, ScalarFunction}; use crate::functions::{FunctionInfo, Signature}; diff --git a/crates/rayexec_execution/src/functions/scalar/mod.rs b/crates/rayexec_execution/src/functions/scalar/mod.rs index 94251627c..22941656d 100644 --- a/crates/rayexec_execution/src/functions/scalar/mod.rs +++ b/crates/rayexec_execution/src/functions/scalar/mod.rs @@ -4,11 +4,11 @@ use std::fmt::Debug; use std::hash::Hash; use dyn_clone::DynClone; -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::DataType; use rayexec_error::Result; use super::FunctionInfo; +use crate::arrays::array::Array; +use crate::arrays::datatype::DataType; use crate::expr::Expression; use crate::logical::binder::table_list::TableList; diff --git a/crates/rayexec_execution/src/functions/table/builtin/series.rs b/crates/rayexec_execution/src/functions/table/builtin/series.rs index de2174b32..aef14ab0a 100644 --- a/crates/rayexec_execution/src/functions/table/builtin/series.rs +++ b/crates/rayexec_execution/src/functions/table/builtin/series.rs @@ -1,16 +1,16 @@ use std::collections::HashMap; use std::task::{Context, Waker}; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::physical_type::PhysicalI64; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::field::{Field, Schema}; -use rayexec_bullet::scalar::OwnedScalarValue; -use rayexec_bullet::storage::PrimitiveStorage; use rayexec_error::{RayexecError, Result}; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::physical_type::PhysicalI64; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::field::{Field, Schema}; +use crate::arrays::scalar::OwnedScalarValue; +use crate::arrays::storage::PrimitiveStorage; use crate::execution::operators::{PollFinalize, PollPush}; use crate::expr::{self, Expression}; use crate::functions::documentation::{Category, Documentation}; diff --git a/crates/rayexec_execution/src/functions/table/builtin/system.rs b/crates/rayexec_execution/src/functions/table/builtin/system.rs index 636a864b8..f0723ddeb 100644 --- a/crates/rayexec_execution/src/functions/table/builtin/system.rs +++ b/crates/rayexec_execution/src/functions/table/builtin/system.rs @@ -5,16 +5,16 @@ use std::sync::Arc; use futures::future::BoxFuture; use parking_lot::Mutex; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::bitmap::Bitmap; -use rayexec_bullet::datatype::{DataType, DataTypeId, ListTypeMeta}; -use rayexec_bullet::executor::builder::{ArrayDataBuffer, GermanVarlenBuffer}; -use rayexec_bullet::field::{Field, Schema}; -use rayexec_bullet::scalar::OwnedScalarValue; -use rayexec_bullet::storage::{GermanVarlenStorage, ListItemMetadata, ListStorage}; use rayexec_error::{OptionExt, RayexecError, Result}; +use crate::arrays::array::Array; +use crate::arrays::batch::Batch; +use crate::arrays::bitmap::Bitmap; +use crate::arrays::datatype::{DataType, DataTypeId, ListTypeMeta}; +use crate::arrays::executor::builder::{ArrayDataBuffer, GermanVarlenBuffer}; +use crate::arrays::field::{Field, Schema}; +use crate::arrays::scalar::OwnedScalarValue; +use crate::arrays::storage::{GermanVarlenStorage, ListItemMetadata, ListStorage}; use crate::database::catalog::CatalogTx; use crate::database::catalog_entry::{CatalogEntryInner, CatalogEntryType}; use crate::database::memory_catalog::MemoryCatalog; diff --git a/crates/rayexec_execution/src/functions/table/builtin/unnest.rs b/crates/rayexec_execution/src/functions/table/builtin/unnest.rs index 431271820..0535b3f5c 100644 --- a/crates/rayexec_execution/src/functions/table/builtin/unnest.rs +++ b/crates/rayexec_execution/src/functions/table/builtin/unnest.rs @@ -1,15 +1,15 @@ use std::collections::HashMap; use std::task::{Context, Waker}; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::executor::physical_type::{PhysicalList, PhysicalType}; -use rayexec_bullet::executor::scalar::UnaryExecutor; -use rayexec_bullet::field::{Field, Schema}; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::{RayexecError, Result}; +use crate::arrays::array::{Array, ArrayData}; +use crate::arrays::batch::Batch; +use crate::arrays::datatype::{DataType, DataTypeId}; +use crate::arrays::executor::physical_type::{PhysicalList, PhysicalType}; +use crate::arrays::executor::scalar::UnaryExecutor; +use crate::arrays::field::{Field, Schema}; +use crate::arrays::scalar::OwnedScalarValue; use crate::execution::operators::unnest::unnest; use crate::execution::operators::{PollFinalize, PollPush}; use crate::expr::Expression; diff --git a/crates/rayexec_execution/src/functions/table/inout.rs b/crates/rayexec_execution/src/functions/table/inout.rs index 3ed5f7183..f4b1229af 100644 --- a/crates/rayexec_execution/src/functions/table/inout.rs +++ b/crates/rayexec_execution/src/functions/table/inout.rs @@ -2,9 +2,9 @@ use std::fmt::Debug; use std::task::Context; use dyn_clone::DynClone; -use rayexec_bullet::batch::Batch; use rayexec_error::Result; +use crate::arrays::batch::Batch; use crate::execution::operators::{PollFinalize, PollPush}; pub trait TableInOutFunction: Debug + Sync + Send + DynClone { diff --git a/crates/rayexec_execution/src/functions/table/mod.rs b/crates/rayexec_execution/src/functions/table/mod.rs index 9e449fc29..65a2ed695 100644 --- a/crates/rayexec_execution/src/functions/table/mod.rs +++ b/crates/rayexec_execution/src/functions/table/mod.rs @@ -8,14 +8,14 @@ use std::sync::Arc; use dyn_clone::DynClone; use futures::future::BoxFuture; use inout::TableInOutFunction; -use rayexec_bullet::field::Schema; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::{RayexecError, Result}; use rayexec_io::location::{AccessConfig, FileLocation}; use rayexec_io::s3::credentials::AwsCredentials; use rayexec_io::s3::S3Location; use super::FunctionInfo; +use crate::arrays::field::Schema; +use crate::arrays::scalar::OwnedScalarValue; use crate::database::DatabaseContext; use crate::expr::Expression; use crate::logical::binder::table_list::TableList; diff --git a/crates/rayexec_execution/src/hybrid/buffer.rs b/crates/rayexec_execution/src/hybrid/buffer.rs index 63b282b5a..ffba013b8 100644 --- a/crates/rayexec_execution/src/hybrid/buffer.rs +++ b/crates/rayexec_execution/src/hybrid/buffer.rs @@ -7,12 +7,12 @@ use std::task::{Context, Poll, Waker}; use dashmap::DashMap; use futures::future::BoxFuture; use parking_lot::{Mutex, RwLock}; -use rayexec_bullet::batch::Batch; use rayexec_error::{RayexecError, Result}; use tracing::debug; use uuid::Uuid; use super::client::{IpcBatch, PullStatus}; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::execution::intermediate::pipeline::StreamId; use crate::execution::operators::sink::{PartitionSink, SinkOperation}; diff --git a/crates/rayexec_execution/src/hybrid/client.rs b/crates/rayexec_execution/src/hybrid/client.rs index 87ab06299..a9d430a4f 100644 --- a/crates/rayexec_execution/src/hybrid/client.rs +++ b/crates/rayexec_execution/src/hybrid/client.rs @@ -1,10 +1,5 @@ use std::fmt::Debug; -use std::io::Cursor; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::field::{Field, Schema}; -use rayexec_bullet::ipc::stream::{StreamReader, StreamWriter}; -use rayexec_bullet::ipc::IpcConfig; use rayexec_error::{OptionExt, RayexecError, Result, ResultExt}; use rayexec_io::http::reqwest::header::{HeaderValue, CONTENT_TYPE}; use rayexec_io::http::reqwest::{Method, Request, StatusCode}; @@ -15,6 +10,8 @@ use serde::{Deserialize, Serialize}; use url::{Host, Url}; use uuid::Uuid; +use crate::arrays::batch::Batch; +use crate::arrays::field::Schema; use crate::database::DatabaseContext; use crate::execution::intermediate::pipeline::{IntermediatePipelineGroup, StreamId}; use crate::logical::resolver::resolve_context::ResolveContext; @@ -320,36 +317,38 @@ impl ProtoConv for IpcBatch { type ProtoType = rayexec_proto::generated::array::IpcStreamBatch; fn to_proto(&self) -> Result { - let buf = Vec::new(); + unimplemented!() + // let buf = Vec::new(); - // Field names don't matter. A full schema is included just for - // compatability with arrow ipc, but we only care about the data types. - let schema = Schema::new( - self.0 - .columns() - .iter() - .map(|c| Field::new("", c.datatype().clone(), true)), - ); + // // Field names don't matter. A full schema is included just for + // // compatability with arrow ipc, but we only care about the data types. + // let schema = Schema::new( + // self.0 + // .columns() + // .iter() + // .map(|c| Field::new("", c.datatype().clone(), true)), + // ); - let mut writer = StreamWriter::try_new(buf, &schema, IpcConfig {})?; - writer.write_batch(&self.0)?; + // let mut writer = StreamWriter::try_new(buf, &schema, IpcConfig {})?; + // writer.write_batch(&self.0)?; - let buf = writer.into_writer(); + // let buf = writer.into_writer(); - Ok(Self::ProtoType { ipc: buf }) + // Ok(Self::ProtoType { ipc: buf }) } - fn from_proto(proto: Self::ProtoType) -> Result { - let mut reader = StreamReader::try_new(Cursor::new(proto.ipc), IpcConfig {})?; - let batch = reader - .try_next_batch()? - .ok_or_else(|| RayexecError::new("Missing IPC batch"))?; + fn from_proto(_proto: Self::ProtoType) -> Result { + unimplemented!() + // let mut reader = StreamReader::try_new(Cursor::new(proto.ipc), IpcConfig {})?; + // let batch = reader + // .try_next_batch()? + // .ok_or_else(|| RayexecError::new("Missing IPC batch"))?; - if reader.try_next_batch()?.is_some() { - return Err(RayexecError::new("Received too many IPC batches")); - } + // if reader.try_next_batch()?.is_some() { + // return Err(RayexecError::new("Received too many IPC batches")); + // } - Ok(Self(batch)) + // Ok(Self(batch)) } } diff --git a/crates/rayexec_execution/src/hybrid/stream.rs b/crates/rayexec_execution/src/hybrid/stream.rs index c09eaf914..c997eb591 100644 --- a/crates/rayexec_execution/src/hybrid/stream.rs +++ b/crates/rayexec_execution/src/hybrid/stream.rs @@ -1,11 +1,11 @@ use std::sync::Arc; use futures::future::BoxFuture; -use rayexec_bullet::batch::Batch; use rayexec_error::Result; use rayexec_io::http::HttpClient; use super::client::{HybridClient, PullStatus}; +use crate::arrays::batch::Batch; use crate::database::DatabaseContext; use crate::execution::intermediate::pipeline::StreamId; use crate::execution::operators::sink::{PartitionSink, SinkOperation}; diff --git a/crates/rayexec_execution/src/lib.rs b/crates/rayexec_execution/src/lib.rs index 36d966315..5c067bc7c 100644 --- a/crates/rayexec_execution/src/lib.rs +++ b/crates/rayexec_execution/src/lib.rs @@ -1,3 +1,4 @@ +pub mod arrays; pub mod config; pub mod database; pub mod datasource; diff --git a/crates/rayexec_execution/src/logical/binder/bind_context.rs b/crates/rayexec_execution/src/logical/binder/bind_context.rs index 1a0d4c743..ad89931b4 100644 --- a/crates/rayexec_execution/src/logical/binder/bind_context.rs +++ b/crates/rayexec_execution/src/logical/binder/bind_context.rs @@ -1,11 +1,11 @@ use std::collections::{HashMap, HashSet}; use std::fmt; -use rayexec_bullet::datatype::DataType; use rayexec_error::{RayexecError, Result}; use super::bind_query::BoundQuery; use super::table_list::{Table, TableAlias, TableList, TableRef}; +use crate::arrays::datatype::DataType; use crate::expr::Expression; use crate::logical::operator::{LogicalNode, LogicalOperator}; diff --git a/crates/rayexec_execution/src/logical/binder/bind_copy.rs b/crates/rayexec_execution/src/logical/binder/bind_copy.rs index 2a788cadd..d1248dc81 100644 --- a/crates/rayexec_execution/src/logical/binder/bind_copy.rs +++ b/crates/rayexec_execution/src/logical/binder/bind_copy.rs @@ -1,5 +1,3 @@ -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::field::{Field, Schema}; use rayexec_error::{RayexecError, Result}; use rayexec_io::location::FileLocation; use rayexec_parser::ast; @@ -7,6 +5,8 @@ use rayexec_parser::ast; use super::bind_context::{BindContext, BindScopeRef}; use super::bind_query::bind_from::BoundFrom; use super::bind_query::BoundQuery; +use crate::arrays::datatype::DataType; +use crate::arrays::field::{Field, Schema}; use crate::functions::copy::CopyToFunction; use crate::logical::binder::bind_query::bind_from::FromBinder; use crate::logical::binder::bind_query::QueryBinder; diff --git a/crates/rayexec_execution/src/logical/binder/bind_create_table.rs b/crates/rayexec_execution/src/logical/binder/bind_create_table.rs index 9f6ee3c86..60a2c088c 100644 --- a/crates/rayexec_execution/src/logical/binder/bind_create_table.rs +++ b/crates/rayexec_execution/src/logical/binder/bind_create_table.rs @@ -1,9 +1,9 @@ -use rayexec_bullet::field::Field; use rayexec_error::{RayexecError, Result}; use rayexec_parser::ast; use super::bind_context::{BindContext, BindScopeRef}; use super::bind_query::BoundQuery; +use crate::arrays::field::Field; use crate::database::create::OnConflict; use crate::logical::binder::bind_query::QueryBinder; use crate::logical::resolver::resolve_context::ResolveContext; diff --git a/crates/rayexec_execution/src/logical/binder/bind_describe.rs b/crates/rayexec_execution/src/logical/binder/bind_describe.rs index b6da1f366..b105bdf19 100644 --- a/crates/rayexec_execution/src/logical/binder/bind_describe.rs +++ b/crates/rayexec_execution/src/logical/binder/bind_describe.rs @@ -1,9 +1,9 @@ -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::field::{Field, Schema}; use rayexec_error::Result; use rayexec_parser::ast; use super::bind_context::{BindContext, BindScopeRef}; +use crate::arrays::datatype::DataType; +use crate::arrays::field::{Field, Schema}; use crate::logical::binder::bind_query::bind_from::FromBinder; use crate::logical::binder::bind_query::QueryBinder; use crate::logical::logical_describe::LogicalDescribe; diff --git a/crates/rayexec_execution/src/logical/binder/bind_explain.rs b/crates/rayexec_execution/src/logical/binder/bind_explain.rs index 977df25d6..c0fe8835d 100644 --- a/crates/rayexec_execution/src/logical/binder/bind_explain.rs +++ b/crates/rayexec_execution/src/logical/binder/bind_explain.rs @@ -1,9 +1,9 @@ -use rayexec_bullet::datatype::DataType; use rayexec_error::Result; use rayexec_parser::ast; use super::bind_context::{BindContext, BindScopeRef}; use super::bind_query::BoundQuery; +use crate::arrays::datatype::DataType; use crate::logical::binder::bind_query::QueryBinder; use crate::logical::logical_explain::ExplainFormat; use crate::logical::resolver::resolve_context::ResolveContext; diff --git a/crates/rayexec_execution/src/logical/binder/bind_insert.rs b/crates/rayexec_execution/src/logical/binder/bind_insert.rs index 38f9f945c..8f778cd80 100644 --- a/crates/rayexec_execution/src/logical/binder/bind_insert.rs +++ b/crates/rayexec_execution/src/logical/binder/bind_insert.rs @@ -1,10 +1,10 @@ -use rayexec_bullet::datatype::DataType; use rayexec_error::{RayexecError, Result}; use rayexec_parser::ast; use super::bind_context::{BindContext, BindScopeRef}; use super::bind_query::BoundQuery; use super::table_list::TableRef; +use crate::arrays::datatype::DataType; use crate::expr::cast_expr::CastExpr; use crate::expr::column_expr::ColumnExpr; use crate::expr::Expression; diff --git a/crates/rayexec_execution/src/logical/binder/bind_query/bind_from.rs b/crates/rayexec_execution/src/logical/binder/bind_query/bind_from.rs index 87d07f0aa..e04d847a3 100644 --- a/crates/rayexec_execution/src/logical/binder/bind_query/bind_from.rs +++ b/crates/rayexec_execution/src/logical/binder/bind_query/bind_from.rs @@ -1,11 +1,11 @@ use std::collections::{HashMap, HashSet}; use std::sync::Arc; -use rayexec_bullet::datatype::DataType; use rayexec_error::{not_implemented, RayexecError, Result}; use rayexec_parser::ast; use super::{BoundQuery, QueryBinder}; +use crate::arrays::datatype::DataType; use crate::database::catalog_entry::CatalogEntry; use crate::expr::column_expr::ColumnExpr; use crate::expr::comparison_expr::{ComparisonExpr, ComparisonOperator}; diff --git a/crates/rayexec_execution/src/logical/binder/bind_query/bind_select.rs b/crates/rayexec_execution/src/logical/binder/bind_query/bind_select.rs index 53fadadd4..8782c2cd5 100644 --- a/crates/rayexec_execution/src/logical/binder/bind_query/bind_select.rs +++ b/crates/rayexec_execution/src/logical/binder/bind_query/bind_select.rs @@ -155,9 +155,8 @@ impl<'a> SelectBinder<'a> { #[cfg(test)] mod tests { - use rayexec_bullet::datatype::DataType; - use super::*; + use crate::arrays::datatype::DataType; use crate::logical::binder::bind_context::testutil::columns_in_scope; #[test] diff --git a/crates/rayexec_execution/src/logical/binder/bind_query/bind_values.rs b/crates/rayexec_execution/src/logical/binder/bind_query/bind_values.rs index cbb970033..1b4ce9063 100644 --- a/crates/rayexec_execution/src/logical/binder/bind_query/bind_values.rs +++ b/crates/rayexec_execution/src/logical/binder/bind_query/bind_values.rs @@ -1,7 +1,7 @@ -use rayexec_bullet::datatype::DataType; use rayexec_error::{RayexecError, Result}; use rayexec_parser::ast; +use crate::arrays::datatype::DataType; use crate::expr::cast_expr::CastExpr; use crate::expr::Expression; use crate::logical::binder::bind_context::{BindContext, BindScopeRef}; diff --git a/crates/rayexec_execution/src/logical/binder/bind_query/select_expr_expander.rs b/crates/rayexec_execution/src/logical/binder/bind_query/select_expr_expander.rs index 00f7410e4..0ac4a44c7 100644 --- a/crates/rayexec_execution/src/logical/binder/bind_query/select_expr_expander.rs +++ b/crates/rayexec_execution/src/logical/binder/bind_query/select_expr_expander.rs @@ -292,9 +292,9 @@ impl<'a> SelectExprExpander<'a> { #[cfg(test)] mod tests { use ast::ObjectReference; - use rayexec_bullet::datatype::DataType; use super::*; + use crate::arrays::datatype::DataType; #[test] fn expand_none() { diff --git a/crates/rayexec_execution/src/logical/binder/bind_set.rs b/crates/rayexec_execution/src/logical/binder/bind_set.rs index b37516ef6..044dbae36 100644 --- a/crates/rayexec_execution/src/logical/binder/bind_set.rs +++ b/crates/rayexec_execution/src/logical/binder/bind_set.rs @@ -1,9 +1,9 @@ -use rayexec_bullet::datatype::DataType; use rayexec_error::Result; use rayexec_parser::ast; use super::bind_context::{BindContext, BindScopeRef}; use super::column_binder::ErroringColumnBinder; +use crate::arrays::datatype::DataType; use crate::config::session::SessionConfig; use crate::logical::binder::expr_binder::{BaseExpressionBinder, RecursionContext}; use crate::logical::logical_set::{LogicalResetVar, LogicalSetVar, LogicalShowVar, VariableOrAll}; diff --git a/crates/rayexec_execution/src/logical/binder/constant_binder.rs b/crates/rayexec_execution/src/logical/binder/constant_binder.rs index d476bfd92..fa2baae40 100644 --- a/crates/rayexec_execution/src/logical/binder/constant_binder.rs +++ b/crates/rayexec_execution/src/logical/binder/constant_binder.rs @@ -1,10 +1,10 @@ use std::collections::HashMap; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::{RayexecError, Result}; use rayexec_parser::ast; use super::expr_binder::RecursionContext; +use crate::arrays::scalar::OwnedScalarValue; use crate::logical::binder::bind_context::BindContext; use crate::logical::binder::column_binder::ErroringColumnBinder; use crate::logical::binder::expr_binder::BaseExpressionBinder; diff --git a/crates/rayexec_execution/src/logical/binder/expr_binder.rs b/crates/rayexec_execution/src/logical/binder/expr_binder.rs index 9fc0cf5d9..b0b77e12a 100644 --- a/crates/rayexec_execution/src/logical/binder/expr_binder.rs +++ b/crates/rayexec_execution/src/logical/binder/expr_binder.rs @@ -1,12 +1,12 @@ use fmtutil::IntoDisplayableSlice; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::scalar::interval::Interval; -use rayexec_bullet::scalar::{OwnedScalarValue, ScalarValue}; use rayexec_error::{not_implemented, RayexecError, Result}; use rayexec_parser::ast::{self, QueryNode}; use super::bind_context::{BindContext, BindScopeRef}; use super::column_binder::ExpressionColumnBinder; +use crate::arrays::datatype::DataType; +use crate::arrays::scalar::interval::Interval; +use crate::arrays::scalar::{OwnedScalarValue, ScalarValue}; use crate::expr::aggregate_expr::AggregateExpr; use crate::expr::arith_expr::{ArithExpr, ArithOperator}; use crate::expr::case_expr::{CaseExpr, WhenThen}; diff --git a/crates/rayexec_execution/src/logical/binder/table_list.rs b/crates/rayexec_execution/src/logical/binder/table_list.rs index 9776b8fe3..67732d139 100644 --- a/crates/rayexec_execution/src/logical/binder/table_list.rs +++ b/crates/rayexec_execution/src/logical/binder/table_list.rs @@ -1,9 +1,10 @@ use std::fmt; -use rayexec_bullet::datatype::DataType; use rayexec_error::{RayexecError, Result}; use serde::{Deserialize, Serialize}; +use crate::arrays::datatype::DataType; + /// Reference to a table in a context. #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] pub struct TableRef { diff --git a/crates/rayexec_execution/src/logical/logical_attach.rs b/crates/rayexec_execution/src/logical/logical_attach.rs index 9933c1794..cd418924f 100644 --- a/crates/rayexec_execution/src/logical/logical_attach.rs +++ b/crates/rayexec_execution/src/logical/logical_attach.rs @@ -1,11 +1,11 @@ use std::collections::HashMap; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::Result; use super::binder::bind_context::BindContext; use super::binder::table_list::TableRef; use super::operator::{LogicalNode, Node}; +use crate::arrays::scalar::OwnedScalarValue; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; use crate::expr::Expression; diff --git a/crates/rayexec_execution/src/logical/logical_copy.rs b/crates/rayexec_execution/src/logical/logical_copy.rs index 3474b387e..13d1c981e 100644 --- a/crates/rayexec_execution/src/logical/logical_copy.rs +++ b/crates/rayexec_execution/src/logical/logical_copy.rs @@ -1,10 +1,10 @@ -use rayexec_bullet::field::Schema; use rayexec_error::Result; use rayexec_io::location::FileLocation; use super::binder::bind_context::BindContext; use super::binder::table_list::TableRef; use super::operator::{LogicalNode, Node}; +use crate::arrays::field::Schema; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; use crate::expr::Expression; use crate::functions::copy::CopyToFunction; diff --git a/crates/rayexec_execution/src/logical/logical_create.rs b/crates/rayexec_execution/src/logical/logical_create.rs index d14724b50..525ae6ded 100644 --- a/crates/rayexec_execution/src/logical/logical_create.rs +++ b/crates/rayexec_execution/src/logical/logical_create.rs @@ -1,9 +1,9 @@ -use rayexec_bullet::field::Field; use rayexec_error::Result; use super::binder::bind_context::BindContext; use super::binder::table_list::TableRef; use super::operator::{LogicalNode, Node}; +use crate::arrays::field::Field; use crate::database::create::OnConflict; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; use crate::expr::Expression; diff --git a/crates/rayexec_execution/src/logical/logical_describe.rs b/crates/rayexec_execution/src/logical/logical_describe.rs index e180102b7..1b38d927f 100644 --- a/crates/rayexec_execution/src/logical/logical_describe.rs +++ b/crates/rayexec_execution/src/logical/logical_describe.rs @@ -1,9 +1,9 @@ -use rayexec_bullet::field::Schema; use rayexec_error::Result; use super::binder::bind_context::BindContext; use super::binder::table_list::TableRef; use super::operator::{LogicalNode, Node}; +use crate::arrays::field::Schema; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; use crate::expr::Expression; diff --git a/crates/rayexec_execution/src/logical/logical_join.rs b/crates/rayexec_execution/src/logical/logical_join.rs index 0257e44d7..c0b718757 100644 --- a/crates/rayexec_execution/src/logical/logical_join.rs +++ b/crates/rayexec_execution/src/logical/logical_join.rs @@ -302,9 +302,8 @@ impl LogicalNode for Node { #[cfg(test)] mod tests { - use rayexec_bullet::scalar::ScalarValue; - use super::*; + use crate::arrays::scalar::ScalarValue; use crate::expr::literal_expr::LiteralExpr; #[test] diff --git a/crates/rayexec_execution/src/logical/logical_scan.rs b/crates/rayexec_execution/src/logical/logical_scan.rs index 56f1e2e46..c86777530 100644 --- a/crates/rayexec_execution/src/logical/logical_scan.rs +++ b/crates/rayexec_execution/src/logical/logical_scan.rs @@ -1,6 +1,5 @@ use std::sync::Arc; -use rayexec_bullet::datatype::DataType; use rayexec_error::Result; use super::binder::bind_context::BindContext; @@ -8,6 +7,7 @@ use super::binder::table_list::TableRef; use super::operator::{LogicalNode, Node}; use super::scan_filter::ScanFilter; use super::statistics::StatisticsValue; +use crate::arrays::datatype::DataType; use crate::database::catalog_entry::CatalogEntry; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; use crate::expr::Expression; diff --git a/crates/rayexec_execution/src/logical/logical_set.rs b/crates/rayexec_execution/src/logical/logical_set.rs index 111441a88..4c529adda 100644 --- a/crates/rayexec_execution/src/logical/logical_set.rs +++ b/crates/rayexec_execution/src/logical/logical_set.rs @@ -1,9 +1,9 @@ -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::Result; use super::binder::bind_context::BindContext; use super::binder::table_list::TableRef; use super::operator::{LogicalNode, Node}; +use crate::arrays::scalar::OwnedScalarValue; use crate::explain::explainable::{ExplainConfig, ExplainEntry, Explainable}; use crate::expr::Expression; diff --git a/crates/rayexec_execution/src/logical/planner/plan_from.rs b/crates/rayexec_execution/src/logical/planner/plan_from.rs index a6a028f65..4f4e79468 100644 --- a/crates/rayexec_execution/src/logical/planner/plan_from.rs +++ b/crates/rayexec_execution/src/logical/planner/plan_from.rs @@ -1,8 +1,8 @@ -use rayexec_bullet::scalar::ScalarValue; use rayexec_error::{RayexecError, Result}; use super::plan_query::QueryPlanner; use super::plan_subquery::SubqueryPlanner; +use crate::arrays::scalar::ScalarValue; use crate::expr::column_expr::ColumnExpr; use crate::expr::comparison_expr::ComparisonExpr; use crate::expr::literal_expr::LiteralExpr; diff --git a/crates/rayexec_execution/src/logical/planner/plan_subquery.rs b/crates/rayexec_execution/src/logical/planner/plan_subquery.rs index f73ce50be..50b636fbb 100644 --- a/crates/rayexec_execution/src/logical/planner/plan_subquery.rs +++ b/crates/rayexec_execution/src/logical/planner/plan_subquery.rs @@ -1,9 +1,9 @@ use std::collections::{BTreeSet, HashMap}; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::scalar::ScalarValue; use rayexec_error::{not_implemented, RayexecError, Result}; +use crate::arrays::datatype::DataType; +use crate::arrays::scalar::ScalarValue; use crate::expr::aggregate_expr::AggregateExpr; use crate::expr::column_expr::ColumnExpr; use crate::expr::comparison_expr::{ComparisonExpr, ComparisonOperator}; diff --git a/crates/rayexec_execution/src/logical/planner/plan_unnest.rs b/crates/rayexec_execution/src/logical/planner/plan_unnest.rs index bb6ab25b4..a51d5a07d 100644 --- a/crates/rayexec_execution/src/logical/planner/plan_unnest.rs +++ b/crates/rayexec_execution/src/logical/planner/plan_unnest.rs @@ -1,6 +1,6 @@ -use rayexec_bullet::datatype::DataType; use rayexec_error::Result; +use crate::arrays::datatype::DataType; use crate::expr::column_expr::ColumnExpr; use crate::expr::Expression; use crate::logical::binder::bind_context::BindContext; diff --git a/crates/rayexec_execution/src/logical/resolver/mod.rs b/crates/rayexec_execution/src/logical/resolver/mod.rs index df2c71a70..2da6f7d66 100644 --- a/crates/rayexec_execution/src/logical/resolver/mod.rs +++ b/crates/rayexec_execution/src/logical/resolver/mod.rs @@ -11,9 +11,6 @@ pub mod resolved_table_function; use std::collections::HashMap; use expr_resolver::ExpressionResolver; -use rayexec_bullet::datatype::{DataType, DecimalTypeMeta, TimeUnit, TimestampTypeMeta}; -use rayexec_bullet::scalar::decimal::{Decimal128Type, Decimal64Type, DecimalType}; -use rayexec_bullet::scalar::{OwnedScalarValue, ScalarValue}; use rayexec_error::{OptionExt, RayexecError, Result}; use rayexec_io::location::FileLocation; use rayexec_parser::ast::{self, ColumnDef, ObjectReference}; @@ -31,6 +28,9 @@ use serde::{Deserialize, Serialize}; use super::binder::constant_binder::ConstantBinder; use super::binder::expr_binder::BaseExpressionBinder; use super::binder::table_list::TableAlias; +use crate::arrays::datatype::{DataType, DecimalTypeMeta, TimeUnit, TimestampTypeMeta}; +use crate::arrays::scalar::decimal::{Decimal128Type, Decimal64Type, DecimalType}; +use crate::arrays::scalar::{OwnedScalarValue, ScalarValue}; use crate::database::builtin_views::{ BuiltinView, SHOW_DATABASES_VIEW, diff --git a/crates/rayexec_execution/src/logical/resolver/resolved_table.rs b/crates/rayexec_execution/src/logical/resolver/resolved_table.rs index 023813758..3076e872c 100644 --- a/crates/rayexec_execution/src/logical/resolver/resolved_table.rs +++ b/crates/rayexec_execution/src/logical/resolver/resolved_table.rs @@ -111,10 +111,10 @@ impl ProtoConv for UnresolvedTableReference { #[cfg(test)] mod tests { - use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_proto::testutil::assert_proto_roundtrip; use super::*; + use crate::arrays::scalar::OwnedScalarValue; #[test] fn roundtrip_unbound_table_reference() { diff --git a/crates/rayexec_execution/src/logical/resolver/resolved_table_function.rs b/crates/rayexec_execution/src/logical/resolver/resolved_table_function.rs index 295d383d1..c73cc0290 100644 --- a/crates/rayexec_execution/src/logical/resolver/resolved_table_function.rs +++ b/crates/rayexec_execution/src/logical/resolver/resolved_table_function.rs @@ -1,10 +1,10 @@ use std::collections::HashMap; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::Result; use rayexec_parser::ast; use rayexec_proto::ProtoConv; +use crate::arrays::scalar::OwnedScalarValue; use crate::database::DatabaseContext; use crate::functions::table::{PlannedTableFunction, TableFunction}; use crate::proto::DatabaseProtoConv; diff --git a/crates/rayexec_execution/src/logical/scan_filter.rs b/crates/rayexec_execution/src/logical/scan_filter.rs index 003d5ee24..f8a2a1091 100644 --- a/crates/rayexec_execution/src/logical/scan_filter.rs +++ b/crates/rayexec_execution/src/logical/scan_filter.rs @@ -1,5 +1,4 @@ -use rayexec_bullet::scalar::OwnedScalarValue; - +use crate::arrays::scalar::OwnedScalarValue; use crate::expr::comparison_expr::ComparisonOperator; /// A simplified filter that can be pushed into a scan. diff --git a/crates/rayexec_execution/src/optimizer/expr_rewrite/const_fold.rs b/crates/rayexec_execution/src/optimizer/expr_rewrite/const_fold.rs index 440464394..ebf145831 100644 --- a/crates/rayexec_execution/src/optimizer/expr_rewrite/const_fold.rs +++ b/crates/rayexec_execution/src/optimizer/expr_rewrite/const_fold.rs @@ -1,7 +1,7 @@ -use rayexec_bullet::batch::Batch; use rayexec_error::{RayexecError, Result}; use super::ExpressionRewriteRule; +use crate::arrays::batch::Batch; use crate::expr::literal_expr::LiteralExpr; use crate::expr::physical::planner::PhysicalExpressionPlanner; use crate::expr::Expression; @@ -58,9 +58,8 @@ fn maybe_fold(table_list: &TableList, expr: &mut Expression) -> Result<()> { #[cfg(test)] mod tests { - use rayexec_bullet::datatype::DataType; - use super::*; + use crate::arrays::datatype::DataType; use crate::expr::{add, and, cast, col_ref, lit}; #[test] diff --git a/crates/rayexec_execution/src/optimizer/filter_pushdown/split.rs b/crates/rayexec_execution/src/optimizer/filter_pushdown/split.rs index 56a0cb0ae..7896d07ef 100644 --- a/crates/rayexec_execution/src/optimizer/filter_pushdown/split.rs +++ b/crates/rayexec_execution/src/optimizer/filter_pushdown/split.rs @@ -19,9 +19,8 @@ pub fn split_conjunction(expr: Expression, out: &mut Vec) { #[cfg(test)] mod tests { - use rayexec_bullet::scalar::ScalarValue; - use super::*; + use crate::arrays::scalar::ScalarValue; use crate::expr::literal_expr::LiteralExpr; #[test] diff --git a/crates/rayexec_execution/src/storage/memory.rs b/crates/rayexec_execution/src/storage/memory.rs index f095330e1..d0d1efa7b 100644 --- a/crates/rayexec_execution/src/storage/memory.rs +++ b/crates/rayexec_execution/src/storage/memory.rs @@ -2,10 +2,10 @@ use std::sync::Arc; use futures::future::BoxFuture; use parking_lot::Mutex; -use rayexec_bullet::batch::Batch; use rayexec_error::{RayexecError, Result}; use super::table_storage::{DataTable, DataTableScan, ProjectedScan, Projections, TableStorage}; +use crate::arrays::batch::Batch; use crate::database::catalog_entry::CatalogEntry; use crate::execution::computed_batch::ComputedBatches; use crate::execution::operators::sink::PartitionSink; diff --git a/crates/rayexec_execution/src/storage/table_storage.rs b/crates/rayexec_execution/src/storage/table_storage.rs index 2f79ed184..258f69cff 100644 --- a/crates/rayexec_execution/src/storage/table_storage.rs +++ b/crates/rayexec_execution/src/storage/table_storage.rs @@ -1,10 +1,10 @@ use std::fmt::Debug; use futures::future::BoxFuture; -use rayexec_bullet::batch::Batch; use rayexec_error::{RayexecError, Result}; use rayexec_proto::ProtoConv; +use crate::arrays::batch::Batch; use crate::database::catalog_entry::CatalogEntry; use crate::execution::operators::sink::PartitionSink; diff --git a/crates/rayexec_iceberg/Cargo.toml b/crates/rayexec_iceberg/Cargo.toml index c53e207f1..452a270ee 100644 --- a/crates/rayexec_iceberg/Cargo.toml +++ b/crates/rayexec_iceberg/Cargo.toml @@ -6,7 +6,6 @@ edition.workspace = true [dependencies] rayexec_proto = { path = '../rayexec_proto' } rayexec_execution = { path = '../rayexec_execution' } -rayexec_bullet = { path = '../rayexec_bullet' } rayexec_error = { path = '../rayexec_error' } rayexec_io = { path = '../rayexec_io' } rayexec_parquet = { path = '../rayexec_parquet' } diff --git a/crates/rayexec_iceberg/src/datatable.rs b/crates/rayexec_iceberg/src/datatable.rs index f4817deee..1be505567 100644 --- a/crates/rayexec_iceberg/src/datatable.rs +++ b/crates/rayexec_iceberg/src/datatable.rs @@ -1,8 +1,8 @@ use std::sync::Arc; use futures::future::BoxFuture; -use rayexec_bullet::batch::Batch; use rayexec_error::Result; +use rayexec_execution::arrays::batch::Batch; use rayexec_execution::storage::table_storage::{DataTable, DataTableScan, Projections}; use crate::table::{Table, TableScan}; diff --git a/crates/rayexec_iceberg/src/read_iceberg.rs b/crates/rayexec_iceberg/src/read_iceberg.rs index bfc6f3ae3..7d53b12f5 100644 --- a/crates/rayexec_iceberg/src/read_iceberg.rs +++ b/crates/rayexec_iceberg/src/read_iceberg.rs @@ -3,9 +3,9 @@ use std::sync::Arc; use futures::future::BoxFuture; use futures::FutureExt; -use rayexec_bullet::datatype::DataTypeId; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::Result; +use rayexec_execution::arrays::datatype::DataTypeId; +use rayexec_execution::arrays::scalar::OwnedScalarValue; use rayexec_execution::database::DatabaseContext; use rayexec_execution::expr; use rayexec_execution::functions::table::{ diff --git a/crates/rayexec_iceberg/src/spec/schema.rs b/crates/rayexec_iceberg/src/spec/schema.rs index 737aba9b0..83fc4f35b 100644 --- a/crates/rayexec_iceberg/src/spec/schema.rs +++ b/crates/rayexec_iceberg/src/spec/schema.rs @@ -1,15 +1,15 @@ use std::str::FromStr; use std::sync::LazyLock; -use rayexec_bullet::datatype::{ +use rayexec_error::{not_implemented, RayexecError, Result}; +use rayexec_execution::arrays::datatype::{ DataType, DecimalTypeMeta, ListTypeMeta, TimeUnit, TimestampTypeMeta, }; -use rayexec_bullet::field::{Field, Schema as BulletSchema}; -use rayexec_error::{not_implemented, RayexecError, Result}; +use rayexec_execution::arrays::field::{Field, Schema as BulletSchema}; use regex::Regex; use serde::{de, Deserialize, Deserializer}; diff --git a/crates/rayexec_iceberg/src/table.rs b/crates/rayexec_iceberg/src/table.rs index 13d6bd99f..f5a08175a 100644 --- a/crates/rayexec_iceberg/src/table.rs +++ b/crates/rayexec_iceberg/src/table.rs @@ -4,9 +4,9 @@ use std::io::Cursor; use std::sync::Arc; use futures::StreamExt; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::field::Schema; use rayexec_error::{RayexecError, Result, ResultExt}; +use rayexec_execution::arrays::batch::Batch; +use rayexec_execution::arrays::field::Schema; use rayexec_execution::storage::table_storage::Projections; use rayexec_io::location::{AccessConfig, FileLocation}; use rayexec_io::{FileProvider, FileSource, FileSourceExt}; diff --git a/crates/rayexec_parquet/Cargo.toml b/crates/rayexec_parquet/Cargo.toml index bd1687d5d..fe434274d 100644 --- a/crates/rayexec_parquet/Cargo.toml +++ b/crates/rayexec_parquet/Cargo.toml @@ -6,7 +6,6 @@ edition.workspace = true [dependencies] rayexec_proto = { path = '../rayexec_proto' } rayexec_execution = { path = '../rayexec_execution' } -rayexec_bullet = { path = '../rayexec_bullet' } rayexec_error = { path = '../rayexec_error' } rayexec_io = { path = '../rayexec_io' } parquet = { path = '../parquet' } diff --git a/crates/rayexec_parquet/src/copy_to.rs b/crates/rayexec_parquet/src/copy_to.rs index 096db7cfc..1bf3fbb42 100644 --- a/crates/rayexec_parquet/src/copy_to.rs +++ b/crates/rayexec_parquet/src/copy_to.rs @@ -2,9 +2,9 @@ use std::fmt; use futures::future::BoxFuture; use futures::FutureExt; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::field::Schema; use rayexec_error::Result; +use rayexec_execution::arrays::batch::Batch; +use rayexec_execution::arrays::field::Schema; use rayexec_execution::execution::operators::sink::PartitionSink; use rayexec_execution::functions::copy::CopyToFunction; use rayexec_execution::runtime::Runtime; diff --git a/crates/rayexec_parquet/src/functions/datatable.rs b/crates/rayexec_parquet/src/functions/datatable.rs index fcdc12cb2..bf00983bd 100644 --- a/crates/rayexec_parquet/src/functions/datatable.rs +++ b/crates/rayexec_parquet/src/functions/datatable.rs @@ -3,9 +3,9 @@ use std::fmt::{self, Debug}; use std::sync::Arc; use futures::future::BoxFuture; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::field::Schema; use rayexec_error::Result; +use rayexec_execution::arrays::batch::Batch; +use rayexec_execution::arrays::field::Schema; use rayexec_execution::runtime::Runtime; use rayexec_execution::storage::table_storage::{DataTable, DataTableScan, Projections}; use rayexec_io::location::{AccessConfig, FileLocation}; diff --git a/crates/rayexec_parquet/src/functions/read_parquet.rs b/crates/rayexec_parquet/src/functions/read_parquet.rs index 697f9119c..f5e685caf 100644 --- a/crates/rayexec_parquet/src/functions/read_parquet.rs +++ b/crates/rayexec_parquet/src/functions/read_parquet.rs @@ -3,9 +3,9 @@ use std::sync::Arc; use futures::future::BoxFuture; use futures::FutureExt; -use rayexec_bullet::datatype::DataTypeId; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::Result; +use rayexec_execution::arrays::datatype::DataTypeId; +use rayexec_execution::arrays::scalar::OwnedScalarValue; use rayexec_execution::database::DatabaseContext; use rayexec_execution::expr; use rayexec_execution::functions::table::{ diff --git a/crates/rayexec_parquet/src/reader/mod.rs b/crates/rayexec_parquet/src/reader/mod.rs index 5c2793408..15d8c4106 100644 --- a/crates/rayexec_parquet/src/reader/mod.rs +++ b/crates/rayexec_parquet/src/reader/mod.rs @@ -18,12 +18,12 @@ use parquet::data_type::Int96; use parquet::file::reader::{ChunkReader, Length, SerializedPageReader}; use parquet::schema::types::ColumnDescPtr; use primitive::PrimitiveArrayReader; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::bitmap::Bitmap; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::field::Schema; use rayexec_error::{RayexecError, Result, ResultExt}; +use rayexec_execution::arrays::array::{Array, ArrayData}; +use rayexec_execution::arrays::batch::Batch; +use rayexec_execution::arrays::bitmap::Bitmap; +use rayexec_execution::arrays::datatype::DataType; +use rayexec_execution::arrays::field::Schema; use rayexec_execution::storage::table_storage::Projections; use rayexec_io::FileSource; use varlen::VarlenArrayReader; diff --git a/crates/rayexec_parquet/src/reader/primitive.rs b/crates/rayexec_parquet/src/reader/primitive.rs index eec0c71cd..81e8c615f 100644 --- a/crates/rayexec_parquet/src/reader/primitive.rs +++ b/crates/rayexec_parquet/src/reader/primitive.rs @@ -3,13 +3,13 @@ use parquet::column::page::PageReader; use parquet::column::reader::basic::BasicColumnValueDecoder; use parquet::data_type::{DataType as ParquetDataType, Int96}; use parquet::schema::types::ColumnDescPtr; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::bitmap::Bitmap; -use rayexec_bullet::compute::cast::array::cast_array; -use rayexec_bullet::compute::cast::behavior::CastFailBehavior; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::storage::{BooleanStorage, PrimitiveStorage}; use rayexec_error::{RayexecError, Result}; +use rayexec_execution::arrays::array::{Array, ArrayData}; +use rayexec_execution::arrays::bitmap::Bitmap; +use rayexec_execution::arrays::compute::cast::array::cast_array; +use rayexec_execution::arrays::compute::cast::behavior::CastFailBehavior; +use rayexec_execution::arrays::datatype::DataType; +use rayexec_execution::arrays::storage::{BooleanStorage, PrimitiveStorage}; use super::{ def_levels_into_bitmap, diff --git a/crates/rayexec_parquet/src/reader/varlen.rs b/crates/rayexec_parquet/src/reader/varlen.rs index 292a19708..5091e6f19 100644 --- a/crates/rayexec_parquet/src/reader/varlen.rs +++ b/crates/rayexec_parquet/src/reader/varlen.rs @@ -4,10 +4,10 @@ use parquet::column::reader::view::ViewColumnValueDecoder; use parquet::data_type::{ByteArray, DataType as ParquetDataType}; use parquet::decoding::view::ViewBuffer; use parquet::schema::types::ColumnDescPtr; -use rayexec_bullet::array::Array; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::builder::ArrayDataBuffer; use rayexec_error::{RayexecError, Result}; +use rayexec_execution::arrays::array::Array; +use rayexec_execution::arrays::datatype::DataType; +use rayexec_execution::arrays::executor::builder::ArrayDataBuffer; use super::{def_levels_into_bitmap, insert_null_values, ArrayBuilder, ValuesReader}; @@ -62,7 +62,7 @@ where } } } - (p_other, d_other) => return Err(RayexecError::new(format!("Unknown conversion from parquet to bullet type in varlen reader; parqet: {p_other}, bullet: {d_other}"))) + (p_other, d_other) => return Err(RayexecError::new(format!("Unknown conversion from parquet to glaredb type in varlen reader; parqet: {p_other}, bullet: {d_other}"))) }; Ok(arr) diff --git a/crates/rayexec_parquet/src/schema.rs b/crates/rayexec_parquet/src/schema.rs index 5652dda54..69ded4223 100644 --- a/crates/rayexec_parquet/src/schema.rs +++ b/crates/rayexec_parquet/src/schema.rs @@ -9,16 +9,16 @@ use parquet::basic::{ }; use parquet::format::{MicroSeconds, MilliSeconds, NanoSeconds}; use parquet::schema::types::{BasicTypeInfo, SchemaDescriptor, Type}; -use rayexec_bullet::datatype::{ +use rayexec_error::{not_implemented, RayexecError, Result, ResultExt}; +use rayexec_execution::arrays::datatype::{ DataType, DecimalTypeMeta, ListTypeMeta, TimeUnit, TimestampTypeMeta, }; -use rayexec_bullet::field::{Field, Schema}; -use rayexec_bullet::scalar::decimal::{Decimal128Type, Decimal64Type, DecimalType}; -use rayexec_error::{not_implemented, RayexecError, Result, ResultExt}; +use rayexec_execution::arrays::field::{Field, Schema}; +use rayexec_execution::arrays::scalar::decimal::{Decimal128Type, Decimal64Type, DecimalType}; /// Converts a parquet schema to a bullet schema. /// diff --git a/crates/rayexec_parquet/src/writer/mod.rs b/crates/rayexec_parquet/src/writer/mod.rs index d577c6723..1e380b9df 100644 --- a/crates/rayexec_parquet/src/writer/mod.rs +++ b/crates/rayexec_parquet/src/writer/mod.rs @@ -11,13 +11,13 @@ use parquet::file::properties::{WriterProperties, WriterPropertiesPtr}; use parquet::file::writer::{write_page, SerializedFileWriter}; use parquet::format::FileMetaData; use parquet::schema::types::SchemaDescriptor; -use rayexec_bullet::array::{Array, ArrayData}; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::executor::physical_type::{PhysicalBinary, PhysicalStorage}; -use rayexec_bullet::field::Schema; -use rayexec_bullet::storage::AddressableStorage; use rayexec_error::{not_implemented, OptionExt, RayexecError, Result, ResultExt}; +use rayexec_execution::arrays::array::{Array, ArrayData}; +use rayexec_execution::arrays::batch::Batch; +use rayexec_execution::arrays::datatype::DataType; +use rayexec_execution::arrays::executor::physical_type::{PhysicalBinary, PhysicalStorage}; +use rayexec_execution::arrays::field::Schema; +use rayexec_execution::arrays::storage::AddressableStorage; use rayexec_io::FileSink; use crate::schema::to_parquet_schema; diff --git a/crates/rayexec_postgres/Cargo.toml b/crates/rayexec_postgres/Cargo.toml index fa415d04c..4e53947f6 100644 --- a/crates/rayexec_postgres/Cargo.toml +++ b/crates/rayexec_postgres/Cargo.toml @@ -6,7 +6,6 @@ edition.workspace = true [dependencies] rayexec_proto = { path = '../rayexec_proto' } rayexec_execution = { path = '../rayexec_execution' } -rayexec_bullet = { path = '../rayexec_bullet' } rayexec_error = { path = '../rayexec_error' } tokio-postgres = { version = "0.7.10" } futures = { workspace = true } diff --git a/crates/rayexec_postgres/src/decimal.rs b/crates/rayexec_postgres/src/decimal.rs index 530b8818c..3670d90c3 100644 --- a/crates/rayexec_postgres/src/decimal.rs +++ b/crates/rayexec_postgres/src/decimal.rs @@ -1,5 +1,5 @@ -use rayexec_bullet::scalar::decimal::Decimal128Scalar; use rayexec_error::RayexecError; +use rayexec_execution::arrays::scalar::decimal::Decimal128Scalar; use tokio_postgres::types::{FromSql, Type}; const NBASE: i128 = 10000; diff --git a/crates/rayexec_postgres/src/lib.rs b/crates/rayexec_postgres/src/lib.rs index db298047a..0f5e1e344 100644 --- a/crates/rayexec_postgres/src/lib.rs +++ b/crates/rayexec_postgres/src/lib.rs @@ -10,12 +10,12 @@ use decimal::PostgresDecimal; use futures::future::BoxFuture; use futures::stream::BoxStream; use futures::{StreamExt, TryFutureExt}; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::datatype::{DataType, DecimalTypeMeta}; -use rayexec_bullet::field::Field; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::{RayexecError, Result, ResultExt}; +use rayexec_execution::arrays::array::Array; +use rayexec_execution::arrays::batch::Batch; +use rayexec_execution::arrays::datatype::{DataType, DecimalTypeMeta}; +use rayexec_execution::arrays::field::Field; +use rayexec_execution::arrays::scalar::OwnedScalarValue; use rayexec_execution::database::catalog_entry::{CatalogEntry, TableEntry}; use rayexec_execution::database::memory_catalog::MemoryCatalog; use rayexec_execution::datasource::{ diff --git a/crates/rayexec_postgres/src/read_postgres.rs b/crates/rayexec_postgres/src/read_postgres.rs index a3ed699da..5994b488e 100644 --- a/crates/rayexec_postgres/src/read_postgres.rs +++ b/crates/rayexec_postgres/src/read_postgres.rs @@ -3,10 +3,10 @@ use std::sync::Arc; use futures::future::BoxFuture; use futures::FutureExt; -use rayexec_bullet::datatype::DataTypeId; -use rayexec_bullet::field::Schema; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::{RayexecError, Result}; +use rayexec_execution::arrays::datatype::DataTypeId; +use rayexec_execution::arrays::field::Schema; +use rayexec_execution::arrays::scalar::OwnedScalarValue; use rayexec_execution::database::DatabaseContext; use rayexec_execution::expr; use rayexec_execution::functions::table::{ diff --git a/crates/rayexec_shell/Cargo.toml b/crates/rayexec_shell/Cargo.toml index 68839a255..29c0a9cab 100644 --- a/crates/rayexec_shell/Cargo.toml +++ b/crates/rayexec_shell/Cargo.toml @@ -6,7 +6,6 @@ edition.workspace = true [dependencies] rayexec_error = { path = '../rayexec_error' } rayexec_execution = { path = '../rayexec_execution' } -rayexec_bullet = { path = '../rayexec_bullet' } rayexec_parser = { path = '../rayexec_parser' } futures = { workspace = true } tracing = { workspace = true } diff --git a/crates/rayexec_shell/src/result_table.rs b/crates/rayexec_shell/src/result_table.rs index 6f59b2521..208c0f64e 100644 --- a/crates/rayexec_shell/src/result_table.rs +++ b/crates/rayexec_shell/src/result_table.rs @@ -4,12 +4,12 @@ use std::task::{Context, Poll}; use futures::stream::Stream; use futures::{StreamExt, TryStreamExt}; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::field::Schema; -use rayexec_bullet::format::pretty::table::PrettyTable; -use rayexec_bullet::row::ScalarRow; use rayexec_error::{RayexecError, Result}; +use rayexec_execution::arrays::array::Array; +use rayexec_execution::arrays::batch::Batch; +use rayexec_execution::arrays::field::Schema; +use rayexec_execution::arrays::format::pretty::table::PrettyTable; +use rayexec_execution::arrays::row::ScalarRow; use rayexec_execution::engine::profiler::PlanningProfileData; use rayexec_execution::engine::result::ExecutionResult; use rayexec_execution::execution::executable::profiler::ExecutionProfileData; diff --git a/crates/rayexec_slt/Cargo.toml b/crates/rayexec_slt/Cargo.toml index f63efb7ab..728e3cf0b 100644 --- a/crates/rayexec_slt/Cargo.toml +++ b/crates/rayexec_slt/Cargo.toml @@ -8,7 +8,6 @@ edition.workspace = true [dependencies] rayexec_error = { path = '../rayexec_error' } rayexec_execution = { path = '../rayexec_execution' } -rayexec_bullet = { path = '../rayexec_bullet' } rayexec_rt_native = { path = '../rayexec_rt_native' } rayexec_shell = { path = '../rayexec_shell' } libtest-mimic = "0.7.3" diff --git a/crates/rayexec_slt/src/convert.rs b/crates/rayexec_slt/src/convert.rs index 470d478ab..ca6611454 100644 --- a/crates/rayexec_slt/src/convert.rs +++ b/crates/rayexec_slt/src/convert.rs @@ -1,7 +1,7 @@ -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::field::Schema; -use rayexec_bullet::format::{FormatOptions, Formatter}; use rayexec_error::Result; +use rayexec_execution::arrays::datatype::DataType; +use rayexec_execution::arrays::field::Schema; +use rayexec_execution::arrays::format::{FormatOptions, Formatter}; use rayexec_shell::result_table::MaterializedResultTable; use sqllogictest::DefaultColumnType; diff --git a/crates/rayexec_unity_catalog/Cargo.toml b/crates/rayexec_unity_catalog/Cargo.toml index 8858aec80..9b4724cbc 100644 --- a/crates/rayexec_unity_catalog/Cargo.toml +++ b/crates/rayexec_unity_catalog/Cargo.toml @@ -5,7 +5,6 @@ edition.workspace = true [dependencies] rayexec_execution = { path = '../rayexec_execution' } -rayexec_bullet = { path = '../rayexec_bullet' } rayexec_io = { path = '../rayexec_io' } rayexec_error = { path = '../rayexec_error' } futures = { workspace = true } diff --git a/crates/rayexec_unity_catalog/src/functions.rs b/crates/rayexec_unity_catalog/src/functions.rs index 4764e3086..5fe88720a 100644 --- a/crates/rayexec_unity_catalog/src/functions.rs +++ b/crates/rayexec_unity_catalog/src/functions.rs @@ -6,12 +6,12 @@ use std::sync::Arc; use futures::future::BoxFuture; use futures::stream::BoxStream; use futures::{FutureExt, TryStreamExt}; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::datatype::{DataType, DataTypeId}; -use rayexec_bullet::field::{Field, Schema}; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::Result; +use rayexec_execution::arrays::array::Array; +use rayexec_execution::arrays::batch::Batch; +use rayexec_execution::arrays::datatype::{DataType, DataTypeId}; +use rayexec_execution::arrays::field::{Field, Schema}; +use rayexec_execution::arrays::scalar::OwnedScalarValue; use rayexec_execution::database::DatabaseContext; use rayexec_execution::expr; use rayexec_execution::functions::table::{ diff --git a/crates/rayexec_unity_catalog/src/lib.rs b/crates/rayexec_unity_catalog/src/lib.rs index bcda1310c..f0bb60093 100644 --- a/crates/rayexec_unity_catalog/src/lib.rs +++ b/crates/rayexec_unity_catalog/src/lib.rs @@ -10,8 +10,8 @@ use catalog::UnityCatalog; use connection::{UnityCatalogConnection, CATALOG_OPTION_KEY, ENDPOINT_OPTION_KEY}; use functions::{ListSchemasOperation, ListTablesOperation, UnityObjects}; use futures::future::BoxFuture; -use rayexec_bullet::scalar::OwnedScalarValue; use rayexec_error::Result; +use rayexec_execution::arrays::scalar::OwnedScalarValue; use rayexec_execution::datasource::{ take_option, DataSource, diff --git a/crates/rayexec_wasm/Cargo.toml b/crates/rayexec_wasm/Cargo.toml index 335d4fa2c..c3f8d296f 100644 --- a/crates/rayexec_wasm/Cargo.toml +++ b/crates/rayexec_wasm/Cargo.toml @@ -16,7 +16,6 @@ web-sys = { version = "0.3.69", features = [ ] } rayexec_execution = { path = '../rayexec_execution' } -rayexec_bullet = { path = '../rayexec_bullet' } rayexec_error = { path = '../rayexec_error' } rayexec_shell = { path = '../rayexec_shell' } rayexec_parquet = { path = '../rayexec_parquet' } diff --git a/crates/rayexec_wasm/src/session.rs b/crates/rayexec_wasm/src/session.rs index f2cddab15..0c3e693d3 100644 --- a/crates/rayexec_wasm/src/session.rs +++ b/crates/rayexec_wasm/src/session.rs @@ -1,9 +1,9 @@ use std::path::PathBuf; use std::rc::Rc; -use rayexec_bullet::format::{FormatOptions, Formatter}; use rayexec_csv::CsvDataSource; use rayexec_delta::DeltaDataSource; +use rayexec_execution::arrays::format::{FormatOptions, Formatter}; use rayexec_execution::datasource::{DataSourceBuilder, DataSourceRegistry, MemoryDataSource}; use rayexec_iceberg::IcebergDataSource; use rayexec_parquet::ParquetDataSource; @@ -182,10 +182,10 @@ impl WasmMaterializedColumn { #[cfg(test)] mod tests { - use rayexec_bullet::array::Array; - use rayexec_bullet::batch::Batch; - use rayexec_bullet::datatype::DataType; - use rayexec_bullet::field::{Field, Schema}; + use rayexec_execution::arrays::array::Array; + use rayexec_execution::arrays::batch::Batch; + use rayexec_execution::arrays::datatype::DataType; + use rayexec_execution::arrays::field::{Field, Schema}; use super::*; diff --git a/test_bin/Cargo.toml b/test_bin/Cargo.toml index 0b6e23f58..ba4ee9030 100644 --- a/test_bin/Cargo.toml +++ b/test_bin/Cargo.toml @@ -12,7 +12,6 @@ rayexec_server = { path = '../crates/rayexec_server' } rayexec_shell = { path = '../crates/rayexec_shell' } rayexec_rt_native = { path = '../crates/rayexec_rt_native' } rayexec_slt = { path = '../crates/rayexec_slt' } -rayexec_bullet = { path = '../crates/rayexec_bullet' } rayexec_postgres = { path = '../crates/rayexec_postgres' } rayexec_parquet = { path = '../crates/rayexec_parquet' } rayexec_csv = { path = '../crates/rayexec_csv' } diff --git a/test_bin/integration_slt_hybrid.rs b/test_bin/integration_slt_hybrid.rs index 6030a7c2a..69c13283d 100644 --- a/test_bin/integration_slt_hybrid.rs +++ b/test_bin/integration_slt_hybrid.rs @@ -2,13 +2,13 @@ use std::collections::HashMap; use std::path::Path; use std::time::Duration; -use rayexec_bullet::array::Array; -use rayexec_bullet::batch::Batch; -use rayexec_bullet::datatype::DataType; -use rayexec_bullet::field::Field; use rayexec_debug::table_storage::TablePreload; use rayexec_debug::{DebugDataSource, DebugDataSourceOptions}; use rayexec_error::Result; +use rayexec_execution::arrays::array::Array; +use rayexec_execution::arrays::batch::Batch; +use rayexec_execution::arrays::datatype::DataType; +use rayexec_execution::arrays::field::Field; use rayexec_execution::datasource::DataSourceRegistry; use rayexec_execution::engine::Engine; use rayexec_execution::runtime::{Runtime, TokioHandlerProvider};