except internal

n0x29a · n0x29a · commit cdb4c075b3de · 2025-05-14T18:30:06.000+02:00
diff --git a/lib/api/src/grpc/qdrant.rs b/lib/api/src/grpc/qdrant.rs
@@ -9887,7 +9887,7 @@ pub struct QueryBatchResponseInternal {
     #[prost(double, tag = "2")]
     pub time: f64,
     #[prost(message, optional, tag = "5")]
-    pub usage: ::core::option::Option<Usage>,
+    pub usage: ::core::option::Option<HardwareUsage>,
 }
 #[derive(serde::Serialize)]
 #[derive(validator::Validate)]
diff --git a/lib/collection/src/shards/remote_shard.rs b/lib/collection/src/shards/remote_shard.rs
@@ -1201,9 +1201,7 @@ impl ShardOperation for RemoteShard {
         } = batch_response;
 
         if let Some(hw_usage) = usage {
-            if let Some(hardware) = hw_usage.hardware {
-                hw_measurement_acc.accumulate_request(hardware);
-            }
+            hw_measurement_acc.accumulate_request(hw_usage);
         }
 
         let result = results
diff --git a/src/tonic/api/points_internal_api.rs b/src/tonic/api/points_internal_api.rs
@@ -3,6 +3,7 @@ use std::str::FromStr;
 use std::sync::Arc;
 use std::time::{Duration, Instant};
 
+use api::grpc::HardwareUsage;
 use api::grpc::qdrant::points_internal_server::PointsInternal;
 use api::grpc::qdrant::{
     ClearPayloadPointsInternal, CoreSearchBatchPointsInternal, CountPointsInternal, CountResponse,
@@ -15,7 +16,6 @@ use api::grpc::qdrant::{
     SyncPointsInternal, UpdateBatchInternal, UpdateVectorsInternal, UpsertPointsInternal,
 };
 use api::grpc::update_operation::Update;
-use api::grpc::{HardwareUsage, Usage};
 use collection::operations::shard_selector_internal::ShardSelectorInternal;
 use collection::operations::universal_query::shard_query::ShardQueryRequest;
 use collection::shards::shard::ShardId;
@@ -375,9 +375,7 @@ pub async fn query_batch_internal(
             })
             .collect(),
         time: timing.elapsed().as_secs_f64(),
-        usage: Option::from(Usage {
-            hardware: request_hw_data.to_grpc_api(),
-        }),
+        usage: request_hw_data.to_grpc_api(),
     };
 
     Ok(Response::new(response))

Original file line number	Diff line number	Diff line change
`@@ -9887,7 +9887,7 @@ pub struct QueryBatchResponseInternal {`
`9887`	`9887`	`#[prost(double, tag = "2")]`
`9888`	`9888`	`pub time: f64,`
`9889`	`9889`	`#[prost(message, optional, tag = "5")]`
`9890`		`- pub usage: ::core::option::Option<Usage>,`
	`9890`	`+ pub usage: ::core::option::Option<HardwareUsage>,`
`9891`	`9891`	`}`
`9892`	`9892`	`#[derive(serde::Serialize)]`
`9893`	`9893`	`#[derive(validator::Validate)]`
Original file line number	Diff line number	Diff line change
`@@ -1201,9 +1201,7 @@ impl ShardOperation for RemoteShard {`
`1201`	`1201`	`} = batch_response;`
`1202`	`1202`
`1203`	`1203`	`if let Some(hw_usage) = usage {`
`1204`		`- if let Some(hardware) = hw_usage.hardware {`
`1205`		`- hw_measurement_acc.accumulate_request(hardware);`
`1206`		`- }`
	`1204`	`+ hw_measurement_acc.accumulate_request(hw_usage);`
`1207`	`1205`	`}`
`1208`	`1206`
`1209`	`1207`	`let result = results`