From e88a3b17f897e0aa883a25499f952f7346fd34ab Mon Sep 17 00:00:00 2001
From: Ritchie Vink <ritchie46@gmail.com>
Date: Wed, 26 May 2021 08:34:30 +0200
Subject: [PATCH] rename filter kernel argument

rename argument: 'filter' to 'predicate'
to reduce name collissions.
---
 arrow/src/compute/kernels/filter.rs | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/arrow/src/compute/kernels/filter.rs b/arrow/src/compute/kernels/filter.rs
index 46eb05b6859..b15692e90f2 100644
--- a/arrow/src/compute/kernels/filter.rs
+++ b/arrow/src/compute/kernels/filter.rs
@@ -244,16 +244,15 @@ fn prep_null_mask_filter(filter: &BooleanArray) -> BooleanArray {
 /// # Ok(())
 /// # }
 /// ```
-pub fn filter(array: &Array, filter: &BooleanArray) -> Result<ArrayRef> {
-    if filter.null_count() > 0 {
+pub fn filter(array: &Array, predicate: &BooleanArray) -> Result<ArrayRef> {
+    if predicate.null_count() > 0 {
         // this greatly simplifies subsequent filtering code
         // now we only have a boolean mask to deal with
-        let filter = prep_null_mask_filter(filter);
-        // fully qualified syntax, because we have an argument with the same name
-        return crate::compute::kernels::filter::filter(array, &filter);
+        let predicate = prep_null_mask_filter(predicate);
+        return filter(array, &predicate);
     }
 
-    let iter = SlicesIterator::new(filter);
+    let iter = SlicesIterator::new(predicate);
     match iter.filter_count {
         0 => {
             // return empty
@@ -278,20 +277,16 @@ pub fn filter(array: &Array, filter: &BooleanArray) -> Result<ArrayRef> {
 /// Returns a new [RecordBatch] with arrays containing only values matching the filter.
 pub fn filter_record_batch(
     record_batch: &RecordBatch,
-    filter: &BooleanArray,
+    predicate: &BooleanArray,
 ) -> Result<RecordBatch> {
-    if filter.null_count() > 0 {
+    if predicate.null_count() > 0 {
         // this greatly simplifies subsequent filtering code
         // now we only have a boolean mask to deal with
-        let filter = prep_null_mask_filter(filter);
-        // fully qualified syntax, because we have an argument with the same name
-        return crate::compute::kernels::filter::filter_record_batch(
-            record_batch,
-            &filter,
-        );
+        let predicate = prep_null_mask_filter(predicate);
+        return filter_record_batch(record_batch, &predicate);
     }
 
-    let filter = build_filter(filter)?;
+    let filter = build_filter(predicate)?;
     let filtered_arrays = record_batch
         .columns()
         .iter()