bk commit into 5.0 tree (konstantin:1.1804)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1804 05/03/06 00:10:08 konstantin@stripped +10 -0
  Porting of "buffered read" patch to 5.0 and post-review fixes.
  The patch implements the idea suggested by Olaf van der Spek in 
  thread "Client: many small reads?" (internals@stripped).
  Now small reads performed by the client library are buffered.
  The buffering gives up to 2 times speedup when retrieving 
  one-column tables.

  vio/viosocket.c
    1.30 05/03/06 00:10:04 konstantin@stripped +46 -0
    Implementation of client-side buffered reads in VIO: the idea 
    is to buffer small reads in a client buffer to save amount of
    syscalls per retrieved result set. The implementation relies
    on the fact that read/recv will return as soon as there is
    some data in the kernel buffer, no matter how big the given
    user's buffer is. To be able to disable it in case recv/read don't
    have such semantics, the new calls are guarded
    with #define HAVE_VIO_READ_BUFF. Currently buffered reading is 
    switched on only for BSD sockets and named pipes, both on Windows
    and UNIXes.

  vio/vio.c
    1.21 05/03/06 00:10:04 konstantin@stripped +27 -18
    Optionally set up vio read buffer when creating a new VIO structure.

  sql/mysqld.cc
    1.436 05/03/06 00:10:03 konstantin@stripped +1 -1
    Use flags to disable vio read buffering when creating a server 
    connection.

  sql-common/client.c
    1.68 05/03/06 00:10:03 konstantin@stripped +3 -2
    Use flags to set up vio read buffering in mysql_real_connect.

  include/violite.h
    1.39 05/03/06 00:10:03 konstantin@stripped +14 -6
    Removed HAVE_VIO, as currently VIO is always in use.
    Added declaration for vio_read_buff and related members in struct VIO.

  include/config-win.h
    1.56 05/03/06 00:10:03 konstantin@stripped +1 -1
    Removed HAVE_VIO (not needed anymore)
    Added HAVE_VIO_READ_BUFF (define buffered client reads for Windows clients).

  config/ac-macros/openssl.m4
    1.3 05/03/06 00:10:03 konstantin@stripped +0 -3
    Removed HAVE_VIO.

  config/ac-macros/misc.m4
    1.3 05/03/06 00:10:03 konstantin@stripped +7 -16
    Removed --with-vio configure switch: we always use VIO. The switch,
     in fact, only saved us one pointer dereferencing per call in case we had
    only one transport type in VIO enabled.

  BUILD/compile-pentium64-valgrind-max
    1.2 05/03/06 00:10:03 konstantin@stripped +1 -1
    Remove --with-vio option which no longer exist.

  BUILD/SETUP.sh
    1.39 05/03/06 00:10:03 konstantin@stripped +2 -2
    Remove --with-vio option which no longer exist.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	konstantin
# Host:	dragonfly.local
# Root:	/media/sda1/mysql/mysql-5.0-vio

--- 1.55/include/config-win.h	2005-02-23 16:01:30 +03:00
+++ 1.56/include/config-win.h	2005-03-06 00:10:03 +03:00
@@ -308,7 +308,7 @@
 #define HAVE_QUERY_CACHE
 #define SPRINTF_RETURNS_INT
 #define HAVE_SETFILEPOINTER
-#define HAVE_VIO
+#define HAVE_VIO_READ_BUFF
 
 #ifdef NOT_USED
 #define HAVE_SNPRINTF		/* Gave link error */

--- 1.38/include/violite.h	2004-12-23 14:04:37 +03:00
+++ 1.39/include/violite.h	2005-03-06 00:10:03 +03:00
@@ -37,7 +37,12 @@
   VIO_TYPE_SSL, VIO_TYPE_SHARED_MEMORY
 };
 
-Vio*	vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost);
+
+#define VIO_LOCALHOST 1                         /* a localhost connection */
+#define VIO_BUFFERED_READ 2                     /* use buffered read */
+#define VIO_READ_BUFFER_SIZE 16384              /* size of read buffer */
+
+Vio*	vio_new(my_socket sd, enum enum_vio_type type, uint flags);
 #ifdef __WIN__
 Vio* vio_new_win32pipe(HANDLE hPipe);
 Vio* vio_new_win32shared_memory(NET *net,HANDLE handle_file_map,
@@ -57,8 +62,9 @@
 void	vio_delete(Vio* vio);
 int	vio_close(Vio* vio);
 void    vio_reset(Vio* vio, enum enum_vio_type type,
-                  my_socket sd, HANDLE hPipe, my_bool localhost);
+                  my_socket sd, HANDLE hPipe, uint flags);
 int	vio_read(Vio *vio, gptr	buf, int size);
+int     vio_read_buff(Vio *vio, gptr buf, int size);
 int	vio_write(Vio *vio, const gptr buf, int size);
 int	vio_blocking(Vio *vio, my_bool onoff, my_bool *old_mode);
 my_bool	vio_is_blocking(Vio *vio);
@@ -135,7 +141,7 @@
 }
 #endif
 
-#if defined(HAVE_VIO) && !defined(DONT_MAP_VIO)
+#if !defined(DONT_MAP_VIO)
 #define vio_delete(vio) 			(vio)->viodelete(vio)
 #define vio_errno(vio)	 			(vio)->vioerrno(vio)
 #define vio_read(vio, buf, size) 		(vio)->read(vio,buf,size)
@@ -150,7 +156,7 @@
 #define vio_peer_addr(vio, buf, prt)		(vio)->peer_addr(vio, buf, prt)
 #define vio_in_addr(vio, in)			(vio)->in_addr(vio, in)
 #define vio_timeout(vio, seconds)			(vio)->timeout(vio, seconds)
-#endif /* defined(HAVE_VIO) && !defined(DONT_MAP_VIO) */
+#endif /* !defined(DONT_MAP_VIO) */
 
 /* This enumerator is used in parser - should be always visible */
 enum SSL_type
@@ -175,7 +181,10 @@
   struct sockaddr_in	remote;		/* Remote internet address */
   enum enum_vio_type	type;		/* Type of connection */
   char			desc[30];	/* String description */
-#ifdef HAVE_VIO
+  char                  *read_buffer;   /* buffer for vio_read_buff */
+  char                  *read_pos;      /* start of unfetched data in the
+                                           read buffer */
+  char                  *read_end;      /* end of unfetched data */
   /* function pointers. They are similar for socket/SSL/whatever */
   void    (*viodelete)(Vio*);
   int     (*vioerrno)(Vio*);
@@ -203,6 +212,5 @@
   char    *shared_memory_pos;
   NET     *net;
 #endif /* HAVE_SMEM */
-#endif /* HAVE_VIO */
 };
 #endif /* vio_violite_h_ */

--- 1.435/sql/mysqld.cc	2005-03-04 13:38:13 +03:00
+++ 1.436/sql/mysqld.cc	2005-03-06 00:10:03 +03:00
@@ -3745,7 +3745,7 @@
     if (!(vio_tmp=vio_new(new_sock,
 			  sock == unix_sock ? VIO_TYPE_SOCKET :
 			  VIO_TYPE_TCPIP,
-			  sock == unix_sock)) ||
+			  sock == unix_sock ? VIO_LOCALHOST: 0)) ||
 	my_net_init(&thd->net,vio_tmp))
     {
       if (vio_tmp)

--- 1.2/config/ac-macros/misc.m4	2004-12-04 21:48:51 +03:00
+++ 1.3/config/ac-macros/misc.m4	2005-03-06 00:10:03 +03:00
@@ -594,22 +594,13 @@
 ])
 
 AC_DEFUN([MYSQL_CHECK_VIO], [
-  AC_ARG_WITH([vio],
-              [  --with-vio              Include the Virtual IO support],
-              [vio="$withval"],
-              [vio=no])
-
-  if test "$vio" = "yes"
-  then
-    vio_dir="vio"
-    vio_libs="../vio/libvio.la"
-    AC_DEFINE(HAVE_VIO, 1)
-  else
-    vio_dir=""
-    vio_libs=""
-  fi
-  AC_SUBST([vio_dir])
-  AC_SUBST([vio_libs])
+dnl
+dnl we always use vio: no need for special defines 
+dnl
+  AC_DEFINE([HAVE_VIO_READ_BUFF], [1],
+            [Define to enable buffered read. This works only if syscalls
+            read/recv return as soon as there is some data in the kernel
+            buffer, no matter how big the given buffer is.])
 ])
 
 # Local version of _AC_PROG_CXX_EXIT_DECLARATION that does not

--- 1.2/config/ac-macros/openssl.m4	2004-12-04 21:48:51 +03:00
+++ 1.3/config/ac-macros/openssl.m4	2005-03-06 00:10:03 +03:00
@@ -89,9 +89,6 @@
 	fi
     MYSQL_FIND_OPENSSL([$openssl_includes], [$openssl_libs])
     #force VIO use
-    vio_dir="vio"
-    vio_libs="../vio/libvio.la"
-    AC_DEFINE([HAVE_VIO], [1], [Virtual IO])
     AC_MSG_RESULT(yes)
     openssl_libs="-L$OPENSSL_LIB -lssl -lcrypto"
     # Don't set openssl_includes to /usr/include as this gives us a lot of

--- 1.67/sql-common/client.c	2005-02-23 11:29:51 +03:00
+++ 1.68/sql-common/client.c	2005-03-06 00:10:03 +03:00
@@ -1681,7 +1681,8 @@
                   ER(net->last_errno),socket_errno);
       goto error;
     }
-    net->vio = vio_new(sock, VIO_TYPE_SOCKET, TRUE);
+    net->vio= vio_new(sock, VIO_TYPE_SOCKET,
+                      VIO_LOCALHOST | VIO_BUFFERED_READ);
     bzero((char*) &UNIXaddr,sizeof(UNIXaddr));
     UNIXaddr.sun_family = AF_UNIX;
     strmake(UNIXaddr.sun_path, unix_socket, sizeof(UNIXaddr.sun_path)-1);
@@ -1756,7 +1757,7 @@
                   ER(net->last_errno),socket_errno);
       goto error;
     }
-    net->vio = vio_new(sock,VIO_TYPE_TCPIP,FALSE);
+    net->vio= vio_new(sock, VIO_TYPE_TCPIP, VIO_BUFFERED_READ);
     bzero((char*) &sock_addr,sizeof(sock_addr));
     sock_addr.sin_family = AF_INET;
 

--- 1.1/BUILD/compile-pentium64-valgrind-max	2004-12-18 06:19:16 +03:00
+++ 1.2/BUILD/compile-pentium64-valgrind-max	2005-03-06 00:10:03 +03:00
@@ -9,7 +9,7 @@
 extra_configs="$pentium_configs $debug_configs"
 
 # We want to test isam when building with valgrind
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-isam
--with-embedded-server --with-openssl --with-vio --with-raid --with-ndbcluster"
+extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-isam
--with-embedded-server --with-openssl --with-raid --with-ndbcluster"
 
 . "$path/FINISH.sh"
 

--- 1.38/BUILD/SETUP.sh	2005-02-19 20:00:37 +03:00
+++ 1.39/BUILD/SETUP.sh	2005-03-06 00:10:03 +03:00
@@ -48,8 +48,8 @@
 c_warnings="$global_warnings -Wunused"
 cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder
-Wctor-dtor-privacy -Wnon-virtual-dtor"
 
-base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster
--with-archive-storage-engine --with-raid --with-openssl --with-raid --with-vio"
-max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster
--with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl
--with-raid --with-vio --with-embedded-server"
+base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster
--with-archive-storage-engine --with-raid --with-openssl --with-raid"
+max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster
--with-archive-storage-engine --with-federated-storage-engine --with-raid --with-openssl
--with-raid --with-embedded-server"
 max_no_es_configs="$max_leave_isam_configs --without-isam"
 max_configs="$max_no_es_configs --with-embedded-server"
 

--- 1.20/vio/vio.c	2004-12-31 16:30:53 +03:00
+++ 1.21/vio/vio.c	2005-03-06 00:10:04 +03:00
@@ -27,20 +27,23 @@
  * Helper to fill most of the Vio* with defaults.
  */
 
-void vio_reset(Vio* vio, enum enum_vio_type type,
-		      my_socket sd, HANDLE hPipe,
-		      my_bool localhost)
+static void vio_init(Vio* vio, enum enum_vio_type type,
+                     my_socket sd, HANDLE hPipe, uint flags)
 {
-  DBUG_ENTER("vio_reset");
-  DBUG_PRINT("enter", ("type: %d  sd: %d  localhost: %d", type, sd,
-                       localhost));
+  DBUG_ENTER("vio_init");
+  DBUG_PRINT("enter", ("type: %d  sd: %d  flags: %d", type, sd, flags));
 
+#ifndef HAVE_VIO_READ_BUFF
+  flags&= ~VIO_BUFFERED_READ;
+#endif
   bzero((char*) vio, sizeof(*vio));
   vio->type	= type;
   vio->sd	= sd;
   vio->hPipe	= hPipe;
-  vio->localhost= localhost;
-#ifdef HAVE_VIO  
+  vio->localhost= flags & VIO_LOCALHOST;
+  if ((flags & VIO_BUFFERED_READ) &&
+      !(vio->read_buffer= (char*)my_malloc(VIO_READ_BUFFER_SIZE, MYF(MY_WME))))
+    flags&= ~VIO_BUFFERED_READ;
 #ifdef __WIN__ 
   if (type == VIO_TYPE_NAMEDPIPE)
   {
@@ -101,7 +104,7 @@
   {
     vio->viodelete	=vio_delete;
     vio->vioerrno	=vio_errno;
-    vio->read		=vio_read;
+    vio->read= (flags & VIO_BUFFERED_READ) ? vio_read_buff : vio_read;
     vio->write		=vio_write;
     vio->fastsend	=vio_fastsend;
     vio->viokeepalive	=vio_keepalive;
@@ -113,21 +116,30 @@
     vio->is_blocking	=vio_is_blocking;
     vio->timeout	=vio_timeout;
   }
-#endif /* HAVE_VIO */
   DBUG_VOID_RETURN;
 }
 
 
+/* Reset initialized VIO to use with another transport type */
+
+void vio_reset(Vio* vio, enum enum_vio_type type,
+               my_socket sd, HANDLE hPipe, uint flags)
+{
+  my_free(vio->read_buffer, MYF(MY_ALLOW_ZERO_PTR));
+  vio_init(vio, type, sd, hPipe, flags);
+}
+
+
 /* Open the socket or TCP/IP connection and read the fnctl() status */
 
-Vio *vio_new(my_socket sd, enum enum_vio_type type, my_bool localhost)
+Vio *vio_new(my_socket sd, enum enum_vio_type type, uint flags)
 {
   Vio *vio;
   DBUG_ENTER("vio_new");
   DBUG_PRINT("enter", ("sd: %d", sd));
   if ((vio = (Vio*) my_malloc(sizeof(*vio),MYF(MY_WME))))
   {
-    vio_reset(vio, type, sd, 0, localhost);
+    vio_init(vio, type, sd, 0, flags);
     sprintf(vio->desc,
 	    (vio->type == VIO_TYPE_SOCKET ? "socket (%d)" : "TCP/IP (%d)"),
 	    vio->sd);
@@ -163,7 +175,7 @@
   DBUG_ENTER("vio_new_handle");
   if ((vio = (Vio*) my_malloc(sizeof(Vio),MYF(MY_WME))))
   {
-    vio_reset(vio, VIO_TYPE_NAMEDPIPE, 0, hPipe, TRUE);
+    vio_init(vio, VIO_TYPE_NAMEDPIPE, 0, hPipe, VIO_LOCALHOST);
     strmov(vio->desc, "named pipe");
   }
   DBUG_RETURN(vio);
@@ -179,7 +191,7 @@
   DBUG_ENTER("vio_new_win32shared_memory");
   if ((vio = (Vio*) my_malloc(sizeof(Vio),MYF(MY_WME))))
   {
-    vio_reset(vio, VIO_TYPE_SHARED_MEMORY, 0, 0, TRUE);
+    vio_init(vio, VIO_TYPE_SHARED_MEMORY, 0, 0, VIO_LOCALHOST);
     vio->handle_file_map= handle_file_map;
     vio->handle_map= handle_map;
     vio->event_server_wrote= event_server_wrote;
@@ -204,11 +216,8 @@
   if (vio)
   {
     if (vio->type != VIO_CLOSED)
-#ifdef HAVE_VIO /*WAX*/
       vio->vioclose(vio);
-#else
-      vio_close(vio);
-#endif
+    my_free((gptr) vio->read_buffer, MYF(MY_ALLOW_ZERO_PTR));
     my_free((gptr) vio,MYF(0));
   }
 }

--- 1.29/vio/viosocket.c	2005-02-15 17:46:42 +03:00
+++ 1.30/vio/viosocket.c	2005-03-06 00:10:04 +03:00
@@ -35,6 +35,8 @@
   DBUG_ENTER("vio_read");
   DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d", vio->sd, buf, size));
 
+  /* Ensure nobody uses vio_read_buff and vio_read simultaneously */
+  DBUG_ASSERT(vio->read_end == vio->read_pos);
 #ifdef __WIN__
   r = recv(vio->sd, buf, size,0);
 #else
@@ -49,6 +51,50 @@
 #endif /* DBUG_OFF */
   DBUG_PRINT("exit", ("%d", r));
   DBUG_RETURN(r);
+}
+
+
+/*
+  Buffered read: if average read size is small it may
+  reduce number of syscalls.
+*/
+
+int vio_read_buff(Vio *vio, gptr buf, int size)
+{
+  int rc;
+#define VIO_UNBUFFERED_READ_MIN_SIZE 2048
+  DBUG_ENTER("vio_read_buff");
+  DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d", vio->sd, buf, size));
+
+  if (vio->read_pos < vio->read_end)
+  {
+    rc= min(vio->read_end - vio->read_pos, size);
+    memcpy(buf, vio->read_pos, rc);
+    vio->read_pos+= rc;
+    /*
+      Do not try to read from the socket now even if rc < size:
+      vio_read can return -1 due to an error or non-blocking mode, and
+      the safest way to handle it is to move to a separate branch.
+    */
+  }
+  else if (size < VIO_UNBUFFERED_READ_MIN_SIZE)
+  {
+    rc= vio_read(vio, vio->read_buffer, VIO_READ_BUFFER_SIZE);
+    if (rc > 0)
+    {
+      if (rc > size)
+      {
+        vio->read_pos= vio->read_buffer + size;
+        vio->read_end= vio->read_buffer + rc;
+        rc= size;
+      }
+      memcpy(buf, vio->read_buffer, rc);
+    }
+  }
+  else
+    rc= vio_read(vio, buf, size);
+  DBUG_RETURN(rc);
+#undef VIO_UNBUFFERED_READ_MIN_SIZE
 }