-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
Update rust vesion to 1.57 #1395
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -37,8 +37,8 @@ use super::{format_state_name, sum}; | |
#[derive(Debug)] | ||
pub struct Avg { | ||
name: String, | ||
#[allow(dead_code)] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I will look into removing this field as well There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This PR might be the reason causes the different behavior on There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think you are right |
||
data_type: DataType, | ||
nullable: bool, | ||
expr: Arc<dyn PhysicalExpr>, | ||
} | ||
|
||
|
@@ -73,7 +73,6 @@ impl Avg { | |
name: name.into(), | ||
expr, | ||
data_type, | ||
nullable: true, | ||
} | ||
} | ||
} | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -346,7 +346,7 @@ struct SortPreservingMergeStream { | |
receivers: Vec<mpsc::Receiver<ArrowResult<RecordBatch>>>, | ||
|
||
/// Drop helper for tasks feeding the [`receivers`](Self::receivers) | ||
drop_helper: AbortOnDropMany<()>, | ||
_drop_helper: AbortOnDropMany<()>, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is used (its |
||
|
||
/// For each input stream maintain a dequeue of SortKeyCursor | ||
/// | ||
|
@@ -379,7 +379,7 @@ struct SortPreservingMergeStream { | |
impl SortPreservingMergeStream { | ||
fn new( | ||
receivers: Vec<mpsc::Receiver<ArrowResult<RecordBatch>>>, | ||
drop_helper: AbortOnDropMany<()>, | ||
_drop_helper: AbortOnDropMany<()>, | ||
schema: SchemaRef, | ||
expressions: &[PhysicalSortExpr], | ||
target_batch_size: usize, | ||
|
@@ -394,7 +394,7 @@ impl SortPreservingMergeStream { | |
schema, | ||
cursors, | ||
receivers, | ||
drop_helper, | ||
_drop_helper, | ||
column_expressions: expressions.iter().map(|x| x.expr.clone()).collect(), | ||
sort_options: expressions.iter().map(|x| x.options).collect(), | ||
target_batch_size, | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -68,7 +68,7 @@ pub enum ScalarValue { | |
/// large binary | ||
LargeBinary(Option<Vec<u8>>), | ||
/// list of nested ScalarValue (boxed to reduce size_of(ScalarValue)) | ||
#[allow(clippy::box_vec)] | ||
#[allow(clippy::box_collection)] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh clippy, how wrong you are :) the benefit is that the overall enum is smaller (as in the size of |
||
List(Option<Box<Vec<ScalarValue>>>, Box<DataType>), | ||
/// Date stored as a signed 32bit int | ||
Date32(Option<i32>), | ||
|
@@ -87,7 +87,7 @@ pub enum ScalarValue { | |
/// Interval with DayTime unit | ||
IntervalDayTime(Option<i64>), | ||
/// struct of nested ScalarValue (boxed to reduce size_of(ScalarValue)) | ||
#[allow(clippy::box_vec)] | ||
#[allow(clippy::box_collection)] | ||
Struct(Option<Box<Vec<ScalarValue>>>, Box<Vec<Field>>), | ||
} | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -85,7 +85,7 @@ pub struct CreateExternalTable { | |
#[derive(Debug, Clone, PartialEq)] | ||
pub enum Statement { | ||
/// ANSI SQL AST node | ||
Statement(SQLStatement), | ||
Statement(Box<SQLStatement>), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
/// Extension: `CREATE EXTERNAL TABLE` | ||
CreateExternalTable(CreateExternalTable), | ||
} | ||
|
@@ -167,13 +167,17 @@ impl<'a> DFParser<'a> { | |
} | ||
_ => { | ||
// use the native parser | ||
Ok(Statement::Statement(self.parser.parse_statement()?)) | ||
Ok(Statement::Statement(Box::from( | ||
self.parser.parse_statement()?, | ||
))) | ||
} | ||
} | ||
} | ||
_ => { | ||
// use the native parser | ||
Ok(Statement::Statement(self.parser.parse_statement()?)) | ||
Ok(Statement::Statement(Box::from( | ||
self.parser.parse_statement()?, | ||
))) | ||
} | ||
} | ||
} | ||
|
@@ -183,7 +187,7 @@ impl<'a> DFParser<'a> { | |
if self.parser.parse_keyword(Keyword::EXTERNAL) { | ||
self.parse_create_external_table() | ||
} else { | ||
Ok(Statement::Statement(self.parser.parse_create()?)) | ||
Ok(Statement::Statement(Box::from(self.parser.parse_create()?))) | ||
} | ||
} | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://rust-lang.github.io/rust-clippy/master/index.html#redundant_closure