Skip to content

Combine the logic of rank, dense_rank and percent_rank udwf to reduce duplications #12893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Oct 16, 2024
Merged

Combine the logic of rank, dense_rank and percent_rank udwf to reduce duplications #12893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5d5d673
wip: combining the logic of rank, dense_rank and percent_rank udwf
jatin510 Oct 12, 2024
9486489
added test for dense_rank and percent_rank
jatin510 Oct 12, 2024
aaa62bb
removed unnecessary files and fixed issue for percent_rank and dense_…
jatin510 Oct 12, 2024
a83aa05
Merge branch 'main' into refactor/rank-udwfs
jatin510 Oct 12, 2024
4421df6
updated the module imports for the percent_rank and dense_rank udwfs
jatin510 Oct 12, 2024
0c4b521
removed data_type field from then rank struct
jatin510 Oct 12, 2024
b5922eb
fixed function-window macros
jatin510 Oct 12, 2024
5c58ca1
removed unused function
jatin510 Oct 12, 2024
a99ac46
module doc updated for rank.rs
jatin510 Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions datafusion/core/tests/fuzz_cases/window_fuzz.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ use datafusion_physical_expr::{PhysicalExpr, PhysicalSortExpr};
use test_utils::add_empty_batches;

use datafusion::functions_window::row_number::row_number_udwf;
use datafusion_functions_window::dense_rank::dense_rank_udwf;
use datafusion_functions_window::rank::rank_udwf;
use datafusion_functions_window::rank::{dense_rank_udwf, rank_udwf};
use hashbrown::HashMap;
use rand::distributions::Alphanumeric;
use rand::rngs::StdRng;
Expand Down
205 changes: 0 additions & 205 deletions datafusion/functions-window/src/dense_rank.rs
View file
Open in desktop

This file was deleted.

10 changes: 3 additions & 7 deletions datafusion/functions-window/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,12 @@ use datafusion_expr::WindowUDF;

#[macro_use]
pub mod macros;
pub mod dense_rank;
pub mod percent_rank;
pub mod rank;
pub mod row_number;

/// Fluent-style API for creating `Expr`s
pub mod expr_fn {
pub use super::dense_rank::dense_rank;
pub use super::percent_rank::percent_rank;
pub use super::rank::rank;
pub use super::rank::{dense_rank, percent_rank, rank};
pub use super::row_number::row_number;
}

Expand All @@ -49,8 +45,8 @@ pub fn all_default_window_functions() -> Vec<Arc<WindowUDF>> {
vec![
row_number::row_number_udwf(),
rank::rank_udwf(),
dense_rank::dense_rank_udwf(),
percent_rank::percent_rank_udwf(),
rank::dense_rank_udwf(),
rank::percent_rank_udwf(),
]
}
/// Registers all enabled packages with a [`FunctionRegistry`]
Expand Down
4 changes: 2 additions & 2 deletions datafusion/functions-window/src/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ macro_rules! create_udwf_expr {
($UDWF:ident, $OUT_FN_NAME:ident, $DOC:expr) => {
paste::paste! {
#[doc = " Create a [`WindowFunction`](datafusion_expr::Expr::WindowFunction) expression for"]
#[doc = concat!(" [`", stringify!($UDWF), "`] user-defined window function.")]
#[doc = concat!(" `", stringify!($UDWF), "` user-defined window function.")]
#[doc = ""]
#[doc = concat!(" ", $DOC)]
pub fn $OUT_FN_NAME() -> datafusion_expr::Expr {
Expand All @@ -316,7 +316,7 @@ macro_rules! create_udwf_expr {
($UDWF:ident, $OUT_FN_NAME:ident, [$($PARAM:ident),+], $DOC:expr) => {
paste::paste! {
#[doc = " Create a [`WindowFunction`](datafusion_expr::Expr::WindowFunction) expression for"]
#[doc = concat!(" [`", stringify!($UDWF), "`] user-defined window function.")]
#[doc = concat!(" `", stringify!($UDWF), "` user-defined window function.")]
#[doc = ""]
#[doc = concat!(" ", $DOC)]
pub fn $OUT_FN_NAME(
Expand Down
Loading