mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
b59217ebbb
--long-query-time is now given in seconds with microseconds as decimals --min_examined_row_limit added for slow query log long_query_time user variable is now double with 6 decimals Added functions to get time in microseconds Added faster time() functions for system that has gethrtime() (Solaris) We now do less time() calls. Added field->in_read_set() and field->in_write_set() for easier field manipulation by handlers set_var.cc and my_getopt() can now handle DOUBLE variables. All time() calls changed to my_time() my_time() now does retry's if time() call fails. Added debug function for stopping in mysql_admin_table() when tables are locked Some trivial function and struct variable renames to avoid merge errors. Fixed compiler warnings Initialization of some time variables on windows moved to my_init() include/my_getopt.h: Added support for double arguments include/my_sys.h: Fixed wrong type to packfrm() Added new my_time functions include/mysql/plugin.h: Added support for DOUBLE libmysql/CMakeLists.txt: Added new time functions libmysql/Makefile.shared: Added new time functions mysql-test/r/variables.result: Testing of long_query_time mysql-test/t/variables.test: Testing of long_query_time mysys/charset.c: Fixed compiler warnings mysys/default_modify.c: Fixed compiler warnings mysys/hash.c: Fixed compiler warnings mysys/mf_getdate.c: Use my_time() mysys/mf_iocache2.c: Fixed compiler warnings mysys/mf_pack.c: Fixed compiler warnings mysys/mf_path.c: Fixed compiler warnings mysys/my_append.c: Fixed compiler warnings mysys/my_compress.c: Fixed compiler warnings mysys/my_copy.c: Fixed compiler warnings mysys/my_gethwaddr.c: Fixed compiler warnings mysys/my_getopt.c: Added support for double arguments mysys/my_getsystime.c: Added functions to get time in microseconds. Added faster time() functions for system that has gethrtime() (Solaris) Moved windows initialization code to my_init() mysys/my_init.c: Added initializing of variables needed for windows time functions mysys/my_static.c: Added variables needed for windows time functions mysys/my_static.h: Added variables needed for windows time functions mysys/my_thr_init.c: Added THR_LOCK_time, used for faster my_time() mysys/mysys_priv.h: Added THR_LOCK_time, used for faster my_time() mysys/thr_alarm.c: time() -> my_time() sql/event_data_objects.cc: end_time() -> set_current_time() sql/event_queue.cc: end_time() -> set_current_time() sql/event_scheduler.cc: Fixed compiler warnings sql/field.h: Added field->in_read_set() and field->in_write_set() for easier field manipulation by handlers sql/item.h: Added decimal to Item_float(double) sql/item_cmpfunc.h: Added decimal to Item_float(double) sql/item_timefunc.cc: time() -> my_time() sql/item_xmlfunc.cc: Fixed compiler warning sql/lock.cc: lock_time() -> set_time_after_lock() sql/log.cc: Timing in slow query log to file is now done in microseconds Changed some while() loops to for() loops. Fixed indentation time() -> my_time() sql/log.h: Slow query logging is now done based on microseconds sql/log_event.cc: time() -> my_time() Fixed arguments to new Item_float() sql/mysql_priv.h: Fixed compiler warnings Added opt_log_slow_slave_statements sql/mysqld.cc: Added --log_slow_slave_statements and --min_examined_row_limit --long-query-time now takes a double argument with microsecond resolution Don't write shutdown message when using --help Removed not needed \n Thread create time and connect time is now done in microseconds time() -> my_time() Avoid some time() calls sql/net_serv.cc: Fixed compiler warnings sql/parse_file.cc: time() -> my_time() sql/set_var.cc: Added support for DOUBLE variables Added support for variables that are given in seconds with microsecond resolution sql/set_var.h: Added support for variables that are given in seconds with microsecond resolution sql/slave.cc: Allow logging of slave queries to slow query log if 'opt_log_slow_slave_statements' is given time() -> my_time() sql/sql_cache.h: Fixed compiler warning() sql/sql_class.cc: Initialize new THD variables sql/sql_class.h: long_query_time is now in microseconds Added min_examined_row_limit Reordered some THD elements for higher efficency Added timers in microseconds (connect_utime, thr_create_utime, start_utime and utime_after_lock) Start of query is now recorded both in seconds and in microseconds. Following renames was made for more clarity and avoid merge problems from earlier versions: connect_time -> connect_utime thr_create_time -> thr_create_utime end_time() -> set_current_time() lock_time() -> set_time_after_lock() Added THD::start_utime, which is start of query in microseconds from some arbitary time Added function THD::current_utime() Removed safe_time() as retry's are handled in my_time() sql/sql_connect.cc: User resources are now using microsecond resolution sql/sql_insert.cc: end_time() -> set_current_time() sql-common/client.c: time() -> my_time() sql/sql_parse.cc: Testing if we should print to slow_query_log() is now done with microsecond precission. If min_examined_row_limit is given, only log queries to slow query log that has examined more rows than this. sql/sql_select.cc: Simplify code now that Item_float() takes decimals as argument sql/sql_show.cc: time() -> my_time() Added support for SYS_DOUBLE sql/sql_table.cc: Added debug function for stopping in mysql_admin_table() when tables are locked sql/structs.h: intime -> reset_utime
263 lines
6.9 KiB
C
263 lines
6.9 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* Written by Sinisa Milivojevic <sinisa@mysql.com> */
|
|
|
|
#include <my_global.h>
|
|
#ifdef HAVE_COMPRESS
|
|
#include <my_sys.h>
|
|
#ifndef SCO
|
|
#include <m_string.h>
|
|
#endif
|
|
#include <zlib.h>
|
|
|
|
/*
|
|
This replaces the packet with a compressed packet
|
|
|
|
SYNOPSIS
|
|
my_compress()
|
|
packet Data to compress. This is is replaced with the compressed data.
|
|
len Length of data to compress at 'packet'
|
|
complen out: 0 if packet was not compressed
|
|
|
|
RETURN
|
|
1 error. 'len' is not changed'
|
|
0 ok. In this case 'len' contains the size of the compressed packet
|
|
*/
|
|
|
|
my_bool my_compress(uchar *packet, size_t *len, size_t *complen)
|
|
{
|
|
DBUG_ENTER("my_compress");
|
|
if (*len < MIN_COMPRESS_LENGTH)
|
|
{
|
|
*complen=0;
|
|
DBUG_PRINT("note",("Packet too short: Not compressed"));
|
|
}
|
|
else
|
|
{
|
|
uchar *compbuf=my_compress_alloc(packet,len,complen);
|
|
if (!compbuf)
|
|
DBUG_RETURN(*complen ? 0 : 1);
|
|
memcpy(packet,compbuf,*len);
|
|
my_free(compbuf,MYF(MY_WME));
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
uchar *my_compress_alloc(const uchar *packet, size_t *len, size_t *complen)
|
|
{
|
|
uchar *compbuf;
|
|
uLongf tmp_complen;
|
|
int res;
|
|
*complen= *len * 120 / 100 + 12;
|
|
|
|
if (!(compbuf= (uchar *) my_malloc(*complen, MYF(MY_WME))))
|
|
return 0; /* Not enough memory */
|
|
|
|
tmp_complen= *complen;
|
|
res= compress((Bytef*) compbuf, &tmp_complen, (Bytef*) packet, (uLong) *len);
|
|
*complen= tmp_complen;
|
|
|
|
if (res != Z_OK)
|
|
{
|
|
my_free(compbuf, MYF(MY_WME));
|
|
return 0;
|
|
}
|
|
|
|
if (*complen >= *len)
|
|
{
|
|
*complen= 0;
|
|
my_free(compbuf, MYF(MY_WME));
|
|
DBUG_PRINT("note",("Packet got longer on compression; Not compressed"));
|
|
return 0;
|
|
}
|
|
/* Store length of compressed packet in *len */
|
|
swap_variables(size_t, *len, *complen);
|
|
return compbuf;
|
|
}
|
|
|
|
|
|
/*
|
|
Uncompress packet
|
|
|
|
SYNOPSIS
|
|
my_uncompress()
|
|
packet Compressed data. This is is replaced with the orignal data.
|
|
len Length of compressed data
|
|
complen Length of the packet buffer (must be enough for the original
|
|
data)
|
|
|
|
RETURN
|
|
1 error
|
|
0 ok. In this case 'complen' contains the updated size of the
|
|
real data.
|
|
*/
|
|
|
|
my_bool my_uncompress(uchar *packet, size_t len, size_t *complen)
|
|
{
|
|
uLongf tmp_complen;
|
|
DBUG_ENTER("my_uncompress");
|
|
|
|
if (*complen) /* If compressed */
|
|
{
|
|
uchar *compbuf= (uchar *) my_malloc(*complen,MYF(MY_WME));
|
|
int error;
|
|
if (!compbuf)
|
|
DBUG_RETURN(1); /* Not enough memory */
|
|
|
|
tmp_complen= *complen;
|
|
error= uncompress((Bytef*) compbuf, &tmp_complen, (Bytef*) packet,
|
|
(uLong) len);
|
|
*complen= tmp_complen;
|
|
if (error != Z_OK)
|
|
{ /* Probably wrong packet */
|
|
DBUG_PRINT("error",("Can't uncompress packet, error: %d",error));
|
|
my_free(compbuf, MYF(MY_WME));
|
|
DBUG_RETURN(1);
|
|
}
|
|
memcpy(packet, compbuf, *complen);
|
|
my_free(compbuf, MYF(MY_WME));
|
|
}
|
|
else
|
|
*complen= len;
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
/*
|
|
Internal representation of the frm blob is:
|
|
|
|
ver 4 bytes
|
|
orglen 4 bytes
|
|
complen 4 bytes
|
|
*/
|
|
|
|
#define BLOB_HEADER 12
|
|
|
|
|
|
/*
|
|
packfrm is a method used to compress the frm file for storage in a
|
|
handler. This method was developed for the NDB handler and has been moved
|
|
here to serve also other uses.
|
|
|
|
SYNOPSIS
|
|
packfrm()
|
|
data Data reference to frm file data.
|
|
len Length of frm file data
|
|
out:pack_data Reference to the pointer to the packed frm data
|
|
out:pack_len Length of packed frm file data
|
|
|
|
NOTES
|
|
data is replaced with compressed content
|
|
|
|
RETURN VALUES
|
|
0 Success
|
|
>0 Failure
|
|
*/
|
|
|
|
int packfrm(uchar *data, size_t len,
|
|
uchar **pack_data, size_t *pack_len)
|
|
{
|
|
int error;
|
|
size_t org_len, comp_len, blob_len;
|
|
uchar *blob;
|
|
DBUG_ENTER("packfrm");
|
|
DBUG_PRINT("enter", ("data: 0x%lx len: %lu", (long) data, (ulong) len));
|
|
|
|
error= 1;
|
|
org_len= len;
|
|
if (my_compress((uchar*)data, &org_len, &comp_len))
|
|
goto err;
|
|
|
|
DBUG_PRINT("info", ("org_len: %lu comp_len: %lu", (ulong) org_len, (ulong) comp_len));
|
|
DBUG_DUMP("compressed", data, org_len);
|
|
|
|
error= 2;
|
|
blob_len= BLOB_HEADER + org_len;
|
|
if (!(blob= (uchar*) my_malloc(blob_len,MYF(MY_WME))))
|
|
goto err;
|
|
|
|
/* Store compressed blob in machine independent format */
|
|
int4store(blob, 1);
|
|
int4store(blob+4, (uint32) len);
|
|
int4store(blob+8, (uint32) org_len); /* compressed length */
|
|
|
|
/* Copy frm data into blob, already in machine independent format */
|
|
memcpy(blob+BLOB_HEADER, data, org_len);
|
|
|
|
*pack_data= blob;
|
|
*pack_len= blob_len;
|
|
error= 0;
|
|
|
|
DBUG_PRINT("exit", ("pack_data: 0x%lx pack_len: %lu",
|
|
(long) *pack_data, (ulong) *pack_len));
|
|
err:
|
|
DBUG_RETURN(error);
|
|
|
|
}
|
|
|
|
/*
|
|
unpackfrm is a method used to decompress the frm file received from a
|
|
handler. This method was developed for the NDB handler and has been moved
|
|
here to serve also other uses for other clustered storage engines.
|
|
|
|
SYNOPSIS
|
|
unpackfrm()
|
|
pack_data Data reference to packed frm file data
|
|
out:unpack_data Reference to the pointer to the unpacked frm data
|
|
out:unpack_len Length of unpacked frm file data
|
|
|
|
RETURN VALUES¨
|
|
0 Success
|
|
>0 Failure
|
|
*/
|
|
|
|
int unpackfrm(uchar **unpack_data, size_t *unpack_len,
|
|
const uchar *pack_data)
|
|
{
|
|
uchar *data;
|
|
size_t complen, orglen;
|
|
ulong ver;
|
|
DBUG_ENTER("unpackfrm");
|
|
DBUG_PRINT("enter", ("pack_data: 0x%lx", (long) pack_data));
|
|
|
|
ver= uint4korr(pack_data);
|
|
orglen= uint4korr(pack_data+4);
|
|
complen= uint4korr(pack_data+8);
|
|
|
|
DBUG_PRINT("blob",("ver: %lu complen: %lu orglen: %lu",
|
|
ver, (ulong) complen, (ulong) orglen));
|
|
DBUG_DUMP("blob->data", pack_data + BLOB_HEADER, complen);
|
|
|
|
if (ver != 1)
|
|
DBUG_RETURN(1);
|
|
if (!(data= my_malloc(max(orglen, complen), MYF(MY_WME))))
|
|
DBUG_RETURN(2);
|
|
memcpy(data, pack_data + BLOB_HEADER, complen);
|
|
|
|
if (my_uncompress(data, complen, &orglen))
|
|
{
|
|
my_free(data, MYF(0));
|
|
DBUG_RETURN(3);
|
|
}
|
|
|
|
*unpack_data= data;
|
|
*unpack_len= orglen;
|
|
|
|
DBUG_PRINT("exit", ("frmdata: 0x%lx len: %lu", (long) *unpack_data,
|
|
(ulong) *unpack_len));
|
|
DBUG_RETURN(0);
|
|
}
|
|
#endif /* HAVE_COMPRESS */
|