Fix for CONC79: Performance issue with c client library

Added read-ahed cache for vio to reduce the number of reads

include/violite.h

@@ -51,6 +51,10 @@ typedef struct st_vio Vio;
 #define HANDLE void *
 #endif
 
+/* vio read-ahead cachine */
+#define VIO_CACHE_SIZE 16384
+#define VIO_CACHE_MIN_SIZE 2048
+
 enum enum_vio_type { VIO_CLOSED, VIO_TYPE_TCPIP, VIO_TYPE_SOCKET,
 		     VIO_TYPE_NAMEDPIPE, VIO_TYPE_SSL};
 
@@ -139,6 +143,9 @@ struct st_vio
 #ifdef HAVE_OPENSSL
   SSL *ssl;
 #endif
+  uchar *cache;       /* read-ahead cache to reduce reads (see CONC-79) */
+  uchar *cache_pos;   /* position of read-ahead cached data */
+  size_t cache_size;  /* <= VIO_CACHE_SIZE */
 };
 
 #ifdef	__cplusplus

libmariadb/violite.c

@@ -148,6 +148,13 @@ Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost)
     }
 #endif
   }
+  if (!(vio->cache= my_malloc(VIO_CACHE_SIZE, MYF(MY_WME))))
+  {
+    my_free((gptr)vio, MYF(0));
+    vio= NULL;
+  }
+  vio->cache_size= 0;
+  vio->cache_pos= vio->cache;
   DBUG_RETURN(vio);
 }
 
@@ -176,6 +183,7 @@ void vio_delete(Vio * vio)
   {
     if (vio->type != VIO_CLOSED)
       vio_close(vio);
+    my_free((gptr) vio->cache, MYF(0));
     my_free((gptr) vio,MYF(0));
   }
 }
@@ -185,6 +193,34 @@ int vio_errno(Vio *vio __attribute__((unused)))
   return socket_errno; /* On Win32 this mapped to WSAGetLastError() */
 }
 
+size_t vio_real_read(Vio *vio, gptr buf, size_t size)
+{
+  switch(vio->type) {
+#ifdef HAVE_OPENSSL
+  case VIO_TYPE_SSL:
+    return my_ssl_read(vio, (char *)buf, size);
+    break;
+#endif
+#ifdef _WIN32
+  case VIO_TYPE_NAMEDPIPE:
+    {
+      DWORD length= 0;
+      if (!ReadFile(vio->hPipe, buf, (DWORD)size, &length, NULL))
+        return -1;
+      return length;
+    }
+    break;
+#endif
+  default:
+    return recv(vio->sd, buf,
+#ifdef _WIN32
+           (int)
+#endif 
+                size, 0);
+    break;
+  }
+}
+
 
 size_t vio_read(Vio * vio, gptr buf, size_t size)
 {
@@ -192,32 +228,30 @@ size_t vio_read(Vio * vio, gptr buf, size_t size)
   DBUG_ENTER("vio_read");
   DBUG_PRINT("enter", ("sd=%d  size=%d", vio->sd, size));
 
-#ifdef HAVE_OPENSSL
+  if (vio->cache + vio->cache_size > vio->cache_pos)
-  if (vio->type == VIO_TYPE_SSL)
   {
-    r= my_ssl_read(vio, (uchar *)buf, size);
+    r= MIN(size, vio->cache + vio->cache_size - vio->cache_pos);
-    DBUG_RETURN(r); 
+    memcpy(buf, vio->cache_pos, r);
+    vio->cache_pos+= r;
   }
-#endif
+  else if (size >= VIO_CACHE_MIN_SIZE)
-
-#if defined( _WIN32) || defined(OS2)
-  if (vio->type == VIO_TYPE_NAMEDPIPE)
   {
-    DWORD length;
+    r= vio_real_read(vio, buf, size); 
-#ifdef OS2
+  }
-    if (!DosRead((HFILE)vio->hPipe, buf, size, &length))
+  else
-      DBUG_RETURN(-1);
+  {
-#else
+    r= vio_real_read(vio, vio->cache, VIO_CACHE_SIZE);
-    if (!ReadFile(vio->hPipe, buf, (DWORD)size, &length, NULL))
+    if (r > 0)
-      DBUG_RETURN(-1);
+    {
-#endif
+      if (size < r)
-    DBUG_RETURN(length);
+      {
+        vio->cache_size= r; /* might be < VIO_CACHE_SIZE */
+        vio->cache_pos= vio->cache + size;
+        r= size;
+      }
+      memcpy(buf, vio->cache, r);
+    }
   } 
-  r = recv(vio->sd, buf, (int)size,0);
-#else
-  errno=0; /* For linux */
-  r = read(vio->sd, buf, size);
-#endif /* _WIN32 */
 #ifndef DBUG_OFF
   if ((size_t)r == -1)
   {

unittest/libmariadb/ps.c

@@ -3859,7 +3859,7 @@ static int test_rename(MYSQL *mysql)
   check_mysql_rc(rc, mysql);
 
   rc= mysql_stmt_execute(stmt);
-  FAIL_IF(!rc, "Errr expected");
+  FAIL_IF(!rc, "Error expected");
 
   rc= mysql_query(mysql, "create table t3 (a int)");
   check_mysql_rc(rc, mysql);