refactor: Rearrange delegation to remove one usage of generated types (#4579)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
pull/24376/head
Carol (Nichols || Goulding) 2022-05-12 12:10:38 -04:00 committed by GitHub
parent 7eff52d04e
commit 975dd288d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 11 deletions

View File

@ -33,8 +33,9 @@ impl WriteInfoService for QuerierWriteInfoServiceImpl {
) -> Result<tonic::Response<proto::GetWriteInfoResponse>, tonic::Status> {
let proto::GetWriteInfoRequest { write_token } = request.into_inner();
let progresses = self
.server
let ingester_connection = self.server.ingester_connection();
let progresses = ingester_connection
.get_write_info(&write_token)
.await
.map_err(|e| tonic::Status::internal(e.to_string()))?;

View File

@ -1,16 +1,12 @@
//! Database for the querier that contains all namespaces.
use crate::{
cache::CatalogCache,
chunk::ParquetChunkAdapter,
ingester::{Error, IngesterConnection},
namespace::QuerierNamespace,
query_log::QueryLog,
cache::CatalogCache, chunk::ParquetChunkAdapter, ingester::IngesterConnection,
namespace::QuerierNamespace, query_log::QueryLog,
};
use async_trait::async_trait;
use backoff::{Backoff, BackoffConfig};
use data_types::Namespace;
use generated_types::influxdata::iox::ingester::v1::GetWriteInfoResponse;
use object_store::DynObjectStore;
use parking_lot::RwLock;
use query::exec::Executor;
@ -127,9 +123,9 @@ impl QuerierDatabase {
.expect("retry forever")
}
/// Get write info for the given token, by proxing the request to the ingester
pub async fn get_write_info(&self, write_token: &str) -> Result<GetWriteInfoResponse, Error> {
self.ingester_connection.get_write_info(write_token).await
/// Return connection to ingester(s) to get and aggregate information from them
pub fn ingester_connection(&self) -> Arc<dyn IngesterConnection> {
Arc::clone(&self.ingester_connection)
}
/// Executor