-
Notifications
You must be signed in to change notification settings - Fork 193
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor!: move ordering-related code to
order_by_util.rs && fix an…
… issue with decimals (#388)
- Loading branch information
Showing
8 changed files
with
331 additions
and
319 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| //! Contains the utility functions for ordering. | ||
| use crate::base::{ | ||
| database::{Column, OwnedColumn}, | ||
| scalar::{Scalar, ScalarExt}, | ||
| }; | ||
| use alloc::vec::Vec; | ||
| use core::cmp::Ordering; | ||
| use proof_of_sql_parser::intermediate_ast::OrderByDirection; | ||
|
|
||
| /// Compares the tuples `(order_by[0][i], order_by[1][i], ...)` and | ||
| /// `(order_by[0][j], order_by[1][j], ...)` in lexicographic order. | ||
| pub(crate) fn compare_indexes_by_columns<S: Scalar>( | ||
| order_by: &[Column<S>], | ||
| i: usize, | ||
| j: usize, | ||
| ) -> Ordering { | ||
| order_by | ||
| .iter() | ||
| .map(|col| match col { | ||
| Column::Boolean(col) => col[i].cmp(&col[j]), | ||
| Column::TinyInt(col) => col[i].cmp(&col[j]), | ||
| Column::SmallInt(col) => col[i].cmp(&col[j]), | ||
| Column::Int(col) => col[i].cmp(&col[j]), | ||
| Column::BigInt(col) | Column::TimestampTZ(_, _, col) => col[i].cmp(&col[j]), | ||
| Column::Int128(col) => col[i].cmp(&col[j]), | ||
| Column::Decimal75(_, _, col) => col[i].signed_cmp(&col[j]), | ||
| Column::Scalar(col) => col[i].cmp(&col[j]), | ||
| Column::VarChar((col, _)) => col[i].cmp(col[j]), | ||
| }) | ||
| .find(|&ord| ord != Ordering::Equal) | ||
| .unwrap_or(Ordering::Equal) | ||
| } | ||
|
|
||
| /// Compares the tuples `(order_by[0][i], order_by[1][i], ...)` and | ||
| /// `(order_by[0][j], order_by[1][j], ...)` in lexicographic order. | ||
| /// | ||
| /// Identical in functionality to [`compare_indexes_by_columns`] | ||
| pub(crate) fn compare_indexes_by_owned_columns<S: Scalar>( | ||
| order_by: &[&OwnedColumn<S>], | ||
| i: usize, | ||
| j: usize, | ||
| ) -> Ordering { | ||
| let order_by_pairs = order_by | ||
| .iter() | ||
| .map(|&col| (col.clone(), OrderByDirection::Asc)) | ||
| .collect::<Vec<_>>(); | ||
| compare_indexes_by_owned_columns_with_direction(&order_by_pairs, i, j) | ||
| } | ||
|
|
||
| /// Compares the tuples `(left[0][i], left[1][i], ...)` and | ||
| /// `(right[0][j], right[1][j], ...)` in lexicographic order. | ||
| /// Note that direction flips the ordering. | ||
| pub(crate) fn compare_indexes_by_owned_columns_with_direction<S: Scalar>( | ||
| order_by_pairs: &[(OwnedColumn<S>, OrderByDirection)], | ||
| i: usize, | ||
| j: usize, | ||
| ) -> Ordering { | ||
| order_by_pairs | ||
| .iter() | ||
| .map(|(col, direction)| { | ||
| let ordering = match col { | ||
| OwnedColumn::Boolean(col) => col[i].cmp(&col[j]), | ||
| OwnedColumn::TinyInt(col) => col[i].cmp(&col[j]), | ||
| OwnedColumn::SmallInt(col) => col[i].cmp(&col[j]), | ||
| OwnedColumn::Int(col) => col[i].cmp(&col[j]), | ||
| OwnedColumn::BigInt(col) | OwnedColumn::TimestampTZ(_, _, col) => { | ||
| col[i].cmp(&col[j]) | ||
| } | ||
| OwnedColumn::Int128(col) => col[i].cmp(&col[j]), | ||
| OwnedColumn::Decimal75(_, _, col) => col[i].signed_cmp(&col[j]), | ||
| OwnedColumn::Scalar(col) => col[i].cmp(&col[j]), | ||
| OwnedColumn::VarChar(col) => col[i].cmp(&col[j]), | ||
| }; | ||
| match direction { | ||
| OrderByDirection::Asc => ordering, | ||
| OrderByDirection::Desc => ordering.reverse(), | ||
| } | ||
| }) | ||
| .find(|&ord| ord != Ordering::Equal) | ||
| .unwrap_or(Ordering::Equal) | ||
| } |
Oops, something went wrong.