Move Quickwit generated code to quickwit dir

quickwit/quickwit-cluster/src/cluster.rs

@@ -31,7 +31,7 @@ use chitchat::{
 };
 use futures::Stream;
 use itertools::Itertools;
-use quickwit_proto::indexing_api::IndexingTask;
+use quickwit_proto::indexing::IndexingTask;
 use serde::{Deserialize, Serialize};
 use tokio::sync::{mpsc, watch, Mutex, RwLock};
 use tokio::time::timeout;
@@ -571,7 +571,7 @@ mod tests {
     use itertools::Itertools;
     use quickwit_common::test_utils::wait_until_predicate;
     use quickwit_config::service::QuickwitService;
-    use quickwit_proto::indexing_api::IndexingTask;
+    use quickwit_proto::indexing::IndexingTask;
     use rand::Rng;
 
     use super::*;

quickwit/quickwit-cluster/src/member.rs

@@ -23,7 +23,7 @@ use std::net::SocketAddr;
 use anyhow::{anyhow, Context};
 use chitchat::{ChitchatId, NodeState};
 use itertools::Itertools;
-use quickwit_proto::indexing_api::IndexingTask;
+use quickwit_proto::indexing::IndexingTask;
 use tracing::warn;
 
 use crate::{GenerationId, QuickwitService};

quickwit/quickwit-cluster/src/node.rs

@@ -24,7 +24,7 @@ use std::sync::Arc;
 
 use chitchat::{ChitchatId, NodeState};
 use quickwit_config::service::QuickwitService;
-use quickwit_proto::indexing_api::IndexingTask;
+use quickwit_proto::indexing::IndexingTask;
 use tonic::transport::Channel;
 
 use crate::member::build_cluster_member;

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

@@ -24,7 +24,7 @@ use std::hash::Hash;
 use itertools::Itertools;
 use quickwit_common::rendezvous_hasher::sort_by_rendez_vous_hash;
 use quickwit_config::{SourceConfig, CLI_INGEST_SOURCE_ID, INGEST_API_SOURCE_ID};
-use quickwit_proto::indexing_api::IndexingTask;
+use quickwit_proto::indexing::IndexingTask;
 use quickwit_proto::IndexUid;
 use serde::Serialize;
 
@@ -325,7 +325,7 @@ mod tests {
         CLI_INGEST_SOURCE_ID, INGEST_API_SOURCE_ID,
     };
     use quickwit_indexing::indexing_client::create_indexing_service_client;
-    use quickwit_proto::indexing_api::IndexingTask;
+    use quickwit_proto::indexing::IndexingTask;
     use quickwit_proto::IndexUid;
     use rand::seq::SliceRandom;
     use serde_json::json;

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

@@ -33,7 +33,7 @@ use quickwit_common::tower::Pool;
 use quickwit_config::SourceParams;
 use quickwit_indexing::indexing_client::IndexingServiceClient;
 use quickwit_metastore::{Metastore, MetastoreEvent};
-use quickwit_proto::indexing_api::IndexingTask;
+use quickwit_proto::indexing::IndexingTask;
 use scheduler::IndexingScheduler;
 use tracing::error;
 

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

@@ -29,7 +29,7 @@ use itertools::Itertools;
 use quickwit_actors::{Actor, ActorContext, ActorExitStatus, Handler};
 use quickwit_config::SourceConfig;
 use quickwit_metastore::Metastore;
-use quickwit_proto::indexing_api::{ApplyIndexingPlanRequest, IndexingTask};
+use quickwit_proto::indexing::{ApplyIndexingPlanRequest, IndexingTask};
 use serde::Serialize;
 use tracing::{debug, error, info, warn};
 
@@ -525,7 +525,7 @@ mod tests {
     use quickwit_indexing::indexing_client::IndexingServiceClient;
     use quickwit_indexing::IndexingService;
     use quickwit_metastore::{IndexMetadata, MockMetastore};
-    use quickwit_proto::indexing_api::{ApplyIndexingPlanRequest, IndexingTask};
+    use quickwit_proto::indexing::{ApplyIndexingPlanRequest, IndexingTask};
     use serde_json::json;
 
     use super::{IndexingScheduler, CONTROL_PLAN_LOOP_INTERVAL};

quickwit/quickwit-indexing/src/actors/indexing_service.rs

@@ -37,7 +37,7 @@ use quickwit_config::{
 };
 use quickwit_ingest::{DropQueueRequest, IngestApiService, ListQueuesRequest, QUEUES_DIR_NAME};
 use quickwit_metastore::{IndexMetadata, Metastore, MetastoreError};
-use quickwit_proto::indexing_api::{ApplyIndexingPlanRequest, IndexingTask};
+use quickwit_proto::indexing::{ApplyIndexingPlanRequest, IndexingTask};
 use quickwit_proto::{IndexUid, ServiceError, ServiceErrorCode};
 use quickwit_storage::{StorageError, StorageResolver, StorageResolverError};
 use serde::{Deserialize, Serialize};
@@ -800,7 +800,7 @@ mod tests {
     };
     use quickwit_ingest::{init_ingest_api, CreateQueueIfNotExistsRequest};
     use quickwit_metastore::{metastore_for_test, MockMetastore};
-    use quickwit_proto::indexing_api::IndexingTask;
+    use quickwit_proto::indexing::IndexingTask;
 
     use super::*;
 

quickwit/quickwit-indexing/src/actors/merge_executor.rs

@@ -34,7 +34,7 @@ use quickwit_common::temp_dir::TempDirectory;
 use quickwit_directories::UnionDirectory;
 use quickwit_doc_mapper::DocMapper;
 use quickwit_metastore::{Metastore, SplitMetadata};
-use quickwit_proto::metastore_api::DeleteTask;
+use quickwit_proto::metastore::DeleteTask;
 use quickwit_query::get_quickwit_fastfield_normalizer_manager;
 use quickwit_query::query_ast::QueryAst;
 use tantivy::directory::{DirectoryClone, MmapDirectory, RamDirectory};
@@ -532,7 +532,7 @@ mod tests {
     use quickwit_actors::Universe;
     use quickwit_common::split_file;
     use quickwit_metastore::SplitMetadata;
-    use quickwit_proto::metastore_api::DeleteQuery;
+    use quickwit_proto::metastore::DeleteQuery;
     use serde_json::Value as JsonValue;
     use tantivy::{Inventory, ReloadPolicy};
 

quickwit/quickwit-indexing/src/grpc_adapter.rs

@@ -19,8 +19,8 @@
 
 use async_trait::async_trait;
 use quickwit_actors::Mailbox;
-use quickwit_proto::indexing_api::indexing_service_server::{self as grpc};
-use quickwit_proto::indexing_api::{ApplyIndexingPlanRequest, ApplyIndexingPlanResponse};
+use quickwit_proto::indexing::indexing_service_server::{self as grpc};
+use quickwit_proto::indexing::{ApplyIndexingPlanRequest, ApplyIndexingPlanResponse};
 use quickwit_proto::tonic;
 
 use crate::IndexingService;

quickwit/quickwit-indexing/src/indexing_client.rs

@@ -25,14 +25,14 @@ use async_trait::async_trait;
 use quickwit_actors::Mailbox;
 use quickwit_config::service::QuickwitService;
 use quickwit_grpc_clients::service_client_pool::ServiceClient;
-use quickwit_proto::indexing_api::ApplyIndexingPlanRequest;
+use quickwit_proto::indexing::ApplyIndexingPlanRequest;
 use quickwit_proto::tonic::transport::{Channel, Endpoint, Uri};
 
 use crate::IndexingService;
 
 #[derive(Clone)]
 enum IndexingServiceClientImpl {
-    Grpc(quickwit_proto::indexing_api::indexing_service_client::IndexingServiceClient<Channel>),
+    Grpc(quickwit_proto::indexing::indexing_service_client::IndexingServiceClient<Channel>),
     Local(Mailbox<IndexingService>),
 }
 
@@ -72,9 +72,7 @@ impl ServiceClient for IndexingServiceClient {
 
 impl IndexingServiceClient {
     pub fn from_grpc_client(
-        client: quickwit_proto::indexing_api::indexing_service_client::IndexingServiceClient<
-            Channel,
-        >,
+        client: quickwit_proto::indexing::indexing_service_client::IndexingServiceClient<Channel>,
         grpc_addr: SocketAddr,
     ) -> Self {
         Self {
@@ -123,7 +121,7 @@ pub async fn create_indexing_service_client(
         .connect_timeout(Duration::from_secs(5))
         .connect_lazy();
     let client = IndexingServiceClient::from_grpc_client(
-        quickwit_proto::indexing_api::indexing_service_client::IndexingServiceClient::new(channel),
+        quickwit_proto::indexing::indexing_service_client::IndexingServiceClient::new(channel),
         grpc_addr,
     );
     Ok(client)
@@ -133,8 +131,8 @@ pub async fn create_indexing_service_client(
 mod tests {
     use quickwit_actors::Universe;
     use quickwit_grpc_clients::create_channel_from_duplex_stream;
-    use quickwit_proto::indexing_api::indexing_service_server::IndexingServiceServer;
-    use quickwit_proto::indexing_api::ApplyIndexingPlanRequest;
+    use quickwit_proto::indexing::indexing_service_server::IndexingServiceServer;
+    use quickwit_proto::indexing::ApplyIndexingPlanRequest;
     use quickwit_proto::tonic::transport::Server;
 
     use super::IndexingServiceClient;
@@ -172,9 +170,7 @@ mod tests {
         let channel = create_channel_from_duplex_stream(client).await.unwrap();
         let grpc_addr = ([127, 0, 0, 1], 1).into();
         let grpc_client =
-            quickwit_proto::indexing_api::indexing_service_client::IndexingServiceClient::new(
-                channel,
-            );
+            quickwit_proto::indexing::indexing_service_client::IndexingServiceClient::new(channel);
         let mut client = IndexingServiceClient::from_grpc_client(grpc_client, grpc_addr);
         client
             .apply_indexing_plan(ApplyIndexingPlanRequest {

quickwit/quickwit-janitor/src/actors/delete_task_pipeline.rs

@@ -291,7 +291,7 @@ mod tests {
     use quickwit_common::temp_dir::TempDirectory;
     use quickwit_indexing::TestSandbox;
     use quickwit_metastore::SplitState;
-    use quickwit_proto::metastore_api::DeleteQuery;
+    use quickwit_proto::metastore::DeleteQuery;
     use quickwit_proto::{LeafSearchRequest, LeafSearchResponse};
     use quickwit_search::{
         searcher_pool_for_test, MockSearchService, SearchError, SearchJobPlacer,

quickwit/quickwit-janitor/src/actors/delete_task_planner.rs

@@ -32,7 +32,7 @@ use quickwit_indexing::merge_policy::MergeOperation;
 use quickwit_metastore::{
     split_tag_filter, split_time_range_filter, Metastore, MetastoreResult, Split,
 };
-use quickwit_proto::metastore_api::DeleteTask;
+use quickwit_proto::metastore::DeleteTask;
 use quickwit_proto::{IndexUid, SearchRequest};
 use quickwit_search::{jobs_to_leaf_request, SearchJob, SearchJobPlacer};
 use serde::Serialize;
@@ -400,7 +400,7 @@ mod tests {
     use quickwit_indexing::merge_policy::MergeOperation;
     use quickwit_indexing::TestSandbox;
     use quickwit_metastore::SplitMetadata;
-    use quickwit_proto::metastore_api::DeleteQuery;
+    use quickwit_proto::metastore::DeleteQuery;
     use quickwit_proto::{LeafSearchRequest, LeafSearchResponse};
     use quickwit_search::{searcher_pool_for_test, MockSearchService};
     use tantivy::TrackedObject;

quickwit/quickwit-janitor/src/actors/delete_task_service.rs

@@ -203,7 +203,7 @@ impl Handler<UpdatePipelines> for DeleteTaskService {
 #[cfg(test)]
 mod tests {
     use quickwit_indexing::TestSandbox;
-    use quickwit_proto::metastore_api::DeleteQuery;
+    use quickwit_proto::metastore::DeleteQuery;
     use quickwit_search::{searcher_pool_for_test, MockSearchService, SearchJobPlacer};
     use quickwit_storage::StorageResolver;
 

quickwit/quickwit-metastore-utils/src/bin/proxy.rs

@@ -23,11 +23,11 @@ use std::sync::Arc;
 
 use async_trait::async_trait;
 use quickwit_metastore_utils::{GrpcCall, GrpcRequest};
-use quickwit_proto::metastore_api::metastore_api_service_client::MetastoreApiServiceClient;
-use quickwit_proto::metastore_api::metastore_api_service_server::{
-    MetastoreApiService, MetastoreApiServiceServer,
+use quickwit_proto::metastore::metastore_service_client::MetastoreServiceClient;
+use quickwit_proto::metastore::metastore_service_server::{
+    MetastoreService, MetastoreServiceServer,
 };
-use quickwit_proto::metastore_api::*;
+use quickwit_proto::metastore::*;
 use quickwit_proto::tonic;
 use quickwit_proto::tonic::transport::Channel;
 use quickwit_proto::tonic::{Request, Response, Status};
@@ -39,7 +39,7 @@ use tokio::time::Instant;
 
 struct Inner {
     start: Instant,
-    client: MetastoreApiServiceClient<Channel>,
+    client: MetastoreServiceClient<Channel>,
     file: BufWriter<File>,
 }
 
@@ -48,7 +48,7 @@ struct MetastoreProxyService {
 }
 
 impl MetastoreProxyService {
-    pub fn new(client: MetastoreApiServiceClient<Channel>, record_file: File) -> Self {
+    pub fn new(client: MetastoreServiceClient<Channel>, record_file: File) -> Self {
         let inner = Inner {
             start: Instant::now(),
             client,
@@ -77,7 +77,7 @@ impl Inner {
 }
 
 #[async_trait]
-impl MetastoreApiService for MetastoreProxyService {
+impl MetastoreService for MetastoreProxyService {
     /// Creates an index.
     async fn create_index(
         &self,
@@ -284,10 +284,10 @@ struct Opt {
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {
     let opt = Opt::from_args();
-    let client = MetastoreApiServiceClient::connect(opt.forward_to.clone()).await?;
+    let client = MetastoreServiceClient::connect(opt.forward_to.clone()).await?;
     let file = File::create(&opt.file).await?;
     let service = MetastoreProxyService::new(client, file);
-    let server = MetastoreApiServiceServer::new(service);
+    let server = MetastoreServiceServer::new(service);
     println!(
         "Listening to {}, Forwarding to {}",
         opt.listen_to, opt.forward_to

quickwit/quickwit-metastore-utils/src/bin/replay.rs

@@ -20,14 +20,14 @@
 use std::path::PathBuf;
 
 use quickwit_metastore_utils::{GrpcCall, GrpcRequest};
-use quickwit_proto::metastore_api::metastore_api_service_client::MetastoreApiServiceClient;
+use quickwit_proto::metastore::metastore_service_client::MetastoreServiceClient;
 use quickwit_proto::tonic::transport::Channel;
 use structopt::StructOpt;
 use tokio::fs::File;
 use tokio::io::AsyncBufReadExt;
 
 async fn replay_grpc_request(
-    client: &mut MetastoreApiServiceClient<Channel>,
+    client: &mut MetastoreServiceClient<Channel>,
     req: GrpcRequest,
 ) -> anyhow::Result<()> {
     match req {
@@ -113,7 +113,7 @@ async fn main() -> anyhow::Result<()> {
     let file = File::open(&opt.file).await?;
     let buffered = tokio::io::BufReader::new(file);
     let mut lines = buffered.lines();
-    let mut client = MetastoreApiServiceClient::connect(opt.forward_to.clone()).await?;
+    let mut client = MetastoreServiceClient::connect(opt.forward_to.clone()).await?;
     let mut i = 0;
     while let Some(line) = lines.next_line().await? {
         println!("line {i} = {line}");

quickwit/quickwit-metastore-utils/src/grpc_request.rs

@@ -17,7 +17,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-use quickwit_proto::metastore_api::*;
+use quickwit_proto::metastore::*;
 
 // The macros below are generating a req enum of the form
 //

quickwit/quickwit-metastore/src/metastore/file_backed_metastore/file_backed_index/mod.rs

@@ -29,7 +29,7 @@ use std::ops::Bound;
 
 use quickwit_common::PrettySample;
 use quickwit_config::SourceConfig;
-use quickwit_proto::metastore_api::{DeleteQuery, DeleteTask};
+use quickwit_proto::metastore::{DeleteQuery, DeleteTask};
 use quickwit_proto::IndexUid;
 use serde::{Deserialize, Serialize};
 use serialize::VersionedFileBackedIndex;

quickwit/quickwit-metastore/src/metastore/file_backed_metastore/mod.rs

@@ -34,7 +34,7 @@ use async_trait::async_trait;
 use futures::future::try_join_all;
 use quickwit_common::uri::Uri;
 use quickwit_config::{IndexConfig, SourceConfig};
-use quickwit_proto::metastore_api::{DeleteQuery, DeleteTask};
+use quickwit_proto::metastore::{DeleteQuery, DeleteTask};
 use quickwit_proto::IndexUid;
 use quickwit_storage::Storage;
 use tokio::sync::{Mutex, OwnedMutexGuard, RwLock};
@@ -698,7 +698,7 @@ mod tests {
 
     use futures::executor::block_on;
     use quickwit_config::IndexConfig;
-    use quickwit_proto::metastore_api::DeleteQuery;
+    use quickwit_proto::metastore::DeleteQuery;
     use quickwit_proto::qast_helper;
     use quickwit_storage::{MockStorage, RamStorage, Storage, StorageErrorKind};
     use rand::Rng;

quickwit/quickwit-metastore/src/metastore/grpc_metastore/grpc_adapter.rs

@@ -22,8 +22,8 @@ use std::sync::Arc;
 use async_trait::async_trait;
 use itertools::Itertools;
 use quickwit_config::IndexConfig;
-use quickwit_proto::metastore_api::metastore_api_service_server::{self as grpc};
-use quickwit_proto::metastore_api::{
+use quickwit_proto::metastore::metastore_service_server::{self as grpc};
+use quickwit_proto::metastore::{
     AddSourceRequest, CreateIndexRequest, CreateIndexResponse, DeleteIndexRequest,
     DeleteIndexResponse, DeleteQuery, DeleteSourceRequest, DeleteSplitsRequest, DeleteTask,
     IndexMetadataRequest, IndexMetadataResponse, LastDeleteOpstampRequest,
@@ -51,7 +51,7 @@ impl From<Arc<dyn Metastore>> for GrpcMetastoreAdapter {
 }
 
 #[async_trait]
-impl grpc::MetastoreApiService for GrpcMetastoreAdapter {
+impl grpc::MetastoreService for GrpcMetastoreAdapter {
     #[instrument(skip(self, request))]
     async fn create_index(
         &self,