Skip to content

Commit 5ce3fcc

Browse files
committed
Update import and return type in moved functions
1 parent a685c15 commit 5ce3fcc

2 files changed

Lines changed: 11 additions & 12 deletions

File tree

crates/modelardb_server/src/remote.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ pub fn flight_data_to_record_batch(
228228
flight_data: &FlightData,
229229
schema: &Arc<Schema>,
230230
dictionaries_by_id: &HashMap<i64, ArrayRef>,
231-
) -> std::result::Result<RecordBatch, Status> {
231+
) -> StdResult<RecordBatch, Status> {
232232
debug_assert_eq!(flight_data.flight_descriptor, None);
233233

234234
utils::flight_data_to_arrow_batch(flight_data, schema.clone(), dictionaries_by_id)
@@ -239,7 +239,7 @@ pub fn flight_data_to_record_batch(
239239
/// [`Status`] that specifies that the table name is missing.
240240
pub fn table_name_from_flight_descriptor(
241241
flight_descriptor: &FlightDescriptor,
242-
) -> std::result::Result<&String, Status> {
242+
) -> StdResult<&String, Status> {
243243
flight_descriptor
244244
.path
245245
.first()

crates/modelardb_server/tests/integration_test.rs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ use datafusion::arrow::ipc::convert;
3636
use datafusion::arrow::ipc::writer::{DictionaryTracker, IpcDataGenerator, IpcWriteOptions};
3737
use datafusion::arrow::record_batch::RecordBatch;
3838
use futures::{StreamExt, stream};
39-
use modelardb_test::data_generation;
39+
use modelardb_test::data_generation::generate_multivariate_time_series;
4040
use modelardb_test::table::{
4141
NORMAL_TABLE_NAME, TIME_SERIES_TABLE_NAME, table_metadata_protobuf_bytes,
4242
};
@@ -265,15 +265,14 @@ impl TestContext {
265265
multiply_noise_range: Option<Range<f32>>,
266266
maybe_tag: Option<&str>,
267267
) -> RecordBatch {
268-
let (uncompressed_timestamps, mut uncompressed_values) =
269-
data_generation::generate_multivariate_time_series(
270-
TIME_SERIES_TEST_LENGTH,
271-
5,
272-
SEGMENT_TEST_MINIMUM_LENGTH..2 * SEGMENT_TEST_MINIMUM_LENGTH + 1,
273-
generate_irregular_timestamps,
274-
multiply_noise_range,
275-
100.0..200.0,
276-
);
268+
let (uncompressed_timestamps, mut uncompressed_values) = generate_multivariate_time_series(
269+
TIME_SERIES_TEST_LENGTH,
270+
5,
271+
SEGMENT_TEST_MINIMUM_LENGTH..2 * SEGMENT_TEST_MINIMUM_LENGTH + 1,
272+
generate_irregular_timestamps,
273+
multiply_noise_range,
274+
100.0..200.0,
275+
);
277276

278277
let time_series_len = uncompressed_timestamps.len();
279278

0 commit comments

Comments
 (0)