From 5d59164bfe4d2b69f08a58c37fce233de203b204 Mon Sep 17 00:00:00 2001
From: light-city <455954986@qq.com>
Date: Wed, 10 Apr 2024 16:43:28 +0800
Subject: [PATCH] fix lint for hashjoin test

---
 cpp/src/arrow/acero/hash_join_node_test.cc | 9 ++++++---
 cpp/src/arrow/acero/swiss_join.cc          | 8 +++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/cpp/src/arrow/acero/hash_join_node_test.cc b/cpp/src/arrow/acero/hash_join_node_test.cc
index c6818ca491ba3..6bb220a7dc40c 100644
--- a/cpp/src/arrow/acero/hash_join_node_test.cc
+++ b/cpp/src/arrow/acero/hash_join_node_test.cc
@@ -2038,14 +2038,17 @@ TEST(HashJoin, ResidualFilter) {
 
 TEST(HashJoin, FilterEmptyRows) {
   BatchesWithSchema input_left;
-  input_left.batches = {ExecBatchFromJSON({int32(), utf8(), int32()}, R"([[2, "Jarry", 28]])")};
-  input_left.schema = schema({field("id", int32()), field("name", utf8()), field("age", int32())});
+  input_left.batches = {
+      ExecBatchFromJSON({int32(), utf8(), int32()}, R"([[2, "Jarry", 28]])")};
+  input_left.schema =
+      schema({field("id", int32()), field("name", utf8()), field("age", int32())});
 
   BatchesWithSchema input_right;
   input_right.batches = {ExecBatchFromJSON(
       {int32(), int32(), utf8()},
       R"([[2, 10, "Jack"], [3, 12, "Mark"], [4, 15, "Tom"], [1, 10, "Jack"]])")};
-  input_right.schema = schema({field("id", int32()), field("stu_id", int32()), field("subject", utf8())});
+  input_right.schema =
+      schema({field("id", int32()), field("stu_id", int32()), field("subject", utf8())});
 
   const ResidualFilterCaseRunner runner{std::move(input_left), std::move(input_right)};
 
diff --git a/cpp/src/arrow/acero/swiss_join.cc b/cpp/src/arrow/acero/swiss_join.cc
index a042ed4f07755..542e943c4a82b 100644
--- a/cpp/src/arrow/acero/swiss_join.cc
+++ b/cpp/src/arrow/acero/swiss_join.cc
@@ -2160,9 +2160,6 @@ Status JoinResidualFilter::FilterOneBatch(const ExecBatch& keypayload_batch,
                                           bool output_key_ids, bool output_payload_ids,
                                           arrow::util::TempVectorStack* temp_stack,
                                           int* num_passing_rows) const {
-  if (num_batch_rows == 0) {
-    return Status::OK();
-  }
   // Caller must do shortcuts for trivial filter.
   ARROW_DCHECK(!filter_.IsNullLiteral() && filter_ != literal(true) &&
                filter_ != literal(false));
@@ -2170,6 +2167,11 @@ Status JoinResidualFilter::FilterOneBatch(const ExecBatch& keypayload_batch,
   ARROW_DCHECK(!output_payload_ids || payload_ids_maybe_null);
 
   *num_passing_rows = 0;
+
+  if (num_batch_rows == 0) {
+    return Status::OK();
+  }
+
   ARROW_ASSIGN_OR_RAISE(Datum mask,
                         EvalFilter(keypayload_batch, num_batch_rows, batch_row_ids,
                                    key_ids_maybe_null, payload_ids_maybe_null));