From cdc4f19eb98299751c45e2cc74c92482006060fd Mon Sep 17 00:00:00 2001 From: Johnny Graettinger Date: Tue, 18 Feb 2025 15:13:09 -0600 Subject: [PATCH 1/3] Revert "flow.proto: Add Projection.write_inference (but don't populate it yet)" This reverts commit f37f0a3734697b764114b622ce4752d66b7cce30. We've switched to a design which doesn't require `write_inference`, and are removing it. It has never been populated or used. --- crates/proto-flow/src/flow.rs | 6 - crates/proto-flow/src/flow.serde.rs | 18 - crates/proto-flow/tests/regression.rs | 1 - crates/validation/src/collection.rs | 3 - ...lection_schema_contains_flow_document.snap | 4 - ...n_is_skipped_when_shards_are_disabled.snap | 15 - ..._tests__disabled_bindings_are_ignored.snap | 24 - .../scenario_tests__golden_all_visits.snap | 149 ----- ...zation_constraints_on_excluded_fields.snap | 12 - ...tion_not_created_for_empty_properties.snap | 5 - .../snapshots/transition_tests__inserts.snap | 29 - ..._update_collection_becomes_derivation.snap | 5 - .../snapshots/transition_tests__updates.snap | 41 -- go/protocols/flow/flow.pb.go | 556 ++++++++---------- go/protocols/flow/flow.proto | 5 - 15 files changed, 249 insertions(+), 624 deletions(-) diff --git a/crates/proto-flow/src/flow.rs b/crates/proto-flow/src/flow.rs index bd366410d7..3a243fbc9b 100644 --- a/crates/proto-flow/src/flow.rs +++ b/crates/proto-flow/src/flow.rs @@ -56,12 +56,6 @@ pub struct Projection { /// Inference of this projection. #[prost(message, optional, tag = "6")] pub inference: ::core::option::Option, - /// Inference of this projection from the collection's write schema. - /// This is set only when: - /// 1) The collection has separate read and write schemas, and - /// 2) The write schema defines constrains over this projection. - #[prost(message, optional, tag = "7")] - pub write_inference: ::core::option::Option, } /// Inference details type information which is statically known /// about a given document location. diff --git a/crates/proto-flow/src/flow.serde.rs b/crates/proto-flow/src/flow.serde.rs index eb7747e5c1..83fa2b5f78 100644 --- a/crates/proto-flow/src/flow.serde.rs +++ b/crates/proto-flow/src/flow.serde.rs @@ -4738,9 +4738,6 @@ impl serde::Serialize for Projection { if self.inference.is_some() { len += 1; } - if self.write_inference.is_some() { - len += 1; - } let mut struct_ser = serializer.serialize_struct("flow.Projection", len)?; if !self.ptr.is_empty() { struct_ser.serialize_field("ptr", &self.ptr)?; @@ -4760,9 +4757,6 @@ impl serde::Serialize for Projection { if let Some(v) = self.inference.as_ref() { struct_ser.serialize_field("inference", v)?; } - if let Some(v) = self.write_inference.as_ref() { - struct_ser.serialize_field("writeInference", v)?; - } struct_ser.end() } } @@ -4781,8 +4775,6 @@ impl<'de> serde::Deserialize<'de> for Projection { "is_primary_key", "isPrimaryKey", "inference", - "write_inference", - "writeInference", ]; #[allow(clippy::enum_variant_names)] @@ -4793,7 +4785,6 @@ impl<'de> serde::Deserialize<'de> for Projection { IsPartitionKey, IsPrimaryKey, Inference, - WriteInference, } impl<'de> serde::Deserialize<'de> for GeneratedField { fn deserialize(deserializer: D) -> std::result::Result @@ -4821,7 +4812,6 @@ impl<'de> serde::Deserialize<'de> for Projection { "isPartitionKey" | "is_partition_key" => Ok(GeneratedField::IsPartitionKey), "isPrimaryKey" | "is_primary_key" => Ok(GeneratedField::IsPrimaryKey), "inference" => Ok(GeneratedField::Inference), - "writeInference" | "write_inference" => Ok(GeneratedField::WriteInference), _ => Err(serde::de::Error::unknown_field(value, FIELDS)), } } @@ -4847,7 +4837,6 @@ impl<'de> serde::Deserialize<'de> for Projection { let mut is_partition_key__ = None; let mut is_primary_key__ = None; let mut inference__ = None; - let mut write_inference__ = None; while let Some(k) = map_.next_key()? { match k { GeneratedField::Ptr => { @@ -4886,12 +4875,6 @@ impl<'de> serde::Deserialize<'de> for Projection { } inference__ = map_.next_value()?; } - GeneratedField::WriteInference => { - if write_inference__.is_some() { - return Err(serde::de::Error::duplicate_field("writeInference")); - } - write_inference__ = map_.next_value()?; - } } } Ok(Projection { @@ -4901,7 +4884,6 @@ impl<'de> serde::Deserialize<'de> for Projection { is_partition_key: is_partition_key__.unwrap_or_default(), is_primary_key: is_primary_key__.unwrap_or_default(), inference: inference__, - write_inference: write_inference__, }) } } diff --git a/crates/proto-flow/tests/regression.rs b/crates/proto-flow/tests/regression.rs index ad4e356e17..2d9409efa4 100644 --- a/crates/proto-flow/tests/regression.rs +++ b/crates/proto-flow/tests/regression.rs @@ -38,7 +38,6 @@ fn ex_projections() -> Vec { item_types: vec!["null".to_string(), "integer".to_string()], }), }), - write_inference: None, }] } diff --git a/crates/validation/src/collection.rs b/crates/validation/src/collection.rs index 60395479dc..2a5c577709 100644 --- a/crates/validation/src/collection.rs +++ b/crates/validation/src/collection.rs @@ -370,7 +370,6 @@ fn walk_collection_projections( is_primary_key: key.iter().any(|k| k == ptr), is_partition_key: partition, inference: Some(assemble::inference(r_shape, r_exists)), - write_inference: None, }); models.insert(field.clone(), projection.clone()); } @@ -422,7 +421,6 @@ fn walk_collection_projections( is_primary_key: true, is_partition_key: false, inference: Some(assemble::inference(r_shape, r_exists)), - write_inference: None, }); } @@ -450,7 +448,6 @@ fn walk_collection_projections( is_primary_key: false, is_partition_key: false, inference: Some(assemble::inference(r_shape, r_exists)), - write_inference: None, }); } diff --git a/crates/validation/tests/snapshots/scenario_tests__collection_schema_contains_flow_document.snap b/crates/validation/tests/snapshots/scenario_tests__collection_schema_contains_flow_document.snap index cea8af10e6..a7279b154f 100644 --- a/crates/validation/tests/snapshots/scenario_tests__collection_schema_contains_flow_document.snap +++ b/crates/validation/tests/snapshots/scenario_tests__collection_schema_contains_flow_document.snap @@ -50,7 +50,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -73,7 +72,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -103,7 +101,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/id", @@ -133,7 +130,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", diff --git a/crates/validation/tests/snapshots/scenario_tests__connector_validation_is_skipped_when_shards_are_disabled.snap b/crates/validation/tests/snapshots/scenario_tests__connector_validation_is_skipped_when_shards_are_disabled.snap index ee23c139fd..9dc812d822 100644 --- a/crates/validation/tests/snapshots/scenario_tests__connector_validation_is_skipped_when_shards_are_disabled.snap +++ b/crates/validation/tests/snapshots/scenario_tests__connector_validation_is_skipped_when_shards_are_disabled.snap @@ -79,7 +79,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -102,7 +101,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -132,7 +130,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/id", @@ -162,7 +159,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/val", @@ -192,7 +188,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -431,7 +426,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -454,7 +448,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -484,7 +477,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/id", @@ -514,7 +506,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/val", @@ -544,7 +535,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -718,7 +708,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -741,7 +730,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -771,7 +759,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/id", @@ -801,7 +788,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/val", @@ -831,7 +817,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", diff --git a/crates/validation/tests/snapshots/scenario_tests__disabled_bindings_are_ignored.snap b/crates/validation/tests/snapshots/scenario_tests__disabled_bindings_are_ignored.snap index 1030085e64..233f2acbce 100644 --- a/crates/validation/tests/snapshots/scenario_tests__disabled_bindings_are_ignored.snap +++ b/crates/validation/tests/snapshots/scenario_tests__disabled_bindings_are_ignored.snap @@ -239,7 +239,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -262,7 +261,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -292,7 +290,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/id", @@ -322,7 +319,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -561,7 +557,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -584,7 +579,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -614,7 +608,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/id", @@ -644,7 +637,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -785,7 +777,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -808,7 +799,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -838,7 +828,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/id", @@ -868,7 +857,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -1136,7 +1124,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -1159,7 +1146,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -1189,7 +1175,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/id", @@ -1219,7 +1204,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -1320,7 +1304,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -1343,7 +1326,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -1373,7 +1355,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/id", @@ -1403,7 +1384,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -1872,7 +1852,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -1895,7 +1874,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -1925,7 +1903,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/id", @@ -1955,7 +1932,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", diff --git a/crates/validation/tests/snapshots/scenario_tests__golden_all_visits.snap b/crates/validation/tests/snapshots/scenario_tests__golden_all_visits.snap index 92bdb10852..589b232fd1 100644 --- a/crates/validation/tests/snapshots/scenario_tests__golden_all_visits.snap +++ b/crates/validation/tests/snapshots/scenario_tests__golden_all_visits.snap @@ -92,7 +92,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/flow_truncated", @@ -115,7 +114,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/bit", @@ -138,7 +136,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -161,7 +158,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -191,7 +187,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/int", @@ -221,7 +216,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/str", @@ -251,7 +245,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -572,7 +565,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/flow_truncated", @@ -595,7 +587,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/bit", @@ -618,7 +609,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -641,7 +631,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -671,7 +660,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/int", @@ -701,7 +689,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/str", @@ -731,7 +718,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -836,7 +822,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/bit", @@ -859,7 +844,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -882,7 +866,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -912,7 +895,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/int", @@ -942,7 +924,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/str", @@ -972,7 +953,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -1250,7 +1230,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/arr/1/aKey", @@ -1280,7 +1259,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/arr", @@ -1312,7 +1290,6 @@ Outcome { ), }, ), - write_inference: None, }, Projection { ptr: "/arr/0/aKey", @@ -1342,7 +1319,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -1365,7 +1341,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -1395,7 +1370,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -1556,7 +1530,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -1579,7 +1552,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -1609,7 +1581,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/someKey", @@ -1639,7 +1610,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -1740,7 +1710,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/arr/1/aKey", @@ -1770,7 +1739,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/arr", @@ -1802,7 +1770,6 @@ Outcome { ), }, ), - write_inference: None, }, Projection { ptr: "/arr/0/aKey", @@ -1832,7 +1799,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -1855,7 +1821,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -1885,7 +1850,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -2017,7 +1981,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/arr/1/aKey", @@ -2047,7 +2010,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/arr", @@ -2079,7 +2041,6 @@ Outcome { ), }, ), - write_inference: None, }, Projection { ptr: "/arr/0/aKey", @@ -2109,7 +2070,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -2132,7 +2092,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -2162,7 +2121,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -2511,7 +2469,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/len", @@ -2541,7 +2498,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -2564,7 +2520,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/partitionString", @@ -2594,7 +2549,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/flow_truncated", @@ -2617,7 +2571,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/arr", @@ -2649,7 +2602,6 @@ Outcome { ), }, ), - write_inference: None, }, Projection { ptr: "/bit", @@ -2672,7 +2624,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -2702,7 +2653,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/int", @@ -2732,7 +2682,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/len", @@ -2762,7 +2711,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/partitionString", @@ -2792,7 +2740,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/str", @@ -2822,7 +2769,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -2932,7 +2878,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/len", @@ -2962,7 +2907,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/str", @@ -2992,7 +2936,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/flow_truncated", @@ -3015,7 +2958,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/arr", @@ -3047,7 +2989,6 @@ Outcome { ), }, ), - write_inference: None, }, Projection { ptr: "/bit", @@ -3070,7 +3011,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -3093,7 +3033,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -3123,7 +3062,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/int", @@ -3153,7 +3091,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/len", @@ -3183,7 +3120,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/partitionString", @@ -3213,7 +3149,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/str", @@ -3243,7 +3178,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -3395,7 +3329,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/len", @@ -3425,7 +3358,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -3448,7 +3380,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/partitionString", @@ -3478,7 +3409,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/flow_truncated", @@ -3501,7 +3431,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/arr", @@ -3533,7 +3462,6 @@ Outcome { ), }, ), - write_inference: None, }, Projection { ptr: "/bit", @@ -3556,7 +3484,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -3586,7 +3513,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/int", @@ -3616,7 +3542,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/len", @@ -3646,7 +3571,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/partitionString", @@ -3676,7 +3600,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/str", @@ -3706,7 +3629,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -4005,7 +3927,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/bit", @@ -4028,7 +3949,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -4051,7 +3971,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -4081,7 +4000,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/int", @@ -4111,7 +4029,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/str", @@ -4141,7 +4058,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -4251,7 +4167,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/flow_truncated", @@ -4274,7 +4189,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/bit", @@ -4297,7 +4211,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -4320,7 +4233,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -4350,7 +4262,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/int", @@ -4380,7 +4291,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/str", @@ -4410,7 +4320,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -4693,7 +4602,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/flow_truncated", @@ -4716,7 +4624,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/bit", @@ -4739,7 +4646,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -4762,7 +4668,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -4792,7 +4697,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/int", @@ -4822,7 +4726,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/str", @@ -4852,7 +4755,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -4966,7 +4868,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/addedProp", @@ -4996,7 +4897,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/bit", @@ -5019,7 +4919,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -5042,7 +4941,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -5072,7 +4970,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/int", @@ -5102,7 +4999,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/str", @@ -5132,7 +5028,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -5264,7 +5159,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/len", @@ -5294,7 +5188,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/str", @@ -5324,7 +5217,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/flow_truncated", @@ -5347,7 +5239,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/arr", @@ -5379,7 +5270,6 @@ Outcome { ), }, ), - write_inference: None, }, Projection { ptr: "/bit", @@ -5402,7 +5292,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -5425,7 +5314,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -5455,7 +5343,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/int", @@ -5485,7 +5372,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/len", @@ -5515,7 +5401,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/partitionString", @@ -5545,7 +5430,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/str", @@ -5575,7 +5459,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -5693,7 +5576,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/bit", @@ -5716,7 +5598,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -5739,7 +5620,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -5769,7 +5649,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/int", @@ -5799,7 +5678,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/str", @@ -5829,7 +5707,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -5994,7 +5871,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/flow_truncated", @@ -6017,7 +5893,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/bit", @@ -6040,7 +5915,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -6063,7 +5937,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -6093,7 +5966,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/int", @@ -6123,7 +5995,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/str", @@ -6153,7 +6024,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -6541,7 +6411,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/flow_truncated", @@ -6564,7 +6433,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/bit", @@ -6587,7 +6455,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -6610,7 +6477,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -6640,7 +6506,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/int", @@ -6670,7 +6535,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/str", @@ -6700,7 +6564,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -6859,7 +6722,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/len", @@ -6889,7 +6751,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -6912,7 +6773,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/partitionString", @@ -6942,7 +6802,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/flow_truncated", @@ -6965,7 +6824,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/arr", @@ -6997,7 +6855,6 @@ Outcome { ), }, ), - write_inference: None, }, Projection { ptr: "/bit", @@ -7020,7 +6877,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -7050,7 +6906,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/int", @@ -7080,7 +6935,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/len", @@ -7110,7 +6964,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/partitionString", @@ -7140,7 +6993,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/str", @@ -7170,7 +7022,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", diff --git a/crates/validation/tests/snapshots/scenario_tests__materialization_constraints_on_excluded_fields.snap b/crates/validation/tests/snapshots/scenario_tests__materialization_constraints_on_excluded_fields.snap index d69d666548..4678cdf4fc 100644 --- a/crates/validation/tests/snapshots/scenario_tests__materialization_constraints_on_excluded_fields.snap +++ b/crates/validation/tests/snapshots/scenario_tests__materialization_constraints_on_excluded_fields.snap @@ -50,7 +50,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -73,7 +72,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -103,7 +101,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/id", @@ -133,7 +130,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/naughty_f", @@ -163,7 +159,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/naughty_u", @@ -193,7 +188,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -361,7 +355,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -384,7 +377,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -414,7 +406,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/id", @@ -444,7 +435,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/naughty_f", @@ -474,7 +464,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/naughty_u", @@ -504,7 +493,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", diff --git a/crates/validation/tests/snapshots/scenario_tests__projection_not_created_for_empty_properties.snap b/crates/validation/tests/snapshots/scenario_tests__projection_not_created_for_empty_properties.snap index b3f0558802..142ff6d864 100644 --- a/crates/validation/tests/snapshots/scenario_tests__projection_not_created_for_empty_properties.snap +++ b/crates/validation/tests/snapshots/scenario_tests__projection_not_created_for_empty_properties.snap @@ -50,7 +50,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/a", @@ -73,7 +72,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -96,7 +94,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -126,7 +123,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/id", @@ -156,7 +152,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", diff --git a/crates/validation/tests/snapshots/transition_tests__inserts.snap b/crates/validation/tests/snapshots/transition_tests__inserts.snap index 38276f06d7..f2f7c2d459 100644 --- a/crates/validation/tests/snapshots/transition_tests__inserts.snap +++ b/crates/validation/tests/snapshots/transition_tests__inserts.snap @@ -78,7 +78,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_one", @@ -108,7 +107,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_two", @@ -138,7 +136,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_x", @@ -159,7 +156,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -182,7 +178,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -212,7 +207,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -451,7 +445,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_one", @@ -481,7 +474,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_two", @@ -511,7 +503,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_x", @@ -532,7 +523,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -555,7 +545,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -585,7 +574,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -724,7 +712,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/d_one", @@ -754,7 +741,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/d_two", @@ -784,7 +770,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -807,7 +792,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -837,7 +821,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -938,7 +921,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_one", @@ -968,7 +950,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_two", @@ -998,7 +979,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_x", @@ -1019,7 +999,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -1042,7 +1021,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -1072,7 +1050,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -1392,7 +1369,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_one", @@ -1422,7 +1398,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_two", @@ -1452,7 +1427,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_x", @@ -1473,7 +1447,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -1496,7 +1469,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -1526,7 +1498,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", diff --git a/crates/validation/tests/snapshots/transition_tests__update_collection_becomes_derivation.snap b/crates/validation/tests/snapshots/transition_tests__update_collection_becomes_derivation.snap index 850b3aaa8f..df44aa06df 100644 --- a/crates/validation/tests/snapshots/transition_tests__update_collection_becomes_derivation.snap +++ b/crates/validation/tests/snapshots/transition_tests__update_collection_becomes_derivation.snap @@ -160,7 +160,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/d_one", @@ -190,7 +189,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/d_two", @@ -220,7 +218,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -243,7 +240,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -273,7 +269,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", diff --git a/crates/validation/tests/snapshots/transition_tests__updates.snap b/crates/validation/tests/snapshots/transition_tests__updates.snap index 65e3831805..027e0282df 100644 --- a/crates/validation/tests/snapshots/transition_tests__updates.snap +++ b/crates/validation/tests/snapshots/transition_tests__updates.snap @@ -85,7 +85,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_two", @@ -115,7 +114,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_x", @@ -136,7 +134,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/flow_truncated", @@ -159,7 +156,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_one", @@ -189,7 +185,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_two", @@ -219,7 +214,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_x", @@ -240,7 +234,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -263,7 +256,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -293,7 +285,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -580,7 +571,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_two", @@ -610,7 +600,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_x", @@ -631,7 +620,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/flow_truncated", @@ -654,7 +642,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_one", @@ -684,7 +671,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_two", @@ -714,7 +700,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_x", @@ -735,7 +720,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -758,7 +742,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -788,7 +771,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -950,7 +932,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/d_one", @@ -980,7 +961,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/d_two", @@ -1010,7 +990,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -1033,7 +1012,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -1063,7 +1041,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -1171,7 +1148,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_two", @@ -1201,7 +1177,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_x", @@ -1222,7 +1197,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/flow_truncated", @@ -1245,7 +1219,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_one", @@ -1275,7 +1248,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_two", @@ -1305,7 +1277,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_x", @@ -1326,7 +1297,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -1349,7 +1319,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -1379,7 +1348,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", @@ -1766,7 +1734,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_two", @@ -1796,7 +1763,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_x", @@ -1817,7 +1783,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/flow_truncated", @@ -1840,7 +1805,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_one", @@ -1870,7 +1834,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_two", @@ -1900,7 +1863,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/f_x", @@ -1921,7 +1883,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "", @@ -1944,7 +1905,6 @@ Outcome { array: None, }, ), - write_inference: None, }, Projection { ptr: "/_meta/uuid", @@ -1974,7 +1934,6 @@ Outcome { array: None, }, ), - write_inference: None, }, ], ack_template_json: "{\"_meta\":{\"ack\":true,\"uuid\":\"DocUUIDPlaceholder-329Bb50aa48EAa9ef\"}}", diff --git a/go/protocols/flow/flow.pb.go b/go/protocols/flow/flow.pb.go index ee3e26dbdb..9e45bc509d 100644 --- a/go/protocols/flow/flow.pb.go +++ b/go/protocols/flow/flow.pb.go @@ -470,15 +470,10 @@ type Projection struct { // Does this location form (part of) the collection key? IsPrimaryKey bool `protobuf:"varint,5,opt,name=is_primary_key,json=isPrimaryKey,proto3" json:"is_primary_key,omitempty"` // Inference of this projection. - Inference Inference `protobuf:"bytes,6,opt,name=inference,proto3" json:"inference"` - // Inference of this projection from the collection's write schema. - // This is set only when: - // 1) The collection has separate read and write schemas, and - // 2) The write schema defines constrains over this projection. - WriteInference *Inference `protobuf:"bytes,7,opt,name=write_inference,json=writeInference,proto3" json:"write_inference,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Inference Inference `protobuf:"bytes,6,opt,name=inference,proto3" json:"inference"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Projection) Reset() { *m = Projection{} } @@ -2336,243 +2331,242 @@ func init() { func init() { proto.RegisterFile("go/protocols/flow/flow.proto", fileDescriptor_d0677502142fec31) } var fileDescriptor_d0677502142fec31 = []byte{ - // 3764 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4d, 0x8c, 0x1b, 0xc9, - 0x75, 0x9e, 0xe6, 0x3f, 0x1f, 0xc9, 0x99, 0x9e, 0x9a, 0x91, 0x44, 0x71, 0x57, 0xc3, 0x11, 0x1d, - 0x63, 0xb5, 0x2b, 0x2f, 0x67, 0x3d, 0x0b, 0x3b, 0x2b, 0x09, 0x8a, 0xc1, 0x21, 0x39, 0x5a, 0x4a, - 0x1c, 0x92, 0x29, 0x72, 0xbc, 0xd6, 0x02, 0x46, 0xa3, 0xd9, 0x5d, 0xe4, 0xb4, 0x86, 0xec, 0x66, - 0xba, 0x8b, 0xa3, 0xa1, 0x2f, 0x09, 0x02, 0x03, 0x01, 0x16, 0x09, 0xe2, 0x4b, 0x60, 0xdf, 0xbc, - 0x31, 0x90, 0x9f, 0x73, 0x6e, 0x49, 0x2e, 0x06, 0x72, 0xd9, 0x53, 0x60, 0x24, 0xb7, 0x20, 0xd0, - 0x22, 0xce, 0xc1, 0x3e, 0x25, 0x77, 0x9d, 0x82, 0xfa, 0xe9, 0x66, 0x73, 0x38, 0x9a, 0x9f, 0xb5, - 0x73, 0xf0, 0x85, 0xe8, 0x7a, 0x7f, 0x55, 0xf5, 0x5e, 0xd5, 0xf7, 0x5e, 0x55, 0x11, 0xde, 0x1e, - 0x3a, 0x3b, 0x13, 0xd7, 0xa1, 0x8e, 0xe1, 0x8c, 0xbc, 0x9d, 0xc1, 0xc8, 0x79, 0xc9, 0x7f, 0xca, - 0x9c, 0x86, 0x62, 0xec, 0xbb, 0xb0, 0xd5, 0x77, 0x9d, 0x63, 0xe2, 0x06, 0x72, 0xc1, 0x87, 0x90, - 0x2a, 0x6c, 0x1b, 0x8e, 0xed, 0x4d, 0xc7, 0x17, 0x48, 0x6c, 0x0e, 0x9d, 0xa1, 0xc3, 0x3f, 0x77, - 0xd8, 0x97, 0xa4, 0x16, 0x87, 0x8e, 0x33, 0x1c, 0x11, 0x21, 0xdc, 0x9f, 0x0e, 0x76, 0xa8, 0x35, - 0x26, 0x1e, 0xd5, 0xc7, 0x13, 0x21, 0x50, 0x7a, 0x0c, 0xf1, 0xee, 0xc8, 0x32, 0x08, 0xda, 0x84, - 0x78, 0x9f, 0x0c, 0x2d, 0x3b, 0xaf, 0x6c, 0x2b, 0xf7, 0x72, 0x58, 0x34, 0x90, 0x0a, 0x51, 0x62, - 0x9b, 0xf9, 0x08, 0xa7, 0xb1, 0xcf, 0x87, 0xd9, 0x5f, 0xfc, 0x75, 0x71, 0xe5, 0x47, 0x3f, 0x2b, - 0xae, 0xfc, 0xe4, 0x67, 0xc5, 0x95, 0x92, 0x0d, 0xe9, 0xc3, 0xc3, 0x46, 0xad, 0xa3, 0xbb, 0xd4, - 0x43, 0x08, 0x62, 0xb6, 0x63, 0x12, 0x6e, 0x21, 0x81, 0xf9, 0x37, 0x7a, 0x04, 0x71, 0x63, 0xe4, - 0x18, 0xc7, 0xdc, 0x44, 0x62, 0xef, 0xeb, 0xaf, 0x5f, 0x15, 0xef, 0x0e, 0x9d, 0xf2, 0x50, 0xff, - 0x01, 0xa1, 0x94, 0x94, 0x4d, 0x72, 0xb2, 0x63, 0x38, 0x2e, 0xd9, 0x19, 0x13, 0xcf, 0xd3, 0x87, - 0xa4, 0x5c, 0x65, 0xc2, 0x58, 0xe8, 0x3c, 0x54, 0x7f, 0xfd, 0x79, 0x51, 0x59, 0xe8, 0xef, 0x2f, - 0x23, 0x00, 0x1d, 0xd7, 0x79, 0x41, 0x0c, 0x6a, 0x39, 0x7c, 0x78, 0x13, 0xea, 0xf2, 0x0e, 0xd3, - 0x98, 0x7d, 0xb2, 0x69, 0x0c, 0x2c, 0x32, 0x12, 0x43, 0x4e, 0x63, 0xd1, 0x40, 0x05, 0x48, 0x91, - 0xd3, 0xc9, 0xc8, 0x32, 0x2c, 0x9a, 0x8f, 0x6e, 0x2b, 0xf7, 0x52, 0x38, 0x68, 0xa3, 0x7b, 0xa0, - 0x5a, 0x9e, 0x36, 0xd1, 0x5d, 0x6a, 0x31, 0x9b, 0xda, 0x31, 0x99, 0xe5, 0x63, 0x5c, 0x66, 0xd5, - 0xf2, 0x3a, 0x3e, 0xf9, 0x19, 0x99, 0xa1, 0xdf, 0x83, 0x55, 0x26, 0xe9, 0x5a, 0x63, 0xdd, 0x9d, - 0x71, 0xb9, 0x38, 0x97, 0xcb, 0x5a, 0x5e, 0x47, 0x10, 0x99, 0xd4, 0x87, 0x90, 0xb6, 0xec, 0x01, - 0x71, 0x89, 0x6d, 0x90, 0x7c, 0x62, 0x5b, 0xb9, 0x97, 0xd9, 0x5d, 0x2b, 0xf3, 0x80, 0x37, 0x7c, - 0xf2, 0x5e, 0xec, 0x8b, 0x57, 0xc5, 0x15, 0x3c, 0x97, 0x43, 0x1f, 0xc1, 0xda, 0x4b, 0xd7, 0xa2, - 0x44, 0x9b, 0xab, 0x26, 0xcf, 0x55, 0xc5, 0xab, 0x5c, 0x2e, 0x68, 0x97, 0xfe, 0x33, 0x01, 0xe9, - 0xa0, 0xc5, 0xa6, 0x4f, 0x67, 0x13, 0xe2, 0xe5, 0x95, 0xed, 0x28, 0x9b, 0x3e, 0x6f, 0xa0, 0x32, - 0x24, 0x3c, 0xea, 0x5a, 0xf6, 0x90, 0x4f, 0x3e, 0xb3, 0x7b, 0xf3, 0x8c, 0xd1, 0x72, 0x97, 0x73, - 0xb1, 0x94, 0xe2, 0x56, 0x2c, 0x3a, 0x22, 0xdc, 0x0f, 0xcc, 0x0a, 0x6b, 0xa0, 0x6d, 0xc8, 0x98, - 0xc4, 0x33, 0x5c, 0x6b, 0xc2, 0x1c, 0xc2, 0xe7, 0x9e, 0xc6, 0x61, 0x12, 0x7a, 0x04, 0x59, 0x93, - 0x0c, 0xf4, 0xe9, 0x88, 0x6a, 0x2f, 0x3c, 0xc7, 0xe6, 0xb3, 0x4f, 0xef, 0xbd, 0xfd, 0xfa, 0x55, - 0x31, 0x4f, 0x6c, 0xc3, 0x31, 0x2d, 0x7b, 0xb8, 0xc3, 0x18, 0x65, 0xac, 0xbf, 0x3c, 0x10, 0x01, - 0xc7, 0x49, 0xa9, 0x81, 0x6e, 0x42, 0xc2, 0x23, 0x86, 0x4b, 0x28, 0x9f, 0x79, 0x0a, 0xcb, 0x16, - 0x1b, 0x3c, 0x39, 0xb5, 0x3c, 0xea, 0xe5, 0x53, 0xdb, 0xca, 0xbd, 0xd5, 0xe5, 0xc1, 0xd7, 0x39, - 0x17, 0x4b, 0x29, 0xf4, 0x4d, 0x48, 0xda, 0x6c, 0xa7, 0x58, 0x46, 0x3e, 0xcd, 0x67, 0x7b, 0xeb, - 0xac, 0x42, 0x4b, 0xb0, 0xb1, 0x2f, 0x87, 0xee, 0x43, 0x5c, 0x77, 0x5d, 0x7d, 0x96, 0x07, 0xae, - 0x70, 0xe3, 0xac, 0x42, 0x85, 0x31, 0xb1, 0x90, 0x29, 0xfc, 0x54, 0x81, 0x84, 0xf0, 0x17, 0xba, - 0x0b, 0x59, 0xc3, 0xb1, 0x29, 0xb1, 0xa9, 0xc6, 0x1c, 0xcd, 0xbd, 0x9b, 0xc6, 0x19, 0x49, 0xeb, - 0xcd, 0x26, 0x84, 0xcd, 0x6a, 0xe0, 0xb8, 0x63, 0x9d, 0x4a, 0x5f, 0xca, 0x16, 0x7a, 0x17, 0x54, - 0x5f, 0xd5, 0x77, 0x0d, 0x9f, 0x77, 0x1a, 0xaf, 0x49, 0x7a, 0x5d, 0x92, 0xd1, 0x1d, 0x80, 0xb1, - 0x7e, 0xaa, 0x8d, 0x88, 0x3d, 0xa4, 0x47, 0xdc, 0xa7, 0x39, 0x9c, 0x1e, 0xeb, 0xa7, 0x4d, 0x4e, - 0x78, 0x1a, 0x4b, 0x29, 0x6a, 0xe4, 0x69, 0x2c, 0x15, 0x51, 0xa3, 0x4f, 0x63, 0xa9, 0xb8, 0x9a, - 0x28, 0xfc, 0x31, 0x24, 0xe5, 0x14, 0x51, 0x11, 0x32, 0x47, 0xba, 0xa7, 0x8d, 0x2d, 0xdb, 0x1a, - 0x4f, 0xc7, 0x7c, 0xa3, 0xa4, 0x30, 0x1c, 0xe9, 0xde, 0x81, 0xa0, 0xa0, 0x3c, 0x24, 0x7d, 0x26, - 0xdb, 0x31, 0x0a, 0xf6, 0x9b, 0x81, 0xaa, 0x7e, 0xca, 0xb9, 0xd1, 0xb9, 0xaa, 0xa0, 0x70, 0x55, - 0xc9, 0x8c, 0x49, 0x55, 0xd1, 0x2c, 0xfc, 0x50, 0x81, 0x38, 0xf7, 0x19, 0x7a, 0x0b, 0xd2, 0x63, - 0xcb, 0xd6, 0x2c, 0x4a, 0xc6, 0x9e, 0x44, 0x96, 0xd4, 0xd8, 0xb2, 0x1b, 0xac, 0x8d, 0x4a, 0x90, - 0x93, 0x3d, 0x48, 0x81, 0x08, 0xef, 0x23, 0x23, 0xfa, 0x10, 0x32, 0xcc, 0x40, 0xc0, 0x8f, 0x4a, - 0x03, 0x3e, 0xf3, 0x0e, 0x00, 0x63, 0x68, 0x62, 0xc9, 0xc7, 0xf8, 0x92, 0x4f, 0x33, 0x0a, 0x73, - 0xbd, 0x57, 0xda, 0x83, 0x84, 0x58, 0x1b, 0x28, 0x03, 0xc9, 0x46, 0xeb, 0xbb, 0x95, 0x66, 0xa3, - 0xa6, 0xae, 0xa0, 0x14, 0xc4, 0x0e, 0x0e, 0xbb, 0x3d, 0x55, 0x41, 0x49, 0x88, 0x1e, 0x54, 0x9e, - 0xab, 0x11, 0x94, 0x85, 0x54, 0xe3, 0xa0, 0xd3, 0x6c, 0x54, 0x1b, 0x3d, 0x35, 0x8a, 0x00, 0x12, - 0xd5, 0x4a, 0xab, 0xd5, 0xee, 0xa9, 0xb1, 0xd2, 0x73, 0xc8, 0xb4, 0x08, 0x7d, 0xe9, 0xb8, 0xc7, - 0x1d, 0xc7, 0xe5, 0x8b, 0xd4, 0x9e, 0x8e, 0xfb, 0xc4, 0x95, 0x93, 0x91, 0x2d, 0x06, 0x30, 0x3e, - 0x1e, 0x4b, 0xe4, 0x09, 0xda, 0x4c, 0x67, 0x32, 0xed, 0x8f, 0x2c, 0x43, 0xfa, 0x50, 0xb6, 0x4a, - 0xff, 0xb6, 0x06, 0xab, 0x55, 0x67, 0x34, 0x12, 0x58, 0xd6, 0x9d, 0x10, 0x03, 0x95, 0x20, 0x66, - 0xeb, 0x63, 0x81, 0xa0, 0xe9, 0xbd, 0xd5, 0xd7, 0xaf, 0x8a, 0x30, 0x97, 0xc0, 0x9c, 0x87, 0x6a, - 0xb0, 0x2e, 0xa0, 0xc2, 0x33, 0x8e, 0xc8, 0x58, 0x17, 0x3b, 0x2d, 0x75, 0x85, 0x9d, 0x96, 0xe1, - 0x6a, 0x5d, 0xae, 0x85, 0xf6, 0x40, 0x75, 0x89, 0x6e, 0x2e, 0x18, 0xc9, 0x5c, 0xc1, 0x08, 0x30, - 0x2d, 0x69, 0x43, 0x85, 0x28, 0x03, 0xc1, 0x28, 0xf7, 0x3b, 0xfb, 0x44, 0xb7, 0x21, 0x35, 0x9d, - 0x5a, 0xa6, 0xc6, 0x40, 0x59, 0xac, 0xf7, 0x24, 0x6b, 0x77, 0xa8, 0xcb, 0x16, 0xfc, 0x1c, 0x63, - 0x39, 0x2a, 0x7b, 0xf9, 0x38, 0xd7, 0x5c, 0x0b, 0xe8, 0xfb, 0x9c, 0x8c, 0x3e, 0x82, 0xcc, 0x24, - 0xc0, 0x78, 0x2f, 0x9f, 0xd8, 0x8e, 0xde, 0xcb, 0xec, 0xaa, 0x62, 0x53, 0xce, 0xc1, 0x5f, 0x82, - 0x68, 0x58, 0x94, 0xf9, 0x46, 0x37, 0x8e, 0x35, 0x4a, 0xc6, 0x93, 0x91, 0x4e, 0x89, 0x98, 0x56, - 0xf2, 0x2a, 0xbe, 0xd1, 0x8d, 0xe3, 0x9e, 0xd4, 0x42, 0x35, 0x40, 0xf3, 0xa1, 0xfa, 0xb6, 0x24, - 0x98, 0xdc, 0x28, 0x07, 0x79, 0xf7, 0xa9, 0x33, 0x75, 0x6d, 0x7d, 0xc4, 0x02, 0x87, 0xd7, 0x03, - 0x85, 0xc0, 0xca, 0x77, 0x00, 0x4c, 0xe2, 0x5a, 0x27, 0x3a, 0x47, 0xcb, 0x2c, 0xd7, 0x2e, 0x8a, - 0x49, 0x2c, 0x46, 0xbd, 0x5c, 0x0b, 0xc4, 0x70, 0x48, 0xa5, 0xf0, 0x0f, 0x19, 0x80, 0x39, 0x0b, - 0xf5, 0x60, 0xd5, 0x70, 0x6c, 0x9b, 0x18, 0xd4, 0x71, 0x05, 0xdc, 0x28, 0x1c, 0x0f, 0xdf, 0xbf, - 0xc4, 0x66, 0xb9, 0xea, 0x6b, 0xb1, 0x5d, 0x81, 0x73, 0x46, 0xb8, 0x89, 0x1e, 0x00, 0x83, 0xab, - 0x81, 0x35, 0x14, 0xbe, 0x8a, 0x5c, 0xc1, 0x57, 0x09, 0xa1, 0x80, 0xda, 0x00, 0xd4, 0xd5, 0x6d, - 0x8f, 0x21, 0x9a, 0xc7, 0x57, 0x41, 0x66, 0xf7, 0xdd, 0xcb, 0x06, 0xd3, 0xf3, 0x35, 0x64, 0xf8, - 0x42, 0x26, 0xd0, 0x27, 0xb0, 0xee, 0x1d, 0x4d, 0x07, 0x83, 0x11, 0x61, 0xc9, 0x35, 0xb4, 0xab, - 0x57, 0x77, 0xef, 0x5f, 0x66, 0xb7, 0x2b, 0x14, 0xf9, 0x14, 0xd7, 0xa4, 0x95, 0x67, 0x64, 0xc6, - 0x81, 0x00, 0x3d, 0x84, 0x55, 0xef, 0x48, 0x77, 0xcd, 0x79, 0x30, 0xe3, 0x3c, 0x1c, 0x1b, 0x65, - 0xbf, 0xac, 0x2a, 0x77, 0x19, 0x9f, 0x87, 0x32, 0xc7, 0x45, 0x83, 0x30, 0x36, 0xe0, 0x86, 0x4b, - 0x0c, 0xe7, 0x84, 0xb8, 0x33, 0x6d, 0xe4, 0x0c, 0xe7, 0x26, 0x12, 0x17, 0xad, 0x87, 0x0d, 0x5f, - 0xa7, 0xe9, 0x0c, 0x03, 0x53, 0xdf, 0x86, 0x9c, 0x2d, 0xb0, 0x44, 0x9b, 0x38, 0x2e, 0xf5, 0xf2, - 0x49, 0xee, 0xb3, 0x75, 0x31, 0xb7, 0x10, 0xcc, 0xe0, 0xac, 0x3d, 0x6f, 0x78, 0xe8, 0x53, 0xd8, - 0xb0, 0x6c, 0xdd, 0xa0, 0xd6, 0x09, 0xd1, 0x42, 0x1e, 0x4f, 0x5d, 0xd3, 0xe3, 0x18, 0xf9, 0x56, - 0x02, 0x92, 0x57, 0xf8, 0x69, 0x1c, 0xd2, 0x41, 0x13, 0xdd, 0x5d, 0xc0, 0x9f, 0xdc, 0xeb, 0x57, - 0xc5, 0x39, 0x53, 0xc2, 0xcf, 0x43, 0x00, 0x23, 0xe8, 0x8b, 0xaf, 0x97, 0xcc, 0xee, 0xe6, 0x79, - 0x63, 0xf0, 0x03, 0x3c, 0x97, 0x46, 0xcd, 0xf0, 0xc6, 0xf2, 0xc8, 0x88, 0x2f, 0x43, 0x59, 0x93, - 0xdc, 0x9a, 0x3b, 0xb2, 0xa9, 0xf7, 0xc9, 0xa8, 0x2b, 0xd9, 0xd2, 0xcc, 0x7c, 0x83, 0xf9, 0x0c, - 0x81, 0xb9, 0x96, 0xe3, 0x5a, 0x54, 0x14, 0x6c, 0x39, 0x1c, 0xb4, 0xd1, 0x37, 0x00, 0x71, 0x78, - 0x33, 0xc9, 0x48, 0x9f, 0x69, 0x1e, 0x31, 0x1c, 0x9b, 0xe3, 0x0d, 0x93, 0xe2, 0xc0, 0x57, 0x63, - 0x8c, 0xae, 0xa0, 0xb3, 0x54, 0x17, 0x5a, 0x78, 0x1c, 0x70, 0xd2, 0x18, 0xe6, 0xab, 0x08, 0x1d, - 0x42, 0xc1, 0x17, 0x18, 0xe9, 0xe3, 0xbe, 0xa9, 0x6b, 0xe1, 0x4d, 0x73, 0x15, 0x80, 0xd9, 0x90, - 0xfa, 0x4d, 0xae, 0x5e, 0x15, 0x3b, 0x68, 0x1f, 0xd0, 0x39, 0xe6, 0xae, 0x82, 0xe5, 0xd9, 0x51, - 0xd8, 0xce, 0x5b, 0x90, 0xe6, 0xb3, 0x75, 0xec, 0xd1, 0x8c, 0xe3, 0x54, 0x0a, 0xa7, 0x18, 0xa1, - 0x6d, 0x8f, 0x66, 0xa8, 0x0c, 0x1b, 0x2f, 0xc4, 0xca, 0xd4, 0x04, 0xe2, 0x4f, 0x07, 0x03, 0xeb, - 0x94, 0x97, 0x3a, 0x69, 0xbc, 0x2e, 0x59, 0x98, 0xa1, 0x3a, 0x67, 0xa0, 0x07, 0x00, 0xb6, 0x43, - 0xb5, 0x3e, 0x19, 0x38, 0x2e, 0xe1, 0x39, 0x21, 0xb3, 0x5b, 0x28, 0x8b, 0x73, 0x44, 0xd9, 0x3f, - 0x47, 0x94, 0x7b, 0xfe, 0x39, 0x02, 0xa7, 0x6d, 0x87, 0xee, 0x71, 0x61, 0xf4, 0xfb, 0xc0, 0x1a, - 0x9a, 0x3e, 0xa0, 0xc4, 0x95, 0x88, 0x77, 0x91, 0x66, 0xca, 0x76, 0x68, 0x85, 0xc9, 0xb2, 0x50, - 0xf6, 0x75, 0xe3, 0x78, 0x60, 0x8d, 0x46, 0xf9, 0x9c, 0x08, 0xa5, 0xdf, 0x2e, 0x7d, 0x1f, 0x72, - 0x0b, 0x08, 0x86, 0x0a, 0x70, 0x53, 0x26, 0x73, 0xad, 0xda, 0x6e, 0xb5, 0xea, 0xd5, 0x5e, 0x1b, - 0x6b, 0xbd, 0xe7, 0x9d, 0xba, 0xba, 0xc2, 0x52, 0x77, 0xf7, 0x0f, 0x9b, 0x8d, 0x5e, 0x5d, 0x55, - 0xd0, 0x2a, 0x00, 0xa3, 0x76, 0xab, 0xb8, 0xd1, 0xe9, 0xa9, 0x11, 0x94, 0x86, 0x78, 0xe3, 0xa0, - 0xf2, 0xa4, 0xae, 0x46, 0xd9, 0x67, 0xb3, 0x5d, 0xad, 0x34, 0xd5, 0x58, 0xe9, 0x00, 0x32, 0x21, - 0xec, 0x40, 0x79, 0xd8, 0xf4, 0x8d, 0x77, 0x3f, 0x3e, 0xdc, 0xdf, 0x6f, 0xd6, 0x7d, 0xd3, 0x19, - 0x48, 0xee, 0xb5, 0xdb, 0xcd, 0x7a, 0xa5, 0xa5, 0x2a, 0xa2, 0xa0, 0xe8, 0xd5, 0x9f, 0xd4, 0xb1, - 0x1a, 0xe1, 0x9d, 0xf6, 0x70, 0xa3, 0xf5, 0x44, 0x8d, 0x96, 0x7e, 0x1c, 0x81, 0x55, 0x9e, 0xc6, - 0xc4, 0x32, 0x65, 0xab, 0x1e, 0x41, 0xec, 0x98, 0xcc, 0xfc, 0x92, 0x9c, 0x7f, 0xb3, 0x9a, 0xe0, - 0x44, 0x1f, 0x4d, 0x09, 0xab, 0x79, 0x18, 0x55, 0xb6, 0x98, 0x23, 0x4c, 0xc7, 0x98, 0x8e, 0x89, - 0x4d, 0x65, 0x35, 0x19, 0xb4, 0xd1, 0x09, 0xdc, 0xe0, 0x79, 0x33, 0xbc, 0x58, 0xb4, 0xb1, 0x3e, - 0xe1, 0x10, 0x99, 0xd9, 0xfd, 0x86, 0xd8, 0x84, 0x8b, 0x9d, 0x8b, 0xa6, 0x58, 0x26, 0x4f, 0x3d, - 0xc7, 0x3e, 0xd0, 0x27, 0x75, 0x9b, 0xba, 0xb3, 0xbd, 0xb7, 0x3f, 0xfb, 0xf2, 0xa2, 0x74, 0x38, - 0x98, 0xab, 0x15, 0xea, 0x70, 0xeb, 0x0d, 0x56, 0xfc, 0x0a, 0x40, 0x9e, 0xbf, 0x58, 0x05, 0xb0, - 0x09, 0x71, 0x3e, 0x15, 0xff, 0xfc, 0xc5, 0x1b, 0x0f, 0x23, 0x1f, 0x29, 0xa5, 0x9f, 0x27, 0x20, - 0x53, 0xd5, 0x27, 0x74, 0xea, 0x12, 0x5e, 0xeb, 0x14, 0x17, 0xb0, 0x26, 0xf3, 0xfa, 0x55, 0x31, - 0x29, 0xd9, 0x12, 0x69, 0xf6, 0x97, 0x12, 0x5e, 0x84, 0x27, 0x3c, 0x3f, 0x89, 0xce, 0x6d, 0x5d, - 0x2b, 0xc5, 0x45, 0xaf, 0x91, 0xe2, 0xbe, 0x05, 0xa9, 0xbe, 0x65, 0x33, 0x11, 0x4f, 0x7a, 0xf9, - 0xf6, 0x72, 0xe7, 0x7b, 0x42, 0x02, 0x07, 0xa2, 0xac, 0xd6, 0xb1, 0x6c, 0x4a, 0xdc, 0x13, 0x7d, - 0x74, 0x06, 0x7b, 0xd6, 0x7c, 0xba, 0x0f, 0x3d, 0xcb, 0xa9, 0x29, 0xf1, 0x9b, 0xa7, 0xa6, 0xe4, - 0x6f, 0x9e, 0x9a, 0x52, 0x57, 0x4b, 0x4d, 0xfb, 0xb0, 0x1e, 0xa4, 0xa6, 0xc0, 0x53, 0xe9, 0xcb, - 0x3c, 0xa5, 0xfa, 0x3a, 0x92, 0xe0, 0x15, 0xfe, 0x57, 0x81, 0xa4, 0x6c, 0xa0, 0xa7, 0xb0, 0xe9, - 0x12, 0xcf, 0x99, 0xba, 0x06, 0x59, 0xc0, 0x45, 0xe5, 0x0a, 0x81, 0x5b, 0xf5, 0x35, 0x25, 0x32, - 0x7e, 0x0d, 0x72, 0x81, 0xad, 0x89, 0x4e, 0x8f, 0xe4, 0x76, 0xcb, 0xfa, 0xc4, 0x8e, 0x4e, 0x8f, - 0xce, 0xa4, 0xb4, 0xe8, 0xb5, 0x52, 0x5a, 0x18, 0xb9, 0x62, 0x8b, 0xc8, 0xc5, 0x60, 0xd9, 0xa3, - 0xac, 0x0c, 0xf5, 0xaf, 0x0a, 0xd2, 0x38, 0xc5, 0x09, 0xcf, 0xc8, 0xac, 0xb4, 0x7b, 0x16, 0xd6, - 0x16, 0xce, 0x28, 0x01, 0x56, 0x25, 0xe7, 0x58, 0x95, 0x2a, 0xfd, 0x5d, 0x06, 0x36, 0x0e, 0x74, - 0x4a, 0x5c, 0x4b, 0x1f, 0x59, 0x3f, 0xd0, 0x83, 0x63, 0xc3, 0x3b, 0x0b, 0x5b, 0x69, 0xe3, 0xf5, - 0xab, 0xe2, 0xda, 0x19, 0x31, 0xb9, 0xa5, 0x5a, 0x6f, 0xd8, 0x52, 0xef, 0x88, 0xd9, 0x9e, 0x63, - 0xfb, 0xff, 0x6d, 0x6b, 0x3d, 0x5e, 0xda, 0x5a, 0x77, 0xdf, 0x3c, 0x88, 0xe5, 0x2d, 0xf6, 0x3b, - 0x5e, 0xd2, 0xb5, 0xde, 0xbc, 0x6f, 0xae, 0xe0, 0x86, 0xe5, 0xfd, 0xf3, 0xaf, 0x89, 0xdf, 0xd1, - 0xfd, 0x73, 0x7e, 0x49, 0x98, 0xfc, 0x2d, 0x94, 0x84, 0xe9, 0x33, 0x25, 0x61, 0x15, 0xd6, 0x44, - 0xfa, 0xf4, 0xfc, 0xe4, 0xc8, 0x37, 0x6c, 0x30, 0xd4, 0xc5, 0xc4, 0x29, 0xfb, 0x58, 0x1d, 0x2c, - 0xe6, 0xf2, 0xaf, 0x41, 0xce, 0x24, 0x23, 0xaa, 0x6b, 0xd3, 0x89, 0xa9, 0x53, 0xe2, 0xf9, 0x37, - 0x80, 0x9c, 0x78, 0x28, 0x68, 0xa8, 0x0f, 0xc8, 0x24, 0x13, 0x97, 0x18, 0x3a, 0x25, 0xa6, 0x26, - 0x0b, 0x3f, 0xb9, 0xb8, 0x3e, 0xbc, 0x34, 0xba, 0xe5, 0x5a, 0xa0, 0x2b, 0x0b, 0x13, 0xbc, 0x6e, - 0x9e, 0x25, 0xbd, 0xa9, 0xaa, 0x4b, 0x5d, 0xad, 0xaa, 0x83, 0xaf, 0x5c, 0xd5, 0x65, 0xbe, 0x62, - 0x55, 0x97, 0xbd, 0x08, 0x1b, 0x73, 0x8b, 0xd8, 0x58, 0xf8, 0x13, 0x05, 0xd6, 0x97, 0xbc, 0x80, - 0xee, 0x00, 0x0c, 0x5d, 0x67, 0x3a, 0xd1, 0xe6, 0x58, 0x87, 0xd3, 0x9c, 0xd2, 0x62, 0xd8, 0xf6, - 0x5b, 0x3d, 0x5c, 0x94, 0x1e, 0x5f, 0x0d, 0x9e, 0x53, 0x73, 0x78, 0x4e, 0xb3, 0xcf, 0x5a, 0xfd, - 0x59, 0x65, 0x5f, 0x85, 0xd2, 0xff, 0xa4, 0x21, 0xd1, 0xae, 0x4c, 0xe9, 0xd1, 0xae, 0xbc, 0x1a, - 0x3a, 0xb1, 0x4c, 0xe2, 0x5f, 0x54, 0x07, 0x6d, 0xf4, 0x1e, 0xac, 0xeb, 0x53, 0x7a, 0xa4, 0x4d, - 0xdd, 0xd1, 0x1c, 0x85, 0x44, 0xe5, 0xb4, 0xc6, 0x18, 0x87, 0xee, 0x28, 0x80, 0x9a, 0x07, 0x70, - 0x5b, 0x37, 0x0c, 0xe2, 0x79, 0x1a, 0x75, 0x8e, 0x89, 0xbd, 0xa8, 0x23, 0x6a, 0xc5, 0x9b, 0x42, - 0xa0, 0xc7, 0xf8, 0x61, 0xd5, 0x32, 0x6c, 0x2c, 0xa8, 0x8e, 0x09, 0x3d, 0x72, 0x4c, 0x71, 0xdf, - 0x83, 0xd7, 0x43, 0x4a, 0x07, 0x9c, 0xc1, 0x87, 0x15, 0x96, 0xef, 0x3b, 0xe6, 0x4c, 0xde, 0xe7, - 0xac, 0x85, 0xa4, 0xf7, 0x1c, 0x73, 0x86, 0x7e, 0xa8, 0xc0, 0x9d, 0x05, 0xe1, 0x23, 0xa2, 0x9b, - 0xc4, 0xf5, 0xe6, 0xe5, 0x69, 0x9c, 0xc3, 0x9a, 0x3c, 0xc1, 0x0b, 0xa7, 0x94, 0x2b, 0x73, 0x2b, - 0x1f, 0x0b, 0xf9, 0x6b, 0x54, 0xa7, 0x48, 0x5f, 0xd2, 0x46, 0x9f, 0x29, 0xb0, 0xb5, 0x30, 0x0c, - 0x97, 0x78, 0x13, 0xc7, 0xf6, 0xc8, 0x7c, 0x1c, 0x89, 0x70, 0x99, 0xbc, 0x3c, 0x0e, 0x2c, 0x15, - 0xae, 0x31, 0x90, 0xb0, 0xbf, 0x7d, 0xf5, 0x03, 0x7d, 0x82, 0x1e, 0x41, 0xc1, 0x25, 0x03, 0x97, - 0x78, 0x47, 0xe7, 0xc5, 0x4a, 0x5c, 0xf3, 0xde, 0x92, 0x12, 0x4b, 0xc1, 0xfa, 0x80, 0xc1, 0x77, - 0x58, 0x59, 0x46, 0x2b, 0xcb, 0xd5, 0x50, 0x58, 0x4d, 0x86, 0x8b, 0x1f, 0x76, 0xc3, 0x1a, 0x3c, - 0x5e, 0x02, 0x0a, 0xd4, 0xb0, 0x3c, 0x0f, 0xd8, 0x9f, 0x29, 0xb0, 0xb5, 0x28, 0xbe, 0x14, 0xb1, - 0xf4, 0x39, 0x9e, 0xc2, 0x21, 0x3b, 0xd7, 0x0f, 0xd9, 0x86, 0xbb, 0xac, 0x8e, 0xfe, 0x42, 0x81, - 0xe2, 0xe2, 0x48, 0x96, 0x83, 0x06, 0x7c, 0x28, 0xef, 0xbf, 0x71, 0x28, 0x5f, 0x21, 0x6a, 0x0b, - 0x9e, 0x0f, 0x85, 0xad, 0xd0, 0x84, 0xad, 0x8b, 0xd7, 0xe5, 0x75, 0xce, 0x3b, 0x85, 0x03, 0x28, - 0x5e, 0xb2, 0xba, 0xae, 0x6b, 0xee, 0x92, 0x10, 0x5c, 0xcb, 0x5c, 0x0b, 0xb6, 0x2f, 0x73, 0xe3, - 0xb5, 0x4e, 0x77, 0xff, 0x18, 0x85, 0x54, 0x8f, 0x78, 0x94, 0xd7, 0xa3, 0x28, 0x5c, 0x8f, 0xca, - 0xd2, 0x73, 0x07, 0xe2, 0x1e, 0x25, 0x13, 0x71, 0xe0, 0x65, 0x75, 0x1a, 0x8f, 0xa8, 0xaf, 0x52, - 0xee, 0x52, 0x32, 0x91, 0x68, 0x2c, 0xe4, 0x0a, 0xbf, 0x8a, 0x40, 0x8c, 0x51, 0xd1, 0xb7, 0x58, - 0xaa, 0x20, 0x93, 0xf0, 0x9d, 0x67, 0xfe, 0x1c, 0xed, 0x32, 0x2f, 0x50, 0x53, 0x4c, 0x94, 0x03, - 0xf6, 0x1d, 0x00, 0xae, 0x66, 0xd9, 0x26, 0x39, 0x95, 0x2f, 0x98, 0xdc, 0x50, 0x83, 0x11, 0xce, - 0xbe, 0x66, 0x45, 0x97, 0x5f, 0xb3, 0x7c, 0x03, 0x9e, 0xe1, 0x4c, 0xfc, 0xa7, 0x30, 0x6e, 0xa0, - 0xcb, 0x08, 0xa8, 0xbc, 0x50, 0xf5, 0xc4, 0xcf, 0xbd, 0xb1, 0x0f, 0x57, 0x3a, 0x0f, 0x20, 0x67, - 0x3a, 0x86, 0xdc, 0x65, 0x27, 0xc4, 0x10, 0xd7, 0x4c, 0x97, 0xd4, 0x63, 0x31, 0xa6, 0x82, 0x1e, - 0x03, 0x04, 0x19, 0xca, 0xbb, 0x5a, 0x71, 0x14, 0x52, 0x28, 0x6d, 0x41, 0x8c, 0x7b, 0x04, 0x20, - 0xd1, 0x68, 0x3d, 0xa9, 0x77, 0x7b, 0xe2, 0xa2, 0xe4, 0xbb, 0x75, 0xdc, 0xd8, 0x7f, 0xae, 0x2a, - 0xa5, 0x1f, 0x2b, 0x90, 0xc6, 0xba, 0x3d, 0x14, 0xe7, 0xf2, 0xb7, 0x20, 0x7d, 0x4c, 0x66, 0x9a, - 0x78, 0x0c, 0x66, 0x6e, 0x4b, 0xe2, 0xd4, 0x31, 0x99, 0xed, 0xf1, 0xf7, 0xe0, 0x5b, 0x90, 0x64, - 0x4c, 0x62, 0x9b, 0xdc, 0x63, 0x49, 0x9c, 0x38, 0x26, 0xb3, 0xba, 0x6d, 0xa2, 0x12, 0xe4, 0x5c, - 0x8d, 0xbf, 0xda, 0x4a, 0xcd, 0x18, 0x67, 0x67, 0x5c, 0xfe, 0xa0, 0x2b, 0x94, 0xb7, 0x20, 0xe3, - 0xcb, 0x30, 0x03, 0x71, 0x2e, 0x91, 0x16, 0x12, 0x75, 0xdb, 0x7c, 0xa8, 0xfe, 0xe4, 0xf3, 0xe2, - 0xca, 0x99, 0xe7, 0xe5, 0xd5, 0x20, 0x0b, 0x77, 0x59, 0x75, 0x80, 0x1e, 0x41, 0x56, 0x94, 0x5e, - 0xe6, 0xd5, 0x8b, 0xda, 0xa4, 0xd4, 0x40, 0x45, 0xc8, 0x8c, 0x89, 0x3b, 0xe4, 0xa5, 0xac, 0x71, - 0x24, 0x9f, 0x9b, 0x80, 0x93, 0x3a, 0x8c, 0x52, 0xfa, 0x5b, 0x05, 0xd2, 0x5d, 0xe2, 0x76, 0x9c, - 0x91, 0x65, 0xf0, 0x4b, 0x44, 0x8f, 0xba, 0x1a, 0x75, 0xa7, 0x36, 0x2b, 0x44, 0x64, 0x05, 0x24, - 0x1e, 0x7e, 0x54, 0x8f, 0xba, 0x3d, 0xc9, 0x10, 0xd5, 0xce, 0x03, 0xb8, 0x6d, 0x13, 0x8f, 0x0d, - 0xcc, 0xe9, 0xbf, 0x38, 0xab, 0x24, 0x96, 0xdf, 0x4d, 0x21, 0xd0, 0xee, 0xbf, 0x58, 0x54, 0xfd, - 0x00, 0x36, 0xf9, 0xdb, 0xe2, 0x59, 0x2d, 0xf1, 0xde, 0x85, 0x38, 0x6f, 0x41, 0xa3, 0xf4, 0x37, - 0x11, 0x80, 0xfa, 0x29, 0x75, 0x75, 0x83, 0x56, 0x3a, 0x8d, 0xc2, 0x3f, 0x2b, 0x90, 0x90, 0x15, - 0x7b, 0xf8, 0x09, 0x46, 0x59, 0x7c, 0x82, 0x79, 0x0c, 0x99, 0xf0, 0x73, 0xcf, 0x55, 0xee, 0xfa, - 0x41, 0x28, 0x30, 0x58, 0x60, 0xfb, 0x41, 0x14, 0xd0, 0x13, 0xea, 0x7a, 0xf2, 0xd5, 0x27, 0xcd, - 0x29, 0x1d, 0xea, 0x2e, 0xbd, 0xda, 0xc4, 0xae, 0xfc, 0x6a, 0x53, 0x7a, 0x0e, 0xb1, 0xaa, 0x63, - 0x9e, 0x29, 0xb1, 0x72, 0x90, 0xae, 0xb6, 0x5b, 0xfb, 0x8d, 0x27, 0x87, 0xb8, 0x2e, 0x2e, 0xdc, - 0xea, 0xdf, 0xeb, 0xe1, 0x4a, 0xb5, 0xa7, 0x46, 0x10, 0x82, 0x55, 0xd9, 0xa8, 0xd7, 0xb4, 0xc3, - 0xc3, 0x46, 0x4d, 0x8d, 0xa2, 0x4d, 0x50, 0xe7, 0xb4, 0xfd, 0x46, 0xbd, 0x59, 0xeb, 0xaa, 0xb1, - 0xd2, 0xaf, 0x14, 0x48, 0xed, 0x4d, 0xad, 0x91, 0xc9, 0xbc, 0xf4, 0x1f, 0x0b, 0x5e, 0xea, 0x33, - 0xb2, 0x66, 0x99, 0xbe, 0x97, 0x78, 0xbb, 0x61, 0xce, 0x59, 0x66, 0x5f, 0xc2, 0x9c, 0x60, 0xd5, - 0xfa, 0xfc, 0x89, 0x9a, 0x1f, 0x7b, 0x24, 0x5c, 0xc8, 0x16, 0xda, 0x85, 0x8c, 0x3c, 0x23, 0x71, - 0x8c, 0x8a, 0x71, 0x8c, 0x5a, 0xf7, 0x4f, 0x40, 0xc1, 0x63, 0x30, 0x06, 0x21, 0xc5, 0x37, 0xe3, - 0x7d, 0x58, 0x9f, 0x1f, 0xc5, 0xe5, 0xd9, 0x50, 0x5e, 0x12, 0xa8, 0x01, 0x43, 0x1e, 0x20, 0xd1, - 0x5d, 0xc8, 0x4a, 0x87, 0x69, 0xae, 0xe3, 0x50, 0xf1, 0xb0, 0x1e, 0x38, 0x11, 0x3b, 0x0e, 0x2d, - 0x6d, 0xc0, 0x3a, 0x26, 0x1e, 0xa1, 0x7c, 0x9b, 0x60, 0xf2, 0x47, 0x53, 0xe2, 0xd1, 0xd2, 0x26, - 0xa0, 0x30, 0x51, 0x60, 0x7c, 0xe9, 0x31, 0xa0, 0x8a, 0x79, 0xa2, 0xdb, 0x06, 0x61, 0x55, 0xbb, - 0x94, 0x45, 0xef, 0xc0, 0x9a, 0x2e, 0xa8, 0xc1, 0x9d, 0x15, 0xf3, 0x4c, 0x0c, 0xaf, 0x4a, 0xb2, - 0xbc, 0xb2, 0x2a, 0xdd, 0x80, 0x8d, 0x05, 0x75, 0x69, 0xf5, 0x23, 0xc8, 0xd6, 0x1c, 0xc3, 0xab, - 0xd8, 0xe6, 0xde, 0x8c, 0x9d, 0x82, 0x10, 0x70, 0xf0, 0x92, 0xfb, 0x45, 0x00, 0xd9, 0x26, 0xc4, - 0xfb, 0x8c, 0xc9, 0x1d, 0x1b, 0xc3, 0xa2, 0x51, 0xfa, 0x2b, 0x05, 0x72, 0x0d, 0x7b, 0x48, 0x3c, - 0xea, 0x8f, 0x65, 0x11, 0x5b, 0x95, 0x4b, 0xb1, 0x35, 0x1c, 0xce, 0xc8, 0x62, 0x38, 0x97, 0x60, - 0x37, 0x7a, 0x55, 0xd8, 0x2d, 0xfd, 0x7b, 0x04, 0x56, 0xfd, 0x71, 0x89, 0x49, 0xa2, 0x7f, 0x52, - 0xe6, 0xe7, 0x2e, 0xf1, 0x0a, 0xcb, 0x8a, 0x27, 0x71, 0xb7, 0x1b, 0xd4, 0xb8, 0x8b, 0x3a, 0xfe, - 0x25, 0xc2, 0x27, 0x4c, 0x9c, 0xa5, 0x6d, 0x4f, 0x14, 0x29, 0xdf, 0xff, 0xd3, 0x2f, 0x8b, 0xf7, - 0xcf, 0xfb, 0x2b, 0xcc, 0x99, 0xbf, 0x02, 0xf9, 0xfa, 0x9f, 0x7d, 0x59, 0x7c, 0xef, 0x2a, 0xe2, - 0xed, 0xc1, 0xc0, 0x23, 0x34, 0x38, 0x03, 0xce, 0xbb, 0x45, 0x7f, 0x00, 0x59, 0x7f, 0xec, 0x84, - 0x1a, 0xa6, 0x7c, 0xbc, 0x09, 0x5d, 0x77, 0x88, 0xa2, 0xa2, 0x5c, 0xa7, 0x86, 0xe9, 0xef, 0x53, - 0xa9, 0xc0, 0x48, 0x85, 0x1a, 0xdc, 0x3c, 0x7f, 0x2e, 0x97, 0x55, 0x0a, 0xd1, 0x70, 0xa5, 0xf0, - 0xf7, 0x11, 0xb8, 0xd5, 0xd3, 0xbd, 0x63, 0xff, 0x72, 0xc4, 0x75, 0x4e, 0x67, 0x7e, 0xdc, 0xbf, - 0x0d, 0x31, 0x67, 0x42, 0x44, 0xc4, 0x33, 0xbb, 0x25, 0x99, 0xe5, 0xcf, 0x17, 0x2e, 0xb7, 0x27, - 0xc4, 0xc6, 0x5c, 0x9e, 0xaf, 0x35, 0x9d, 0xea, 0xbc, 0xb3, 0x2c, 0xe6, 0xdf, 0x85, 0x9f, 0x2b, - 0x10, 0x63, 0x22, 0xe8, 0x1e, 0x24, 0x44, 0x85, 0x2b, 0xcd, 0xaa, 0x67, 0x27, 0x8c, 0x25, 0x1f, - 0x35, 0x21, 0x25, 0x2e, 0x95, 0xfc, 0x65, 0xb4, 0xf7, 0xcd, 0xd7, 0xaf, 0x8a, 0xef, 0x9f, 0xe7, - 0xf5, 0xa5, 0xff, 0x63, 0x89, 0xeb, 0xa6, 0x46, 0x0d, 0x27, 0xb9, 0x89, 0x06, 0xcf, 0x36, 0x54, - 0x77, 0x87, 0x84, 0xf2, 0xab, 0x21, 0x09, 0xe6, 0x20, 0x48, 0xfc, 0xcf, 0x04, 0x45, 0xc8, 0x18, - 0x23, 0x8b, 0xd8, 0x54, 0xd3, 0x4d, 0xd3, 0x7f, 0x30, 0x07, 0x41, 0xaa, 0x98, 0xa6, 0x5b, 0xfa, - 0xf3, 0x28, 0xe4, 0x97, 0x67, 0x2f, 0x97, 0x62, 0x07, 0x72, 0x6c, 0xee, 0x41, 0xcd, 0x2c, 0x67, - 0x77, 0xff, 0x4d, 0x4e, 0x93, 0xab, 0x91, 0x7b, 0x4d, 0x36, 0x70, 0xd6, 0x09, 0xb5, 0xce, 0xf5, - 0xe2, 0x4b, 0xc8, 0x86, 0x35, 0xd0, 0x63, 0x48, 0xb0, 0x63, 0xfa, 0xd4, 0x93, 0x95, 0xd8, 0xd7, - 0x2f, 0xe9, 0xae, 0xcb, 0x85, 0xb1, 0x54, 0x0a, 0xc5, 0x22, 0x72, 0x71, 0x2c, 0x4a, 0x3f, 0xe2, - 0x7f, 0xb3, 0xe1, 0x4a, 0x09, 0x88, 0xb4, 0x9f, 0xa9, 0x2b, 0x68, 0x03, 0xd6, 0xba, 0x1f, 0x57, - 0x70, 0x4d, 0x6b, 0xb5, 0x7b, 0xda, 0x7e, 0xfb, 0xb0, 0x55, 0x53, 0x15, 0x86, 0xfb, 0xad, 0xb6, - 0x26, 0xe8, 0x1d, 0xdc, 0x38, 0xa8, 0xe0, 0xe7, 0x6a, 0x04, 0xdd, 0x80, 0x75, 0x26, 0xb4, 0x48, - 0x8e, 0xb2, 0xc4, 0xd1, 0x68, 0xf5, 0xea, 0xb8, 0x55, 0x69, 0x6a, 0x75, 0x8c, 0xdb, 0x58, 0x8d, - 0xa1, 0x75, 0xc8, 0x09, 0xb1, 0x6e, 0xaf, 0xdd, 0xe9, 0xd4, 0x6b, 0x6a, 0x1c, 0xdd, 0x00, 0xb5, - 0xd3, 0xc6, 0x3d, 0xde, 0x4f, 0xa5, 0xd9, 0x6c, 0x7f, 0x52, 0xaf, 0xa9, 0xbf, 0x4e, 0xbe, 0xd7, - 0x82, 0x4c, 0x08, 0xcd, 0x59, 0x4a, 0xaa, 0x56, 0x7a, 0x95, 0x66, 0xfb, 0x89, 0xba, 0x82, 0xd6, - 0x20, 0xf3, 0xb4, 0xdb, 0x6e, 0x69, 0xdd, 0xea, 0xc7, 0xf5, 0x83, 0x8a, 0xaa, 0xf0, 0x3f, 0x91, - 0xf0, 0xfc, 0xa5, 0xc6, 0xd8, 0x68, 0x6a, 0xed, 0xea, 0xe1, 0x41, 0xbd, 0xd5, 0xeb, 0x6a, 0xfb, - 0x8d, 0xef, 0xf5, 0x58, 0x4e, 0x8b, 0xef, 0xfe, 0x8b, 0x02, 0x49, 0x56, 0xc2, 0x5a, 0xf6, 0x10, - 0x7d, 0x07, 0x60, 0x8e, 0xd4, 0x48, 0xfe, 0x65, 0x69, 0x09, 0xd0, 0x0b, 0xf9, 0x65, 0x86, 0x0c, - 0xcc, 0x1e, 0x64, 0x42, 0xa8, 0x8c, 0xa4, 0xe0, 0x32, 0xce, 0x17, 0x6e, 0x9f, 0xc3, 0x91, 0x36, - 0x3e, 0x84, 0x84, 0xc0, 0x2e, 0xb4, 0xb1, 0x88, 0x64, 0x42, 0x73, 0xf3, 0x3c, 0x78, 0xdb, 0xfd, - 0x14, 0xb2, 0xe1, 0xc8, 0xa3, 0xa7, 0x10, 0x17, 0x1f, 0x77, 0x2e, 0xdc, 0xbe, 0x85, 0xad, 0x8b, - 0x57, 0xce, 0x3d, 0xe5, 0x03, 0x65, 0xef, 0xd1, 0x17, 0xff, 0xb5, 0xb5, 0xf2, 0xc5, 0x2f, 0xb7, - 0x94, 0x5f, 0xfc, 0x72, 0x4b, 0xf9, 0xfc, 0xbf, 0xb7, 0x94, 0x4f, 0xdf, 0x1d, 0x5a, 0xf4, 0x68, - 0xda, 0x2f, 0x1b, 0xce, 0x78, 0x87, 0x78, 0x74, 0xaa, 0xbb, 0x33, 0xf1, 0x97, 0xca, 0xa5, 0x3f, - 0x59, 0xf6, 0x13, 0xbc, 0xfd, 0xe1, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x43, 0x43, 0xfd, 0x31, - 0x80, 0x29, 0x00, 0x00, + // 3749 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4d, 0x6c, 0x23, 0xc9, + 0x75, 0x56, 0xf3, 0x9f, 0x8f, 0xa4, 0xd4, 0x2a, 0x69, 0x66, 0x38, 0xdc, 0x1d, 0x51, 0x43, 0xc7, + 0xd8, 0xd9, 0x1d, 0x2f, 0xb5, 0xd6, 0xc2, 0xce, 0xce, 0x0c, 0x26, 0x06, 0xff, 0x34, 0xcb, 0x19, + 0x8a, 0x64, 0x9a, 0x94, 0xd7, 0xb3, 0x80, 0xd1, 0x68, 0x76, 0x17, 0xa9, 0x1e, 0x35, 0xbb, 0x99, + 0xee, 0xa2, 0x46, 0xf4, 0x25, 0x41, 0x60, 0x20, 0xc0, 0x22, 0x01, 0x7c, 0x09, 0xec, 0x9b, 0x37, + 0x06, 0xf2, 0x73, 0xce, 0x2d, 0xc9, 0xc5, 0x40, 0x2e, 0x7b, 0x0a, 0x8c, 0x04, 0xb9, 0x04, 0xc1, + 0x2c, 0xe2, 0x1c, 0xec, 0x53, 0x72, 0x9f, 0x53, 0x50, 0x3f, 0xdd, 0x6c, 0x8a, 0x1a, 0x89, 0x5a, + 0x3b, 0x07, 0x5f, 0x88, 0xae, 0xf7, 0x57, 0x55, 0xef, 0x55, 0x7d, 0xef, 0x55, 0x15, 0xe1, 0xed, + 0x91, 0xb3, 0x37, 0x71, 0x1d, 0xe2, 0xe8, 0x8e, 0xe5, 0xed, 0x0d, 0x2d, 0xe7, 0x25, 0xfb, 0x29, + 0x33, 0x1a, 0x8a, 0xd1, 0xef, 0xc2, 0xce, 0xc0, 0x75, 0x4e, 0xb0, 0x1b, 0xc8, 0x05, 0x1f, 0x5c, + 0xaa, 0xb0, 0xab, 0x3b, 0xb6, 0x37, 0x1d, 0x5f, 0x22, 0xb1, 0x3d, 0x72, 0x46, 0x0e, 0xfb, 0xdc, + 0xa3, 0x5f, 0x82, 0x5a, 0x1c, 0x39, 0xce, 0xc8, 0xc2, 0x5c, 0x78, 0x30, 0x1d, 0xee, 0x11, 0x73, + 0x8c, 0x3d, 0xa2, 0x8d, 0x27, 0x5c, 0xa0, 0xf4, 0x18, 0xe2, 0x3d, 0xcb, 0xd4, 0x31, 0xda, 0x86, + 0xf8, 0x00, 0x8f, 0x4c, 0x3b, 0x2f, 0xed, 0x4a, 0xf7, 0x72, 0x0a, 0x6f, 0x20, 0x19, 0xa2, 0xd8, + 0x36, 0xf2, 0x11, 0x46, 0xa3, 0x9f, 0x0f, 0xb3, 0xbf, 0xf8, 0xab, 0xe2, 0xda, 0x8f, 0x7e, 0x56, + 0x5c, 0xfb, 0xc9, 0xcf, 0x8a, 0x6b, 0x25, 0x1b, 0xd2, 0x47, 0x47, 0xcd, 0x7a, 0x57, 0x73, 0x89, + 0x87, 0x10, 0xc4, 0x6c, 0xc7, 0xc0, 0xcc, 0x42, 0x42, 0x61, 0xdf, 0xe8, 0x11, 0xc4, 0x75, 0xcb, + 0xd1, 0x4f, 0x98, 0x89, 0x44, 0xf5, 0xeb, 0xaf, 0x5f, 0x15, 0xef, 0x8e, 0x9c, 0xf2, 0x48, 0xfb, + 0x01, 0x26, 0x04, 0x97, 0x0d, 0x7c, 0xba, 0xa7, 0x3b, 0x2e, 0xde, 0x1b, 0x63, 0xcf, 0xd3, 0x46, + 0xb8, 0x5c, 0xa3, 0xc2, 0x0a, 0xd7, 0x79, 0x28, 0xff, 0xfa, 0xf3, 0xa2, 0xb4, 0xd0, 0xdf, 0xbf, + 0x4b, 0x00, 0x5d, 0xd7, 0x79, 0x81, 0x75, 0x62, 0x3a, 0x6c, 0x78, 0x13, 0xe2, 0xb2, 0x0e, 0xd3, + 0x0a, 0xfd, 0xa4, 0xd3, 0x18, 0x9a, 0xd8, 0xe2, 0x43, 0x4e, 0x2b, 0xbc, 0x81, 0x0a, 0x90, 0xc2, + 0x67, 0x13, 0xcb, 0xd4, 0x4d, 0x92, 0x8f, 0xee, 0x4a, 0xf7, 0x52, 0x4a, 0xd0, 0x46, 0xf7, 0x40, + 0x36, 0x3d, 0x75, 0xa2, 0xb9, 0xc4, 0xa4, 0x36, 0xd5, 0x13, 0x3c, 0xcb, 0xc7, 0x98, 0xcc, 0xba, + 0xe9, 0x75, 0x7d, 0xf2, 0x33, 0x3c, 0x43, 0xbf, 0x07, 0xeb, 0x54, 0xd2, 0x35, 0xc7, 0x9a, 0x3b, + 0x63, 0x72, 0x71, 0x26, 0x97, 0x35, 0xbd, 0x2e, 0x27, 0x52, 0xa9, 0x0f, 0x21, 0x6d, 0xda, 0x43, + 0xec, 0x62, 0x5b, 0xc7, 0xf9, 0xc4, 0xae, 0x74, 0x2f, 0xb3, 0xbf, 0x51, 0x66, 0x01, 0x6f, 0xfa, + 0xe4, 0x6a, 0xec, 0x8b, 0x57, 0xc5, 0x35, 0x65, 0x2e, 0x57, 0xfa, 0xcf, 0x04, 0xa4, 0x03, 0x36, + 0x9d, 0x04, 0x99, 0x4d, 0xb0, 0x97, 0x97, 0x76, 0xa3, 0x74, 0x12, 0xac, 0x81, 0xca, 0x90, 0xf0, + 0x88, 0x6b, 0xda, 0x23, 0x36, 0x85, 0xcc, 0xfe, 0xcd, 0x73, 0x56, 0xcb, 0x3d, 0xc6, 0x55, 0x84, + 0x14, 0xb3, 0x62, 0x12, 0x0b, 0xb3, 0xd9, 0x50, 0x2b, 0xb4, 0x81, 0x76, 0x21, 0x63, 0x60, 0x4f, + 0x77, 0xcd, 0x09, 0x9d, 0x16, 0x9b, 0x41, 0x5a, 0x09, 0x93, 0xd0, 0x23, 0xc8, 0x1a, 0x78, 0xa8, + 0x4d, 0x2d, 0xa2, 0xbe, 0xf0, 0x1c, 0x9b, 0xcd, 0x21, 0x5d, 0x7d, 0xfb, 0xf5, 0xab, 0x62, 0x1e, + 0xdb, 0xba, 0x63, 0x98, 0xf6, 0x68, 0x8f, 0x32, 0xca, 0x8a, 0xf6, 0xf2, 0x90, 0x87, 0x4d, 0x49, + 0x0a, 0x0d, 0x74, 0x13, 0x12, 0x1e, 0xd6, 0x5d, 0x4c, 0xf2, 0x49, 0xe6, 0x1b, 0xd1, 0xa2, 0x83, + 0xc7, 0x67, 0xa6, 0x47, 0xbc, 0x7c, 0x6a, 0x57, 0xba, 0xb7, 0xbe, 0x3c, 0xf8, 0x06, 0xe3, 0x2a, + 0x42, 0x0a, 0x7d, 0x13, 0x92, 0x36, 0x5d, 0xef, 0xa6, 0x9e, 0x4f, 0xb3, 0xd9, 0xde, 0x3a, 0xaf, + 0xd0, 0xe6, 0x6c, 0xc5, 0x97, 0x43, 0xf7, 0x21, 0xae, 0xb9, 0xae, 0x36, 0xcb, 0x03, 0x53, 0xb8, + 0x71, 0x5e, 0xa1, 0x42, 0x99, 0x0a, 0x97, 0x29, 0xfc, 0x54, 0x82, 0x04, 0xf7, 0x17, 0xba, 0x0b, + 0x59, 0xdd, 0xb1, 0x09, 0xb6, 0x89, 0x4a, 0x1d, 0xcd, 0xbc, 0x9b, 0x56, 0x32, 0x82, 0xd6, 0x9f, + 0x4d, 0x30, 0x9d, 0xd5, 0xd0, 0x71, 0xc7, 0x1a, 0x11, 0xbe, 0x14, 0x2d, 0xf4, 0x2e, 0xc8, 0xbe, + 0xaa, 0xef, 0x1a, 0x36, 0xef, 0xb4, 0xb2, 0x21, 0xe8, 0x0d, 0x41, 0x46, 0x77, 0x00, 0xc6, 0xda, + 0x99, 0x6a, 0x61, 0x7b, 0x44, 0x8e, 0x99, 0x4f, 0x73, 0x4a, 0x7a, 0xac, 0x9d, 0xb5, 0x18, 0xe1, + 0x69, 0x2c, 0x25, 0xc9, 0x91, 0xa7, 0xb1, 0x54, 0x44, 0x8e, 0x3e, 0x8d, 0xa5, 0xe2, 0x72, 0xa2, + 0xf0, 0xc7, 0x90, 0x14, 0x53, 0x44, 0x45, 0xc8, 0x1c, 0x6b, 0x9e, 0x3a, 0x36, 0x6d, 0x73, 0x3c, + 0x1d, 0xb3, 0xe5, 0x9e, 0x52, 0xe0, 0x58, 0xf3, 0x0e, 0x39, 0x05, 0xe5, 0x21, 0xe9, 0x33, 0xe9, + 0xba, 0x97, 0x14, 0xbf, 0x19, 0xa8, 0x6a, 0x67, 0x8c, 0x1b, 0x9d, 0xab, 0x72, 0x0a, 0x53, 0x15, + 0xcc, 0x98, 0x50, 0xe5, 0xcd, 0xc2, 0x0f, 0x25, 0x88, 0x33, 0x9f, 0xa1, 0xb7, 0x20, 0x3d, 0x36, + 0x6d, 0xd5, 0x24, 0x78, 0xec, 0x09, 0x7c, 0x48, 0x8d, 0x4d, 0xbb, 0x49, 0xdb, 0xa8, 0x04, 0x39, + 0xd1, 0x83, 0x10, 0x88, 0xb0, 0x3e, 0x32, 0xbc, 0x0f, 0x2e, 0x43, 0x0d, 0x04, 0xfc, 0xa8, 0x30, + 0xe0, 0x33, 0xef, 0x00, 0x50, 0x86, 0xca, 0x97, 0x7c, 0x8c, 0x2d, 0xf9, 0x34, 0xa5, 0x50, 0xd7, + 0x7b, 0xa5, 0x2a, 0x24, 0xf8, 0xda, 0x40, 0x19, 0x48, 0x36, 0xdb, 0xdf, 0xad, 0xb4, 0x9a, 0x75, + 0x79, 0x0d, 0xa5, 0x20, 0x76, 0x78, 0xd4, 0xeb, 0xcb, 0x12, 0x4a, 0x42, 0xf4, 0xb0, 0xf2, 0x5c, + 0x8e, 0xa0, 0x2c, 0xa4, 0x9a, 0x87, 0xdd, 0x56, 0xb3, 0xd6, 0xec, 0xcb, 0x51, 0x04, 0x90, 0xa8, + 0x55, 0xda, 0xed, 0x4e, 0x5f, 0x8e, 0x95, 0x9e, 0x43, 0xa6, 0x8d, 0xc9, 0x4b, 0xc7, 0x3d, 0xe9, + 0x3a, 0x2e, 0x5b, 0xa4, 0xf6, 0x74, 0x3c, 0xc0, 0xae, 0x98, 0x8c, 0x68, 0x51, 0x98, 0xf0, 0x51, + 0x55, 0xe0, 0x47, 0xd0, 0xa6, 0x3a, 0x93, 0xe9, 0xc0, 0x32, 0x75, 0xe1, 0x43, 0xd1, 0x2a, 0xfd, + 0xeb, 0x06, 0xac, 0xd7, 0x1c, 0xcb, 0xe2, 0x88, 0xd4, 0x9b, 0x60, 0x1d, 0x95, 0x20, 0x66, 0x6b, + 0x63, 0x8e, 0x83, 0xe9, 0xea, 0xfa, 0xeb, 0x57, 0x45, 0x98, 0x4b, 0x28, 0x8c, 0x87, 0xea, 0xb0, + 0xf9, 0xd2, 0x35, 0x09, 0x56, 0x3d, 0xfd, 0x18, 0x8f, 0x35, 0xbe, 0xd3, 0x52, 0x2b, 0xec, 0xb4, + 0x0c, 0x53, 0xeb, 0x31, 0x2d, 0x54, 0x05, 0xd9, 0xc5, 0x9a, 0xb1, 0x60, 0x24, 0xb3, 0x82, 0x11, + 0xa0, 0x5a, 0xc2, 0x86, 0x0c, 0x51, 0x0a, 0x65, 0x51, 0xe6, 0x77, 0xfa, 0x89, 0x6e, 0x43, 0x6a, + 0x3a, 0x35, 0x0d, 0x95, 0x42, 0x2b, 0x5f, 0xef, 0x49, 0xda, 0xee, 0x12, 0x97, 0x2e, 0xf8, 0x39, + 0x52, 0x32, 0x6c, 0xf5, 0xf2, 0x71, 0xa6, 0xb9, 0x11, 0xd0, 0x0f, 0x18, 0x19, 0x7d, 0x04, 0x99, + 0x49, 0x80, 0xd4, 0x5e, 0x3e, 0xb1, 0x1b, 0xbd, 0x97, 0xd9, 0x97, 0xf9, 0xa6, 0x9c, 0x43, 0xb8, + 0x80, 0xc2, 0xb0, 0x28, 0xf5, 0x8d, 0xa6, 0x9f, 0xa8, 0x04, 0x8f, 0x27, 0x96, 0x46, 0x30, 0x9f, + 0x56, 0x72, 0x15, 0xdf, 0x68, 0xfa, 0x49, 0x5f, 0x68, 0xa1, 0x3a, 0xa0, 0xf9, 0x50, 0x7d, 0x5b, + 0x02, 0x4c, 0x6e, 0x94, 0x83, 0xec, 0xf9, 0xd4, 0x99, 0xba, 0xb6, 0x66, 0xd1, 0xc0, 0x29, 0x9b, + 0x81, 0x42, 0x60, 0xe5, 0x3b, 0x00, 0x06, 0x76, 0xcd, 0x53, 0x8d, 0xa1, 0x65, 0x96, 0x69, 0x17, + 0xf9, 0x24, 0x16, 0xa3, 0x5e, 0xae, 0x07, 0x62, 0x4a, 0x48, 0xa5, 0xf0, 0xf7, 0x19, 0x80, 0x39, + 0x0b, 0xf5, 0x61, 0x5d, 0x77, 0x6c, 0x1b, 0xeb, 0xc4, 0x71, 0x39, 0xdc, 0x48, 0x0c, 0x0f, 0xdf, + 0xbf, 0xc2, 0x66, 0xb9, 0xe6, 0x6b, 0xd1, 0x5d, 0xa1, 0xe4, 0xf4, 0x70, 0x13, 0x3d, 0x00, 0x0a, + 0x57, 0x43, 0x73, 0xc4, 0x7d, 0x15, 0x59, 0xc1, 0x57, 0x09, 0xae, 0x80, 0x3a, 0x00, 0xc4, 0xd5, + 0x6c, 0x8f, 0x22, 0x9a, 0xc7, 0x56, 0x41, 0x66, 0xff, 0xdd, 0xab, 0x06, 0xd3, 0xf7, 0x35, 0x44, + 0xf8, 0x42, 0x26, 0xd0, 0x27, 0xb0, 0xe9, 0x1d, 0x4f, 0x87, 0x43, 0x0b, 0xd3, 0x14, 0x19, 0xda, + 0xd5, 0xeb, 0xfb, 0xf7, 0xaf, 0xb2, 0xdb, 0xe3, 0x8a, 0x6c, 0x8a, 0x1b, 0xc2, 0xca, 0x33, 0x3c, + 0x63, 0x40, 0x80, 0x1e, 0xc2, 0xba, 0x77, 0xac, 0xb9, 0xc6, 0x3c, 0x98, 0x71, 0x16, 0x8e, 0xad, + 0xb2, 0x5f, 0x1c, 0x95, 0x7b, 0x94, 0xcf, 0x42, 0x99, 0x63, 0xa2, 0x41, 0x18, 0x9b, 0x70, 0xc3, + 0xc5, 0xba, 0x73, 0x8a, 0xdd, 0x99, 0x6a, 0x39, 0xa3, 0xb9, 0x89, 0xc4, 0x65, 0xeb, 0x61, 0xcb, + 0xd7, 0x69, 0x39, 0xa3, 0xc0, 0xd4, 0xb7, 0x21, 0x67, 0x73, 0x2c, 0x51, 0x27, 0x8e, 0x4b, 0xbc, + 0x7c, 0x92, 0xf9, 0x6c, 0x93, 0xcf, 0x2d, 0x04, 0x33, 0x4a, 0xd6, 0x9e, 0x37, 0x3c, 0xf4, 0x29, + 0x6c, 0x99, 0xb6, 0xa6, 0x13, 0xf3, 0x14, 0xab, 0x21, 0x8f, 0xa7, 0xae, 0xe9, 0x71, 0x05, 0xf9, + 0x56, 0x02, 0x92, 0x57, 0xf8, 0x69, 0x1c, 0xd2, 0x41, 0x13, 0xdd, 0x5d, 0xc0, 0x9f, 0xdc, 0xeb, + 0x57, 0xc5, 0x39, 0x53, 0xc0, 0xcf, 0x43, 0x00, 0x3d, 0xe8, 0x8b, 0xad, 0x97, 0xcc, 0xfe, 0xf6, + 0x45, 0x63, 0xf0, 0x03, 0x3c, 0x97, 0x46, 0xad, 0xf0, 0xc6, 0xf2, 0xb0, 0xc5, 0x96, 0xa1, 0xa8, + 0x49, 0x6e, 0xcd, 0x1d, 0xd9, 0xd2, 0x06, 0xd8, 0xea, 0x09, 0xb6, 0x30, 0x33, 0xdf, 0x60, 0x3e, + 0x83, 0x63, 0xae, 0xe9, 0xb8, 0x26, 0xe1, 0x65, 0x57, 0x4e, 0x09, 0xda, 0xe8, 0x1b, 0x80, 0x18, + 0xbc, 0x19, 0xd8, 0xd2, 0x66, 0xaa, 0x87, 0x75, 0xc7, 0x66, 0x78, 0x43, 0xa5, 0x18, 0xf0, 0xd5, + 0x29, 0xa3, 0xc7, 0xe9, 0x34, 0xd5, 0x85, 0x16, 0x1e, 0x03, 0x9c, 0xb4, 0x02, 0xf3, 0x55, 0x84, + 0x8e, 0xa0, 0xe0, 0x0b, 0x58, 0xda, 0x78, 0x60, 0x68, 0x6a, 0x78, 0xd3, 0xac, 0x02, 0x30, 0x5b, + 0x42, 0xbf, 0xc5, 0xd4, 0x6b, 0x7c, 0x07, 0x1d, 0x00, 0xba, 0xc0, 0xdc, 0x2a, 0x58, 0x9e, 0xb5, + 0xc2, 0x76, 0xde, 0x82, 0x34, 0x9b, 0xad, 0x63, 0x5b, 0x33, 0x86, 0x53, 0x29, 0x25, 0x45, 0x09, + 0x1d, 0xdb, 0x9a, 0xa1, 0x32, 0x6c, 0xbd, 0xe0, 0x2b, 0x53, 0xe5, 0x88, 0x3f, 0x1d, 0x0e, 0xcd, + 0x33, 0x56, 0xea, 0xa4, 0x95, 0x4d, 0xc1, 0x52, 0x28, 0xaa, 0x33, 0x06, 0x7a, 0x00, 0x60, 0x3b, + 0x44, 0x1d, 0xe0, 0xa1, 0xe3, 0x62, 0x96, 0x13, 0x32, 0xfb, 0x85, 0x32, 0x3f, 0x0d, 0x94, 0xfd, + 0xd3, 0x40, 0xb9, 0xef, 0x9f, 0x06, 0x94, 0xb4, 0xed, 0x90, 0x2a, 0x13, 0x46, 0xbf, 0x0f, 0xb4, + 0xa1, 0x6a, 0x43, 0x82, 0x5d, 0x81, 0x78, 0x97, 0x69, 0xa6, 0x6c, 0x87, 0x54, 0xa8, 0x2c, 0x0d, + 0xe5, 0x40, 0xd3, 0x4f, 0x86, 0xa6, 0x65, 0xe5, 0x73, 0x3c, 0x94, 0x7e, 0xbb, 0xf4, 0x7d, 0xc8, + 0x2d, 0x20, 0x18, 0x2a, 0xc0, 0x4d, 0x91, 0xcc, 0xd5, 0x5a, 0xa7, 0xdd, 0x6e, 0xd4, 0xfa, 0x1d, + 0x45, 0xed, 0x3f, 0xef, 0x36, 0xe4, 0x35, 0x9a, 0xba, 0x7b, 0x7f, 0xd8, 0x6a, 0xf6, 0x1b, 0xb2, + 0x84, 0xd6, 0x01, 0x28, 0xb5, 0x57, 0x53, 0x9a, 0xdd, 0xbe, 0x1c, 0x41, 0x69, 0x88, 0x37, 0x0f, + 0x2b, 0x4f, 0x1a, 0x72, 0x94, 0x7e, 0xb6, 0x3a, 0xb5, 0x4a, 0x4b, 0x8e, 0x95, 0x0e, 0x21, 0x13, + 0xc2, 0x0e, 0x94, 0x87, 0x6d, 0xdf, 0x78, 0xef, 0xe3, 0xa3, 0x83, 0x83, 0x56, 0xc3, 0x37, 0x9d, + 0x81, 0x64, 0xb5, 0xd3, 0x69, 0x35, 0x2a, 0x6d, 0x59, 0xe2, 0x05, 0x45, 0xbf, 0xf1, 0xa4, 0xa1, + 0xc8, 0x11, 0xd6, 0x69, 0x5f, 0x69, 0xb6, 0x9f, 0xc8, 0xd1, 0xd2, 0x8f, 0x23, 0xb0, 0xce, 0xd2, + 0x18, 0x5f, 0xa6, 0x74, 0xd5, 0x23, 0x88, 0x9d, 0xe0, 0x99, 0x5f, 0x92, 0xb3, 0x6f, 0x5a, 0x13, + 0x9c, 0x6a, 0xd6, 0x14, 0xd3, 0x9a, 0x87, 0x52, 0x45, 0x8b, 0x3a, 0xc2, 0x70, 0xf4, 0xe9, 0x18, + 0xdb, 0x44, 0x54, 0x93, 0x41, 0x1b, 0x9d, 0xc2, 0x0d, 0x96, 0x37, 0xc3, 0x8b, 0x45, 0x1d, 0x6b, + 0x13, 0x06, 0x91, 0x99, 0xfd, 0x6f, 0xf0, 0x4d, 0xb8, 0xd8, 0x39, 0x6f, 0xf2, 0x65, 0xf2, 0xd4, + 0x73, 0xec, 0x43, 0x6d, 0xd2, 0xb0, 0x89, 0x3b, 0xab, 0xbe, 0xfd, 0xd9, 0x97, 0x97, 0xa5, 0xc3, + 0xe1, 0x5c, 0xad, 0xd0, 0x80, 0x5b, 0x6f, 0xb0, 0xe2, 0x57, 0x00, 0xe2, 0x14, 0x45, 0x2b, 0x80, + 0x6d, 0x88, 0xb3, 0xa9, 0xf8, 0xa7, 0x28, 0xd6, 0x78, 0x18, 0xf9, 0x48, 0x2a, 0xfd, 0x3c, 0x01, + 0x99, 0x9a, 0x36, 0x21, 0x53, 0x17, 0xb3, 0x5a, 0xa7, 0xb8, 0x80, 0x35, 0x99, 0xd7, 0xaf, 0x8a, + 0x49, 0xc1, 0x16, 0x48, 0x73, 0xb0, 0x94, 0xf0, 0x22, 0x2c, 0xe1, 0xf9, 0x49, 0x74, 0x6e, 0xeb, + 0x5a, 0x29, 0x2e, 0x7a, 0x8d, 0x14, 0xf7, 0x2d, 0x48, 0x0d, 0x4c, 0x9b, 0x8a, 0x78, 0xc2, 0xcb, + 0xb7, 0x97, 0x3b, 0xaf, 0x72, 0x09, 0x25, 0x10, 0xa5, 0xb5, 0x8e, 0x69, 0x13, 0xec, 0x9e, 0x6a, + 0xd6, 0x39, 0xec, 0xd9, 0xf0, 0xe9, 0x3e, 0xf4, 0x2c, 0xa7, 0xa6, 0xc4, 0x6f, 0x9e, 0x9a, 0x92, + 0xbf, 0x79, 0x6a, 0x4a, 0xad, 0x96, 0x9a, 0x0e, 0x60, 0x33, 0x48, 0x4d, 0x81, 0xa7, 0xd2, 0x57, + 0x79, 0x4a, 0xf6, 0x75, 0x04, 0xc1, 0x2b, 0xfc, 0xaf, 0x04, 0x49, 0xd1, 0x40, 0x4f, 0x61, 0xdb, + 0xc5, 0x9e, 0x33, 0x75, 0x75, 0xbc, 0x80, 0x8b, 0xd2, 0x0a, 0x81, 0x5b, 0xf7, 0x35, 0x05, 0x32, + 0x7e, 0x0d, 0x72, 0x81, 0xad, 0x89, 0x46, 0x8e, 0xc5, 0x76, 0xcb, 0xfa, 0xc4, 0xae, 0x46, 0x8e, + 0xcf, 0xa5, 0xb4, 0xe8, 0xb5, 0x52, 0x5a, 0x18, 0xb9, 0x62, 0x8b, 0xc8, 0x45, 0x61, 0xd9, 0x23, + 0xb4, 0x0c, 0xf5, 0x0f, 0xfc, 0x69, 0x25, 0xc5, 0x08, 0xcf, 0xf0, 0xac, 0xb4, 0x7f, 0x1e, 0xd6, + 0x16, 0xce, 0x28, 0x01, 0x56, 0x25, 0xe7, 0x58, 0x95, 0x2a, 0xfd, 0x6d, 0x06, 0xb6, 0x0e, 0x35, + 0x82, 0x5d, 0x53, 0xb3, 0xcc, 0x1f, 0x68, 0xc1, 0xb1, 0xe1, 0x9d, 0x85, 0xad, 0xb4, 0xf5, 0xfa, + 0x55, 0x71, 0xe3, 0x9c, 0x98, 0xd8, 0x52, 0xed, 0x37, 0x6c, 0xa9, 0x77, 0xf8, 0x6c, 0x2f, 0xb0, + 0xfd, 0xff, 0xb6, 0xb5, 0x1e, 0x2f, 0x6d, 0xad, 0xbb, 0x6f, 0x1e, 0xc4, 0xf2, 0x16, 0xfb, 0x1d, + 0x2f, 0xe9, 0xda, 0x6f, 0xde, 0x37, 0x2b, 0xb8, 0x61, 0x79, 0xff, 0xfc, 0x4b, 0xe2, 0x77, 0x74, + 0xff, 0x5c, 0x5c, 0x12, 0x26, 0x7f, 0x0b, 0x25, 0x61, 0xfa, 0x5c, 0x49, 0x58, 0x83, 0x0d, 0x9e, + 0x3e, 0x3d, 0x3f, 0x39, 0xb2, 0x0d, 0x1b, 0x0c, 0x75, 0x31, 0x71, 0x8a, 0x3e, 0xd6, 0x87, 0x8b, + 0xb9, 0xfc, 0x6b, 0x90, 0x33, 0xb0, 0x45, 0x34, 0x75, 0x3a, 0x31, 0x34, 0x82, 0x3d, 0xff, 0x1e, + 0x8f, 0x11, 0x8f, 0x38, 0x0d, 0x0d, 0x00, 0x19, 0x78, 0xe2, 0x62, 0x5d, 0x23, 0xd8, 0x50, 0x45, + 0xe1, 0x27, 0x16, 0xd7, 0x87, 0x57, 0x46, 0xb7, 0x5c, 0x0f, 0x74, 0x45, 0x61, 0xa2, 0x6c, 0x1a, + 0xe7, 0x49, 0x6f, 0xaa, 0xea, 0x52, 0xab, 0x55, 0x75, 0xf0, 0x95, 0xab, 0xba, 0xcc, 0x57, 0xac, + 0xea, 0xb2, 0x97, 0x61, 0x63, 0x6e, 0x11, 0x1b, 0x0b, 0x7f, 0x22, 0xc1, 0xe6, 0x92, 0x17, 0xd0, + 0x1d, 0x80, 0x91, 0xeb, 0x4c, 0x27, 0xea, 0x1c, 0xeb, 0x94, 0x34, 0xa3, 0xb4, 0x29, 0xb6, 0xfd, + 0x56, 0x0f, 0x17, 0xa5, 0xc7, 0xab, 0xc1, 0x73, 0x6a, 0x0e, 0xcf, 0x69, 0xfa, 0x59, 0x6f, 0x3c, + 0xab, 0x1c, 0xc8, 0x50, 0xfa, 0x9f, 0x34, 0x24, 0x3a, 0x95, 0x29, 0x39, 0xde, 0x17, 0x57, 0x43, + 0xa7, 0xa6, 0x81, 0xfd, 0xeb, 0xe6, 0xa0, 0x8d, 0xde, 0x83, 0x4d, 0x6d, 0x4a, 0x8e, 0xd5, 0xa9, + 0x6b, 0xcd, 0x51, 0x88, 0x57, 0x4e, 0x1b, 0x94, 0x71, 0xe4, 0x5a, 0x01, 0xd4, 0x3c, 0x80, 0xdb, + 0x9a, 0xae, 0x63, 0xcf, 0x53, 0x89, 0x73, 0x82, 0xed, 0x45, 0x1d, 0x5e, 0x2b, 0xde, 0xe4, 0x02, + 0x7d, 0xca, 0x0f, 0xab, 0x96, 0x61, 0x6b, 0x41, 0x75, 0x8c, 0xc9, 0xb1, 0x63, 0xf0, 0xfb, 0x1e, + 0x65, 0x33, 0xa4, 0x74, 0xc8, 0x18, 0x6c, 0x58, 0x61, 0xf9, 0x81, 0x63, 0xcc, 0xc4, 0x7d, 0xce, + 0x46, 0x48, 0xba, 0xea, 0x18, 0x33, 0xf4, 0x43, 0x09, 0xee, 0x2c, 0x08, 0x1f, 0x63, 0xcd, 0xc0, + 0xae, 0x37, 0x2f, 0x4f, 0xe3, 0x0c, 0xd6, 0xc4, 0x09, 0x9e, 0x3b, 0xa5, 0x5c, 0x99, 0x5b, 0xf9, + 0x98, 0xcb, 0x5f, 0xa3, 0x3a, 0x45, 0xda, 0x92, 0x36, 0xfa, 0x4c, 0x82, 0x9d, 0x85, 0x61, 0xb8, + 0xd8, 0x9b, 0x38, 0xb6, 0x87, 0xe7, 0xe3, 0x48, 0x84, 0xcb, 0xe4, 0xe5, 0x71, 0x28, 0x42, 0xe1, + 0x1a, 0x03, 0x09, 0xfb, 0xdb, 0x57, 0x3f, 0xd4, 0x26, 0xe8, 0x11, 0x14, 0x5c, 0x3c, 0x74, 0xb1, + 0x77, 0x7c, 0x51, 0xac, 0xf8, 0x35, 0xef, 0x2d, 0x21, 0xb1, 0x14, 0xac, 0x0f, 0x28, 0x7c, 0x87, + 0x95, 0x45, 0xb4, 0xb2, 0x4c, 0x0d, 0x85, 0xd5, 0x44, 0xb8, 0xd8, 0x61, 0x37, 0xac, 0xc1, 0xe2, + 0xc5, 0xa1, 0x40, 0x0e, 0xcb, 0xb3, 0x80, 0xfd, 0x99, 0x04, 0x3b, 0x8b, 0xe2, 0x4b, 0x11, 0x4b, + 0x5f, 0xe0, 0x29, 0x25, 0x64, 0xe7, 0xfa, 0x21, 0xdb, 0x72, 0x97, 0xd5, 0xd1, 0x5f, 0x48, 0x50, + 0x5c, 0x1c, 0xc9, 0x72, 0xd0, 0x80, 0x0d, 0xe5, 0xfd, 0x37, 0x0e, 0xe5, 0x2b, 0x44, 0x6d, 0xc1, + 0xf3, 0xa1, 0xb0, 0x15, 0x5a, 0xb0, 0x73, 0xf9, 0xba, 0xbc, 0xce, 0x79, 0xa7, 0x70, 0x08, 0xc5, + 0x2b, 0x56, 0xd7, 0x75, 0xcd, 0x5d, 0x11, 0x82, 0x6b, 0x99, 0x6b, 0xc3, 0xee, 0x55, 0x6e, 0xbc, + 0xd6, 0xe9, 0xee, 0x1f, 0xa2, 0x90, 0xea, 0x63, 0x8f, 0xb0, 0x7a, 0x14, 0x85, 0xeb, 0x51, 0x51, + 0x7a, 0xee, 0x41, 0xdc, 0x23, 0x78, 0xc2, 0x0f, 0xbc, 0xb4, 0x4e, 0x63, 0x11, 0xf5, 0x55, 0xca, + 0x3d, 0x82, 0x27, 0x02, 0x8d, 0xb9, 0x5c, 0xe1, 0x57, 0x11, 0x88, 0x51, 0x2a, 0xfa, 0x16, 0x4d, + 0x15, 0x78, 0x12, 0xbe, 0xf3, 0xcc, 0x5f, 0xa0, 0x5d, 0x66, 0x05, 0x6a, 0x8a, 0x8a, 0x32, 0xc0, + 0xbe, 0x03, 0xc0, 0xd4, 0x4c, 0xdb, 0xc0, 0x67, 0xe2, 0x1d, 0x92, 0x19, 0x6a, 0x52, 0xc2, 0xf9, + 0xd7, 0xac, 0xe8, 0xf2, 0x6b, 0x96, 0x6f, 0xc0, 0xd3, 0x9d, 0x89, 0xff, 0x14, 0xc6, 0x0c, 0xf4, + 0x28, 0x01, 0x95, 0x17, 0xaa, 0x9e, 0xf8, 0x85, 0x37, 0xf6, 0xe1, 0x4a, 0xe7, 0x01, 0xe4, 0x0c, + 0x47, 0x17, 0xbb, 0xec, 0x14, 0xeb, 0xfc, 0x9a, 0xe9, 0x8a, 0x7a, 0x2c, 0x46, 0x55, 0xd0, 0x63, + 0x80, 0x20, 0x43, 0x79, 0xab, 0x15, 0x47, 0x21, 0x85, 0xd2, 0x0e, 0xc4, 0x98, 0x47, 0x00, 0x12, + 0xcd, 0xf6, 0x93, 0x46, 0xaf, 0xcf, 0x2f, 0x4a, 0xbe, 0xdb, 0x50, 0x9a, 0x07, 0xcf, 0x65, 0xa9, + 0xf4, 0x63, 0x09, 0xd2, 0x8a, 0x66, 0x8f, 0xf8, 0xb9, 0xfc, 0x2d, 0x48, 0x9f, 0xe0, 0x99, 0xca, + 0x9f, 0x74, 0xa9, 0xdb, 0x92, 0x4a, 0xea, 0x04, 0xcf, 0xaa, 0xec, 0x55, 0xf7, 0x16, 0x24, 0x29, + 0x13, 0xdb, 0x06, 0xf3, 0x58, 0x52, 0x49, 0x9c, 0xe0, 0x59, 0xc3, 0x36, 0x50, 0x09, 0x72, 0xae, + 0xca, 0xde, 0x5e, 0x85, 0x66, 0x8c, 0xb1, 0x33, 0x2e, 0x7b, 0x96, 0xe5, 0xca, 0x3b, 0x90, 0xf1, + 0x65, 0xa8, 0x81, 0x38, 0x93, 0x48, 0x73, 0x89, 0x86, 0x6d, 0x3c, 0x94, 0x7f, 0xf2, 0x79, 0x71, + 0xed, 0xdc, 0x23, 0xf1, 0x7a, 0x90, 0x85, 0x7b, 0xb4, 0x3a, 0x40, 0x8f, 0x20, 0xcb, 0x4b, 0x2f, + 0x63, 0xf5, 0xa2, 0x36, 0x29, 0x34, 0x50, 0x11, 0x32, 0x63, 0xec, 0x8e, 0x58, 0x29, 0xab, 0x1f, + 0x8b, 0xe7, 0x26, 0x60, 0xa4, 0x2e, 0xa5, 0x94, 0xfe, 0x46, 0x82, 0x74, 0x0f, 0xbb, 0x5d, 0xc7, + 0x32, 0x75, 0x76, 0x89, 0xe8, 0x11, 0x57, 0x25, 0xee, 0xd4, 0xa6, 0x85, 0x88, 0xa8, 0x80, 0xf8, + 0xc3, 0x8f, 0xec, 0x11, 0xb7, 0x2f, 0x18, 0xbc, 0xda, 0x79, 0x00, 0xb7, 0x6d, 0xec, 0xd1, 0x81, + 0x39, 0x83, 0x17, 0xe7, 0x95, 0xf8, 0xf2, 0xbb, 0xc9, 0x05, 0x3a, 0x83, 0x17, 0x8b, 0xaa, 0x1f, + 0xc0, 0x36, 0x7b, 0x5b, 0x3c, 0xaf, 0xc5, 0xdf, 0xbb, 0x10, 0xe3, 0x2d, 0x68, 0x94, 0xfe, 0x3a, + 0x02, 0xd0, 0x38, 0x23, 0xae, 0xa6, 0x93, 0x4a, 0xb7, 0x59, 0xf8, 0x27, 0x09, 0x12, 0xa2, 0x62, + 0x0f, 0x3f, 0xc1, 0x48, 0x8b, 0x4f, 0x30, 0x8f, 0x21, 0x13, 0x7e, 0xee, 0x59, 0xe5, 0xae, 0x1f, + 0xb8, 0x02, 0x85, 0x05, 0xba, 0x1f, 0x78, 0x01, 0x3d, 0x21, 0xae, 0x27, 0x5e, 0x7d, 0xd2, 0x8c, + 0xd2, 0x25, 0xee, 0xd2, 0xab, 0x4d, 0x6c, 0xe5, 0x57, 0x9b, 0xd2, 0x73, 0x88, 0xd5, 0x1c, 0xe3, + 0x5c, 0x89, 0x95, 0x83, 0x74, 0xad, 0xd3, 0x3e, 0x68, 0x3e, 0x39, 0x52, 0x1a, 0xfc, 0xc2, 0xad, + 0xf1, 0xbd, 0xbe, 0x52, 0xa9, 0xf5, 0xe5, 0x08, 0x42, 0xb0, 0x2e, 0x1a, 0x8d, 0xba, 0x7a, 0x74, + 0xd4, 0xac, 0xcb, 0x51, 0xb4, 0x0d, 0xf2, 0x9c, 0x76, 0xd0, 0x6c, 0xb4, 0xea, 0x3d, 0x39, 0x56, + 0xfa, 0x95, 0x04, 0xa9, 0xea, 0xd4, 0xb4, 0x0c, 0xea, 0xa5, 0xff, 0x58, 0xf0, 0xd2, 0x80, 0x92, + 0x55, 0xd3, 0xf0, 0xbd, 0xc4, 0xda, 0x4d, 0x63, 0xce, 0x32, 0x06, 0x02, 0xe6, 0x38, 0xab, 0x3e, + 0x60, 0x4f, 0xd4, 0xec, 0xd8, 0x23, 0xe0, 0x42, 0xb4, 0xd0, 0x3e, 0x64, 0xc4, 0x19, 0x89, 0x61, + 0x54, 0x8c, 0x61, 0xd4, 0xa6, 0x7f, 0x02, 0x0a, 0x1e, 0x83, 0x15, 0xe0, 0x52, 0x6c, 0x33, 0xde, + 0x87, 0xcd, 0xf9, 0x51, 0x5c, 0x9c, 0x0d, 0xc5, 0x25, 0x81, 0x1c, 0x30, 0xc4, 0x01, 0x12, 0xdd, + 0x85, 0xac, 0x70, 0x98, 0xea, 0x3a, 0x0e, 0xe1, 0x0f, 0xeb, 0x81, 0x13, 0x15, 0xc7, 0x21, 0xa5, + 0x2d, 0xd8, 0x54, 0xb0, 0x87, 0x09, 0xdb, 0x26, 0x0a, 0xfe, 0xa3, 0x29, 0xf6, 0x48, 0x69, 0x1b, + 0x50, 0x98, 0xc8, 0x31, 0xbe, 0xf4, 0x18, 0x50, 0xc5, 0x38, 0xd5, 0x6c, 0x1d, 0xd3, 0xaa, 0x5d, + 0xc8, 0xa2, 0x77, 0x60, 0x43, 0xe3, 0xd4, 0xe0, 0xce, 0x8a, 0x7a, 0x26, 0xa6, 0xac, 0x0b, 0xb2, + 0xb8, 0xb2, 0x2a, 0xdd, 0x80, 0xad, 0x05, 0x75, 0x61, 0xf5, 0x23, 0xc8, 0xd6, 0x1d, 0xdd, 0xab, + 0xd8, 0x46, 0x75, 0x46, 0x4f, 0x41, 0x08, 0x18, 0x78, 0x89, 0xfd, 0xc2, 0x81, 0x6c, 0x1b, 0xe2, + 0x03, 0xca, 0x64, 0x8e, 0x8d, 0x29, 0xbc, 0x51, 0xfa, 0x4b, 0x09, 0x72, 0x4d, 0x7b, 0x84, 0x3d, + 0xe2, 0x8f, 0x65, 0x11, 0x5b, 0xa5, 0x2b, 0xb1, 0x35, 0x1c, 0xce, 0xc8, 0x62, 0x38, 0x97, 0x60, + 0x37, 0xba, 0x2a, 0xec, 0x96, 0xfe, 0x2d, 0x02, 0xeb, 0xfe, 0xb8, 0xf8, 0x24, 0xd1, 0x3f, 0x4a, + 0xf3, 0x73, 0x17, 0x7f, 0x85, 0xa5, 0xc5, 0x13, 0xbf, 0xdb, 0x0d, 0x6a, 0xdc, 0x45, 0x1d, 0xff, + 0x12, 0xe1, 0x13, 0x2a, 0x4e, 0xd3, 0xb6, 0xc7, 0x8b, 0x94, 0xef, 0xff, 0xe9, 0x97, 0xc5, 0xfb, + 0x17, 0xfd, 0xa1, 0xe5, 0xdc, 0x1f, 0x7a, 0x7c, 0xfd, 0xcf, 0xbe, 0x2c, 0xbe, 0xb7, 0x8a, 0x78, + 0x67, 0x38, 0xf4, 0x30, 0x09, 0xce, 0x80, 0xf3, 0x6e, 0xd1, 0x1f, 0x40, 0xd6, 0x1f, 0x3b, 0x26, + 0xba, 0x21, 0x1e, 0x6f, 0x42, 0xd7, 0x1d, 0xbc, 0xa8, 0x28, 0x37, 0x88, 0x6e, 0xf8, 0xfb, 0x54, + 0x28, 0x50, 0x52, 0xa1, 0x0e, 0x37, 0x2f, 0x9e, 0xcb, 0x55, 0x95, 0x42, 0x34, 0x5c, 0x29, 0xfc, + 0x5d, 0x04, 0x6e, 0xf5, 0x35, 0xef, 0xc4, 0xbf, 0x1c, 0x71, 0x9d, 0xb3, 0x99, 0x1f, 0xf7, 0x6f, + 0x43, 0xcc, 0x99, 0x60, 0x1e, 0xf1, 0xcc, 0x7e, 0x49, 0x64, 0xf9, 0x8b, 0x85, 0xcb, 0x9d, 0x09, + 0xb6, 0x15, 0x26, 0xcf, 0xd6, 0x9a, 0x46, 0x34, 0xd6, 0x59, 0x56, 0x61, 0xdf, 0x85, 0x9f, 0x4b, + 0x10, 0xa3, 0x22, 0xe8, 0x1e, 0x24, 0x78, 0x85, 0x2b, 0xcc, 0xca, 0xe7, 0x27, 0xac, 0x08, 0x3e, + 0x6a, 0x41, 0x8a, 0x5f, 0x2a, 0xf9, 0xcb, 0xa8, 0xfa, 0xcd, 0xd7, 0xaf, 0x8a, 0xef, 0x5f, 0xe4, + 0xf5, 0xa5, 0x7f, 0x55, 0xf1, 0xeb, 0xa6, 0x66, 0x5d, 0x49, 0x32, 0x13, 0x4d, 0x96, 0x6d, 0x88, + 0xe6, 0x8e, 0x30, 0x61, 0x57, 0x43, 0x02, 0xcc, 0x81, 0x93, 0xd8, 0x9f, 0x09, 0x8a, 0x90, 0xd1, + 0x2d, 0x13, 0xdb, 0x44, 0xd5, 0x0c, 0xc3, 0x7f, 0x30, 0x07, 0x4e, 0xaa, 0x18, 0x86, 0x5b, 0xfa, + 0xf3, 0x28, 0xe4, 0x97, 0x67, 0x2f, 0x96, 0x62, 0x17, 0x72, 0x74, 0xee, 0x41, 0xcd, 0x2c, 0x66, + 0x77, 0xff, 0x4d, 0x4e, 0x13, 0xab, 0x91, 0x79, 0x4d, 0x34, 0x94, 0xac, 0x13, 0x6a, 0x5d, 0xe8, + 0xc5, 0x97, 0x90, 0x0d, 0x6b, 0xa0, 0xc7, 0x90, 0xa0, 0xc7, 0xf4, 0xa9, 0x27, 0x2a, 0xb1, 0xaf, + 0x5f, 0xd1, 0x5d, 0x8f, 0x09, 0x2b, 0x42, 0x29, 0x14, 0x8b, 0xc8, 0xe5, 0xb1, 0x28, 0xfd, 0x88, + 0xfd, 0xcd, 0x86, 0x29, 0x25, 0x20, 0xd2, 0x79, 0x26, 0xaf, 0xa1, 0x2d, 0xd8, 0xe8, 0x7d, 0x5c, + 0x51, 0xea, 0x6a, 0xbb, 0xd3, 0x57, 0x0f, 0x3a, 0x47, 0xed, 0xba, 0x2c, 0x51, 0xdc, 0x6f, 0x77, + 0x54, 0x4e, 0xef, 0x2a, 0xcd, 0xc3, 0x8a, 0xf2, 0x5c, 0x8e, 0xa0, 0x1b, 0xb0, 0x49, 0x85, 0x16, + 0xc9, 0x51, 0x9a, 0x38, 0x9a, 0xed, 0x7e, 0x43, 0x69, 0x57, 0x5a, 0x6a, 0x43, 0x51, 0x3a, 0x8a, + 0x1c, 0x43, 0x9b, 0x90, 0xe3, 0x62, 0xbd, 0x7e, 0xa7, 0xdb, 0x6d, 0xd4, 0xe5, 0x38, 0xba, 0x01, + 0x72, 0xb7, 0xa3, 0xf4, 0x59, 0x3f, 0x95, 0x56, 0xab, 0xf3, 0x49, 0xa3, 0x2e, 0xff, 0x3a, 0xf9, + 0x5e, 0x1b, 0x32, 0x21, 0x34, 0xa7, 0x29, 0xa9, 0x56, 0xe9, 0x57, 0x5a, 0x9d, 0x27, 0xf2, 0x1a, + 0xda, 0x80, 0xcc, 0xd3, 0x5e, 0xa7, 0xad, 0xf6, 0x6a, 0x1f, 0x37, 0x0e, 0x2b, 0xb2, 0xc4, 0xfe, + 0x44, 0xc2, 0xf2, 0x97, 0x1c, 0xa3, 0xa3, 0xa9, 0x77, 0x6a, 0x47, 0x87, 0x8d, 0x76, 0xbf, 0xa7, + 0x1e, 0x34, 0xbf, 0xd7, 0xa7, 0x39, 0x2d, 0xbe, 0xff, 0xcf, 0x12, 0x24, 0x69, 0x09, 0x6b, 0xda, + 0x23, 0xf4, 0x1d, 0x80, 0x39, 0x52, 0x23, 0xf1, 0x97, 0xa5, 0x25, 0x40, 0x2f, 0xe4, 0x97, 0x19, + 0x22, 0x30, 0x55, 0xc8, 0x84, 0x50, 0x19, 0x09, 0xc1, 0x65, 0x9c, 0x2f, 0xdc, 0xbe, 0x80, 0x23, + 0x6c, 0x7c, 0x08, 0x09, 0x8e, 0x5d, 0x68, 0x6b, 0x11, 0xc9, 0xb8, 0xe6, 0xf6, 0x45, 0xf0, 0xb6, + 0xff, 0x29, 0x64, 0xc3, 0x91, 0x47, 0x4f, 0x21, 0xce, 0x3f, 0xee, 0x5c, 0xba, 0x7d, 0x0b, 0x3b, + 0x97, 0xaf, 0x9c, 0x7b, 0xd2, 0x07, 0x52, 0xf5, 0xd1, 0x17, 0xff, 0xb5, 0xb3, 0xf6, 0xc5, 0x2f, + 0x77, 0xa4, 0x5f, 0xfc, 0x72, 0x47, 0xfa, 0xfc, 0xbf, 0x77, 0xa4, 0x4f, 0xdf, 0x1d, 0x99, 0xe4, + 0x78, 0x3a, 0x28, 0xeb, 0xce, 0x78, 0x0f, 0x7b, 0x64, 0xaa, 0xb9, 0x33, 0xfe, 0xc7, 0xc8, 0xa5, + 0xbf, 0x4a, 0x0e, 0x12, 0xac, 0xfd, 0xe1, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x9a, 0x9c, 0xe3, + 0x8d, 0x46, 0x29, 0x00, 0x00, } func (this *UUIDParts) Equal(that interface{}) bool { @@ -2951,18 +2945,6 @@ func (m *Projection) MarshalToSizedBuffer(dAtA []byte) (int, error) { i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if m.WriteInference != nil { - { - size, err := m.WriteInference.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintFlow(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x3a - } { size, err := m.Inference.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -3540,20 +3522,20 @@ func (m *CollectionSpec_Derivation) MarshalToSizedBuffer(dAtA []byte) (int, erro dAtA[i] = 0x2a } if len(m.ShuffleKeyTypes) > 0 { - dAtA11 := make([]byte, len(m.ShuffleKeyTypes)*10) - var j10 int + dAtA10 := make([]byte, len(m.ShuffleKeyTypes)*10) + var j9 int for _, num := range m.ShuffleKeyTypes { for num >= 1<<7 { - dAtA11[j10] = uint8(uint64(num)&0x7f | 0x80) + dAtA10[j9] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j10++ + j9++ } - dAtA11[j10] = uint8(num) - j10++ + dAtA10[j9] = uint8(num) + j9++ } - i -= j10 - copy(dAtA[i:], dAtA11[:j10]) - i = encodeVarintFlow(dAtA, i, uint64(j10)) + i -= j9 + copy(dAtA[i:], dAtA10[:j9]) + i = encodeVarintFlow(dAtA, i, uint64(j9)) i-- dAtA[i] = 0x22 } @@ -5387,10 +5369,6 @@ func (m *Projection) ProtoSize() (n int) { } l = m.Inference.ProtoSize() n += 1 + l + sovFlow(uint64(l)) - if m.WriteInference != nil { - l = m.WriteInference.ProtoSize() - n += 1 + l + sovFlow(uint64(l)) - } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -6797,42 +6775,6 @@ func (m *Projection) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field WriteInference", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowFlow - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthFlow - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthFlow - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.WriteInference == nil { - m.WriteInference = &Inference{} - } - if err := m.WriteInference.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipFlow(dAtA[iNdEx:]) diff --git a/go/protocols/flow/flow.proto b/go/protocols/flow/flow.proto index 5485a32009..b5dc5ba550 100644 --- a/go/protocols/flow/flow.proto +++ b/go/protocols/flow/flow.proto @@ -66,11 +66,6 @@ message Projection { bool is_primary_key = 5; // Inference of this projection. Inference inference = 6 [ (gogoproto.nullable) = false ]; - // Inference of this projection from the collection's write schema. - // This is set only when: - // 1) The collection has separate read and write schemas, and - // 2) The write schema defines constrains over this projection. - Inference write_inference = 7; } // Inference details type information which is statically known From 691a0024e7c1d7ab302035ba223d3d048158e9f4 Mon Sep 17 00:00:00 2001 From: Johnny Graettinger Date: Tue, 18 Feb 2025 17:36:14 -0600 Subject: [PATCH 2/3] protocols: add capture Response.SourcedSchema message SourcedSchema allows capture connectors to tell the runtime of a possible update to source-defined schema, drawn from the source systems understanding of the binding schema. The runtime will apply sourced schemas to the inference it generates for each binding. --- crates/proto-flow/src/capture.rs | 35 +- crates/proto-flow/src/capture.serde.rs | 129 +++++ crates/proto-flow/tests/regression.rs | 4 + .../regression__capture_response_json.snap | 4 + .../regression__capture_response_proto.snap | 7 +- crates/proto-grpc/src/capture.rs | 4 +- go/protocols/capture/capture.pb.go | 444 ++++++++++++++---- go/protocols/capture/capture.proto | 35 +- 8 files changed, 573 insertions(+), 89 deletions(-) diff --git a/crates/proto-flow/src/capture.rs b/crates/proto-flow/src/capture.rs index d2bdb2fc77..e01d21053d 100644 --- a/crates/proto-flow/src/capture.rs +++ b/crates/proto-flow/src/capture.rs @@ -162,6 +162,8 @@ pub mod request { pub checkpoints: u32, } } +/// Spec responds to Request.Spec. +/// Next tag: 9 #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Response { @@ -177,6 +179,8 @@ pub struct Response { pub opened: ::core::option::Option, #[prost(message, optional, tag = "6")] pub captured: ::core::option::Option, + #[prost(message, optional, tag = "8")] + pub sourced_schema: ::core::option::Option, #[prost(message, optional, tag = "7")] pub checkpoint: ::core::option::Option, /// Reserved for internal use. @@ -185,7 +189,6 @@ pub struct Response { } /// Nested message and enum types in `Response`. pub mod response { - /// Spec responds to Request.Spec. #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Spec { @@ -313,6 +316,36 @@ pub mod response { #[prost(string, tag = "2")] pub doc_json: ::prost::alloc::string::String, } + /// SourcedSchema notifies the runtime of a source-defined schema of the + /// indicated binding. It's not required that the connector know that the + /// schema has actually changed since a last SourcedSchema. + /// It's encouraged for connectors to emit SourcedSchema liberally, + /// such as on startup, or periodically, or upon encountering a previously + /// unseen column. + /// + /// SourcedSchema may be a partial schema: it may schematize some + /// specific field(s) and not others that are in active use. + /// + /// SourcedSchema should be maximally restrictive. It should disallow + /// `types` and `additionalProperties` which are not explicitly being + /// schematized. The platform will union a SourcedSchema with all other + /// SourcedSchema messages of the binding, as well as additional inference + /// updates required to fit Captured documents. + /// + /// SourcedSchema is transactional. It may be interleaved with zero or more + /// Captured documents, and multiple SourcedSchema messages may be emitted + /// for a single binding, but an emitted SourcedSchema has no effect until + /// it's followed by a Checkpoint. + #[allow(clippy::derive_partial_eq_without_eq)] + #[derive(Clone, PartialEq, ::prost::Message)] + pub struct SourcedSchema { + /// Index of the Open binding for which the schema applies. + #[prost(uint32, tag = "1")] + pub binding: u32, + /// JSON schema of documents produced by this binding. + #[prost(string, tag = "2")] + pub schema_json: ::prost::alloc::string::String, + } /// Checkpoint all preceding documents of this invocation since the last checkpoint. /// The Flow runtime may begin to commit documents in a transaction. /// Note that the runtime may include more than one checkpoint in a single transaction. diff --git a/crates/proto-flow/src/capture.serde.rs b/crates/proto-flow/src/capture.serde.rs index 6e83371413..bc31141e97 100644 --- a/crates/proto-flow/src/capture.serde.rs +++ b/crates/proto-flow/src/capture.serde.rs @@ -1136,6 +1136,9 @@ impl serde::Serialize for Response { if self.captured.is_some() { len += 1; } + if self.sourced_schema.is_some() { + len += 1; + } if self.checkpoint.is_some() { len += 1; } @@ -1161,6 +1164,9 @@ impl serde::Serialize for Response { if let Some(v) = self.captured.as_ref() { struct_ser.serialize_field("captured", v)?; } + if let Some(v) = self.sourced_schema.as_ref() { + struct_ser.serialize_field("sourcedSchema", v)?; + } if let Some(v) = self.checkpoint.as_ref() { struct_ser.serialize_field("checkpoint", v)?; } @@ -1185,6 +1191,8 @@ impl<'de> serde::Deserialize<'de> for Response { "applied", "opened", "captured", + "sourced_schema", + "sourcedSchema", "checkpoint", "internal", "$internal", @@ -1198,6 +1206,7 @@ impl<'de> serde::Deserialize<'de> for Response { Applied, Opened, Captured, + SourcedSchema, Checkpoint, Internal, } @@ -1227,6 +1236,7 @@ impl<'de> serde::Deserialize<'de> for Response { "applied" => Ok(GeneratedField::Applied), "opened" => Ok(GeneratedField::Opened), "captured" => Ok(GeneratedField::Captured), + "sourcedSchema" | "sourced_schema" => Ok(GeneratedField::SourcedSchema), "checkpoint" => Ok(GeneratedField::Checkpoint), "$internal" | "internal" => Ok(GeneratedField::Internal), _ => Err(serde::de::Error::unknown_field(value, FIELDS)), @@ -1254,6 +1264,7 @@ impl<'de> serde::Deserialize<'de> for Response { let mut applied__ = None; let mut opened__ = None; let mut captured__ = None; + let mut sourced_schema__ = None; let mut checkpoint__ = None; let mut internal__ = None; while let Some(k) = map_.next_key()? { @@ -1294,6 +1305,12 @@ impl<'de> serde::Deserialize<'de> for Response { } captured__ = map_.next_value()?; } + GeneratedField::SourcedSchema => { + if sourced_schema__.is_some() { + return Err(serde::de::Error::duplicate_field("sourcedSchema")); + } + sourced_schema__ = map_.next_value()?; + } GeneratedField::Checkpoint => { if checkpoint__.is_some() { return Err(serde::de::Error::duplicate_field("checkpoint")); @@ -1317,6 +1334,7 @@ impl<'de> serde::Deserialize<'de> for Response { applied: applied__, opened: opened__, captured: captured__, + sourced_schema: sourced_schema__, checkpoint: checkpoint__, internal: internal__.unwrap_or_default(), }) @@ -1982,6 +2000,117 @@ impl<'de> serde::Deserialize<'de> for response::Opened { deserializer.deserialize_struct("capture.Response.Opened", FIELDS, GeneratedVisitor) } } +impl serde::Serialize for response::SourcedSchema { + #[allow(deprecated)] + fn serialize(&self, serializer: S) -> std::result::Result + where + S: serde::Serializer, + { + use serde::ser::SerializeStruct; + let mut len = 0; + if self.binding != 0 { + len += 1; + } + if !self.schema_json.is_empty() { + len += 1; + } + let mut struct_ser = serializer.serialize_struct("capture.Response.SourcedSchema", len)?; + if self.binding != 0 { + struct_ser.serialize_field("binding", &self.binding)?; + } + if !self.schema_json.is_empty() { + struct_ser.serialize_field("documentSchema", crate::as_raw_json(&self.schema_json)?)?; + } + struct_ser.end() + } +} +impl<'de> serde::Deserialize<'de> for response::SourcedSchema { + #[allow(deprecated)] + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + const FIELDS: &[&str] = &[ + "binding", + "schema_json", + "documentSchema", + ]; + + #[allow(clippy::enum_variant_names)] + enum GeneratedField { + Binding, + SchemaJson, + } + impl<'de> serde::Deserialize<'de> for GeneratedField { + fn deserialize(deserializer: D) -> std::result::Result + where + D: serde::Deserializer<'de>, + { + struct GeneratedVisitor; + + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = GeneratedField; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(formatter, "expected one of: {:?}", &FIELDS) + } + + #[allow(unused_variables)] + fn visit_str(self, value: &str) -> std::result::Result + where + E: serde::de::Error, + { + match value { + "binding" => Ok(GeneratedField::Binding), + "documentSchema" | "schema_json" => Ok(GeneratedField::SchemaJson), + _ => Err(serde::de::Error::unknown_field(value, FIELDS)), + } + } + } + deserializer.deserialize_identifier(GeneratedVisitor) + } + } + struct GeneratedVisitor; + impl<'de> serde::de::Visitor<'de> for GeneratedVisitor { + type Value = response::SourcedSchema; + + fn expecting(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + formatter.write_str("struct capture.Response.SourcedSchema") + } + + fn visit_map(self, mut map_: V) -> std::result::Result + where + V: serde::de::MapAccess<'de>, + { + let mut binding__ = None; + let mut schema_json__ : Option> = None; + while let Some(k) = map_.next_key()? { + match k { + GeneratedField::Binding => { + if binding__.is_some() { + return Err(serde::de::Error::duplicate_field("binding")); + } + binding__ = + Some(map_.next_value::<::pbjson::private::NumberDeserialize<_>>()?.0) + ; + } + GeneratedField::SchemaJson => { + if schema_json__.is_some() { + return Err(serde::de::Error::duplicate_field("documentSchema")); + } + schema_json__ = Some(map_.next_value()?); + } + } + } + Ok(response::SourcedSchema { + binding: binding__.unwrap_or_default(), + schema_json: schema_json__.map(|r| Box::::from(r).into()).unwrap_or_default(), + }) + } + } + deserializer.deserialize_struct("capture.Response.SourcedSchema", FIELDS, GeneratedVisitor) + } +} impl serde::Serialize for response::Spec { #[allow(deprecated)] fn serialize(&self, serializer: S) -> std::result::Result diff --git a/crates/proto-flow/tests/regression.rs b/crates/proto-flow/tests/regression.rs index 2d9409efa4..43569a0deb 100644 --- a/crates/proto-flow/tests/regression.rs +++ b/crates/proto-flow/tests/regression.rs @@ -456,6 +456,10 @@ fn ex_capture_response() -> capture::Response { binding: 2, doc_json: json!({"captured":"doc"}).to_string(), }), + sourced_schema: Some(capture::response::SourcedSchema { + binding: 3, + schema_json: json!({"type": "string", "format": "date-time"}).to_string(), + }), checkpoint: Some(capture::response::Checkpoint { state: Some(ex_connector_state()), }), 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 3d6c6ebf8d..f1ac6db89c 100644 --- a/crates/proto-flow/tests/snapshots/regression__capture_response_json.snap +++ b/crates/proto-flow/tests/snapshots/regression__capture_response_json.snap @@ -72,6 +72,10 @@ expression: json_test(msg) "binding": 2, "doc": {"captured":"doc"} }, + "sourcedSchema": { + "binding": 3, + "documentSchema": {"format":"date-time","type":"string"} + }, "checkpoint": { "state": { "updated": {"state":"update"}, 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 da6cec88ad..ba9cb4b985 100644 --- a/crates/proto-flow/tests/snapshots/regression__capture_response_proto.snap +++ b/crates/proto-flow/tests/snapshots/regression__capture_response_proto.snap @@ -32,5 +32,8 @@ expression: proto_test(msg) |01321608 0212127b 22636170 74757265| .2.....{"capture 000001b0 |64223a22 646f6322 7d3a180a 160a127b| d":"doc"}:.....{ 000001c0 |22737461 7465223a 22757064 61746522| "state":"update" 000001d0 -|7d1001a2 06061202 48691801| }.......Hi.. 000001e0 - 000001ec +|7d100142 2a080312 267b2266 6f726d61| }..B*...&{"forma 000001e0 +|74223a22 64617465 2d74696d 65222c22| t":"date-time"," 000001f0 +|74797065 223a2273 7472696e 67227da2| type":"string"}. 00000200 +|06061202 48691801| ....Hi.. 00000210 + 00000218 diff --git a/crates/proto-grpc/src/capture.rs b/crates/proto-grpc/src/capture.rs index 063e87f08b..f618824e42 100644 --- a/crates/proto-grpc/src/capture.rs +++ b/crates/proto-grpc/src/capture.rs @@ -42,7 +42,7 @@ pub mod connector_client { /// documents of all such messages in a single transaction. /// :Response.Checkpoint: /// - The connector tells the runtime of a checkpoint: a watermark in the - /// captured documents stream which is eligble to be used as a + /// captured documents stream which is eligible to be used as a /// transaction commit boundary. /// - Whether the checkpoint becomes a commit boundary is at the /// discretion of the Flow runtime. It may combine multiple checkpoints @@ -217,7 +217,7 @@ pub mod connector_server { /// documents of all such messages in a single transaction. /// :Response.Checkpoint: /// - The connector tells the runtime of a checkpoint: a watermark in the - /// captured documents stream which is eligble to be used as a + /// captured documents stream which is eligible to be used as a /// transaction commit boundary. /// - Whether the checkpoint becomes a commit boundary is at the /// discretion of the Flow runtime. It may combine multiple checkpoints diff --git a/go/protocols/capture/capture.pb.go b/go/protocols/capture/capture.pb.go index 3d982b9a27..4ce466ee64 100644 --- a/go/protocols/capture/capture.pb.go +++ b/go/protocols/capture/capture.pb.go @@ -428,13 +428,14 @@ func (m *Request_Acknowledge) XXX_DiscardUnknown() { var xxx_messageInfo_Request_Acknowledge proto.InternalMessageInfo type Response struct { - Spec *Response_Spec `protobuf:"bytes,1,opt,name=spec,proto3" json:"spec,omitempty"` - Discovered *Response_Discovered `protobuf:"bytes,2,opt,name=discovered,proto3" json:"discovered,omitempty"` - Validated *Response_Validated `protobuf:"bytes,3,opt,name=validated,proto3" json:"validated,omitempty"` - Applied *Response_Applied `protobuf:"bytes,4,opt,name=applied,proto3" json:"applied,omitempty"` - Opened *Response_Opened `protobuf:"bytes,5,opt,name=opened,proto3" json:"opened,omitempty"` - 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"` + Spec *Response_Spec `protobuf:"bytes,1,opt,name=spec,proto3" json:"spec,omitempty"` + Discovered *Response_Discovered `protobuf:"bytes,2,opt,name=discovered,proto3" json:"discovered,omitempty"` + Validated *Response_Validated `protobuf:"bytes,3,opt,name=validated,proto3" json:"validated,omitempty"` + Applied *Response_Applied `protobuf:"bytes,4,opt,name=applied,proto3" json:"applied,omitempty"` + Opened *Response_Opened `protobuf:"bytes,5,opt,name=opened,proto3" json:"opened,omitempty"` + Captured *Response_Captured `protobuf:"bytes,6,opt,name=captured,proto3" json:"captured,omitempty"` + SourcedSchema *Response_SourcedSchema `protobuf:"bytes,8,opt,name=sourced_schema,json=sourcedSchema,proto3" json:"sourced_schema,omitempty"` + Checkpoint *Response_Checkpoint `protobuf:"bytes,7,opt,name=checkpoint,proto3" json:"checkpoint,omitempty"` // Reserved for internal use. Internal []byte `protobuf:"bytes,100,opt,name=internal,json=$internal,proto3" json:"internal,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -475,7 +476,6 @@ func (m *Response) XXX_DiscardUnknown() { var xxx_messageInfo_Response proto.InternalMessageInfo -// Spec responds to Request.Spec. type Response_Spec struct { // Protocol version must be 3032023. Protocol uint32 `protobuf:"varint,1,opt,name=protocol,proto3" json:"protocol,omitempty"` @@ -856,6 +856,69 @@ func (m *Response_Captured) XXX_DiscardUnknown() { var xxx_messageInfo_Response_Captured proto.InternalMessageInfo +// SourcedSchema notifies the runtime of a source-defined schema of the +// indicated binding. It's not required that the connector know that the +// schema has actually changed since a last SourcedSchema. +// It's encouraged for connectors to emit SourcedSchema liberally, +// such as on startup, or periodically, or upon encountering a previously +// unseen column. +// +// SourcedSchema may be a partial schema: it may schematize some +// specific field(s) and not others that are in active use. +// +// SourcedSchema should be maximally restrictive. It should disallow +// `types` and `additionalProperties` which are not explicitly being +// schematized. The platform will union a SourcedSchema with all other +// SourcedSchema messages of the binding, as well as additional inference +// updates required to fit Captured documents. +// +// SourcedSchema is transactional. It may be interleaved with zero or more +// Captured documents, and multiple SourcedSchema messages may be emitted +// for a single binding, but an emitted SourcedSchema has no effect until +// it's followed by a Checkpoint. +type Response_SourcedSchema struct { + // Index of the Open binding for which the schema applies. + Binding uint32 `protobuf:"varint,1,opt,name=binding,proto3" json:"binding,omitempty"` + // JSON schema of documents produced by this binding. + SchemaJson encoding_json.RawMessage `protobuf:"bytes,2,opt,name=schema_json,json=documentSchema,proto3,casttype=encoding/json.RawMessage" json:"schema_json,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *Response_SourcedSchema) Reset() { *m = Response_SourcedSchema{} } +func (m *Response_SourcedSchema) String() string { return proto.CompactTextString(m) } +func (*Response_SourcedSchema) ProtoMessage() {} +func (*Response_SourcedSchema) Descriptor() ([]byte, []int) { + return fileDescriptor_841a70e6e6288f13, []int{1, 6} +} +func (m *Response_SourcedSchema) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Response_SourcedSchema) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Response_SourcedSchema.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Response_SourcedSchema) XXX_Merge(src proto.Message) { + xxx_messageInfo_Response_SourcedSchema.Merge(m, src) +} +func (m *Response_SourcedSchema) XXX_Size() int { + return m.ProtoSize() +} +func (m *Response_SourcedSchema) XXX_DiscardUnknown() { + xxx_messageInfo_Response_SourcedSchema.DiscardUnknown(m) +} + +var xxx_messageInfo_Response_SourcedSchema proto.InternalMessageInfo + // Checkpoint all preceding documents of this invocation since the last checkpoint. // The Flow runtime may begin to commit documents in a transaction. // Note that the runtime may include more than one checkpoint in a single transaction. @@ -870,7 +933,7 @@ func (m *Response_Checkpoint) Reset() { *m = Response_Checkpoint{} } func (m *Response_Checkpoint) String() string { return proto.CompactTextString(m) } func (*Response_Checkpoint) ProtoMessage() {} func (*Response_Checkpoint) Descriptor() ([]byte, []int) { - return fileDescriptor_841a70e6e6288f13, []int{1, 6} + return fileDescriptor_841a70e6e6288f13, []int{1, 7} } func (m *Response_Checkpoint) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -917,6 +980,7 @@ func init() { proto.RegisterType((*Response_Applied)(nil), "capture.Response.Applied") proto.RegisterType((*Response_Opened)(nil), "capture.Response.Opened") proto.RegisterType((*Response_Captured)(nil), "capture.Response.Captured") + proto.RegisterType((*Response_SourcedSchema)(nil), "capture.Response.SourcedSchema") proto.RegisterType((*Response_Checkpoint)(nil), "capture.Response.Checkpoint") } @@ -925,81 +989,83 @@ func init() { } var fileDescriptor_841a70e6e6288f13 = []byte{ - // 1176 bytes of a gzipped FileDescriptorProto + // 1214 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcb, 0x6e, 0x1c, 0x45, - 0x17, 0x4e, 0xcf, 0xb5, 0xe7, 0xcc, 0xd8, 0xb1, 0x4b, 0xfe, 0xa3, 0x76, 0xdb, 0xb2, 0x1d, 0xc7, - 0xbf, 0xe4, 0x5c, 0x98, 0x09, 0xe3, 0x04, 0x12, 0x2e, 0x09, 0xbe, 0x10, 0x89, 0x48, 0xe0, 0xa8, - 0x0c, 0x41, 0xb0, 0x19, 0xb5, 0xab, 0xcb, 0x33, 0x8d, 0x7b, 0xba, 0x9a, 0xee, 0x1e, 0x1b, 0x4b, - 0xbc, 0x00, 0x0b, 0x1e, 0x01, 0x29, 0x62, 0xc3, 0x8a, 0xf7, 0xf0, 0x82, 0x05, 0x4f, 0x60, 0x89, - 0xb0, 0xe7, 0x01, 0x22, 0x21, 0xa1, 0xba, 0x75, 0xb7, 0xdd, 0xb6, 0x35, 0x44, 0x59, 0xb0, 0xb1, - 0xa7, 0xce, 0xf9, 0x4e, 0xd5, 0xa9, 0xef, 0x9c, 0xfa, 0x4e, 0xc3, 0x72, 0x9f, 0x75, 0xc2, 0x88, - 0x25, 0x8c, 0x30, 0x3f, 0xee, 0x10, 0x27, 0x4c, 0x46, 0x11, 0xd5, 0xff, 0xdb, 0xc2, 0x83, 0xea, - 0x6a, 0x69, 0xcf, 0x9f, 0x02, 0xef, 0xf9, 0xec, 0x50, 0xfc, 0x91, 0x30, 0x7b, 0xa6, 0xcf, 0xfa, - 0x4c, 0xfc, 0xec, 0xf0, 0x5f, 0xd2, 0xba, 0xfc, 0x73, 0x0b, 0xea, 0x98, 0x7e, 0x3b, 0xa2, 0x71, - 0x82, 0x6e, 0x42, 0x25, 0x0e, 0x29, 0xb1, 0x8c, 0x25, 0x63, 0xb5, 0xd9, 0xfd, 0x5f, 0x5b, 0x1f, - 0xa3, 0xfc, 0xed, 0x9d, 0x90, 0x12, 0x2c, 0x20, 0xe8, 0x3e, 0x98, 0xae, 0x17, 0x13, 0x76, 0x40, - 0x23, 0xab, 0x24, 0xe0, 0xb3, 0x05, 0xf8, 0x96, 0x02, 0xe0, 0x14, 0xca, 0xc3, 0x0e, 0x1c, 0xdf, - 0x73, 0x9d, 0x84, 0x5a, 0xe5, 0x0b, 0xc2, 0x9e, 0x2b, 0x00, 0x4e, 0xa1, 0xe8, 0x0e, 0x54, 0x9d, - 0x30, 0xf4, 0x8f, 0xac, 0x8a, 0x88, 0xb9, 0x56, 0x88, 0x59, 0xe7, 0x5e, 0x2c, 0x41, 0xfc, 0x1a, - 0x2c, 0xa4, 0x81, 0x55, 0xbd, 0xe0, 0x1a, 0xdb, 0x21, 0x0d, 0xb0, 0x80, 0xa0, 0x47, 0xd0, 0x74, - 0xc8, 0x7e, 0xc0, 0x0e, 0x7d, 0xea, 0xf6, 0xa9, 0x55, 0x13, 0x11, 0xf3, 0xc5, 0xed, 0x33, 0x0c, - 0xce, 0x07, 0xa0, 0x39, 0x30, 0xbd, 0x20, 0xa1, 0x51, 0xe0, 0xf8, 0x96, 0xbb, 0x64, 0xac, 0xb6, - 0x70, 0x63, 0x45, 0x1b, 0xec, 0x1f, 0x0c, 0xa8, 0x70, 0xca, 0xd0, 0x13, 0x98, 0x24, 0x2c, 0x08, - 0x28, 0x49, 0x58, 0xd4, 0x4b, 0x8e, 0x42, 0x2a, 0x18, 0x9e, 0xec, 0x2e, 0xb6, 0x45, 0x79, 0x36, - 0xe5, 0x69, 0x1c, 0xda, 0xde, 0xd4, 0xb8, 0xcf, 0x8f, 0x42, 0x8a, 0x27, 0x48, 0x7e, 0x89, 0x1e, - 0x42, 0x93, 0xb0, 0x60, 0xcf, 0xeb, 0xf7, 0xbe, 0x89, 0x59, 0x20, 0x78, 0x6f, 0x6c, 0xcc, 0xbf, - 0x3a, 0x59, 0xb4, 0x68, 0x40, 0x98, 0xeb, 0x05, 0xfd, 0x0e, 0x77, 0xb4, 0xb1, 0x73, 0xf8, 0x29, - 0x8d, 0x63, 0xa7, 0x4f, 0x71, 0x4d, 0x06, 0xd8, 0x3f, 0x1a, 0x60, 0xea, 0x7a, 0xfc, 0x17, 0xf2, - 0x79, 0x51, 0x01, 0x53, 0x17, 0x1a, 0x7d, 0x02, 0x95, 0xc0, 0x19, 0xca, 0x2c, 0x1a, 0x1b, 0xf7, - 0x5f, 0x9d, 0x2c, 0xbe, 0xdd, 0xf7, 0x92, 0xc1, 0x68, 0xb7, 0x4d, 0xd8, 0xb0, 0x43, 0xe3, 0x64, - 0xe4, 0x44, 0x47, 0xb2, 0x9f, 0x0b, 0x1d, 0xae, 0xb3, 0xc5, 0x62, 0x8b, 0x73, 0xae, 0x56, 0x7a, - 0x13, 0x57, 0x2b, 0x8f, 0x7f, 0x35, 0xf4, 0x21, 0x98, 0xbb, 0x5e, 0xc0, 0x21, 0xb1, 0x55, 0x59, - 0x2a, 0xaf, 0x36, 0xbb, 0xd7, 0x2f, 0xec, 0xf1, 0xf6, 0x86, 0x44, 0xe2, 0x34, 0x04, 0xdd, 0x83, - 0x96, 0xef, 0xc4, 0x49, 0x4f, 0x85, 0xa8, 0x2e, 0x9e, 0x2e, 0xe4, 0x8f, 0x9b, 0x1c, 0xa6, 0x0c, - 0xe8, 0xba, 0x8a, 0x3a, 0xa0, 0x51, 0xec, 0xb1, 0x40, 0x74, 0x72, 0x43, 0x42, 0x9e, 0x4b, 0x93, - 0xfd, 0xab, 0x01, 0x75, 0x75, 0x1c, 0x7a, 0x0a, 0x33, 0x11, 0x8d, 0xd9, 0x28, 0x22, 0xb4, 0x97, - 0xbf, 0xa7, 0x31, 0xc6, 0x3d, 0x27, 0x75, 0xe4, 0xa6, 0xbc, 0xef, 0x7b, 0x00, 0x84, 0xf9, 0x3e, - 0x25, 0x89, 0xa7, 0x9a, 0xa0, 0xd9, 0x9d, 0x51, 0xe9, 0xa6, 0x76, 0x9e, 0xf1, 0x46, 0xe5, 0xf8, - 0x64, 0xf1, 0x0a, 0xce, 0xa1, 0x91, 0x0d, 0xe6, 0xae, 0x43, 0xf6, 0xf7, 0x3c, 0xdf, 0x17, 0x1c, - 0x4f, 0xe0, 0x74, 0x6d, 0xff, 0x62, 0x40, 0x55, 0xbc, 0x6b, 0x74, 0x1b, 0xb4, 0xc4, 0x29, 0x69, - 0x3a, 0x87, 0x0d, 0x8d, 0x40, 0x16, 0xd4, 0x35, 0x09, 0xa2, 0x21, 0xb1, 0x5e, 0x16, 0x98, 0xad, - 0xbc, 0x16, 0xb3, 0xd5, 0x73, 0x99, 0xad, 0x70, 0x51, 0x79, 0x53, 0x89, 0xfe, 0x1f, 0xaa, 0x91, - 0x13, 0xf4, 0xb5, 0x44, 0x5e, 0x95, 0x9b, 0x60, 0x6e, 0x12, 0x5b, 0x48, 0x2f, 0x7a, 0x17, 0x20, - 0x4e, 0x9c, 0x84, 0xca, 0xd2, 0x55, 0xc6, 0x28, 0x5d, 0x55, 0xe0, 0xed, 0x0e, 0x34, 0x73, 0x8a, - 0x86, 0x96, 0xa0, 0x49, 0x06, 0x94, 0xec, 0x87, 0xcc, 0x0b, 0x92, 0x58, 0x64, 0x3e, 0x81, 0xf3, - 0xa6, 0xe5, 0xbf, 0x9b, 0x60, 0x62, 0x1a, 0x87, 0x2c, 0x88, 0x29, 0xba, 0x75, 0x6a, 0x4a, 0xe4, - 0xb5, 0x58, 0x02, 0xf2, 0x63, 0xe2, 0x03, 0x00, 0xad, 0xfd, 0xd4, 0x55, 0xbd, 0x31, 0x5f, 0x8c, - 0xd8, 0x4a, 0x31, 0x38, 0x87, 0x47, 0x0f, 0xa1, 0xa1, 0x47, 0x80, 0xab, 0xb8, 0x98, 0x2b, 0x06, - 0xeb, 0xb7, 0xe4, 0xe2, 0x0c, 0x8d, 0xd6, 0xa0, 0xce, 0x87, 0x81, 0x47, 0x5d, 0x55, 0xe6, 0xd9, - 0x62, 0xe0, 0xba, 0x04, 0x60, 0x8d, 0x44, 0x77, 0xa1, 0xc6, 0xa7, 0x02, 0x75, 0xd5, 0xa3, 0xb3, - 0x8a, 0x31, 0xdb, 0xc2, 0x8f, 0x15, 0x0e, 0xbd, 0x03, 0xa6, 0x82, 0xb8, 0x6a, 0x78, 0xd8, 0xc5, - 0x18, 0x55, 0x7d, 0x17, 0xa7, 0x58, 0xce, 0x4b, 0xc6, 0xaf, 0x55, 0xbf, 0x88, 0x97, 0xcd, 0x14, - 0x83, 0x73, 0xf8, 0xcb, 0xa7, 0xce, 0x6f, 0x25, 0x35, 0x75, 0x6c, 0x30, 0xb5, 0x54, 0xaa, 0x9a, - 0xa6, 0x6b, 0xf4, 0x04, 0x90, 0x7a, 0xf6, 0x31, 0x19, 0xd0, 0xa1, 0x33, 0xbe, 0x80, 0xb7, 0x64, - 0xdc, 0x8e, 0x08, 0x43, 0x5f, 0xc2, 0xdc, 0x59, 0x1d, 0xc9, 0x6f, 0x38, 0x8e, 0x6c, 0xce, 0x9c, - 0x96, 0x13, 0xb5, 0xf1, 0x6d, 0x98, 0x76, 0x19, 0x19, 0x0d, 0x69, 0x90, 0x38, 0x5c, 0x29, 0x7a, - 0xa3, 0xc8, 0x97, 0x2d, 0x8e, 0xa7, 0x4e, 0x39, 0xbe, 0x88, 0x7c, 0xb4, 0x02, 0x35, 0xe6, 0x8c, - 0x92, 0x41, 0x57, 0xd5, 0xad, 0x25, 0x1f, 0xcc, 0xf6, 0x3a, 0xb7, 0x61, 0xe5, 0x43, 0xf7, 0xe0, - 0x5a, 0x9a, 0x6b, 0xe8, 0x24, 0x83, 0x9e, 0x20, 0x93, 0x46, 0xb1, 0x55, 0x5b, 0x2a, 0xaf, 0x36, - 0xb2, 0x44, 0x9e, 0x39, 0xc9, 0xe0, 0x99, 0xf2, 0xd9, 0x7f, 0x95, 0x00, 0xb2, 0xf6, 0x44, 0x1f, - 0xe5, 0xc4, 0xdd, 0x10, 0xe2, 0xbe, 0x72, 0x59, 0x3b, 0x17, 0xf5, 0xdd, 0xfe, 0xa9, 0x94, 0xc9, - 0xf0, 0x4d, 0x98, 0x8a, 0x28, 0x61, 0xc3, 0x21, 0x0d, 0x5c, 0xea, 0xf6, 0xb2, 0x21, 0x88, 0xaf, - 0xe6, 0xec, 0x9f, 0xf1, 0xc1, 0x76, 0x91, 0x62, 0x97, 0x5e, 0x43, 0xb1, 0x9f, 0xc2, 0x8c, 0xe6, - 0xf0, 0x5f, 0x97, 0x6b, 0x52, 0x47, 0xaa, 0x42, 0x4d, 0x41, 0x79, 0x9f, 0x1e, 0x89, 0x41, 0xd7, - 0xc0, 0xfc, 0x27, 0xd7, 0x35, 0xd7, 0x8b, 0x9d, 0x5d, 0x5f, 0xce, 0x2e, 0x13, 0xeb, 0x25, 0xba, - 0x01, 0x13, 0xa7, 0x2a, 0xa0, 0x88, 0x6f, 0xe5, 0x89, 0xb7, 0xbf, 0x87, 0x46, 0xfa, 0xa2, 0xd1, - 0xe3, 0x02, 0xdd, 0x37, 0x2e, 0x11, 0x80, 0x73, 0xd8, 0x6e, 0x67, 0x64, 0x17, 0x4e, 0x37, 0xce, - 0x39, 0xfd, 0x01, 0xd4, 0x95, 0x2c, 0xa0, 0xb7, 0x00, 0x39, 0x62, 0x4a, 0xf5, 0x5c, 0x1a, 0x93, - 0xc8, 0x0b, 0xc5, 0x7c, 0x93, 0xe5, 0x99, 0x96, 0x9e, 0xad, 0xcc, 0x61, 0x7f, 0x0c, 0x35, 0x29, - 0x0e, 0xe8, 0x7d, 0x98, 0xa5, 0xdf, 0x85, 0xbe, 0x47, 0xbc, 0xa4, 0x97, 0xfb, 0x58, 0xe4, 0xa4, - 0x49, 0x75, 0x35, 0xb1, 0xa5, 0x01, 0xeb, 0x67, 0xfc, 0xf6, 0x57, 0x60, 0x6a, 0xbd, 0xe0, 0x4c, - 0xaa, 0x8b, 0xa8, 0x07, 0xac, 0x97, 0x68, 0x0d, 0x4c, 0x97, 0x91, 0xf1, 0x3b, 0xa0, 0xec, 0x32, - 0x62, 0x3f, 0x00, 0xc8, 0x04, 0x05, 0xdd, 0x02, 0x39, 0x0d, 0x94, 0x8e, 0xa7, 0x13, 0x5b, 0x7d, - 0x05, 0xed, 0x70, 0x9f, 0x1a, 0x18, 0xdd, 0xc7, 0xd0, 0x48, 0x1d, 0xa8, 0x0b, 0x75, 0x3d, 0x1b, - 0xa7, 0xce, 0x7e, 0xd8, 0xd8, 0xd3, 0x85, 0xf2, 0xac, 0x1a, 0x77, 0x8d, 0x8d, 0x47, 0xc7, 0x7f, - 0x2c, 0x5c, 0x39, 0x7e, 0xb9, 0x60, 0xfc, 0xfe, 0x72, 0xc1, 0x78, 0xf1, 0xe7, 0x82, 0xf1, 0xf5, - 0x9d, 0xb1, 0xbe, 0xf0, 0xd4, 0x66, 0xbb, 0x35, 0x61, 0x5a, 0xfb, 0x27, 0x00, 0x00, 0xff, 0xff, - 0x92, 0x37, 0x26, 0x4a, 0x0f, 0x0d, 0x00, 0x00, + 0x14, 0x4d, 0xcf, 0xb3, 0xe7, 0xce, 0x8c, 0x63, 0x97, 0x4c, 0xd4, 0xe9, 0x58, 0xb6, 0x93, 0x18, + 0xc9, 0x79, 0x30, 0x13, 0xc6, 0x09, 0x24, 0x3c, 0x12, 0xfc, 0x20, 0x12, 0x91, 0xc0, 0x51, 0x19, + 0x82, 0x60, 0x33, 0x6a, 0x57, 0x97, 0x67, 0x1a, 0xf7, 0x74, 0x35, 0xdd, 0x3d, 0x36, 0x96, 0xf8, + 0x01, 0x16, 0x7c, 0x02, 0x52, 0xc4, 0x86, 0x15, 0x2b, 0x7e, 0xc2, 0x0b, 0x16, 0x7c, 0x81, 0x25, + 0xc2, 0x9e, 0x0f, 0xc8, 0x0a, 0xd5, 0xab, 0xa7, 0xc7, 0x3d, 0xb6, 0x26, 0x51, 0x16, 0x6c, 0xec, + 0xa9, 0xba, 0xe7, 0x56, 0x57, 0x9d, 0x7b, 0xeb, 0x9c, 0x82, 0x6b, 0x3d, 0xd6, 0x0e, 0x23, 0x96, + 0x30, 0xc2, 0xfc, 0xb8, 0x4d, 0x9c, 0x30, 0x19, 0x46, 0x54, 0xff, 0x6f, 0x89, 0x08, 0xaa, 0xaa, + 0xa1, 0xbd, 0x30, 0x06, 0xde, 0xf3, 0xd9, 0xa1, 0xf8, 0x23, 0x61, 0xf6, 0x7c, 0x8f, 0xf5, 0x98, + 0xf8, 0xd9, 0xe6, 0xbf, 0xe4, 0xec, 0xb5, 0x5f, 0x1b, 0x50, 0xc5, 0xf4, 0xfb, 0x21, 0x8d, 0x13, + 0x74, 0x03, 0x4a, 0x71, 0x48, 0x89, 0x65, 0x2c, 0x1b, 0xab, 0xf5, 0xce, 0x5b, 0x2d, 0xfd, 0x19, + 0x15, 0x6f, 0xed, 0x84, 0x94, 0x60, 0x01, 0x41, 0xf7, 0xc0, 0x74, 0xbd, 0x98, 0xb0, 0x03, 0x1a, + 0x59, 0x05, 0x01, 0xbf, 0x9c, 0x83, 0x6f, 0x29, 0x00, 0x4e, 0xa1, 0x3c, 0xed, 0xc0, 0xf1, 0x3d, + 0xd7, 0x49, 0xa8, 0x55, 0x3c, 0x23, 0xed, 0x99, 0x02, 0xe0, 0x14, 0x8a, 0x6e, 0x43, 0xd9, 0x09, + 0x43, 0xff, 0xc8, 0x2a, 0x89, 0x9c, 0x4b, 0xb9, 0x9c, 0x75, 0x1e, 0xc5, 0x12, 0xc4, 0x8f, 0xc1, + 0x42, 0x1a, 0x58, 0xe5, 0x33, 0x8e, 0xb1, 0x1d, 0xd2, 0x00, 0x0b, 0x08, 0x7a, 0x08, 0x75, 0x87, + 0xec, 0x07, 0xec, 0xd0, 0xa7, 0x6e, 0x8f, 0x5a, 0x15, 0x91, 0xb1, 0x90, 0x5f, 0x7e, 0x84, 0xc1, + 0xd9, 0x04, 0x74, 0x05, 0x4c, 0x2f, 0x48, 0x68, 0x14, 0x38, 0xbe, 0xe5, 0x2e, 0x1b, 0xab, 0x0d, + 0x5c, 0x5b, 0xd1, 0x13, 0xf6, 0x4f, 0x06, 0x94, 0x38, 0x65, 0xe8, 0x31, 0xcc, 0x10, 0x16, 0x04, + 0x94, 0x24, 0x2c, 0xea, 0x26, 0x47, 0x21, 0x15, 0x0c, 0xcf, 0x74, 0x96, 0x5a, 0xa2, 0x3c, 0x9b, + 0xf2, 0x6b, 0x1c, 0xda, 0xda, 0xd4, 0xb8, 0x2f, 0x8f, 0x42, 0x8a, 0x9b, 0x24, 0x3b, 0x44, 0x0f, + 0xa0, 0x4e, 0x58, 0xb0, 0xe7, 0xf5, 0xba, 0xdf, 0xc5, 0x2c, 0x10, 0xbc, 0xd7, 0x36, 0x16, 0x5e, + 0x9e, 0x2c, 0x59, 0x34, 0x20, 0xcc, 0xf5, 0x82, 0x5e, 0x9b, 0x07, 0x5a, 0xd8, 0x39, 0xfc, 0x9c, + 0xc6, 0xb1, 0xd3, 0xa3, 0xb8, 0x22, 0x13, 0xec, 0x9f, 0x0d, 0x30, 0x75, 0x3d, 0xfe, 0x0f, 0xfb, + 0x79, 0x5e, 0x02, 0x53, 0x17, 0x1a, 0x7d, 0x06, 0xa5, 0xc0, 0x19, 0xc8, 0x5d, 0xd4, 0x36, 0xee, + 0xbd, 0x3c, 0x59, 0x7a, 0xb7, 0xe7, 0x25, 0xfd, 0xe1, 0x6e, 0x8b, 0xb0, 0x41, 0x9b, 0xc6, 0xc9, + 0xd0, 0x89, 0x8e, 0x64, 0x3f, 0xe7, 0x3a, 0x5c, 0xef, 0x16, 0x8b, 0x25, 0x26, 0x1c, 0xad, 0xf0, + 0x26, 0x8e, 0x56, 0x9c, 0xfe, 0x68, 0xe8, 0x63, 0x30, 0x77, 0xbd, 0x80, 0x43, 0x62, 0xab, 0xb4, + 0x5c, 0x5c, 0xad, 0x77, 0xae, 0x9e, 0xd9, 0xe3, 0xad, 0x0d, 0x89, 0xc4, 0x69, 0x0a, 0xba, 0x0b, + 0x0d, 0xdf, 0x89, 0x93, 0xae, 0x4a, 0x51, 0x5d, 0x3c, 0x97, 0xdb, 0x3f, 0xae, 0x73, 0x98, 0x9a, + 0x40, 0x57, 0x55, 0xd6, 0x01, 0x8d, 0x62, 0x8f, 0x05, 0xa2, 0x93, 0x6b, 0x12, 0xf2, 0x4c, 0x4e, + 0xd9, 0xbf, 0x1b, 0x50, 0x55, 0x9f, 0x43, 0x4f, 0x60, 0x3e, 0xa2, 0x31, 0x1b, 0x46, 0x84, 0x76, + 0xb3, 0xe7, 0x34, 0xa6, 0x38, 0xe7, 0x8c, 0xce, 0xdc, 0x94, 0xe7, 0xfd, 0x00, 0x80, 0x30, 0xdf, + 0xa7, 0x24, 0xf1, 0x54, 0x13, 0xd4, 0x3b, 0xf3, 0x6a, 0xbb, 0xe9, 0x3c, 0xdf, 0xf1, 0x46, 0xe9, + 0xf8, 0x64, 0xe9, 0x02, 0xce, 0xa0, 0x91, 0x0d, 0xe6, 0xae, 0x43, 0xf6, 0xf7, 0x3c, 0xdf, 0x17, + 0x1c, 0x37, 0x71, 0x3a, 0xb6, 0x7f, 0x33, 0xa0, 0x2c, 0xee, 0x35, 0xba, 0x05, 0x5a, 0xe2, 0x94, + 0x34, 0x4d, 0x60, 0x43, 0x23, 0x90, 0x05, 0x55, 0x4d, 0x82, 0x68, 0x48, 0xac, 0x87, 0x39, 0x66, + 0x4b, 0xaf, 0xc5, 0x6c, 0x79, 0x22, 0xb3, 0x25, 0x2e, 0x2a, 0x6f, 0x6a, 0xa3, 0x6f, 0x43, 0x39, + 0x72, 0x82, 0x9e, 0x96, 0xc8, 0x8b, 0x72, 0x11, 0xcc, 0xa7, 0xc4, 0x12, 0x32, 0x8a, 0xde, 0x07, + 0x88, 0x13, 0x27, 0xa1, 0xb2, 0x74, 0xa5, 0x29, 0x4a, 0x57, 0x16, 0x78, 0xbb, 0x0d, 0xf5, 0x8c, + 0xa2, 0xa1, 0x65, 0xa8, 0x93, 0x3e, 0x25, 0xfb, 0x21, 0xf3, 0x82, 0x24, 0x16, 0x3b, 0x6f, 0xe2, + 0xec, 0xd4, 0xb5, 0x3f, 0x9a, 0x60, 0x62, 0x1a, 0x87, 0x2c, 0x88, 0x29, 0xba, 0x39, 0xe6, 0x12, + 0x59, 0x2d, 0x96, 0x80, 0xac, 0x4d, 0x7c, 0x04, 0xa0, 0xb5, 0x9f, 0xba, 0xaa, 0x37, 0x16, 0xf2, + 0x19, 0x5b, 0x29, 0x06, 0x67, 0xf0, 0xe8, 0x01, 0xd4, 0xb4, 0x05, 0xb8, 0x8a, 0x8b, 0x2b, 0xf9, + 0x64, 0x7d, 0x97, 0x5c, 0x3c, 0x42, 0xa3, 0x35, 0xa8, 0x72, 0x33, 0xf0, 0xa8, 0xab, 0xca, 0x7c, + 0x39, 0x9f, 0xb8, 0x2e, 0x01, 0x58, 0x23, 0xd1, 0x1d, 0xa8, 0x70, 0x57, 0xa0, 0xae, 0xba, 0x74, + 0x56, 0x3e, 0x67, 0x5b, 0xc4, 0xb1, 0xc2, 0xa1, 0xf7, 0xc0, 0x54, 0x10, 0x57, 0x99, 0x87, 0x9d, + 0xcf, 0x51, 0xd5, 0x77, 0x71, 0x8a, 0xe5, 0x32, 0x25, 0xef, 0x90, 0xdb, 0x8d, 0x49, 0x9f, 0x0e, + 0x1c, 0xcb, 0x14, 0xd9, 0x4b, 0x13, 0xd8, 0x94, 0xb8, 0x1d, 0x01, 0xc3, 0xcd, 0x38, 0x3b, 0xe4, + 0xfc, 0x8e, 0xea, 0x64, 0x55, 0xcf, 0xe2, 0x77, 0x33, 0xc5, 0xe0, 0x0c, 0xfe, 0x7c, 0xf7, 0xfa, + 0xb3, 0xa0, 0xdc, 0xcb, 0x06, 0x53, 0x4b, 0xae, 0xea, 0x8d, 0x74, 0x8c, 0x1e, 0x03, 0x52, 0xf2, + 0x21, 0x8f, 0x31, 0xbd, 0x11, 0x34, 0x64, 0x9e, 0x3a, 0xc7, 0xd7, 0x70, 0xe5, 0xb4, 0x1e, 0x65, + 0x17, 0x9c, 0x46, 0x7e, 0xe7, 0xc7, 0x65, 0x49, 0x2d, 0x7c, 0x0b, 0xe6, 0x5c, 0x46, 0x86, 0x03, + 0x1a, 0x24, 0x0e, 0x57, 0x9c, 0xee, 0x30, 0xf2, 0xe5, 0x55, 0xc1, 0xb3, 0x63, 0x81, 0xaf, 0x22, + 0x1f, 0xad, 0x40, 0x85, 0x39, 0xc3, 0xa4, 0xdf, 0x51, 0xf5, 0x6f, 0xc8, 0x8b, 0xb7, 0xbd, 0xce, + 0xe7, 0xb0, 0x8a, 0xa1, 0xbb, 0x70, 0x29, 0xdd, 0x6b, 0xe8, 0x24, 0xfd, 0xae, 0x20, 0x93, 0x46, + 0xb1, 0x55, 0x59, 0x2e, 0xae, 0xd6, 0x46, 0x1b, 0x79, 0xea, 0x24, 0xfd, 0xa7, 0x2a, 0x66, 0xff, + 0x5b, 0x00, 0x18, 0xb5, 0x39, 0xfa, 0x24, 0x63, 0x12, 0x86, 0x30, 0x89, 0x95, 0xf3, 0xae, 0x45, + 0xde, 0x27, 0xec, 0x5f, 0x0a, 0x23, 0x39, 0xbf, 0x01, 0xb3, 0x11, 0x25, 0x6c, 0x30, 0xa0, 0x81, + 0x4b, 0xdd, 0xee, 0xc8, 0x4c, 0xf1, 0xc5, 0xcc, 0xfc, 0x17, 0xdc, 0x20, 0xcf, 0x52, 0xfe, 0xc2, + 0x6b, 0x28, 0xff, 0x13, 0x98, 0xd7, 0x1c, 0xbe, 0x72, 0xb9, 0x66, 0x74, 0xa6, 0x2a, 0xd4, 0x2c, + 0x14, 0xf7, 0xe9, 0x91, 0x30, 0xcc, 0x1a, 0xe6, 0x3f, 0xb9, 0x3e, 0xba, 0x5e, 0xec, 0xec, 0xfa, + 0xd2, 0x03, 0x4d, 0xac, 0x87, 0xe8, 0x3a, 0x34, 0xc7, 0x2a, 0xa0, 0x88, 0x6f, 0x64, 0x89, 0xb7, + 0x7f, 0x84, 0x5a, 0xaa, 0x0c, 0xe8, 0x51, 0x8e, 0xee, 0xeb, 0xe7, 0x08, 0xc9, 0x04, 0xb6, 0x5b, + 0x23, 0xb2, 0x73, 0x5f, 0x37, 0x26, 0x7c, 0xfd, 0x3e, 0x54, 0x95, 0xbc, 0xa0, 0x77, 0x00, 0x39, + 0xc2, 0xed, 0xba, 0x2e, 0x8d, 0x49, 0xe4, 0x85, 0xc2, 0x27, 0x65, 0x79, 0xe6, 0x64, 0x64, 0x6b, + 0x14, 0xb0, 0x3f, 0x85, 0x8a, 0x14, 0x19, 0xf4, 0x21, 0x5c, 0xa6, 0x3f, 0x84, 0xbe, 0x47, 0xbc, + 0xa4, 0x9b, 0x79, 0x74, 0x72, 0xd2, 0xa4, 0x4a, 0x9b, 0xd8, 0xd2, 0x80, 0xf5, 0x53, 0x71, 0xfb, + 0x1b, 0x30, 0xb5, 0xee, 0x70, 0x26, 0xd5, 0x41, 0xd4, 0x05, 0xd6, 0x43, 0xb4, 0x06, 0xa6, 0xcb, + 0xc8, 0xf4, 0x1d, 0x50, 0x74, 0x19, 0xb1, 0x7d, 0x68, 0x8e, 0x89, 0xd2, 0x39, 0xeb, 0xaf, 0x43, + 0xfd, 0x55, 0x85, 0xe1, 0x54, 0x63, 0xd8, 0xf7, 0x01, 0x46, 0xf2, 0x85, 0x6e, 0x82, 0xf4, 0x30, + 0xe5, 0x3e, 0xe9, 0x3b, 0x43, 0xbd, 0xdd, 0x76, 0x78, 0x4c, 0xd9, 0x5c, 0xe7, 0x11, 0xd4, 0xd2, + 0x00, 0xea, 0x40, 0x55, 0x3b, 0xfa, 0xec, 0xe9, 0xe7, 0x98, 0x3d, 0x97, 0x6b, 0x86, 0x55, 0xe3, + 0x8e, 0xb1, 0xf1, 0xf0, 0xf8, 0xef, 0xc5, 0x0b, 0xc7, 0x2f, 0x16, 0x8d, 0xbf, 0x5e, 0x2c, 0x1a, + 0xcf, 0xff, 0x59, 0x34, 0xbe, 0xbd, 0x3d, 0xd5, 0xbb, 0x54, 0x2d, 0xb6, 0x5b, 0x11, 0x53, 0x6b, + 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x3c, 0xba, 0xee, 0x3e, 0xc5, 0x0d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1623,6 +1689,18 @@ func (m *Response) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0xa2 } + if m.SourcedSchema != nil { + { + size, err := m.SourcedSchema.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCapture(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x42 + } if m.Checkpoint != nil { { size, err := m.Checkpoint.MarshalToSizedBuffer(dAtA[:i]) @@ -2088,6 +2166,45 @@ func (m *Response_Captured) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *Response_SourcedSchema) Marshal() (dAtA []byte, err error) { + size := m.ProtoSize() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Response_SourcedSchema) MarshalTo(dAtA []byte) (int, error) { + size := m.ProtoSize() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Response_SourcedSchema) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.XXX_unrecognized != nil { + i -= len(m.XXX_unrecognized) + copy(dAtA[i:], m.XXX_unrecognized) + } + if len(m.SchemaJson) > 0 { + i -= len(m.SchemaJson) + copy(dAtA[i:], m.SchemaJson) + i = encodeVarintCapture(dAtA, i, uint64(len(m.SchemaJson))) + i-- + dAtA[i] = 0x12 + } + if m.Binding != 0 { + i = encodeVarintCapture(dAtA, i, uint64(m.Binding)) + i-- + dAtA[i] = 0x8 + } + return len(dAtA) - i, nil +} + func (m *Response_Checkpoint) Marshal() (dAtA []byte, err error) { size := m.ProtoSize() dAtA = make([]byte, size) @@ -2379,6 +2496,10 @@ func (m *Response) ProtoSize() (n int) { l = m.Checkpoint.ProtoSize() n += 1 + l + sovCapture(uint64(l)) } + if m.SourcedSchema != nil { + l = m.SourcedSchema.ProtoSize() + n += 1 + l + sovCapture(uint64(l)) + } l = len(m.Internal) if l > 0 { n += 2 + l + sovCapture(uint64(l)) @@ -2569,6 +2690,25 @@ func (m *Response_Captured) ProtoSize() (n int) { return n } +func (m *Response_SourcedSchema) ProtoSize() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Binding != 0 { + n += 1 + sovCapture(uint64(m.Binding)) + } + l = len(m.SchemaJson) + if l > 0 { + n += 1 + l + sovCapture(uint64(l)) + } + if m.XXX_unrecognized != nil { + n += len(m.XXX_unrecognized) + } + return n +} + func (m *Response_Checkpoint) ProtoSize() (n int) { if m == nil { return 0 @@ -4192,6 +4332,42 @@ func (m *Response) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SourcedSchema", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCapture + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthCapture + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCapture + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.SourcedSchema == nil { + m.SourcedSchema = &Response_SourcedSchema{} + } + if err := m.SourcedSchema.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 100: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Internal", wireType) @@ -5222,6 +5398,108 @@ func (m *Response_Captured) Unmarshal(dAtA []byte) error { } return nil } +func (m *Response_SourcedSchema) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCapture + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: SourcedSchema: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SourcedSchema: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Binding", wireType) + } + m.Binding = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCapture + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Binding |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SchemaJson", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCapture + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthCapture + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthCapture + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SchemaJson = encoding_json.RawMessage(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipCapture(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthCapture + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *Response_Checkpoint) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/go/protocols/capture/capture.proto b/go/protocols/capture/capture.proto index e207a1cf53..baca7386c7 100644 --- a/go/protocols/capture/capture.proto +++ b/go/protocols/capture/capture.proto @@ -48,7 +48,7 @@ option (gogoproto.goproto_getters_all) = false; // documents of all such messages in a single transaction. // :Response.Checkpoint: // - The connector tells the runtime of a checkpoint: a watermark in the -// captured documents stream which is eligble to be used as a +// captured documents stream which is eligible to be used as a // transaction commit boundary. // - Whether the checkpoint becomes a commit boundary is at the // discretion of the Flow runtime. It may combine multiple checkpoints @@ -186,6 +186,8 @@ message Request { message Response { // Spec responds to Request.Spec. + // Next tag: 9 + message Spec { // Protocol version must be 3032023. uint32 protocol = 1; @@ -297,6 +299,37 @@ message Response { } Captured captured = 6; + // SourcedSchema notifies the runtime of a source-defined schema of the + // indicated binding. It's not required that the connector know that the + // schema has actually changed since a last SourcedSchema. + // It's encouraged for connectors to emit SourcedSchema liberally, + // such as on startup, or periodically, or upon encountering a previously + // unseen column. + // + // SourcedSchema may be a partial schema: it may schematize some + // specific field(s) and not others that are in active use. + // + // SourcedSchema should be maximally restrictive. It should disallow + // `types` and `additionalProperties` which are not explicitly being + // schematized. The platform will union a SourcedSchema with all other + // SourcedSchema messages of the binding, as well as additional inference + // updates required to fit Captured documents. + // + // SourcedSchema is transactional. It may be interleaved with zero or more + // Captured documents, and multiple SourcedSchema messages may be emitted + // for a single binding, but an emitted SourcedSchema has no effect until + // it's followed by a Checkpoint. + message SourcedSchema { + // Index of the Open binding for which the schema applies. + uint32 binding = 1; + // JSON schema of documents produced by this binding. + string schema_json = 2 [ + (gogoproto.casttype) = "encoding/json.RawMessage", + json_name = "documentSchema" + ]; + } + SourcedSchema sourced_schema = 8; + // Checkpoint all preceding documents of this invocation since the last checkpoint. // The Flow runtime may begin to commit documents in a transaction. // Note that the runtime may include more than one checkpoint in a single transaction. From bb5afc63c26906203472f0750801f9ef2b442f4c Mon Sep 17 00:00:00 2001 From: Johnny Graettinger Date: Tue, 18 Feb 2025 17:51:37 -0600 Subject: [PATCH 3/3] runtime: support capture Response.SourcedSchema Within a transaction, SourcedSchema messages are accumulated for each binding using doc::Shape::union(). At the close of the transaction, SourcedSchemas are then intersected with the write schema, and the result is used to pre-widen the inferred schema of each binding. If a binding had a SourcedSchema in a particular transaction, we always emit an "inferred schema updated" log at transaction close, even if it may not have actually changed. --- crates/doc/src/validation.rs | 2 +- crates/runtime/src/capture/mod.rs | 5 ++ crates/runtime/src/capture/protocol.rs | 76 +++++++++++++++++++++++++- crates/runtime/src/capture/serve.rs | 17 +++++- crates/runtime/src/capture/task.rs | 28 ++++++---- 5 files changed, 111 insertions(+), 17 deletions(-) diff --git a/crates/doc/src/validation.rs b/crates/doc/src/validation.rs index f81b4faf8a..2c654926cc 100644 --- a/crates/doc/src/validation.rs +++ b/crates/doc/src/validation.rs @@ -17,7 +17,7 @@ pub use json::schema::build::build_schema; pub fn build_bundle(bundle: &str) -> Result { let mut schema = build_schema( url::Url::parse("schema://bundle").unwrap(), - &serde_json::from_str(bundle).unwrap(), + &serde_json::from_str(bundle).map_err(json::schema::build::Error::FormatErr)?, )?; // Tweak scope to remove a synthetic resource pointer that was previously diff --git a/crates/runtime/src/capture/mod.rs b/crates/runtime/src/capture/mod.rs index 59341b8ced..23dbc24bf8 100644 --- a/crates/runtime/src/capture/mod.rs +++ b/crates/runtime/src/capture/mod.rs @@ -42,6 +42,8 @@ struct Binding { ser_policy: doc::SerPolicy, // Write schema of the target collection. write_schema_json: String, + // Inferred Shape of written documents. + write_shape: doc::Shape, } #[derive(Debug)] @@ -56,6 +58,8 @@ pub struct Transaction { started_at: std::time::SystemTime, // Statistics of (read documents, combined documents) for each binding. stats: BTreeMap, + // Sourced schema updates of this transaction. + sourced_schemas: BTreeMap, // Set of bindings which updated their inferred Shape this transaction. updated_inferences: BTreeSet, } @@ -83,6 +87,7 @@ impl Transaction { connector_eof: false, started_at: std::time::SystemTime::UNIX_EPOCH, stats: Default::default(), + sourced_schemas: Default::default(), updated_inferences: Default::default(), } } diff --git a/crates/runtime/src/capture/protocol.rs b/crates/runtime/src/capture/protocol.rs index d443f66162..fa1f2ae54a 100644 --- a/crates/runtime/src/capture/protocol.rs +++ b/crates/runtime/src/capture/protocol.rs @@ -380,7 +380,7 @@ pub fn recv_connector_captured( let uuid_ptr = &task .bindings .get(binding_index as usize) - .with_context(|| "invalid captured binding {binding}")? + .with_context(|| format!("invalid captured binding {binding_index}"))? .document_uuid_ptr; if !uuid_ptr.0.is_empty() { @@ -398,6 +398,80 @@ pub fn recv_connector_captured( Ok(()) } +pub fn recv_connector_sourced_schema( + sourced: response::SourcedSchema, + task: &Task, + txn: &mut Transaction, +) -> anyhow::Result<()> { + let response::SourcedSchema { + binding, + schema_json, + } = sourced; + + tracing::debug!(schema=%schema_json, binding, "sourced schema"); + + let built_schema = doc::validation::build_bundle(&schema_json).with_context(|| { + format!( + "couldn't parse sourced schema as JSON Schema (target {})", + task.bindings[binding as usize].collection_name + ) + })?; + let validator = doc::Validator::new(built_schema).with_context(|| { + format!( + "couldn't build a sourced schema validator (target {})", + task.bindings[binding as usize].collection_name + ) + })?; + let sourced_shape = doc::Shape::infer(&validator.schemas()[0], validator.schema_index()); + + // Track this SourcedSchema by its binding, union-ing with another SourcedSchema if present. + let entry = txn + .sourced_schemas + .entry(binding as usize) + .or_insert(doc::Shape::nothing()); + + *entry = doc::Shape::union( + std::mem::replace(entry, doc::Shape::nothing()), + sourced_shape, + ); + + Ok(()) +} + +pub fn apply_sourced_schemas( + shapes: &mut [doc::Shape], + task: &Task, + txn: &mut Transaction, +) -> anyhow::Result<()> { + let Transaction { + sourced_schemas, + updated_inferences, + .. + } = txn; + + for (binding, sourced_shape) in std::mem::take(sourced_schemas) { + let write_shape = task + .bindings + .get(binding) + .with_context(|| format!("invalid sourced schema binding {binding}"))? + .write_shape + .clone(); + + // By construction, we cannot capture documents which don't adhere to + // the write schema. Intersect it to avoid generating incompatible + // inference updates. + let sourced_shape = doc::Shape::intersect(sourced_shape, write_shape); + + shapes[binding] = doc::Shape::union( + std::mem::replace(&mut shapes[binding], doc::Shape::nothing()), + sourced_shape, + ); + updated_inferences.insert(binding); + } + + Ok(()) +} + pub fn recv_connector_checkpoint( accumulator: &mut Accumulator, response: Response, diff --git a/crates/runtime/src/capture/serve.rs b/crates/runtime/src/capture/serve.rs index 97a595fb9d..2c1203f2d9 100644 --- a/crates/runtime/src/capture/serve.rs +++ b/crates/runtime/src/capture/serve.rs @@ -179,6 +179,11 @@ async fn serve_session( // Atomic WriteBatch into which we'll stage connector and runtime state updates. let mut wb = rocksdb::WriteBatch::default(); + // Apply sourced schemas to inference before we widen from documents. + // Assuming documents fit the source shape, this prevents unnecessary + // widening (consider a schema with tight minItems / maxItems bounds). + apply_sourced_schemas(&mut shapes, &task, &mut txn)?; + while let Some(drained) = drainer.drain_next()? { let response = send_client_captured_or_checkpoint( &mut buf, @@ -263,9 +268,15 @@ async fn read_checkpoint( task: &Task, txn: &mut Transaction, ) -> anyhow::Result<()> { - // Read all Captured responses of the checkpoint. - while let Some(captured) = response.captured { - recv_connector_captured(accumulator, captured, task, txn)?; + // Read all Captured and SourcedSchema responses of the checkpoint. + loop { + if let Some(captured) = response.captured { + recv_connector_captured(accumulator, captured, task, txn)?; + } else if let Some(sourced) = response.sourced_schema { + recv_connector_sourced_schema(sourced, task, txn)?; + } else { + break; + } // Read next response. response = match connector_rx.try_next().await? { diff --git a/crates/runtime/src/capture/task.rs b/crates/runtime/src/capture/task.rs index 71e4bad657..2835cdbe88 100644 --- a/crates/runtime/src/capture/task.rs +++ b/crates/runtime/src/capture/task.rs @@ -92,9 +92,8 @@ impl Task { let combiner_spec = self .bindings .iter() - .enumerate() - .map(|(index, binding)| binding.combiner_spec().context(index)) - .collect::, _>>()?; + .map(|binding| binding.combiner_spec()) + .collect::>(); let state_schema = doc::reduce::merge_patch_schema().to_string(); let state_schema = doc::validation::build_bundle(&state_schema).unwrap(); @@ -149,6 +148,12 @@ impl Binding { let partition_extractors = extractors::for_fields(&partition_fields, &projections, &ser_policy)?; + let built_schema = doc::validation::build_bundle(&write_schema_json) + .context("collection write_schema_json is not a JSON schema")?; + let validator = + doc::Validator::new(built_schema).context("could not build a schema validator")?; + let write_shape = doc::Shape::infer(&validator.schemas()[0], validator.schema_index()); + Ok(Self { collection_name: name.clone(), document_uuid_ptr, @@ -157,22 +162,21 @@ impl Binding { resource_path: resource_path.clone(), ser_policy, write_schema_json: write_schema_json.clone(), + write_shape, }) } - pub fn combiner_spec( - &self, - ) -> anyhow::Result<(bool, Vec, String, doc::Validator)> { - let built_schema = doc::validation::build_bundle(&self.write_schema_json) - .context("collection write_schema_json is not a JSON schema")?; - let validator = - doc::Validator::new(built_schema).context("could not build a schema validator")?; + pub fn combiner_spec(&self) -> (bool, Vec, String, doc::Validator) { + // These are safe to unwrap() because they were previously run over + // `self.write_schema_json` by Binding::new(). + let built_schema = doc::validation::build_bundle(&self.write_schema_json).unwrap(); + let validator = doc::Validator::new(built_schema).unwrap(); - Ok(( + ( false, self.key_extractors.clone(), format!("captured collection {}", self.collection_name), validator, - )) + ) } }