cargo fmt, rebase oss

Author: parmesant

src/lib.rs

@@ -73,9 +73,9 @@ use once_cell::sync::Lazy;
 pub use openid;
 use parseable::PARSEABLE;
 use reqwest::{Client, ClientBuilder};
+pub use utils as parseable_utils;
 pub use {opentelemetry, opentelemetry_otlp, opentelemetry_proto, opentelemetry_sdk};
 pub use {tracing_actix_web, tracing_opentelemetry, tracing_subscriber};
-pub use utils as parseable_utils;
 
 // It is very unlikely that panic will occur when dealing with locks.
 pub const LOCK_EXPECT: &str = "Thread shouldn't panic while holding a lock";

src/query/mod.rs

@@ -82,8 +82,6 @@ type BoxedBatchStream = SendableRecordBatchStream;
 /// Result type returned by query execution: either collected batches or a streaming adapter, plus field names.
 type QueryResult = Result<(Either<Vec<RecordBatch>, BoxedBatchStream>, Vec<String>), ExecuteError>;
 
-// pub static QUERY_SESSION: Lazy<SessionContext> =
-//     Lazy::new(|| Query::create_session_context(PARSEABLE.storage()));
 pub static SCHEMA_PROVIDER: OnceCell<Box<dyn ParseableSchemaProvider>> = OnceCell::new();
 
 /// Additional physical optimizer rules registered by enterprise/plugins.

src/query/stream_schema_provider.rs

@@ -55,11 +55,11 @@ use crate::{
         snapshot::{ManifestItem, Snapshot},
     },
     event::DEFAULT_TIMESTAMP_KEY,
+    hottier::{GLOBAL_HOTTIER, HotTierManager},
     metrics::{
         QUERY_CACHE_HIT, increment_files_scanned_in_hottier_by_date,
         increment_files_scanned_in_query_by_date,
     },
-    hottier::{GLOBAL_HOTTIER, HotTierManager},
     option::Mode,
     parseable::{DEFAULT_TENANT, PARSEABLE, STREAM_EXISTS},
     storage::{ObjectStorage, ObjectStoreFormat},

src/utils/arrow/flight.rs

@@ -149,9 +149,9 @@ pub fn into_flight_data_stream(
     stream: datafusion::execution::SendableRecordBatchStream,
 ) -> Result<Response<DoGetStream>, Box<Status>> {
     let record_stream = stream.map_err(|e| {
-        arrow_flight::error::FlightError::Arrow(arrow_schema::ArrowError::ExternalError(
-            Box::new(e),
-        ))
+        arrow_flight::error::FlightError::Arrow(arrow_schema::ArrowError::ExternalError(Box::new(
+            e,
+        )))
     });
 
     let write_options = IpcWriteOptions::default()