diff --git a/quickwit/quickwit-cluster/src/cluster.rs b/quickwit/quickwit-cluster/src/cluster.rs index 4ab337f4dca..eec47ba020a 100644 --- a/quickwit/quickwit-cluster/src/cluster.rs +++ b/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::*; diff --git a/quickwit/quickwit-cluster/src/member.rs b/quickwit/quickwit-cluster/src/member.rs index 45bc2965dd0..81819fa9f91 100644 --- a/quickwit/quickwit-cluster/src/member.rs +++ b/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}; diff --git a/quickwit/quickwit-cluster/src/node.rs b/quickwit/quickwit-cluster/src/node.rs index ffcc6b2b774..d0ffd3d87f5 100644 --- a/quickwit/quickwit-cluster/src/node.rs +++ b/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; diff --git a/quickwit/quickwit-control-plane/src/indexing_plan.rs b/quickwit/quickwit-control-plane/src/indexing_plan.rs index 47371085857..51dd3f01ab9 100644 --- a/quickwit/quickwit-control-plane/src/indexing_plan.rs +++ b/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; diff --git a/quickwit/quickwit-control-plane/src/lib.rs b/quickwit/quickwit-control-plane/src/lib.rs index 3ccdeb83b1d..f867233d83f 100644 --- a/quickwit/quickwit-control-plane/src/lib.rs +++ b/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; diff --git a/quickwit/quickwit-control-plane/src/scheduler.rs b/quickwit/quickwit-control-plane/src/scheduler.rs index 765ec487187..b53ea5a834f 100644 --- a/quickwit/quickwit-control-plane/src/scheduler.rs +++ b/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}; diff --git a/quickwit/quickwit-indexing/src/actors/indexing_service.rs b/quickwit/quickwit-indexing/src/actors/indexing_service.rs index dcd27c53b9d..f23ea27c083 100644 --- a/quickwit/quickwit-indexing/src/actors/indexing_service.rs +++ b/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::*; diff --git a/quickwit/quickwit-indexing/src/actors/merge_executor.rs b/quickwit/quickwit-indexing/src/actors/merge_executor.rs index ae4042baa88..bf243ccb408 100644 --- a/quickwit/quickwit-indexing/src/actors/merge_executor.rs +++ b/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}; diff --git a/quickwit/quickwit-indexing/src/grpc_adapter.rs b/quickwit/quickwit-indexing/src/grpc_adapter.rs index cb3840ca2e1..c8d53f2914b 100644 --- a/quickwit/quickwit-indexing/src/grpc_adapter.rs +++ b/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; diff --git a/quickwit/quickwit-indexing/src/indexing_client.rs b/quickwit/quickwit-indexing/src/indexing_client.rs index 4c84e292968..923e60e9b55 100644 --- a/quickwit/quickwit-indexing/src/indexing_client.rs +++ b/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), + Grpc(quickwit_proto::indexing::indexing_service_client::IndexingServiceClient), Local(Mailbox), } @@ -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, 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 { diff --git a/quickwit/quickwit-janitor/src/actors/delete_task_pipeline.rs b/quickwit/quickwit-janitor/src/actors/delete_task_pipeline.rs index 04ab3345c88..3f8a84db10d 100644 --- a/quickwit/quickwit-janitor/src/actors/delete_task_pipeline.rs +++ b/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, diff --git a/quickwit/quickwit-janitor/src/actors/delete_task_planner.rs b/quickwit/quickwit-janitor/src/actors/delete_task_planner.rs index bc1e60fd7a0..69a1d2b18cc 100644 --- a/quickwit/quickwit-janitor/src/actors/delete_task_planner.rs +++ b/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; diff --git a/quickwit/quickwit-janitor/src/actors/delete_task_service.rs b/quickwit/quickwit-janitor/src/actors/delete_task_service.rs index 68c22bb34b3..8102e5256a6 100644 --- a/quickwit/quickwit-janitor/src/actors/delete_task_service.rs +++ b/quickwit/quickwit-janitor/src/actors/delete_task_service.rs @@ -203,7 +203,7 @@ impl Handler 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; diff --git a/quickwit/quickwit-metastore-utils/src/bin/proxy.rs b/quickwit/quickwit-metastore-utils/src/bin/proxy.rs index d5d6d2c51c8..57ffb14fa64 100644 --- a/quickwit/quickwit-metastore-utils/src/bin/proxy.rs +++ b/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, + client: MetastoreServiceClient, file: BufWriter, } @@ -48,7 +48,7 @@ struct MetastoreProxyService { } impl MetastoreProxyService { - pub fn new(client: MetastoreApiServiceClient, record_file: File) -> Self { + pub fn new(client: MetastoreServiceClient, 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 diff --git a/quickwit/quickwit-metastore-utils/src/bin/replay.rs b/quickwit/quickwit-metastore-utils/src/bin/replay.rs index 08c4fa87a7a..1b22b088605 100644 --- a/quickwit/quickwit-metastore-utils/src/bin/replay.rs +++ b/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, + client: &mut MetastoreServiceClient, 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}"); diff --git a/quickwit/quickwit-metastore-utils/src/grpc_request.rs b/quickwit/quickwit-metastore-utils/src/grpc_request.rs index 729fd536314..15c612a3ca4 100644 --- a/quickwit/quickwit-metastore-utils/src/grpc_request.rs +++ b/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 . -use quickwit_proto::metastore_api::*; +use quickwit_proto::metastore::*; // The macros below are generating a req enum of the form // diff --git a/quickwit/quickwit-metastore/src/metastore/file_backed_metastore/file_backed_index/mod.rs b/quickwit/quickwit-metastore/src/metastore/file_backed_metastore/file_backed_index/mod.rs index 0c11df45be5..4e87c05427f 100644 --- a/quickwit/quickwit-metastore/src/metastore/file_backed_metastore/file_backed_index/mod.rs +++ b/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; diff --git a/quickwit/quickwit-metastore/src/metastore/file_backed_metastore/mod.rs b/quickwit/quickwit-metastore/src/metastore/file_backed_metastore/mod.rs index 7a6bf7f980a..732401929c8 100644 --- a/quickwit/quickwit-metastore/src/metastore/file_backed_metastore/mod.rs +++ b/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; diff --git a/quickwit/quickwit-metastore/src/metastore/grpc_metastore/grpc_adapter.rs b/quickwit/quickwit-metastore/src/metastore/grpc_metastore/grpc_adapter.rs index 734bbdefd73..da1c4c10427 100644 --- a/quickwit/quickwit-metastore/src/metastore/grpc_metastore/grpc_adapter.rs +++ b/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> for GrpcMetastoreAdapter { } #[async_trait] -impl grpc::MetastoreApiService for GrpcMetastoreAdapter { +impl grpc::MetastoreService for GrpcMetastoreAdapter { #[instrument(skip(self, request))] async fn create_index( &self, diff --git a/quickwit/quickwit-metastore/src/metastore/grpc_metastore/mod.rs b/quickwit/quickwit-metastore/src/metastore/grpc_metastore/mod.rs index 7c71ebb2b88..59b0c9a573a 100644 --- a/quickwit/quickwit-metastore/src/metastore/grpc_metastore/mod.rs +++ b/quickwit/quickwit-metastore/src/metastore/grpc_metastore/mod.rs @@ -29,8 +29,8 @@ use itertools::Itertools; use quickwit_common::tower::BalanceChannel; use quickwit_common::uri::Uri as QuickwitUri; use quickwit_config::{IndexConfig, SourceConfig}; -use quickwit_proto::metastore_api::metastore_api_service_client::MetastoreApiServiceClient; -use quickwit_proto::metastore_api::{ +use quickwit_proto::metastore::metastore_service_client::MetastoreServiceClient; +use quickwit_proto::metastore::{ AddSourceRequest, CreateIndexRequest, DeleteIndexRequest, DeleteQuery, DeleteSourceRequest, DeleteSplitsRequest, DeleteTask, IndexMetadataRequest, LastDeleteOpstampRequest, ListAllSplitsRequest, ListDeleteTasksRequest, ListIndexesMetadatasRequest, ListSplitsRequest, @@ -55,7 +55,7 @@ use crate::{ const GRPC_METASTORE_BASE_URI: &str = "grpc://metastore.service.cluster"; type Transport = InterceptedService, SpanContextInterceptor>; -type MetastoreGrpcClientImpl = MetastoreApiServiceClient; +type MetastoreGrpcClientImpl = MetastoreServiceClient; /// The [`MetastoreGrpcClient`] sends gRPC requests to cluster members running a [`Metastore`] /// service, those nodes will execute the queries on the metastore. @@ -79,7 +79,7 @@ impl MetastoreGrpcClient { pub async fn from_balance_channel( balance_channel: BalanceChannel, ) -> anyhow::Result { - let underlying = MetastoreApiServiceClient::with_interceptor( + let underlying = MetastoreServiceClient::with_interceptor( balance_channel.clone(), SpanContextInterceptor, ); @@ -110,7 +110,7 @@ impl MetastoreGrpcClient { .await?; let dummy_addr = "127.0.0.1:1234".parse::()?; let balance_channel = BalanceChannel::from_channel(dummy_addr, channel); - let underlying = MetastoreApiServiceClient::with_interceptor( + let underlying = MetastoreServiceClient::with_interceptor( balance_channel.clone(), SpanContextInterceptor, ); @@ -569,7 +569,7 @@ impl crate::tests::test_suite::DefaultForTest for MetastoreGrpcClient { async fn default_for_test() -> Self { use std::sync::Arc; - use quickwit_proto::metastore_api::metastore_api_service_server::MetastoreApiServiceServer; + use quickwit_proto::metastore::metastore_service_server::MetastoreServiceServer; use quickwit_proto::tonic::transport::Server; use quickwit_storage::RamStorage; @@ -582,7 +582,7 @@ impl crate::tests::test_suite::DefaultForTest for MetastoreGrpcClient { let grpc_adapter = GrpcMetastoreAdapter::from(Arc::new(metastore) as Arc); tokio::spawn(async move { Server::builder() - .add_service(MetastoreApiServiceServer::new(grpc_adapter)) + .add_service(MetastoreServiceServer::new(grpc_adapter)) .serve_with_incoming(futures::stream::iter(vec![Ok::<_, std::io::Error>(server)])) .await }); diff --git a/quickwit/quickwit-metastore/src/metastore/instrumented_metastore.rs b/quickwit/quickwit-metastore/src/metastore/instrumented_metastore.rs index 2e8faceb209..5f366c176f6 100644 --- a/quickwit/quickwit-metastore/src/metastore/instrumented_metastore.rs +++ b/quickwit/quickwit-metastore/src/metastore/instrumented_metastore.rs @@ -20,7 +20,7 @@ use async_trait::async_trait; 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 crate::checkpoint::IndexCheckpointDelta; diff --git a/quickwit/quickwit-metastore/src/metastore/metastore_event_publisher.rs b/quickwit/quickwit-metastore/src/metastore/metastore_event_publisher.rs index 6df4933e55d..c9cf8afe2eb 100644 --- a/quickwit/quickwit-metastore/src/metastore/metastore_event_publisher.rs +++ b/quickwit/quickwit-metastore/src/metastore/metastore_event_publisher.rs @@ -24,7 +24,7 @@ use async_trait::async_trait; use quickwit_common::pubsub::{Event, EventBroker}; 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 tracing::info; diff --git a/quickwit/quickwit-metastore/src/metastore/mod.rs b/quickwit/quickwit-metastore/src/metastore/mod.rs index 6529a785a41..773575d4724 100644 --- a/quickwit/quickwit-metastore/src/metastore/mod.rs +++ b/quickwit/quickwit-metastore/src/metastore/mod.rs @@ -35,7 +35,7 @@ pub use index_metadata::IndexMetadata; use quickwit_common::uri::Uri; use quickwit_config::{IndexConfig, SourceConfig}; use quickwit_doc_mapper::tag_pruning::TagFilterAst; -use quickwit_proto::metastore_api::{DeleteQuery, DeleteTask}; +use quickwit_proto::metastore::{DeleteQuery, DeleteTask}; use quickwit_proto::IndexUid; use time::OffsetDateTime; diff --git a/quickwit/quickwit-metastore/src/metastore/postgresql_metastore.rs b/quickwit/quickwit-metastore/src/metastore/postgresql_metastore.rs index cd6c0e19d5d..9cc0a2593c7 100644 --- a/quickwit/quickwit-metastore/src/metastore/postgresql_metastore.rs +++ b/quickwit/quickwit-metastore/src/metastore/postgresql_metastore.rs @@ -31,7 +31,7 @@ use quickwit_config::{ IndexConfig, MetastoreBackend, MetastoreConfig, PostgresMetastoreConfig, SourceConfig, }; use quickwit_doc_mapper::tag_pruning::TagFilterAst; -use quickwit_proto::metastore_api::{DeleteQuery, DeleteTask}; +use quickwit_proto::metastore::{DeleteQuery, DeleteTask}; use quickwit_proto::IndexUid; use sqlx::migrate::Migrator; use sqlx::postgres::{PgConnectOptions, PgDatabaseError, PgPoolOptions}; diff --git a/quickwit/quickwit-metastore/src/metastore/postgresql_model.rs b/quickwit/quickwit-metastore/src/metastore/postgresql_model.rs index bc3ddb95d01..ae5aca36c13 100644 --- a/quickwit/quickwit-metastore/src/metastore/postgresql_model.rs +++ b/quickwit/quickwit-metastore/src/metastore/postgresql_model.rs @@ -20,7 +20,7 @@ use std::convert::TryInto; use std::str::FromStr; -use quickwit_proto::metastore_api::{DeleteQuery, DeleteTask as QuickwitDeleteTask}; +use quickwit_proto::metastore::{DeleteQuery, DeleteTask as QuickwitDeleteTask}; use quickwit_proto::IndexUid; use tracing::error; diff --git a/quickwit/quickwit-metastore/src/metastore/retrying_metastore/mod.rs b/quickwit/quickwit-metastore/src/metastore/retrying_metastore/mod.rs index f263d666ed9..7c99545ec25 100644 --- a/quickwit/quickwit-metastore/src/metastore/retrying_metastore/mod.rs +++ b/quickwit/quickwit-metastore/src/metastore/retrying_metastore/mod.rs @@ -25,7 +25,7 @@ mod test; use async_trait::async_trait; 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 self::retry::{retry, RetryParams}; diff --git a/quickwit/quickwit-metastore/src/metastore/retrying_metastore/test.rs b/quickwit/quickwit-metastore/src/metastore/retrying_metastore/test.rs index 91ea7ee7878..857dfb5c553 100644 --- a/quickwit/quickwit-metastore/src/metastore/retrying_metastore/test.rs +++ b/quickwit/quickwit-metastore/src/metastore/retrying_metastore/test.rs @@ -22,7 +22,7 @@ use std::sync::atomic::{AtomicUsize, Ordering}; use async_trait::async_trait; 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 super::retry::RetryParams; diff --git a/quickwit/quickwit-metastore/src/tests.rs b/quickwit/quickwit-metastore/src/tests.rs index 9e2ff7816b0..b1e8570fa12 100644 --- a/quickwit/quickwit-metastore/src/tests.rs +++ b/quickwit/quickwit-metastore/src/tests.rs @@ -30,7 +30,7 @@ pub mod test_suite { use quickwit_common::rand::append_random_suffix; use quickwit_config::{IndexConfig, SourceConfig, SourceInputFormat, SourceParams}; use quickwit_doc_mapper::tag_pruning::{no_tag, tag, TagFilterAst}; - use quickwit_proto::metastore_api::DeleteQuery; + use quickwit_proto::metastore::DeleteQuery; use quickwit_proto::{qast_helper, IndexUid}; use time::OffsetDateTime; use tokio::time::sleep; diff --git a/quickwit/quickwit-proto/build.rs b/quickwit/quickwit-proto/build.rs index 0c7fc7ed693..b17ffe0d47f 100644 --- a/quickwit/quickwit-proto/build.rs +++ b/quickwit/quickwit-proto/build.rs @@ -46,7 +46,7 @@ fn main() -> Result<(), Box> { .type_attribute("OutputFormat", "#[serde(rename_all = \"snake_case\")]") .type_attribute("PartialHit.sort_value", "#[derive(Copy)]") .type_attribute("SortOrder", "#[serde(rename_all = \"lowercase\")]") - .out_dir("src/") + .out_dir("src/quickwit") .compile_with_config(prost_config, &protos, &["protos/quickwit"])?; // Jaeger proto diff --git a/quickwit/quickwit-proto/protos/quickwit/indexing_api.proto b/quickwit/quickwit-proto/protos/quickwit/indexing.proto similarity index 97% rename from quickwit/quickwit-proto/protos/quickwit/indexing_api.proto rename to quickwit/quickwit-proto/protos/quickwit/indexing.proto index be5bd1bfc5a..d80ddcdc63a 100644 --- a/quickwit/quickwit-proto/protos/quickwit/indexing_api.proto +++ b/quickwit/quickwit-proto/protos/quickwit/indexing.proto @@ -19,7 +19,7 @@ syntax = "proto3"; -package quickwit_indexing_api; +package quickwit.indexing; service IndexingService { /// Apply an indexing plan on the node. diff --git a/quickwit/quickwit-proto/protos/quickwit/metastore_api.proto b/quickwit/quickwit-proto/protos/quickwit/metastore.proto similarity index 98% rename from quickwit/quickwit-proto/protos/quickwit/metastore_api.proto rename to quickwit/quickwit-proto/protos/quickwit/metastore.proto index ad6fdbfdfd0..03c263b6571 100644 --- a/quickwit/quickwit-proto/protos/quickwit/metastore_api.proto +++ b/quickwit/quickwit-proto/protos/quickwit/metastore.proto @@ -20,9 +20,9 @@ syntax = "proto3"; -package quickwit_metastore_api; +package quickwit.metastore; -service MetastoreApiService { +service MetastoreService { // Creates an index. rpc create_index(CreateIndexRequest) returns (CreateIndexResponse); diff --git a/quickwit/quickwit-proto/protos/quickwit/search_api.proto b/quickwit/quickwit-proto/protos/quickwit/search.proto similarity index 99% rename from quickwit/quickwit-proto/protos/quickwit/search_api.proto rename to quickwit/quickwit-proto/protos/quickwit/search.proto index 4f26b9a690b..6fac124a732 100644 --- a/quickwit/quickwit-proto/protos/quickwit/search_api.proto +++ b/quickwit/quickwit-proto/protos/quickwit/search.proto @@ -19,7 +19,7 @@ syntax = "proto3"; -package quickwit; +package quickwit.search; service SearchService { // Root search API. @@ -107,7 +107,7 @@ message SearchRequest { // Fields to extract snippet on repeated string snippet_fields = 12; - // Optional sort by one or more fields (limited to 2 at the moment). + // Optional sort by one or more fields (limited to 2 at the moment). repeated SortField sort_fields = 14; } diff --git a/quickwit/quickwit-proto/src/lib.rs b/quickwit/quickwit-proto/src/lib.rs index 07ffc22474c..ee28c9b3c78 100644 --- a/quickwit/quickwit-proto/src/lib.rs +++ b/quickwit/quickwit-proto/src/lib.rs @@ -23,19 +23,33 @@ use anyhow::anyhow; use ulid::Ulid; -mod quickwit; -mod quickwit_indexing_api; -mod quickwit_metastore_api; -pub use sort_by_value::SortValue; use std::cmp::Ordering; +use std::convert::Infallible; +use std::fmt; +use ::opentelemetry::global; +use ::opentelemetry::propagation::Extractor; +use ::opentelemetry::propagation::Injector; +use quickwit_query::query_ast::QueryAst; +use tonic::codegen::http; +use tonic::service::Interceptor; +use tonic::Status; +use tracing::Span; +use tracing_opentelemetry::OpenTelemetrySpanExt; -pub mod indexing_api { - pub use crate::quickwit_indexing_api::*; -} +pub use tonic; -pub mod metastore_api { - pub use crate::quickwit_metastore_api::*; -} +#[path = "quickwit/quickwit.indexing.rs"] +pub mod indexing; +#[path = "quickwit/quickwit.metastore.rs"] +pub mod metastore; +#[path = "quickwit/quickwit.search.rs"] +pub mod search; + +pub use indexing::*; +pub use metastore::*; +pub use search::*; + +pub use search::sort_by_value::SortValue; pub mod jaeger { pub mod api_v2 { @@ -49,7 +63,6 @@ pub mod jaeger { } pub mod opentelemetry { - #[cfg(not(doctest))] pub mod proto { @@ -104,23 +117,6 @@ pub mod opentelemetry { #[macro_use] extern crate serde; -use std::convert::Infallible; -use std::fmt; - -use ::opentelemetry::global; -use ::opentelemetry::propagation::Extractor; -use ::opentelemetry::propagation::Injector; -pub use quickwit::*; -use quickwit_indexing_api::IndexingTask; -use quickwit_metastore_api::DeleteQuery; -use quickwit_query::query_ast::QueryAst; -pub use tonic; -use tonic::codegen::http; -use tonic::service::Interceptor; -use tonic::Status; -use tracing::Span; -use tracing_opentelemetry::OpenTelemetrySpanExt; - /// This enum serves as a Rosetta stone of /// gRPC and Http status code. /// diff --git a/quickwit/quickwit-proto/src/quickwit_indexing_api.rs b/quickwit/quickwit-proto/src/quickwit/quickwit.indexing.rs similarity index 97% rename from quickwit/quickwit-proto/src/quickwit_indexing_api.rs rename to quickwit/quickwit-proto/src/quickwit/quickwit.indexing.rs index c2fa637acaa..0767cd87208 100644 --- a/quickwit/quickwit-proto/src/quickwit_indexing_api.rs +++ b/quickwit/quickwit-proto/src/quickwit/quickwit.indexing.rs @@ -125,13 +125,13 @@ pub mod indexing_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_indexing_api.IndexingService/applyIndexingPlan", + "/quickwit.indexing.IndexingService/applyIndexingPlan", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "quickwit_indexing_api.IndexingService", + "quickwit.indexing.IndexingService", "applyIndexingPlan", ), ); @@ -234,7 +234,7 @@ pub mod indexing_service_server { fn call(&mut self, req: http::Request) -> Self::Future { let inner = self.inner.clone(); match req.uri().path() { - "/quickwit_indexing_api.IndexingService/applyIndexingPlan" => { + "/quickwit.indexing.IndexingService/applyIndexingPlan" => { #[allow(non_camel_case_types)] struct applyIndexingPlanSvc(pub Arc); impl< @@ -318,6 +318,6 @@ pub mod indexing_service_server { } } impl tonic::server::NamedService for IndexingServiceServer { - const NAME: &'static str = "quickwit_indexing_api.IndexingService"; + const NAME: &'static str = "quickwit.indexing.IndexingService"; } } diff --git a/quickwit/quickwit-proto/src/quickwit_metastore_api.rs b/quickwit/quickwit-proto/src/quickwit/quickwit.metastore.rs similarity index 91% rename from quickwit/quickwit-proto/src/quickwit_metastore_api.rs rename to quickwit/quickwit-proto/src/quickwit/quickwit.metastore.rs index da79685d451..a5af0981ea6 100644 --- a/quickwit/quickwit-proto/src/quickwit_metastore_api.rs +++ b/quickwit/quickwit-proto/src/quickwit/quickwit.metastore.rs @@ -250,15 +250,15 @@ pub struct ListDeleteTasksResponse { pub delete_tasks: ::prost::alloc::vec::Vec, } /// Generated client implementations. -pub mod metastore_api_service_client { +pub mod metastore_service_client { #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)] use tonic::codegen::*; use tonic::codegen::http::Uri; #[derive(Debug, Clone)] - pub struct MetastoreApiServiceClient { + pub struct MetastoreServiceClient { inner: tonic::client::Grpc, } - impl MetastoreApiServiceClient { + impl MetastoreServiceClient { /// Attempt to create a new client by connecting to a given endpoint. pub async fn connect(dst: D) -> Result where @@ -269,7 +269,7 @@ pub mod metastore_api_service_client { Ok(Self::new(conn)) } } - impl MetastoreApiServiceClient + impl MetastoreServiceClient where T: tonic::client::GrpcService, T::Error: Into, @@ -287,7 +287,7 @@ pub mod metastore_api_service_client { pub fn with_interceptor( inner: T, interceptor: F, - ) -> MetastoreApiServiceClient> + ) -> MetastoreServiceClient> where F: tonic::service::Interceptor, T::ResponseBody: Default, @@ -301,7 +301,7 @@ pub mod metastore_api_service_client { http::Request, >>::Error: Into + Send + Sync, { - MetastoreApiServiceClient::new(InterceptedService::new(inner, interceptor)) + MetastoreServiceClient::new(InterceptedService::new(inner, interceptor)) } /// Compress requests with the given encoding. /// @@ -353,13 +353,13 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/create_index", + "/quickwit.metastore.MetastoreService/create_index", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", + "quickwit.metastore.MetastoreService", "create_index", ), ); @@ -384,13 +384,13 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/index_metadata", + "/quickwit.metastore.MetastoreService/index_metadata", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", + "quickwit.metastore.MetastoreService", "index_metadata", ), ); @@ -415,13 +415,13 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/list_indexes_metadatas", + "/quickwit.metastore.MetastoreService/list_indexes_metadatas", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", + "quickwit.metastore.MetastoreService", "list_indexes_metadatas", ), ); @@ -446,13 +446,13 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/delete_index", + "/quickwit.metastore.MetastoreService/delete_index", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", + "quickwit.metastore.MetastoreService", "delete_index", ), ); @@ -477,13 +477,13 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/list_all_splits", + "/quickwit.metastore.MetastoreService/list_all_splits", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", + "quickwit.metastore.MetastoreService", "list_all_splits", ), ); @@ -508,15 +508,12 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/list_splits", + "/quickwit.metastore.MetastoreService/list_splits", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", - "list_splits", - ), + GrpcMethod::new("quickwit.metastore.MetastoreService", "list_splits"), ); self.inner.unary(req, path, codec).await } @@ -536,13 +533,13 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/stage_splits", + "/quickwit.metastore.MetastoreService/stage_splits", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", + "quickwit.metastore.MetastoreService", "stage_splits", ), ); @@ -564,13 +561,13 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/publish_splits", + "/quickwit.metastore.MetastoreService/publish_splits", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", + "quickwit.metastore.MetastoreService", "publish_splits", ), ); @@ -592,13 +589,13 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/mark_splits_for_deletion", + "/quickwit.metastore.MetastoreService/mark_splits_for_deletion", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", + "quickwit.metastore.MetastoreService", "mark_splits_for_deletion", ), ); @@ -620,13 +617,13 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/delete_splits", + "/quickwit.metastore.MetastoreService/delete_splits", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", + "quickwit.metastore.MetastoreService", "delete_splits", ), ); @@ -648,15 +645,12 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/add_source", + "/quickwit.metastore.MetastoreService/add_source", ); let mut req = request.into_request(); req.extensions_mut() .insert( - GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", - "add_source", - ), + GrpcMethod::new("quickwit.metastore.MetastoreService", "add_source"), ); self.inner.unary(req, path, codec).await } @@ -676,13 +670,13 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/toggle_source", + "/quickwit.metastore.MetastoreService/toggle_source", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", + "quickwit.metastore.MetastoreService", "toggle_source", ), ); @@ -704,13 +698,13 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/delete_source", + "/quickwit.metastore.MetastoreService/delete_source", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", + "quickwit.metastore.MetastoreService", "delete_source", ), ); @@ -732,13 +726,13 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/reset_source_checkpoint", + "/quickwit.metastore.MetastoreService/reset_source_checkpoint", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", + "quickwit.metastore.MetastoreService", "reset_source_checkpoint", ), ); @@ -763,13 +757,13 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/last_delete_opstamp", + "/quickwit.metastore.MetastoreService/last_delete_opstamp", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", + "quickwit.metastore.MetastoreService", "last_delete_opstamp", ), ); @@ -791,13 +785,13 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/create_delete_task", + "/quickwit.metastore.MetastoreService/create_delete_task", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", + "quickwit.metastore.MetastoreService", "create_delete_task", ), ); @@ -822,13 +816,13 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/update_splits_delete_opstamp", + "/quickwit.metastore.MetastoreService/update_splits_delete_opstamp", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", + "quickwit.metastore.MetastoreService", "update_splits_delete_opstamp", ), ); @@ -853,13 +847,13 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/list_delete_tasks", + "/quickwit.metastore.MetastoreService/list_delete_tasks", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", + "quickwit.metastore.MetastoreService", "list_delete_tasks", ), ); @@ -884,13 +878,13 @@ pub mod metastore_api_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit_metastore_api.MetastoreApiService/list_stale_splits", + "/quickwit.metastore.MetastoreService/list_stale_splits", ); let mut req = request.into_request(); req.extensions_mut() .insert( GrpcMethod::new( - "quickwit_metastore_api.MetastoreApiService", + "quickwit.metastore.MetastoreService", "list_stale_splits", ), ); @@ -899,12 +893,12 @@ pub mod metastore_api_service_client { } } /// Generated server implementations. -pub mod metastore_api_service_server { +pub mod metastore_service_server { #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)] use tonic::codegen::*; - /// Generated trait containing gRPC methods that should be implemented for use with MetastoreApiServiceServer. + /// Generated trait containing gRPC methods that should be implemented for use with MetastoreServiceServer. #[async_trait] - pub trait MetastoreApiService: Send + Sync + 'static { + pub trait MetastoreService: Send + Sync + 'static { /// Creates an index. async fn create_index( &self, @@ -1032,7 +1026,7 @@ pub mod metastore_api_service_server { >; } #[derive(Debug)] - pub struct MetastoreApiServiceServer { + pub struct MetastoreServiceServer { inner: _Inner, accept_compression_encodings: EnabledCompressionEncodings, send_compression_encodings: EnabledCompressionEncodings, @@ -1040,7 +1034,7 @@ pub mod metastore_api_service_server { max_encoding_message_size: Option, } struct _Inner(Arc); - impl MetastoreApiServiceServer { + impl MetastoreServiceServer { pub fn new(inner: T) -> Self { Self::from_arc(Arc::new(inner)) } @@ -1092,9 +1086,9 @@ pub mod metastore_api_service_server { self } } - impl tonic::codegen::Service> for MetastoreApiServiceServer + impl tonic::codegen::Service> for MetastoreServiceServer where - T: MetastoreApiService, + T: MetastoreService, B: Body + Send + 'static, B::Error: Into + Send + 'static, { @@ -1110,11 +1104,11 @@ pub mod metastore_api_service_server { fn call(&mut self, req: http::Request) -> Self::Future { let inner = self.inner.clone(); match req.uri().path() { - "/quickwit_metastore_api.MetastoreApiService/create_index" => { + "/quickwit.metastore.MetastoreService/create_index" => { #[allow(non_camel_case_types)] - struct create_indexSvc(pub Arc); + struct create_indexSvc(pub Arc); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService for create_indexSvc { type Response = super::CreateIndexResponse; @@ -1156,11 +1150,11 @@ pub mod metastore_api_service_server { }; Box::pin(fut) } - "/quickwit_metastore_api.MetastoreApiService/index_metadata" => { + "/quickwit.metastore.MetastoreService/index_metadata" => { #[allow(non_camel_case_types)] - struct index_metadataSvc(pub Arc); + struct index_metadataSvc(pub Arc); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService for index_metadataSvc { type Response = super::IndexMetadataResponse; @@ -1202,11 +1196,11 @@ pub mod metastore_api_service_server { }; Box::pin(fut) } - "/quickwit_metastore_api.MetastoreApiService/list_indexes_metadatas" => { + "/quickwit.metastore.MetastoreService/list_indexes_metadatas" => { #[allow(non_camel_case_types)] - struct list_indexes_metadatasSvc(pub Arc); + struct list_indexes_metadatasSvc(pub Arc); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService for list_indexes_metadatasSvc { type Response = super::ListIndexesMetadatasResponse; @@ -1248,11 +1242,11 @@ pub mod metastore_api_service_server { }; Box::pin(fut) } - "/quickwit_metastore_api.MetastoreApiService/delete_index" => { + "/quickwit.metastore.MetastoreService/delete_index" => { #[allow(non_camel_case_types)] - struct delete_indexSvc(pub Arc); + struct delete_indexSvc(pub Arc); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService for delete_indexSvc { type Response = super::DeleteIndexResponse; @@ -1294,11 +1288,11 @@ pub mod metastore_api_service_server { }; Box::pin(fut) } - "/quickwit_metastore_api.MetastoreApiService/list_all_splits" => { + "/quickwit.metastore.MetastoreService/list_all_splits" => { #[allow(non_camel_case_types)] - struct list_all_splitsSvc(pub Arc); + struct list_all_splitsSvc(pub Arc); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService for list_all_splitsSvc { type Response = super::ListSplitsResponse; @@ -1340,11 +1334,11 @@ pub mod metastore_api_service_server { }; Box::pin(fut) } - "/quickwit_metastore_api.MetastoreApiService/list_splits" => { + "/quickwit.metastore.MetastoreService/list_splits" => { #[allow(non_camel_case_types)] - struct list_splitsSvc(pub Arc); + struct list_splitsSvc(pub Arc); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService for list_splitsSvc { type Response = super::ListSplitsResponse; @@ -1384,11 +1378,11 @@ pub mod metastore_api_service_server { }; Box::pin(fut) } - "/quickwit_metastore_api.MetastoreApiService/stage_splits" => { + "/quickwit.metastore.MetastoreService/stage_splits" => { #[allow(non_camel_case_types)] - struct stage_splitsSvc(pub Arc); + struct stage_splitsSvc(pub Arc); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService for stage_splitsSvc { type Response = super::SplitResponse; @@ -1430,11 +1424,11 @@ pub mod metastore_api_service_server { }; Box::pin(fut) } - "/quickwit_metastore_api.MetastoreApiService/publish_splits" => { + "/quickwit.metastore.MetastoreService/publish_splits" => { #[allow(non_camel_case_types)] - struct publish_splitsSvc(pub Arc); + struct publish_splitsSvc(pub Arc); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService for publish_splitsSvc { type Response = super::SplitResponse; @@ -1476,13 +1470,11 @@ pub mod metastore_api_service_server { }; Box::pin(fut) } - "/quickwit_metastore_api.MetastoreApiService/mark_splits_for_deletion" => { + "/quickwit.metastore.MetastoreService/mark_splits_for_deletion" => { #[allow(non_camel_case_types)] - struct mark_splits_for_deletionSvc( - pub Arc, - ); + struct mark_splits_for_deletionSvc(pub Arc); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService for mark_splits_for_deletionSvc { type Response = super::SplitResponse; @@ -1524,11 +1516,11 @@ pub mod metastore_api_service_server { }; Box::pin(fut) } - "/quickwit_metastore_api.MetastoreApiService/delete_splits" => { + "/quickwit.metastore.MetastoreService/delete_splits" => { #[allow(non_camel_case_types)] - struct delete_splitsSvc(pub Arc); + struct delete_splitsSvc(pub Arc); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService for delete_splitsSvc { type Response = super::SplitResponse; @@ -1570,11 +1562,11 @@ pub mod metastore_api_service_server { }; Box::pin(fut) } - "/quickwit_metastore_api.MetastoreApiService/add_source" => { + "/quickwit.metastore.MetastoreService/add_source" => { #[allow(non_camel_case_types)] - struct add_sourceSvc(pub Arc); + struct add_sourceSvc(pub Arc); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService for add_sourceSvc { type Response = super::SourceResponse; @@ -1614,11 +1606,11 @@ pub mod metastore_api_service_server { }; Box::pin(fut) } - "/quickwit_metastore_api.MetastoreApiService/toggle_source" => { + "/quickwit.metastore.MetastoreService/toggle_source" => { #[allow(non_camel_case_types)] - struct toggle_sourceSvc(pub Arc); + struct toggle_sourceSvc(pub Arc); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService for toggle_sourceSvc { type Response = super::SourceResponse; @@ -1660,11 +1652,11 @@ pub mod metastore_api_service_server { }; Box::pin(fut) } - "/quickwit_metastore_api.MetastoreApiService/delete_source" => { + "/quickwit.metastore.MetastoreService/delete_source" => { #[allow(non_camel_case_types)] - struct delete_sourceSvc(pub Arc); + struct delete_sourceSvc(pub Arc); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService for delete_sourceSvc { type Response = super::SourceResponse; @@ -1706,13 +1698,11 @@ pub mod metastore_api_service_server { }; Box::pin(fut) } - "/quickwit_metastore_api.MetastoreApiService/reset_source_checkpoint" => { + "/quickwit.metastore.MetastoreService/reset_source_checkpoint" => { #[allow(non_camel_case_types)] - struct reset_source_checkpointSvc( - pub Arc, - ); + struct reset_source_checkpointSvc(pub Arc); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService for reset_source_checkpointSvc { type Response = super::SourceResponse; @@ -1754,11 +1744,11 @@ pub mod metastore_api_service_server { }; Box::pin(fut) } - "/quickwit_metastore_api.MetastoreApiService/last_delete_opstamp" => { + "/quickwit.metastore.MetastoreService/last_delete_opstamp" => { #[allow(non_camel_case_types)] - struct last_delete_opstampSvc(pub Arc); + struct last_delete_opstampSvc(pub Arc); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService for last_delete_opstampSvc { type Response = super::LastDeleteOpstampResponse; @@ -1800,11 +1790,11 @@ pub mod metastore_api_service_server { }; Box::pin(fut) } - "/quickwit_metastore_api.MetastoreApiService/create_delete_task" => { + "/quickwit.metastore.MetastoreService/create_delete_task" => { #[allow(non_camel_case_types)] - struct create_delete_taskSvc(pub Arc); + struct create_delete_taskSvc(pub Arc); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService for create_delete_taskSvc { type Response = super::DeleteTask; @@ -1846,13 +1836,13 @@ pub mod metastore_api_service_server { }; Box::pin(fut) } - "/quickwit_metastore_api.MetastoreApiService/update_splits_delete_opstamp" => { + "/quickwit.metastore.MetastoreService/update_splits_delete_opstamp" => { #[allow(non_camel_case_types)] - struct update_splits_delete_opstampSvc( + struct update_splits_delete_opstampSvc( pub Arc, ); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService< super::UpdateSplitsDeleteOpstampRequest, > for update_splits_delete_opstampSvc { @@ -1897,11 +1887,11 @@ pub mod metastore_api_service_server { }; Box::pin(fut) } - "/quickwit_metastore_api.MetastoreApiService/list_delete_tasks" => { + "/quickwit.metastore.MetastoreService/list_delete_tasks" => { #[allow(non_camel_case_types)] - struct list_delete_tasksSvc(pub Arc); + struct list_delete_tasksSvc(pub Arc); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService for list_delete_tasksSvc { type Response = super::ListDeleteTasksResponse; @@ -1943,11 +1933,11 @@ pub mod metastore_api_service_server { }; Box::pin(fut) } - "/quickwit_metastore_api.MetastoreApiService/list_stale_splits" => { + "/quickwit.metastore.MetastoreService/list_stale_splits" => { #[allow(non_camel_case_types)] - struct list_stale_splitsSvc(pub Arc); + struct list_stale_splitsSvc(pub Arc); impl< - T: MetastoreApiService, + T: MetastoreService, > tonic::server::UnaryService for list_stale_splitsSvc { type Response = super::ListSplitsResponse; @@ -2004,7 +1994,7 @@ pub mod metastore_api_service_server { } } } - impl Clone for MetastoreApiServiceServer { + impl Clone for MetastoreServiceServer { fn clone(&self) -> Self { let inner = self.inner.clone(); Self { @@ -2016,7 +2006,7 @@ pub mod metastore_api_service_server { } } } - impl Clone for _Inner { + impl Clone for _Inner { fn clone(&self) -> Self { Self(Arc::clone(&self.0)) } @@ -2026,8 +2016,7 @@ pub mod metastore_api_service_server { write!(f, "{:?}", self.0) } } - impl tonic::server::NamedService - for MetastoreApiServiceServer { - const NAME: &'static str = "quickwit_metastore_api.MetastoreApiService"; + impl tonic::server::NamedService for MetastoreServiceServer { + const NAME: &'static str = "quickwit.metastore.MetastoreService"; } } diff --git a/quickwit/quickwit-proto/src/quickwit.rs b/quickwit/quickwit-proto/src/quickwit/quickwit.search.rs similarity index 97% rename from quickwit/quickwit-proto/src/quickwit.rs rename to quickwit/quickwit-proto/src/quickwit/quickwit.search.rs index f8c7ffd444a..d9c6acd532f 100644 --- a/quickwit/quickwit-proto/src/quickwit.rs +++ b/quickwit/quickwit-proto/src/quickwit/quickwit.search.rs @@ -584,11 +584,11 @@ pub mod search_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit.SearchService/RootSearch", + "/quickwit.search.SearchService/RootSearch", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("quickwit.SearchService", "RootSearch")); + .insert(GrpcMethod::new("quickwit.search.SearchService", "RootSearch")); self.inner.unary(req, path, codec).await } /// Perform a leaf search on a given set of splits. @@ -616,11 +616,11 @@ pub mod search_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit.SearchService/LeafSearch", + "/quickwit.search.SearchService/LeafSearch", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("quickwit.SearchService", "LeafSearch")); + .insert(GrpcMethod::new("quickwit.search.SearchService", "LeafSearch")); self.inner.unary(req, path, codec).await } /// / Fetches the documents contents from the document store. @@ -643,11 +643,11 @@ pub mod search_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit.SearchService/FetchDocs", + "/quickwit.search.SearchService/FetchDocs", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("quickwit.SearchService", "FetchDocs")); + .insert(GrpcMethod::new("quickwit.search.SearchService", "FetchDocs")); self.inner.unary(req, path, codec).await } /// Perform a leaf stream on a given set of splits. @@ -669,11 +669,13 @@ pub mod search_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit.SearchService/LeafSearchStream", + "/quickwit.search.SearchService/LeafSearchStream", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("quickwit.SearchService", "LeafSearchStream")); + .insert( + GrpcMethod::new("quickwit.search.SearchService", "LeafSearchStream"), + ); self.inner.server_streaming(req, path, codec).await } /// Root list terms API. @@ -699,11 +701,13 @@ pub mod search_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit.SearchService/RootListTerms", + "/quickwit.search.SearchService/RootListTerms", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("quickwit.SearchService", "RootListTerms")); + .insert( + GrpcMethod::new("quickwit.search.SearchService", "RootListTerms"), + ); self.inner.unary(req, path, codec).await } /// Perform a leaf list terms on a given set of splits. @@ -730,11 +734,13 @@ pub mod search_service_client { })?; let codec = tonic::codec::ProstCodec::default(); let path = http::uri::PathAndQuery::from_static( - "/quickwit.SearchService/LeafListTerms", + "/quickwit.search.SearchService/LeafListTerms", ); let mut req = request.into_request(); req.extensions_mut() - .insert(GrpcMethod::new("quickwit.SearchService", "LeafListTerms")); + .insert( + GrpcMethod::new("quickwit.search.SearchService", "LeafListTerms"), + ); self.inner.unary(req, path, codec).await } } @@ -900,7 +906,7 @@ pub mod search_service_server { fn call(&mut self, req: http::Request) -> Self::Future { let inner = self.inner.clone(); match req.uri().path() { - "/quickwit.SearchService/RootSearch" => { + "/quickwit.search.SearchService/RootSearch" => { #[allow(non_camel_case_types)] struct RootSearchSvc(pub Arc); impl< @@ -944,7 +950,7 @@ pub mod search_service_server { }; Box::pin(fut) } - "/quickwit.SearchService/LeafSearch" => { + "/quickwit.search.SearchService/LeafSearch" => { #[allow(non_camel_case_types)] struct LeafSearchSvc(pub Arc); impl< @@ -988,7 +994,7 @@ pub mod search_service_server { }; Box::pin(fut) } - "/quickwit.SearchService/FetchDocs" => { + "/quickwit.search.SearchService/FetchDocs" => { #[allow(non_camel_case_types)] struct FetchDocsSvc(pub Arc); impl< @@ -1032,7 +1038,7 @@ pub mod search_service_server { }; Box::pin(fut) } - "/quickwit.SearchService/LeafSearchStream" => { + "/quickwit.search.SearchService/LeafSearchStream" => { #[allow(non_camel_case_types)] struct LeafSearchStreamSvc(pub Arc); impl< @@ -1080,7 +1086,7 @@ pub mod search_service_server { }; Box::pin(fut) } - "/quickwit.SearchService/RootListTerms" => { + "/quickwit.search.SearchService/RootListTerms" => { #[allow(non_camel_case_types)] struct RootListTermsSvc(pub Arc); impl< @@ -1126,7 +1132,7 @@ pub mod search_service_server { }; Box::pin(fut) } - "/quickwit.SearchService/LeafListTerms" => { + "/quickwit.search.SearchService/LeafListTerms" => { #[allow(non_camel_case_types)] struct LeafListTermsSvc(pub Arc); impl< @@ -1210,6 +1216,6 @@ pub mod search_service_server { } } impl tonic::server::NamedService for SearchServiceServer { - const NAME: &'static str = "quickwit.SearchService"; + const NAME: &'static str = "quickwit.search.SearchService"; } } diff --git a/quickwit/quickwit-serve/src/delete_task_api/handler.rs b/quickwit/quickwit-serve/src/delete_task_api/handler.rs index 2b0efdc266c..3d5405239e4 100644 --- a/quickwit/quickwit-serve/src/delete_task_api/handler.rs +++ b/quickwit/quickwit-serve/src/delete_task_api/handler.rs @@ -22,7 +22,7 @@ use std::sync::Arc; use quickwit_config::build_doc_mapper; use quickwit_janitor::error::JanitorError; use quickwit_metastore::{Metastore, MetastoreError}; -use quickwit_proto::metastore_api::{DeleteQuery, DeleteTask}; +use quickwit_proto::metastore::{DeleteQuery, DeleteTask}; use quickwit_proto::{query_ast_from_user_text, IndexUid, SearchRequest}; use quickwit_query::query_ast::QueryAst; use serde::Deserialize; @@ -167,7 +167,7 @@ pub async fn post_delete_request( #[cfg(test)] mod tests { use quickwit_indexing::TestSandbox; - use quickwit_proto::metastore_api::DeleteTask; + use quickwit_proto::metastore::DeleteTask; use warp::Filter; use crate::rest::recover_fn; diff --git a/quickwit/quickwit-serve/src/grpc.rs b/quickwit/quickwit-serve/src/grpc.rs index 2245048fb3d..dabba29ae28 100644 --- a/quickwit/quickwit-serve/src/grpc.rs +++ b/quickwit/quickwit-serve/src/grpc.rs @@ -31,9 +31,9 @@ use quickwit_ingest::IngestServiceGrpcServerAdapter; use quickwit_jaeger::JaegerService; use quickwit_metastore::GrpcMetastoreAdapter; use quickwit_opentelemetry::otlp::{OtlpGrpcLogsService, OtlpGrpcTracesService}; -use quickwit_proto::indexing_api::indexing_service_server::IndexingServiceServer; +use quickwit_proto::indexing::indexing_service_server::IndexingServiceServer; use quickwit_proto::jaeger::storage::v1::span_reader_plugin_server::SpanReaderPluginServer; -use quickwit_proto::metastore_api::metastore_api_service_server::MetastoreApiServiceServer; +use quickwit_proto::metastore::metastore_service_server::MetastoreServiceServer; use quickwit_proto::opentelemetry::proto::collector::logs::v1::logs_service_server::LogsServiceServer; use quickwit_proto::opentelemetry::proto::collector::trace::v1::trace_service_server::TraceServiceServer; use quickwit_proto::search_service_server::SearchServiceServer; @@ -60,7 +60,7 @@ pub(crate) async fn start_grpc_server( enabled_grpc_services.insert("metastore"); let metastore = services.metastore.clone(); let grpc_metastore = GrpcMetastoreAdapter::from(metastore); - Some(MetastoreApiServiceServer::new(grpc_metastore)) + Some(MetastoreServiceServer::new(grpc_metastore)) } else { None }; diff --git a/quickwit/quickwit-serve/src/lib.rs b/quickwit/quickwit-serve/src/lib.rs index d4ea62446ce..df06baf62f0 100644 --- a/quickwit/quickwit-serve/src/lib.rs +++ b/quickwit/quickwit-serve/src/lib.rs @@ -584,7 +584,7 @@ async fn setup_indexing_scheduler( } } else { let grpc_client = - quickwit_proto::indexing_api::indexing_service_client::IndexingServiceClient::new( + quickwit_proto::indexing::indexing_service_client::IndexingServiceClient::new( node.channel(), ); let client = diff --git a/quickwit/rustfmt.toml b/quickwit/rustfmt.toml index f79b1d569f7..d313705507b 100644 --- a/quickwit/rustfmt.toml +++ b/quickwit/rustfmt.toml @@ -1,5 +1,5 @@ ignore = [ - "quickwit-proto/src/*.rs", + "quickwit-proto/src/**/*.rs", "**/codegen/*.rs", ]