spooky

GlareDB · Jan 5, 2025 · edb8875 · edb8875
1 parent f5d4920
commit edb8875
Show file tree

Hide file tree

Showing 54 changed files with 108 additions and 73 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/rayexec_execution/Cargo.toml b/crates/rayexec_execution/Cargo.toml
@@ -10,7 +10,7 @@ rayexec_parser = { path = "../rayexec_parser" }
 # rayexec_bullet = { path = "../rayexec_bullet" }
 rayexec_io = { path = "../rayexec_io" }
 fmtutil = { path = "../fmtutil" }
-iterutil = { path = "../iterutil" }
+stdutil = { path = "../stdutil" }
 # stackutil = { path = "../stackutil" } TODO: psm hash issues when compiling to wasm on macos
 
 ahash = { workspace = true }

diff --git a/crates/rayexec_execution/src/arrays/array/exp.rs b/crates/rayexec_execution/src/arrays/array/exp.rs
@@ -1,6 +1,6 @@
 use half::f16;
-use iterutil::{IntoExactSizeIterator, TryFromExactSizeIterator};
 use rayexec_error::{not_implemented, RayexecError, Result};
+use stdutil::iter::{IntoExactSizeIterator, TryFromExactSizeIterator};
 
 use super::array_data::ArrayData;
 use super::flat::FlatArrayView;

diff --git a/crates/rayexec_execution/src/arrays/batch_exp.rs b/crates/rayexec_execution/src/arrays/batch_exp.rs
@@ -1,5 +1,5 @@
-use iterutil::IntoExactSizeIterator;
 use rayexec_error::{RayexecError, Result};
+use stdutil::iter::IntoExactSizeIterator;
 
 use super::array::exp::Array;
 use super::array::selection::Selection;
@@ -139,7 +139,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
 

diff --git a/crates/rayexec_execution/src/arrays/compute/cast/array.rs b/crates/rayexec_execution/src/arrays/compute/cast/array.rs
@@ -1,6 +1,6 @@
 use std::ops::Mul;
 
-use iterutil::IntoExactSizeIterator;
+use stdutil::iter::IntoExactSizeIterator;
 use num::{CheckedDiv, CheckedMul, Float, NumCast, PrimInt, ToPrimitive};
 use rayexec_error::{RayexecError, Result};
 
@@ -840,7 +840,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::datatype::DecimalTypeMeta;

diff --git a/crates/rayexec_execution/src/arrays/compute/date.rs b/crates/rayexec_execution/src/arrays/compute/date.rs
@@ -1,5 +1,5 @@
 use chrono::{DateTime, Datelike, NaiveDate, Timelike, Utc};
-use iterutil::IntoExactSizeIterator;
+use stdutil::iter::IntoExactSizeIterator;
 use rayexec_error::{not_implemented, RayexecError, Result};
 
 use crate::arrays::array::exp::Array;

diff --git a/crates/rayexec_execution/src/arrays/executor_exp/aggregate/binary.rs b/crates/rayexec_execution/src/arrays/executor_exp/aggregate/binary.rs
@@ -1,5 +1,5 @@
-use iterutil::IntoExactSizeIterator;
 use rayexec_error::Result;
+use stdutil::iter::IntoExactSizeIterator;
 
 use super::AggregateState;
 use crate::arrays::array::exp::Array;
@@ -62,7 +62,7 @@ impl BinaryNonNullUpdater {
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::buffer::physical_type::{AddressableMut, PhysicalI32};

diff --git a/crates/rayexec_execution/src/arrays/executor_exp/aggregate/mod.rs b/crates/rayexec_execution/src/arrays/executor_exp/aggregate/mod.rs
@@ -40,6 +40,7 @@ impl StateCombiner {
     ) -> Result<()>
     where
         State: AggregateState<Input, Output>,
+        Output: ?Sized,
     {
         for (from, to) in mapping {
             let consume = &mut consume[from];

diff --git a/crates/rayexec_execution/src/arrays/executor_exp/aggregate/unary.rs b/crates/rayexec_execution/src/arrays/executor_exp/aggregate/unary.rs
@@ -1,5 +1,5 @@
-use iterutil::IntoExactSizeIterator;
 use rayexec_error::Result;
+use stdutil::iter::IntoExactSizeIterator;
 
 use super::AggregateState;
 use crate::arrays::array::exp::Array;
@@ -94,7 +94,7 @@ impl UnaryNonNullUpdater {
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::buffer::buffer_manager::NopBufferManager;

diff --git a/crates/rayexec_execution/src/arrays/executor_exp/scalar/binary.rs b/crates/rayexec_execution/src/arrays/executor_exp/scalar/binary.rs
@@ -1,4 +1,4 @@
-use iterutil::IntoExactSizeIterator;
+use stdutil::iter::IntoExactSizeIterator;
 use rayexec_error::Result;
 
 use crate::arrays::array::exp::Array;
@@ -144,7 +144,7 @@ impl BinaryExecutor {
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::array::validity::Validity;

diff --git a/crates/rayexec_execution/src/arrays/executor_exp/scalar/list_reduce.rs b/crates/rayexec_execution/src/arrays/executor_exp/scalar/list_reduce.rs
@@ -1,4 +1,4 @@
-use iterutil::IntoExactSizeIterator;
+use stdutil::iter::IntoExactSizeIterator;
 use rayexec_error::{RayexecError, Result};
 
 use crate::arrays::array::exp::Array;

diff --git a/crates/rayexec_execution/src/arrays/executor_exp/scalar/ternary.rs b/crates/rayexec_execution/src/arrays/executor_exp/scalar/ternary.rs
@@ -1,4 +1,4 @@
-use iterutil::IntoExactSizeIterator;
+use stdutil::iter::IntoExactSizeIterator;
 use rayexec_error::Result;
 
 use crate::arrays::array::exp::Array;
@@ -189,7 +189,7 @@ impl TernaryExecutor {
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::buffer::buffer_manager::NopBufferManager;

diff --git a/crates/rayexec_execution/src/arrays/executor_exp/scalar/unary.rs b/crates/rayexec_execution/src/arrays/executor_exp/scalar/unary.rs
@@ -1,5 +1,5 @@
-use iterutil::IntoExactSizeIterator;
 use rayexec_error::Result;
+use stdutil::iter::IntoExactSizeIterator;
 
 use crate::arrays::array::exp::Array;
 use crate::arrays::array::flat::FlatArrayView;
@@ -179,7 +179,7 @@ impl UnaryExecutor {
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::array::validity::Validity;

diff --git a/crates/rayexec_execution/src/arrays/executor_exp/scalar/uniform.rs b/crates/rayexec_execution/src/arrays/executor_exp/scalar/uniform.rs
@@ -1,4 +1,4 @@
-use iterutil::IntoExactSizeIterator;
+use stdutil::iter::IntoExactSizeIterator;
 use rayexec_error::Result;
 
 use crate::arrays::array::exp::Array;
@@ -149,7 +149,7 @@ impl UniformExecutor {
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::buffer::buffer_manager::NopBufferManager;

diff --git a/crates/rayexec_execution/src/arrays/testutil.rs b/crates/rayexec_execution/src/arrays/testutil.rs
@@ -8,7 +8,7 @@
 use std::collections::BTreeMap;
 use std::fmt::Debug;
 
-use iterutil::IntoExactSizeIterator;
+use stdutil::iter::IntoExactSizeIterator;
 
 use super::array::exp::Array;
 use super::batch_exp::Batch;
@@ -201,7 +201,7 @@ pub fn assert_batches_eq(batch1: &Batch, batch2: &Batch) {
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::buffer::buffer_manager::NopBufferManager;

diff --git a/crates/rayexec_execution/src/expr/physical/case_expr.rs b/crates/rayexec_execution/src/expr/physical/case_expr.rs
@@ -187,7 +187,7 @@ impl fmt::Display for PhysicalCaseExpr {
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::datatype::DataType;

diff --git a/crates/rayexec_execution/src/expr/physical/cast_expr.rs b/crates/rayexec_execution/src/expr/physical/cast_expr.rs
@@ -101,7 +101,7 @@ impl DatabaseProtoConv for PhysicalCastExpr {
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::buffer::buffer_manager::NopBufferManager;

diff --git a/crates/rayexec_execution/src/expr/physical/column_expr.rs b/crates/rayexec_execution/src/expr/physical/column_expr.rs
@@ -70,7 +70,7 @@ impl DatabaseProtoConv for PhysicalColumnExpr {
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::datatype::DataType;

diff --git a/crates/rayexec_execution/src/expr/physical/literal_expr.rs b/crates/rayexec_execution/src/expr/physical/literal_expr.rs
@@ -68,7 +68,7 @@ impl DatabaseProtoConv for PhysicalLiteralExpr {
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::datatype::DataType;

diff --git a/crates/rayexec_execution/src/functions/aggregate/states.rs b/crates/rayexec_execution/src/functions/aggregate/states.rs
@@ -3,8 +3,9 @@ use std::any::Any;
 use std::fmt::Debug;
 use std::marker::PhantomData;
 
-use iterutil::IntoExactSizeIterator;
 use rayexec_error::{RayexecError, Result};
+use stdutil::iter::IntoExactSizeIterator;
+use stdutil::marker::PhantomCovariant;
 
 use super::ChunkGroupAddressIter;
 use crate::arrays::array::exp::Array;
@@ -32,7 +33,14 @@ use crate::arrays::executor_exp::aggregate::{AggregateState, StateCombiner};
 use crate::arrays::executor_exp::PutBuffer;
 use crate::arrays::storage::{AddressableStorage, PrimitiveStorage};
 
-pub struct TypedAggregateGroupStates<State, Input, Output, StateInit, StateUpdate, StateFinalize> {
+pub struct TypedAggregateGroupStates<
+    State,
+    Input,
+    Output: ?Sized,
+    StateInit,
+    StateUpdate,
+    StateFinalize,
+> {
     /// States being tracked.
     states: Vec<State>,
 
@@ -47,11 +55,11 @@ pub struct TypedAggregateGroupStates<State, Input, Output, StateInit, StateUpdat
     /// How to finalize states.
     state_finalize: StateFinalize,
 
-    _input: PhantomData<Input>,
-    _output: PhantomData<Output>,
+    _input: PhantomCovariant<Input>,
+    _output: PhantomCovariant<Output>,
 }
 
-impl<State, Input, Output, StateInit, StateUpdate, StateFinalize>
+impl<State, Input, Output: ?Sized, StateInit, StateUpdate, StateFinalize>
     TypedAggregateGroupStates<State, Input, Output, StateInit, StateUpdate, StateFinalize>
 {
     pub fn new(
@@ -65,8 +73,8 @@ impl<State, Input, Output, StateInit, StateUpdate, StateFinalize>
             state_init,
             state_update,
             state_finalize,
-            _input: PhantomData,
-            _output: PhantomData,
+            _input: PhantomCovariant::new(),
+            _output: PhantomCovariant::new(),
         }
     }
 }
@@ -76,7 +84,7 @@ impl<State, Input, Output, StateInit, StateUpdate, StateFinalize> AggregateGroup
 where
     State: AggregateState<Input, Output> + Sync + Send + 'static,
     Input: Sync + Send,
-    Output: Sync + Send,
+    Output: Sync + Send + ?Sized,
     StateInit: Fn() -> State + Sync + Send,
     StateUpdate: Fn(&[Array], Selection, &[usize], &mut [State]) -> Result<()> + Sync + Send,
     StateFinalize: Fn(&mut [State], &mut Array) -> Result<()> + Sync + Send,
@@ -155,7 +163,7 @@ where
     Ok(())
 }
 
-impl<State, Input, Output, StateInit, StateUpdate, StateFinalize> fmt::Debug
+impl<State, Input, Output: ?Sized, StateInit, StateUpdate, StateFinalize> fmt::Debug
     for TypedAggregateGroupStates<State, Input, Output, StateInit, StateUpdate, StateFinalize>
 {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {

diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/arith/add.rs b/crates/rayexec_execution/src/functions/scalar/builtin/arith/add.rs
@@ -204,7 +204,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::buffer::buffer_manager::NopBufferManager;

diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/arith/div.rs b/crates/rayexec_execution/src/functions/scalar/builtin/arith/div.rs
@@ -251,7 +251,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::buffer::buffer_manager::NopBufferManager;

diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/arith/mul.rs b/crates/rayexec_execution/src/functions/scalar/builtin/arith/mul.rs
@@ -317,7 +317,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::buffer::buffer_manager::NopBufferManager;

diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/arith/rem.rs b/crates/rayexec_execution/src/functions/scalar/builtin/arith/rem.rs
@@ -200,7 +200,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::buffer::buffer_manager::NopBufferManager;

diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/arith/sub.rs b/crates/rayexec_execution/src/functions/scalar/builtin/arith/sub.rs
@@ -212,7 +212,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::buffer::buffer_manager::NopBufferManager;

diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/boolean.rs b/crates/rayexec_execution/src/functions/scalar/builtin/boolean.rs
@@ -225,7 +225,7 @@ impl ScalarFunctionImpl for OrImpl {
 
 #[cfg(test)]
 mod tests {
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::buffer::buffer_manager::NopBufferManager;

diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/comparison.rs b/crates/rayexec_execution/src/functions/scalar/builtin/comparison.rs
@@ -854,7 +854,7 @@ where
 #[cfg(test)]
 mod tests {
 
-    use iterutil::TryFromExactSizeIterator;
+    use stdutil::iter::TryFromExactSizeIterator;
 
     use super::*;
     use crate::arrays::buffer::buffer_manager::NopBufferManager;

diff --git a/crates/rayexec_execution/src/functions/scalar/builtin/datetime/epoch.rs b/crates/rayexec_execution/src/functions/scalar/builtin/datetime/epoch.rs
@@ -1,4 +1,4 @@
-use iterutil::IntoExactSizeIterator;
+use stdutil::iter::IntoExactSizeIterator;
 use rayexec_error::Result;
 
 use crate::arrays::array::exp::Array;