feat: Enable clippy::clone_on_ref_ptr on core crate (#860)

apache · Aug 22, 2024 · a99f742 · a99f742
1 parent 3b59999
commit a99f742
Show file tree

Hide file tree

Showing 25 changed files with 185 additions and 139 deletions.
diff --git a/native/core/src/execution/datafusion/expressions/avg.rs b/native/core/src/execution/datafusion/expressions/avg.rs
@@ -96,7 +96,7 @@ impl AggregateExpr for Avg {
     }
 
     fn expressions(&self) -> Vec<Arc<dyn PhysicalExpr>> {
-        vec![self.expr.clone()]
+        vec![Arc::clone(&self.expr)]
     }
 
     fn name(&self) -> &str {

diff --git a/native/core/src/execution/datafusion/expressions/avg_decimal.rs b/native/core/src/execution/datafusion/expressions/avg_decimal.rs
@@ -107,7 +107,7 @@ impl AggregateExpr for AvgDecimal {
     }
 
     fn expressions(&self) -> Vec<Arc<dyn PhysicalExpr>> {
-        vec![self.expr.clone()]
+        vec![Arc::clone(&self.expr)]
     }
 
     fn name(&self) -> &str {

diff --git a/native/core/src/execution/datafusion/expressions/bitwise_not.rs b/native/core/src/execution/datafusion/expressions/bitwise_not.rs
@@ -113,7 +113,7 @@ impl PhysicalExpr for BitwiseNotExpr {
         self: Arc<Self>,
         children: Vec<Arc<dyn PhysicalExpr>>,
     ) -> Result<Arc<dyn PhysicalExpr>> {
-        Ok(Arc::new(BitwiseNotExpr::new(children[0].clone())))
+        Ok(Arc::new(BitwiseNotExpr::new(Arc::clone(&children[0]))))
     }
 
     fn dyn_hash(&self, state: &mut dyn Hasher) {

diff --git a/native/core/src/execution/datafusion/expressions/bloom_filter_might_contain.rs b/native/core/src/execution/datafusion/expressions/bloom_filter_might_contain.rs
@@ -138,8 +138,8 @@ impl PhysicalExpr for BloomFilterMightContain {
         children: Vec<Arc<dyn PhysicalExpr>>,
     ) -> Result<Arc<dyn PhysicalExpr>> {
         Ok(Arc::new(BloomFilterMightContain::try_new(
-            children[0].clone(),
-            children[1].clone(),
+            Arc::clone(&children[0]),
+            Arc::clone(&children[1]),
         )?))
     }
 

diff --git a/native/core/src/execution/datafusion/expressions/checkoverflow.rs b/native/core/src/execution/datafusion/expressions/checkoverflow.rs
@@ -158,7 +158,7 @@ impl PhysicalExpr for CheckOverflow {
         children: Vec<Arc<dyn PhysicalExpr>>,
     ) -> datafusion_common::Result<Arc<dyn PhysicalExpr>> {
         Ok(Arc::new(CheckOverflow::new(
-            children[0].clone(),
+            Arc::clone(&children[0]),
             self.data_type.clone(),
             self.fail_on_error,
         )))

diff --git a/native/core/src/execution/datafusion/expressions/correlation.rs b/native/core/src/execution/datafusion/expressions/correlation.rs
@@ -115,7 +115,7 @@ impl AggregateExpr for Correlation {
     }
 
     fn expressions(&self) -> Vec<Arc<dyn PhysicalExpr>> {
-        vec![self.expr1.clone(), self.expr2.clone()]
+        vec![Arc::clone(&self.expr1), Arc::clone(&self.expr2)]
     }
 
     fn name(&self) -> &str {
@@ -209,13 +209,21 @@ impl Accumulator for CorrelationAccumulator {
 
     fn merge_batch(&mut self, states: &[ArrayRef]) -> Result<()> {
         let states_c = [
-            states[0].clone(),
-            states[1].clone(),
-            states[2].clone(),
-            states[3].clone(),
+            Arc::clone(&states[0]),
+            Arc::clone(&states[1]),
+            Arc::clone(&states[2]),
+            Arc::clone(&states[3]),
+        ];
+        let states_s1 = [
+            Arc::clone(&states[0]),
+            Arc::clone(&states[1]),
+            Arc::clone(&states[4]),
+        ];
+        let states_s2 = [
+            Arc::clone(&states[0]),
+            Arc::clone(&states[2]),
+            Arc::clone(&states[5]),
         ];
-        let states_s1 = [states[0].clone(), states[1].clone(), states[4].clone()];
-        let states_s2 = [states[0].clone(), states[2].clone(), states[5].clone()];
 
         if states[0].len() > 0 && states[1].len() > 0 && states[2].len() > 0 {
             self.covar.merge_batch(&states_c)?;

diff --git a/native/core/src/execution/datafusion/expressions/covariance.rs b/native/core/src/execution/datafusion/expressions/covariance.rs
@@ -112,7 +112,7 @@ impl AggregateExpr for Covariance {
     }
 
     fn expressions(&self) -> Vec<Arc<dyn PhysicalExpr>> {
-        vec![self.expr1.clone(), self.expr2.clone()]
+        vec![Arc::clone(&self.expr1), Arc::clone(&self.expr2)]
     }
 
     fn name(&self) -> &str {

diff --git a/native/core/src/execution/datafusion/expressions/negative.rs b/native/core/src/execution/datafusion/expressions/negative.rs
@@ -200,7 +200,7 @@ impl PhysicalExpr for NegativeExpr {
         children: Vec<Arc<dyn PhysicalExpr>>,
     ) -> Result<Arc<dyn PhysicalExpr>> {
         Ok(Arc::new(NegativeExpr::new(
-            children[0].clone(),
+            Arc::clone(&children[0]),
             self.fail_on_error,
         )))
     }

diff --git a/native/core/src/execution/datafusion/expressions/normalize_nan.rs b/native/core/src/execution/datafusion/expressions/normalize_nan.rs
@@ -87,7 +87,7 @@ impl PhysicalExpr for NormalizeNaNAndZero {
     ) -> datafusion_common::Result<Arc<dyn PhysicalExpr>> {
         Ok(Arc::new(NormalizeNaNAndZero::new(
             self.data_type.clone(),
-            children[0].clone(),
+            Arc::clone(&children[0]),
         )))
     }
 

diff --git a/native/core/src/execution/datafusion/expressions/stddev.rs b/native/core/src/execution/datafusion/expressions/stddev.rs
@@ -102,7 +102,7 @@ impl AggregateExpr for Stddev {
     }
 
     fn expressions(&self) -> Vec<Arc<dyn PhysicalExpr>> {
-        vec![self.expr.clone()]
+        vec![Arc::clone(&self.expr)]
     }
 
     fn name(&self) -> &str {

diff --git a/native/core/src/execution/datafusion/expressions/strings.rs b/native/core/src/execution/datafusion/expressions/strings.rs
@@ -228,7 +228,7 @@ impl PhysicalExpr for SubstringExpr {
         children: Vec<Arc<dyn PhysicalExpr>>,
     ) -> datafusion_common::Result<Arc<dyn PhysicalExpr>> {
         Ok(Arc::new(SubstringExpr::new(
-            children[0].clone(),
+            Arc::clone(&children[0]),
             self.start,
             self.len,
         )))
@@ -292,7 +292,7 @@ impl PhysicalExpr for StringSpaceExpr {
         self: Arc<Self>,
         children: Vec<Arc<dyn PhysicalExpr>>,
     ) -> datafusion_common::Result<Arc<dyn PhysicalExpr>> {
-        Ok(Arc::new(StringSpaceExpr::new(children[0].clone())))
+        Ok(Arc::new(StringSpaceExpr::new(Arc::clone(&children[0]))))
     }
 
     fn dyn_hash(&self, state: &mut dyn Hasher) {

diff --git a/native/core/src/execution/datafusion/expressions/sum_decimal.rs b/native/core/src/execution/datafusion/expressions/sum_decimal.rs
@@ -94,7 +94,7 @@ impl AggregateExpr for SumDecimal {
     }
 
     fn expressions(&self) -> Vec<Arc<dyn PhysicalExpr>> {
-        vec![self.expr.clone()]
+        vec![Arc::clone(&self.expr)]
     }
 
     fn name(&self) -> &str {

diff --git a/native/core/src/execution/datafusion/expressions/variance.rs b/native/core/src/execution/datafusion/expressions/variance.rs
@@ -100,7 +100,7 @@ impl AggregateExpr for Variance {
     }
 
     fn expressions(&self) -> Vec<Arc<dyn PhysicalExpr>> {
-        vec![self.expr.clone()]
+        vec![Arc::clone(&self.expr)]
     }
 
     fn name(&self) -> &str {

diff --git a/native/core/src/execution/datafusion/operators/expand.rs b/native/core/src/execution/datafusion/operators/expand.rs
@@ -52,7 +52,7 @@ impl CometExpandExec {
         schema: SchemaRef,
     ) -> Self {
         let cache = PlanProperties::new(
-            EquivalenceProperties::new(schema.clone()),
+            EquivalenceProperties::new(Arc::clone(&schema)),
             Partitioning::UnknownPartitioning(1),
             ExecutionMode::Bounded,
         );
@@ -93,7 +93,7 @@ impl ExecutionPlan for CometExpandExec {
     }
 
     fn schema(&self) -> SchemaRef {
-        self.schema.clone()
+        Arc::clone(&self.schema)
     }
 
     fn children(&self) -> Vec<&Arc<dyn ExecutionPlan>> {
@@ -106,8 +106,8 @@ impl ExecutionPlan for CometExpandExec {
     ) -> datafusion_common::Result<Arc<dyn ExecutionPlan>> {
         let new_expand = CometExpandExec::new(
             self.projections.clone(),
-            children[0].clone(),
-            self.schema.clone(),
+            Arc::clone(&children[0]),
+            Arc::clone(&self.schema),
         );
         Ok(Arc::new(new_expand))
     }
@@ -118,8 +118,11 @@ impl ExecutionPlan for CometExpandExec {
         context: Arc<TaskContext>,
     ) -> datafusion_common::Result<SendableRecordBatchStream> {
         let child_stream = self.child.execute(partition, context)?;
-        let expand_stream =
-            ExpandStream::new(self.projections.clone(), child_stream, self.schema.clone());
+        let expand_stream = ExpandStream::new(
+            self.projections.clone(),
+            child_stream,
+            Arc::clone(&self.schema),
+        );
         Ok(Box::pin(expand_stream))
     }
 
@@ -174,7 +177,7 @@ impl ExpandStream {
         })?;
 
         let options = RecordBatchOptions::new().with_row_count(Some(batch.num_rows()));
-        RecordBatch::try_new_with_options(self.schema.clone(), columns, &options)
+        RecordBatch::try_new_with_options(Arc::clone(&self.schema), columns, &options)
             .map_err(|e| e.into())
     }
 }
@@ -210,6 +213,6 @@ impl Stream for ExpandStream {
 
 impl RecordBatchStream for ExpandStream {
     fn schema(&self) -> SchemaRef {
-        self.schema.clone()
+        Arc::clone(&self.schema)
     }
 }