Skip to content

Commit a2f1519

Browse files
committed
Uniform BitMap > Bitmap
1 parent 4cff28b commit a2f1519

2 files changed

Lines changed: 82 additions & 82 deletions

File tree

cpp/src/arrow/util/rle_bitmap_internal.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ using BitmapSpanConst = BitmapSpan<const uint8_t>;
7272

7373
namespace internal_rle {
7474
template <typename CRTP>
75-
class RunToBitMapDecoderMixin {
75+
class RunToBitmapDecoderMixin {
7676
public:
7777
/// Advance by as many values as provided or until exhaustion of the decoder.
7878
/// Return the number of values skipped.
@@ -156,15 +156,15 @@ class RunToBitMapDecoderMixin {
156156
};
157157
} // namespace internal_rle
158158

159-
class RleRunToBitMapDecoder
160-
: public internal_rle::RunToBitMapDecoderMixin<RleRunToBitMapDecoder> {
159+
class RleRunToBitmapDecoder
160+
: public internal_rle::RunToBitmapDecoderMixin<RleRunToBitmapDecoder> {
161161
public:
162162
/// The type of run that can be decoded.
163163
using RunType = RleRun;
164164

165-
constexpr RleRunToBitMapDecoder() noexcept = default;
165+
constexpr RleRunToBitmapDecoder() noexcept = default;
166166

167-
explicit RleRunToBitMapDecoder(const RunType& run) noexcept { Reset(run); }
167+
explicit RleRunToBitmapDecoder(const RunType& run) noexcept { Reset(run); }
168168

169169
void Reset(const RunType& run) noexcept {
170170
values_left_ = run.values_count();
@@ -182,7 +182,7 @@ class RleRunToBitMapDecoder
182182
constexpr bool value() const { return value_pattern_ != 0; }
183183

184184
private:
185-
friend class internal_rle::RunToBitMapDecoderMixin<RleRunToBitMapDecoder>;
185+
friend class internal_rle::RunToBitmapDecoderMixin<RleRunToBitmapDecoder>;
186186

187187
/// The byte pattern for 8 values (full ones or full zeros).
188188
uint8_t value_pattern_ = {};
@@ -207,15 +207,15 @@ class RleRunToBitMapDecoder
207207
}
208208
};
209209

210-
class BitPackedRunToBitMapDecoder
211-
: public internal_rle::RunToBitMapDecoderMixin<BitPackedRunToBitMapDecoder> {
210+
class BitPackedRunToBitmapDecoder
211+
: public internal_rle::RunToBitmapDecoderMixin<BitPackedRunToBitmapDecoder> {
212212
public:
213213
/// The type of run that can be decoded.
214214
using RunType = BitPackedRun;
215215

216-
constexpr BitPackedRunToBitMapDecoder() noexcept = default;
216+
constexpr BitPackedRunToBitmapDecoder() noexcept = default;
217217

218-
explicit BitPackedRunToBitMapDecoder(const RunType& run) noexcept { Reset(run); }
218+
explicit BitPackedRunToBitmapDecoder(const RunType& run) noexcept { Reset(run); }
219219

220220
void Reset(const RunType& run) noexcept {
221221
data_ = run.raw_data_ptr();
@@ -241,8 +241,8 @@ class BitPackedRunToBitMapDecoder
241241
}
242242

243243
private:
244-
using Base = internal_rle::RunToBitMapDecoderMixin<BitPackedRunToBitMapDecoder>;
245-
friend class internal_rle::RunToBitMapDecoderMixin<BitPackedRunToBitMapDecoder>;
244+
using Base = internal_rle::RunToBitmapDecoderMixin<BitPackedRunToBitmapDecoder>;
245+
friend class internal_rle::RunToBitmapDecoderMixin<BitPackedRunToBitmapDecoder>;
246246

247247
/// The pointer to the beginning of the run
248248
const uint8_t* data_ = nullptr;
@@ -334,14 +334,14 @@ class BitPackedRunToBitMapDecoder
334334
/// no repetition and no nesting), we know values to be decoded will end up in an
335335
/// Arrow validity bitmap. In such cases, decoding values to a ``int16`` before
336336
/// encoding them again in overly wasteful.
337-
class RleBitPackedToBitMapDecoder {
337+
class RleBitPackedToBitmapDecoder {
338338
public:
339-
RleBitPackedToBitMapDecoder() noexcept = default;
339+
RleBitPackedToBitmapDecoder() noexcept = default;
340340

341341
/// Create a decoder object.
342342
///
343343
/// data and data_size are the raw bytes to decode.
344-
RleBitPackedToBitMapDecoder(const uint8_t* data, rle_size_t data_size) noexcept {
344+
RleBitPackedToBitmapDecoder(const uint8_t* data, rle_size_t data_size) noexcept {
345345
Reset(data, data_size);
346346
}
347347

@@ -364,17 +364,17 @@ class RleBitPackedToBitMapDecoder {
364364
struct get_decoder;
365365
template <>
366366
struct get_decoder<RleRun> {
367-
using type = RleRunToBitMapDecoder;
367+
using type = RleRunToBitmapDecoder;
368368
};
369369
template <>
370370
struct get_decoder<BitPackedRun> {
371-
using type = BitPackedRunToBitMapDecoder;
371+
using type = BitPackedRunToBitmapDecoder;
372372
};
373373
template <typename Run>
374374
using get_decoder_t = get_decoder<Run>::type;
375375

376376
RleBitPackedParser parser_ = {};
377-
std::variant<RleRunToBitMapDecoder, BitPackedRunToBitMapDecoder> decoder_ = {};
377+
std::variant<RleRunToBitmapDecoder, BitPackedRunToBitmapDecoder> decoder_ = {};
378378

379379
/// Return the number of values that are remaining in the current run.
380380
rle_size_t run_remaining() const {
@@ -388,10 +388,10 @@ class RleBitPackedToBitMapDecoder {
388388
};
389389

390390
/************************************************
391-
* RleBitPackedToBitMapDecoder implementation *
391+
* RleBitPackedToBitmapDecoder implementation *
392392
************************************************/
393393

394-
inline auto RleBitPackedToBitMapDecoder::GetBatch(BitmapSpanMut out,
394+
inline auto RleBitPackedToBitmapDecoder::GetBatch(BitmapSpanMut out,
395395
rle_size_t batch_size) -> rle_size_t {
396396
using ControlFlow = RleBitPackedParser::ControlFlow;
397397

0 commit comments

Comments
 (0)