Skip to content

Commit 3e97d0a

Browse files
authored
Migrate Control Plane codegen to quickwit-proto crate (#3678)
1 parent fda33ae commit 3e97d0a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+474
-551
lines changed

quickwit/Cargo.lock

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

quickwit/quickwit-control-plane/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ quickwit-actors = { workspace = true }
3434
quickwit-cluster = { workspace = true }
3535
quickwit-common = { workspace = true }
3636
quickwit-config = { workspace = true }
37-
quickwit-grpc-clients = { workspace = true }
3837
quickwit-indexing = { workspace = true }
3938
quickwit-metastore = { workspace = true }
4039
quickwit-proto = { workspace = true }
@@ -50,6 +49,7 @@ quickwit-cluster = { workspace = true, features = ["testsuite"] }
5049
quickwit-common = { workspace = true, features = ["testsuite"] }
5150
quickwit-config = { workspace = true, features = ["testsuite"] }
5251
quickwit-metastore = { workspace = true, features = ["testsuite"] }
52+
quickwit-proto = { workspace = true, features = ["testsuite"] }
5353
quickwit-storage = { workspace = true, features = ["testsuite"] }
5454

5555
[build-dependencies]

quickwit/quickwit-control-plane/build.rs

Lines changed: 0 additions & 31 deletions
This file was deleted.

quickwit/quickwit-control-plane/src/control_plane.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
use anyhow::Context;
2121
use async_trait::async_trait;
2222
use quickwit_actors::{Actor, ActorContext, ActorExitStatus, Handler, Mailbox};
23+
use quickwit_proto::control_plane::{NotifyIndexChangeRequest, NotifyIndexChangeResponse};
2324
use tracing::debug;
2425

2526
use crate::scheduler::IndexingScheduler;
26-
use crate::{NotifyIndexChangeRequest, NotifyIndexChangeResponse};
2727

2828
#[derive(Debug)]
2929
pub struct ControlPlane {
@@ -51,7 +51,7 @@ impl ControlPlane {
5151

5252
#[async_trait]
5353
impl Handler<NotifyIndexChangeRequest> for ControlPlane {
54-
type Reply = crate::Result<NotifyIndexChangeResponse>;
54+
type Reply = quickwit_proto::control_plane::Result<NotifyIndexChangeResponse>;
5555

5656
async fn handle(
5757
&mut self,

quickwit/quickwit-control-plane/src/grpc_adapter.rs

Lines changed: 0 additions & 140 deletions
This file was deleted.

quickwit/quickwit-control-plane/src/indexing_plan.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,8 @@ mod tests {
324324
FileSourceParams, KafkaSourceParams, SourceConfig, SourceInputFormat, SourceParams,
325325
CLI_INGEST_SOURCE_ID, INGEST_API_SOURCE_ID,
326326
};
327-
use quickwit_proto::indexing::IndexingTask;
328-
use quickwit_proto::{IndexUid, IndexingServiceClient};
327+
use quickwit_proto::indexing::{IndexingServiceClient, IndexingTask};
328+
use quickwit_proto::IndexUid;
329329
use rand::seq::SliceRandom;
330330
use serde_json::json;
331331
use tonic::transport::Endpoint;

0 commit comments

Comments
 (0)