Migrate Control Plane codegen to quickwit-proto crate (#3678)

quickwit-oss · Jul 24, 2023 · 3e97d0a · 3e97d0a
1 parent fda33ae
commit 3e97d0a
Show file tree

Hide file tree

Showing 51 changed files with 474 additions and 551 deletions.
diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock
diff --git a/quickwit/quickwit-control-plane/Cargo.toml b/quickwit/quickwit-control-plane/Cargo.toml
@@ -34,7 +34,6 @@ quickwit-actors = { workspace = true }
 quickwit-cluster = { workspace = true }
 quickwit-common = { workspace = true }
 quickwit-config = { workspace = true }
-quickwit-grpc-clients = { workspace = true }
 quickwit-indexing = { workspace = true }
 quickwit-metastore = { workspace = true }
 quickwit-proto = { workspace = true }
@@ -50,6 +49,7 @@ quickwit-cluster = { workspace = true, features = ["testsuite"] }
 quickwit-common = { workspace = true, features = ["testsuite"] }
 quickwit-config = { workspace = true, features = ["testsuite"] }
 quickwit-metastore = { workspace = true, features = ["testsuite"] }
+quickwit-proto = { workspace = true, features = ["testsuite"] }
 quickwit-storage = { workspace = true, features = ["testsuite"] }
 
 [build-dependencies]

diff --git a/quickwit/quickwit-control-plane/build.rs b/quickwit/quickwit-control-plane/build.rs
diff --git a/quickwit/quickwit-control-plane/src/control_plane.rs b/quickwit/quickwit-control-plane/src/control_plane.rs
@@ -20,10 +20,10 @@
 use anyhow::Context;
 use async_trait::async_trait;
 use quickwit_actors::{Actor, ActorContext, ActorExitStatus, Handler, Mailbox};
+use quickwit_proto::control_plane::{NotifyIndexChangeRequest, NotifyIndexChangeResponse};
 use tracing::debug;
 
 use crate::scheduler::IndexingScheduler;
-use crate::{NotifyIndexChangeRequest, NotifyIndexChangeResponse};
 
 #[derive(Debug)]
 pub struct ControlPlane {
@@ -51,7 +51,7 @@ impl ControlPlane {
 
 #[async_trait]
 impl Handler<NotifyIndexChangeRequest> for ControlPlane {
-    type Reply = crate::Result<NotifyIndexChangeResponse>;
+    type Reply = quickwit_proto::control_plane::Result<NotifyIndexChangeResponse>;
 
     async fn handle(
         &mut self,

diff --git a/quickwit/quickwit-control-plane/src/grpc_adapter.rs b/quickwit/quickwit-control-plane/src/grpc_adapter.rs
diff --git a/quickwit/quickwit-control-plane/src/indexing_plan.rs b/quickwit/quickwit-control-plane/src/indexing_plan.rs
@@ -324,8 +324,8 @@ mod tests {
         FileSourceParams, KafkaSourceParams, SourceConfig, SourceInputFormat, SourceParams,
         CLI_INGEST_SOURCE_ID, INGEST_API_SOURCE_ID,
     };
-    use quickwit_proto::indexing::IndexingTask;
-    use quickwit_proto::{IndexUid, IndexingServiceClient};
+    use quickwit_proto::indexing::{IndexingServiceClient, IndexingTask};
+    use quickwit_proto::IndexUid;
     use rand::seq::SliceRandom;
     use serde_json::json;
     use tonic::transport::Endpoint;