Merge pull request #342 from blackbeam/result-set-terminator

Fix result set terminator handling

Author: blackbeam

Cargo.toml

@@ -70,7 +70,7 @@ crossbeam = "0.8.1"
 io-enum = "1.0.0"
 flate2 = { version = "1.0", default-features = false }
 lru = "0.8.1"
-mysql_common = { version = "0.29.1", default-features = false }
+mysql_common = { version = "0.29.2", default-features = false }
 socket2 = "0.4"
 once_cell = "1.7.2"
 pem = "1.0.1"

azure-pipelines.yml

@@ -103,7 +103,7 @@ jobs:
 
   - job: "TestBasicWindows"
     pool:
-      vmImage: "vs2017-win2016"
+      vmImage: "windows-2019"
     strategy:
       maxParallel: 10
       matrix:
@@ -125,7 +125,7 @@ jobs:
           echo socket=MYSQL >> C:\my.cnf
           echo datadir=C:\\ProgramData\\MySQL\\MySQL Server 8.0\\Data\\ >> C:\my.cnf
           "C:\Program Files\MySQL\MySQL Server 8.0\bin\mysqld" --install MySQL --defaults-file=C:\my.cnf
-          net start MySql
+          net start MySQL
           "C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql" -e "SET GLOBAL max_allowed_packet = 36700160;" -uroot -ppassword
           "C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql" -e "SET @@GLOBAL.ENFORCE_GTID_CONSISTENCY = WARN;" -uroot -ppassword
           "C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql" -e "SET @@GLOBAL.ENFORCE_GTID_CONSISTENCY = ON;" -uroot -ppassword

src/conn/mod.rs

@@ -17,7 +17,7 @@ use mysql_common::{
         binlog_request::BinlogRequest, AuthPlugin, AuthSwitchRequest, Column, ComStmtClose,
         ComStmtExecuteRequestBuilder, ComStmtSendLongData, CommonOkPacket, ErrPacket,
         HandshakePacket, HandshakeResponse, OkPacket, OkPacketDeserializer, OkPacketKind,
-        OldAuthSwitchRequest, ResultSetTerminator, SessionStateInfo,
+        OldAuthSwitchRequest, OldEofPacket, ResultSetTerminator, SessionStateInfo,
     },
     proto::{codec::Compression, sync_framed::MySyncFramed, MySerialize},
     row::{Row, RowDeserializer},
@@ -204,6 +204,11 @@ impl ConnInner {
 pub struct Conn(Box<ConnInner>);
 
 impl Conn {
+    /// Must not be called before handle_handshake.
+    const fn has_capability(&self, flag: CapabilityFlags) -> bool {
+        self.0.capability_flags.contains(flag)
+    }
+
     /// Returns version number reported by the server.
     pub fn server_version(&self) -> (u16, u16, u16) {
         self.0
@@ -562,10 +567,7 @@ impl Conn {
 
         if self.is_insecure() {
             if let Some(ssl_opts) = self.0.opts.get_ssl_opts().cloned() {
-                if !handshake
-                    .capabilities()
-                    .contains(CapabilityFlags::CLIENT_SSL)
-                {
+                if !self.has_capability(CapabilityFlags::CLIENT_SSL) {
                     return Err(DriverError(TlsNotSupported));
                 } else {
                     self.do_ssl_request()?;
@@ -596,11 +598,7 @@ impl Conn {
         self.write_handshake_response(&auth_plugin, auth_data.as_deref())?;
         self.continue_auth(&auth_plugin, &*nonce, false)?;
 
-        if self
-            .0
-            .capability_flags
-            .contains(CapabilityFlags::CLIENT_COMPRESS)
-        {
+        if self.has_capability(CapabilityFlags::CLIENT_COMPRESS) {
             self.switch_to_compressed();
         }
 
@@ -1080,32 +1078,28 @@ impl Conn {
         self.query_first(format!("SELECT @@{}", name))
     }
 
-    fn next_bin(&mut self, columns: Arc<[Column]>) -> Result<Option<Row>> {
+    fn next_row_packet(&mut self) -> Result<Option<Buffer>> {
         if !self.0.has_results {
             return Ok(None);
         }
-        let pld = self.read_packet()?;
-        if pld[0] == 0xfe && pld.len() < 0xfe {
-            self.0.has_results = false;
-            self.handle_ok::<ResultSetTerminator>(&pld)?;
-            return Ok(None);
-        }
-        let row = ParseBuf(&*pld).parse::<RowDeserializer<ServerSide, Binary>>(columns)?;
-        Ok(Some(row.into()))
-    }
 
-    fn next_text(&mut self, columns: Arc<[Column]>) -> Result<Option<Row>> {
-        if !self.0.has_results {
-            return Ok(None);
-        }
         let pld = self.read_packet()?;
-        if pld[0] == 0xfe && pld.len() < 0xfe {
-            self.0.has_results = false;
-            self.handle_ok::<ResultSetTerminator>(&pld)?;
-            return Ok(None);
+
+        if self.has_capability(CapabilityFlags::CLIENT_DEPRECATE_EOF) {
+            if pld[0] == 0xfe && pld.len() < MAX_PAYLOAD_LEN {
+                self.0.has_results = false;
+                self.handle_ok::<ResultSetTerminator>(&pld)?;
+                return Ok(None);
+            }
+        } else {
+            if pld[0] == 0xfe && pld.len() < 8 {
+                self.0.has_results = false;
+                self.handle_ok::<OldEofPacket>(&pld)?;
+                return Ok(None);
+            }
         }
-        let row = ParseBuf(&*pld).parse::<RowDeserializer<(), Text>>(columns)?;
-        Ok(Some(row.into()))
+
+        Ok(Some(pld))
     }
 
     fn has_stmt(&self, query: &[u8]) -> bool {

src/conn/query_result.rs

@@ -8,7 +8,7 @@
 
 pub use mysql_common::proto::{Binary, Text};
 
-use mysql_common::packets::OkPacket;
+use mysql_common::{io::ParseBuf, packets::OkPacket, row::RowDeserializer, value::ServerSide};
 
 use std::{borrow::Cow, marker::PhantomData, sync::Arc};
 
@@ -27,13 +27,25 @@ pub trait Protocol: 'static + Send + Sync {
 
 impl Protocol for Text {
     fn next(conn: &mut Conn, columns: Arc<[Column]>) -> Result<Option<Row>> {
-        conn.next_text(columns)
+        match conn.next_row_packet()? {
+            Some(pld) => {
+                let row = ParseBuf(&*pld).parse::<RowDeserializer<(), Text>>(columns)?;
+                Ok(Some(row.into()))
+            }
+            None => Ok(None),
+        }
     }
 }
 
 impl Protocol for Binary {
     fn next(conn: &mut Conn, columns: Arc<[Column]>) -> Result<Option<Row>> {
-        conn.next_bin(columns)
+        match conn.next_row_packet()? {
+            Some(pld) => {
+                let row = ParseBuf(&*pld).parse::<RowDeserializer<ServerSide, Binary>>(columns)?;
+                Ok(Some(row.into()))
+            }
+            None => Ok(None),
+        }
     }
 }