Skip to content

Commit

Permalink
chore: remove deprecated expr in proto (#7190)
Browse files Browse the repository at this point in the history
was not used after #411

Approved-By: lmatz
  • Loading branch information
xxchan committed Jan 4, 2023
1 parent b8846fa commit 1ba6981
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 25 deletions.
19 changes: 5 additions & 14 deletions dashboard/proto/gen/expr.ts

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

6 changes: 3 additions & 3 deletions proto/expr.proto
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,9 @@ message ExprNode {
ARRAY_CAT = 531;
ARRAY_APPEND = 532;
ARRAY_PREPEND = 533;
// Search operator and Search ARGument
SEARCH = 998;
SARG = 999;

// Non-pure functions below (> 600)
// ------------------------
// Internal functions
VNODE = 1101;
// Non-deterministic functions
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/expr/function_call.rs
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@ impl FunctionCall {
self.func_type
}

/// Refer to [`ExprType`] for details.
pub fn is_pure(&self) -> bool {
// See proto for details
0 < self.func_type as i32 && self.func_type as i32 <= 600
}

Expand Down
12 changes: 5 additions & 7 deletions src/frontend/src/expr/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,21 @@ mod utils;

pub use agg_call::AggCall;
pub use correlated_input_ref::{CorrelatedId, CorrelatedInputRef, Depth};
pub use expr_mutator::ExprMutator;
pub use expr_rewriter::ExprRewriter;
pub use expr_visitor::ExprVisitor;
pub use function_call::{is_row_function, FunctionCall, FunctionCallDisplay};
pub use input_ref::{input_ref_to_column_indices, InputRef, InputRefDisplay};
pub use literal::Literal;
pub use risingwave_pb::expr::expr_node::Type as ExprType;
pub use subquery::{Subquery, SubqueryKind};
pub use table_function::{TableFunction, TableFunctionType};
pub use window_function::{WindowFunction, WindowFunctionType};

pub type ExprType = risingwave_pb::expr::expr_node::Type;

pub use expr_mutator::ExprMutator;
pub use expr_rewriter::ExprRewriter;
pub use expr_visitor::ExprVisitor;
pub use type_inference::{
agg_func_sigs, align_types, cast_map_array, cast_ok, cast_sigs, func_sigs, infer_type,
least_restrictive, AggFuncSig, CastContext, CastSig, FuncSign,
};
pub use utils::*;
pub use window_function::{WindowFunction, WindowFunctionType};

/// the trait of bound expressions
pub trait Expr: Into<ExprImpl> {
Expand Down

0 comments on commit 1ba6981

Please sign in to comment.