Remove remaining v0 protocol bits (#511)

This removes the last traces of v0. We now return an error from gel-tokio's connection methods if we get this in a server version.

gel-tokio and gel-protocol get a minor verison bump to help end-users who might possibly need the older server support.

Author: mmastrac

gel-db-protocol/src/protocol.rs

@@ -32,7 +32,6 @@ message_group!(
         Parse,
         Execute,
         Sync,
-        Flush,
         Terminate,
         Dump,
         Restore,
@@ -85,18 +84,6 @@ struct LogMessage<'a>: Message {
     annotations: Array<'a, i16, Annotation<'a>>,
 }
 
-/// The `ReadyForCommand` struct represents a message indicating the server is ready for a new command.
-struct ReadyForCommand0<'a>: Message {
-    /// Identifies the message as ready for command.
-    mtype: u8 = 'Z',
-    /// Length of message contents in bytes, including self.
-    mlen: len,
-    /// Message headers.
-    headers: Array<'a, i16, KeyValue<'a>>,
-    /// Transaction state.
-    transaction_state: TransactionState,
-}
-
 /// The `ReadyForCommand` struct represents a message indicating the server is ready for a new command.
 struct ReadyForCommand<'a>: Message {
     /// Identifies the message as ready for command.
@@ -347,14 +334,6 @@ struct Sync<'a>: Message {
     mlen: len,
 }
 
-/// The `Flush` struct represents a flush message from the client.
-struct Flush<'a>: Message {
-    /// Identifies the message as flush.
-    mtype: u8 = 'H',
-    /// Length of message contents in bytes, including self.
-    mlen: len,
-}
-
 /// The `Restore` struct represents a restore message from the client.
 struct Restore<'a>: Message {
     /// Identifies the message as restore.
@@ -441,18 +420,6 @@ struct Parse<'a>: Message {
     state_data: Array<'a, u32, u8>,
 }
 
-/// The `ParseComplete` struct represents the response to a `Parse` request from the client.
-struct ParseComplete<'a>: Message {
-    /// The headers
-    headers: Array<'a, i16, KeyValue<'a>>,
-    /// Cardinality
-    cardinality: u8,
-    /// Input descriptor ID.
-    input_typedesc_id: Uuid,
-    /// Output descriptor ID.
-    output_typedesc_id: Uuid,
-}
-
 /// The `Execute` struct represents an execute message from the client.
 struct Execute<'a>: Message {
     /// Identifies the message as execute.
@@ -591,74 +558,6 @@ struct ConnectionParam<'a> {
     value: LString<'a>,
 }
 
-/// Legacy response of [`Prepare0`].
-struct PrepareComplete0<'a>: Message {
-    mtype: u8 = '1',
-    mlen: len,
-    headers: Array<'a, i16, KeyValue<'a>>,
-    cardinality: u8,
-    input_typedesc_id: Uuid,
-    output_typedesc_id: Uuid,
-}
-
-/// Legacy request.
-struct ExecuteScript0<'a>: Message {
-    mtype: u8 = 'Q',
-    mlen: len,
-    headers: Array<'a, i16, KeyValue<'a>>,
-    script_text: LString<'a>,
-}
-
-/// Legacy equivalent of [`Parse`].
-struct Prepare0<'a>: Message {
-    mtype: u8 = 'P',
-    mlen: len,
-    headers: Array<'a, i16, KeyValue<'a>>,
-    io_format: IoFormat,
-    expected_cardinality: u8,
-    statement_name: Array<'a, u32, u8>,
-    command_text: LString<'a>,
-}
-
-/// Legacy equivalent of [`Parse`].
-struct DescribeStatement0<'a>: Message {
-    mtype: u8 = 'D',
-    mlen: len,
-    headers: Array<'a, i16, KeyValue<'a>>,
-    aspect: DescribeAspect,
-    statement_name: Array<'a, u32, u8>,
-}
-
-/// Legacy version of [`CommandComplete`].
-struct CommandComplete0<'a>: Message {
-    mtype: u8 = 'C',
-    mlen: len,
-    headers: Array<'a, i16, KeyValue<'a>>,
-    status_data: Array<'a, u32, u8>,
-}
-
-/// Legacy version of [`CommandDataDescription`].
-struct CommandDataDescription0<'a>: Message {
-    mtype: u8 = 'T',
-    mlen: len,
-    headers: Array<'a, i16, KeyValue<'a>>,
-    result_cardinality: u8,
-    input_typedesc_id: Uuid,
-    input_typedesc: Array<'a, u32, u8>,
-    output_typedesc_id: Uuid,
-    output_typedesc: Array<'a, u32, u8>,
-}
-
-/// Legacy version of [`Execute`].
-struct Execute0<'a>: Message {
-    mtype: u8 = 'E',
-    mlen: len,
-    headers: Array<'a, i16, KeyValue<'a>>,
-    statement_name: Array<'a, u32, u8>,
-    arguments: Array<'a, u32, u8>,
-}
-
-
 /// Legacy version of [`Execute`] without `input_language`.
 struct Execute2<'a>: Message {
     /// Identifies the message as execute.
@@ -691,19 +590,6 @@ struct Execute2<'a>: Message {
     arguments: Array<'a, u32, u8>,
 }
 
-/// Legacy version of [`Execute`].
-struct OptimisticExecute0<'a>: Message {
-    mtype: u8 = 'O',
-    mlen: len,
-    headers: Array<'a, i16, KeyValue<'a>>,
-    io_format: IoFormat,
-    expected_cardinality: u8,
-    command_text: LString<'a>,
-    input_typedesc_id: Uuid,
-    output_typedesc_id: Uuid,
-    arguments: Array<'a, u32, u8>,
-}
-
 #[repr(u8)]
 /// Data format.
 enum IoFormat {

gel-protocol/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "gel-protocol"
 license = "MIT/Apache-2.0"
-version = "0.8.5"
+version = "0.9.0"
 authors = ["MagicStack Inc. <hello@magic.io>"]
 edition = "2018"
 description = """

gel-protocol/src/descriptors.rs

@@ -698,13 +698,8 @@ impl Decode for ObjectShapeDescriptor {
 impl Decode for ShapeElement {
     fn decode(buf: &mut Input) -> Result<Self, DecodeError> {
         ensure!(buf.remaining() >= 7, errors::Underflow);
-        let (flags, cardinality) = if buf.proto().is_at_least(0, 11) {
-            let flags = buf.get_u32();
-            let cardinality = TryFrom::try_from(buf.get_u8())?;
-            (flags, Some(cardinality))
-        } else {
-            (buf.get_u8() as u32, None)
-        };
+        let flags = buf.get_u32();
+        let cardinality = Some(Cardinality::try_from(buf.get_u8())?);
         let name = String::decode(buf)?;
         let type_pos = TypePos::decode(buf)?;
         let source_type_pos = if buf.proto().is_2() {

gel-protocol/tests/type_descriptors.rs

@@ -33,10 +33,6 @@ fn decode_1_0(bytes: &[u8]) -> Result<Vec<Descriptor>, DecodeError> {
     decode(ProtocolVersion::new(1, 0), bytes)
 }
 
-fn decode_0_10(bytes: &[u8]) -> Result<Vec<Descriptor>, DecodeError> {
-    decode(ProtocolVersion::new(0, 10), bytes)
-}
-
 #[test]
 fn empty_tuple() -> Result<(), Box<dyn Error>> {
     // `SELECT ()`
@@ -168,67 +164,6 @@ fn duration() -> Result<(), Box<dyn Error>> {
     Ok(())
 }
 
-#[test]
-fn object_0_10() -> Result<(), Box<dyn Error>> {
-    assert_eq!(
-        decode_0_10(bconcat!(
-         b"\x02\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x01\0\x02"
-         b"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x01\x01\x01n"
-         b"\xbb\xbe\xda\0P\x14\xfe\x84\xbc\x82\x15@\xb1"
-         b"R\xcd\0\x03\x01\0\0\0\x07__tid__\0\0\x01"
-         b"\0\0\0\x02id\0\0\0\0\0\0\x05title\0\x01"))?,
-        vec![
-            Descriptor::BaseScalar(BaseScalarTypeDescriptor {
-                id: "00000000-0000-0000-0000-000000000100"
-                    .parse::<Uuid>()?
-                    .into(),
-            }),
-            Descriptor::BaseScalar(BaseScalarTypeDescriptor {
-                id: "00000000-0000-0000-0000-000000000101"
-                    .parse::<Uuid>()?
-                    .into(),
-            }),
-            Descriptor::ObjectShape(ObjectShapeDescriptor {
-                id: "6ebbbeda-0050-14fe-84bc-821540b152cd"
-                    .parse::<Uuid>()?
-                    .into(),
-                ephemeral_free_shape: false,
-                type_pos: None,
-                elements: vec![
-                    ShapeElement {
-                        flag_implicit: true,
-                        flag_link_property: false,
-                        flag_link: false,
-                        cardinality: None,
-                        name: String::from("__tid__"),
-                        type_pos: TypePos(0),
-                        source_type_pos: None,
-                    },
-                    ShapeElement {
-                        flag_implicit: true,
-                        flag_link_property: false,
-                        flag_link: false,
-                        cardinality: None,
-                        name: String::from("id"),
-                        type_pos: TypePos(0),
-                        source_type_pos: None,
-                    },
-                    ShapeElement {
-                        flag_implicit: false,
-                        flag_link_property: false,
-                        flag_link: false,
-                        cardinality: None,
-                        name: String::from("title"),
-                        type_pos: TypePos(1),
-                        source_type_pos: None,
-                    }
-                ]
-            })
-        ]
-    );
-    Ok(())
-}
-
 #[test]
 fn object_1_0() -> Result<(), Box<dyn Error>> {
     use gel_protocol::common::Cardinality::*;

gel-tokio/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "gel-tokio"
 license = "MIT/Apache-2.0"
-version = "0.10.16"
+version = "0.11.0"
 authors = ["MagicStack Inc. <hello@magic.io>"]
 edition = "2021"
 description = """
@@ -12,7 +12,7 @@ readme = "README.md"
 rust-version.workspace = true
 
 [dependencies]
-gel-protocol = { path = "../gel-protocol", version = "^0.8.5", features = [
+gel-protocol = { path = "../gel-protocol", version = "^0.9.0", features = [
     "with-serde",
 ] }
 gel-errors = { path = "../gel-errors", version = "^0.5.4" }

gel-tokio/README.md

@@ -37,6 +37,11 @@ async fn main() -> anyhow::Result<()> {
 
 More [examples on github](https://github.com/edgedb/edgedb-rust/tree/master/gel-tokio/examples)
 
+Version Support
+===============
+
+Gel protocol version 0 support was removed in 0.11.x.
+
 
 License
 =======

gel-tokio/src/raw/connection.rs

@@ -371,6 +371,11 @@ async fn connect4(cfg: &Config, mut stream: gel_stream::RawStream, cert_check: O
         params.insert(String::from("secret_key"), secret_key.to_string());
     }
     let (major_ver, minor_ver) = proto.version_tuple();
+    if major_ver < 1 {
+        return Err(ProtocolError::with_message(format!(
+            "EdgeDB protocol version {major_ver}.{minor_ver} is not supported"
+        )));
+    }
     send_messages(
         &mut stream,
         &mut out_buf,