Skip to content

Commit df33710

Browse files
committed
fixup! Deprecated the public expose of test_util package
1 parent e2add0b commit df33710

33 files changed

+140
-0
lines changed

arrow-integration-testing/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ use arrow::datatypes::{DataType, Field, Fields, Schema};
2727
use arrow::error::{ArrowError, Result};
2828
use arrow::ffi::{from_ffi_and_data_type, FFI_ArrowArray, FFI_ArrowSchema};
2929
use arrow::record_batch::RecordBatch;
30+
#[allow(deprecated)]
3031
use arrow::util::test_util::arrow_test_data;
3132
use arrow_integration_test::*;
3233
use std::collections::HashMap;
@@ -148,6 +149,7 @@ pub fn open_json_file(json_name: &str) -> Result<ArrowFile> {
148149
///
149150
/// Returns the contents of
150151
/// `arrow-ipc-stream/integration/0.17.1/generated_union.json.gz`
152+
#[allow(deprecated)]
151153
pub fn read_gzip_json(version: &str, path: &str) -> ArrowJson {
152154
use flate2::read::GzDecoder;
153155
use std::io::Read;

arrow-integration-testing/tests/ipc_reader.rs

+6
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,15 @@
2020
2121
use arrow::error::ArrowError;
2222
use arrow::ipc::reader::{FileReader, StreamDecoder, StreamReader};
23+
#[allow(deprecated)]
2324
use arrow::util::test_util::arrow_test_data;
2425
use arrow_buffer::Buffer;
2526
use arrow_integration_testing::read_gzip_json;
2627
use std::fs::File;
2728
use std::io::Read;
2829

2930
#[test]
31+
#[allow(deprecated)]
3032
fn read_0_1_4() {
3133
let testdata = arrow_test_data();
3234
let version = "0.14.1";
@@ -48,6 +50,7 @@ fn read_0_1_4() {
4850
}
4951

5052
#[test]
53+
#[allow(deprecated)]
5154
fn read_0_1_7() {
5255
let testdata = arrow_test_data();
5356
let version = "0.17.1";
@@ -59,6 +62,7 @@ fn read_0_1_7() {
5962
}
6063

6164
#[test]
65+
#[allow(deprecated)]
6266
fn read_1_0_0_bigendian() {
6367
let testdata = arrow_test_data();
6468
let paths = [
@@ -90,6 +94,7 @@ fn read_1_0_0_bigendian() {
9094
}
9195

9296
#[test]
97+
#[allow(deprecated)]
9398
fn read_1_0_0_littleendian() {
9499
let testdata = arrow_test_data();
95100
let version = "1.0.0-littleendian";
@@ -125,6 +130,7 @@ fn read_1_0_0_littleendian() {
125130
}
126131

127132
#[test]
133+
#[allow(deprecated)]
128134
fn read_2_0_0_compression() {
129135
let testdata = arrow_test_data();
130136
let version = "2.0.0-compression";

arrow-integration-testing/tests/ipc_writer.rs

+5
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818
use arrow::ipc;
1919
use arrow::ipc::reader::{FileReader, StreamReader};
2020
use arrow::ipc::writer::{FileWriter, IpcWriteOptions, StreamWriter};
21+
#[allow(deprecated)]
2122
use arrow::util::test_util::arrow_test_data;
2223
use arrow_integration_testing::read_gzip_json;
2324
use std::fs::File;
2425
use std::io::Seek;
2526

2627
#[test]
28+
#[allow(deprecated)]
2729
fn write_0_1_4() {
2830
let testdata = arrow_test_data();
2931
let version = "0.14.1";
@@ -45,6 +47,7 @@ fn write_0_1_4() {
4547
}
4648

4749
#[test]
50+
#[allow(deprecated)]
4851
fn write_0_1_7() {
4952
let testdata = arrow_test_data();
5053
let version = "0.17.1";
@@ -56,6 +59,7 @@ fn write_0_1_7() {
5659
}
5760

5861
#[test]
62+
#[allow(deprecated)]
5963
fn write_1_0_0_littleendian() {
6064
let testdata = arrow_test_data();
6165
let version = "1.0.0-littleendian";
@@ -91,6 +95,7 @@ fn write_1_0_0_littleendian() {
9195
}
9296

9397
#[test]
98+
#[allow(deprecated)]
9499
fn write_2_0_0_compression() {
95100
let testdata = arrow_test_data();
96101
let version = "2.0.0-compression";

arrow/benches/bitwise_kernel.rs

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ use rand::RngCore;
2929
extern crate arrow;
3030

3131
use arrow::util::bench_util::create_primitive_array;
32+
#[allow(deprecated)]
3233
use arrow::util::test_util::seedable_rng;
3334

3435
fn bitwise_array_benchmark(c: &mut Criterion) {
@@ -75,6 +76,7 @@ fn bitwise_array_benchmark(c: &mut Criterion) {
7576
group.finish();
7677
}
7778

79+
#[allow(deprecated)]
7880
fn bitwise_array_scalar_benchmark(c: &mut Criterion) {
7981
let size = 64 * 1024_usize;
8082
let array_without_null = create_primitive_array::<Int64Type>(size, 0 as f32);

arrow/benches/buffer_create.rs

+3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#[macro_use]
1919
extern crate criterion;
20+
#[allow(deprecated)]
2021
use arrow::util::test_util::seedable_rng;
2122
use criterion::Criterion;
2223
use rand::distr::Uniform;
@@ -108,6 +109,7 @@ fn from_slice(data: &[Vec<u32>], capacity: usize) -> Buffer {
108109
})
109110
}
110111

112+
#[allow(deprecated)]
111113
fn create_data(size: usize) -> Vec<Vec<u32>> {
112114
let rng = &mut seedable_rng();
113115
let range = Uniform::new(0, 33).unwrap();
@@ -123,6 +125,7 @@ fn create_data(size: usize) -> Vec<Vec<u32>> {
123125
.collect()
124126
}
125127

128+
#[allow(deprecated)]
126129
fn create_data_bool(size: usize) -> Vec<Vec<bool>> {
127130
let rng = &mut seedable_rng();
128131
let range = Uniform::new(0, 33).unwrap();

arrow/benches/builder.rs

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ use criterion::*;
2525
use rand::distr::StandardUniform;
2626

2727
use arrow::array::*;
28+
#[allow(deprecated)]
2829
use arrow::util::test_util::seedable_rng;
2930
use arrow_buffer::i256;
3031
use rand::Rng;
@@ -66,6 +67,7 @@ fn bench_primitive_nulls(c: &mut Criterion) {
6667
group.finish();
6768
}
6869

70+
#[allow(deprecated)]
6971
fn bench_bool(c: &mut Criterion) {
7072
let data: Vec<bool> = seedable_rng()
7173
.sample_iter(&StandardUniform)

arrow/benches/cast_kernels.rs

+5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ use arrow::array::*;
3030
use arrow::compute::cast;
3131
use arrow::datatypes::*;
3232
use arrow::util::bench_util::*;
33+
#[allow(deprecated)]
3334
use arrow::util::test_util::seedable_rng;
3435

3536
fn build_array<T: ArrowPrimitiveType>(size: usize) -> ArrayRef
@@ -40,6 +41,7 @@ where
4041
Arc::new(array)
4142
}
4243

44+
#[allow(deprecated)]
4345
fn build_utf8_date_array(size: usize, with_nulls: bool) -> ArrayRef {
4446
use chrono::NaiveDate;
4547

@@ -62,6 +64,7 @@ fn build_utf8_date_array(size: usize, with_nulls: bool) -> ArrayRef {
6264
Arc::new(builder.finish())
6365
}
6466

67+
#[allow(deprecated)]
6568
fn build_utf8_date_time_array(size: usize, with_nulls: bool) -> ArrayRef {
6669
// use random numbers to avoid spurious compiler optimizations wrt to branching
6770
let mut rng = seedable_rng();
@@ -82,6 +85,7 @@ fn build_utf8_date_time_array(size: usize, with_nulls: bool) -> ArrayRef {
8285
Arc::new(builder.finish())
8386
}
8487

88+
#[allow(deprecated)]
8589
fn build_decimal128_array(size: usize, precision: u8, scale: i8) -> ArrayRef {
8690
let mut rng = seedable_rng();
8791
let mut builder = Decimal128Builder::with_capacity(size);
@@ -97,6 +101,7 @@ fn build_decimal128_array(size: usize, precision: u8, scale: i8) -> ArrayRef {
97101
)
98102
}
99103

104+
#[allow(deprecated)]
100105
fn build_decimal256_array(size: usize, precision: u8, scale: i8) -> ArrayRef {
101106
let mut rng = seedable_rng();
102107
let mut builder = Decimal256Builder::with_capacity(size);

arrow/benches/comparison_kernels.rs

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ extern crate criterion;
2121

2222
use arrow::compute::kernels::cmp::*;
2323
use arrow::util::bench_util::*;
24+
#[allow(deprecated)]
2425
use arrow::util::test_util::seedable_rng;
2526
use arrow::{array::*, datatypes::Float32Type, datatypes::Int32Type};
2627
use arrow_buffer::IntervalMonthDayNano;
@@ -78,6 +79,7 @@ fn make_string_array(size: usize, rng: &mut StdRng) -> impl Iterator<Item = Opti
7879
})
7980
}
8081

82+
#[allow(deprecated)]
8183
fn add_benchmark(c: &mut Criterion) {
8284
let arr_a = create_primitive_array_with_seed::<Float32Type>(SIZE, 0.0, 42);
8385
let arr_b = create_primitive_array_with_seed::<Float32Type>(SIZE, 0.0, 43);

arrow/benches/csv_reader.rs

+2
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ use arrow::array::*;
2929
use arrow::csv;
3030
use arrow::datatypes::*;
3131
use arrow::util::bench_util::{create_primitive_array, create_string_array_with_len};
32+
#[allow(deprecated)]
3233
use arrow::util::test_util::seedable_rng;
3334

3435
fn do_bench(c: &mut Criterion, name: &str, cols: Vec<ArrayRef>) {
@@ -57,6 +58,7 @@ fn do_bench(c: &mut Criterion, name: &str, cols: Vec<ArrayRef>) {
5758
}
5859
}
5960

61+
#[allow(deprecated)]
6062
fn criterion_benchmark(c: &mut Criterion) {
6163
let mut rng = seedable_rng();
6264

arrow/benches/interleave_kernels.rs

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ use rand::Rng;
2626
extern crate arrow;
2727

2828
use arrow::datatypes::*;
29+
#[allow(deprecated)]
2930
use arrow::util::test_util::seedable_rng;
3031
use arrow::{array::*, util::bench_util::*};
3132
use arrow_select::interleave::interleave;
@@ -50,6 +51,7 @@ fn do_bench(
5051
);
5152
}
5253

54+
#[allow(deprecated)]
5355
fn bench_values(c: &mut Criterion, name: &str, len: usize, values: &[&dyn Array]) {
5456
let mut rng = seedable_rng();
5557
let indices: Vec<_> = (0..len)

arrow/benches/json_writer.rs

+3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ use arrow::util::bench_util::{
2222
create_primitive_array, create_string_array, create_string_array_with_len,
2323
create_string_dict_array,
2424
};
25+
#[allow(deprecated)]
2526
use arrow::util::test_util::seedable_rng;
2627
use arrow_array::{Array, ListArray, RecordBatch, StructArray};
2728
use arrow_buffer::{BooleanBuffer, NullBuffer, OffsetBuffer};
@@ -59,11 +60,13 @@ fn create_mixed(len: usize) -> RecordBatch {
5960
.unwrap()
6061
}
6162

63+
#[allow(deprecated)]
6264
fn create_nulls(len: usize) -> NullBuffer {
6365
let mut rng = seedable_rng();
6466
BooleanBuffer::from_iter((0..len).map(|_| rng.random_bool(0.2))).into()
6567
}
6668

69+
#[allow(deprecated)]
6770
fn create_offsets(len: usize) -> (usize, OffsetBuffer<i32>) {
6871
let mut rng = seedable_rng();
6972
let mut last_offset = 0;

arrow/benches/mutable_array.rs

+2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ use rand::Rng;
2323

2424
extern crate arrow;
2525

26+
#[allow(deprecated)]
2627
use arrow::util::test_util::seedable_rng;
2728
use arrow::{array::*, util::bench_util::create_string_array};
2829

30+
#[allow(deprecated)]
2931
fn create_slices(size: usize) -> Vec<(usize, usize)> {
3032
let rng = &mut seedable_rng();
3133

arrow/benches/primitive_run_take.rs

+2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ use arrow::array::UInt32Builder;
1919
use arrow::compute::take;
2020
use arrow::datatypes::{Int32Type, Int64Type};
2121
use arrow::util::bench_util::*;
22+
#[allow(deprecated)]
2223
use arrow::util::test_util::seedable_rng;
2324
use arrow_array::UInt32Array;
2425
use criterion::{criterion_group, criterion_main, Criterion};
2526
use rand::Rng;
2627

28+
#[allow(deprecated)]
2729
fn create_random_index(size: usize, null_density: f32, max_value: usize) -> UInt32Array {
2830
let mut rng = seedable_rng();
2931
let mut builder = UInt32Builder::with_capacity(size);

arrow/benches/take_kernels.rs

+2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ extern crate arrow;
2525

2626
use arrow::compute::{take, TakeOptions};
2727
use arrow::datatypes::*;
28+
#[allow(deprecated)]
2829
use arrow::util::test_util::seedable_rng;
2930
use arrow::{array::*, util::bench_util::*};
3031

32+
#[allow(deprecated)]
3133
fn create_random_index(size: usize, null_density: f32) -> UInt32Array {
3234
let mut rng = seedable_rng();
3335
let mut builder = UInt32Builder::with_capacity(size);

0 commit comments

Comments
 (0)