Skip to content

Commit 63e466f

Browse files
branczbrancz
committed
Add allow deprecations where necessary
1 parent d542433 commit 63e466f

File tree

18 files changed

+116
-16
lines changed

18 files changed

+116
-16
lines changed

‎arrow-flight/src/encode.rs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,10 @@ fn prepare_field_for_flight(
535535
)
536536
.with_metadata(field.metadata().clone())
537537
} else {
538+
#[allow(deprecated)]
538539
let dict_id = dictionary_tracker.set_dict_id(field.as_ref());
539540

541+
#[allow(deprecated)]
540542
Field::new_dict(
541543
field.name(),
542544
field.data_type().clone(),
@@ -583,7 +585,9 @@ fn prepare_schema_for_flight(
583585
)
584586
.with_metadata(field.metadata().clone())
585587
} else {
588+
#[allow(deprecated)]
586589
let dict_id = dictionary_tracker.set_dict_id(field.as_ref());
590+
#[allow(deprecated)]
587591
Field::new_dict(
588592
field.name(),
589593
field.data_type().clone(),
@@ -650,10 +654,12 @@ struct FlightIpcEncoder {
650654

651655
impl FlightIpcEncoder {
652656
fn new(options: IpcWriteOptions, error_on_replacement: bool) -> Self {
657+
#[allow(deprecated)]
653658
let preserve_dict_id = options.preserve_dict_id();
654659
Self {
655660
options,
656661
data_gen: IpcDataGenerator::default(),
662+
#[allow(deprecated)]
657663
dictionary_tracker: DictionaryTracker::new_with_preserve_dict_id(
658664
error_on_replacement,
659665
preserve_dict_id,
@@ -1541,6 +1547,7 @@ mod tests {
15411547
async fn verify_flight_round_trip(mut batches: Vec<RecordBatch>) {
15421548
let expected_schema = batches.first().unwrap().schema();
15431549

1550+
#[allow(deprecated)]
15441551
let encoder = FlightDataEncoderBuilder::default()
15451552
.with_options(IpcWriteOptions::default().with_preserve_dict_id(false))
15461553
.with_dictionary_handling(DictionaryHandling::Resend)
@@ -1568,6 +1575,7 @@ mod tests {
15681575
HashMap::from([("some_key".to_owned(), "some_value".to_owned())]),
15691576
);
15701577

1578+
#[allow(deprecated)]
15711579
let mut dictionary_tracker = DictionaryTracker::new_with_preserve_dict_id(false, true);
15721580

15731581
let got = prepare_schema_for_flight(&schema, &mut dictionary_tracker, false);
@@ -1598,6 +1606,7 @@ mod tests {
15981606
options: &IpcWriteOptions,
15991607
) -> (Vec<FlightData>, FlightData) {
16001608
let data_gen = IpcDataGenerator::default();
1609+
#[allow(deprecated)]
16011610
let mut dictionary_tracker =
16021611
DictionaryTracker::new_with_preserve_dict_id(false, options.preserve_dict_id());
16031612

‎arrow-flight/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ pub struct IpcMessage(pub Bytes);
143143

144144
fn flight_schema_as_encoded_data(arrow_schema: &Schema, options: &IpcWriteOptions) -> EncodedData {
145145
let data_gen = writer::IpcDataGenerator::default();
146+
#[allow(deprecated)]
146147
let mut dict_tracker =
147148
writer::DictionaryTracker::new_with_preserve_dict_id(false, options.preserve_dict_id());
148149
data_gen.schema_to_bytes_with_dictionary_tracker(arrow_schema, &mut dict_tracker, options)

‎arrow-flight/src/utils.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ pub fn batches_to_flight_data(
9090
let mut flight_data = vec![];
9191

9292
let data_gen = writer::IpcDataGenerator::default();
93+
#[allow(deprecated)]
9394
let mut dictionary_tracker =
9495
writer::DictionaryTracker::new_with_preserve_dict_id(false, options.preserve_dict_id());
9596

‎arrow-integration-test/src/field.rs

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ pub fn field_from_json(json: &serde_json::Value) -> Result<Field> {
252252
_ => data_type,
253253
};
254254

255+
#[allow(deprecated)]
255256
let mut field = Field::new_dict(name, data_type, nullable, dict_id, dict_is_ordered);
256257
field.set_metadata(metadata);
257258
Ok(field)
@@ -274,17 +275,21 @@ pub fn field_to_json(field: &Field) -> serde_json::Value {
274275
};
275276

276277
match field.data_type() {
277-
DataType::Dictionary(ref index_type, ref value_type) => serde_json::json!({
278-
"name": field.name(),
279-
"nullable": field.is_nullable(),
280-
"type": data_type_to_json(value_type),
281-
"children": children,
282-
"dictionary": {
283-
"id": field.dict_id().unwrap(),
284-
"indexType": data_type_to_json(index_type),
285-
"isOrdered": field.dict_is_ordered().unwrap(),
286-
}
287-
}),
278+
DataType::Dictionary(ref index_type, ref value_type) => {
279+
#[allow(deprecated)]
280+
let dict_id = field.dict_id().unwrap();
281+
serde_json::json!({
282+
"name": field.name(),
283+
"nullable": field.is_nullable(),
284+
"type": data_type_to_json(value_type),
285+
"children": children,
286+
"dictionary": {
287+
"id": dict_id,
288+
"indexType": data_type_to_json(index_type),
289+
"isOrdered": field.dict_is_ordered().unwrap(),
290+
}
291+
})
292+
},
288293
_ => serde_json::json!({
289294
"name": field.name(),
290295
"nullable": field.is_nullable(),

‎arrow-integration-test/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -787,6 +787,7 @@ pub fn array_from_json(
787787
Ok(Arc::new(array))
788788
}
789789
DataType::Dictionary(key_type, value_type) => {
790+
#[allow(deprecated)]
790791
let dict_id = field.dict_id().ok_or_else(|| {
791792
ArrowError::JsonError(format!("Unable to find dict_id for field {field:?}"))
792793
})?;
@@ -930,10 +931,12 @@ pub fn dictionary_array_from_json(
930931
let null_buf = create_null_buf(&json_col);
931932

932933
// build the key data into a buffer, then construct values separately
934+
#[allow(deprecated)]
933935
let key_field = Field::new_dict(
934936
"key",
935937
dict_key.clone(),
936938
field.is_nullable(),
939+
#[allow(deprecated)]
937940
field
938941
.dict_id()
939942
.expect("Dictionary fields must have a dict_id value"),

‎arrow-integration-test/src/schema.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ mod tests {
189189
Field::new("c30", DataType::Duration(TimeUnit::Millisecond), false),
190190
Field::new("c31", DataType::Duration(TimeUnit::Microsecond), false),
191191
Field::new("c32", DataType::Duration(TimeUnit::Nanosecond), false),
192+
#[allow(deprecated)]
192193
Field::new_dict(
193194
"c33",
194195
DataType::Dictionary(Box::new(DataType::Int32), Box::new(DataType::Utf8)),

‎arrow-integration-testing/src/flight_client_scenarios/integration_test.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ async fn upload_data(
7272
let (mut upload_tx, upload_rx) = mpsc::channel(10);
7373

7474
let options = arrow::ipc::writer::IpcWriteOptions::default();
75+
#[allow(deprecated)]
7576
let mut dict_tracker =
7677
writer::DictionaryTracker::new_with_preserve_dict_id(false, options.preserve_dict_id());
7778
let data_gen = writer::IpcDataGenerator::default();

‎arrow-integration-testing/src/flight_server_scenarios/integration_test.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ impl FlightService for FlightServiceImpl {
119119
.ok_or_else(|| Status::not_found(format!("Could not find flight. {key}")))?;
120120

121121
let options = arrow::ipc::writer::IpcWriteOptions::default();
122+
#[allow(deprecated)]
122123
let mut dictionary_tracker =
123124
writer::DictionaryTracker::new_with_preserve_dict_id(false, options.preserve_dict_id());
124125
let data_gen = writer::IpcDataGenerator::default();

‎arrow-ipc/src/convert.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ pub fn schema_to_fb_offset<'a>(
165165
impl From<crate::Field<'_>> for Field {
166166
fn from(field: crate::Field) -> Field {
167167
let arrow_field = if let Some(dictionary) = field.dictionary() {
168+
#[allow(deprecated)]
168169
Field::new_dict(
169170
field.name().unwrap(),
170171
get_data_type(field, true),
@@ -519,6 +520,7 @@ pub(crate) fn build_field<'a>(
519520
match dictionary_tracker {
520521
Some(tracker) => Some(get_fb_dictionary(
521522
index_type,
523+
#[allow(deprecated)]
522524
tracker.set_dict_id(field),
523525
field
524526
.dict_is_ordered()
@@ -527,6 +529,7 @@ pub(crate) fn build_field<'a>(
527529
)),
528530
None => Some(get_fb_dictionary(
529531
index_type,
532+
#[allow(deprecated)]
530533
field
531534
.dict_id()
532535
.expect("Dictionary type must have a dictionary id"),
@@ -1143,13 +1146,15 @@ mod tests {
11431146
),
11441147
true,
11451148
),
1149+
#[allow(deprecated)]
11461150
Field::new_dict(
11471151
"dictionary<int32, utf8>",
11481152
DataType::Dictionary(Box::new(DataType::Int32), Box::new(DataType::Utf8)),
11491153
true,
11501154
123,
11511155
true,
11521156
),
1157+
#[allow(deprecated)]
11531158
Field::new_dict(
11541159
"dictionary<uint8, uint32>",
11551160
DataType::Dictionary(Box::new(DataType::UInt8), Box::new(DataType::UInt32)),

‎arrow-ipc/src/reader.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ fn create_array(
196196
let index_node = reader.next_node(field)?;
197197
let index_buffers = [reader.next_buffer()?, reader.next_buffer()?];
198198

199+
#[allow(deprecated)]
199200
let dict_id = field.dict_id().ok_or_else(|| {
200201
ArrowError::ParseError(format!("Field {field} does not have dict id"))
201202
})?;
@@ -617,6 +618,7 @@ fn read_dictionary_impl(
617618
}
618619

619620
let id = batch.id();
621+
#[allow(deprecated)]
620622
let fields_using_this_dictionary = schema.fields_with_dict_id(id);
621623
let first_field = fields_using_this_dictionary.first().ok_or_else(|| {
622624
ArrowError::InvalidArgumentError(format!("dictionary id {id} not found in schema"))
@@ -1725,6 +1727,7 @@ mod tests {
17251727
let mut writer = crate::writer::FileWriter::try_new_with_options(
17261728
&mut buf,
17271729
batch.schema_ref(),
1730+
#[allow(deprecated)]
17281731
IpcWriteOptions::default().with_preserve_dict_id(false),
17291732
)
17301733
.unwrap();
@@ -1869,13 +1872,15 @@ mod tests {
18691872
let key_dict_keys = Int8Array::from_iter_values([0, 0, 2, 1, 1, 3]);
18701873
let key_dict_array = DictionaryArray::new(key_dict_keys, values);
18711874

1875+
#[allow(deprecated)]
18721876
let keys_field = Arc::new(Field::new_dict(
18731877
"keys",
18741878
DataType::Dictionary(Box::new(DataType::Int8), Box::new(DataType::Utf8)),
18751879
true, // It is technically not legal for this field to be null.
18761880
1,
18771881
false,
18781882
));
1883+
#[allow(deprecated)]
18791884
let values_field = Arc::new(Field::new_dict(
18801885
"values",
18811886
DataType::Dictionary(Box::new(DataType::Int8), Box::new(DataType::Utf8)),
@@ -1956,6 +1961,7 @@ mod tests {
19561961
#[test]
19571962
fn test_roundtrip_stream_dict_of_list_of_dict() {
19581963
// list
1964+
#[allow(deprecated)]
19591965
let list_data_type = DataType::List(Arc::new(Field::new_dict(
19601966
"item",
19611967
DataType::Dictionary(Box::new(DataType::Int8), Box::new(DataType::Utf8)),
@@ -1967,6 +1973,7 @@ mod tests {
19671973
test_roundtrip_stream_dict_of_list_of_dict_impl::<i32, i32>(list_data_type, offsets);
19681974

19691975
// large list
1976+
#[allow(deprecated)]
19701977
let list_data_type = DataType::LargeList(Arc::new(Field::new_dict(
19711978
"item",
19721979
DataType::Dictionary(Box::new(DataType::Int8), Box::new(DataType::Utf8)),
@@ -1985,6 +1992,7 @@ mod tests {
19851992
let dict_array = DictionaryArray::new(keys, Arc::new(values));
19861993
let dict_data = dict_array.into_data();
19871994

1995+
#[allow(deprecated)]
19881996
let list_data_type = DataType::FixedSizeList(
19891997
Arc::new(Field::new_dict(
19901998
"item",
@@ -2075,6 +2083,7 @@ mod tests {
20752083

20762084
let key_dict_keys = Int8Array::from_iter_values([0, 0, 1, 2, 0, 1, 3]);
20772085
let key_dict_array = DictionaryArray::new(key_dict_keys, utf8_view_array.clone());
2086+
#[allow(deprecated)]
20782087
let keys_field = Arc::new(Field::new_dict(
20792088
"keys",
20802089
DataType::Dictionary(Box::new(DataType::Int8), Box::new(DataType::Utf8View)),
@@ -2085,6 +2094,7 @@ mod tests {
20852094

20862095
let value_dict_keys = Int8Array::from_iter_values([0, 3, 0, 1, 2, 0, 1]);
20872096
let value_dict_array = DictionaryArray::new(value_dict_keys, bin_view_array);
2097+
#[allow(deprecated)]
20882098
let values_field = Arc::new(Field::new_dict(
20892099
"values",
20902100
DataType::Dictionary(Box::new(DataType::Int8), Box::new(DataType::BinaryView)),
@@ -2150,6 +2160,7 @@ mod tests {
21502160
.unwrap();
21512161

21522162
let gen = IpcDataGenerator {};
2163+
#[allow(deprecated)]
21532164
let mut dict_tracker = DictionaryTracker::new_with_preserve_dict_id(false, true);
21542165
let (_, encoded) = gen
21552166
.encoded_batch(&batch, &mut dict_tracker, &Default::default())
@@ -2187,6 +2198,7 @@ mod tests {
21872198
.unwrap();
21882199

21892200
let gen = IpcDataGenerator {};
2201+
#[allow(deprecated)]
21902202
let mut dict_tracker = DictionaryTracker::new_with_preserve_dict_id(false, true);
21912203
let (_, encoded) = gen
21922204
.encoded_batch(&batch, &mut dict_tracker, &Default::default())
@@ -2326,6 +2338,7 @@ mod tests {
23262338
["a", "b"]
23272339
.iter()
23282340
.map(|name| {
2341+
#[allow(deprecated)]
23292342
Field::new_dict(
23302343
name.to_string(),
23312344
DataType::Dictionary(
@@ -2360,6 +2373,7 @@ mod tests {
23602373
let mut writer = crate::writer::StreamWriter::try_new_with_options(
23612374
&mut buf,
23622375
batch.schema().as_ref(),
2376+
#[allow(deprecated)]
23632377
crate::writer::IpcWriteOptions::default().with_preserve_dict_id(false),
23642378
)
23652379
.expect("Failed to create StreamWriter");

‎arrow-ipc/src/reader/stream.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ mod tests {
324324
"test1",
325325
DataType::RunEndEncoded(
326326
Arc::new(Field::new("run_ends".to_string(), DataType::Int32, false)),
327+
#[allow(deprecated)]
327328
Arc::new(Field::new_dict(
328329
"values".to_string(),
329330
DataType::Dictionary(Box::new(DataType::Int32), Box::new(DataType::Utf8)),
@@ -353,6 +354,7 @@ mod tests {
353354
let mut writer = StreamWriter::try_new_with_options(
354355
&mut buffer,
355356
&schema,
357+
#[allow(deprecated)]
356358
IpcWriteOptions::default().with_preserve_dict_id(false),
357359
)
358360
.expect("Failed to create StreamWriter");

0 commit comments

Comments
 (0)