diff --git a/generated_types/build.rs b/generated_types/build.rs index ea7543df68..63483250d7 100644 --- a/generated_types/build.rs +++ b/generated_types/build.rs @@ -54,6 +54,7 @@ fn generate_grpc_types(root: &Path) -> Result<()> { ingester_path.join("parquet_metadata.proto"), ingester_path.join("query.proto"), ingester_path.join("write_info.proto"), + ingester_path.join("write.proto"), namespace_path.join("service.proto"), object_store_path.join("service.proto"), predicate_path.join("predicate.proto"), diff --git a/generated_types/protos/influxdata/iox/ingester/v1/write.proto b/generated_types/protos/influxdata/iox/ingester/v1/write.proto new file mode 100644 index 0000000000..89bbb3ec65 --- /dev/null +++ b/generated_types/protos/influxdata/iox/ingester/v1/write.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; +package influxdata.iox.ingester.v1; +option go_package = "github.com/influxdata/iox/ingester/v1"; + +import "influxdata/pbdata/v1/influxdb_pb_data_protocol.proto"; + +service WriteService { + rpc Write(WriteRequest) returns (WriteResponse); +} + +message WriteRequest { + influxdata.pbdata.v1.DatabaseBatch payload = 1; +} + +message WriteResponse {} diff --git a/generated_types/protos/influxdata/pbdata/v1/influxdb_pb_data_protocol.proto b/generated_types/protos/influxdata/pbdata/v1/influxdb_pb_data_protocol.proto index 2e5ab9dacb..ade578c728 100644 --- a/generated_types/protos/influxdata/pbdata/v1/influxdb_pb_data_protocol.proto +++ b/generated_types/protos/influxdata/pbdata/v1/influxdb_pb_data_protocol.proto @@ -123,19 +123,3 @@ message Column { // Trailing off bits (0) *may* be omitted. bytes null_mask = 4; } - -// Note there used to be a service that would load this internal protobuf format. -// See https://github.com/influxdata/influxdb_iox/pull/5750 and -// https://github.com/influxdata/influxdb_iox/issues/4866 -// for rationale of why it was removed - -// service WriteService { -// rpc Write (WriteRequest) returns (WriteResponse); -// } - -message WriteRequest { - DatabaseBatch database_batch = 1; -} - -message WriteResponse { -} diff --git a/test_helpers_end_to_end/src/client.rs b/test_helpers_end_to_end/src/client.rs index 5017b0bbba..0bcca71dfa 100644 --- a/test_helpers_end_to_end/src/client.rs +++ b/test_helpers_end_to_end/src/client.rs @@ -1,7 +1,6 @@ //! Client helpers for writing end to end ng tests use arrow::record_batch::RecordBatch; use futures::{stream::FuturesUnordered, StreamExt}; -use generated_types::influxdata::pbdata::v1::WriteResponse; use http::Response; use hyper::{Body, Client, Request}; use influxdb_iox_client::{ @@ -51,18 +50,6 @@ pub fn get_write_token(response: &Response) -> String { .to_string() } -/// Extracts the write token from the specified response (to the gRPC write API) -pub fn get_write_token_from_grpc(response: &tonic::Response) -> String { - let message = format!("no write token in {:?}", response); - response - .metadata() - .get("X-IOx-Write-Token") - .expect(&message) - .to_str() - .expect("Value not a string") - .to_string() -} - /// returns the write info from the connection (to either an ingester or a querier) for this token pub async fn token_info( write_token: impl AsRef,