From 3fd43478c52698233aac5e36551650248169491a Mon Sep 17 00:00:00 2001 From: Johnny Graettinger Date: Fri, 1 Sep 2023 06:20:45 +0000 Subject: [PATCH] rework internal fields --- crates/connector-init/src/capture.rs | 7 +- crates/connector-init/src/derive.rs | 7 +- crates/connector-init/src/materialize.rs | 7 +- crates/derive-sqlite/src/connector.rs | 48 ++- crates/flowctl/src/preview/mod.rs | 29 +- crates/proto-flow/build.rs | 7 +- crates/proto-flow/src/capture.rs | 8 +- crates/proto-flow/src/capture.serde.rs | 34 ++- crates/proto-flow/src/derive.rs | 8 +- crates/proto-flow/src/derive.serde.rs | 34 ++- crates/proto-flow/src/internal.rs | 122 +++----- crates/proto-flow/src/lib.rs | 1 - crates/proto-flow/src/materialize.rs | 8 +- crates/proto-flow/src/materialize.serde.rs | 34 ++- crates/proto-flow/tests/regression.rs | 30 +- .../regression__capture_request_json.snap | 5 +- .../regression__capture_request_proto.snap | 6 +- .../regression__capture_response_json.snap | 5 +- .../regression__capture_response_proto.snap | 6 +- .../regression__derive_request_json.snap | 5 +- .../regression__derive_request_proto.snap | 7 +- .../regression__derive_response_json.snap | 5 +- .../regression__derive_response_proto.snap | 7 +- .../regression__materialize_request_json.snap | 5 +- ...regression__materialize_request_proto.snap | 6 +- ...regression__materialize_response_json.snap | 5 +- ...egression__materialize_response_proto.snap | 6 +- crates/runtime/src/capture/image.rs | 13 +- crates/runtime/src/capture/mod.rs | 2 +- crates/runtime/src/container.rs | 2 +- crates/runtime/src/derive/combine.rs | 45 +-- crates/runtime/src/derive/image.rs | 12 +- crates/runtime/src/derive/mod.rs | 2 +- crates/runtime/src/derive/rocksdb.rs | 26 +- crates/runtime/src/materialize/image.rs | 12 +- crates/runtime/src/materialize/mod.rs | 2 +- crates/validation/src/capture.rs | 7 +- crates/validation/src/derivation.rs | 7 +- crates/validation/src/materialization.rs | 7 +- crates/validation/tests/scenario_tests.rs | 60 ++-- go/bindings/task_service_test.go | 2 +- go/protocols/capture/capture.pb.go | 222 +++++++------- go/protocols/capture/capture.proto | 5 +- go/protocols/derive/derive.pb.go | 254 ++++++++-------- go/protocols/derive/derive.proto | 5 +- go/protocols/materialize/materialize.pb.go | 287 ++++++++---------- go/protocols/materialize/materialize.proto | 5 +- .../{any_support.go => internal_support.go} | 13 +- go/runtime/derive.go | 6 +- 49 files changed, 650 insertions(+), 798 deletions(-) rename go/protocols/runtime/{any_support.go => internal_support.go} (65%) diff --git a/crates/connector-init/src/capture.rs b/crates/connector-init/src/capture.rs index e8b3c70d01..756ded940b 100644 --- a/crates/connector-init/src/capture.rs +++ b/crates/connector-init/src/capture.rs @@ -1,5 +1,5 @@ use super::{codec::Codec, rpc}; -use futures::StreamExt; +use futures::{StreamExt, TryStreamExt}; use proto_flow::capture::{Request, Response}; pub struct Proxy { @@ -20,7 +20,10 @@ impl proto_grpc::capture::connector_server::Connector for Proxy { rpc::bidi::( rpc::new_command(&self.entrypoint), self.codec, - request.into_inner(), + request.into_inner().map_ok(|mut request| { + request.internal.clear(); // TODO(johnny): Temporarily remove $internal. + request + }), ops::stderr_log_handler, )? .boxed(), diff --git a/crates/connector-init/src/derive.rs b/crates/connector-init/src/derive.rs index cc08070231..89a6231fd9 100644 --- a/crates/connector-init/src/derive.rs +++ b/crates/connector-init/src/derive.rs @@ -1,5 +1,5 @@ use super::{codec::Codec, rpc}; -use futures::StreamExt; +use futures::{StreamExt, TryStreamExt}; use proto_flow::derive::{Request, Response}; pub struct Proxy { @@ -20,7 +20,10 @@ impl proto_grpc::derive::connector_server::Connector for Proxy { rpc::bidi::( rpc::new_command(&self.entrypoint), self.codec, - request.into_inner(), + request.into_inner().map_ok(|mut request| { + request.internal.clear(); // TODO(johnny): Temporarily remove $internal. + request + }), ops::stderr_log_handler, )? .boxed(), diff --git a/crates/connector-init/src/materialize.rs b/crates/connector-init/src/materialize.rs index 8a5de53227..0ea2f3d4dd 100644 --- a/crates/connector-init/src/materialize.rs +++ b/crates/connector-init/src/materialize.rs @@ -1,5 +1,5 @@ use super::{codec::Codec, rpc}; -use futures::StreamExt; +use futures::{StreamExt, TryStreamExt}; use proto_flow::materialize::{Request, Response}; pub struct Proxy { @@ -20,7 +20,10 @@ impl proto_grpc::materialize::connector_server::Connector for Proxy { rpc::bidi::( rpc::new_command(&self.entrypoint), self.codec, - request.into_inner(), + request.into_inner().map_ok(|mut request| { + request.internal.clear(); // TODO(johnny): Temporarily remove $internal. + request + }), ops::stderr_log_handler, )? .boxed(), diff --git a/crates/derive-sqlite/src/connector.rs b/crates/derive-sqlite/src/connector.rs index e389734189..d7682c15f1 100644 --- a/crates/derive-sqlite/src/connector.rs +++ b/crates/derive-sqlite/src/connector.rs @@ -4,9 +4,7 @@ use futures::channel::mpsc; use futures::TryStreamExt; use futures::{SinkExt, Stream}; use prost::Message; -use proto_flow::runtime::{ - derive_request_ext, derive_response_ext, DeriveRequestExt, DeriveResponseExt, -}; +use proto_flow::runtime::{derive_request_ext, derive_response_ext, DeriveRequestExt}; use proto_flow::{ derive::{request, response, Request, Response}, flow, RuntimeCheckpoint, @@ -85,20 +83,13 @@ where let _ = response_tx .send(Ok(Response { opened: Some(response::Opened {}), - internal: Some(proto_flow::Any { - type_url: "flow://runtime.DeriveResponseExt".to_string(), - value: DeriveResponseExt { - opened: Some(derive_response_ext::Opened { - runtime_checkpoint: Some(runtime_checkpoint), - }), - ..Default::default() - } - .encode_to_vec() - .into(), - }), - ..Default::default() - })) + } + .with_internal(|internal| { + internal.opened = Some(derive_response_ext::Opened { + runtime_checkpoint: Some(runtime_checkpoint), + }); + }))) .await; maybe_handle = Some(handle); @@ -164,7 +155,7 @@ where fn parse_open( open: request::Open, - internal: Option, + internal: bytes::Bytes, ) -> anyhow::Result<(String, Vec, Vec)> { let request::Open { collection, @@ -173,21 +164,20 @@ fn parse_open( version: _, } = open; - let sqlite_uri = match internal { + let sqlite_uri = if internal.is_empty() { // If DeriveRequestExt was not sent, then use a :memory: DB. - None => ":memory:".to_string(), + ":memory:".to_string() + } else { // If it was sent, *require* that `sqlite_vfs_uri` is populated. - Some(internal) => { - let DeriveRequestExt { open: open_ext, .. } = - Message::decode(internal.value).context("internal is a DeriveRequestExt")?; - let derive_request_ext::Open { sqlite_vfs_uri, .. } = - open_ext.context("expected DeriveRequestExt.open to be set")?; - - if sqlite_vfs_uri.is_empty() { - anyhow::bail!("DeriveRequestExt.open.sqlite_vfs_uri is not set and must be"); - } - sqlite_vfs_uri + let DeriveRequestExt { open: open_ext, .. } = + Message::decode(internal).context("internal is a DeriveRequestExt")?; + let derive_request_ext::Open { sqlite_vfs_uri, .. } = + open_ext.context("expected DeriveRequestExt.open to be set")?; + + if sqlite_vfs_uri.is_empty() { + anyhow::bail!("DeriveRequestExt.open.sqlite_vfs_uri is not set and must be"); } + sqlite_vfs_uri }; let flow::CollectionSpec { derivation, .. } = collection.unwrap(); diff --git a/crates/flowctl/src/preview/mod.rs b/crates/flowctl/src/preview/mod.rs index 24eb88bae9..3e94db8cfd 100644 --- a/crates/flowctl/src/preview/mod.rs +++ b/crates/flowctl/src/preview/mod.rs @@ -3,8 +3,7 @@ use anyhow::Context; use doc::shape::schema::to_schema; use futures::channel::mpsc; use futures::{SinkExt, StreamExt, TryStreamExt}; -use prost::Message; -use proto_flow::runtime::{derive_request_ext, DeriveRequestExt}; +use proto_flow::runtime::derive_request_ext; use proto_flow::{derive, flow, flow::collection_spec::derivation::Transform}; use proto_gazette::broker; use tokio::sync::broadcast; @@ -140,20 +139,14 @@ impl Preview { version: "local".to_string(), state_json: "{}".to_string(), }), - internal: Some(proto_flow::Any { - type_url: "flow://runtime.DeriveResponseExt".to_string(), - value: DeriveRequestExt { - open: Some(derive_request_ext::Open { - sqlite_vfs_uri: sqlite_path.clone(), - ..Default::default() - }), - ..Default::default() - } - .encode_to_vec() - .into(), - }), ..Default::default() - })) + } + .with_internal(|internal| { + internal.open = Some(derive_request_ext::Open { + sqlite_vfs_uri: sqlite_path.clone(), + ..Default::default() + }); + }))) .await?; let mut responses_rx = runtime::Runtime::new( @@ -357,9 +350,9 @@ where while let Some(response) = responses_rx.next().await { let response = response.map_err(status_to_anyhow)?; - let internal: proto_flow::runtime::DeriveResponseExt = - Message::decode(response.internal.map(|i| i.value).unwrap_or_default()) - .context("failed to decode internal runtime.DeriveResponseExt")?; + let internal = response + .get_internal() + .context("failed to decode internal runtime.DeriveResponseExt")?; if let Some(derive::response::Published { doc_json }) = response.published { let proto_flow::runtime::derive_response_ext::Published { diff --git a/crates/proto-flow/build.rs b/crates/proto-flow/build.rs index aa52527561..e93ec9ff50 100644 --- a/crates/proto-flow/build.rs +++ b/crates/proto-flow/build.rs @@ -7,7 +7,12 @@ fn main() { .out_dir(&b.src_dir) .btree_map(&["."]) // Make ordering stable for snapshots. // Fields that hold tuple-encoded values use Bytes rather than Vec. - .bytes(&["key_packed", "values_packed", "partitions_packed"]) + .bytes(&[ + "internal", + "key_packed", + "partitions_packed", + "values_packed", + ]) .file_descriptor_set_path(&b.descriptor_path) .compile_well_known_types() .extern_path(".consumer", "::proto_gazette::consumer") diff --git a/crates/proto-flow/src/capture.rs b/crates/proto-flow/src/capture.rs index 31a181669c..52d5bbb646 100644 --- a/crates/proto-flow/src/capture.rs +++ b/crates/proto-flow/src/capture.rs @@ -14,8 +14,8 @@ pub struct Request { #[prost(message, optional, tag = "6")] pub acknowledge: ::core::option::Option, /// Reserved for internal use. - #[prost(message, optional, tag = "100")] - pub internal: ::core::option::Option<::pbjson_types::Any>, + #[prost(bytes = "bytes", tag = "100")] + pub internal: ::prost::bytes::Bytes, } /// Nested message and enum types in `Request`. pub mod request { @@ -164,8 +164,8 @@ pub struct Response { #[prost(message, optional, tag = "7")] pub checkpoint: ::core::option::Option, /// Reserved for internal use. - #[prost(message, optional, tag = "100")] - pub internal: ::core::option::Option<::pbjson_types::Any>, + #[prost(bytes = "bytes", tag = "100")] + pub internal: ::prost::bytes::Bytes, } /// Nested message and enum types in `Response`. pub mod response { diff --git a/crates/proto-flow/src/capture.serde.rs b/crates/proto-flow/src/capture.serde.rs index b5197500ba..38a4b0dd92 100644 --- a/crates/proto-flow/src/capture.serde.rs +++ b/crates/proto-flow/src/capture.serde.rs @@ -24,7 +24,7 @@ impl serde::Serialize for Request { if self.acknowledge.is_some() { len += 1; } - if self.internal.is_some() { + if !self.internal.is_empty() { len += 1; } let mut struct_ser = serializer.serialize_struct("capture.Request", len)?; @@ -46,8 +46,8 @@ impl serde::Serialize for Request { if let Some(v) = self.acknowledge.as_ref() { struct_ser.serialize_field("acknowledge", v)?; } - if let Some(v) = self.internal.as_ref() { - struct_ser.serialize_field("internal", v)?; + if !self.internal.is_empty() { + struct_ser.serialize_field("$internal", pbjson::private::base64::encode(&self.internal).as_str())?; } struct_ser.end() } @@ -66,6 +66,7 @@ impl<'de> serde::Deserialize<'de> for Request { "open", "acknowledge", "internal", + "$internal", ]; #[allow(clippy::enum_variant_names)] @@ -104,7 +105,7 @@ impl<'de> serde::Deserialize<'de> for Request { "apply" => Ok(GeneratedField::Apply), "open" => Ok(GeneratedField::Open), "acknowledge" => Ok(GeneratedField::Acknowledge), - "internal" => Ok(GeneratedField::Internal), + "$internal" | "internal" => Ok(GeneratedField::Internal), _ => Err(serde::de::Error::unknown_field(value, FIELDS)), } } @@ -171,9 +172,11 @@ impl<'de> serde::Deserialize<'de> for Request { } GeneratedField::Internal => { if internal__.is_some() { - return Err(serde::de::Error::duplicate_field("internal")); + return Err(serde::de::Error::duplicate_field("$internal")); } - internal__ = map.next_value()?; + internal__ = + Some(map.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + ; } } } @@ -184,7 +187,7 @@ impl<'de> serde::Deserialize<'de> for Request { apply: apply__, open: open__, acknowledge: acknowledge__, - internal: internal__, + internal: internal__.unwrap_or_default(), }) } } @@ -1061,7 +1064,7 @@ impl serde::Serialize for Response { if self.checkpoint.is_some() { len += 1; } - if self.internal.is_some() { + if !self.internal.is_empty() { len += 1; } let mut struct_ser = serializer.serialize_struct("capture.Response", len)?; @@ -1086,8 +1089,8 @@ impl serde::Serialize for Response { if let Some(v) = self.checkpoint.as_ref() { struct_ser.serialize_field("checkpoint", v)?; } - if let Some(v) = self.internal.as_ref() { - struct_ser.serialize_field("internal", v)?; + if !self.internal.is_empty() { + struct_ser.serialize_field("$internal", pbjson::private::base64::encode(&self.internal).as_str())?; } struct_ser.end() } @@ -1107,6 +1110,7 @@ impl<'de> serde::Deserialize<'de> for Response { "captured", "checkpoint", "internal", + "$internal", ]; #[allow(clippy::enum_variant_names)] @@ -1147,7 +1151,7 @@ impl<'de> serde::Deserialize<'de> for Response { "opened" => Ok(GeneratedField::Opened), "captured" => Ok(GeneratedField::Captured), "checkpoint" => Ok(GeneratedField::Checkpoint), - "internal" => Ok(GeneratedField::Internal), + "$internal" | "internal" => Ok(GeneratedField::Internal), _ => Err(serde::de::Error::unknown_field(value, FIELDS)), } } @@ -1221,9 +1225,11 @@ impl<'de> serde::Deserialize<'de> for Response { } GeneratedField::Internal => { if internal__.is_some() { - return Err(serde::de::Error::duplicate_field("internal")); + return Err(serde::de::Error::duplicate_field("$internal")); } - internal__ = map.next_value()?; + internal__ = + Some(map.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + ; } } } @@ -1235,7 +1241,7 @@ impl<'de> serde::Deserialize<'de> for Response { opened: opened__, captured: captured__, checkpoint: checkpoint__, - internal: internal__, + internal: internal__.unwrap_or_default(), }) } } diff --git a/crates/proto-flow/src/derive.rs b/crates/proto-flow/src/derive.rs index b999b71cd6..2ccb9ca68b 100644 --- a/crates/proto-flow/src/derive.rs +++ b/crates/proto-flow/src/derive.rs @@ -16,8 +16,8 @@ pub struct Request { #[prost(message, optional, tag = "7")] pub reset: ::core::option::Option, /// Reserved for internal use. - #[prost(message, optional, tag = "100")] - pub internal: ::core::option::Option<::pbjson_types::Any>, + #[prost(bytes = "bytes", tag = "100")] + pub internal: ::prost::bytes::Bytes, } /// Nested message and enum types in `Request`. pub mod request { @@ -203,8 +203,8 @@ pub struct Response { #[prost(message, optional, tag = "6")] pub started_commit: ::core::option::Option, /// Reserved for internal use. - #[prost(message, optional, tag = "100")] - pub internal: ::core::option::Option<::pbjson_types::Any>, + #[prost(bytes = "bytes", tag = "100")] + pub internal: ::prost::bytes::Bytes, } /// Nested message and enum types in `Response`. pub mod response { diff --git a/crates/proto-flow/src/derive.serde.rs b/crates/proto-flow/src/derive.serde.rs index 2551cdc6a4..290cdff1f2 100644 --- a/crates/proto-flow/src/derive.serde.rs +++ b/crates/proto-flow/src/derive.serde.rs @@ -27,7 +27,7 @@ impl serde::Serialize for Request { if self.reset.is_some() { len += 1; } - if self.internal.is_some() { + if !self.internal.is_empty() { len += 1; } let mut struct_ser = serializer.serialize_struct("derive.Request", len)?; @@ -52,8 +52,8 @@ impl serde::Serialize for Request { if let Some(v) = self.reset.as_ref() { struct_ser.serialize_field("reset", v)?; } - if let Some(v) = self.internal.as_ref() { - struct_ser.serialize_field("internal", v)?; + if !self.internal.is_empty() { + struct_ser.serialize_field("$internal", pbjson::private::base64::encode(&self.internal).as_str())?; } struct_ser.end() } @@ -74,6 +74,7 @@ impl<'de> serde::Deserialize<'de> for Request { "startCommit", "reset", "internal", + "$internal", ]; #[allow(clippy::enum_variant_names)] @@ -114,7 +115,7 @@ impl<'de> serde::Deserialize<'de> for Request { "flush" => Ok(GeneratedField::Flush), "startCommit" | "start_commit" => Ok(GeneratedField::StartCommit), "reset" => Ok(GeneratedField::Reset), - "internal" => Ok(GeneratedField::Internal), + "$internal" | "internal" => Ok(GeneratedField::Internal), _ => Err(serde::de::Error::unknown_field(value, FIELDS)), } } @@ -188,9 +189,11 @@ impl<'de> serde::Deserialize<'de> for Request { } GeneratedField::Internal => { if internal__.is_some() { - return Err(serde::de::Error::duplicate_field("internal")); + return Err(serde::de::Error::duplicate_field("$internal")); } - internal__ = map.next_value()?; + internal__ = + Some(map.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + ; } } } @@ -202,7 +205,7 @@ impl<'de> serde::Deserialize<'de> for Request { flush: flush__, start_commit: start_commit__, reset: reset__, - internal: internal__, + internal: internal__.unwrap_or_default(), }) } } @@ -1349,7 +1352,7 @@ impl serde::Serialize for Response { if self.started_commit.is_some() { len += 1; } - if self.internal.is_some() { + if !self.internal.is_empty() { len += 1; } let mut struct_ser = serializer.serialize_struct("derive.Response", len)?; @@ -1371,8 +1374,8 @@ impl serde::Serialize for Response { if let Some(v) = self.started_commit.as_ref() { struct_ser.serialize_field("startedCommit", v)?; } - if let Some(v) = self.internal.as_ref() { - struct_ser.serialize_field("internal", v)?; + if !self.internal.is_empty() { + struct_ser.serialize_field("$internal", pbjson::private::base64::encode(&self.internal).as_str())?; } struct_ser.end() } @@ -1392,6 +1395,7 @@ impl<'de> serde::Deserialize<'de> for Response { "started_commit", "startedCommit", "internal", + "$internal", ]; #[allow(clippy::enum_variant_names)] @@ -1430,7 +1434,7 @@ impl<'de> serde::Deserialize<'de> for Response { "published" => Ok(GeneratedField::Published), "flushed" => Ok(GeneratedField::Flushed), "startedCommit" | "started_commit" => Ok(GeneratedField::StartedCommit), - "internal" => Ok(GeneratedField::Internal), + "$internal" | "internal" => Ok(GeneratedField::Internal), _ => Err(serde::de::Error::unknown_field(value, FIELDS)), } } @@ -1497,9 +1501,11 @@ impl<'de> serde::Deserialize<'de> for Response { } GeneratedField::Internal => { if internal__.is_some() { - return Err(serde::de::Error::duplicate_field("internal")); + return Err(serde::de::Error::duplicate_field("$internal")); } - internal__ = map.next_value()?; + internal__ = + Some(map.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + ; } } } @@ -1510,7 +1516,7 @@ impl<'de> serde::Deserialize<'de> for Response { published: published__, flushed: flushed__, started_commit: started_commit__, - internal: internal__, + internal: internal__.unwrap_or_default(), }) } } diff --git a/crates/proto-flow/src/internal.rs b/crates/proto-flow/src/internal.rs index cc70a5b132..3c6d09069b 100644 --- a/crates/proto-flow/src/internal.rs +++ b/crates/proto-flow/src/internal.rs @@ -1,32 +1,18 @@ -use crate::{capture, derive, materialize, ops, runtime, Any}; +use crate::{capture, derive, materialize, ops, runtime}; use prost::Message; macro_rules! impl_internal { - ($msg_type:ty , $ext_type:ty , $type_url:literal) => { + ($msg_type:ty , $ext_type:ty) => { impl $msg_type { /// Get the internal field, decoded into its corresponding extension type. - pub fn get_internal(&self) -> Option> { - let Some(Any{type_url, value}) = &self.internal else { return None }; - - if type_url != $type_url { - return Some(Err(format!( - "internal field has wrong type_url {}, expected {}", - type_url, $type_url - ))); - } - match prost::Message::decode(value.clone()) { - Ok(m) => Some(Ok(m)), - Err(err) => Some(Err(format!( - "internal field {} cannot decode: {err:?}", - $type_url - ))), - } + pub fn get_internal(&self) -> Result<$ext_type, prost::DecodeError> { + prost::Message::decode(self.internal.clone()) } /// Set and inspect the internal field via a callback. /// Modifications made by the callback are re-encoded into the - /// internal Any message, the post-modification value is returned. - pub fn set_internal(&mut self, cb: F) -> Result<$ext_type, String> + /// internal Any message. + pub fn set_internal(&mut self, cb: F) where F: FnOnce(&mut $ext_type), { @@ -34,82 +20,62 @@ macro_rules! impl_internal { } /// Set and inspect the internal field via a callback. - /// Use an owned buffer for required allocations. - pub fn set_internal_buf( - &mut self, - buf: &mut bytes::BytesMut, - cb: F, - ) -> Result<$ext_type, String> + /// Uses an owned buffer for required allocations. + pub fn set_internal_buf(&mut self, buf: &mut bytes::BytesMut, cb: F) where F: FnOnce(&mut $ext_type), { - let mut internal = match self.get_internal() { - Some(result) => result?, - None => <$ext_type>::default(), - }; + let mut internal = self.get_internal().expect("internal is valid"); cb(&mut internal); buf.reserve(internal.encoded_len()); internal.encode(buf).unwrap(); - self.internal = Some(::pbjson_types::Any { - type_url: $type_url.to_string(), - value: buf.split().freeze(), - }); - Ok(internal) + self.internal = buf.split().freeze(); + } + + /// Set and inspect the internal field via callback, + /// returning Self. + pub fn with_internal(mut self, cb: F) -> Self + where + F: FnOnce(&mut $ext_type), + { + self.set_internal_buf(&mut bytes::BytesMut::new(), cb); + self + } + + /// Set and inspect the internal field via callback, + /// returning Self and using the provided buffer. + pub fn with_internal_buf(mut self, buf: &mut bytes::BytesMut, cb: F) -> Self + where + F: FnOnce(&mut $ext_type), + { + self.set_internal_buf(buf, cb); + self } } }; } -impl_internal!( - capture::Request, - runtime::CaptureRequestExt, - "flow://runtime.CaptureRequestExt" -); -impl_internal!( - capture::Response, - runtime::CaptureResponseExt, - "flow://runtime.CaptureResponseExt" -); -impl_internal!( - derive::Request, - runtime::DeriveRequestExt, - "flow://runtime.DeriveRequestExt" -); -impl_internal!( - derive::Response, - runtime::DeriveResponseExt, - "flow://runtime.DeriveResponseExt" -); -impl_internal!( - materialize::Request, - runtime::MaterializeRequestExt, - "flow://runtime.MaterializeRequestExt" -); -impl_internal!( - materialize::Response, - runtime::MaterializeResponseExt, - "flow://runtime.MaterializeResponseExt" -); +impl_internal!(capture::Request, runtime::CaptureRequestExt); +impl_internal!(capture::Response, runtime::CaptureResponseExt); +impl_internal!(derive::Request, runtime::DeriveRequestExt); +impl_internal!(derive::Response, runtime::DeriveResponseExt); +impl_internal!(materialize::Request, runtime::MaterializeRequestExt); +impl_internal!(materialize::Response, runtime::MaterializeResponseExt); macro_rules! impl_internal_set_log_level { ($msg_type:ty , $ext_type:ty) => { impl $msg_type { /// Set the log-level of the internal extension field of this Request. - pub fn set_log_level( - &mut self, - log_level: ops::log::Level, - ) -> Result<$ext_type, String> { - self.set_internal_buf(&mut bytes::BytesMut::new(), |internal| { - match internal.labels.as_mut() { - Some(labels) => labels.log_level = log_level as i32, - None => { - internal.labels = Some(ops::ShardLabeling { - log_level: log_level as i32, - ..Default::default() - }) - } + pub fn set_internal_log_level(&mut self, log_level: ops::log::Level) { + self.set_internal(|internal| match internal.labels.as_mut() { + Some(labels) => labels.log_level = log_level as i32, + None => { + internal.labels = Some(ops::ShardLabeling { + log_level: log_level as i32, + ..Default::default() + }) } }) } diff --git a/crates/proto-flow/src/lib.rs b/crates/proto-flow/src/lib.rs index ac1ea9d226..3dd6138050 100644 --- a/crates/proto-flow/src/lib.rs +++ b/crates/proto-flow/src/lib.rs @@ -60,7 +60,6 @@ pub fn as_timestamp(ts: std::time::SystemTime) -> ::pbjson_types::Timestamp { } // Re-export some commonly used types. -pub use pbjson_types::Any; pub use proto_gazette::consumer::checkpoint as runtime_checkpoint; pub use proto_gazette::consumer::Checkpoint as RuntimeCheckpoint; diff --git a/crates/proto-flow/src/materialize.rs b/crates/proto-flow/src/materialize.rs index a5adf58b5f..8a26435d23 100644 --- a/crates/proto-flow/src/materialize.rs +++ b/crates/proto-flow/src/materialize.rs @@ -20,8 +20,8 @@ pub struct Request { #[prost(message, optional, tag = "9")] pub acknowledge: ::core::option::Option, /// Reserved for internal use. - #[prost(message, optional, tag = "100")] - pub internal: ::core::option::Option<::pbjson_types::Any>, + #[prost(bytes = "bytes", tag = "100")] + pub internal: ::prost::bytes::Bytes, } /// Nested message and enum types in `Request`. pub mod request { @@ -235,8 +235,8 @@ pub struct Response { #[prost(message, optional, tag = "8")] pub acknowledged: ::core::option::Option, /// Reserved for internal use. - #[prost(message, optional, tag = "100")] - pub internal: ::core::option::Option<::pbjson_types::Any>, + #[prost(bytes = "bytes", tag = "100")] + pub internal: ::prost::bytes::Bytes, } /// Nested message and enum types in `Response`. pub mod response { diff --git a/crates/proto-flow/src/materialize.serde.rs b/crates/proto-flow/src/materialize.serde.rs index 112685d9c3..b524f2ab5e 100644 --- a/crates/proto-flow/src/materialize.serde.rs +++ b/crates/proto-flow/src/materialize.serde.rs @@ -324,7 +324,7 @@ impl serde::Serialize for Request { if self.acknowledge.is_some() { len += 1; } - if self.internal.is_some() { + if !self.internal.is_empty() { len += 1; } let mut struct_ser = serializer.serialize_struct("materialize.Request", len)?; @@ -355,8 +355,8 @@ impl serde::Serialize for Request { if let Some(v) = self.acknowledge.as_ref() { struct_ser.serialize_field("acknowledge", v)?; } - if let Some(v) = self.internal.as_ref() { - struct_ser.serialize_field("internal", v)?; + if !self.internal.is_empty() { + struct_ser.serialize_field("$internal", pbjson::private::base64::encode(&self.internal).as_str())?; } struct_ser.end() } @@ -379,6 +379,7 @@ impl<'de> serde::Deserialize<'de> for Request { "startCommit", "acknowledge", "internal", + "$internal", ]; #[allow(clippy::enum_variant_names)] @@ -423,7 +424,7 @@ impl<'de> serde::Deserialize<'de> for Request { "store" => Ok(GeneratedField::Store), "startCommit" | "start_commit" => Ok(GeneratedField::StartCommit), "acknowledge" => Ok(GeneratedField::Acknowledge), - "internal" => Ok(GeneratedField::Internal), + "$internal" | "internal" => Ok(GeneratedField::Internal), _ => Err(serde::de::Error::unknown_field(value, FIELDS)), } } @@ -511,9 +512,11 @@ impl<'de> serde::Deserialize<'de> for Request { } GeneratedField::Internal => { if internal__.is_some() { - return Err(serde::de::Error::duplicate_field("internal")); + return Err(serde::de::Error::duplicate_field("$internal")); } - internal__ = map.next_value()?; + internal__ = + Some(map.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + ; } } } @@ -527,7 +530,7 @@ impl<'de> serde::Deserialize<'de> for Request { store: store__, start_commit: start_commit__, acknowledge: acknowledge__, - internal: internal__, + internal: internal__.unwrap_or_default(), }) } } @@ -1791,7 +1794,7 @@ impl serde::Serialize for Response { if self.acknowledged.is_some() { len += 1; } - if self.internal.is_some() { + if !self.internal.is_empty() { len += 1; } let mut struct_ser = serializer.serialize_struct("materialize.Response", len)?; @@ -1819,8 +1822,8 @@ impl serde::Serialize for Response { if let Some(v) = self.acknowledged.as_ref() { struct_ser.serialize_field("acknowledged", v)?; } - if let Some(v) = self.internal.as_ref() { - struct_ser.serialize_field("internal", v)?; + if !self.internal.is_empty() { + struct_ser.serialize_field("$internal", pbjson::private::base64::encode(&self.internal).as_str())?; } struct_ser.end() } @@ -1842,6 +1845,7 @@ impl<'de> serde::Deserialize<'de> for Response { "startedCommit", "acknowledged", "internal", + "$internal", ]; #[allow(clippy::enum_variant_names)] @@ -1884,7 +1888,7 @@ impl<'de> serde::Deserialize<'de> for Response { "flushed" => Ok(GeneratedField::Flushed), "startedCommit" | "started_commit" => Ok(GeneratedField::StartedCommit), "acknowledged" => Ok(GeneratedField::Acknowledged), - "internal" => Ok(GeneratedField::Internal), + "$internal" | "internal" => Ok(GeneratedField::Internal), _ => Err(serde::de::Error::unknown_field(value, FIELDS)), } } @@ -1965,9 +1969,11 @@ impl<'de> serde::Deserialize<'de> for Response { } GeneratedField::Internal => { if internal__.is_some() { - return Err(serde::de::Error::duplicate_field("internal")); + return Err(serde::de::Error::duplicate_field("$internal")); } - internal__ = map.next_value()?; + internal__ = + Some(map.next_value::<::pbjson::private::BytesDeserialize<_>>()?.0) + ; } } } @@ -1980,7 +1986,7 @@ impl<'de> serde::Deserialize<'de> for Response { flushed: flushed__, started_commit: started_commit__, acknowledged: acknowledged__, - internal: internal__, + internal: internal__.unwrap_or_default(), }) } } diff --git a/crates/proto-flow/tests/regression.rs b/crates/proto-flow/tests/regression.rs index 2396a25c8d..03cedd17e9 100644 --- a/crates/proto-flow/tests/regression.rs +++ b/crates/proto-flow/tests/regression.rs @@ -313,17 +313,14 @@ fn ex_range() -> flow::RangeSpec { } } -fn ex_internal() -> pbjson_types::Any { - pbjson_types::Any { - type_url: "flow://internal.thing".to_string(), - value: flow::Projection { - field: "Hi".to_string(), - explicit: true, - ..Default::default() - } - .encode_to_vec() - .into(), +fn ex_internal() -> bytes::Bytes { + flow::Projection { + field: "Hi".to_string(), + explicit: true, + ..Default::default() } + .encode_to_vec() + .into() } fn ex_consumer_checkpoint() -> consumer::Checkpoint { @@ -386,7 +383,7 @@ fn ex_capture_request() -> capture::Request { state_json: json!({"connector": {"state": 42}}).to_string(), }), acknowledge: Some(capture::request::Acknowledge { checkpoints: 32 }), - internal: Some(ex_internal()), + internal: ex_internal(), } } @@ -426,7 +423,7 @@ fn ex_capture_response() -> capture::Response { checkpoint: Some(capture::response::Checkpoint { state: Some(ex_connector_state()), }), - internal: Some(ex_internal()), + internal: ex_internal(), } } @@ -481,8 +478,7 @@ fn ex_derive_request() -> derive::Request { runtime_checkpoint: Some(ex_consumer_checkpoint()), }), reset: Some(derive::request::Reset {}), - - internal: Some(ex_internal()), + internal: ex_internal(), } } @@ -514,7 +510,7 @@ fn ex_derive_response() -> derive::Response { started_commit: Some(derive::response::StartedCommit { state: Some(ex_connector_state()), }), - internal: Some(ex_internal()), + internal: ex_internal(), } } @@ -564,7 +560,7 @@ fn ex_materialize_request() -> materialize::Request { start_commit: Some(materialize::request::StartCommit { runtime_checkpoint: Some(ex_consumer_checkpoint()), }), - internal: Some(ex_internal()), + internal: ex_internal(), } } @@ -614,7 +610,7 @@ fn ex_materialize_response() -> materialize::Response { started_commit: Some(materialize::response::StartedCommit { state: Some(ex_connector_state()), }), - internal: Some(ex_internal()), + internal: ex_internal(), } } diff --git a/crates/proto-flow/tests/snapshots/regression__capture_request_json.snap b/crates/proto-flow/tests/snapshots/regression__capture_request_json.snap index 3ad4aa2d2e..3e04aea267 100644 --- a/crates/proto-flow/tests/snapshots/regression__capture_request_json.snap +++ b/crates/proto-flow/tests/snapshots/regression__capture_request_json.snap @@ -353,8 +353,5 @@ expression: json_test(msg) "acknowledge": { "checkpoints": 32 }, - "internal": { - "typeUrl": "flow://internal.thing", - "value": "EgJIaRgB" - } + "$internal": "EgJIaRgB" } diff --git a/crates/proto-flow/tests/snapshots/regression__capture_request_proto.snap b/crates/proto-flow/tests/snapshots/regression__capture_request_proto.snap index fdfb53aa08..31180dd88e 100644 --- a/crates/proto-flow/tests/snapshots/regression__capture_request_proto.snap +++ b/crates/proto-flow/tests/snapshots/regression__capture_request_proto.snap @@ -124,7 +124,5 @@ expression: proto_test(msg) |14153322 11001d77 66554425 bbaa9988| ..3"...wfUD%.... 00000770 |2dffeedd cc221a7b 22636f6e 6e656374| -....".{"connect 00000780 |6f72223a 7b227374 61746522 3a34327d| or":{"state":42} 00000790 -|7d320208 20a2061f 0a15666c 6f773a2f| }2.. .....flow:/ 000007a0 -|2f696e74 65726e61 6c2e7468 696e6712| /internal.thing. 000007b0 -|06120248 691801| ...Hi.. 000007c0 - 000007c7 +|7d320208 20a20606 12024869 1801| }2.. .....Hi.. 000007a0 + 000007ae diff --git a/crates/proto-flow/tests/snapshots/regression__capture_response_json.snap b/crates/proto-flow/tests/snapshots/regression__capture_response_json.snap index e31802a086..c5c2f1f6be 100644 --- a/crates/proto-flow/tests/snapshots/regression__capture_response_json.snap +++ b/crates/proto-flow/tests/snapshots/regression__capture_response_json.snap @@ -72,8 +72,5 @@ expression: json_test(msg) "mergePatch": true } }, - "internal": { - "typeUrl": "flow://internal.thing", - "value": "EgJIaRgB" - } + "$internal": "EgJIaRgB" } diff --git a/crates/proto-flow/tests/snapshots/regression__capture_response_proto.snap b/crates/proto-flow/tests/snapshots/regression__capture_response_proto.snap index 5dcdd9643a..d728828388 100644 --- a/crates/proto-flow/tests/snapshots/regression__capture_response_proto.snap +++ b/crates/proto-flow/tests/snapshots/regression__capture_response_proto.snap @@ -31,7 +31,5 @@ expression: proto_test(msg) |08013216 08021212 7b226361 70747572| ..2.....{"captur 000001a0 |6564223a 22646f63 227d3a18 0a160a12| ed":"doc"}:..... 000001b0 |7b227374 61746522 3a227570 64617465| {"state":"update 000001c0 -|227d1001 a2061f0a 15666c6f 773a2f2f| "}.......flow:// 000001d0 -|696e7465 726e616c 2e746869 6e671206| internal.thing.. 000001e0 -|12024869 1801| ..Hi.. 000001f0 - 000001f6 +|227d1001 a2060612 02486918 01| "}.......Hi.. 000001d0 + 000001dd diff --git a/crates/proto-flow/tests/snapshots/regression__derive_request_json.snap b/crates/proto-flow/tests/snapshots/regression__derive_request_json.snap index 6e4283bb38..dff8e9c22f 100644 --- a/crates/proto-flow/tests/snapshots/regression__derive_request_json.snap +++ b/crates/proto-flow/tests/snapshots/regression__derive_request_json.snap @@ -277,8 +277,5 @@ expression: json_test(msg) } }, "reset": {}, - "internal": { - "typeUrl": "flow://internal.thing", - "value": "EgJIaRgB" - } + "$internal": "EgJIaRgB" } diff --git a/crates/proto-flow/tests/snapshots/regression__derive_request_proto.snap b/crates/proto-flow/tests/snapshots/regression__derive_request_proto.snap index 233b763f58..a37e353004 100644 --- a/crates/proto-flow/tests/snapshots/regression__derive_request_proto.snap +++ b/crates/proto-flow/tests/snapshots/regression__derive_request_proto.snap @@ -100,7 +100,6 @@ expression: proto_test(msg) |09e32100 00000000 0010d708 12150a05| ..!............. 000005f0 |070c662b 1d120c09 35010000 00000000| ..f+....5....... 00000600 |10ae1112 160a0e61 6e2f6163 6b2f6a6f| .......an/ack/jo 00000610 -|75726e61 6c120403 0402053a 00a2061f| urnal......:.... 00000620 -|0a15666c 6f773a2f 2f696e74 65726e61| ..flow://interna 00000630 -|6c2e7468 696e6712 06120248 691801| l.thing....Hi.. 00000640 - 0000064f +|75726e61 6c120403 0402053a 00a20606| urnal......:.... 00000620 +|12024869 1801| ..Hi.. 00000630 + 00000636 diff --git a/crates/proto-flow/tests/snapshots/regression__derive_response_json.snap b/crates/proto-flow/tests/snapshots/regression__derive_response_json.snap index 9fca6b2eca..752dfffbb7 100644 --- a/crates/proto-flow/tests/snapshots/regression__derive_response_json.snap +++ b/crates/proto-flow/tests/snapshots/regression__derive_response_json.snap @@ -55,8 +55,5 @@ expression: json_test(msg) "mergePatch": true } }, - "internal": { - "typeUrl": "flow://internal.thing", - "value": "EgJIaRgB" - } + "$internal": "EgJIaRgB" } diff --git a/crates/proto-flow/tests/snapshots/regression__derive_response_proto.snap b/crates/proto-flow/tests/snapshots/regression__derive_response_proto.snap index 78633ac87b..e2a9a61d43 100644 --- a/crates/proto-flow/tests/snapshots/regression__derive_response_proto.snap +++ b/crates/proto-flow/tests/snapshots/regression__derive_response_proto.snap @@ -27,7 +27,6 @@ expression: proto_test(msg) |74656e74 1a002215 0a137b22 7075626c| tent.."...{"publ 00000160 |69736865 64223a22 646f6322 7d2a0032| ished":"doc"}*.2 00000170 |180a160a 127b2273 74617465 223a2275| .....{"state":"u 00000180 -|70646174 65227d10 01a2061f 0a15666c| pdate"}.......fl 00000190 -|6f773a2f 2f696e74 65726e61 6c2e7468| ow://internal.th 000001a0 -|696e6712 06120248 691801| ing....Hi.. 000001b0 - 000001bb +|70646174 65227d10 01a20606 12024869| pdate"}.......Hi 00000190 +|1801| .. 000001a0 + 000001a2 diff --git a/crates/proto-flow/tests/snapshots/regression__materialize_request_json.snap b/crates/proto-flow/tests/snapshots/regression__materialize_request_json.snap index 2d08f2a361..665846ebf6 100644 --- a/crates/proto-flow/tests/snapshots/regression__materialize_request_json.snap +++ b/crates/proto-flow/tests/snapshots/regression__materialize_request_json.snap @@ -454,8 +454,5 @@ expression: json_test(msg) } }, "acknowledge": {}, - "internal": { - "typeUrl": "flow://internal.thing", - "value": "EgJIaRgB" - } + "$internal": "EgJIaRgB" } diff --git a/crates/proto-flow/tests/snapshots/regression__materialize_request_proto.snap b/crates/proto-flow/tests/snapshots/regression__materialize_request_proto.snap index a569785a66..054062ac58 100644 --- a/crates/proto-flow/tests/snapshots/regression__materialize_request_proto.snap +++ b/crates/proto-flow/tests/snapshots/regression__materialize_request_proto.snap @@ -167,7 +167,5 @@ expression: proto_test(msg) |10d70812 150a0507 0c662b1d 120c0935| .........f+....5 00000a20 |01000000 00000010 ae111216 0a0e616e| ..............an 00000a30 |2f61636b 2f6a6f75 726e616c 12040304| /ack/journal.... 00000a40 -|02054a00 a2061f0a 15666c6f 773a2f2f| ..J......flow:// 00000a50 -|696e7465 726e616c 2e746869 6e671206| internal.thing.. 00000a60 -|12024869 1801| ..Hi.. 00000a70 - 00000a76 +|02054a00 a2060612 02486918 01| ..J......Hi.. 00000a50 + 00000a5d diff --git a/crates/proto-flow/tests/snapshots/regression__materialize_response_json.snap b/crates/proto-flow/tests/snapshots/regression__materialize_response_json.snap index a5f1f44b02..eb9af73a72 100644 --- a/crates/proto-flow/tests/snapshots/regression__materialize_response_json.snap +++ b/crates/proto-flow/tests/snapshots/regression__materialize_response_json.snap @@ -97,8 +97,5 @@ expression: json_test(msg) } }, "acknowledged": {}, - "internal": { - "typeUrl": "flow://internal.thing", - "value": "EgJIaRgB" - } + "$internal": "EgJIaRgB" } diff --git a/crates/proto-flow/tests/snapshots/regression__materialize_response_proto.snap b/crates/proto-flow/tests/snapshots/regression__materialize_response_proto.snap index 4c1c27ca2d..76b64f6292 100644 --- a/crates/proto-flow/tests/snapshots/regression__materialize_response_proto.snap +++ b/crates/proto-flow/tests/snapshots/regression__materialize_response_proto.snap @@ -37,7 +37,5 @@ expression: proto_test(msg) |2a140804 12107b22 6c6f6164 6564223a| *.....{"loaded": 00000200 |22646f63 227d3200 3a180a16 0a127b22| "doc"}2.:.....{" 00000210 |73746174 65223a22 75706461 7465227d| state":"update"} 00000220 -|10014200 a2061f0a 15666c6f 773a2f2f| ..B......flow:// 00000230 -|696e7465 726e616c 2e746869 6e671206| internal.thing.. 00000240 -|12024869 1801| ..Hi.. 00000250 - 00000256 +|10014200 a2060612 02486918 01| ..B......Hi.. 00000230 + 0000023d diff --git a/crates/runtime/src/capture/image.rs b/crates/runtime/src/capture/image.rs index 5126514c19..d005901e25 100644 --- a/crates/runtime/src/capture/image.rs +++ b/crates/runtime/src/capture/image.rs @@ -39,10 +39,10 @@ fn unseal(mut request: Request) -> Result, Request> { *config_json = unseal::decrypt_sops(&sealed_config).await?.to_string(); let log_level = match request.get_internal() { - Some(Ok(CaptureRequestExt { + Ok(CaptureRequestExt { labels: Some(labels), .. - })) => Some(labels.log_level()), + }) => Some(labels.log_level()), _ => None, }; @@ -68,11 +68,9 @@ fn start_rpc( } fn attach_container(response: &mut Response, container: Container) { - response - .set_internal(|internal| { - internal.container = Some(container); - }) - .unwrap(); + response.set_internal(|internal| { + internal.container = Some(container); + }); } pub fn connector( @@ -138,7 +136,6 @@ mod test { let container = resp .get_internal() - .expect("has internal field") .expect("internal decodes") .container .expect("internal has attached container"); diff --git a/crates/runtime/src/capture/mod.rs b/crates/runtime/src/capture/mod.rs index 91a29488bd..754363cf2e 100644 --- a/crates/runtime/src/capture/mod.rs +++ b/crates/runtime/src/capture/mod.rs @@ -102,7 +102,7 @@ where R: Stream> + Send + 'static, { request_rx.inspect_ok(move |request| { - let Some(Ok(CaptureRequestExt{labels: Some(ops::ShardLabeling { log_level, .. })})) = request.get_internal() else { return }; + let Ok(CaptureRequestExt{labels: Some(ops::ShardLabeling { log_level, .. })}) = request.get_internal() else { return }; if let (Some(log_level), Some(set_log_level)) = (ops::log::Level::from_i32(log_level), &set_log_level) diff --git a/crates/runtime/src/container.rs b/crates/runtime/src/container.rs index 841dff407f..5f522a2317 100644 --- a/crates/runtime/src/container.rs +++ b/crates/runtime/src/container.rs @@ -213,7 +213,7 @@ fn unique_container_name() -> String { .unwrap() .as_nanos(); - format!("fc-{:x}", n as u32) + format!("fc_{:x}", n as u32) } async fn docker_cmd(args: &[S]) -> anyhow::Result> diff --git a/crates/runtime/src/derive/combine.rs b/crates/runtime/src/derive/combine.rs index 0b6b31acf6..2ba3488bdf 100644 --- a/crates/runtime/src/derive/combine.rs +++ b/crates/runtime/src/derive/combine.rs @@ -1,11 +1,10 @@ use crate::anyhow_to_status; use anyhow::Context; use futures::{channel::mpsc, Future, SinkExt, Stream, StreamExt, TryStreamExt}; -use prost::Message; use proto_flow::derive::{request, response, Request, Response}; use proto_flow::flow::{self, collection_spec, CollectionSpec}; use proto_flow::ops; -use proto_flow::runtime::{derive_response_ext, DeriveResponseExt}; +use proto_flow::runtime::derive_response_ext; use std::time::SystemTime; pub fn adapt_requests( @@ -385,25 +384,19 @@ impl State { let partitions_packed = doc::Extractor::extract_all_lazy(&doc, &self.partition_extractors, &mut buf); - let internal = DeriveResponseExt { - published: Some(derive_response_ext::Published { - max_clock, - key_packed, - partitions_packed, - }), - ..Default::default() - }; - buf.reserve(internal.encoded_len()); - internal.encode(&mut buf).unwrap(); - - out.push(Response { - published: Some(response::Published { doc_json }), - internal: Some(::pbjson_types::Any { - type_url: "flow://runtime.DeriveResponseExt".to_string(), - value: buf.split().freeze(), + out.push( + Response { + published: Some(response::Published { doc_json }), + ..Default::default() + } + .with_internal_buf(&mut buf, |internal| { + internal.published = Some(derive_response_ext::Published { + max_clock, + key_packed, + partitions_packed, + }); }), - ..Default::default() - }); + ); Ok::(out.len() != out.capacity()) })?; @@ -465,17 +458,11 @@ impl State { Response { flushed: Some(flushed), - internal: Some(::pbjson_types::Any { - type_url: "flow://runtime.DeriveResponseExt".to_string(), - value: DeriveResponseExt { - flushed: Some(derive_response_ext::Flushed { stats: Some(stats) }), - ..Default::default() - } - .encode_to_vec() - .into(), - }), ..Default::default() } + .with_internal(|internal| { + internal.flushed = Some(derive_response_ext::Flushed { stats: Some(stats) }); + }) } } diff --git a/crates/runtime/src/derive/image.rs b/crates/runtime/src/derive/image.rs index 4bb5460cd8..820bde80c8 100644 --- a/crates/runtime/src/derive/image.rs +++ b/crates/runtime/src/derive/image.rs @@ -34,10 +34,10 @@ fn unseal(mut request: Request) -> Result, Request> { *config_json = unseal::decrypt_sops(&sealed_config).await?.to_string(); let log_level = match request.get_internal() { - Some(Ok(DeriveRequestExt { + Ok(DeriveRequestExt { labels: Some(labels), .. - })) => Some(labels.log_level()), + }) => Some(labels.log_level()), _ => None, }; @@ -63,11 +63,9 @@ fn start_rpc( } fn attach_container(response: &mut Response, container: Container) { - response - .set_internal(|internal| { - internal.container = Some(container); - }) - .unwrap(); + response.set_internal(|internal| { + internal.container = Some(container); + }); } pub fn connector( diff --git a/crates/runtime/src/derive/mod.rs b/crates/runtime/src/derive/mod.rs index 8001bb0f35..6177c82c2c 100644 --- a/crates/runtime/src/derive/mod.rs +++ b/crates/runtime/src/derive/mod.rs @@ -127,7 +127,7 @@ where R: Stream> + Send + 'static, { request_rx.inspect_ok(move |request| { - let Some(Ok(DeriveRequestExt{labels: Some(ops::ShardLabeling { log_level, .. }), ..})) = request.get_internal() else { return }; + let Ok(DeriveRequestExt{labels: Some(ops::ShardLabeling { log_level, .. }), ..}) = request.get_internal() else { return }; if let (Some(log_level), Some(set_log_level)) = (ops::log::Level::from_i32(log_level), &set_log_level) diff --git a/crates/runtime/src/derive/rocksdb.rs b/crates/runtime/src/derive/rocksdb.rs index 56be1df09d..33e6da4e21 100644 --- a/crates/runtime/src/derive/rocksdb.rs +++ b/crates/runtime/src/derive/rocksdb.rs @@ -4,9 +4,7 @@ use futures::{channel::mpsc, Stream, StreamExt}; use prost::Message; use proto_flow::derive::{request, Request, Response}; use proto_flow::flow; -use proto_flow::runtime::{ - derive_response_ext, DeriveRequestExt, DeriveResponseExt, RocksDbDescriptor, -}; +use proto_flow::runtime::{derive_response_ext, DeriveRequestExt, RocksDbDescriptor}; use proto_gazette::consumer::Checkpoint; use std::sync::Arc; @@ -20,11 +18,11 @@ where let db: Arc = match peek_request { Request { open: Some(_open), - internal: Some(internal), + internal, .. - } => { - let DeriveRequestExt { open, .. } = Message::decode(internal.value.clone()) - .context("internal is a DeriveRequestExt")?; + } if !internal.is_empty() => { + let DeriveRequestExt { open, .. } = + Message::decode(internal.clone()).context("internal is a DeriveRequestExt")?; RocksDB::open(open.and_then(|open| open.rocksdb_descriptor))? } @@ -127,16 +125,10 @@ impl Backward { "loaded and attached a persisted OpenedExt.runtime_checkpoint", ); - response.internal = Some(::pbjson_types::Any { - type_url: "flow://runtime.DeriveResponseExt".to_string(), - value: DeriveResponseExt { - opened: Some(derive_response_ext::Opened { - runtime_checkpoint: Some(runtime_checkpoint), - }), - ..Default::default() - } - .encode_to_vec() - .into(), + response.set_internal(|internal| { + internal.opened = Some(derive_response_ext::Opened { + runtime_checkpoint: Some(runtime_checkpoint), + }); }); } diff --git a/crates/runtime/src/materialize/image.rs b/crates/runtime/src/materialize/image.rs index 07dc82e1bf..7130fa82c5 100644 --- a/crates/runtime/src/materialize/image.rs +++ b/crates/runtime/src/materialize/image.rs @@ -35,10 +35,10 @@ fn unseal(mut request: Request) -> Result, Request> { *config_json = unseal::decrypt_sops(&sealed_config).await?.to_string(); let log_level = match request.get_internal() { - Some(Ok(MaterializeRequestExt { + Ok(MaterializeRequestExt { labels: Some(labels), .. - })) => Some(labels.log_level()), + }) => Some(labels.log_level()), _ => None, }; @@ -64,11 +64,9 @@ fn start_rpc( } fn attach_container(response: &mut Response, container: Container) { - response - .set_internal(|internal| { - internal.container = Some(container); - }) - .unwrap(); + response.set_internal(|internal| { + internal.container = Some(container); + }); } pub fn connector( diff --git a/crates/runtime/src/materialize/mod.rs b/crates/runtime/src/materialize/mod.rs index e057388dcd..69d5f6a97d 100644 --- a/crates/runtime/src/materialize/mod.rs +++ b/crates/runtime/src/materialize/mod.rs @@ -118,7 +118,7 @@ where R: Stream> + Send + 'static, { request_rx.inspect_ok(move |request| { - let Some(Ok(MaterializeRequestExt{labels: Some(ops::ShardLabeling { log_level, .. })})) = request.get_internal() else { return }; + let Ok(MaterializeRequestExt{labels: Some(ops::ShardLabeling { log_level, .. })}) = request.get_internal() else { return }; if let (Some(log_level), Some(set_log_level)) = (ops::log::Level::from_i32(log_level), &set_log_level) diff --git a/crates/validation/src/capture.rs b/crates/validation/src/capture.rs index f6cf2facaf..a6995c45e5 100644 --- a/crates/validation/src/capture.rs +++ b/crates/validation/src/capture.rs @@ -40,7 +40,7 @@ pub async fn walk_all_captures( .as_ref() .and_then(|s| LogLevel::from_str_name(s)) { - wrapped.set_log_level(log_level).unwrap(); + wrapped.set_internal_log_level(log_level); } // If shards are disabled, then don't ask the connector to validate. @@ -284,9 +284,8 @@ fn extract_validated( }; let internal = match response.get_internal() { - Some(Ok(internal)) => internal, - None => Default::default(), - Some(Err(err)) => { + Ok(internal) => internal, + Err(err) => { return Err(Error::Connector { detail: anyhow::anyhow!("parsing internal: {err}"), }); diff --git a/crates/validation/src/derivation.rs b/crates/validation/src/derivation.rs index 5f9f6373f9..c2fb9b0623 100644 --- a/crates/validation/src/derivation.rs +++ b/crates/validation/src/derivation.rs @@ -68,7 +68,7 @@ pub async fn walk_all_derivations( .as_ref() .and_then(|s| LogLevel::from_str_name(s)) { - wrapped.set_log_level(log_level).unwrap(); + wrapped.set_internal_log_level(log_level); } // For the moment, we continue to validate a disabled derivation. @@ -553,9 +553,8 @@ fn extract_validated( }; let internal = match response.get_internal() { - Some(Ok(internal)) => internal, - None => Default::default(), - Some(Err(err)) => { + Ok(internal) => internal, + Err(err) => { return Err(Error::Connector { detail: anyhow::anyhow!("parsing internal: {err}"), }); diff --git a/crates/validation/src/materialization.rs b/crates/validation/src/materialization.rs index 361aab51ae..3105590026 100644 --- a/crates/validation/src/materialization.rs +++ b/crates/validation/src/materialization.rs @@ -47,7 +47,7 @@ pub async fn walk_all_materializations( .as_ref() .and_then(|s| LogLevel::from_str_name(s)) { - wrapped.set_log_level(log_level).unwrap(); + wrapped.set_internal_log_level(log_level); } // If shards are disabled, then don't ask the connector to validate. @@ -645,9 +645,8 @@ fn extract_validated( }; let internal = match response.get_internal() { - Some(Ok(internal)) => internal, - None => Default::default(), - Some(Err(err)) => { + Ok(internal) => internal, + Err(err) => { return Err(Error::Connector { detail: anyhow::anyhow!("parsing internal: {err}"), }); diff --git a/crates/validation/tests/scenario_tests.rs b/crates/validation/tests/scenario_tests.rs index e5127191d7..19e8747182 100644 --- a/crates/validation/tests/scenario_tests.rs +++ b/crates/validation/tests/scenario_tests.rs @@ -1594,20 +1594,16 @@ impl validation::Connectors for MockDriverCalls { }) .collect(); - let mut response = capture::Response { + Ok(capture::Response { validated: Some(capture::response::Validated { bindings }), ..Default::default() - }; - response - .set_internal(|internal| { - internal.container = Some(Container { - ip_addr: "1.2.3.4".to_string(), - network_ports: call.network_ports.clone(), - }); - }) - .unwrap(); - - return Ok(response); + } + .with_internal(|internal| { + internal.container = Some(Container { + ip_addr: "1.2.3.4".to_string(), + network_ports: call.network_ports.clone(), + }); + })) } .boxed() } @@ -1670,23 +1666,19 @@ impl validation::Connectors for MockDriverCalls { }) .collect(); - let mut response = derive::Response { + Ok(derive::Response { validated: Some(derive::response::Validated { transforms, generated_files: call.generated_files.clone(), }), ..Default::default() - }; - response - .set_internal(|internal| { - internal.container = Some(Container { - ip_addr: "1.2.3.4".to_string(), - network_ports: call.network_ports.clone(), - }); - }) - .unwrap(); - - return Ok(response); + } + .with_internal(|internal| { + internal.container = Some(Container { + ip_addr: "1.2.3.4".to_string(), + network_ports: call.network_ports.clone(), + }); + })) } .boxed() } @@ -1750,20 +1742,16 @@ impl validation::Connectors for MockDriverCalls { }) .collect(); - let mut response = materialize::Response { + Ok(materialize::Response { validated: Some(materialize::response::Validated { bindings }), ..Default::default() - }; - response - .set_internal(|internal| { - internal.container = Some(Container { - ip_addr: "1.2.3.4".to_string(), - network_ports: call.network_ports.clone(), - }); - }) - .unwrap(); - - return Ok(response); + } + .with_internal(|internal| { + internal.container = Some(Container { + ip_addr: "1.2.3.4".to_string(), + network_ports: call.network_ports.clone(), + }); + })) } .boxed() } diff --git a/go/bindings/task_service_test.go b/go/bindings/task_service_test.go index f13c1ab05e..9bc7ea68c1 100644 --- a/go/bindings/task_service_test.go +++ b/go/bindings/task_service_test.go @@ -69,7 +69,7 @@ func TestSimpleDerive(t *testing.T) { }, StateJson: []byte("{}"), }, - Internal: pr.ToAny(&pr.DeriveRequestExt{ + Internal: pr.ToInternal(&pr.DeriveRequestExt{ Labels: &ops.ShardLabeling{ LogLevel: ops.Log_debug, }, diff --git a/go/protocols/capture/capture.pb.go b/go/protocols/capture/capture.pb.go index 327de9360d..8cf2df1062 100644 --- a/go/protocols/capture/capture.pb.go +++ b/go/protocols/capture/capture.pb.go @@ -11,7 +11,6 @@ import ( github_com_estuary_flow_go_protocols_flow "github.com/estuary/flow/go/protocols/flow" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - types "github.com/gogo/protobuf/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -39,10 +38,10 @@ type Request struct { Open *Request_Open `protobuf:"bytes,5,opt,name=open,proto3" json:"open,omitempty"` Acknowledge *Request_Acknowledge `protobuf:"bytes,6,opt,name=acknowledge,proto3" json:"acknowledge,omitempty"` // Reserved for internal use. - Internal *types.Any `protobuf:"bytes,100,opt,name=internal,proto3" json:"internal,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Internal []byte `protobuf:"bytes,100,opt,name=internal,json=$internal,proto3" json:"internal,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Request) Reset() { *m = Request{} } @@ -426,10 +425,10 @@ type Response struct { Captured *Response_Captured `protobuf:"bytes,6,opt,name=captured,proto3" json:"captured,omitempty"` Checkpoint *Response_Checkpoint `protobuf:"bytes,7,opt,name=checkpoint,proto3" json:"checkpoint,omitempty"` // Reserved for internal use. - Internal *types.Any `protobuf:"bytes,100,opt,name=internal,proto3" json:"internal,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Internal []byte `protobuf:"bytes,100,opt,name=internal,json=$internal,proto3" json:"internal,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Response) Reset() { *m = Response{} } @@ -903,78 +902,77 @@ func init() { } var fileDescriptor_841a70e6e6288f13 = []byte{ - // 1128 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4d, 0x6f, 0xdc, 0x44, - 0x18, 0xae, 0xb3, 0x9b, 0x5d, 0xef, 0xbb, 0x49, 0x9a, 0x8c, 0x02, 0x38, 0x6e, 0x94, 0x84, 0xb4, - 0x48, 0xe9, 0x07, 0xde, 0xb0, 0x51, 0xa1, 0xe5, 0xa3, 0x25, 0x1f, 0x54, 0xa2, 0x12, 0x04, 0x4d, - 0xf8, 0x10, 0x5c, 0x56, 0xce, 0x78, 0xe2, 0x35, 0xf1, 0x7a, 0x8c, 0x3f, 0x12, 0x56, 0xe2, 0xc2, - 0x91, 0x03, 0x07, 0x2e, 0x9c, 0xb9, 0x23, 0xce, 0xfc, 0x85, 0x70, 0xe3, 0x17, 0x44, 0xa2, 0xfc, - 0x09, 0xd4, 0x13, 0x9a, 0x2f, 0xaf, 0x13, 0x27, 0xd5, 0x52, 0xf5, 0xc0, 0x65, 0xd7, 0x33, 0xef, - 0xf3, 0x8c, 0xdf, 0x79, 0xde, 0x79, 0x9f, 0x31, 0xac, 0xfa, 0xac, 0x13, 0x27, 0x2c, 0x63, 0x84, - 0x85, 0x69, 0x87, 0xb8, 0x71, 0x96, 0x27, 0x54, 0xff, 0x3b, 0x22, 0x82, 0x9a, 0x6a, 0x68, 0x2f, - 0x9e, 0x01, 0x1f, 0x84, 0xec, 0x58, 0xfc, 0x48, 0x98, 0x3d, 0xef, 0x33, 0x9f, 0x89, 0xc7, 0x0e, - 0x7f, 0x52, 0xb3, 0x0b, 0x3e, 0x63, 0x7e, 0x48, 0x25, 0x6f, 0x3f, 0x3f, 0xe8, 0xb8, 0xd1, 0x50, - 0x86, 0x56, 0xbf, 0x6f, 0x43, 0x13, 0xd3, 0x6f, 0x72, 0x9a, 0x66, 0xe8, 0x26, 0xd4, 0xd3, 0x98, - 0x12, 0xcb, 0x58, 0x31, 0xd6, 0xda, 0xdd, 0x97, 0x1c, 0x9d, 0x81, 0x8a, 0x3b, 0x7b, 0x31, 0x25, - 0x58, 0x40, 0xd0, 0x5d, 0x30, 0xbd, 0x20, 0x25, 0xec, 0x88, 0x26, 0xd6, 0x84, 0x80, 0x2f, 0x54, - 0xe0, 0x3b, 0x0a, 0x80, 0x0b, 0x28, 0xa7, 0x1d, 0xb9, 0x61, 0xe0, 0xb9, 0x19, 0xb5, 0x6a, 0x97, - 0xd0, 0x3e, 0x57, 0x00, 0x5c, 0x40, 0xd1, 0x1d, 0x98, 0x74, 0xe3, 0x38, 0x1c, 0x5a, 0x75, 0xc1, - 0x79, 0xb9, 0xc2, 0xd9, 0xe4, 0x51, 0x2c, 0x41, 0x7c, 0x1b, 0x2c, 0xa6, 0x91, 0x35, 0x79, 0xc9, - 0x36, 0x76, 0x63, 0x1a, 0x61, 0x01, 0x41, 0x0f, 0xa0, 0xed, 0x92, 0xc3, 0x88, 0x1d, 0x87, 0xd4, - 0xf3, 0xa9, 0xd5, 0x10, 0x8c, 0xc5, 0xea, 0xf2, 0x23, 0x0c, 0x2e, 0x13, 0xd0, 0x3a, 0x98, 0x41, - 0x94, 0xd1, 0x24, 0x72, 0x43, 0xcb, 0x13, 0xe4, 0x79, 0x47, 0x6a, 0xed, 0x68, 0xad, 0x9d, 0xcd, - 0x68, 0x88, 0x0b, 0x94, 0xfd, 0x83, 0x01, 0x75, 0xae, 0x23, 0x7a, 0x04, 0x33, 0x84, 0x45, 0x11, - 0x25, 0x19, 0x4b, 0x7a, 0xd9, 0x30, 0xa6, 0x42, 0xf6, 0x99, 0xee, 0xb2, 0x23, 0xca, 0xb9, 0x2d, - 0x53, 0xe0, 0x50, 0x67, 0x5b, 0xe3, 0x3e, 0x1d, 0xc6, 0x14, 0x4f, 0x93, 0xf2, 0x10, 0xdd, 0x87, - 0x36, 0x61, 0xd1, 0x41, 0xe0, 0xf7, 0xbe, 0x4e, 0x59, 0x24, 0x8a, 0xd1, 0xda, 0x5a, 0x7c, 0x7a, - 0xba, 0x6c, 0xd1, 0x88, 0x30, 0x2f, 0x88, 0xfc, 0x0e, 0x0f, 0x38, 0xd8, 0x3d, 0xfe, 0x88, 0xa6, - 0xa9, 0xeb, 0x53, 0xdc, 0x90, 0x04, 0xfb, 0x47, 0x03, 0x4c, 0x5d, 0xa4, 0xff, 0x43, 0x3e, 0xbf, - 0xd6, 0xc0, 0xd4, 0xd5, 0x47, 0x1f, 0x42, 0x3d, 0x72, 0x07, 0x32, 0x8b, 0xd6, 0xd6, 0xdd, 0xa7, - 0xa7, 0xcb, 0x6f, 0xf8, 0x41, 0xd6, 0xcf, 0xf7, 0x1d, 0xc2, 0x06, 0x1d, 0x9a, 0x66, 0xb9, 0x9b, - 0x0c, 0xe5, 0xf9, 0xaf, 0x74, 0x84, 0xce, 0x16, 0x8b, 0x25, 0x2e, 0xd8, 0xda, 0xc4, 0x8b, 0xd8, - 0x5a, 0x6d, 0xfc, 0xad, 0xa1, 0xf7, 0xc0, 0xdc, 0x0f, 0x22, 0x0e, 0x49, 0xad, 0xfa, 0x4a, 0x6d, - 0xad, 0xdd, 0x7d, 0xf5, 0xd2, 0x83, 0xef, 0x6c, 0x49, 0x24, 0x2e, 0x28, 0xf6, 0x4f, 0x06, 0x34, - 0xd5, 0x2c, 0x7a, 0x0c, 0xf3, 0x09, 0x4d, 0x59, 0x9e, 0x10, 0xda, 0x2b, 0xa7, 0x63, 0x8c, 0x91, - 0xce, 0x8c, 0x66, 0x6e, 0xcb, 0xb4, 0xde, 0x06, 0x20, 0x2c, 0x0c, 0x29, 0xc9, 0x02, 0x55, 0x2b, - 0x7e, 0x82, 0xa5, 0x2a, 0xc5, 0x3c, 0x17, 0x66, 0xab, 0x7e, 0x72, 0xba, 0x7c, 0x05, 0x97, 0xd0, - 0xb6, 0x0f, 0x93, 0xa2, 0xed, 0xd0, 0x6d, 0xd0, 0xe6, 0xa4, 0x9c, 0x63, 0xae, 0xa2, 0x2b, 0xd6, - 0x08, 0x64, 0x41, 0xf3, 0x88, 0x26, 0xa9, 0x7e, 0x5d, 0x0b, 0xeb, 0x21, 0x7a, 0x05, 0x9a, 0x5e, - 0x32, 0xec, 0x25, 0xb9, 0x54, 0xd6, 0xc4, 0x0d, 0x2f, 0x19, 0xe2, 0x3c, 0xb2, 0x7f, 0x33, 0xa0, - 0xce, 0x7b, 0xf6, 0x45, 0xbd, 0xe8, 0x35, 0x98, 0x4c, 0xdc, 0xc8, 0xd7, 0x0e, 0x74, 0x55, 0x2e, - 0x82, 0xf9, 0x94, 0x58, 0x42, 0x46, 0xd1, 0x5b, 0x00, 0x69, 0xe6, 0x66, 0x54, 0xaa, 0x5b, 0x1f, - 0x43, 0xdd, 0x49, 0x81, 0xb7, 0x3b, 0xd0, 0x2e, 0x19, 0x06, 0x5a, 0x81, 0x36, 0xe9, 0x53, 0x72, - 0x18, 0xb3, 0x20, 0xca, 0x52, 0x91, 0xf9, 0x34, 0x2e, 0x4f, 0xad, 0xfe, 0xde, 0x06, 0x13, 0xd3, - 0x34, 0x66, 0x51, 0x4a, 0xd1, 0xad, 0x33, 0x26, 0x5c, 0xb6, 0x3a, 0x09, 0x28, 0xbb, 0xf0, 0xbb, - 0x00, 0xda, 0x5a, 0xa9, 0xa7, 0xca, 0xb7, 0x58, 0x65, 0xec, 0x14, 0x18, 0x5c, 0xc2, 0xa3, 0xfb, - 0xd0, 0xd2, 0x0e, 0xeb, 0x29, 0x2d, 0xae, 0x55, 0xc9, 0xfa, 0x54, 0x7a, 0x78, 0x84, 0x46, 0x1b, - 0xd0, 0xe4, 0x5e, 0x1b, 0x50, 0x4f, 0x59, 0xf2, 0x42, 0x95, 0xb8, 0x29, 0x01, 0x58, 0x23, 0xd1, - 0x3a, 0x34, 0xb8, 0xe9, 0x52, 0x4f, 0x39, 0xb3, 0x55, 0xe5, 0xec, 0x8a, 0x38, 0x56, 0x38, 0xf4, - 0x26, 0x98, 0x0a, 0xe2, 0x29, 0x6f, 0xb6, 0xab, 0x1c, 0x55, 0x7d, 0x0f, 0x17, 0x58, 0xae, 0xcb, - 0x48, 0x5f, 0xab, 0x79, 0x99, 0x2e, 0xdb, 0x05, 0x06, 0x97, 0xf0, 0xcf, 0x61, 0xea, 0x3f, 0x4f, - 0x28, 0x53, 0xb7, 0xc1, 0xd4, 0x4e, 0xa4, 0x0a, 0x5d, 0x8c, 0xd1, 0x23, 0x40, 0xaa, 0x5d, 0x53, - 0xd2, 0xa7, 0x03, 0x77, 0x7c, 0x7f, 0x9c, 0x92, 0xbc, 0x3d, 0x41, 0x43, 0x5f, 0xc0, 0xb5, 0xf3, - 0xfd, 0x5f, 0x5e, 0x70, 0x1c, 0x57, 0x9a, 0x3f, 0x6b, 0x03, 0x6a, 0xe1, 0xdb, 0x30, 0xe7, 0x31, - 0x92, 0x0f, 0x68, 0x94, 0xb9, 0xbc, 0xc3, 0x7b, 0x79, 0x12, 0xca, 0x73, 0x8f, 0x67, 0xcf, 0x04, - 0x3e, 0x4b, 0x42, 0x74, 0x03, 0x1a, 0xcc, 0xcd, 0xb3, 0x7e, 0x57, 0x15, 0x73, 0x4a, 0x76, 0xd1, - 0xee, 0x26, 0x9f, 0xc3, 0x2a, 0x66, 0xff, 0x31, 0x01, 0x30, 0x3a, 0x7d, 0xe8, 0xfd, 0x92, 0x0b, - 0x1a, 0xc2, 0x05, 0x6f, 0x3c, 0xeb, 0xb4, 0x5e, 0x60, 0x84, 0xff, 0x94, 0x8c, 0xf0, 0x26, 0xcc, - 0x26, 0x94, 0xb0, 0xc1, 0x80, 0x46, 0x1e, 0xf5, 0x7a, 0xa3, 0xdb, 0x02, 0x5f, 0x2d, 0xcd, 0x7f, - 0xcc, 0x6f, 0x80, 0xcb, 0x3c, 0x73, 0xe2, 0x39, 0x3c, 0xf3, 0x31, 0xcc, 0x6b, 0x35, 0xfe, 0xb3, - 0xf0, 0x33, 0x9a, 0xa9, 0x24, 0x9f, 0x85, 0xda, 0x21, 0x1d, 0x8a, 0x1b, 0xa1, 0x85, 0xf9, 0x23, - 0xb7, 0x2d, 0x2f, 0x48, 0xdd, 0xfd, 0x90, 0x0a, 0x61, 0x4d, 0xac, 0x87, 0xf6, 0x77, 0xd0, 0x2a, - 0x7a, 0x11, 0x3d, 0xac, 0x28, 0x79, 0xfd, 0x19, 0xad, 0x7b, 0x81, 0x90, 0xce, 0x48, 0xc7, 0xeb, - 0x30, 0x5d, 0x88, 0x13, 0xbb, 0x59, 0x5f, 0x2c, 0xd8, 0xc2, 0x53, 0x7a, 0xf2, 0x13, 0x37, 0xeb, - 0xdb, 0xf7, 0xa0, 0xa9, 0x1a, 0x1a, 0xbd, 0x0e, 0xc8, 0x15, 0x57, 0x40, 0xcf, 0xa3, 0x29, 0x49, - 0x82, 0x58, 0x5c, 0x1e, 0x52, 0xf9, 0x39, 0x19, 0xd9, 0x19, 0x05, 0xec, 0x0f, 0xa0, 0x21, 0xdb, - 0x1a, 0xbd, 0x03, 0x0b, 0xf4, 0xdb, 0x38, 0x0c, 0x48, 0x90, 0xf5, 0x4a, 0x5f, 0x51, 0x5c, 0x0f, - 0xe9, 0x8b, 0x26, 0xb6, 0x34, 0x60, 0xf3, 0x5c, 0xdc, 0xfe, 0x12, 0x4c, 0xdd, 0xe9, 0x5c, 0x24, - 0xb5, 0x11, 0xd5, 0x65, 0x7a, 0x88, 0x36, 0xc0, 0xf4, 0x18, 0x19, 0xbf, 0xb8, 0x35, 0x8f, 0x11, - 0xfb, 0x1e, 0xc0, 0xc8, 0x0a, 0xd0, 0x2d, 0x90, 0x3e, 0xae, 0x1c, 0xb8, 0xb8, 0x0e, 0xd5, 0x97, - 0xc0, 0x1e, 0x8f, 0x29, 0xab, 0xef, 0x3e, 0x84, 0x56, 0x11, 0x40, 0x5d, 0x68, 0xaa, 0x0c, 0xd1, - 0xec, 0xf9, 0xcb, 0xdd, 0x9e, 0xab, 0x94, 0x67, 0xcd, 0x58, 0x37, 0xb6, 0x1e, 0x9c, 0xfc, 0xb5, - 0x74, 0xe5, 0xe4, 0xc9, 0x92, 0xf1, 0xe7, 0x93, 0x25, 0xe3, 0x97, 0xbf, 0x97, 0x8c, 0xaf, 0xee, - 0x8c, 0xf5, 0x95, 0xa3, 0x16, 0xdb, 0x6f, 0x88, 0xa9, 0x8d, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, - 0x1a, 0x5d, 0xe3, 0xed, 0x43, 0x0c, 0x00, 0x00, + // 1108 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcb, 0x6e, 0x23, 0x45, + 0x17, 0x9e, 0x8e, 0x1d, 0xbb, 0x7d, 0x9c, 0x64, 0x92, 0x52, 0xfe, 0x9f, 0x4e, 0x27, 0x4a, 0x42, + 0x26, 0x48, 0x99, 0x0b, 0xf6, 0xe0, 0x68, 0x60, 0x86, 0xcb, 0x0c, 0xb9, 0x30, 0x12, 0x23, 0x41, + 0x50, 0x85, 0x8b, 0x60, 0x63, 0x75, 0xaa, 0x6a, 0xec, 0x26, 0xed, 0xae, 0xa6, 0x2f, 0x09, 0x96, + 0x78, 0x01, 0x16, 0x2c, 0xd8, 0xb0, 0x46, 0x6c, 0x11, 0xef, 0x11, 0x76, 0x3c, 0x41, 0x24, 0x86, + 0x2d, 0x0f, 0x80, 0x66, 0x85, 0xea, 0xd6, 0xee, 0xa4, 0x93, 0xc8, 0xa0, 0x59, 0xb0, 0x49, 0xba, + 0xce, 0xf9, 0xbe, 0xba, 0x7c, 0xa7, 0xce, 0x57, 0x86, 0xb5, 0x1e, 0x6f, 0x47, 0x31, 0x4f, 0x39, + 0xe1, 0x41, 0xd2, 0x26, 0x5e, 0x94, 0x66, 0x31, 0x33, 0xff, 0x5b, 0x32, 0x83, 0xea, 0x7a, 0xe8, + 0x2e, 0x9d, 0x01, 0x3f, 0x0d, 0xf8, 0xb1, 0xfc, 0xa3, 0x60, 0xee, 0x7c, 0x8f, 0xf7, 0xb8, 0xfc, + 0x6c, 0x8b, 0x2f, 0x15, 0x5d, 0xfb, 0x13, 0xa0, 0x8e, 0xd9, 0x57, 0x19, 0x4b, 0x52, 0x74, 0x13, + 0xaa, 0x49, 0xc4, 0x88, 0x63, 0xad, 0x5a, 0x1b, 0xcd, 0xce, 0xff, 0x5a, 0x66, 0x19, 0x9d, 0x6f, + 0xed, 0x47, 0x8c, 0x60, 0x09, 0x41, 0xf7, 0xc0, 0xa6, 0x7e, 0x42, 0xf8, 0x11, 0x8b, 0x9d, 0x09, + 0x09, 0x5f, 0x28, 0xc1, 0x77, 0x35, 0x00, 0xe7, 0x50, 0x41, 0x3b, 0xf2, 0x02, 0x9f, 0x7a, 0x29, + 0x73, 0x2a, 0x97, 0xd0, 0x3e, 0xd5, 0x00, 0x9c, 0x43, 0xd1, 0x1d, 0x98, 0xf4, 0xa2, 0x28, 0x18, + 0x3a, 0x55, 0xc9, 0xf9, 0x7f, 0x89, 0xb3, 0x25, 0xb2, 0x58, 0x81, 0xc4, 0x31, 0x78, 0xc4, 0x42, + 0x67, 0xf2, 0x92, 0x63, 0xec, 0x45, 0x2c, 0xc4, 0x12, 0x82, 0x1e, 0x42, 0xd3, 0x23, 0x87, 0x21, + 0x3f, 0x0e, 0x18, 0xed, 0x31, 0xa7, 0x26, 0x19, 0x4b, 0xe5, 0xe9, 0x47, 0x18, 0x5c, 0x24, 0xa0, + 0x45, 0xb0, 0xfd, 0x30, 0x65, 0x71, 0xe8, 0x05, 0x0e, 0x5d, 0xb5, 0x36, 0xa6, 0x70, 0x63, 0xdd, + 0x04, 0xdc, 0x6f, 0x2d, 0xa8, 0x0a, 0xc9, 0xd0, 0x63, 0x98, 0x21, 0x3c, 0x0c, 0x19, 0x49, 0x79, + 0xdc, 0x4d, 0x87, 0x11, 0x93, 0x0a, 0xcf, 0x74, 0x56, 0x5a, 0xb2, 0x3c, 0x3b, 0x6a, 0x35, 0x01, + 0x6d, 0xed, 0x18, 0xdc, 0xc7, 0xc3, 0x88, 0xe1, 0x69, 0x52, 0x1c, 0xa2, 0x07, 0xd0, 0x24, 0x3c, + 0x7c, 0xea, 0xf7, 0xba, 0x5f, 0x26, 0x3c, 0x94, 0xba, 0x37, 0xb6, 0x97, 0x9e, 0x9f, 0xae, 0x38, + 0x2c, 0x24, 0x9c, 0xfa, 0x61, 0xaf, 0x2d, 0x12, 0x2d, 0xec, 0x1d, 0x7f, 0xc0, 0x92, 0xc4, 0xeb, + 0x31, 0x5c, 0x53, 0x04, 0xf7, 0x3b, 0x0b, 0x6c, 0x53, 0x8f, 0xff, 0xc2, 0x7e, 0x7e, 0xae, 0x80, + 0x6d, 0x0a, 0x8d, 0xde, 0x87, 0x6a, 0xe8, 0x0d, 0xd4, 0x2e, 0x1a, 0xdb, 0xf7, 0x9e, 0x9f, 0xae, + 0xbc, 0xd6, 0xf3, 0xd3, 0x7e, 0x76, 0xd0, 0x22, 0x7c, 0xd0, 0x66, 0x49, 0x9a, 0x79, 0xf1, 0x50, + 0xdd, 0xe7, 0xd2, 0x0d, 0x37, 0xbb, 0xc5, 0x72, 0x8a, 0x0b, 0x8e, 0x36, 0xf1, 0x22, 0x8e, 0x56, + 0x19, 0xff, 0x68, 0xe8, 0x1d, 0xb0, 0x0f, 0xfc, 0x50, 0x40, 0x12, 0xa7, 0xba, 0x5a, 0xd9, 0x68, + 0x76, 0x5e, 0xbe, 0xf4, 0x8e, 0xb7, 0xb6, 0x15, 0x12, 0xe7, 0x14, 0xf7, 0x7b, 0x0b, 0xea, 0x3a, + 0x8a, 0x9e, 0xc0, 0x7c, 0xcc, 0x12, 0x9e, 0xc5, 0x84, 0x75, 0x8b, 0xdb, 0xb1, 0xc6, 0xd8, 0xce, + 0x8c, 0x61, 0xee, 0xa8, 0x6d, 0xbd, 0x09, 0x40, 0x78, 0x10, 0x30, 0x92, 0xfa, 0xba, 0x56, 0xcd, + 0xce, 0xbc, 0x56, 0x25, 0x8f, 0x0b, 0x61, 0xb6, 0xab, 0x27, 0xa7, 0x2b, 0xd7, 0x70, 0x01, 0xed, + 0xf6, 0x60, 0x52, 0x76, 0x18, 0xba, 0x0d, 0xc6, 0x6c, 0xb4, 0x49, 0xcc, 0x95, 0x74, 0xc5, 0x06, + 0x81, 0x1c, 0xa8, 0x1f, 0xb1, 0x38, 0x31, 0xcb, 0x35, 0xb0, 0x19, 0xa2, 0x97, 0xa0, 0x4e, 0xe3, + 0x61, 0x37, 0xce, 0x94, 0xb2, 0x36, 0xae, 0xd1, 0x78, 0x88, 0xb3, 0xd0, 0xfd, 0xc5, 0x82, 0xaa, + 0x68, 0xcf, 0x17, 0xb5, 0xd0, 0x2b, 0x30, 0x19, 0x7b, 0x61, 0xcf, 0x98, 0xcd, 0x75, 0x35, 0x09, + 0x16, 0x21, 0x39, 0x85, 0xca, 0xa2, 0x37, 0x00, 0x92, 0xd4, 0x4b, 0x99, 0x52, 0xb7, 0x3a, 0x86, + 0xba, 0x93, 0x12, 0xef, 0xb6, 0xa1, 0x59, 0xf0, 0x06, 0xb4, 0x0a, 0x4d, 0xd2, 0x67, 0xe4, 0x30, + 0xe2, 0x7e, 0x98, 0x26, 0x72, 0xe7, 0xd3, 0xb8, 0x18, 0x5a, 0xfb, 0xa9, 0x09, 0x36, 0x66, 0x49, + 0xc4, 0xc3, 0x84, 0xa1, 0x5b, 0x67, 0xfc, 0xb6, 0xe8, 0x6a, 0x0a, 0x50, 0x34, 0xdc, 0xb7, 0x01, + 0x8c, 0x8b, 0x32, 0xaa, 0xcb, 0xb7, 0x54, 0x66, 0xec, 0xe6, 0x18, 0x5c, 0xc0, 0xa3, 0x07, 0xd0, + 0x30, 0x66, 0x4a, 0xb5, 0x16, 0x8b, 0x65, 0xb2, 0xb9, 0x95, 0x14, 0x8f, 0xd0, 0x68, 0x13, 0xea, + 0xc2, 0x56, 0x7d, 0x46, 0xb5, 0xfb, 0x2e, 0x94, 0x89, 0x5b, 0x0a, 0x80, 0x0d, 0x12, 0xdd, 0x85, + 0x9a, 0xf0, 0x57, 0x46, 0xb5, 0x09, 0x3b, 0x65, 0xce, 0x9e, 0xcc, 0x63, 0x8d, 0x43, 0xaf, 0x83, + 0xad, 0x21, 0x54, 0xdb, 0xb0, 0x5b, 0xe6, 0xe8, 0xea, 0x53, 0x9c, 0x63, 0x85, 0x2e, 0x23, 0x7d, + 0x9d, 0xfa, 0x65, 0xba, 0xec, 0xe4, 0x18, 0x5c, 0xc0, 0x5f, 0xed, 0xdf, 0x3f, 0x4c, 0x68, 0xff, + 0x76, 0xc1, 0x36, 0xa6, 0xa3, 0x6b, 0x9a, 0x8f, 0xd1, 0x63, 0x40, 0xba, 0x33, 0x13, 0xd2, 0x67, + 0x03, 0x6f, 0x7c, 0x2b, 0x9c, 0x52, 0xbc, 0x7d, 0x49, 0x43, 0x9f, 0xc1, 0xe2, 0xf9, 0x56, 0x2f, + 0x4e, 0x38, 0x8e, 0x01, 0xcd, 0x9f, 0xed, 0x78, 0x3d, 0xf1, 0x6d, 0x98, 0xa3, 0x9c, 0x64, 0x03, + 0x16, 0xa6, 0x9e, 0x68, 0xe6, 0x6e, 0x16, 0x07, 0xea, 0x8a, 0xe3, 0xd9, 0x33, 0x89, 0x4f, 0xe2, + 0x00, 0xad, 0x43, 0x8d, 0x7b, 0x59, 0xda, 0xef, 0xe8, 0xba, 0x4d, 0xa9, 0x86, 0xd9, 0xdb, 0x12, + 0x31, 0xac, 0x73, 0xee, 0xaf, 0x13, 0x00, 0xa3, 0x8b, 0x86, 0xde, 0x2d, 0x18, 0x9e, 0x25, 0x0d, + 0x6f, 0xfd, 0xaa, 0x8b, 0x79, 0x81, 0xe7, 0xfd, 0x55, 0xf0, 0xbc, 0x9b, 0x30, 0x1b, 0x33, 0xc2, + 0x07, 0x03, 0x16, 0x52, 0x46, 0xbb, 0xa3, 0x87, 0x01, 0x5f, 0x2f, 0xc4, 0x3f, 0x14, 0x66, 0x7f, + 0x99, 0x3d, 0x4e, 0xfc, 0x0b, 0x7b, 0x7c, 0x02, 0xf3, 0x46, 0x8d, 0x7f, 0x2c, 0xfc, 0x8c, 0x61, + 0x6a, 0xc9, 0x67, 0xa1, 0x72, 0xc8, 0x86, 0xd2, 0xfc, 0x1b, 0x58, 0x7c, 0x0a, 0x87, 0xa2, 0x7e, + 0xe2, 0x1d, 0x04, 0x4c, 0x0a, 0x6b, 0x63, 0x33, 0x74, 0xbf, 0x81, 0x46, 0xde, 0x76, 0xe8, 0x51, + 0x49, 0xc9, 0x1b, 0x57, 0x74, 0xe9, 0x05, 0x42, 0xb6, 0x46, 0x3a, 0xde, 0x80, 0xe9, 0x5c, 0x9c, + 0xc8, 0x4b, 0xfb, 0x72, 0xc2, 0x06, 0x9e, 0x32, 0xc1, 0x8f, 0xbc, 0xb4, 0xef, 0xde, 0x87, 0xba, + 0xee, 0x5d, 0xf4, 0x2a, 0x20, 0x4f, 0xba, 0x7d, 0x97, 0xb2, 0x84, 0xc4, 0x7e, 0x24, 0xdf, 0x09, + 0xa5, 0xfc, 0x9c, 0xca, 0xec, 0x8e, 0x12, 0xee, 0x7b, 0x50, 0x53, 0x1d, 0x8c, 0xde, 0x82, 0x05, + 0xf6, 0x75, 0x14, 0xf8, 0xc4, 0x4f, 0xbb, 0x85, 0xdf, 0x46, 0x42, 0x0f, 0x65, 0x81, 0x36, 0x76, + 0x0c, 0x60, 0xeb, 0x5c, 0xde, 0xfd, 0x1c, 0x6c, 0xd3, 0xd4, 0x42, 0x24, 0x7d, 0x10, 0xdd, 0x65, + 0x66, 0x88, 0x36, 0xc1, 0xa6, 0x9c, 0x8c, 0x5f, 0xdc, 0x0a, 0xe5, 0xc4, 0xbd, 0x0f, 0x30, 0xea, + 0x7a, 0x74, 0x0b, 0x94, 0x65, 0x6b, 0xb3, 0xcd, 0x5f, 0x3e, 0xfd, 0xe8, 0xef, 0x8b, 0x9c, 0x76, + 0xf5, 0xce, 0x23, 0x68, 0xe4, 0x09, 0xd4, 0x81, 0xba, 0xde, 0x21, 0x9a, 0x3d, 0xff, 0x8e, 0xbb, + 0x73, 0xa5, 0xf2, 0x6c, 0x58, 0x77, 0xad, 0xed, 0x87, 0x27, 0xbf, 0x2f, 0x5f, 0x3b, 0x79, 0xb6, + 0x6c, 0xfd, 0xf6, 0x6c, 0xd9, 0xfa, 0xf1, 0x8f, 0x65, 0xeb, 0x8b, 0x3b, 0x63, 0xfd, 0xa0, 0xd1, + 0x93, 0x1d, 0xd4, 0x64, 0x68, 0xf3, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x29, 0xd2, 0x39, 0x3b, + 0xfe, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1113,15 +1111,10 @@ func (m *Request) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if m.Internal != nil { - { - size, err := m.Internal.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintCapture(dAtA, i, uint64(size)) - } + if len(m.Internal) > 0 { + i -= len(m.Internal) + copy(dAtA[i:], m.Internal) + i = encodeVarintCapture(dAtA, i, uint64(len(m.Internal))) i-- dAtA[i] = 0x6 i-- @@ -1561,15 +1554,10 @@ func (m *Response) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if m.Internal != nil { - { - size, err := m.Internal.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintCapture(dAtA, i, uint64(size)) - } + if len(m.Internal) > 0 { + i -= len(m.Internal) + copy(dAtA[i:], m.Internal) + i = encodeVarintCapture(dAtA, i, uint64(len(m.Internal))) i-- dAtA[i] = 0x6 i-- @@ -2102,8 +2090,8 @@ func (m *Request) ProtoSize() (n int) { l = m.Acknowledge.ProtoSize() n += 1 + l + sovCapture(uint64(l)) } - if m.Internal != nil { - l = m.Internal.ProtoSize() + l = len(m.Internal) + if l > 0 { n += 2 + l + sovCapture(uint64(l)) } if m.XXX_unrecognized != nil { @@ -2297,8 +2285,8 @@ func (m *Response) ProtoSize() (n int) { l = m.Checkpoint.ProtoSize() n += 1 + l + sovCapture(uint64(l)) } - if m.Internal != nil { - l = m.Internal.ProtoSize() + l = len(m.Internal) + if l > 0 { n += 2 + l + sovCapture(uint64(l)) } if m.XXX_unrecognized != nil { @@ -2746,7 +2734,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Internal", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowCapture @@ -2756,26 +2744,24 @@ func (m *Request) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthCapture } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthCapture } if postIndex > l { return io.ErrUnexpectedEOF } + m.Internal = append(m.Internal[:0], dAtA[iNdEx:postIndex]...) if m.Internal == nil { - m.Internal = &types.Any{} - } - if err := m.Internal.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.Internal = []byte{} } iNdEx = postIndex default: @@ -3969,7 +3955,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Internal", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowCapture @@ -3979,26 +3965,24 @@ func (m *Response) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthCapture } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthCapture } if postIndex > l { return io.ErrUnexpectedEOF } + m.Internal = append(m.Internal[:0], dAtA[iNdEx:postIndex]...) if m.Internal == nil { - m.Internal = &types.Any{} - } - if err := m.Internal.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.Internal = []byte{} } iNdEx = postIndex default: diff --git a/go/protocols/capture/capture.proto b/go/protocols/capture/capture.proto index dbf2863e21..b488a0969f 100644 --- a/go/protocols/capture/capture.proto +++ b/go/protocols/capture/capture.proto @@ -5,7 +5,6 @@ option go_package = "github.com/estuary/flow/go/protocols/capture"; import "go/protocols/flow/flow.proto"; import "gogoproto/gogo.proto"; -import "google/protobuf/any.proto"; option (gogoproto.marshaler_all) = true; option (gogoproto.protosizer_all) = true; @@ -171,7 +170,7 @@ message Request { Acknowledge acknowledge = 6; // Reserved for internal use. - google.protobuf.Any internal = 100; + bytes internal = 100 [ json_name = "$internal" ]; } message Response { @@ -284,5 +283,5 @@ message Response { Checkpoint checkpoint = 7; // Reserved for internal use. - google.protobuf.Any internal = 100; + bytes internal = 100 [ json_name = "$internal" ]; } \ No newline at end of file diff --git a/go/protocols/derive/derive.pb.go b/go/protocols/derive/derive.pb.go index 8062ff7138..46b0503557 100644 --- a/go/protocols/derive/derive.pb.go +++ b/go/protocols/derive/derive.pb.go @@ -10,7 +10,6 @@ import ( flow "github.com/estuary/flow/go/protocols/flow" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - types "github.com/gogo/protobuf/types" protocol "go.gazette.dev/core/consumer/protocol" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -40,10 +39,10 @@ type Request struct { StartCommit *Request_StartCommit `protobuf:"bytes,6,opt,name=start_commit,json=startCommit,proto3" json:"start_commit,omitempty"` Reset_ *Request_Reset `protobuf:"bytes,7,opt,name=reset,proto3" json:"reset,omitempty"` // Reserved for internal use. - Internal *types.Any `protobuf:"bytes,100,opt,name=internal,proto3" json:"internal,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Internal []byte `protobuf:"bytes,100,opt,name=internal,json=$internal,proto3" json:"internal,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Request) Reset() { *m = Request{} } @@ -521,10 +520,10 @@ type Response struct { Flushed *Response_Flushed `protobuf:"bytes,5,opt,name=flushed,proto3" json:"flushed,omitempty"` StartedCommit *Response_StartedCommit `protobuf:"bytes,6,opt,name=started_commit,json=startedCommit,proto3" json:"started_commit,omitempty"` // Reserved for internal use. - Internal *types.Any `protobuf:"bytes,100,opt,name=internal,proto3" json:"internal,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Internal []byte `protobuf:"bytes,100,opt,name=internal,json=$internal,proto3" json:"internal,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Response) Reset() { *m = Response{} } @@ -901,86 +900,85 @@ func init() { func init() { proto.RegisterFile("go/protocols/derive/derive.proto", fileDescriptor_4410d076c75e1e4f) } var fileDescriptor_4410d076c75e1e4f = []byte{ - // 1255 bytes of a gzipped FileDescriptorProto + // 1235 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xdd, 0x6e, 0x1b, 0xc5, - 0x17, 0xef, 0x3a, 0xfe, 0xda, 0x93, 0xaf, 0x76, 0x9a, 0xff, 0x9f, 0x65, 0x1b, 0xa5, 0xa1, 0x14, - 0x11, 0x88, 0x58, 0x57, 0x6e, 0x05, 0xa5, 0x14, 0x44, 0xe3, 0x36, 0xa8, 0x82, 0x2a, 0xd5, 0xa4, - 0xa1, 0x12, 0x37, 0xd6, 0x64, 0x77, 0x6c, 0x6f, 0xb3, 0x9e, 0x59, 0x76, 0x66, 0x53, 0xf9, 0x9e, - 0x67, 0xa0, 0x12, 0x57, 0x88, 0x87, 0xe0, 0x19, 0x72, 0x85, 0x78, 0x82, 0x4a, 0x94, 0xb7, 0xe8, - 0x15, 0x9a, 0x8f, 0xdd, 0xd8, 0xb1, 0x03, 0x2e, 0x57, 0xdc, 0x24, 0x73, 0xce, 0xf9, 0x9d, 0x33, - 0x33, 0xe7, 0x9c, 0x39, 0xbf, 0x35, 0x6c, 0xf6, 0x79, 0x2b, 0xcd, 0xb8, 0xe4, 0x21, 0x4f, 0x44, - 0x2b, 0xa2, 0x59, 0x7c, 0x4c, 0xed, 0xbf, 0x40, 0xeb, 0x51, 0xdd, 0x48, 0xfe, 0x66, 0xc8, 0x99, - 0xc8, 0x87, 0x34, 0x2b, 0xf1, 0xe5, 0xc2, 0x20, 0xfd, 0xf5, 0x89, 0x58, 0xbd, 0x84, 0x3f, 0xd7, - 0x7f, 0xac, 0x75, 0xad, 0xcf, 0xfb, 0x5c, 0x2f, 0x5b, 0x6a, 0x65, 0xb5, 0x6f, 0xf7, 0x39, 0xef, - 0x27, 0xd4, 0xf8, 0x1d, 0xe6, 0xbd, 0x16, 0x61, 0x23, 0x63, 0xba, 0xf6, 0xc3, 0x2a, 0x34, 0x30, - 0xfd, 0x3e, 0xa7, 0x42, 0xa2, 0x2d, 0xa8, 0x8a, 0x94, 0x86, 0x9e, 0xb3, 0xe9, 0x6c, 0x2d, 0xb6, - 0xd7, 0x02, 0x7b, 0x42, 0x6b, 0x0e, 0xf6, 0x53, 0x1a, 0x62, 0x8d, 0x40, 0xb7, 0xa0, 0x79, 0x4c, - 0x92, 0x38, 0x22, 0x92, 0x7a, 0x15, 0x8d, 0xf6, 0xce, 0xa2, 0xbf, 0xb5, 0x76, 0x5c, 0x22, 0x55, - 0x7c, 0x9e, 0x52, 0xe6, 0x2d, 0xcc, 0x8e, 0xbf, 0x97, 0x52, 0x86, 0x35, 0x42, 0x21, 0x33, 0x4a, - 0x22, 0xaf, 0x3a, 0x1b, 0x89, 0x29, 0x89, 0xb0, 0x46, 0xa0, 0x6d, 0xa8, 0xf5, 0x92, 0x5c, 0x0c, - 0xbc, 0x9a, 0x86, 0xfe, 0xef, 0x2c, 0x74, 0x57, 0x19, 0xb1, 0xc1, 0xa0, 0x2f, 0x60, 0x49, 0x48, - 0x92, 0xc9, 0x6e, 0xc8, 0x87, 0xc3, 0x58, 0x7a, 0x75, 0xed, 0x73, 0x65, 0xea, 0xa2, 0x0a, 0xd3, - 0xd1, 0x10, 0xbc, 0x28, 0x4e, 0x05, 0xb5, 0x59, 0x46, 0x05, 0x95, 0x5e, 0x63, 0xf6, 0x66, 0x58, - 0x19, 0xb1, 0xc1, 0xa0, 0x1b, 0xd0, 0x8c, 0x99, 0xa4, 0x19, 0x23, 0x89, 0x17, 0xd9, 0x7b, 0x98, - 0x3a, 0x04, 0x45, 0x1d, 0x82, 0x7b, 0x6c, 0x84, 0x4b, 0x94, 0xff, 0xc2, 0x81, 0xaa, 0x4a, 0x32, - 0x7a, 0x02, 0x2b, 0x21, 0x67, 0x8c, 0x86, 0x92, 0x67, 0x5d, 0x39, 0x4a, 0xa9, 0x2e, 0xc9, 0x4a, - 0xfb, 0xa3, 0x40, 0x97, 0xba, 0xc3, 0x93, 0x84, 0x86, 0x32, 0xe6, 0x4c, 0xa1, 0x83, 0xfb, 0xea, - 0x10, 0x44, 0x89, 0x41, 0xa7, 0xf0, 0x7a, 0x32, 0x4a, 0x29, 0x5e, 0x0e, 0xc7, 0x45, 0xf4, 0x29, - 0x2c, 0x86, 0x9c, 0xf5, 0xe2, 0x7e, 0xf7, 0x99, 0xe0, 0x4c, 0xd7, 0xcd, 0xdd, 0x59, 0x7f, 0xfd, - 0xf2, 0xaa, 0x47, 0x59, 0xc8, 0xa3, 0x98, 0xf5, 0x5b, 0xca, 0x10, 0x60, 0xf2, 0xfc, 0x11, 0x15, - 0x82, 0xf4, 0x29, 0xae, 0x1b, 0x07, 0xff, 0xa7, 0x3a, 0x34, 0x8b, 0x82, 0xfe, 0xe7, 0x4e, 0x87, - 0xee, 0x00, 0x84, 0xe5, 0xa6, 0x65, 0x77, 0xcd, 0x38, 0xcc, 0x4e, 0xf5, 0xe4, 0xe5, 0xd5, 0x0b, - 0x78, 0x0c, 0x8d, 0x76, 0x00, 0x64, 0x46, 0x98, 0xe8, 0xf1, 0x6c, 0x28, 0xbc, 0xea, 0xe6, 0xc2, - 0xd6, 0x62, 0xfb, 0xda, 0x79, 0xbd, 0x1c, 0x3c, 0x29, 0xa0, 0x78, 0xcc, 0x0b, 0x3d, 0x85, 0x4b, - 0x62, 0x90, 0xf7, 0x7a, 0x09, 0xed, 0x1e, 0xd1, 0x91, 0x4e, 0x89, 0xf0, 0x6a, 0x9b, 0x0b, 0x5b, - 0x2b, 0xed, 0xed, 0x7f, 0xca, 0xc9, 0xbe, 0x71, 0xd4, 0x19, 0x59, 0xb5, 0x51, 0xbe, 0xa6, 0x23, - 0x25, 0x0b, 0xf4, 0x0e, 0x2c, 0xa5, 0x19, 0x7f, 0x46, 0x43, 0xd9, 0xcd, 0x38, 0x37, 0xfd, 0xea, - 0xe2, 0x45, 0xab, 0xc3, 0x9c, 0x4b, 0xb4, 0x0b, 0x10, 0x0f, 0x53, 0x9e, 0xc9, 0xee, 0x90, 0xa4, - 0x5e, 0x43, 0x9f, 0xff, 0xfd, 0x73, 0xcf, 0xff, 0x50, 0x43, 0x1f, 0x91, 0xf4, 0x01, 0x93, 0xd9, - 0x08, 0xbb, 0x71, 0x21, 0xfb, 0xaf, 0x1d, 0x70, 0xcb, 0xdb, 0x21, 0x04, 0x55, 0x46, 0x86, 0xa6, - 0xb0, 0x2e, 0xd6, 0xeb, 0x33, 0x59, 0xae, 0xbc, 0x51, 0x96, 0x0f, 0xc0, 0x2f, 0x32, 0x94, 0x90, - 0xe1, 0x61, 0x44, 0xba, 0xe3, 0xb5, 0x5e, 0x98, 0xa3, 0xd6, 0x97, 0xad, 0xff, 0x37, 0xda, 0xbd, - 0x63, 0x0a, 0xbf, 0x0b, 0x68, 0x46, 0xb8, 0xea, 0x1c, 0xe1, 0x96, 0x92, 0xb1, 0x38, 0xfe, 0x5d, - 0x58, 0x99, 0xcc, 0x0c, 0xba, 0x08, 0x0b, 0x47, 0x74, 0x64, 0xef, 0xaf, 0x96, 0x68, 0x0d, 0x6a, - 0xc7, 0x24, 0xc9, 0xcd, 0xbc, 0x73, 0xb1, 0x11, 0xee, 0x54, 0x6e, 0x3b, 0xfe, 0xaf, 0x0e, 0x54, - 0xd5, 0xec, 0x42, 0xb7, 0x26, 0x32, 0xe4, 0x9c, 0x9f, 0xa1, 0x89, 0xdc, 0x78, 0xd0, 0x38, 0xa6, - 0x99, 0x28, 0x92, 0xea, 0xe2, 0x42, 0x44, 0xef, 0x41, 0x2d, 0x23, 0xac, 0x4f, 0x6d, 0x4b, 0xaf, - 0x9a, 0x50, 0x58, 0xa9, 0x74, 0x14, 0x63, 0x45, 0x9f, 0x00, 0x08, 0x49, 0x24, 0x35, 0xb7, 0xaf, - 0xcd, 0x71, 0xfb, 0x9a, 0xc6, 0xfb, 0xbf, 0x54, 0xa0, 0xaa, 0x46, 0x29, 0x5a, 0x07, 0xb7, 0x6c, - 0x67, 0x7d, 0xee, 0x65, 0x7c, 0xaa, 0x40, 0xef, 0x42, 0x35, 0xcf, 0xe3, 0xc8, 0x96, 0xdc, 0x9e, - 0xe2, 0xe0, 0xe0, 0xe1, 0xfd, 0xc7, 0x24, 0x93, 0x02, 0x6b, 0x23, 0xfa, 0x18, 0x1a, 0xb6, 0x42, - 0xf6, 0xb4, 0xeb, 0xb3, 0x86, 0x76, 0xd1, 0xee, 0xb8, 0x00, 0xa3, 0x9b, 0xd0, 0x8c, 0x78, 0x38, - 0x7f, 0xe1, 0x16, 0x22, 0x1e, 0xfa, 0xcf, 0xa0, 0xb1, 0x7f, 0xea, 0xaf, 0xde, 0x9c, 0xf6, 0x77, - 0xe6, 0xf1, 0x57, 0xb5, 0xfc, 0x3f, 0xd4, 0x53, 0x12, 0x1e, 0x51, 0x73, 0xa7, 0x25, 0x6c, 0x25, - 0xd5, 0xf6, 0x03, 0x22, 0x06, 0xfa, 0x06, 0xcb, 0x58, 0xaf, 0xfd, 0x06, 0xd4, 0x34, 0x87, 0xf8, - 0x18, 0x16, 0xc7, 0x88, 0x01, 0x75, 0x00, 0x65, 0x39, 0x93, 0xf1, 0x90, 0x76, 0xc3, 0x01, 0x0d, - 0x8f, 0x52, 0x1e, 0x33, 0x59, 0x16, 0xbd, 0xa0, 0xf1, 0xa0, 0x53, 0xda, 0xf0, 0x25, 0x8b, 0x3f, - 0x55, 0xa9, 0xe0, 0x9a, 0x33, 0xae, 0xfd, 0xd6, 0x84, 0x26, 0xa6, 0x22, 0xe5, 0x4c, 0x50, 0xf4, - 0xc1, 0x04, 0x0f, 0x8f, 0xb1, 0x8c, 0xb1, 0x8f, 0x13, 0xf1, 0x6d, 0x70, 0x0b, 0x7a, 0x2d, 0x0a, - 0xe4, 0x4f, 0xe1, 0x8b, 0xe7, 0x1f, 0xe1, 0x53, 0x30, 0x6a, 0x41, 0x5d, 0x51, 0x2d, 0x8d, 0x6c, - 0xbd, 0xde, 0x9a, 0x72, 0xdb, 0xd3, 0x66, 0x6c, 0x61, 0x6a, 0xab, 0x34, 0x3f, 0x4c, 0x62, 0x31, - 0xa0, 0x05, 0x31, 0x4f, 0x6f, 0xf5, 0xb8, 0x40, 0xe0, 0x53, 0x30, 0x6a, 0x43, 0x43, 0xf3, 0x2f, - 0x8d, 0x2c, 0x4b, 0x7b, 0x53, 0x7e, 0xbb, 0xc6, 0x8e, 0x0b, 0x20, 0x7a, 0x00, 0x2b, 0x9a, 0x79, - 0x69, 0x34, 0x49, 0xd6, 0x1b, 0xd3, 0xd9, 0x30, 0x30, 0xcb, 0xd7, 0xcb, 0x62, 0x5c, 0xfc, 0x17, - 0x24, 0xfc, 0x63, 0xc5, 0x92, 0xb0, 0x0f, 0xcd, 0xe2, 0x3b, 0xcb, 0xbe, 0x89, 0x52, 0x56, 0x83, - 0xc7, 0x4e, 0x1c, 0x11, 0x0e, 0xe8, 0x90, 0xcc, 0xcf, 0x59, 0x4b, 0xc6, 0x6f, 0x5f, 0xbb, 0xa1, - 0xa7, 0x70, 0x25, 0xa3, 0x82, 0xe7, 0x59, 0x48, 0xbb, 0x33, 0x02, 0xce, 0x33, 0x18, 0xd7, 0x8a, - 0x00, 0x9d, 0xf1, 0xc0, 0xdb, 0x70, 0x29, 0xe2, 0x61, 0x3e, 0xa4, 0x4c, 0x6a, 0x9e, 0xe9, 0xe6, - 0x59, 0x62, 0xde, 0x17, 0xbe, 0x38, 0x61, 0x38, 0xc8, 0x12, 0x74, 0x1d, 0xea, 0x9c, 0xe4, 0x72, - 0xd0, 0xb6, 0xe5, 0x59, 0x32, 0x4f, 0x7c, 0xef, 0x9e, 0xd2, 0x61, 0x6b, 0xf3, 0x5f, 0x54, 0xc0, - 0x2d, 0x3b, 0x09, 0xdd, 0x9f, 0xe0, 0x4d, 0x47, 0xf3, 0xce, 0xf5, 0xf3, 0x3b, 0xef, 0x5c, 0xe6, - 0x5c, 0xed, 0x53, 0x46, 0x33, 0x05, 0xe9, 0xf6, 0xe2, 0x84, 0x0a, 0xaf, 0xa2, 0x43, 0x05, 0x7f, - 0x13, 0xea, 0xab, 0xc2, 0x63, 0x57, 0x39, 0x18, 0x26, 0x5b, 0xe9, 0x4f, 0x28, 0xfd, 0xad, 0x71, - 0x36, 0xbb, 0x02, 0xae, 0xfa, 0x56, 0xec, 0x72, 0x96, 0x98, 0x91, 0xde, 0xc4, 0x4d, 0xa5, 0xd8, - 0x63, 0xc9, 0xc8, 0xbf, 0x07, 0x97, 0x67, 0x04, 0x7c, 0x23, 0x02, 0x68, 0x42, 0xdd, 0xbc, 0x15, - 0xff, 0x4b, 0x70, 0xcb, 0x17, 0x30, 0x31, 0xda, 0x9c, 0x79, 0x47, 0x9b, 0x0b, 0x0d, 0xfb, 0x16, - 0xfc, 0xcf, 0x60, 0x79, 0xa2, 0xb7, 0xd1, 0x87, 0x60, 0x06, 0xf7, 0x59, 0x6a, 0xb1, 0x9f, 0x51, - 0xfb, 0xca, 0x66, 0x67, 0x7b, 0xfb, 0x2e, 0xb8, 0xa5, 0x41, 0xbd, 0x75, 0xfd, 0xc9, 0x41, 0xd1, - 0xea, 0x99, 0xa9, 0xec, 0x5f, 0x3c, 0x9b, 0xe8, 0x2d, 0xe7, 0x86, 0xb3, 0xf3, 0xf9, 0xc9, 0x1f, - 0x1b, 0x17, 0x4e, 0x5e, 0x6d, 0x38, 0xbf, 0xbf, 0xda, 0x70, 0x7e, 0xfe, 0x73, 0xc3, 0xf9, 0x6e, - 0xbb, 0x1f, 0xcb, 0x41, 0x7e, 0x18, 0x84, 0x7c, 0xd8, 0xa2, 0x42, 0xe6, 0x24, 0x1b, 0x99, 0x1f, - 0x1f, 0x33, 0x7e, 0xda, 0x1c, 0xd6, 0xb5, 0xe6, 0xe6, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x84, - 0x6a, 0x99, 0x88, 0xf8, 0x0c, 0x00, 0x00, + 0x17, 0xef, 0x3a, 0xfe, 0xda, 0x13, 0xc7, 0x69, 0xa7, 0xf9, 0xff, 0x59, 0x6d, 0xa2, 0x34, 0x94, + 0x22, 0x0c, 0x11, 0x0e, 0x72, 0x2b, 0x28, 0xa5, 0x20, 0x1a, 0xb7, 0x41, 0x15, 0x54, 0xa9, 0x26, + 0x0d, 0x95, 0xb8, 0xb1, 0x36, 0xbb, 0xc7, 0xf6, 0x36, 0xeb, 0x9d, 0x65, 0x67, 0x36, 0x95, 0x5f, + 0x84, 0x4a, 0x5c, 0x21, 0x1e, 0x02, 0x89, 0x37, 0xc8, 0x25, 0x4f, 0x50, 0x89, 0xf2, 0x00, 0xdc, + 0xf7, 0x0a, 0xcd, 0xc7, 0x6e, 0xec, 0xd8, 0x29, 0xee, 0x1d, 0x37, 0xc9, 0x9c, 0x73, 0x7e, 0xe7, + 0xcc, 0xcc, 0x39, 0x67, 0xce, 0x6f, 0x0d, 0x5b, 0x03, 0xb6, 0x93, 0xa4, 0x4c, 0x30, 0x9f, 0x45, + 0x7c, 0x27, 0xc0, 0x34, 0x3c, 0x41, 0xf3, 0xaf, 0xad, 0xf4, 0xa4, 0xaa, 0x25, 0x77, 0xcb, 0x67, + 0x31, 0xcf, 0x46, 0x98, 0x16, 0xf8, 0x62, 0xa1, 0x91, 0xee, 0xc6, 0x54, 0xac, 0x7e, 0xc4, 0x9e, + 0xab, 0x3f, 0xc6, 0xba, 0x36, 0x60, 0x03, 0xa6, 0x96, 0x3b, 0x72, 0xa5, 0xb5, 0xd7, 0xff, 0x6e, + 0x42, 0x8d, 0xe2, 0x8f, 0x19, 0x72, 0x41, 0x5a, 0x50, 0xe6, 0x09, 0xfa, 0x8e, 0xb5, 0x65, 0xb5, + 0x96, 0x3b, 0x6b, 0x6d, 0x73, 0x0c, 0x63, 0x6e, 0x1f, 0x24, 0xe8, 0x53, 0x85, 0x20, 0xb7, 0xa0, + 0x7e, 0xe2, 0x45, 0x61, 0xe0, 0x09, 0x74, 0x4a, 0x0a, 0xed, 0x9c, 0x47, 0x7f, 0x6f, 0xec, 0xb4, + 0x40, 0xca, 0xf8, 0x2c, 0xc1, 0xd8, 0x59, 0x9a, 0x1f, 0x7f, 0x3f, 0xc1, 0x98, 0x2a, 0x84, 0x44, + 0xa6, 0xe8, 0x05, 0x4e, 0x79, 0x3e, 0x92, 0xa2, 0x17, 0x50, 0x85, 0x20, 0xdb, 0x50, 0xe9, 0x47, + 0x19, 0x1f, 0x3a, 0x15, 0x05, 0xfd, 0xdf, 0x79, 0xe8, 0x9e, 0x34, 0x52, 0x8d, 0x21, 0x5f, 0x41, + 0x83, 0x0b, 0x2f, 0x15, 0x3d, 0x9f, 0x8d, 0x46, 0xa1, 0x70, 0xaa, 0xca, 0x67, 0x7d, 0xe6, 0xa2, + 0x12, 0xd3, 0x55, 0x10, 0xba, 0xcc, 0xcf, 0x04, 0xb9, 0x59, 0x8a, 0x1c, 0x85, 0x53, 0x9b, 0xbf, + 0x19, 0x95, 0x46, 0xaa, 0x31, 0x64, 0x1d, 0xea, 0x61, 0x2c, 0x30, 0x8d, 0xbd, 0xc8, 0x09, 0xb6, + 0xac, 0x56, 0x83, 0xda, 0x37, 0x72, 0x85, 0xfb, 0xc2, 0x82, 0xb2, 0xcc, 0x27, 0x79, 0x02, 0x4d, + 0x9f, 0xc5, 0x31, 0xfa, 0x82, 0xa5, 0x3d, 0x31, 0x4e, 0x50, 0x65, 0xbf, 0xd9, 0xf9, 0xb8, 0xad, + 0x4a, 0xd7, 0x65, 0x51, 0x84, 0xbe, 0x08, 0x59, 0x2c, 0xd1, 0xed, 0xfb, 0x72, 0x3f, 0x4f, 0x8a, + 0xed, 0x6e, 0xee, 0xf5, 0x64, 0x9c, 0x20, 0x5d, 0xf1, 0x27, 0x45, 0xf2, 0x39, 0x2c, 0xfb, 0x2c, + 0xee, 0x87, 0x83, 0xde, 0x33, 0xce, 0x62, 0x55, 0x22, 0x7b, 0x77, 0xe3, 0xf5, 0xcb, 0x6b, 0x0e, + 0xc6, 0x3e, 0x0b, 0xc2, 0x78, 0xb0, 0x23, 0x0d, 0x6d, 0xea, 0x3d, 0x7f, 0x84, 0x9c, 0x7b, 0x03, + 0xa4, 0x55, 0xed, 0xe0, 0xfe, 0x5c, 0x85, 0x7a, 0x5e, 0xbb, 0xff, 0xdc, 0xe9, 0xc8, 0x1d, 0x00, + 0xbf, 0xd8, 0xb4, 0x68, 0xa4, 0x39, 0x87, 0xd9, 0x2d, 0x9f, 0xbe, 0xbc, 0x76, 0x89, 0x4e, 0xa0, + 0xc9, 0x2e, 0x80, 0x48, 0xbd, 0x98, 0xf7, 0x59, 0x3a, 0xe2, 0x4e, 0x79, 0x6b, 0xa9, 0xb5, 0xdc, + 0xb9, 0x7e, 0x51, 0xdb, 0xb6, 0x9f, 0xe4, 0x50, 0x3a, 0xe1, 0x45, 0x9e, 0xc2, 0x15, 0x3e, 0xcc, + 0xfa, 0xfd, 0x08, 0x7b, 0xc7, 0x38, 0x56, 0x29, 0xe1, 0x4e, 0x65, 0x6b, 0xa9, 0xd5, 0xec, 0x6c, + 0xff, 0x5b, 0x4e, 0x0e, 0xb4, 0xa3, 0xca, 0xc8, 0xaa, 0x89, 0xf2, 0x2d, 0x8e, 0xa5, 0xcc, 0xc9, + 0xbb, 0xd0, 0x48, 0x52, 0xf6, 0x0c, 0x7d, 0xd1, 0x4b, 0x19, 0xd3, 0xad, 0x69, 0xd3, 0x65, 0xa3, + 0xa3, 0x8c, 0x09, 0xb2, 0x07, 0x10, 0x8e, 0x12, 0x96, 0x8a, 0xde, 0xc8, 0x4b, 0x9c, 0x9a, 0x3a, + 0xff, 0x07, 0x17, 0x9e, 0xff, 0xa1, 0x82, 0x3e, 0xf2, 0x92, 0x07, 0xb1, 0x48, 0xc7, 0xd4, 0x0e, + 0x73, 0xd9, 0x7d, 0x6d, 0x81, 0x5d, 0xdc, 0x8e, 0x10, 0x28, 0xc7, 0xde, 0x48, 0x17, 0xd6, 0xa6, + 0x6a, 0x7d, 0x2e, 0xcb, 0xa5, 0xb7, 0xca, 0xf2, 0x21, 0xb8, 0x79, 0x86, 0x22, 0x6f, 0x74, 0x14, + 0x78, 0xbd, 0xc9, 0x5a, 0x2f, 0x2d, 0x50, 0xeb, 0xab, 0xc6, 0xff, 0x3b, 0xe5, 0xde, 0xd5, 0x85, + 0xdf, 0x03, 0x32, 0x27, 0x5c, 0x79, 0x81, 0x70, 0x8d, 0x68, 0x22, 0x8e, 0x7b, 0x17, 0x9a, 0xd3, + 0x99, 0x21, 0x97, 0x61, 0xe9, 0x18, 0xc7, 0xe6, 0xfe, 0x72, 0x49, 0xd6, 0xa0, 0x72, 0xe2, 0x45, + 0x99, 0x1e, 0x6d, 0x36, 0xd5, 0xc2, 0x9d, 0xd2, 0x6d, 0xcb, 0xfd, 0xcd, 0x82, 0xb2, 0x1c, 0x53, + 0xe4, 0xd6, 0x54, 0x86, 0xac, 0x8b, 0x33, 0x34, 0x95, 0x1b, 0x07, 0x6a, 0x27, 0x98, 0xf2, 0x3c, + 0xa9, 0x36, 0xcd, 0x45, 0xf2, 0x3e, 0x54, 0x52, 0x2f, 0x1e, 0xa0, 0x69, 0xe9, 0x55, 0x1d, 0x8a, + 0x4a, 0x95, 0x8a, 0xa2, 0xad, 0xe4, 0x33, 0x00, 0x2e, 0x3c, 0x81, 0xfa, 0xf6, 0x95, 0x05, 0x6e, + 0x5f, 0x51, 0x78, 0xf7, 0xd7, 0x12, 0x94, 0xe5, 0xd4, 0x24, 0x1b, 0x60, 0x17, 0xed, 0xac, 0xce, + 0xbd, 0x42, 0xcf, 0x14, 0xe4, 0x3d, 0x28, 0x67, 0x59, 0x18, 0x98, 0x92, 0x9b, 0x53, 0x1c, 0x1e, + 0x3e, 0xbc, 0xff, 0xd8, 0x4b, 0x05, 0xa7, 0xca, 0x48, 0x3e, 0x85, 0x9a, 0xa9, 0x90, 0x39, 0xed, + 0xc6, 0xbc, 0xf9, 0x9c, 0xb7, 0x3b, 0xcd, 0xc1, 0xe4, 0x26, 0xd4, 0x03, 0xe6, 0x2f, 0x5e, 0xb8, + 0xa5, 0x80, 0xf9, 0xee, 0x33, 0xa8, 0x1d, 0x9c, 0xf9, 0xcb, 0x37, 0xa7, 0xfc, 0xad, 0x45, 0xfc, + 0x65, 0x2d, 0xff, 0x0f, 0xd5, 0xc4, 0xf3, 0x8f, 0x51, 0xdf, 0xa9, 0x41, 0x8d, 0x24, 0xdb, 0x7e, + 0xe8, 0xf1, 0xa1, 0xba, 0xc1, 0x0a, 0x55, 0x6b, 0xb7, 0x06, 0x15, 0x45, 0x17, 0x2e, 0x85, 0xe5, + 0x09, 0x0e, 0x20, 0x5d, 0x20, 0x69, 0x16, 0x8b, 0x70, 0x84, 0x3d, 0x7f, 0x88, 0xfe, 0x71, 0xc2, + 0xc2, 0x58, 0x14, 0x45, 0xcf, 0x69, 0xb9, 0xdd, 0x2d, 0x6c, 0xf4, 0x8a, 0xc1, 0x9f, 0xa9, 0x64, + 0x70, 0x45, 0x0f, 0xd7, 0x7f, 0xaf, 0x43, 0x9d, 0x22, 0x4f, 0x58, 0xcc, 0x91, 0x7c, 0x38, 0x45, + 0xb9, 0x13, 0x84, 0xa2, 0xed, 0x93, 0x9c, 0x7b, 0x1b, 0xec, 0x9c, 0x49, 0xf3, 0x02, 0xb9, 0x33, + 0xf8, 0xfc, 0xf9, 0x07, 0xf4, 0x0c, 0x4c, 0x76, 0xa0, 0x2a, 0x59, 0x15, 0x03, 0x53, 0xaf, 0x77, + 0x66, 0xdc, 0xf6, 0x95, 0x99, 0x1a, 0x98, 0xdc, 0x2a, 0xc9, 0x8e, 0xa2, 0x90, 0x0f, 0x31, 0xe7, + 0xe0, 0xd9, 0xad, 0x1e, 0xe7, 0x08, 0x7a, 0x06, 0x26, 0x1d, 0xa8, 0x29, 0xaa, 0xc5, 0xc0, 0x10, + 0xb2, 0x33, 0xe3, 0xb7, 0xa7, 0xed, 0x34, 0x07, 0x92, 0x07, 0xd0, 0x54, 0x24, 0x8b, 0xc1, 0x34, + 0x2f, 0x6f, 0xce, 0x66, 0x43, 0xc3, 0x0c, 0x35, 0xaf, 0xf0, 0x49, 0xf1, 0xcd, 0x7c, 0xfb, 0x53, + 0xc9, 0xf0, 0xad, 0x0b, 0xf5, 0xfc, 0x13, 0xc9, 0xb4, 0x7f, 0x21, 0xcb, 0x19, 0x63, 0x86, 0x0b, + 0xf7, 0x87, 0x38, 0xf2, 0x16, 0xa7, 0xa7, 0x86, 0xf6, 0x3b, 0x50, 0x6e, 0xe4, 0x29, 0xac, 0xa7, + 0xc8, 0x59, 0x96, 0xfa, 0xd8, 0x9b, 0x13, 0x70, 0x91, 0x19, 0xb8, 0x96, 0x07, 0xe8, 0x4e, 0x06, + 0xde, 0x86, 0x2b, 0x01, 0xf3, 0xb3, 0x11, 0xc6, 0x42, 0x51, 0x4a, 0x2f, 0x4b, 0x23, 0xfd, 0x94, + 0xe8, 0xe5, 0x29, 0xc3, 0x61, 0x1a, 0x91, 0x1b, 0x50, 0x65, 0x5e, 0x26, 0x86, 0x1d, 0x53, 0x89, + 0x86, 0x7e, 0xcd, 0xfb, 0xf7, 0xa4, 0x8e, 0x1a, 0x9b, 0xfb, 0xa2, 0x04, 0x76, 0xd1, 0x34, 0xe4, + 0xfe, 0x14, 0x45, 0x5a, 0x8a, 0x62, 0x6e, 0x5c, 0xdc, 0x64, 0x17, 0x92, 0xe4, 0xea, 0x00, 0x63, + 0x4c, 0x25, 0xa4, 0xd7, 0x0f, 0x23, 0xe4, 0x4e, 0x49, 0x85, 0x6a, 0xbf, 0x21, 0xd4, 0x37, 0xb9, + 0xc7, 0x9e, 0x74, 0xd0, 0xa4, 0xd5, 0x1c, 0x4c, 0x29, 0xdd, 0xd6, 0x24, 0x71, 0xad, 0x83, 0x2d, + 0xbf, 0x00, 0x7b, 0x2c, 0x8e, 0xf4, 0xf4, 0xae, 0xd3, 0xba, 0x54, 0xec, 0xc7, 0xd1, 0xd8, 0xbd, + 0x07, 0x57, 0xe7, 0x04, 0x7c, 0xab, 0x59, 0x5f, 0x87, 0xaa, 0x7e, 0x16, 0xee, 0xd7, 0x60, 0x17, + 0xcd, 0x3e, 0x35, 0xc5, 0xac, 0x45, 0xa7, 0x98, 0x0d, 0x35, 0xd3, 0xf6, 0xee, 0x17, 0xb0, 0x32, + 0xd5, 0xc6, 0xe4, 0x23, 0xd0, 0x33, 0xfa, 0x3c, 0x8b, 0x98, 0x2f, 0xa6, 0x03, 0x69, 0x33, 0x63, + 0xbc, 0x73, 0x17, 0xec, 0xc2, 0x20, 0x9f, 0xb5, 0xfa, 0xba, 0x40, 0xb2, 0x7a, 0x6e, 0x00, 0xbb, + 0x97, 0xcf, 0x27, 0xba, 0x65, 0x7d, 0x62, 0xed, 0x7e, 0x79, 0xfa, 0xe7, 0xe6, 0xa5, 0xd3, 0x57, + 0x9b, 0xd6, 0x1f, 0xaf, 0x36, 0xad, 0x5f, 0xfe, 0xda, 0xb4, 0x7e, 0xd8, 0x1e, 0x84, 0x62, 0x98, + 0x1d, 0xb5, 0x7d, 0x36, 0xda, 0x41, 0x2e, 0x32, 0x2f, 0x1d, 0xeb, 0xdf, 0x0d, 0x73, 0x7e, 0x95, + 0x1c, 0x55, 0x95, 0xe6, 0xe6, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x54, 0xb7, 0x4c, 0xba, 0xb3, + 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1119,15 +1117,10 @@ func (m *Request) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if m.Internal != nil { - { - size, err := m.Internal.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDerive(dAtA, i, uint64(size)) - } + if len(m.Internal) > 0 { + i -= len(m.Internal) + copy(dAtA[i:], m.Internal) + i = encodeVarintDerive(dAtA, i, uint64(len(m.Internal))) i-- dAtA[i] = 0x6 i-- @@ -1310,20 +1303,20 @@ func (m *Request_Validate) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x32 } if len(m.ShuffleKeyTypes) > 0 { - dAtA10 := make([]byte, len(m.ShuffleKeyTypes)*10) - var j9 int + dAtA9 := make([]byte, len(m.ShuffleKeyTypes)*10) + var j8 int for _, num := range m.ShuffleKeyTypes { for num >= 1<<7 { - dAtA10[j9] = uint8(uint64(num)&0x7f | 0x80) + dAtA9[j8] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j9++ + j8++ } - dAtA10[j9] = uint8(num) - j9++ + dAtA9[j8] = uint8(num) + j8++ } - i -= j9 - copy(dAtA[i:], dAtA10[:j9]) - i = encodeVarintDerive(dAtA, i, uint64(j9)) + i -= j8 + copy(dAtA[i:], dAtA9[:j8]) + i = encodeVarintDerive(dAtA, i, uint64(j8)) i-- dAtA[i] = 0x2a } @@ -1715,15 +1708,10 @@ func (m *Response) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if m.Internal != nil { - { - size, err := m.Internal.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintDerive(dAtA, i, uint64(size)) - } + if len(m.Internal) > 0 { + i -= len(m.Internal) + copy(dAtA[i:], m.Internal) + i = encodeVarintDerive(dAtA, i, uint64(len(m.Internal))) i-- dAtA[i] = 0x6 i-- @@ -2138,8 +2126,8 @@ func (m *Request) ProtoSize() (n int) { l = m.Reset_.ProtoSize() n += 1 + l + sovDerive(uint64(l)) } - if m.Internal != nil { - l = m.Internal.ProtoSize() + l = len(m.Internal) + if l > 0 { n += 2 + l + sovDerive(uint64(l)) } if m.XXX_unrecognized != nil { @@ -2387,8 +2375,8 @@ func (m *Response) ProtoSize() (n int) { l = m.StartedCommit.ProtoSize() n += 1 + l + sovDerive(uint64(l)) } - if m.Internal != nil { - l = m.Internal.ProtoSize() + l = len(m.Internal) + if l > 0 { n += 2 + l + sovDerive(uint64(l)) } if m.XXX_unrecognized != nil { @@ -2816,7 +2804,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Internal", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDerive @@ -2826,26 +2814,24 @@ func (m *Request) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthDerive } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthDerive } if postIndex > l { return io.ErrUnexpectedEOF } + m.Internal = append(m.Internal[:0], dAtA[iNdEx:postIndex]...) if m.Internal == nil { - m.Internal = &types.Any{} - } - if err := m.Internal.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.Internal = []byte{} } iNdEx = postIndex default: @@ -4484,7 +4470,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Internal", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDerive @@ -4494,26 +4480,24 @@ func (m *Response) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthDerive } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthDerive } if postIndex > l { return io.ErrUnexpectedEOF } + m.Internal = append(m.Internal[:0], dAtA[iNdEx:postIndex]...) if m.Internal == nil { - m.Internal = &types.Any{} - } - if err := m.Internal.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.Internal = []byte{} } iNdEx = postIndex default: diff --git a/go/protocols/derive/derive.proto b/go/protocols/derive/derive.proto index c0df1bf1cf..d6a4c7d59e 100644 --- a/go/protocols/derive/derive.proto +++ b/go/protocols/derive/derive.proto @@ -6,7 +6,6 @@ option go_package = "github.com/estuary/flow/go/protocols/derive"; import "consumer/protocol/protocol.proto"; import "go/protocols/flow/flow.proto"; import "gogoproto/gogo.proto"; -import "google/protobuf/any.proto"; option (gogoproto.marshaler_all) = true; option (gogoproto.protosizer_all) = true; @@ -154,7 +153,7 @@ message Request { Reset reset = 7; // Reserved for internal use. - google.protobuf.Any internal = 100; + bytes internal = 100 [ json_name = "$internal" ]; } message Response { @@ -234,5 +233,5 @@ message Response { StartedCommit started_commit = 6; // Reserved for internal use. - google.protobuf.Any internal = 100; + bytes internal = 100 [ json_name = "$internal" ]; } \ No newline at end of file diff --git a/go/protocols/materialize/materialize.pb.go b/go/protocols/materialize/materialize.pb.go index 4314f9d491..4e31d26cd1 100644 --- a/go/protocols/materialize/materialize.pb.go +++ b/go/protocols/materialize/materialize.pb.go @@ -11,7 +11,6 @@ import ( github_com_estuary_flow_go_protocols_flow "github.com/estuary/flow/go/protocols/flow" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - types "github.com/gogo/protobuf/types" protocol "go.gazette.dev/core/consumer/protocol" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -92,10 +91,10 @@ type Request struct { StartCommit *Request_StartCommit `protobuf:"bytes,8,opt,name=start_commit,json=startCommit,proto3" json:"start_commit,omitempty"` Acknowledge *Request_Acknowledge `protobuf:"bytes,9,opt,name=acknowledge,proto3" json:"acknowledge,omitempty"` // Reserved for internal use. - Internal *types.Any `protobuf:"bytes,100,opt,name=internal,proto3" json:"internal,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Internal []byte `protobuf:"bytes,100,opt,name=internal,json=$internal,proto3" json:"internal,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Request) Reset() { *m = Request{} } @@ -635,10 +634,10 @@ type Response struct { StartedCommit *Response_StartedCommit `protobuf:"bytes,7,opt,name=started_commit,json=startedCommit,proto3" json:"started_commit,omitempty"` Acknowledged *Response_Acknowledged `protobuf:"bytes,8,opt,name=acknowledged,proto3" json:"acknowledged,omitempty"` // Reserved for internal use. - Internal *types.Any `protobuf:"bytes,100,opt,name=internal,proto3" json:"internal,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Internal []byte `protobuf:"bytes,100,opt,name=internal,json=$internal,proto3" json:"internal,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Response) Reset() { *m = Response{} } @@ -1313,111 +1312,109 @@ func init() { } var fileDescriptor_3e8b62b327f34bc6 = []byte{ - // 1655 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xdd, 0x6e, 0xe3, 0xc6, - 0x15, 0x5e, 0xca, 0xfa, 0x3d, 0x92, 0x6c, 0x79, 0xaa, 0x6d, 0x18, 0x76, 0x63, 0x3b, 0x4e, 0x83, - 0x18, 0x5b, 0x84, 0x36, 0xbc, 0x05, 0xb2, 0x9b, 0x60, 0x8b, 0xea, 0x17, 0xd0, 0x56, 0xb6, 0x9c, - 0xf1, 0x3a, 0x01, 0x72, 0x23, 0x8c, 0xc9, 0xb1, 0xcc, 0x35, 0xc5, 0x61, 0x49, 0x6a, 0x37, 0xea, - 0x4d, 0x7b, 0x53, 0x14, 0xe8, 0x55, 0x0b, 0x14, 0x05, 0x8a, 0xde, 0x14, 0x7d, 0x87, 0x3e, 0x41, - 0x51, 0x60, 0x2f, 0xfb, 0x04, 0x5b, 0x74, 0xdb, 0x17, 0xe8, 0x6d, 0xae, 0x8a, 0xf9, 0x21, 0x45, - 0x39, 0x92, 0x56, 0x28, 0xd2, 0xdc, 0x08, 0x9c, 0x33, 0xdf, 0x77, 0x74, 0xe6, 0xf0, 0xcc, 0x39, - 0x1f, 0xe1, 0xfe, 0x88, 0x1d, 0xfa, 0x01, 0x8b, 0x98, 0xc5, 0xdc, 0xf0, 0x70, 0x4c, 0x22, 0x1a, - 0x38, 0xc4, 0x75, 0x7e, 0x46, 0xd3, 0xcf, 0xa6, 0x40, 0xa0, 0x72, 0xca, 0x64, 0xec, 0x59, 0xcc, - 0x0b, 0x27, 0x63, 0x1a, 0x24, 0xf4, 0xe4, 0x41, 0xc2, 0x8d, 0x7b, 0x73, 0xae, 0xaf, 0x5c, 0xf6, - 0x42, 0xfc, 0xa8, 0xdd, 0xfa, 0x88, 0x8d, 0x98, 0x78, 0x3c, 0xe4, 0x4f, 0xca, 0xfa, 0xf6, 0x88, - 0xb1, 0x91, 0x4b, 0x25, 0xef, 0x72, 0x72, 0x75, 0x48, 0xbc, 0xa9, 0xdc, 0xda, 0xff, 0xc3, 0x36, - 0x14, 0x30, 0xfd, 0xe9, 0x84, 0x86, 0x11, 0xfa, 0x10, 0xb2, 0xa1, 0x4f, 0x2d, 0x5d, 0xdb, 0xd3, - 0x0e, 0xca, 0xc7, 0x6f, 0x9b, 0xe9, 0x58, 0x15, 0xc6, 0x3c, 0xf7, 0xa9, 0x85, 0x05, 0x0c, 0x3d, - 0x82, 0xe2, 0x73, 0xe2, 0x3a, 0x36, 0x89, 0xa8, 0x9e, 0x11, 0x94, 0x77, 0x16, 0x52, 0x3e, 0x53, - 0x20, 0x9c, 0xc0, 0xd1, 0x11, 0xe4, 0x88, 0xef, 0xbb, 0x53, 0x7d, 0x43, 0xf0, 0x8c, 0x85, 0xbc, - 0x06, 0x47, 0x60, 0x09, 0xe4, 0xb1, 0x31, 0x9f, 0x7a, 0x7a, 0x76, 0x45, 0x6c, 0x03, 0x9f, 0x7a, - 0x58, 0xc0, 0x38, 0xdc, 0x65, 0xc4, 0xd6, 0x73, 0x2b, 0xe0, 0x7d, 0x46, 0x6c, 0x2c, 0x60, 0x3c, - 0x9e, 0x2b, 0x77, 0x12, 0x5e, 0xeb, 0xf9, 0x15, 0xf1, 0x74, 0x39, 0x02, 0x4b, 0x20, 0x67, 0x84, - 0x11, 0x0b, 0xa8, 0x5e, 0x58, 0xc1, 0x38, 0xe7, 0x08, 0x2c, 0x81, 0xa8, 0x05, 0x95, 0x30, 0x22, - 0x41, 0x34, 0xb4, 0xd8, 0x78, 0xec, 0x44, 0x7a, 0x51, 0x10, 0xf7, 0x96, 0x10, 0x49, 0x10, 0xb5, - 0x04, 0x0e, 0x97, 0xc3, 0xd9, 0x02, 0x35, 0xa1, 0x4c, 0xac, 0x1b, 0x8f, 0xbd, 0x70, 0xa9, 0x3d, - 0xa2, 0x7a, 0x69, 0x85, 0x8f, 0xc6, 0x0c, 0x87, 0xd3, 0x24, 0x74, 0x04, 0x45, 0xc7, 0x8b, 0x68, - 0xe0, 0x11, 0x57, 0xb7, 0x85, 0x83, 0xba, 0x29, 0x0b, 0xc4, 0x8c, 0x0b, 0xc4, 0x6c, 0x78, 0x53, - 0x9c, 0xa0, 0x8c, 0xdf, 0x6a, 0x90, 0xe5, 0x2f, 0x1e, 0x9d, 0xc2, 0xa6, 0xc5, 0x3c, 0x8f, 0x5a, - 0x11, 0x0b, 0x86, 0xd1, 0xd4, 0xa7, 0xa2, 0x56, 0x36, 0x8f, 0x3f, 0x30, 0x45, 0x0d, 0x9e, 0x24, - 0x61, 0x90, 0xc8, 0x61, 0x1e, 0xa7, 0x98, 0xad, 0x18, 0xff, 0x74, 0xea, 0x53, 0x5c, 0xb5, 0xd2, - 0x4b, 0xf4, 0x08, 0xca, 0x16, 0xf3, 0xae, 0x9c, 0xd1, 0xf0, 0x59, 0xc8, 0x3c, 0x51, 0x45, 0xa5, - 0xe6, 0xbd, 0xaf, 0x5e, 0xed, 0xea, 0xd4, 0xb3, 0x98, 0xed, 0x78, 0xa3, 0x43, 0xbe, 0x61, 0x62, - 0xf2, 0xe2, 0x84, 0x86, 0x21, 0x19, 0x51, 0x9c, 0x97, 0x04, 0xe3, 0x37, 0x39, 0x28, 0xc6, 0x95, - 0x85, 0x3e, 0x85, 0xac, 0x47, 0xc6, 0x32, 0x9a, 0x52, 0xf3, 0xf1, 0x57, 0xaf, 0x76, 0x1f, 0x8d, - 0x9c, 0xe8, 0x7a, 0x72, 0x69, 0x5a, 0x6c, 0x7c, 0x48, 0xc3, 0x68, 0x42, 0x82, 0xa9, 0xbc, 0x2c, - 0x5f, 0xbb, 0x3e, 0xb7, 0xa3, 0xc6, 0xc2, 0xd5, 0x82, 0xa3, 0x66, 0xbe, 0xc9, 0xa3, 0x6e, 0xac, - 0x7f, 0x54, 0xd4, 0x80, 0xe2, 0xa5, 0xe3, 0x71, 0x48, 0xa8, 0x67, 0xf7, 0x36, 0x0e, 0xca, 0xc7, - 0xef, 0xaf, 0xbc, 0x68, 0x66, 0x53, 0xa2, 0x71, 0x42, 0x33, 0x5e, 0x67, 0xa0, 0xa0, 0xac, 0xe8, - 0x09, 0xd4, 0x03, 0x1a, 0xb2, 0x49, 0x60, 0xd1, 0x61, 0x3a, 0x24, 0x6d, 0x8d, 0x90, 0x36, 0x63, - 0x66, 0x4b, 0x86, 0xf6, 0x31, 0x80, 0xc5, 0x5c, 0x97, 0x5a, 0x3c, 0x09, 0xaa, 0x0b, 0xd4, 0x65, - 0x86, 0x5a, 0x89, 0x9d, 0x27, 0xa7, 0x99, 0x7d, 0xf9, 0x6a, 0xf7, 0x0e, 0x4e, 0xa1, 0xd1, 0xaf, - 0x34, 0xb8, 0x7b, 0xe5, 0x50, 0xd7, 0x4e, 0x47, 0x31, 0x1c, 0x13, 0x5f, 0xdf, 0x10, 0x87, 0x7c, - 0xbc, 0xd6, 0x21, 0xcd, 0x2e, 0x77, 0x21, 0xc3, 0x79, 0x12, 0x32, 0xef, 0x84, 0xf8, 0x1d, 0x2f, - 0x0a, 0xa6, 0xcd, 0x7b, 0xbf, 0xfe, 0xc7, 0x8a, 0x83, 0x94, 0xaf, 0x66, 0x34, 0xa3, 0x03, 0x6f, - 0x2d, 0xf1, 0x82, 0x6a, 0xb0, 0x71, 0x43, 0xa7, 0x32, 0x37, 0x98, 0x3f, 0xa2, 0x3a, 0xe4, 0x9e, - 0x13, 0x77, 0x22, 0xeb, 0xa1, 0x84, 0xe5, 0xe2, 0xe3, 0xcc, 0x43, 0xcd, 0xf8, 0x39, 0xe4, 0x44, - 0xcf, 0x42, 0x2d, 0xd8, 0x1a, 0xcf, 0xd7, 0x47, 0xd2, 0x53, 0x97, 0x15, 0x0f, 0xbe, 0xcd, 0x40, - 0x3a, 0x14, 0x9e, 0xd3, 0x20, 0x8c, 0xf3, 0x5a, 0xc2, 0xf1, 0x12, 0xbd, 0x05, 0x05, 0x3b, 0x98, - 0x0e, 0x83, 0x89, 0x2c, 0xa3, 0x22, 0xce, 0xdb, 0xc1, 0x14, 0x4f, 0x3c, 0xe3, 0x6f, 0x1a, 0x64, - 0x79, 0x13, 0xfc, 0x7f, 0x07, 0xf0, 0x3e, 0xe4, 0x02, 0xe2, 0x8d, 0xa8, 0x6a, 0xdf, 0x5b, 0xd2, - 0x29, 0xe6, 0x26, 0xe1, 0x4a, 0xee, 0xa2, 0x8f, 0x00, 0xc2, 0x88, 0x44, 0x54, 0x96, 0x57, 0x76, - 0x8d, 0xf2, 0xca, 0x09, 0xbc, 0x11, 0x41, 0x96, 0x37, 0x67, 0x1e, 0x81, 0xaa, 0x60, 0x11, 0x7e, - 0x15, 0xc7, 0x4b, 0xf4, 0x00, 0x8a, 0x37, 0x74, 0xba, 0x7e, 0xd7, 0x10, 0x6f, 0xee, 0x1d, 0x00, - 0x4e, 0xf2, 0x89, 0x75, 0x43, 0x6d, 0x11, 0x7b, 0x05, 0x97, 0x6e, 0xe8, 0xf4, 0x4c, 0x18, 0x8c, - 0x02, 0xe4, 0x44, 0x8b, 0x37, 0xfe, 0x9c, 0x81, 0x9c, 0x68, 0xdd, 0xdf, 0x6e, 0x00, 0xbc, 0x45, - 0x88, 0x62, 0x0a, 0xd7, 0x4f, 0x58, 0x5e, 0x12, 0xd0, 0x7b, 0x50, 0x55, 0x54, 0xe5, 0x3c, 0x27, - 0x9c, 0x57, 0xa4, 0x51, 0xf9, 0x7f, 0x00, 0x45, 0x9b, 0x59, 0xd2, 0x79, 0x7e, 0x9d, 0x98, 0x6d, - 0x66, 0xa1, 0xef, 0x42, 0x9e, 0x7e, 0xe9, 0x84, 0x51, 0x28, 0x26, 0x5d, 0x11, 0xab, 0x95, 0x81, - 0xa1, 0x9c, 0x9a, 0x52, 0xa8, 0x05, 0x28, 0x98, 0x78, 0x91, 0x33, 0xa6, 0x43, 0xeb, 0x9a, 0x5a, - 0x37, 0x3e, 0x73, 0xbc, 0x48, 0x15, 0x5d, 0xdd, 0x8c, 0x55, 0x8d, 0xd9, 0x4a, 0xf6, 0xf0, 0xb6, - 0xc2, 0xcf, 0x4c, 0x46, 0x15, 0xca, 0xa9, 0xa9, 0xb5, 0xff, 0xef, 0x2a, 0x14, 0x31, 0x0d, 0x7d, - 0xe6, 0x85, 0x14, 0x99, 0x73, 0xe2, 0xe4, 0xf6, 0xbc, 0x95, 0xa0, 0xb4, 0x3a, 0x79, 0x0c, 0xa5, - 0x58, 0x6e, 0xd8, 0xaa, 0x31, 0xed, 0x2e, 0x26, 0xc5, 0x1d, 0xc5, 0xc6, 0x33, 0x06, 0xfa, 0x08, - 0x0a, 0x5c, 0x78, 0x38, 0xea, 0x3d, 0x7d, 0x5d, 0xdb, 0x28, 0x72, 0x43, 0x82, 0x70, 0x8c, 0x46, - 0x3f, 0x84, 0x3c, 0x57, 0x20, 0xd4, 0x56, 0x52, 0xe5, 0xde, 0x62, 0xde, 0x40, 0x60, 0xb0, 0xc2, - 0x72, 0x16, 0x17, 0x22, 0x34, 0x56, 0x2c, 0x4b, 0x58, 0x7d, 0x81, 0xc1, 0x0a, 0xcb, 0x83, 0x14, - 0x6a, 0x84, 0xda, 0x4a, 0xb8, 0x2c, 0x09, 0xb2, 0x2b, 0x41, 0x38, 0x46, 0xa3, 0x27, 0xb0, 0x29, - 0x54, 0x05, 0xb5, 0x63, 0x35, 0x22, 0x65, 0xcc, 0x7b, 0x4b, 0xd2, 0x2a, 0xb1, 0x4a, 0x90, 0x54, - 0xc3, 0xf4, 0x12, 0x75, 0xa1, 0x92, 0x52, 0x17, 0xb6, 0xd2, 0x35, 0xfb, 0x4b, 0xd2, 0x95, 0x42, - 0xe2, 0x39, 0xde, 0xff, 0x20, 0x4b, 0x7e, 0x9f, 0x51, 0xb2, 0xc4, 0x80, 0x62, 0x3c, 0xd3, 0xd5, - 0x3d, 0x4d, 0xd6, 0xa8, 0x0b, 0x48, 0x8d, 0x97, 0xd0, 0xba, 0xa6, 0x63, 0xb2, 0xfe, 0x95, 0xad, - 0x48, 0xde, 0xb9, 0xa0, 0xa1, 0xcf, 0xe1, 0x7b, 0xb7, 0xa7, 0x66, 0xda, 0xe1, 0x3a, 0xf3, 0xbc, - 0x3e, 0x3f, 0x3c, 0x95, 0xe3, 0x1f, 0xc0, 0xb6, 0xcd, 0xac, 0xc9, 0x98, 0x7a, 0x91, 0xe8, 0xbb, - 0xc3, 0x49, 0xe0, 0xca, 0xbb, 0x8f, 0x6b, 0x73, 0x1b, 0x17, 0x81, 0x8b, 0xbe, 0x0f, 0x79, 0x46, - 0x26, 0xd1, 0xf5, 0xb1, 0xaa, 0x93, 0x8a, 0x6c, 0xbd, 0x83, 0x06, 0xb7, 0x61, 0xb5, 0x67, 0xfc, - 0x27, 0x0b, 0xa5, 0xa4, 0xaa, 0x51, 0x2b, 0x25, 0x1f, 0x34, 0x31, 0x59, 0x3f, 0x78, 0xc3, 0x45, - 0x58, 0x20, 0x20, 0x7e, 0x91, 0x01, 0x68, 0x31, 0x2f, 0x8c, 0x02, 0xe2, 0x78, 0xfc, 0xba, 0x67, - 0x53, 0x9a, 0xe8, 0xf0, 0x4d, 0xfe, 0x66, 0x4c, 0x53, 0x68, 0x23, 0x41, 0xe6, 0xad, 0x25, 0xa0, - 0x24, 0xc9, 0x1e, 0x56, 0xab, 0xfd, 0xdf, 0x69, 0x90, 0x15, 0x9a, 0xa9, 0x0c, 0x85, 0xde, 0xe9, - 0x67, 0x8d, 0x7e, 0xaf, 0x5d, 0xbb, 0x83, 0x10, 0x6c, 0x76, 0x7b, 0x9d, 0x7e, 0x7b, 0x88, 0x3b, - 0x9f, 0x5e, 0xf4, 0x70, 0xa7, 0x5d, 0xd3, 0xd0, 0x5d, 0xd8, 0xee, 0x0f, 0x5a, 0x8d, 0xa7, 0xbd, - 0xc1, 0xe9, 0xcc, 0x9c, 0x41, 0x3a, 0xd4, 0x53, 0xe6, 0xd6, 0xe0, 0xe4, 0xa4, 0x73, 0xda, 0xee, - 0xb4, 0x6b, 0x1b, 0x33, 0x27, 0x83, 0x33, 0xbe, 0xdb, 0xe8, 0xd7, 0xb2, 0xe8, 0x3b, 0xb0, 0x25, - 0x6d, 0xdd, 0x01, 0x6e, 0xf6, 0xda, 0xed, 0xce, 0x69, 0x2d, 0x87, 0xb6, 0xa1, 0x7a, 0x71, 0x7a, - 0xde, 0x78, 0xda, 0x3b, 0xef, 0xf6, 0x1a, 0xcd, 0x7e, 0xa7, 0x96, 0x37, 0xfe, 0x98, 0xd2, 0x50, - 0x5f, 0x08, 0x35, 0xa7, 0xce, 0x14, 0xa7, 0xf5, 0xe1, 0x9a, 0x69, 0x4d, 0xa5, 0x23, 0x14, 0x2a, - 0x03, 0xa7, 0x9d, 0xf1, 0x5e, 0x9e, 0x54, 0x9a, 0x4f, 0xa2, 0x6b, 0x3d, 0xb3, 0xb7, 0x71, 0x50, - 0xc2, 0x95, 0xd8, 0x78, 0x46, 0xa2, 0x6b, 0x0e, 0xb2, 0xa9, 0x1b, 0x91, 0xe1, 0xc4, 0xe7, 0xbe, - 0x43, 0xa5, 0x04, 0x2a, 0xc2, 0x78, 0x21, 0x6d, 0xc6, 0x33, 0xa8, 0xdd, 0xfe, 0xab, 0x05, 0x82, - 0xe6, 0xc7, 0x69, 0x41, 0x53, 0x3e, 0xbe, 0xbf, 0xfe, 0xcb, 0x4c, 0x8b, 0x9f, 0x87, 0x50, 0x50, - 0xbd, 0x10, 0x7d, 0x08, 0x88, 0x08, 0x89, 0x37, 0xb4, 0x69, 0x68, 0x05, 0x8e, 0x9f, 0x08, 0x90, - 0x12, 0xde, 0x96, 0x3b, 0xed, 0xd9, 0x86, 0x71, 0x02, 0x79, 0xd9, 0x0d, 0xbf, 0x99, 0x21, 0xf2, - 0x39, 0xe4, 0x65, 0x9b, 0x5c, 0x3d, 0xbd, 0x93, 0x49, 0x98, 0x59, 0x73, 0x12, 0x1a, 0x25, 0x28, - 0xa8, 0x46, 0x6a, 0x7c, 0x02, 0xd5, 0xb9, 0x9e, 0x88, 0xee, 0x83, 0x94, 0x2e, 0x49, 0xb0, 0x4a, - 0x02, 0xab, 0x2f, 0x80, 0x73, 0xbe, 0x17, 0xab, 0x9b, 0x4d, 0xa8, 0xa4, 0xdb, 0xe0, 0xfe, 0x2f, - 0xb3, 0x90, 0xeb, 0x7c, 0x19, 0x05, 0xc4, 0xf8, 0xab, 0x06, 0xef, 0xc6, 0x79, 0xee, 0xf0, 0x31, - 0xeb, 0x78, 0xa3, 0xb3, 0x80, 0x3d, 0x93, 0x82, 0x39, 0xfe, 0x4c, 0xef, 0x43, 0x8d, 0xaa, 0xcd, - 0x61, 0xfa, 0x7c, 0xe5, 0xe3, 0x77, 0x97, 0x7f, 0x9b, 0xc4, 0x37, 0x7a, 0x2b, 0xa6, 0xc6, 0x95, - 0x7c, 0x06, 0x35, 0x3f, 0x60, 0x3e, 0x0b, 0xa9, 0x9d, 0x78, 0x93, 0x85, 0xb0, 0xe6, 0x47, 0xc6, - 0x56, 0x4c, 0x57, 0x06, 0xe3, 0x2f, 0x99, 0xd9, 0x29, 0x94, 0xad, 0x31, 0x22, 0x8e, 0x17, 0x46, - 0xa9, 0x62, 0x44, 0x9f, 0xcc, 0xbf, 0x9c, 0xb5, 0x82, 0x4f, 0xde, 0xdf, 0x68, 0xfe, 0xfa, 0x65, - 0xc4, 0xf5, 0xeb, 0xcc, 0xc5, 0x2b, 0x32, 0x6a, 0xbe, 0x31, 0x8e, 0xd5, 0x77, 0xf1, 0xdb, 0xbc, - 0x41, 0xc7, 0x3f, 0x81, 0x52, 0x52, 0x30, 0xe8, 0x47, 0x50, 0x9e, 0x65, 0x82, 0xa2, 0xfa, 0xa2, - 0x77, 0x61, 0xdc, 0x5d, 0xf8, 0x47, 0x07, 0xda, 0x91, 0xd6, 0x6c, 0xbe, 0xfc, 0xe7, 0xce, 0x9d, - 0x97, 0xaf, 0x77, 0xb4, 0xbf, 0xbf, 0xde, 0xd1, 0xfe, 0xf4, 0xaf, 0x1d, 0xed, 0x8b, 0xa3, 0xb5, - 0xbe, 0x88, 0x53, 0x0e, 0x2f, 0xf3, 0xc2, 0xfc, 0xe0, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x60, - 0xa9, 0x4e, 0xd7, 0xce, 0x12, 0x00, 0x00, + // 1631 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4f, 0x6f, 0xdb, 0xc8, + 0x15, 0x0f, 0x65, 0xfd, 0x7d, 0x92, 0x6c, 0x79, 0xaa, 0x74, 0x59, 0xae, 0xd7, 0xf6, 0x7a, 0x77, + 0xb1, 0x46, 0x8a, 0x95, 0x03, 0xa7, 0xc0, 0x26, 0x1b, 0xa4, 0xa8, 0xfe, 0x02, 0x4a, 0x65, 0xcb, + 0x19, 0xc7, 0x09, 0x90, 0x8b, 0x30, 0x21, 0xc7, 0x32, 0x63, 0x8a, 0xc3, 0x92, 0x54, 0x12, 0xf5, + 0xd2, 0x1e, 0x5a, 0x14, 0xe8, 0xa9, 0x05, 0x8a, 0x5e, 0x7a, 0x29, 0xfa, 0x1d, 0xfa, 0x09, 0x8a, + 0x02, 0xb9, 0xb5, 0x9f, 0x20, 0x45, 0xd3, 0x4f, 0xd0, 0x6b, 0x4e, 0xc5, 0xfc, 0x21, 0x45, 0x39, + 0x92, 0xa2, 0x43, 0x9a, 0x8b, 0xc0, 0x79, 0xf3, 0xfb, 0x3d, 0xbd, 0x79, 0x7c, 0xf3, 0xde, 0x8f, + 0x70, 0x63, 0xc8, 0x0e, 0x3c, 0x9f, 0x85, 0xcc, 0x64, 0x4e, 0x70, 0x30, 0x22, 0x21, 0xf5, 0x6d, + 0xe2, 0xd8, 0x3f, 0xa7, 0xc9, 0xe7, 0x9a, 0x40, 0xa0, 0x62, 0xc2, 0x64, 0xec, 0x9a, 0xcc, 0x0d, + 0xc6, 0x23, 0xea, 0xc7, 0xf4, 0xf8, 0x41, 0xc2, 0x8d, 0xad, 0x19, 0xd7, 0xe7, 0x0e, 0x7b, 0x21, + 0x7e, 0xd4, 0x6e, 0x75, 0xc8, 0x86, 0x4c, 0x3c, 0x1e, 0xf0, 0x27, 0x69, 0xdd, 0xfb, 0xd5, 0x26, + 0xe4, 0x30, 0xfd, 0xd9, 0x98, 0x06, 0x21, 0xfa, 0x06, 0xd2, 0x81, 0x47, 0x4d, 0x5d, 0xdb, 0xd5, + 0xf6, 0x8b, 0x87, 0x3f, 0xa8, 0x25, 0x03, 0x52, 0x98, 0xda, 0xa9, 0x47, 0x4d, 0x2c, 0x60, 0xe8, + 0x0e, 0xe4, 0x9f, 0x13, 0xc7, 0xb6, 0x48, 0x48, 0xf5, 0x94, 0xa0, 0x7c, 0x36, 0x97, 0xf2, 0x48, + 0x81, 0x70, 0x0c, 0x47, 0x37, 0x21, 0x43, 0x3c, 0xcf, 0x99, 0xe8, 0x6b, 0x82, 0x67, 0xcc, 0xe5, + 0xd5, 0x39, 0x02, 0x4b, 0x20, 0x8f, 0x8d, 0x79, 0xd4, 0xd5, 0xd3, 0x4b, 0x62, 0xeb, 0x7b, 0xd4, + 0xc5, 0x02, 0xc6, 0xe1, 0x0e, 0x23, 0x96, 0x9e, 0x59, 0x02, 0xef, 0x31, 0x62, 0x61, 0x01, 0xe3, + 0xf1, 0x9c, 0x3b, 0xe3, 0xe0, 0x42, 0xcf, 0x2e, 0x89, 0xa7, 0xc3, 0x11, 0x58, 0x02, 0x39, 0x23, + 0x08, 0x99, 0x4f, 0xf5, 0xdc, 0x12, 0xc6, 0x29, 0x47, 0x60, 0x09, 0x44, 0x4d, 0x28, 0x05, 0x21, + 0xf1, 0xc3, 0x81, 0xc9, 0x46, 0x23, 0x3b, 0xd4, 0xf3, 0x82, 0xb8, 0xbb, 0x80, 0x48, 0xfc, 0xb0, + 0x29, 0x70, 0xb8, 0x18, 0x4c, 0x17, 0xa8, 0x01, 0x45, 0x62, 0x5e, 0xba, 0xec, 0x85, 0x43, 0xad, + 0x21, 0xd5, 0x0b, 0x4b, 0x7c, 0xd4, 0xa7, 0x38, 0x9c, 0x24, 0xa1, 0x4f, 0x21, 0x6f, 0xbb, 0x21, + 0xf5, 0x5d, 0xe2, 0xe8, 0xd6, 0xae, 0xb6, 0x5f, 0xc2, 0x85, 0x2f, 0x23, 0x83, 0xf1, 0x7b, 0x0d, + 0xd2, 0xfc, 0x1d, 0xa3, 0x63, 0x58, 0x37, 0x99, 0xeb, 0x52, 0x33, 0x64, 0xfe, 0x20, 0x9c, 0x78, + 0x54, 0x94, 0xc5, 0xfa, 0xe1, 0xd7, 0x35, 0x51, 0x53, 0x47, 0xf1, 0x3f, 0x92, 0xd0, 0x66, 0x2e, + 0xa7, 0xd4, 0x9a, 0x11, 0xfe, 0xe1, 0xc4, 0xa3, 0xb8, 0x6c, 0x26, 0x97, 0xe8, 0x0e, 0x14, 0x4d, + 0xe6, 0x9e, 0xdb, 0xc3, 0xc1, 0xb3, 0x80, 0xb9, 0xa2, 0x60, 0x0a, 0x8d, 0xad, 0xb7, 0xaf, 0x77, + 0x74, 0xea, 0x9a, 0xcc, 0xb2, 0xdd, 0xe1, 0x01, 0xdf, 0xa8, 0x61, 0xf2, 0xe2, 0x88, 0x06, 0x01, + 0x19, 0x52, 0x9c, 0x95, 0x04, 0xe3, 0x77, 0x19, 0xc8, 0x47, 0x45, 0x84, 0x1e, 0x40, 0xda, 0x25, + 0x23, 0x19, 0x4d, 0xa1, 0x71, 0xef, 0xed, 0xeb, 0x9d, 0x3b, 0x43, 0x3b, 0xbc, 0x18, 0x3f, 0xad, + 0x99, 0x6c, 0x74, 0x40, 0x83, 0x70, 0x4c, 0xfc, 0x89, 0x2c, 0xfe, 0x77, 0xae, 0xc3, 0xd5, 0xa8, + 0xb1, 0x70, 0x35, 0xe7, 0xa8, 0xa9, 0x0f, 0x79, 0xd4, 0xb5, 0xd5, 0x8f, 0x8a, 0xea, 0x90, 0x7f, + 0x6a, 0xbb, 0x1c, 0x12, 0xe8, 0xe9, 0xdd, 0xb5, 0xfd, 0xe2, 0xe1, 0x57, 0x4b, 0xef, 0x54, 0xad, + 0x21, 0xd1, 0x38, 0xa6, 0x19, 0x6f, 0x52, 0x90, 0x53, 0x56, 0x74, 0x1f, 0xaa, 0x3e, 0x0d, 0xd8, + 0xd8, 0x37, 0xe9, 0x20, 0x19, 0x92, 0xb6, 0x42, 0x48, 0xeb, 0x11, 0xb3, 0x29, 0x43, 0xfb, 0x0e, + 0xc0, 0x64, 0x8e, 0x43, 0x4d, 0x9e, 0x04, 0x75, 0xe1, 0xab, 0x32, 0x43, 0xcd, 0xd8, 0xce, 0x93, + 0xd3, 0x48, 0xbf, 0x7a, 0xbd, 0x73, 0x0d, 0x27, 0xd0, 0xe8, 0x37, 0x1a, 0x5c, 0x3f, 0xb7, 0xa9, + 0x63, 0x25, 0xa3, 0x18, 0x8c, 0x88, 0xa7, 0xaf, 0x89, 0x43, 0xde, 0x5b, 0xe9, 0x90, 0xb5, 0x0e, + 0x77, 0x21, 0xc3, 0xb9, 0x1f, 0x30, 0xf7, 0x88, 0x78, 0x6d, 0x37, 0xf4, 0x27, 0x8d, 0xad, 0xdf, + 0xfe, 0x6b, 0xc9, 0x41, 0x8a, 0xe7, 0x53, 0x9a, 0xd1, 0x86, 0x4f, 0x16, 0x78, 0x41, 0x15, 0x58, + 0xbb, 0xa4, 0x13, 0x99, 0x1b, 0xcc, 0x1f, 0x51, 0x15, 0x32, 0xcf, 0x89, 0x33, 0x96, 0xf5, 0x50, + 0xc0, 0x72, 0xf1, 0x5d, 0xea, 0xb6, 0x66, 0xfc, 0x02, 0x32, 0xa2, 0x3d, 0xa1, 0x26, 0x6c, 0x8c, + 0x66, 0xeb, 0x23, 0x6e, 0x9f, 0x8b, 0x8a, 0x07, 0x5f, 0x65, 0x20, 0x1d, 0x72, 0xcf, 0xa9, 0x1f, + 0x44, 0x79, 0x2d, 0xe0, 0x68, 0x89, 0x3e, 0x81, 0x9c, 0xe5, 0x4f, 0x06, 0xfe, 0x58, 0x96, 0x51, + 0x1e, 0x67, 0x2d, 0x7f, 0x82, 0xc7, 0xae, 0xf1, 0x77, 0x0d, 0xd2, 0xbc, 0xdf, 0xfd, 0xbf, 0x03, + 0xf8, 0x0a, 0x32, 0x3e, 0x71, 0x87, 0x54, 0x75, 0xea, 0x0d, 0xe9, 0x14, 0x73, 0x93, 0x70, 0x25, + 0x77, 0xd1, 0xb7, 0x00, 0x41, 0x48, 0x42, 0x2a, 0xcb, 0x2b, 0xbd, 0x42, 0x79, 0x65, 0x04, 0xde, + 0x08, 0x21, 0xcd, 0xfb, 0x30, 0x8f, 0x40, 0x55, 0xb0, 0x08, 0xbf, 0x8c, 0xa3, 0x25, 0xba, 0x05, + 0xf9, 0x4b, 0x3a, 0x59, 0xbd, 0x6b, 0x88, 0x37, 0xf7, 0x19, 0x00, 0x27, 0x79, 0xc4, 0xbc, 0xa4, + 0x96, 0x88, 0xbd, 0x84, 0x0b, 0x97, 0x74, 0x72, 0x22, 0x0c, 0x46, 0x0e, 0x32, 0xa2, 0x9b, 0x1b, + 0x7f, 0x49, 0x41, 0x46, 0x74, 0xe9, 0x8f, 0x1b, 0x00, 0x6f, 0x11, 0xa2, 0x98, 0x82, 0xd5, 0x13, + 0x96, 0x95, 0x04, 0xf4, 0x05, 0x94, 0x15, 0x55, 0x39, 0xcf, 0x08, 0xe7, 0x25, 0x69, 0x54, 0xfe, + 0x6f, 0x41, 0xde, 0x62, 0xa6, 0x74, 0x9e, 0x5d, 0x25, 0x66, 0x8b, 0x99, 0xe8, 0xfb, 0x90, 0xa5, + 0x2f, 0xed, 0x20, 0x0c, 0xc4, 0x50, 0xcb, 0x63, 0xb5, 0x32, 0x30, 0x14, 0x13, 0x03, 0x09, 0x35, + 0x01, 0xf9, 0x63, 0x37, 0xb4, 0x47, 0x74, 0x60, 0x5e, 0x50, 0xf3, 0xd2, 0x63, 0xb6, 0x1b, 0xaa, + 0xa2, 0xab, 0xd6, 0x22, 0x95, 0x52, 0x6b, 0xc6, 0x7b, 0x78, 0x53, 0xe1, 0xa7, 0x26, 0xa3, 0x0c, + 0xc5, 0xc4, 0x80, 0xda, 0xfb, 0x47, 0x19, 0xf2, 0x98, 0x06, 0x1e, 0x73, 0x03, 0x8a, 0x6a, 0x33, + 0x3a, 0xe4, 0xea, 0x68, 0x95, 0xa0, 0xa4, 0x10, 0xb9, 0x07, 0x85, 0x48, 0x59, 0x58, 0xaa, 0x31, + 0xed, 0xcc, 0x27, 0x45, 0x1d, 0xc5, 0xc2, 0x53, 0x06, 0xfa, 0x16, 0x72, 0x5c, 0x63, 0xd8, 0xea, + 0x3d, 0xbd, 0x2b, 0x63, 0x14, 0xb9, 0x2e, 0x41, 0x38, 0x42, 0xa3, 0x1f, 0x41, 0x96, 0x8b, 0x0d, + 0x6a, 0x29, 0x55, 0xb2, 0x35, 0x9f, 0xd7, 0x17, 0x18, 0xac, 0xb0, 0x9c, 0xc5, 0x35, 0x07, 0x8d, + 0xc4, 0xc9, 0x02, 0x56, 0x4f, 0x60, 0xb0, 0xc2, 0xf2, 0x20, 0x85, 0xf0, 0xa0, 0x96, 0xd2, 0x28, + 0x0b, 0x82, 0xec, 0x48, 0x10, 0x8e, 0xd0, 0xe8, 0x3e, 0xac, 0x0b, 0x01, 0x41, 0xad, 0x48, 0x78, + 0x48, 0xc5, 0xf2, 0xc5, 0x82, 0xb4, 0x4a, 0xac, 0xd2, 0x1e, 0xe5, 0x20, 0xb9, 0x44, 0x1d, 0x28, + 0x25, 0x84, 0x84, 0xa5, 0x24, 0xcc, 0xde, 0x82, 0x74, 0x25, 0x90, 0x78, 0x86, 0xb7, 0x5c, 0x81, + 0xfc, 0x31, 0xa5, 0x14, 0x88, 0x01, 0xf9, 0x68, 0x7c, 0xab, 0x2b, 0x19, 0xaf, 0x51, 0x07, 0x90, + 0x9a, 0x24, 0x81, 0x79, 0x41, 0x47, 0x64, 0xf5, 0xdb, 0x59, 0x92, 0xbc, 0x53, 0x41, 0x43, 0x8f, + 0xe1, 0xd3, 0xab, 0x03, 0x32, 0xe9, 0x70, 0x95, 0xd1, 0x5d, 0x9d, 0x9d, 0x93, 0xca, 0xf1, 0x0f, + 0x61, 0xd3, 0x62, 0xe6, 0x78, 0x44, 0xdd, 0x50, 0xb4, 0xd8, 0xc1, 0xd8, 0x77, 0xe4, 0x35, 0xc7, + 0x95, 0x99, 0x8d, 0x33, 0xdf, 0x41, 0x5f, 0x42, 0x96, 0x91, 0x71, 0x78, 0x71, 0xa8, 0x4a, 0xa2, + 0x24, 0xbb, 0x6c, 0xbf, 0xce, 0x6d, 0x58, 0xed, 0x19, 0xff, 0x4d, 0x43, 0x21, 0x2e, 0x60, 0xd4, + 0x4c, 0x28, 0x05, 0x4d, 0x0c, 0xd1, 0xaf, 0xdf, 0x53, 0xf3, 0x73, 0xb4, 0xc2, 0x2f, 0x53, 0x00, + 0x4d, 0xe6, 0x06, 0xa1, 0x4f, 0x6c, 0x97, 0xdf, 0xec, 0x74, 0x42, 0xfe, 0x1c, 0xbc, 0xcf, 0xdf, + 0x94, 0x59, 0x13, 0x32, 0x48, 0x90, 0x79, 0x17, 0xf1, 0x29, 0x89, 0xb3, 0x87, 0xd5, 0x6a, 0xef, + 0x0f, 0x1a, 0xa4, 0x85, 0x3c, 0x2a, 0x42, 0xae, 0x7b, 0xfc, 0xa8, 0xde, 0xeb, 0xb6, 0x2a, 0xd7, + 0x10, 0x82, 0xf5, 0x4e, 0xb7, 0xdd, 0x6b, 0x0d, 0x70, 0xfb, 0xc1, 0x59, 0x17, 0xb7, 0x5b, 0x15, + 0x0d, 0x5d, 0x87, 0xcd, 0x5e, 0xbf, 0x59, 0x7f, 0xd8, 0xed, 0x1f, 0x4f, 0xcd, 0x29, 0xa4, 0x43, + 0x35, 0x61, 0x6e, 0xf6, 0x8f, 0x8e, 0xda, 0xc7, 0xad, 0x76, 0xab, 0xb2, 0x36, 0x75, 0xd2, 0x3f, + 0xe1, 0xbb, 0xf5, 0x5e, 0x25, 0x8d, 0xbe, 0x07, 0x1b, 0xd2, 0xd6, 0xe9, 0xe3, 0x46, 0xb7, 0xd5, + 0x6a, 0x1f, 0x57, 0x32, 0x68, 0x13, 0xca, 0x67, 0xc7, 0xa7, 0xf5, 0x87, 0xdd, 0xd3, 0x4e, 0xb7, + 0xde, 0xe8, 0xb5, 0x2b, 0x59, 0xe3, 0x4f, 0x09, 0xb9, 0xf4, 0x44, 0x08, 0x37, 0x75, 0xa6, 0x28, + 0xad, 0xb7, 0x57, 0x4c, 0x6b, 0x22, 0x1d, 0x81, 0x10, 0x14, 0x38, 0xe9, 0x8c, 0xb7, 0xed, 0xb8, + 0xd2, 0x3c, 0x12, 0x5e, 0xe8, 0xa9, 0xdd, 0xb5, 0xfd, 0x02, 0x2e, 0x45, 0xc6, 0x13, 0x12, 0x5e, + 0x70, 0x90, 0x45, 0x9d, 0x90, 0x0c, 0xc6, 0x1e, 0xf7, 0x1d, 0xa8, 0xa1, 0x5f, 0x12, 0xc6, 0x33, + 0x69, 0x33, 0x9e, 0x41, 0xe5, 0xea, 0x5f, 0xcd, 0xd1, 0x2e, 0x3f, 0x49, 0x6a, 0x97, 0xe2, 0xe1, + 0x8d, 0xd5, 0x5f, 0x66, 0x52, 0xe7, 0xdc, 0x86, 0x9c, 0x6a, 0x7b, 0xe8, 0x1b, 0x40, 0x44, 0xa8, + 0xb9, 0x81, 0x45, 0x03, 0xd3, 0xb7, 0xbd, 0x58, 0x6b, 0x14, 0xf0, 0xa6, 0xdc, 0x69, 0x4d, 0x37, + 0x8c, 0x23, 0xc8, 0xca, 0xc6, 0xf7, 0x61, 0xe6, 0xc5, 0x63, 0xc8, 0xca, 0x8e, 0xb8, 0x7c, 0x50, + 0xc7, 0x43, 0x2f, 0xb5, 0xe2, 0xd0, 0x33, 0x0a, 0x90, 0x53, 0x3d, 0xd3, 0xb8, 0x0b, 0xe5, 0x99, + 0xf6, 0x87, 0x6e, 0x80, 0x54, 0x29, 0x71, 0xb0, 0x4a, 0xed, 0x2a, 0xb1, 0x7f, 0xca, 0xf7, 0x22, + 0x21, 0xb3, 0x0e, 0xa5, 0x64, 0xc7, 0xdb, 0xfb, 0x75, 0x1a, 0x32, 0xed, 0x97, 0xa1, 0x4f, 0x8c, + 0xbf, 0x69, 0xf0, 0x79, 0x94, 0xe7, 0x36, 0x9f, 0xa8, 0xb6, 0x3b, 0x3c, 0xf1, 0xd9, 0x33, 0xa9, + 0x8d, 0xa3, 0x8f, 0xef, 0x1e, 0x54, 0xa8, 0xda, 0x1c, 0x24, 0xcf, 0x57, 0x3c, 0xfc, 0x7c, 0xf1, + 0x67, 0x48, 0x74, 0xa3, 0x37, 0x22, 0x6a, 0x54, 0xc9, 0x27, 0x50, 0xf1, 0x7c, 0xe6, 0xb1, 0x80, + 0x5a, 0xb1, 0x37, 0x59, 0x08, 0x2b, 0x7e, 0x4f, 0x6c, 0x44, 0x74, 0x65, 0x30, 0xfe, 0x9a, 0x9a, + 0x9e, 0x42, 0xd9, 0xea, 0x43, 0x62, 0xbb, 0x41, 0x98, 0x28, 0x46, 0x74, 0x77, 0xf6, 0xe5, 0xac, + 0x14, 0x7c, 0xfc, 0xfe, 0x86, 0xb3, 0xd7, 0x2f, 0x25, 0xae, 0x5f, 0x7b, 0x26, 0x5e, 0x91, 0xd1, + 0xda, 0x7b, 0xe3, 0x58, 0x7e, 0x17, 0x3f, 0xe6, 0x0d, 0x3a, 0xfc, 0x29, 0x14, 0xe2, 0x82, 0x41, + 0x3f, 0x86, 0xe2, 0x34, 0x13, 0x14, 0x55, 0xe7, 0xbd, 0x0b, 0xe3, 0xfa, 0xdc, 0x3f, 0xda, 0xd7, + 0x6e, 0x6a, 0x8d, 0xc6, 0xab, 0x7f, 0x6f, 0x5f, 0x7b, 0xf5, 0x66, 0x5b, 0xfb, 0xe7, 0x9b, 0x6d, + 0xed, 0xcf, 0xff, 0xd9, 0xd6, 0x9e, 0xdc, 0x5c, 0xe9, 0xe3, 0x37, 0xe1, 0xf0, 0x69, 0x56, 0x98, + 0x6f, 0xfd, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xf5, 0xf6, 0xf5, 0x84, 0x89, 0x12, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1556,15 +1553,10 @@ func (m *Request) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if m.Internal != nil { - { - size, err := m.Internal.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintMaterialize(dAtA, i, uint64(size)) - } + if len(m.Internal) > 0 { + i -= len(m.Internal) + copy(dAtA[i:], m.Internal) + i = encodeVarintMaterialize(dAtA, i, uint64(len(m.Internal))) i-- dAtA[i] = 0x6 i-- @@ -2204,15 +2196,10 @@ func (m *Response) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if m.Internal != nil { - { - size, err := m.Internal.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintMaterialize(dAtA, i, uint64(size)) - } + if len(m.Internal) > 0 { + i -= len(m.Internal) + copy(dAtA[i:], m.Internal) + i = encodeVarintMaterialize(dAtA, i, uint64(len(m.Internal))) i-- dAtA[i] = 0x6 i-- @@ -2935,8 +2922,8 @@ func (m *Request) ProtoSize() (n int) { l = m.Acknowledge.ProtoSize() n += 1 + l + sovMaterialize(uint64(l)) } - if m.Internal != nil { - l = m.Internal.ProtoSize() + l = len(m.Internal) + if l > 0 { n += 2 + l + sovMaterialize(uint64(l)) } if m.XXX_unrecognized != nil { @@ -3209,8 +3196,8 @@ func (m *Response) ProtoSize() (n int) { l = m.Acknowledged.ProtoSize() n += 1 + l + sovMaterialize(uint64(l)) } - if m.Internal != nil { - l = m.Internal.ProtoSize() + l = len(m.Internal) + if l > 0 { n += 2 + l + sovMaterialize(uint64(l)) } if m.XXX_unrecognized != nil { @@ -3836,7 +3823,7 @@ func (m *Request) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Internal", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowMaterialize @@ -3846,26 +3833,24 @@ func (m *Request) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthMaterialize } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthMaterialize } if postIndex > l { return io.ErrUnexpectedEOF } + m.Internal = append(m.Internal[:0], dAtA[iNdEx:postIndex]...) if m.Internal == nil { - m.Internal = &types.Any{} - } - if err := m.Internal.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.Internal = []byte{} } iNdEx = postIndex default: @@ -5629,7 +5614,7 @@ func (m *Response) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Internal", wireType) } - var msglen int + var byteLen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowMaterialize @@ -5639,26 +5624,24 @@ func (m *Response) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + byteLen |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + if byteLen < 0 { return ErrInvalidLengthMaterialize } - postIndex := iNdEx + msglen + postIndex := iNdEx + byteLen if postIndex < 0 { return ErrInvalidLengthMaterialize } if postIndex > l { return io.ErrUnexpectedEOF } + m.Internal = append(m.Internal[:0], dAtA[iNdEx:postIndex]...) if m.Internal == nil { - m.Internal = &types.Any{} - } - if err := m.Internal.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err + m.Internal = []byte{} } iNdEx = postIndex default: diff --git a/go/protocols/materialize/materialize.proto b/go/protocols/materialize/materialize.proto index 43c090d1de..311e7eafb4 100644 --- a/go/protocols/materialize/materialize.proto +++ b/go/protocols/materialize/materialize.proto @@ -6,7 +6,6 @@ option go_package = "github.com/estuary/flow/go/protocols/materialize"; import "consumer/protocol/protocol.proto"; import "go/protocols/flow/flow.proto"; import "gogoproto/gogo.proto"; -import "google/protobuf/any.proto"; option (gogoproto.marshaler_all) = true; option (gogoproto.protosizer_all) = true; @@ -188,7 +187,7 @@ message Request { Acknowledge acknowledge = 9; // Reserved for internal use. - google.protobuf.Any internal = 100; + bytes internal = 100 [ json_name = "$internal" ]; } message Response { @@ -339,7 +338,7 @@ message Response { Acknowledged acknowledged = 8; // Reserved for internal use. - google.protobuf.Any internal = 100; + bytes internal = 100 [ json_name = "$internal" ]; } // Extra messages used by connectors diff --git a/go/protocols/runtime/any_support.go b/go/protocols/runtime/internal_support.go similarity index 65% rename from go/protocols/runtime/any_support.go rename to go/protocols/runtime/internal_support.go index 7550f673a2..ee00930d2e 100644 --- a/go/protocols/runtime/any_support.go +++ b/go/protocols/runtime/internal_support.go @@ -2,32 +2,31 @@ package runtime import ( proto "github.com/gogo/protobuf/proto" - "github.com/gogo/protobuf/types" ) -func ToAny[ +func ToInternal[ Message interface { proto.Message Marshal() ([]byte, error) }, -](m Message) *types.Any { +](m Message) []byte { var b, err = m.Marshal() if err != nil { panic(err) } - return &types.Any{Value: b} + return b } -func FromAny[ +func FromInternal[ Message any, MessagePtr interface { *Message proto.Message Unmarshal([]byte) error }, -](any *types.Any) *Message { +](b []byte) *Message { var msg = new(Message) - var err = MessagePtr(msg).Unmarshal(any.Value) + var err = MessagePtr(msg).Unmarshal(b) if err != nil { panic(err) } diff --git a/go/runtime/derive.go b/go/runtime/derive.go index 65708e6c3b..461240bc0a 100644 --- a/go/runtime/derive.go +++ b/go/runtime/derive.go @@ -156,13 +156,13 @@ func (d *Derive) RestoreCheckpoint(shard consumer.Shard) (cp pf.Checkpoint, err Version: d.labels.Build, Range: &d.labels.Range, }, - Internal: pr.ToAny(requestExt), + Internal: pr.ToInternal(requestExt), }) opened, err := doRecv(d.client) if err != nil { return pf.Checkpoint{}, err } - var openedExt = pr.FromAny[pr.DeriveResponseExt](opened.Internal) + var openedExt = pr.FromInternal[pr.DeriveResponseExt](opened.Internal) removeOldOpsJournalAckIntents(openedExt.Opened.RuntimeCheckpoint.AckIntents) @@ -219,7 +219,7 @@ func (d *Derive) FinalizeTxn(shard consumer.Shard, pub *message.Publisher) error if err != nil { return err } - var responseExt = pr.FromAny[pr.DeriveResponseExt](response.Internal) + var responseExt = pr.FromInternal[pr.DeriveResponseExt](response.Internal) if response.Published != nil {