remove expr::function::window

Signed-off-by: TennyZhuang <[email protected]>
risingwavelabs · Sep 18, 2023 · dc18a24 · dc18a24
1 parent a53a0d0
commit dc18a24
Show file tree

Hide file tree

Showing 18 changed files with 19 additions and 52 deletions.
diff --git a/src/batch/src/executor/sort_over_window.rs b/src/batch/src/executor/sort_over_window.rs
@@ -19,8 +19,9 @@ use risingwave_common::error::{Result, RwError};
 use risingwave_common::row::{OwnedRow, Row, RowExt};
 use risingwave_common::util::chunk_coalesce::DataChunkBuilder;
 use risingwave_common::util::iter_util::ZipEqFast;
-use risingwave_expr::function::window::WindowFuncCall;
-use risingwave_expr::window_function::{create_window_state, StateKey, WindowStates};
+use risingwave_expr::window_function::{
+    create_window_state, StateKey, WindowFuncCall, WindowStates,
+};
 use risingwave_pb::batch_plan::plan_node::NodeBody;
 
 use super::{BoxedDataChunkStream, BoxedExecutor, BoxedExecutorBuilder, Executor, ExecutorBuilder};

diff --git a/src/expr/src/function/mod.rs b/src/expr/src/function/mod.rs
diff --git a/src/expr/src/function/window/mod.rs b/src/expr/src/function/window/mod.rs
diff --git a/src/expr/src/lib.rs b/src/expr/src/lib.rs
@@ -29,7 +29,6 @@ extern crate self as risingwave_expr;
 pub mod agg;
 mod error;
 pub mod expr;
-pub mod function;
 pub mod sig;
 pub mod table_function;
 pub mod vector_op;

diff --git a/src/expr/src/window_function/state/aggregate.rs b/src/expr/src/window_function/state/aggregate.rs
@@ -25,7 +25,7 @@ use smallvec::SmallVec;
 use super::buffer::WindowBuffer;
 use super::{StateEvictHint, StateKey, StatePos, WindowState};
 use crate::agg::{build_append_only, AggArgs, AggCall, BoxedAggregateFunction};
-use crate::function::window::{WindowFuncCall, WindowFuncKind};
+use crate::window_function::{WindowFuncCall, WindowFuncKind};
 use crate::Result;
 
 pub struct AggregateState {

diff --git a/src/expr/src/window_function/state/buffer.rs b/src/expr/src/window_function/state/buffer.rs
@@ -17,7 +17,7 @@ use std::ops::Range;
 
 use either::Either;
 
-use crate::function::window::{Frame, FrameBounds, FrameExclusion};
+use crate::window_function::{Frame, FrameBounds, FrameExclusion};
 
 struct Entry<K: Ord, V> {
     key: K,
@@ -238,7 +238,7 @@ mod tests {
     use itertools::Itertools;
 
     use super::*;
-    use crate::function::window::{Frame, FrameBound};
+    use crate::window_function::{Frame, FrameBound};
 
     #[test]
     fn test_rows_frame_unbounded_preceding_to_current_row() {

diff --git a/src/expr/src/window_function/state/mod.rs b/src/expr/src/window_function/state/mod.rs
@@ -20,8 +20,7 @@ use risingwave_common::types::{Datum, DefaultOrdered};
 use risingwave_common::util::memcmp_encoding::MemcmpEncoded;
 use smallvec::SmallVec;
 
-use super::WindowFuncCall;
-use crate::function::window::WindowFuncKind;
+use super::{WindowFuncCall, WindowFuncKind};
 use crate::sig::FuncSigDebug;
 use crate::{ExprError, Result};
 

diff --git a/src/expr/src/window_function/state/row_number.rs b/src/expr/src/window_function/state/row_number.rs
@@ -18,7 +18,7 @@ use risingwave_common::types::Datum;
 use smallvec::SmallVec;
 
 use super::{StateEvictHint, StateKey, StatePos, WindowState};
-use crate::function::window::WindowFuncCall;
+use crate::window_function::WindowFuncCall;
 use crate::Result;
 
 #[derive(EstimateSize)]
@@ -83,7 +83,7 @@ mod tests {
 
     use super::*;
     use crate::agg::AggArgs;
-    use crate::function::window::{Frame, FrameBound, WindowFuncKind};
+    use crate::window_function::{Frame, FrameBound, WindowFuncKind};
 
     fn create_state_key(pk: i64) -> StateKey {
         StateKey {

diff --git a/src/frontend/src/binder/expr/function.rs b/src/frontend/src/binder/expr/function.rs
@@ -26,7 +26,7 @@ use risingwave_common::session_config::USER_NAME_WILD_CARD;
 use risingwave_common::types::{DataType, ScalarImpl, Timestamptz};
 use risingwave_common::{GIT_SHA, RW_VERSION};
 use risingwave_expr::agg::{agg_kinds, AggKind};
-use risingwave_expr::function::window::{
+use risingwave_expr::window_function::{
     Frame, FrameBound, FrameBounds, FrameExclusion, WindowFuncKind,
 };
 use risingwave_sqlparser::ast::{

diff --git a/src/frontend/src/expr/window_function.rs b/src/frontend/src/expr/window_function.rs
@@ -15,7 +15,7 @@
 use itertools::Itertools;
 use risingwave_common::error::{ErrorCode, RwError};
 use risingwave_common::types::DataType;
-use risingwave_expr::function::window::{Frame, WindowFuncKind};
+use risingwave_expr::window_function::{Frame, WindowFuncKind};
 
 use super::{AggCall, Expr, ExprImpl, OrderBy, RwResult};
 

diff --git a/src/frontend/src/optimizer/plan_node/generic/over_window.rs b/src/frontend/src/optimizer/plan_node/generic/over_window.rs
@@ -18,7 +18,7 @@ use risingwave_common::catalog::{Field, Schema};
 use risingwave_common::types::DataType;
 use risingwave_common::util::column_index_mapping::ColIndexMapping;
 use risingwave_common::util::sort_util::{ColumnOrder, ColumnOrderDisplay};
-use risingwave_expr::function::window::{Frame, WindowFuncKind};
+use risingwave_expr::window_function::{Frame, WindowFuncKind};
 use risingwave_pb::expr::PbWindowFunction;
 
 use super::{DistillUnit, GenericPlanNode, GenericPlanRef};

diff --git a/src/frontend/src/optimizer/plan_node/logical_over_window.rs b/src/frontend/src/optimizer/plan_node/logical_over_window.rs
@@ -18,7 +18,7 @@ use risingwave_common::error::{ErrorCode, Result, RwError};
 use risingwave_common::types::{DataType, Datum, ScalarImpl};
 use risingwave_common::util::sort_util::{ColumnOrder, OrderType};
 use risingwave_expr::agg::AggKind;
-use risingwave_expr::function::window::{Frame, FrameBound, WindowFuncKind};
+use risingwave_expr::window_function::{Frame, FrameBound, WindowFuncKind};
 
 use super::generic::{GenericPlanRef, OverWindow, PlanWindowFunction, ProjectBuilder};
 use super::utils::impl_distill_by_unit;

diff --git a/src/frontend/src/optimizer/rule/over_window_to_agg_and_join_rule.rs b/src/frontend/src/optimizer/rule/over_window_to_agg_and_join_rule.rs
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use itertools::Itertools;
-use risingwave_expr::function::window::WindowFuncKind;
+use risingwave_expr::window_function::WindowFuncKind;
 use risingwave_pb::expr::expr_node::Type;
 use risingwave_pb::plan_common::JoinType;
 

diff --git a/src/frontend/src/optimizer/rule/over_window_to_topn_rule.rs b/src/frontend/src/optimizer/rule/over_window_to_topn_rule.rs
@@ -14,7 +14,7 @@
 
 use fixedbitset::FixedBitSet;
 use risingwave_common::types::DataType;
-use risingwave_expr::function::window::WindowFuncKind;
+use risingwave_expr::window_function::WindowFuncKind;
 
 use super::Rule;
 use crate::expr::{collect_input_refs, ExprImpl, ExprType};

diff --git a/src/stream/src/from_proto/eowc_over_window.rs b/src/stream/src/from_proto/eowc_over_window.rs
@@ -14,7 +14,7 @@
 
 use std::sync::Arc;
 
-use risingwave_expr::function::window::WindowFuncCall;
+use risingwave_expr::window_function::WindowFuncCall;
 use risingwave_pb::stream_plan::PbEowcOverWindowNode;
 use risingwave_storage::StateStore;
 

diff --git a/src/stream/src/from_proto/over_window.rs b/src/stream/src/from_proto/over_window.rs
@@ -16,7 +16,7 @@ use std::sync::Arc;
 
 use risingwave_common::session_config::OverWindowCachePolicy;
 use risingwave_common::util::sort_util::ColumnOrder;
-use risingwave_expr::function::window::WindowFuncCall;
+use risingwave_expr::window_function::WindowFuncCall;
 use risingwave_pb::stream_plan::PbOverWindowNode;
 use risingwave_storage::StateStore;
 

diff --git a/src/stream/tests/integration_tests/eowc_over_window.rs b/src/stream/tests/integration_tests/eowc_over_window.rs
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 use risingwave_expr::agg::{AggArgs, AggKind};
-use risingwave_expr::function::window::{Frame, FrameBound, WindowFuncCall, WindowFuncKind};
+use risingwave_expr::window_function::{Frame, FrameBound, WindowFuncCall, WindowFuncKind};
 use risingwave_stream::executor::{EowcOverWindowExecutor, EowcOverWindowExecutorArgs};
 
 use crate::prelude::*;

diff --git a/src/stream/tests/integration_tests/over_window.rs b/src/stream/tests/integration_tests/over_window.rs
@@ -14,7 +14,7 @@
 
 use risingwave_common::session_config::OverWindowCachePolicy;
 use risingwave_expr::agg::{AggArgs, AggKind};
-use risingwave_expr::function::window::{
+use risingwave_expr::window_function::{
     Frame, FrameBound, FrameExclusion, WindowFuncCall, WindowFuncKind,
 };
 use risingwave_stream::executor::monitor::StreamingMetrics;