[arrow] branch main updated: GH-35539: [C++] Remove use of internal header files from public header file (#35592)

[apitrou]

This is an automated email from the ASF dual-hosted git repository.

apitrou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new 505a2e4519 GH-35539: [C++] Remove use of internal header files from 
public header file (#35592)
505a2e4519 is described below

commit 505a2e4519ba8d4983da6caa1c56ecae8d063e84
Author: Davide Pasetto <dpasett...@gmail.com>
AuthorDate: Tue May 16 12:32:20 2023 -0400

    GH-35539: [C++] Remove use of internal header files from public header file 
(#35592)
    
    
    ### What changes are included in this PR?
    
    Remove use of compute/util_internal.h in compute/key_map.h
    
    * Closes: #35539
    
    Lead-authored-by: Davide Pasetto <dpasett...@gmail.com>
    Co-authored-by: Antoine Pitrou <anto...@python.org>
    Signed-off-by: Antoine Pitrou <anto...@python.org>
---
 cpp/src/arrow/compute/key_map.cc |  1 +
 cpp/src/arrow/compute/key_map.h  | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cpp/src/arrow/compute/key_map.cc b/cpp/src/arrow/compute/key_map.cc
index 20bf1bf089..fd5c404a07 100644
--- a/cpp/src/arrow/compute/key_map.cc
+++ b/cpp/src/arrow/compute/key_map.cc
@@ -22,6 +22,7 @@
 
 #include "arrow/util/bit_util.h"
 #include "arrow/util/bitmap_ops.h"
+#include "arrow/util/logging.h"
 #include "arrow/util/ubsan.h"
 
 namespace arrow {
diff --git a/cpp/src/arrow/compute/key_map.h b/cpp/src/arrow/compute/key_map.h
index bfa75760f0..7ab48470f2 100644
--- a/cpp/src/arrow/compute/key_map.h
+++ b/cpp/src/arrow/compute/key_map.h
@@ -17,13 +17,13 @@
 
 #pragma once
 
+#include <cassert>
 #include <functional>
 
 #include "arrow/compute/util.h"
-#include "arrow/compute/util_internal.h"
-#include "arrow/memory_pool.h"
 #include "arrow/result.h"
 #include "arrow/status.h"
+#include "arrow/type_fwd.h"
 
 namespace arrow {
 namespace compute {
@@ -245,8 +245,8 @@ uint64_t SwissTable::extract_group_id(const uint8_t* 
block_ptr, int slot,
   // bytes. We assume here that the number of bits is rounded up to 8, 16, 32 
or 64. In
   // that case we can extract group id using aligned 64-bit word access.
   int num_group_id_bits = static_cast<int>(ARROW_POPCOUNT64(group_id_mask));
-  ARROW_DCHECK(num_group_id_bits == 8 || num_group_id_bits == 16 ||
-               num_group_id_bits == 32 || num_group_id_bits == 64);
+  assert(num_group_id_bits == 8 || num_group_id_bits == 16 || 
num_group_id_bits == 32 ||
+         num_group_id_bits == 64);
 
   int bit_offset = slot * num_group_id_bits;
   const uint64_t* group_id_bytes =
@@ -262,8 +262,8 @@ void SwissTable::insert_into_empty_slot(uint32_t slot_id, 
uint32_t hash,
 
   // We assume here that the number of bits is rounded up to 8, 16, 32 or 64.
   // In that case we can insert group id value using aligned 64-bit word 
access.
-  ARROW_DCHECK(num_groupid_bits == 8 || num_groupid_bits == 16 ||
-               num_groupid_bits == 32 || num_groupid_bits == 64);
+  assert(num_groupid_bits == 8 || num_groupid_bits == 16 || num_groupid_bits 
== 32 ||
+         num_groupid_bits == 64);
 
   const uint64_t num_block_bytes = (8 + num_groupid_bits);
   constexpr uint64_t stamp_mask = 0x7f;
@@ -278,7 +278,7 @@ void SwissTable::insert_into_empty_slot(uint32_t slot_id, 
uint32_t hash,
   int groupid_bit_offset = static_cast<int>(start_slot * num_groupid_bits);
 
   // Block status bytes should start at an address aligned to 8 bytes
-  ARROW_DCHECK((reinterpret_cast<uint64_t>(blockbase) & 7) == 0);
+  assert((reinterpret_cast<uint64_t>(blockbase) & 7) == 0);
   uint64_t* ptr = reinterpret_cast<uint64_t*>(blockbase) + 1 + 
(groupid_bit_offset >> 6);
   *ptr |= (static_cast<uint64_t>(group_id) << (groupid_bit_offset & 63));
 }