From 90540f9c11f449694d37895f5be653087b037eb9 Mon Sep 17 00:00:00 2001
From: Igor Motov <igor@motovs.org>
Date: Mon, 14 Aug 2023 12:31:29 -1000
Subject: [PATCH] Fix build after main branch merge

---
 .../src/cache_storage_controller.rs                       | 3 ++-
 quickwit/quickwit-control-plane/src/control_plane.rs      | 8 +++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/quickwit/quickwit-control-plane/src/cache_storage_controller.rs b/quickwit/quickwit-control-plane/src/cache_storage_controller.rs
index 2c265e3e196..f2728747e93 100644
--- a/quickwit/quickwit-control-plane/src/cache_storage_controller.rs
+++ b/quickwit/quickwit-control-plane/src/cache_storage_controller.rs
@@ -35,6 +35,7 @@ use quickwit_metastore::{IndexMetadata, ListSplitsQuery, Metastore};
 use quickwit_proto::cache_storage::{
     CacheStorageServiceClient, NotifySplitsChangeRequest, SplitsChangeNotification,
 };
+use quickwit_proto::control_plane::ControlPlaneResult;
 use quickwit_proto::IndexUid;
 use serde::Serialize;
 use tokio::sync::RwLock;
@@ -195,7 +196,7 @@ pub struct CacheUpdateRequest {}
 
 #[async_trait]
 impl Handler<CacheUpdateRequest> for CacheStorageController {
-    type Reply = quickwit_proto::control_plane::Result<()>;
+    type Reply = ControlPlaneResult<()>;
 
     async fn handle(
         &mut self,
diff --git a/quickwit/quickwit-control-plane/src/control_plane.rs b/quickwit/quickwit-control-plane/src/control_plane.rs
index 6131b5c23d6..386c8bae92b 100644
--- a/quickwit/quickwit-control-plane/src/control_plane.rs
+++ b/quickwit/quickwit-control-plane/src/control_plane.rs
@@ -21,11 +21,9 @@ use anyhow::Context;
 use async_trait::async_trait;
 use quickwit_actors::{Actor, ActorContext, ActorExitStatus, Handler, Mailbox};
 use quickwit_proto::control_plane::{
-    
     CloseShardsRequest, CloseShardsResponse, ControlPlaneResult, GetOpenShardsRequest,
-    GetOpenShardsResponse, NotifyIndexChangeRequest, NotifyIndexChangeResponse, NotifySplitsChangeRequest,
-    NotifySplitsChangeResponse,
-,
+    GetOpenShardsResponse, NotifyIndexChangeRequest, NotifyIndexChangeResponse,
+    NotifySplitsChangeRequest, NotifySplitsChangeResponse,
 };
 use tracing::debug;
 
@@ -85,7 +83,7 @@ impl Handler<NotifyIndexChangeRequest> for ControlPlane {
 
 #[async_trait]
 impl Handler<NotifySplitsChangeRequest> for ControlPlane {
-    type Reply = quickwit_proto::control_plane::Result<NotifySplitsChangeResponse>;
+    type Reply = ControlPlaneResult<NotifySplitsChangeResponse>;
 
     async fn handle(
         &mut self,