Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GH-35539: [C++] Remove use of internal header files from public header file #35592

Merged
merged 2 commits into from
May 16, 2023
Merged

GH-35539: [C++] Remove use of internal header files from public header file #35592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
468241a
remove use of _internal.h header file from public header file
ildipo May 15, 2023
2a9c94a
Remove use of logging.h in header file.
pitrou May 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions cpp/src/arrow/compute/key_map.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions cpp/src/arrow/compute/key_map.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 =
Expand All @@ -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;
Expand All @@ -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));
}
Expand Down