Skip to content

Commit b0f622f

Browse files
pitroupitrou
committed
Add ARROW_FORCE_INLINE
1 parent 710cedd commit b0f622f

1 file changed

Lines changed: 34 additions & 26 deletions

File tree

‎cpp/src/arrow/util/bit_run_reader.h‎

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -471,8 +471,8 @@ using ReverseSetBitRunReader = BaseSetBitRunReader</*Reverse=*/true>;
471471
// Functional-style bit run visitors.
472472

473473
template <typename Visit>
474-
inline Status VisitBitRuns(const uint8_t* bitmap, int64_t offset, int64_t length,
475-
Visit&& visit) {
474+
ARROW_FORCE_INLINE Status VisitBitRuns(const uint8_t* bitmap, int64_t offset,
475+
int64_t length, Visit&& visit) {
476476
if (bitmap == NULLPTR) {
477477
// Assuming all set (as in a null bitmap)
478478
return visit(static_cast<int64_t>(0), length, true);
@@ -495,8 +495,8 @@ inline Status VisitBitRuns(const uint8_t* bitmap, int64_t offset, int64_t length
495495
// - don't inline SetBitRunReader constructor, it doesn't hurt performance
496496
// - un-inline NextRun hurts 'many null' cases a bit, but improves normal cases
497497
template <typename Visit>
498-
inline Status VisitSetBitRuns(const uint8_t* bitmap, int64_t offset, int64_t length,
499-
Visit&& visit) {
498+
ARROW_FORCE_INLINE Status VisitSetBitRuns(const uint8_t* bitmap, int64_t offset,
499+
int64_t length, Visit&& visit) {
500500
if (bitmap == NULLPTR) {
501501
// Assuming all set (as in a null bitmap)
502502
return visit(static_cast<int64_t>(0), static_cast<int64_t>(length));
@@ -513,8 +513,8 @@ inline Status VisitSetBitRuns(const uint8_t* bitmap, int64_t offset, int64_t len
513513
}
514514

515515
template <typename Visit>
516-
inline void VisitSetBitRunsVoid(const uint8_t* bitmap, int64_t offset, int64_t length,
517-
Visit&& visit) {
516+
ARROW_FORCE_INLINE void VisitSetBitRunsVoid(const uint8_t* bitmap, int64_t offset,
517+
int64_t length, Visit&& visit) {
518518
if (bitmap == NULLPTR) {
519519
// Assuming all set (as in a null bitmap)
520520
visit(static_cast<int64_t>(0), static_cast<int64_t>(length));
@@ -531,24 +531,27 @@ inline void VisitSetBitRunsVoid(const uint8_t* bitmap, int64_t offset, int64_t l
531531
}
532532

533533
template <typename Visit>
534-
inline Status VisitSetBitRuns(const std::shared_ptr<Buffer>& bitmap, int64_t offset,
535-
int64_t length, Visit&& visit) {
534+
ARROW_FORCE_INLINE Status VisitSetBitRuns(const std::shared_ptr<Buffer>& bitmap,
535+
int64_t offset, int64_t length, Visit&& visit) {
536536
return VisitSetBitRuns(bitmap ? bitmap->data() : NULLPTR, offset, length,
537537
std::forward<Visit>(visit));
538538
}
539539

540540
template <typename Visit>
541-
inline void VisitSetBitRunsVoid(const std::shared_ptr<Buffer>& bitmap, int64_t offset,
542-
int64_t length, Visit&& visit) {
541+
ARROW_FORCE_INLINE void VisitSetBitRunsVoid(const std::shared_ptr<Buffer>& bitmap,
542+
int64_t offset, int64_t length,
543+
Visit&& visit) {
543544
VisitSetBitRunsVoid(bitmap ? bitmap->data() : NULLPTR, offset, length,
544545
std::forward<Visit>(visit));
545546
}
546547

547548
template <typename Visit>
548-
inline Status VisitTwoSetBitRuns(const uint8_t* left_bitmap, int64_t left_offset,
549-
const uint8_t* right_bitmap, int64_t right_offset,
550-
int64_t length, Visit&& visit,
551-
MemoryPool* pool = default_memory_pool()) {
549+
ARROW_FORCE_INLINE Status VisitTwoSetBitRuns(const uint8_t* left_bitmap,
550+
int64_t left_offset,
551+
const uint8_t* right_bitmap,
552+
int64_t right_offset, int64_t length,
553+
Visit&& visit,
554+
MemoryPool* pool = default_memory_pool()) {
552555
if (length == 0) {
553556
return Status::OK();
554557
}
@@ -582,10 +585,11 @@ inline Status VisitTwoSetBitRuns(const uint8_t* left_bitmap, int64_t left_offset
582585
}
583586

584587
template <typename Visit>
585-
inline Status VisitTwoBitRuns(const uint8_t* left_bitmap, int64_t left_offset,
586-
const uint8_t* right_bitmap, int64_t right_offset,
587-
int64_t length, Visit&& visit,
588-
MemoryPool* pool = default_memory_pool()) {
588+
ARROW_FORCE_INLINE Status VisitTwoBitRuns(const uint8_t* left_bitmap, int64_t left_offset,
589+
const uint8_t* right_bitmap,
590+
int64_t right_offset, int64_t length,
591+
Visit&& visit,
592+
MemoryPool* pool = default_memory_pool()) {
589593
int64_t output_position = 0;
590594
ARROW_RETURN_NOT_OK(VisitTwoSetBitRuns(
591595
left_bitmap, left_offset, right_bitmap, right_offset, length,
@@ -605,10 +609,12 @@ inline Status VisitTwoBitRuns(const uint8_t* left_bitmap, int64_t left_offset,
605609
}
606610

607611
template <typename Visit>
608-
inline void VisitTwoBitRunsVoid(const uint8_t* left_bitmap, int64_t left_offset,
609-
const uint8_t* right_bitmap, int64_t right_offset,
610-
int64_t length, Visit&& visit,
611-
MemoryPool* pool = default_memory_pool()) {
612+
ARROW_FORCE_INLINE void VisitTwoBitRunsVoid(const uint8_t* left_bitmap,
613+
int64_t left_offset,
614+
const uint8_t* right_bitmap,
615+
int64_t right_offset, int64_t length,
616+
Visit&& visit,
617+
MemoryPool* pool = default_memory_pool()) {
612618
ARROW_IGNORE_EXPR(VisitTwoBitRuns(
613619
left_bitmap, left_offset, right_bitmap, right_offset, length,
614620
[&](int64_t position, int64_t length, bool set) {
@@ -619,10 +625,12 @@ inline void VisitTwoBitRunsVoid(const uint8_t* left_bitmap, int64_t left_offset,
619625
}
620626

621627
template <typename Visit>
622-
inline void VisitTwoSetBitRunsVoid(const uint8_t* left_bitmap, int64_t left_offset,
623-
const uint8_t* right_bitmap, int64_t right_offset,
624-
int64_t length, Visit&& visit,
625-
MemoryPool* pool = default_memory_pool()) {
628+
ARROW_FORCE_INLINE void VisitTwoSetBitRunsVoid(const uint8_t* left_bitmap,
629+
int64_t left_offset,
630+
const uint8_t* right_bitmap,
631+
int64_t right_offset, int64_t length,
632+
Visit&& visit,
633+
MemoryPool* pool = default_memory_pool()) {
626634
ARROW_IGNORE_EXPR(VisitTwoSetBitRuns(
627635
left_bitmap, left_offset, right_bitmap, right_offset, length,
628636
[&](int64_t position, int64_t length) {

0 commit comments

Comments
 (0)