fix lint for hashjoin test

apache · Apr 15, 2024 · 5d59164 · 5d59164
1 parent 6bdcea8
commit 5d59164
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git 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
@@ -2160,16 +2160,18 @@ 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));
  ARROW_DCHECK(!output_key_ids || key_ids_maybe_null);
  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));