This is an automated email from the ASF dual-hosted git repository.
prantogg pushed a commit to branch support-multipart
in repository https://gitbox.apache.org/repos/asf/sedona-spatialbench.git
The following commit(s) were added to refs/heads/support-multipart by this push:
new b4caf34 fmt fix
b4caf34 is described below
commit b4caf34834fcd47dfecc7058afab98840d247654
Author: Pranav Toggi <[email protected]>
AuthorDate: Sat Oct 25 21:19:47 2025 -0700
fmt fix
---
spatialbench-arrow/src/building.rs | 2 +-
spatialbench-arrow/src/conversions.rs | 2 +-
spatialbench-arrow/src/customer.rs | 2 +-
spatialbench-arrow/src/driver.rs | 2 +-
spatialbench-arrow/src/trip.rs | 2 +-
spatialbench-arrow/src/vehicle.rs | 2 +-
spatialbench-arrow/tests/reparse.rs | 4 ++--
spatialbench-cli/src/csv.rs | 2 +-
spatialbench-cli/src/main.rs | 6 +++---
spatialbench-cli/src/parquet.rs | 2 +-
spatialbench-cli/src/plan.rs | 4 ++--
spatialbench-cli/src/runner.rs | 6 +++---
spatialbench-cli/src/spatial_config_file.rs | 4 ++--
spatialbench-cli/src/tbl.rs | 2 +-
spatialbench-cli/tests/cli_integration.rs | 4 ++--
15 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/spatialbench-arrow/src/building.rs
b/spatialbench-arrow/src/building.rs
index 70f3e20..8d16aba 100644
--- a/spatialbench-arrow/src/building.rs
+++ b/spatialbench-arrow/src/building.rs
@@ -4,8 +4,8 @@ use arrow::array::{BinaryArray, Int64Array, RecordBatch};
use arrow::datatypes::{DataType, Field, Schema, SchemaRef};
use geo::Geometry;
use geozero::{CoordDimensions, ToWkb};
-use std::sync::{Arc, LazyLock};
use spatialbench::generators::{BuildingGenerator, BuildingGeneratorIterator};
+use std::sync::{Arc, LazyLock};
/// Generate [`Building`]s in [`RecordBatch`] format
///
diff --git a/spatialbench-arrow/src/conversions.rs
b/spatialbench-arrow/src/conversions.rs
index db727f8..63aad6e 100644
--- a/spatialbench-arrow/src/conversions.rs
+++ b/spatialbench-arrow/src/conversions.rs
@@ -1,9 +1,9 @@
//! Routines to convert TPCH types to Arrow types
use arrow::array::{StringViewArray, StringViewBuilder};
-use std::fmt::Write;
use spatialbench::dates::TPCHDate;
use spatialbench::decimal::TPCHDecimal;
+use std::fmt::Write;
/// Convert a TPCHDecimal to an Arrow Decimal(15,2)
#[inline(always)]
diff --git a/spatialbench-arrow/src/customer.rs
b/spatialbench-arrow/src/customer.rs
index 2e3afd3..126bdbc 100644
--- a/spatialbench-arrow/src/customer.rs
+++ b/spatialbench-arrow/src/customer.rs
@@ -2,8 +2,8 @@ use crate::conversions::string_view_array_from_display_iter;
use crate::{DEFAULT_BATCH_SIZE, RecordBatchIterator};
use arrow::array::{Int64Array, RecordBatch, StringViewArray};
use arrow::datatypes::{DataType, Field, Schema, SchemaRef};
-use std::sync::{Arc, LazyLock};
use spatialbench::generators::{CustomerGenerator, CustomerGeneratorIterator};
+use std::sync::{Arc, LazyLock};
/// Generate [`Customer`]s in [`RecordBatch`] format
///
diff --git a/spatialbench-arrow/src/driver.rs b/spatialbench-arrow/src/driver.rs
index faca825..8294397 100644
--- a/spatialbench-arrow/src/driver.rs
+++ b/spatialbench-arrow/src/driver.rs
@@ -2,8 +2,8 @@ use crate::conversions::string_view_array_from_display_iter;
use crate::{DEFAULT_BATCH_SIZE, RecordBatchIterator};
use arrow::array::{Int64Array, RecordBatch, StringViewArray};
use arrow::datatypes::{DataType, Field, Schema, SchemaRef};
-use std::sync::{Arc, LazyLock};
use spatialbench::generators::{DriverGenerator, DriverGeneratorIterator};
+use std::sync::{Arc, LazyLock};
/// Generate [`Driver`]s in [`RecordBatch`] format
///
diff --git a/spatialbench-arrow/src/trip.rs b/spatialbench-arrow/src/trip.rs
index c034bfc..bf866de 100644
--- a/spatialbench-arrow/src/trip.rs
+++ b/spatialbench-arrow/src/trip.rs
@@ -4,8 +4,8 @@ use arrow::array::{BinaryArray, Int64Array, RecordBatch,
TimestampMillisecondArr
use arrow::datatypes::{DataType, Field, Schema, SchemaRef, TimeUnit};
use geo::Geometry;
use geozero::{CoordDimensions, ToWkb};
-use std::sync::{Arc, LazyLock, Mutex};
use spatialbench::generators::{Trip, TripGenerator, TripGeneratorIterator};
+use std::sync::{Arc, LazyLock, Mutex};
// Thread-safe wrapper for TripGeneratorIterator
struct ThreadSafeTripGenerator {
diff --git a/spatialbench-arrow/src/vehicle.rs
b/spatialbench-arrow/src/vehicle.rs
index a15c400..8e39013 100644
--- a/spatialbench-arrow/src/vehicle.rs
+++ b/spatialbench-arrow/src/vehicle.rs
@@ -2,8 +2,8 @@ use crate::conversions::string_view_array_from_display_iter;
use crate::{DEFAULT_BATCH_SIZE, RecordBatchIterator};
use arrow::array::{Int64Array, RecordBatch, StringViewArray};
use arrow::datatypes::{DataType, Field, Schema, SchemaRef};
-use std::sync::{Arc, LazyLock};
use spatialbench::generators::{VehicleGenerator, VehicleGeneratorIterator};
+use std::sync::{Arc, LazyLock};
/// Generate [`Vehicle`]s in [`RecordBatch`] format
///
diff --git a/spatialbench-arrow/tests/reparse.rs
b/spatialbench-arrow/tests/reparse.rs
index 5325813..889933a 100644
--- a/spatialbench-arrow/tests/reparse.rs
+++ b/spatialbench-arrow/tests/reparse.rs
@@ -3,8 +3,6 @@
use arrow::array::RecordBatch;
use arrow::datatypes::SchemaRef;
-use std::io::Write;
-use std::sync::Arc;
use spatialbench::csv::{BuildingCsv, CustomerCsv, DriverCsv, TripCsv,
VehicleCsv};
use spatialbench::generators::{
Building, BuildingGenerator, Customer, CustomerGenerator, Driver,
DriverGenerator, Trip,
@@ -13,6 +11,8 @@ use spatialbench::generators::{
use spatialbench_arrow::{
BuildingArrow, CustomerArrow, DriverArrow, RecordBatchIterator, TripArrow,
VehicleArrow,
};
+use std::io::Write;
+use std::sync::Arc;
use arrow::array::Array;
use arrow::array::BinaryArray;
diff --git a/spatialbench-cli/src/csv.rs b/spatialbench-cli/src/csv.rs
index 0d96ef4..78f93e5 100644
--- a/spatialbench-cli/src/csv.rs
+++ b/spatialbench-cli/src/csv.rs
@@ -1,10 +1,10 @@
//! Implementations of [`Source`] for generating data in TBL format
use super::generate::Source;
-use std::io::Write;
use spatialbench::csv::{BuildingCsv, CustomerCsv, DriverCsv, TripCsv,
VehicleCsv};
use spatialbench::generators::{
BuildingGenerator, CustomerGenerator, DriverGenerator, TripGenerator,
VehicleGenerator,
};
+use std::io::Write;
/// Define a Source that writes the table in CSV format
macro_rules! define_csv_source {
diff --git a/spatialbench-cli/src/main.rs b/spatialbench-cli/src/main.rs
index 8db2436..55eefd6 100644
--- a/spatialbench-cli/src/main.rs
+++ b/spatialbench-cli/src/main.rs
@@ -26,15 +26,15 @@ use ::parquet::basic::Compression;
use clap::builder::TypedValueParser;
use clap::{Parser, ValueEnum};
use log::{debug, info, LevelFilter};
+use spatialbench::distribution::Distributions;
+use spatialbench::spatial::overrides::{set_overrides, SpatialOverrides};
+use spatialbench::text::TextPool;
use std::fmt::Display;
use std::fs::{self, File};
use std::io::{self, BufWriter, Stdout, Write};
use std::path::PathBuf;
use std::str::FromStr;
use std::time::Instant;
-use spatialbench::distribution::Distributions;
-use spatialbench::spatial::overrides::{set_overrides, SpatialOverrides};
-use spatialbench::text::TextPool;
#[derive(Parser)]
#[command(name = "spatialbench")]
diff --git a/spatialbench-cli/src/parquet.rs b/spatialbench-cli/src/parquet.rs
index 0807f70..53b60f4 100644
--- a/spatialbench-cli/src/parquet.rs
+++ b/spatialbench-cli/src/parquet.rs
@@ -10,11 +10,11 @@ use parquet::basic::Compression;
use parquet::file::properties::WriterProperties;
use parquet::file::writer::SerializedFileWriter;
use parquet::schema::types::SchemaDescPtr;
+use spatialbench_arrow::RecordBatchIterator;
use std::io;
use std::io::Write;
use std::sync::Arc;
use tokio::sync::mpsc::{Receiver, Sender};
-use spatialbench_arrow::RecordBatchIterator;
pub trait IntoSize {
/// Convert the object into a size
diff --git a/spatialbench-cli/src/plan.rs b/spatialbench-cli/src/plan.rs
index 779a4ec..8c1acaa 100644
--- a/spatialbench-cli/src/plan.rs
+++ b/spatialbench-cli/src/plan.rs
@@ -2,11 +2,11 @@
use crate::{OutputFormat, Table};
use log::debug;
-use std::fmt::Display;
-use std::ops::RangeInclusive;
use spatialbench::generators::{
BuildingGenerator, CustomerGenerator, DriverGenerator, TripGenerator,
VehicleGenerator,
};
+use std::fmt::Display;
+use std::ops::RangeInclusive;
/// A list of generator "parts" (data generator chunks, not TPCH parts) for a
/// single output file.
diff --git a/spatialbench-cli/src/runner.rs b/spatialbench-cli/src/runner.rs
index b7da61b..882d1cf 100644
--- a/spatialbench-cli/src/runner.rs
+++ b/spatialbench-cli/src/runner.rs
@@ -7,15 +7,15 @@ use crate::parquet::generate_parquet;
use crate::tbl::*;
use crate::{OutputFormat, Table, WriterSink};
use log::{debug, info};
-use std::io;
-use std::io::BufWriter;
-use tokio::task::{JoinError, JoinSet};
use spatialbench::generators::{
BuildingGenerator, CustomerGenerator, DriverGenerator, TripGenerator,
VehicleGenerator,
};
use spatialbench_arrow::{
BuildingArrow, CustomerArrow, DriverArrow, RecordBatchIterator, TripArrow,
VehicleArrow,
};
+use std::io;
+use std::io::BufWriter;
+use tokio::task::{JoinError, JoinSet};
/// Runs multiple [`OutputPlan`]s in parallel, managing the number of threads
/// used to run them.
diff --git a/spatialbench-cli/src/spatial_config_file.rs
b/spatialbench-cli/src/spatial_config_file.rs
index c67f94d..9027da7 100644
--- a/spatialbench-cli/src/spatial_config_file.rs
+++ b/spatialbench-cli/src/spatial_config_file.rs
@@ -1,11 +1,11 @@
use anyhow::Result;
use serde::de::{self, Visitor};
use serde::{Deserialize, Deserializer};
-use std::fmt;
-use std::sync::OnceLock;
use spatialbench::spatial::{
DistributionParams, DistributionType, GeomType, SpatialConfig,
SpatialGenerator,
};
+use std::fmt;
+use std::sync::OnceLock;
// Deserializer for DistributionType
fn deserialize_distribution_type<'de, D>(deserializer: D) ->
Result<DistributionType, D::Error>
diff --git a/spatialbench-cli/src/tbl.rs b/spatialbench-cli/src/tbl.rs
index e98d344..8eeb448 100644
--- a/spatialbench-cli/src/tbl.rs
+++ b/spatialbench-cli/src/tbl.rs
@@ -1,10 +1,10 @@
//! Implementations of [`Source`] for generating data in TBL format
use super::generate::Source;
-use std::io::Write;
use spatialbench::generators::{
BuildingGenerator, CustomerGenerator, DriverGenerator, TripGenerator,
VehicleGenerator,
};
+use std::io::Write;
/// Define a Source that writes the table in TBL format
macro_rules! define_tbl_source {
diff --git a/spatialbench-cli/tests/cli_integration.rs
b/spatialbench-cli/tests/cli_integration.rs
index 5340c83..d4f9b6d 100644
--- a/spatialbench-cli/tests/cli_integration.rs
+++ b/spatialbench-cli/tests/cli_integration.rs
@@ -2,14 +2,14 @@ use arrow_array::RecordBatch;
use assert_cmd::Command;
use parquet::arrow::arrow_reader::{ArrowReaderOptions,
ParquetRecordBatchReaderBuilder};
use parquet::file::metadata::ParquetMetaDataReader;
+use spatialbench::generators::TripGenerator;
+use spatialbench_arrow::{RecordBatchIterator, TripArrow};
use std::fs;
use std::fs::File;
use std::io::Read;
use std::path::{Path, PathBuf};
use std::sync::Arc;
use tempfile::tempdir;
-use spatialbench::generators::TripGenerator;
-use spatialbench_arrow::{RecordBatchIterator, TripArrow};
/// Test TBL output for scale factor 0.51 and 0.001 using spatialbench-cli
/// A scale factor of 0.51 is used because a sf of 0.5 and below will yield 0
results in the Building table
