Merge branch 'main' into otel-flattening-changes

Author: nikhilsinhaparseable

src/alerts/mod.rs

@@ -136,7 +136,7 @@ pub struct Message {
 impl Message {
     // checks if message (with a column name) is valid (i.e. the column name is present in the schema)
     pub fn valid(&self, schema: &Schema, column: &str) -> bool {
-        return get_field(&schema.fields, column).is_some();
+        get_field(&schema.fields, column).is_some()
     }
 
     pub fn extract_column_names(&self) -> Vec<&str> {

src/handlers/http/modal/utils/logstream_utils.rs

@@ -148,7 +148,8 @@ async fn update_stream(
         return Ok(req.headers().clone());
     }
     validate_and_update_custom_partition(stream_name, custom_partition).await?;
-    return Ok(req.headers().clone());
+
+    Ok(req.headers().clone())
 }
 
 async fn validate_and_update_custom_partition(

src/handlers/http/otel/opentelemetry.proto.resource.v1.rs

@@ -15,24 +15,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
- // This file was generated by protoc-gen-rust-protobuf. The file was edited after the generation.
- // All the repeated fields were changed to Option<Vec<T>>
+// This file was generated by protoc-gen-rust-protobuf. The file was edited after the generation.
+// All the repeated fields were changed to Option<Vec<T>>
 
- use crate::handlers::http::otel::proto::common::v1::KeyValue;
- use serde::{Deserialize, Serialize};
- 
- #[derive(Serialize, Deserialize, Debug)]
- /// Resource information.
- pub struct Resource {
-     /// Set of attributes that describe the resource.
-     /// Attribute keys MUST be unique (it is not allowed to have more than one
-     /// attribute with the same key).
-     #[serde(rename = "attributes")]
-     pub attributes: Option<Vec<KeyValue>>,
-     /// dropped_attributes_count is the number of dropped attributes. If the value is 0, then
-     /// no attributes were dropped.
- 
-     #[serde(rename = "droppedAttributesCount")]
-     pub dropped_attributes_count: Option<u32>,
- }
- 
+use crate::handlers::http::otel::proto::common::v1::KeyValue;
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Debug)]
+/// Resource information.
+pub struct Resource {
+    /// Set of attributes that describe the resource.
+    /// Attribute keys MUST be unique (it is not allowed to have more than one
+    /// attribute with the same key).
+    #[serde(rename = "attributes")]
+    pub attributes: Option<Vec<KeyValue>>,
+    /// dropped_attributes_count is the number of dropped attributes. If the value is 0, then
+    /// no attributes were dropped.
+    #[serde(rename = "droppedAttributesCount")]
+    pub dropped_attributes_count: Option<u32>,
+}

src/utils/arrow/mod.rs

@@ -17,6 +17,29 @@
  *
  */
 
+//! example function for concat recordbatch(may not work)
+//! ```rust
+//! # use arrow::record_batch::RecordBatch;
+//! # use arrow::error::Result;
+//!
+//! fn concat_batches(batch1: RecordBatch, batch2: RecordBatch) -> Result<RecordBatch> {
+//!     let schema = batch1.schema();
+//!     let columns = schema
+//!         .fields()
+//!         .iter()
+//!         .enumerate()
+//!         .map(|(i, _)| -> Result<_> {
+//!             let array1 = batch1.column(i);
+//!             let array2 = batch2.column(i);
+//!             let array = arrow::compute::concat(&[array1.as_ref(), array2.as_ref()])?;
+//!             Ok(array)
+//!         })
+//!         .collect::<Result<Vec<_>>>()?;
+//!
+//!     RecordBatch::try_new(schema.clone(), columns)
+//! }
+//! ```
+
 use std::sync::Arc;
 
 use arrow_array::{Array, RecordBatch};
@@ -33,30 +56,6 @@ pub use batch_adapter::adapt_batch;
 pub use merged_reader::MergedRecordReader;
 use serde_json::{Map, Value};
 
-/// example function for concat recordbatch(may not work)
-/// ```rust
-/// # use arrow::record_batch::RecordBatch;
-/// # use arrow::error::Result;
-///
-/// fn concat_batches(batch1: RecordBatch, batch2: RecordBatch) -> Result<RecordBatch> {
-///     let schema = batch1.schema();
-///     let columns = schema
-///         .fields()
-///         .iter()
-///         .enumerate()
-///         .map(|(i, _)| -> Result<_> {
-///             let array1 = batch1.column(i);
-///             let array2 = batch2.column(i);
-///             let array = arrow::compute::concat(&[array1.as_ref(), array2.as_ref()])?;
-///             Ok(array)
-///         })
-///         .collect::<Result<Vec<_>>>()?;
-///
-///     RecordBatch::try_new(schema.clone(), columns)
-/// }
-/// ```
-///
-
 /// Replaces columns in a record batch with new arrays.
 ///
 /// # Arguments