Skip to content

VTX-4075: make one method public and clippy happy #223

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.

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

Open
wants to merge 27 commits into
base: v33
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
ebf2f5a
VTX-4075: ore verbose display for union
fsdvh Jan 25, 2024
edc5a5f
VTX-4075: fmt
fsdvh Jan 25, 2024
28ade24
VTX-4075: clippy
fsdvh Jan 25, 2024
85e8504
VTX-4075: clippy
fsdvh Jan 25, 2024
e5a8db7
VTX-4075: display for projection
fsdvh Jan 25, 2024
25afc10
VTX-4075: clippy
fsdvh Jan 25, 2024
fd80a29
VTX-4075: cleanup
fsdvh Jan 25, 2024
beece8b
VTX-4075: make spawn_buffered public
fsdvh Jan 26, 2024
0220a95
VTX-4075: update
fsdvh Jan 26, 2024
7608327
VTX-4075: fix more tests
fsdvh Jan 26, 2024
0722ae4
VTX-4075: some updates
fsdvh Jan 26, 2024
286dc61
VTX-4075: more updates
fsdvh Jan 26, 2024
fb93e66
VTX-4075: more updates
fsdvh Jan 26, 2024
597c930
VTX-4075: verbose out
fsdvh Jan 26, 2024
771e1e1
Revert "VTX-4075: ore verbose display for union"
fsdvh Jan 26, 2024
09fff24
Revert "VTX-4075: fix more tests"
fsdvh Jan 26, 2024
c3c6a4f
Revert "VTX-4075: some updates"
fsdvh Jan 26, 2024
2ba2c28
Revert "VTX-4075: more updates"
fsdvh Jan 26, 2024
60daf1c
Revert "VTX-4075: more updates"
fsdvh Jan 26, 2024
a24cdf1
Revert "VTX-4075: ore verbose display for union"
fsdvh Jan 26, 2024
500dd13
Revert "VTX-4075: ore verbose display for union"
fsdvh Jan 26, 2024
aadbc1b
Revert "VTX-4075: fix more tests"
fsdvh Jan 26, 2024
c021af1
Revert "VTX-4075: more updates"
fsdvh Jan 26, 2024
644cc4f
Revert "VTX-4075: more updates"
fsdvh Jan 26, 2024
738f2b4
VTX-4075: cleanup
fsdvh Jan 26, 2024
a912f39
VTX-4075: revert even verbose out, don't want to mess with tests
fsdvh Jan 26, 2024
d885449
VTX-4075: fix
fsdvh Jan 26, 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
2 changes: 1 addition & 1 deletion datafusion-cli/src/functions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ pub struct ParquetMetadataFunc {}

impl TableFunctionImpl for ParquetMetadataFunc {
fn call(&self, exprs: &[Expr]) -> Result<Arc<dyn TableProvider>> {
let filename = match exprs.get(0) {
let filename = match exprs.first() {
Some(Expr::Literal(ScalarValue::Utf8(Some(s)))) => s, // single quote: parquet_metadata('x.parquet')
Some(Expr::Column(Column { name, .. })) => name, // double quote: parquet_metadata("x.parquet")
_ => {
Expand Down
3 changes: 1 addition & 2 deletions datafusion/common/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,7 @@ macro_rules! sql_err {

// To avoid compiler error when using macro in the same crate:
// macros from the current crate cannot be referred to by absolute paths
#[allow(unused_imports)]
pub use exec_err as _exec_err;
pub use internal_err as _internal_err;
pub use not_impl_err as _not_impl_err;
Expand Down Expand Up @@ -581,7 +582,6 @@ mod test {

#[cfg(not(feature = "backtrace"))]
#[test]
#[allow(clippy::unnecessary_literal_unwrap)]
fn test_disabled_backtrace() {
let res: Result<(), DataFusionError> = plan_err!("Err");
let res = res.unwrap_err().to_string();
Expand Down Expand Up @@ -645,7 +645,6 @@ mod test {
}

#[test]
#[allow(clippy::unnecessary_literal_unwrap)]
fn test_make_error_parse_input() {
let res: Result<(), DataFusionError> = plan_err!("Err");
let res = res.unwrap_err();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -985,6 +985,7 @@ fn join_table_borders(

/// Tries to update the equi-join `Column`'s of a join as if the the input of
/// the join was replaced by a projection.
#[allow(clippy::map_identity)]
fn update_join_on(
proj_left_exprs: &[(Column, String)],
proj_right_exprs: &[(Column, String)],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ pub(crate) struct GuaranteeRewriter<'a> {
}

impl<'a> GuaranteeRewriter<'a> {
#[allow(clippy::map_identity)]
pub fn new(
guarantees: impl IntoIterator<Item = &'a (Expr, NullableInterval)>,
) -> Self {
Expand Down
2 changes: 1 addition & 1 deletion datafusion/physical-expr/src/array_expressions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2147,7 +2147,7 @@ pub fn general_array_distinct<OffsetSize: OffsetSizeTrait>(
let last_offset: OffsetSize = offsets.last().copied().unwrap();
offsets.push(last_offset + OffsetSize::usize_as(rows.len()));
let arrays = converter.convert_rows(rows)?;
let array = match arrays.get(0) {
let array = match arrays.first() {
Some(array) => array.clone(),
None => {
return internal_err!("array_distinct: failed to get array from rows")
Expand Down
2 changes: 1 addition & 1 deletion datafusion/physical-plan/src/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ fn build_file_list_recurse(

/// If running in a tokio context spawns the execution of `stream` to a separate task
/// allowing it to execute in parallel with an intermediate buffer of size `buffer`
pub(crate) fn spawn_buffered(
pub fn spawn_buffered(
mut input: SendableRecordBatchStream,
buffer: usize,
) -> SendableRecordBatchStream {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ mod normalize;
mod runner;

pub use error::*;
pub use normalize::*;

pub use runner::*;