Skip to content

Commit ceff11e

Browse files
robert3005robert3005
committed
renames
1 parent 24c4b97 commit ceff11e

File tree

57 files changed

+365
-206
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+365
-206
lines changed

‎encodings/alp/src/alp/compute/between.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ mod tests {
9696
.unwrap()
9797
.to_bool()
9898
.unwrap()
99-
.boolean_buffer()
99+
.bit_buffer()
100100
.iter()
101101
.collect_vec();
102102
assert_eq!(res.len(), 1);

‎encodings/alp/src/alp/compute/compare.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ mod tests {
141141
{
142142
alp_scalar_compare(alp, value, operator)
143143
.unwrap()
144-
.map(|a| a.to_bool().unwrap().boolean_buffer().iter().collect())
144+
.map(|a| a.to_bool().unwrap().bit_buffer().iter().collect())
145145
}
146146

147147
#[test]
@@ -160,7 +160,7 @@ mod tests {
160160
.to_bool()
161161
.unwrap();
162162

163-
for v in r.boolean_buffer().iter() {
163+
for v in r.bit_buffer().iter() {
164164
assert!(!v);
165165
}
166166

@@ -170,7 +170,7 @@ mod tests {
170170
.to_bool()
171171
.unwrap();
172172

173-
for v in r.boolean_buffer().iter() {
173+
for v in r.bit_buffer().iter() {
174174
assert!(v);
175175
}
176176
}
@@ -192,7 +192,7 @@ mod tests {
192192
.to_bool()
193193
.unwrap();
194194

195-
assert!(r_eq.boolean_buffer().iter().all(|v| !v));
195+
assert!(r_eq.bit_buffer().iter().all(|v| !v));
196196

197197
#[allow(clippy::excessive_precision)]
198198
let r_neq = alp_scalar_compare(&encoded, 1.234444f32, Operator::NotEq)
@@ -201,7 +201,7 @@ mod tests {
201201
.to_bool()
202202
.unwrap();
203203

204-
assert!(r_neq.boolean_buffer().iter().all(|v| v));
204+
assert!(r_neq.bit_buffer().iter().all(|v| v));
205205
}
206206

207207
#[test]
@@ -221,7 +221,7 @@ mod tests {
221221
.unwrap();
222222

223223
// !(0.0605_f32 >= 0.06051_f32);
224-
assert!(r_gte.boolean_buffer().iter().all(|v| !v));
224+
assert!(r_gte.bit_buffer().iter().all(|v| !v));
225225

226226
let r_gt = alp_scalar_compare(&encoded, 0.06051_f32, Operator::Gt)
227227
.unwrap()
@@ -230,7 +230,7 @@ mod tests {
230230
.unwrap();
231231

232232
// (0.0605_f32 > 0.06051_f32);
233-
assert!(r_gt.boolean_buffer().iter().all(|v| !v));
233+
assert!(r_gt.bit_buffer().iter().all(|v| !v));
234234

235235
let r_lte = alp_scalar_compare(&encoded, 0.06051_f32, Operator::Lte)
236236
.unwrap()
@@ -239,7 +239,7 @@ mod tests {
239239
.unwrap();
240240

241241
// 0.0605_f32 <= 0.06051_f32;
242-
assert!(r_lte.boolean_buffer().iter().all(|v| v));
242+
assert!(r_lte.bit_buffer().iter().all(|v| v));
243243

244244
let r_lt = alp_scalar_compare(&encoded, 0.06051_f32, Operator::Lt)
245245
.unwrap()
@@ -248,7 +248,7 @@ mod tests {
248248
.unwrap();
249249

250250
//0.0605_f32 < 0.06051_f32;
251-
assert!(r_lt.boolean_buffer().iter().all(|v| v));
251+
assert!(r_lt.bit_buffer().iter().all(|v| v));
252252
}
253253

254254
#[test]
@@ -313,7 +313,7 @@ mod tests {
313313
.to_bool()
314314
.unwrap();
315315

316-
for v in r.boolean_buffer().iter() {
316+
for v in r.bit_buffer().iter() {
317317
assert!(!v);
318318
}
319319
}

‎encodings/decimal-byte-parts/src/decimal_byte_parts/compute/compare.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ mod tests {
9393
assert_eq!(
9494
res.to_bool()
9595
.unwrap()
96-
.boolean_buffer()
96+
.bit_buffer()
9797
.iter()
9898
.collect::<Vec<_>>(),
9999
vec![false, false, true]

‎encodings/dict/src/compute/compare.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ fn dict_equal_to(
5454
) -> VortexResult<ArrayRef> {
5555
let bool_result = values_compare.to_bool()?;
5656
let result_validity = bool_result.validity_mask()?;
57-
let bool_buffer = bool_result.boolean_buffer();
57+
let bool_buffer = bool_result.bit_buffer();
5858
let (first_match, second_match) = match result_validity.boolean_buffer() {
5959
AllOr::All => {
6060
let mut indices_iter = bool_buffer.set_indices();
@@ -147,7 +147,7 @@ mod tests {
147147
.unwrap();
148148
let res = res.to_bool().unwrap();
149149
assert_eq!(
150-
res.boolean_buffer().iter().collect::<Vec<_>>(),
150+
res.bit_buffer().iter().collect::<Vec<_>>(),
151151
vec![true, false, false]
152152
);
153153
}
@@ -168,7 +168,7 @@ mod tests {
168168
.unwrap();
169169
let res = res.to_bool().unwrap();
170170
assert_eq!(
171-
res.boolean_buffer().iter().collect::<Vec<_>>(),
171+
res.bit_buffer().iter().collect::<Vec<_>>(),
172172
vec![false, true, true]
173173
);
174174
}
@@ -193,7 +193,7 @@ mod tests {
193193
.unwrap();
194194
let res = res.to_bool().unwrap();
195195
assert_eq!(
196-
res.boolean_buffer().iter().collect::<Vec<_>>(),
196+
res.bit_buffer().iter().collect::<Vec<_>>(),
197197
vec![false, false, false]
198198
);
199199
assert_eq!(res.dtype().nullability(), Nullability::Nullable);
@@ -223,7 +223,7 @@ mod tests {
223223
.unwrap();
224224
let res = res.to_bool().unwrap();
225225
assert_eq!(
226-
res.boolean_buffer().iter().collect::<Vec<_>>(),
226+
res.bit_buffer().iter().collect::<Vec<_>>(),
227227
vec![false, false, false]
228228
);
229229
assert_eq!(res.dtype().nullability(), Nullability::Nullable);

‎encodings/dict/src/compute/fill_null.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ impl FillNullKernel for DictVTable {
1717
)?
1818
.to_bool()?;
1919

20-
let Some(first_fill_value) = found_fill_values.boolean_buffer().set_indices().next() else {
20+
let Some(first_fill_value) = found_fill_values.bit_buffer().set_indices().next() else {
2121
// No fill values found, so we must canonicalize and fill_null.
2222
// TODO(ngates): compute kernels should all return Option<ArrayRef> to support this
2323
// fall back.

‎encodings/fastlanes/src/for/compute/compare.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,6 @@ mod tests {
187187
expected: T,
188188
) {
189189
let result = result.unwrap().unwrap().to_bool().unwrap();
190-
assert_eq!(result.boolean_buffer(), &BooleanBuffer::from_iter(expected));
190+
assert_eq!(result.bit_buffer(), &BooleanBuffer::from_iter(expected));
191191
}
192192
}

‎encodings/fsst/src/compute/compare.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ mod tests {
139139
assert_eq!(equals.dtype(), &DType::Bool(Nullability::Nullable));
140140

141141
assert_eq!(
142-
equals.boolean_buffer().into_iter().collect::<Vec<_>>(),
142+
equals.bit_buffer().into_iter().collect::<Vec<_>>(),
143143
vec![false, false, true, false, false]
144144
);
145145

@@ -151,7 +151,7 @@ mod tests {
151151

152152
assert_eq!(not_equals.dtype(), &DType::Bool(Nullability::Nullable));
153153
assert_eq!(
154-
not_equals.boolean_buffer().into_iter().collect::<Vec<_>>(),
154+
not_equals.bit_buffer().into_iter().collect::<Vec<_>>(),
155155
vec![true, true, false, true, true]
156156
);
157157

‎encodings/runend/src/array.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ impl ValidityVTable<RunEndVTable> for RunEndVTable {
188188
)
189189
.vortex_expect("invalid array")
190190
.into_array();
191-
Mask::from_buffer(ree_validity.to_bool()?.boolean_buffer().clone())
191+
Mask::from_buffer(ree_validity.to_bool()?.bit_buffer().clone())
192192
}
193193
})
194194
}

‎encodings/runend/src/compress.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub fn runend_encode(array: &PrimitiveArray) -> VortexResult<(PrimitiveArray, Ar
2525
ConstantArray::new(Scalar::null(array.dtype().clone()), 1).into_array(),
2626
));
2727
}
28-
Validity::Array(a) => Some(a.to_bool()?.boolean_buffer().clone()),
28+
Validity::Array(a) => Some(a.to_bool()?.bit_buffer().clone()),
2929
};
3030

3131
let (ends, values) = match validity {

‎encodings/runend/src/compute/compare.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ mod test {
6565
.unwrap();
6666
let res_canon = res.to_bool().unwrap();
6767
assert_eq!(
68-
res_canon.boolean_buffer(),
68+
res_canon.bit_buffer(),
6969
&BooleanBuffer::from(vec![
7070
false, false, false, false, false, false, false, false, true, true, true, true
7171
])

‎encodings/sparse/src/canonical.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,21 +123,21 @@ mod test {
123123
fill_value,
124124
);
125125

126-
assert_eq!(flat_bools.boolean_buffer(), expected.boolean_buffer());
126+
assert_eq!(flat_bools.bit_buffer(), expected.bit_buffer());
127127
assert_eq!(flat_bools.validity(), expected.validity());
128128

129-
assert!(flat_bools.boolean_buffer().value(0));
129+
assert!(flat_bools.bit_buffer().value(0));
130130
assert!(flat_bools.validity().is_valid(0).unwrap());
131131
assert_eq!(
132-
flat_bools.boolean_buffer().value(1),
132+
flat_bools.bit_buffer().value(1),
133133
fill_value.unwrap_or_default()
134134
);
135135
assert!(!flat_bools.validity().is_valid(1).unwrap());
136136
assert_eq!(
137137
flat_bools.validity().is_valid(2).unwrap(),
138138
fill_value.is_some()
139139
);
140-
assert!(!flat_bools.boolean_buffer().value(7));
140+
assert!(!flat_bools.bit_buffer().value(7));
141141
assert!(flat_bools.validity().is_valid(7).unwrap());
142142
}
143143

‎encodings/sparse/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ impl SparseArray {
192192
&Scalar::bool(true, Nullability::NonNullable),
193193
)?
194194
.to_bool()?
195-
.boolean_buffer()
195+
.bit_buffer()
196196
.clone(),
197197
);
198198

‎fuzz/fuzz_targets/file_io.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ fuzz_target!(|array_data: ArbitraryArray| -> Corpus {
7272
.vortex_unwrap()
7373
.to_bool()
7474
.vortex_unwrap();
75-
let true_count = bool_result.boolean_buffer().count_set_bits();
75+
let true_count = bool_result.bit_buffer().count_set_bits();
7676
if true_count != array_data.len()
7777
&& (bool_result.all_valid().vortex_unwrap()
7878
|| array_data.all_valid().vortex_unwrap())

‎fuzz/src/compare.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pub fn compare_canonical_array(
3232
Ok(compare_to(
3333
array
3434
.to_bool()?
35-
.boolean_buffer()
35+
.bit_buffer()
3636
.iter()
3737
.zip(array.validity_mask()?.to_boolean_buffer().iter())
3838
.map(|(b, v)| v.then_some(b)),

‎fuzz/src/filter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub fn filter_canonical_array(array: &dyn Array, filter: &[bool]) -> VortexResul
3131
BooleanBuffer::from_iter(
3232
filter
3333
.iter()
34-
.zip(bool_array.boolean_buffer().iter())
34+
.zip(bool_array.bit_buffer().iter())
3535
.filter(|(f, _)| **f)
3636
.map(|(_, v)| v),
3737
),

‎fuzz/src/search_sorted.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ pub fn search_sorted_canonical_array(
5353
let bool_array = array.to_bool()?;
5454
let validity = bool_array.validity_mask()?.to_boolean_buffer();
5555
let opt_values = bool_array
56-
.boolean_buffer()
56+
.bit_buffer()
5757
.iter()
5858
.zip(validity.iter())
5959
.map(|(b, v)| v.then_some(b))

‎fuzz/src/slice.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub fn slice_canonical_array(
2222
match array.dtype() {
2323
DType::Bool(_) => {
2424
let bool_array = array.to_bool()?;
25-
let sliced_bools = bool_array.boolean_buffer().slice(start, stop - start);
25+
let sliced_bools = bool_array.bit_buffer().slice(start, stop - start);
2626
Ok(BoolArray::new(sliced_bools, validity).into_array())
2727
}
2828
DType::Primitive(p, _) => {

‎fuzz/src/sort.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub fn sort_canonical_array(array: &dyn Array) -> VortexResult<ArrayRef> {
1313
DType::Bool(_) => {
1414
let bool_array = array.to_bool()?;
1515
let mut opt_values = bool_array
16-
.boolean_buffer()
16+
.bit_buffer()
1717
.iter()
1818
.zip(bool_array.validity_mask()?.to_boolean_buffer().iter())
1919
.map(|(b, v)| v.then_some(b))

‎fuzz/src/take.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub fn take_canonical_array(array: &dyn Array, indices: &[usize]) -> VortexResul
2020
match array.dtype() {
2121
DType::Bool(_) => {
2222
let bool_array = array.to_bool()?;
23-
let vec_values = bool_array.boolean_buffer().iter().collect::<Vec<_>>();
23+
let vec_values = bool_array.bit_buffer().iter().collect::<Vec<_>>();
2424
Ok(
2525
BoolArray::new(indices.iter().map(|i| vec_values[*i]).collect(), validity)
2626
.into_array(),

0 commit comments

Comments
 (0)