Skip to content

Commit 989cf12

Browse files
committed
fix clippy
1 parent 80f5f1e commit 989cf12

File tree

8 files changed

+16
-15
lines changed

8 files changed

+16
-15
lines changed

bitpacker/src/bitpacker.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ impl BitPacker {
4848

4949
pub fn flush<TWrite: io::Write + ?Sized>(&mut self, output: &mut TWrite) -> io::Result<()> {
5050
if self.mini_buffer_written > 0 {
51-
let num_bytes = (self.mini_buffer_written + 7) / 8;
51+
let num_bytes = self.mini_buffer_written.div_ceil(8);
5252
let bytes = self.mini_buffer.to_le_bytes();
5353
output.write_all(&bytes[..num_bytes])?;
5454
self.mini_buffer_written = 0;
@@ -138,7 +138,7 @@ impl BitUnpacker {
138138

139139
// We use `usize` here to avoid overflow issues.
140140
let end_bit_read = (end_idx as usize) * self.num_bits;
141-
let end_byte_read = (end_bit_read + 7) / 8;
141+
let end_byte_read = end_bit_read.div_ceil(8);
142142
assert!(
143143
end_byte_read <= data.len(),
144144
"Requested index is out of bounds."
@@ -258,7 +258,7 @@ mod test {
258258
bitpacker.write(val, num_bits, &mut data).unwrap();
259259
}
260260
bitpacker.close(&mut data).unwrap();
261-
assert_eq!(data.len(), ((num_bits as usize) * len + 7) / 8);
261+
assert_eq!(data.len(), ((num_bits as usize) * len).div_ceil(8));
262262
let bitunpacker = BitUnpacker::new(num_bits);
263263
(bitunpacker, vals, data)
264264
}
@@ -304,7 +304,7 @@ mod test {
304304
bitpacker.write(val, num_bits, &mut buffer).unwrap();
305305
}
306306
bitpacker.flush(&mut buffer).unwrap();
307-
assert_eq!(buffer.len(), (vals.len() * num_bits as usize + 7) / 8);
307+
assert_eq!(buffer.len(), (vals.len() * num_bits as usize).div_ceil(8));
308308
let bitunpacker = BitUnpacker::new(num_bits);
309309
let max_val = if num_bits == 64 {
310310
u64::MAX

columnar/benches/bench_values_u64.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ fn bench_intfastfield_stride7_vec(b: &mut Bencher) {
141141
b.iter(|| {
142142
let mut a = 0u64;
143143
for i in (0..n / 7).map(|val| val * 7) {
144-
a += permutation[i as usize];
144+
a += permutation[i];
145145
}
146146
a
147147
});
@@ -196,7 +196,7 @@ fn bench_intfastfield_scan_all_vec(b: &mut Bencher) {
196196
b.iter(|| {
197197
let mut a = 0u64;
198198
for i in 0..permutation.len() {
199-
a += permutation[i as usize] as u64;
199+
a += permutation[i] as u64;
200200
}
201201
a
202202
});

columnar/src/column_index/merge/stacked.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,11 @@ fn get_num_values_iterator<'a>(
105105
) -> Box<dyn Iterator<Item = u32> + 'a> {
106106
match column_index {
107107
ColumnIndex::Empty { .. } => Box::new(std::iter::empty()),
108-
ColumnIndex::Full => Box::new(std::iter::repeat(1u32).take(num_docs as usize)),
109-
ColumnIndex::Optional(optional_index) => {
110-
Box::new(std::iter::repeat(1u32).take(optional_index.num_non_nulls() as usize))
111-
}
108+
ColumnIndex::Full => Box::new(std::iter::repeat_n(1u32, num_docs as usize)),
109+
ColumnIndex::Optional(optional_index) => Box::new(std::iter::repeat_n(
110+
1u32,
111+
optional_index.num_non_nulls() as usize,
112+
)),
112113
ColumnIndex::Multivalued(multivalued_index) => Box::new(
113114
multivalued_index
114115
.get_start_index_column()

columnar/src/column_values/u64_based/bitpacked.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ impl ColumnCodecEstimator for BitpackedCodecEstimator {
109109

110110
fn estimate(&self, stats: &ColumnStats) -> Option<u64> {
111111
let num_bits_per_value = num_bits(stats);
112-
Some(stats.num_bytes() + (stats.num_rows as u64 * (num_bits_per_value as u64) + 7) / 8)
112+
Some(stats.num_bytes() + (stats.num_rows as u64 * (num_bits_per_value as u64)).div_ceil(8))
113113
}
114114

115115
fn serialize(

columnar/src/column_values/u64_based/linear.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ impl ColumnCodecEstimator for LinearCodecEstimator {
117117
Some(
118118
stats.num_bytes()
119119
+ linear_params.num_bytes()
120-
+ (num_bits as u64 * stats.num_rows as u64 + 7) / 8,
120+
+ (num_bits as u64 * stats.num_rows as u64).div_ceil(8),
121121
)
122122
}
123123

columnar/src/columnar/writer/column_operation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ impl SymbolValue for UnorderedId {
244244

245245
fn compute_num_bytes_for_u64(val: u64) -> usize {
246246
let msb = (64u32 - val.leading_zeros()) as usize;
247-
(msb + 7) / 8
247+
msb.div_ceil(8)
248248
}
249249

250250
fn encode_zig_zag(n: i64) -> u64 {

common/src/bitset.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ pub struct BitSet {
183183
}
184184

185185
fn num_buckets(max_val: u32) -> u32 {
186-
(max_val + 63u32) / 64u32
186+
max_val.div_ceil(64u32)
187187
}
188188

189189
impl BitSet {

sstable/src/sstable_index_v3.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ impl BlockAddrBlockMetadata {
438438
let ordinal_addr = range_start_addr + self.range_start_nbits as usize;
439439
let range_end_addr = range_start_addr + num_bits;
440440

441-
if (range_end_addr + self.range_start_nbits as usize + 7) / 8 > data.len() {
441+
if (range_end_addr + self.range_start_nbits as usize).div_ceil(8) > data.len() {
442442
return None;
443443
}
444444

0 commit comments

Comments
 (0)