2006-12-31 01:02:27 +01:00
|
|
|
/* Copyright (C) 2000-2006 MySQL AB
|
2001-12-06 13:10:51 +01:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
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
|
2006-12-23 20:17:15 +01:00
|
|
|
the Free Software Foundation; version 2 of the License.
|
2001-12-06 13:10:51 +01:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
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.
|
2001-12-06 13:10:51 +01:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
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 */
|
|
|
|
|
|
|
|
|
2005-05-26 12:09:14 +02:00
|
|
|
#ifdef USE_PRAGMA_IMPLEMENTATION
|
2000-07-31 21:29:14 +02:00
|
|
|
#pragma implementation // gcc: Class implementation
|
|
|
|
#endif
|
|
|
|
|
2006-08-19 17:02:52 +02:00
|
|
|
#define MYSQL_SERVER 1
|
2000-07-31 21:29:14 +02:00
|
|
|
#include "mysql_priv.h"
|
2006-08-19 17:02:52 +02:00
|
|
|
#include <mysql/plugin.h>
|
2000-07-31 21:29:14 +02:00
|
|
|
#include "ha_heap.h"
|
|
|
|
|
2005-11-07 16:25:06 +01:00
|
|
|
|
2006-09-30 02:19:02 +02:00
|
|
|
static handler *heap_create_handler(handlerton *hton,
|
|
|
|
TABLE_SHARE *table,
|
|
|
|
MEM_ROOT *mem_root);
|
2005-11-07 16:25:06 +01:00
|
|
|
|
2006-09-30 21:49:46 +02:00
|
|
|
int heap_panic(handlerton *hton, ha_panic_function flag)
|
|
|
|
{
|
|
|
|
return hp_panic(flag);
|
|
|
|
}
|
|
|
|
|
2006-05-28 14:51:01 +02:00
|
|
|
|
2006-09-15 19:28:00 +02:00
|
|
|
int heap_init(void *p)
|
2006-05-28 14:51:01 +02:00
|
|
|
{
|
2006-09-30 21:49:46 +02:00
|
|
|
handlerton *heap_hton;
|
|
|
|
|
2006-09-15 19:28:00 +02:00
|
|
|
heap_hton= (handlerton *)p;
|
|
|
|
heap_hton->state= SHOW_OPTION_YES;
|
|
|
|
heap_hton->db_type= DB_TYPE_HEAP;
|
|
|
|
heap_hton->create= heap_create_handler;
|
|
|
|
heap_hton->panic= heap_panic;
|
|
|
|
heap_hton->flags= HTON_CAN_RECREATE;
|
|
|
|
|
2006-05-28 14:51:01 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2005-07-19 20:21:12 +02:00
|
|
|
|
2006-09-30 02:19:02 +02:00
|
|
|
static handler *heap_create_handler(handlerton *hton,
|
|
|
|
TABLE_SHARE *table,
|
|
|
|
MEM_ROOT *mem_root)
|
2005-11-07 16:25:06 +01:00
|
|
|
{
|
2006-09-30 02:19:02 +02:00
|
|
|
return new (mem_root) ha_heap(hton, table);
|
2005-11-07 16:25:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
/*****************************************************************************
|
|
|
|
** HEAP tables
|
|
|
|
*****************************************************************************/
|
2005-07-19 20:21:12 +02:00
|
|
|
|
2006-09-30 02:19:02 +02:00
|
|
|
ha_heap::ha_heap(handlerton *hton, TABLE_SHARE *table_arg)
|
|
|
|
:handler(hton, table_arg), file(0), records_changed(0),
|
2006-02-02 22:07:36 +01:00
|
|
|
key_stat_version(0)
|
2005-07-19 20:21:12 +02:00
|
|
|
{}
|
|
|
|
|
|
|
|
|
2005-04-27 11:25:08 +02:00
|
|
|
static const char *ha_heap_exts[] = {
|
|
|
|
NullS
|
|
|
|
};
|
2000-07-31 21:29:14 +02:00
|
|
|
|
|
|
|
const char **ha_heap::bas_ext() const
|
2005-04-27 11:25:08 +02:00
|
|
|
{
|
|
|
|
return ha_heap_exts;
|
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2004-09-08 00:07:53 +02:00
|
|
|
/*
|
|
|
|
Hash index statistics is updated (copied from HP_KEYDEF::hash_buckets to
|
2004-10-12 16:21:25 +02:00
|
|
|
rec_per_key) after 1/HEAP_STATS_UPDATE_THRESHOLD fraction of table records
|
|
|
|
have been inserted/updated/deleted. delete_all_rows() and table flush cause
|
|
|
|
immediate update.
|
|
|
|
|
|
|
|
NOTE
|
|
|
|
hash index statistics must be updated when number of table records changes
|
|
|
|
from 0 to non-zero value and vice versa. Otherwise records_in_range may
|
|
|
|
erroneously return 0 and 'range' may miss records.
|
2004-09-08 00:07:53 +02:00
|
|
|
*/
|
|
|
|
#define HEAP_STATS_UPDATE_THRESHOLD 10
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2000-09-25 23:33:25 +02:00
|
|
|
int ha_heap::open(const char *name, int mode, uint test_if_locked)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2002-06-07 13:47:36 +02:00
|
|
|
if (!(file= heap_open(name, mode)) && my_errno == ENOENT)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2002-10-07 14:49:03 +02:00
|
|
|
HA_CREATE_INFO create_info;
|
|
|
|
bzero(&create_info, sizeof(create_info));
|
|
|
|
if (!create(name, table, &create_info))
|
2004-02-16 09:03:25 +01:00
|
|
|
{
|
2002-06-07 13:47:36 +02:00
|
|
|
file= heap_open(name, mode);
|
2004-02-16 09:03:25 +01:00
|
|
|
implicit_emptied= 1;
|
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2004-02-09 12:31:03 +01:00
|
|
|
ref_length= sizeof(HEAP_PTR);
|
2004-03-25 14:05:01 +01:00
|
|
|
if (file)
|
|
|
|
{
|
|
|
|
/* Initialize variables for the opened table */
|
2004-05-06 15:53:01 +02:00
|
|
|
set_keys_for_scanning();
|
2005-06-24 17:47:09 +02:00
|
|
|
/*
|
|
|
|
We cannot run update_key_stats() here because we do not have a
|
|
|
|
lock on the table. The 'records' count might just be changed
|
|
|
|
temporarily at this moment and we might get wrong statistics (Bug
|
|
|
|
#10178). Instead we request for update. This will be done in
|
|
|
|
ha_heap::info(), which is always called before key statistics are
|
|
|
|
used.
|
|
|
|
*/
|
2005-11-08 06:26:37 +01:00
|
|
|
key_stat_version= file->s->key_stat_version-1;
|
2004-03-25 14:05:01 +01:00
|
|
|
}
|
2002-06-07 13:47:36 +02:00
|
|
|
return (file ? 0 : 1);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int ha_heap::close(void)
|
|
|
|
{
|
|
|
|
return heap_close(file);
|
|
|
|
}
|
|
|
|
|
2004-05-06 15:53:01 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Compute which keys to use for scanning
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
set_keys_for_scanning()
|
|
|
|
no parameter
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
Set the bitmap btree_keys, which is used when the upper layers ask
|
|
|
|
which keys to use for scanning. For each btree index the
|
|
|
|
corresponding bit is set.
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
void
|
|
|
|
*/
|
|
|
|
|
|
|
|
void ha_heap::set_keys_for_scanning(void)
|
|
|
|
{
|
|
|
|
btree_keys.clear_all();
|
2005-01-06 12:00:13 +01:00
|
|
|
for (uint i= 0 ; i < table->s->keys ; i++)
|
2004-05-06 15:53:01 +02:00
|
|
|
{
|
|
|
|
if (table->key_info[i].algorithm == HA_KEY_ALG_BTREE)
|
|
|
|
btree_keys.set_bit(i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-12-07 14:47:00 +01:00
|
|
|
|
2004-09-08 00:07:53 +02:00
|
|
|
void ha_heap::update_key_stats()
|
|
|
|
{
|
2005-01-06 12:00:13 +01:00
|
|
|
for (uint i= 0; i < table->s->keys; i++)
|
2004-09-08 00:07:53 +02:00
|
|
|
{
|
|
|
|
KEY *key=table->key_info+i;
|
2005-02-08 21:44:51 +01:00
|
|
|
if (!key->rec_per_key)
|
|
|
|
continue;
|
2004-09-08 00:07:53 +02:00
|
|
|
if (key->algorithm != HA_KEY_ALG_BTREE)
|
|
|
|
{
|
2005-11-08 06:26:37 +01:00
|
|
|
if (key->flags & HA_NOSAME)
|
|
|
|
key->rec_per_key[key->key_parts-1]= 1;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ha_rows hash_buckets= file->s->keydef[i].hash_buckets;
|
|
|
|
uint no_records= hash_buckets ? file->s->records/hash_buckets : 2;
|
|
|
|
if (no_records < 2)
|
|
|
|
no_records= 2;
|
|
|
|
key->rec_per_key[key->key_parts-1]= no_records;
|
|
|
|
}
|
2004-09-08 00:07:53 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
records_changed= 0;
|
2005-06-24 17:47:09 +02:00
|
|
|
/* At the end of update_key_stats() we can proudly claim they are OK. */
|
2005-11-08 06:26:37 +01:00
|
|
|
key_stat_version= file->s->key_stat_version;
|
2004-09-08 00:07:53 +02:00
|
|
|
}
|
|
|
|
|
2004-12-07 14:47:00 +01:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
int ha_heap::write_row(byte * buf)
|
|
|
|
{
|
2004-09-08 00:07:53 +02:00
|
|
|
int res;
|
2004-11-12 18:04:35 +01:00
|
|
|
statistic_increment(table->in_use->status_var.ha_write_count,&LOCK_status);
|
2004-10-01 16:54:06 +02:00
|
|
|
if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT)
|
|
|
|
table->timestamp_field->set_time();
|
2002-10-07 14:49:03 +02:00
|
|
|
if (table->next_number_field && buf == table->record[0])
|
2006-08-30 22:20:39 +02:00
|
|
|
{
|
|
|
|
if ((res= update_auto_increment()))
|
|
|
|
return res;
|
|
|
|
}
|
2004-09-08 00:07:53 +02:00
|
|
|
res= heap_write(file,buf);
|
2005-02-10 01:27:37 +01:00
|
|
|
if (!res && (++records_changed*HEAP_STATS_UPDATE_THRESHOLD >
|
|
|
|
file->s->records))
|
2006-01-27 18:44:33 +01:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
We can perform this safely since only one writer at the time is
|
|
|
|
allowed on the table.
|
|
|
|
*/
|
2005-11-08 06:26:37 +01:00
|
|
|
file->s->key_stat_version++;
|
2006-01-27 18:44:33 +01:00
|
|
|
}
|
2004-09-08 00:07:53 +02:00
|
|
|
return res;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int ha_heap::update_row(const byte * old_data, byte * new_data)
|
|
|
|
{
|
2004-09-08 00:07:53 +02:00
|
|
|
int res;
|
2004-11-17 20:07:13 +01:00
|
|
|
statistic_increment(table->in_use->status_var.ha_update_count,&LOCK_status);
|
2004-10-01 16:54:06 +02:00
|
|
|
if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
|
|
|
|
table->timestamp_field->set_time();
|
2004-09-08 00:07:53 +02:00
|
|
|
res= heap_update(file,old_data,new_data);
|
2005-02-08 21:44:51 +01:00
|
|
|
if (!res && ++records_changed*HEAP_STATS_UPDATE_THRESHOLD >
|
|
|
|
file->s->records)
|
2006-01-27 18:44:33 +01:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
We can perform this safely since only one writer at the time is
|
|
|
|
allowed on the table.
|
|
|
|
*/
|
2005-11-08 06:26:37 +01:00
|
|
|
file->s->key_stat_version++;
|
2006-01-27 18:44:33 +01:00
|
|
|
}
|
2004-09-08 00:07:53 +02:00
|
|
|
return res;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int ha_heap::delete_row(const byte * buf)
|
|
|
|
{
|
2004-09-08 00:07:53 +02:00
|
|
|
int res;
|
2004-11-12 18:04:35 +01:00
|
|
|
statistic_increment(table->in_use->status_var.ha_delete_count,&LOCK_status);
|
2004-09-08 00:07:53 +02:00
|
|
|
res= heap_delete(file,buf);
|
2005-01-06 12:00:13 +01:00
|
|
|
if (!res && table->s->tmp_table == NO_TMP_TABLE &&
|
2004-09-08 00:07:53 +02:00
|
|
|
++records_changed*HEAP_STATS_UPDATE_THRESHOLD > file->s->records)
|
2006-01-27 18:44:33 +01:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
We can perform this safely since only one writer at the time is
|
|
|
|
allowed on the table.
|
|
|
|
*/
|
2005-11-08 06:26:37 +01:00
|
|
|
file->s->key_stat_version++;
|
2006-01-27 18:44:33 +01:00
|
|
|
}
|
2004-09-08 00:07:53 +02:00
|
|
|
return res;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
2007-03-17 00:13:25 +01:00
|
|
|
int ha_heap::index_read(byte * buf, const byte * key, key_part_map keypart_map,
|
2002-04-25 10:36:55 +02:00
|
|
|
enum ha_rkey_function find_flag)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2004-06-23 12:29:05 +02:00
|
|
|
DBUG_ASSERT(inited==INDEX);
|
2004-11-12 18:04:35 +01:00
|
|
|
statistic_increment(table->in_use->status_var.ha_read_key_count,
|
|
|
|
&LOCK_status);
|
2007-01-29 10:40:26 +01:00
|
|
|
int error = heap_rkey(file,buf,active_index, key, keypart_map, find_flag);
|
2002-04-25 10:36:55 +02:00
|
|
|
table->status = error ? STATUS_NOT_FOUND : 0;
|
2000-07-31 21:29:14 +02:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2007-03-17 00:13:25 +01:00
|
|
|
int ha_heap::index_read_last(byte *buf, const byte *key, key_part_map keypart_map)
|
2002-11-28 12:19:42 +01:00
|
|
|
{
|
2004-06-23 12:29:05 +02:00
|
|
|
DBUG_ASSERT(inited==INDEX);
|
2004-11-12 18:04:35 +01:00
|
|
|
statistic_increment(table->in_use->status_var.ha_read_key_count,
|
|
|
|
&LOCK_status);
|
2007-01-29 10:40:26 +01:00
|
|
|
int error= heap_rkey(file, buf, active_index, key, keypart_map,
|
2002-11-28 12:19:42 +01:00
|
|
|
HA_READ_PREFIX_LAST);
|
|
|
|
table->status= error ? STATUS_NOT_FOUND : 0;
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
int ha_heap::index_read_idx(byte * buf, uint index, const byte * key,
|
2007-03-17 00:13:25 +01:00
|
|
|
key_part_map keypart_map,
|
2007-01-29 10:40:26 +01:00
|
|
|
enum ha_rkey_function find_flag)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2004-11-12 18:04:35 +01:00
|
|
|
statistic_increment(table->in_use->status_var.ha_read_key_count,
|
|
|
|
&LOCK_status);
|
2007-01-29 10:40:26 +01:00
|
|
|
int error = heap_rkey(file, buf, index, key, keypart_map, find_flag);
|
2002-04-25 10:36:55 +02:00
|
|
|
table->status = error ? STATUS_NOT_FOUND : 0;
|
2000-07-31 21:29:14 +02:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
int ha_heap::index_next(byte * buf)
|
|
|
|
{
|
2004-06-23 12:29:05 +02:00
|
|
|
DBUG_ASSERT(inited==INDEX);
|
2004-11-12 18:04:35 +01:00
|
|
|
statistic_increment(table->in_use->status_var.ha_read_next_count,
|
|
|
|
&LOCK_status);
|
2000-07-31 21:29:14 +02:00
|
|
|
int error=heap_rnext(file,buf);
|
|
|
|
table->status=error ? STATUS_NOT_FOUND: 0;
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
int ha_heap::index_prev(byte * buf)
|
|
|
|
{
|
2004-06-23 12:29:05 +02:00
|
|
|
DBUG_ASSERT(inited==INDEX);
|
2004-11-12 18:04:35 +01:00
|
|
|
statistic_increment(table->in_use->status_var.ha_read_prev_count,
|
|
|
|
&LOCK_status);
|
2000-07-31 21:29:14 +02:00
|
|
|
int error=heap_rprev(file,buf);
|
|
|
|
table->status=error ? STATUS_NOT_FOUND: 0;
|
|
|
|
return error;
|
|
|
|
}
|
2001-12-06 13:10:51 +01:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
int ha_heap::index_first(byte * buf)
|
|
|
|
{
|
2004-06-23 12:29:05 +02:00
|
|
|
DBUG_ASSERT(inited==INDEX);
|
2004-11-12 18:04:35 +01:00
|
|
|
statistic_increment(table->in_use->status_var.ha_read_first_count,
|
2004-09-13 15:48:01 +02:00
|
|
|
&LOCK_status);
|
2002-04-29 10:53:29 +02:00
|
|
|
int error=heap_rfirst(file, buf, active_index);
|
2000-07-31 21:29:14 +02:00
|
|
|
table->status=error ? STATUS_NOT_FOUND: 0;
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
int ha_heap::index_last(byte * buf)
|
|
|
|
{
|
2004-06-23 12:29:05 +02:00
|
|
|
DBUG_ASSERT(inited==INDEX);
|
2004-11-12 18:04:35 +01:00
|
|
|
statistic_increment(table->in_use->status_var.ha_read_last_count,
|
|
|
|
&LOCK_status);
|
2002-04-29 10:53:29 +02:00
|
|
|
int error=heap_rlast(file, buf, active_index);
|
2000-07-31 21:29:14 +02:00
|
|
|
table->status=error ? STATUS_NOT_FOUND: 0;
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
int ha_heap::rnd_init(bool scan)
|
|
|
|
{
|
|
|
|
return scan ? heap_scan_init(file) : 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int ha_heap::rnd_next(byte *buf)
|
|
|
|
{
|
2004-11-12 18:04:35 +01:00
|
|
|
statistic_increment(table->in_use->status_var.ha_read_rnd_next_count,
|
2004-09-13 15:48:01 +02:00
|
|
|
&LOCK_status);
|
2000-07-31 21:29:14 +02:00
|
|
|
int error=heap_scan(file, buf);
|
|
|
|
table->status=error ? STATUS_NOT_FOUND: 0;
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
int ha_heap::rnd_pos(byte * buf, byte *pos)
|
|
|
|
{
|
|
|
|
int error;
|
2006-12-14 23:51:37 +01:00
|
|
|
HEAP_PTR heap_position;
|
2004-11-12 18:04:35 +01:00
|
|
|
statistic_increment(table->in_use->status_var.ha_read_rnd_count,
|
|
|
|
&LOCK_status);
|
2006-12-14 23:51:37 +01:00
|
|
|
memcpy_fixed((char*) &heap_position, pos, sizeof(HEAP_PTR));
|
|
|
|
error=heap_rrnd(file, buf, heap_position);
|
2000-07-31 21:29:14 +02:00
|
|
|
table->status=error ? STATUS_NOT_FOUND: 0;
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ha_heap::position(const byte *record)
|
|
|
|
{
|
|
|
|
*(HEAP_PTR*) ref= heap_position(file); // Ref is aligned
|
|
|
|
}
|
|
|
|
|
2006-08-10 16:55:20 +02:00
|
|
|
int ha_heap::info(uint flag)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2006-12-14 23:51:37 +01:00
|
|
|
HEAPINFO hp_info;
|
|
|
|
(void) heap_info(file,&hp_info,flag);
|
|
|
|
|
2007-01-27 02:46:45 +01:00
|
|
|
errkey= hp_info.errkey;
|
|
|
|
stats.records= hp_info.records;
|
|
|
|
stats.deleted= hp_info.deleted;
|
|
|
|
stats.mean_rec_length= hp_info.reclength;
|
|
|
|
stats.data_file_length= hp_info.data_length;
|
|
|
|
stats.index_file_length= hp_info.index_length;
|
|
|
|
stats.max_data_file_length= hp_info.max_records * hp_info.reclength;
|
|
|
|
stats.delete_length= hp_info.deleted * hp_info.reclength;
|
2002-10-07 14:49:03 +02:00
|
|
|
if (flag & HA_STATUS_AUTO)
|
2007-01-27 02:46:45 +01:00
|
|
|
stats.auto_increment_value= hp_info.auto_increment;
|
2005-06-24 17:47:09 +02:00
|
|
|
/*
|
|
|
|
If info() is called for the first time after open(), we will still
|
|
|
|
have to update the key statistics. Hoping that a table lock is now
|
|
|
|
in place.
|
|
|
|
*/
|
2005-11-08 06:26:37 +01:00
|
|
|
if (key_stat_version != file->s->key_stat_version)
|
2005-06-24 17:47:09 +02:00
|
|
|
update_key_stats();
|
2006-08-10 16:55:20 +02:00
|
|
|
return 0;
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
|
|
|
|
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),
- New optional handler function introduced: reset()
This is called after every DML statement to make it easy for a handler to
statement specific cleanups.
(The only case it's not called is if force the file to be closed)
- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
should be moved to handler::reset()
- table->read_set contains a bitmap over all columns that are needed
in the query. read_row() and similar functions only needs to read these
columns
- table->write_set contains a bitmap over all columns that will be updated
in the query. write_row() and update_row() only needs to update these
columns.
The above bitmaps should now be up to date in all context
(including ALTER TABLE, filesort()).
The handler is informed of any changes to the bitmap after
fix_fields() by calling the virtual function
handler::column_bitmaps_signal(). If the handler does caching of
these bitmaps (instead of using table->read_set, table->write_set),
it should redo the caching in this code. as the signal() may be sent
several times, it's probably best to set a variable in the signal
and redo the caching on read_row() / write_row() if the variable was
set.
- Removed the read_set and write_set bitmap objects from the handler class
- Removed all column bit handling functions from the handler class.
(Now one instead uses the normal bitmap functions in my_bitmap.c instead
of handler dedicated bitmap functions)
- field->query_id is removed. One should instead instead check
table->read_set and table->write_set if a field is used in the query.
- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
instead use table->read_set to check for which columns to retrieve.
- If a handler needs to call Field->val() or Field->store() on columns
that are not used in the query, one should install a temporary
all-columns-used map while doing so. For this, we provide the following
functions:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
field->val();
dbug_tmp_restore_column_map(table->read_set, old_map);
and similar for the write map:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
field->val();
dbug_tmp_restore_column_map(table->write_set, old_map);
If this is not done, you will sooner or later hit a DBUG_ASSERT
in the field store() / val() functions.
(For not DBUG binaries, the dbug_tmp_restore_column_map() and
dbug_tmp_restore_column_map() are inline dummy functions and should
be optimized away be the compiler).
- If one needs to temporary set the column map for all binaries (and not
just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
methods) one should use the functions tmp_use_all_columns() and
tmp_restore_column_map() instead of the above dbug_ variants.
- All 'status' fields in the handler base class (like records,
data_file_length etc) are now stored in a 'stats' struct. This makes
it easier to know what status variables are provided by the base
handler. This requires some trivial variable names in the extra()
function.
- New virtual function handler::records(). This is called to optimize
COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
(stats.records is not supposed to be an exact value. It's only has to
be 'reasonable enough' for the optimizer to be able to choose a good
optimization path).
- Non virtual handler::init() function added for caching of virtual
constants from engine.
- Removed has_transactions() virtual method. Now one should instead return
HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
transactions.
- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
that is to be used with 'new handler_name()' to allocate the handler
in the right area. The xxxx_create_handler() function is also
responsible for any initialization of the object before returning.
For example, one should change:
static handler *myisam_create_handler(TABLE_SHARE *table)
{
return new ha_myisam(table);
}
->
static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
{
return new (mem_root) ha_myisam(table);
}
- New optional virtual function: use_hidden_primary_key().
This is called in case of an update/delete when
(table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
but we don't have a primary key. This allows the handler to take precisions
in remembering any hidden primary key to able to update/delete any
found row. The default handler marks all columns to be read.
- handler::table_flags() now returns a ulonglong (to allow for more flags).
- New/changed table_flags()
- HA_HAS_RECORDS Set if ::records() is supported
- HA_NO_TRANSACTIONS Set if engine doesn't support transactions
- HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
Set if we should mark all primary key columns for
read when reading rows as part of a DELETE
statement. If there is no primary key,
all columns are marked for read.
- HA_PARTIAL_COLUMN_READ Set if engine will not read all columns in some
cases (based on table->read_set)
- HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- HA_DUPP_POS Renamed to HA_DUPLICATE_POS
- HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
Set this if we should mark ALL key columns for
read when when reading rows as part of a DELETE
statement. In case of an update we will mark
all keys for read for which key part changed
value.
- HA_STATS_RECORDS_IS_EXACT
Set this if stats.records is exact.
(This saves us some extra records() calls
when optimizing COUNT(*))
- Removed table_flags()
- HA_NOT_EXACT_COUNT Now one should instead use HA_HAS_RECORDS if
handler::records() gives an exact count() and
HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
- HA_READ_RND_SAME Removed (no one supported this one)
- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
- Renamed handler::dupp_pos to handler::dup_pos
- Removed not used variable handler::sortkey
Upper level handler changes:
- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
cache is updated on engine creation time and updated on open.
MySQL level changes (not obvious from the above):
- DBUG_ASSERT() added to check that column usage matches what is set
in the column usage bit maps. (This found a LOT of bugs in current
column marking code).
- In 5.1 before, all used columns was marked in read_set and only updated
columns was marked in write_set. Now we only mark columns for which we
need a value in read_set.
- Column bitmaps are created in open_binary_frm() and open_table_from_share().
(Before this was in table.cc)
- handler::table_flags() calls are replaced with handler::ha_table_flags()
- For calling field->val() you must have the corresponding bit set in
table->read_set. For calling field->store() you must have the
corresponding bit set in table->write_set. (There are asserts in
all store()/val() functions to catch wrong usage)
- thd->set_query_id is renamed to thd->mark_used_columns and instead
of setting this to an integer value, this has now the values:
MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
Changed also all variables named 'set_query_id' to mark_used_columns.
- In filesort() we now inform the handler of exactly which columns are needed
doing the sort and choosing the rows.
- The TABLE_SHARE object has a 'all_set' column bitmap one can use
when one needs a column bitmap with all columns set.
(This is used for table->use_all_columns() and other places)
- The TABLE object has 3 column bitmaps:
- def_read_set Default bitmap for columns to be read
- def_write_set Default bitmap for columns to be written
- tmp_set Can be used as a temporary bitmap when needed.
The table object has also two pointer to bitmaps read_set and write_set
that the handler should use to find out which columns are used in which way.
- count() optimization now calls handler::records() instead of using
handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
- Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
- Added TABLE parameter to cp_buffer_from_ref()
- Don't close tables created with CREATE ... SELECT but keep them in
the table cache. (Faster usage of newly created tables).
New interfaces:
- table->clear_column_bitmaps() to initialize the bitmaps for tables
at start of new statements.
- table->column_bitmaps_set() to set up new column bitmaps and signal
the handler about this.
- table->column_bitmaps_set_no_signal() for some few cases where we need
to setup new column bitmaps but don't signal the handler (as the handler
has already been signaled about these before). Used for the momement
only in opt_range.cc when doing ROR scans.
- table->use_all_columns() to install a bitmap where all columns are marked
as use in the read and the write set.
- table->default_column_bitmaps() to install the normal read and write
column bitmaps, but not signaling the handler about this.
This is mainly used when creating TABLE instances.
- table->mark_columns_needed_for_delete(),
table->mark_columns_needed_for_delete() and
table->mark_columns_needed_for_insert() to allow us to put additional
columns in column usage maps if handler so requires.
(The handler indicates what it neads in handler->table_flags())
- table->prepare_for_position() to allow us to tell handler that it
needs to read primary key parts to be able to store them in
future table->position() calls.
(This replaces the table->file->ha_retrieve_all_pk function)
- table->mark_auto_increment_column() to tell handler are going to update
columns part of any auto_increment key.
- table->mark_columns_used_by_index() to mark all columns that is part of
an index. It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
it to quickly know that it only needs to read colums that are part
of the key. (The handler can also use the column map for detecting this,
but simpler/faster handler can just monitor the extra() call).
- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
also mark all columns that is used by the given key.
- table->restore_column_maps_after_mark_index() to restore to default
column maps after a call to table->mark_columns_used_by_index().
- New item function register_field_in_read_map(), for marking used columns
in table->read_map. Used by filesort() to mark all used columns
- Maintain in TABLE->merge_keys set of all keys that are used in query.
(Simplices some optimization loops)
- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
but the field in the clustered key is not assumed to be part of all index.
(used in opt_range.cc for faster loops)
- dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
mark all columns as usable. The 'dbug_' version is primarily intended
inside a handler when it wants to just call Field:store() & Field::val()
functions, but don't need the column maps set for any other usage.
(ie:: bitmap_is_set() is never called)
- We can't use compare_records() to skip updates for handlers that returns
a partial column set and the read_set doesn't cover all columns in the
write set. The reason for this is that if we have a column marked only for
write we can't in the MySQL level know if the value changed or not.
The reason this worked before was that MySQL marked all to be written
columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
bug'.
- open_table_from_share() does not anymore setup temporary MEM_ROOT
object as a thread specific variable for the handler. Instead we
send the to-be-used MEMROOT to get_new_handler().
(Simpler, faster code)
Bugs fixed:
- Column marking was not done correctly in a lot of cases.
(ALTER TABLE, when using triggers, auto_increment fields etc)
(Could potentially result in wrong values inserted in table handlers
relying on that the old column maps or field->set_query_id was correct)
Especially when it comes to triggers, there may be cases where the
old code would cause lost/wrong values for NDB and/or InnoDB tables.
- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
This allowed me to remove some wrong warnings about:
"Some non-transactional changed tables couldn't be rolled back"
- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
(thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
some warnings about
"Some non-transactional changed tables couldn't be rolled back")
- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
which could cause delete_table to report random failures.
- Fixed core dumps for some tests when running with --debug
- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after
crash)
- slow_logs was not properly initialized, which could maybe cause
extra/lost entries in slow log.
- If we get an duplicate row on insert, change column map to read and
write all columns while retrying the operation. This is required by
the definition of REPLACE and also ensures that fields that are only
part of UPDATE are properly handled. This fixed a bug in NDB and
REPLACE where REPLACE wrongly copied some column values from the replaced
row.
- For table handler that doesn't support NULL in keys, we would give an error
when creating a primary key with NULL fields, even after the fields has been
automaticly converted to NOT NULL.
- Creating a primary key on a SPATIAL key, would fail if field was not
declared as NOT NULL.
Cleanups:
- Removed not used condition argument to setup_tables
- Removed not needed item function reset_query_id_processor().
- Field->add_index is removed. Now this is instead maintained in
(field->flags & FIELD_IN_ADD_INDEX)
- Field->fieldnr is removed (use field->field_index instead)
- New argument to filesort() to indicate that it should return a set of
row pointers (not used columns). This allowed me to remove some references
to sql_command in filesort and should also enable us to return column
results in some cases where we couldn't before.
- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
bitmap, which allowed me to use bitmap functions instead of looping over
all fields to create some needed bitmaps. (Faster and smaller code)
- Broke up found too long lines
- Moved some variable declaration at start of function for better code
readability.
- Removed some not used arguments from functions.
(setup_fields(), mysql_prepare_insert_check_table())
- setup_fields() now takes an enum instead of an int for marking columns
usage.
- For internal temporary tables, use handler::write_row(),
handler::delete_row() and handler::update_row() instead of
handler::ha_xxxx() for faster execution.
- Changed some constants to enum's and define's.
- Using separate column read and write sets allows for easier checking
of timestamp field was set by statement.
- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
- Don't build table->normalized_path as this is now identical to table->path
(after bar's fixes to convert filenames)
- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
do comparision with the 'convert-dbug-for-diff' tool.
Things left to do in 5.1:
- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
Mats has promised to look into this.
- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
(I added several test cases for this, but in this case it's better that
someone else also tests this throughly).
Lars has promosed to do this.
2006-06-04 17:52:22 +02:00
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
int ha_heap::extra(enum ha_extra_function operation)
|
|
|
|
{
|
|
|
|
return heap_extra(file,operation);
|
|
|
|
}
|
|
|
|
|
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),
- New optional handler function introduced: reset()
This is called after every DML statement to make it easy for a handler to
statement specific cleanups.
(The only case it's not called is if force the file to be closed)
- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
should be moved to handler::reset()
- table->read_set contains a bitmap over all columns that are needed
in the query. read_row() and similar functions only needs to read these
columns
- table->write_set contains a bitmap over all columns that will be updated
in the query. write_row() and update_row() only needs to update these
columns.
The above bitmaps should now be up to date in all context
(including ALTER TABLE, filesort()).
The handler is informed of any changes to the bitmap after
fix_fields() by calling the virtual function
handler::column_bitmaps_signal(). If the handler does caching of
these bitmaps (instead of using table->read_set, table->write_set),
it should redo the caching in this code. as the signal() may be sent
several times, it's probably best to set a variable in the signal
and redo the caching on read_row() / write_row() if the variable was
set.
- Removed the read_set and write_set bitmap objects from the handler class
- Removed all column bit handling functions from the handler class.
(Now one instead uses the normal bitmap functions in my_bitmap.c instead
of handler dedicated bitmap functions)
- field->query_id is removed. One should instead instead check
table->read_set and table->write_set if a field is used in the query.
- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
instead use table->read_set to check for which columns to retrieve.
- If a handler needs to call Field->val() or Field->store() on columns
that are not used in the query, one should install a temporary
all-columns-used map while doing so. For this, we provide the following
functions:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
field->val();
dbug_tmp_restore_column_map(table->read_set, old_map);
and similar for the write map:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
field->val();
dbug_tmp_restore_column_map(table->write_set, old_map);
If this is not done, you will sooner or later hit a DBUG_ASSERT
in the field store() / val() functions.
(For not DBUG binaries, the dbug_tmp_restore_column_map() and
dbug_tmp_restore_column_map() are inline dummy functions and should
be optimized away be the compiler).
- If one needs to temporary set the column map for all binaries (and not
just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
methods) one should use the functions tmp_use_all_columns() and
tmp_restore_column_map() instead of the above dbug_ variants.
- All 'status' fields in the handler base class (like records,
data_file_length etc) are now stored in a 'stats' struct. This makes
it easier to know what status variables are provided by the base
handler. This requires some trivial variable names in the extra()
function.
- New virtual function handler::records(). This is called to optimize
COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
(stats.records is not supposed to be an exact value. It's only has to
be 'reasonable enough' for the optimizer to be able to choose a good
optimization path).
- Non virtual handler::init() function added for caching of virtual
constants from engine.
- Removed has_transactions() virtual method. Now one should instead return
HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
transactions.
- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
that is to be used with 'new handler_name()' to allocate the handler
in the right area. The xxxx_create_handler() function is also
responsible for any initialization of the object before returning.
For example, one should change:
static handler *myisam_create_handler(TABLE_SHARE *table)
{
return new ha_myisam(table);
}
->
static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
{
return new (mem_root) ha_myisam(table);
}
- New optional virtual function: use_hidden_primary_key().
This is called in case of an update/delete when
(table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
but we don't have a primary key. This allows the handler to take precisions
in remembering any hidden primary key to able to update/delete any
found row. The default handler marks all columns to be read.
- handler::table_flags() now returns a ulonglong (to allow for more flags).
- New/changed table_flags()
- HA_HAS_RECORDS Set if ::records() is supported
- HA_NO_TRANSACTIONS Set if engine doesn't support transactions
- HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
Set if we should mark all primary key columns for
read when reading rows as part of a DELETE
statement. If there is no primary key,
all columns are marked for read.
- HA_PARTIAL_COLUMN_READ Set if engine will not read all columns in some
cases (based on table->read_set)
- HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- HA_DUPP_POS Renamed to HA_DUPLICATE_POS
- HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
Set this if we should mark ALL key columns for
read when when reading rows as part of a DELETE
statement. In case of an update we will mark
all keys for read for which key part changed
value.
- HA_STATS_RECORDS_IS_EXACT
Set this if stats.records is exact.
(This saves us some extra records() calls
when optimizing COUNT(*))
- Removed table_flags()
- HA_NOT_EXACT_COUNT Now one should instead use HA_HAS_RECORDS if
handler::records() gives an exact count() and
HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
- HA_READ_RND_SAME Removed (no one supported this one)
- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
- Renamed handler::dupp_pos to handler::dup_pos
- Removed not used variable handler::sortkey
Upper level handler changes:
- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
cache is updated on engine creation time and updated on open.
MySQL level changes (not obvious from the above):
- DBUG_ASSERT() added to check that column usage matches what is set
in the column usage bit maps. (This found a LOT of bugs in current
column marking code).
- In 5.1 before, all used columns was marked in read_set and only updated
columns was marked in write_set. Now we only mark columns for which we
need a value in read_set.
- Column bitmaps are created in open_binary_frm() and open_table_from_share().
(Before this was in table.cc)
- handler::table_flags() calls are replaced with handler::ha_table_flags()
- For calling field->val() you must have the corresponding bit set in
table->read_set. For calling field->store() you must have the
corresponding bit set in table->write_set. (There are asserts in
all store()/val() functions to catch wrong usage)
- thd->set_query_id is renamed to thd->mark_used_columns and instead
of setting this to an integer value, this has now the values:
MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
Changed also all variables named 'set_query_id' to mark_used_columns.
- In filesort() we now inform the handler of exactly which columns are needed
doing the sort and choosing the rows.
- The TABLE_SHARE object has a 'all_set' column bitmap one can use
when one needs a column bitmap with all columns set.
(This is used for table->use_all_columns() and other places)
- The TABLE object has 3 column bitmaps:
- def_read_set Default bitmap for columns to be read
- def_write_set Default bitmap for columns to be written
- tmp_set Can be used as a temporary bitmap when needed.
The table object has also two pointer to bitmaps read_set and write_set
that the handler should use to find out which columns are used in which way.
- count() optimization now calls handler::records() instead of using
handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
- Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
- Added TABLE parameter to cp_buffer_from_ref()
- Don't close tables created with CREATE ... SELECT but keep them in
the table cache. (Faster usage of newly created tables).
New interfaces:
- table->clear_column_bitmaps() to initialize the bitmaps for tables
at start of new statements.
- table->column_bitmaps_set() to set up new column bitmaps and signal
the handler about this.
- table->column_bitmaps_set_no_signal() for some few cases where we need
to setup new column bitmaps but don't signal the handler (as the handler
has already been signaled about these before). Used for the momement
only in opt_range.cc when doing ROR scans.
- table->use_all_columns() to install a bitmap where all columns are marked
as use in the read and the write set.
- table->default_column_bitmaps() to install the normal read and write
column bitmaps, but not signaling the handler about this.
This is mainly used when creating TABLE instances.
- table->mark_columns_needed_for_delete(),
table->mark_columns_needed_for_delete() and
table->mark_columns_needed_for_insert() to allow us to put additional
columns in column usage maps if handler so requires.
(The handler indicates what it neads in handler->table_flags())
- table->prepare_for_position() to allow us to tell handler that it
needs to read primary key parts to be able to store them in
future table->position() calls.
(This replaces the table->file->ha_retrieve_all_pk function)
- table->mark_auto_increment_column() to tell handler are going to update
columns part of any auto_increment key.
- table->mark_columns_used_by_index() to mark all columns that is part of
an index. It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
it to quickly know that it only needs to read colums that are part
of the key. (The handler can also use the column map for detecting this,
but simpler/faster handler can just monitor the extra() call).
- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
also mark all columns that is used by the given key.
- table->restore_column_maps_after_mark_index() to restore to default
column maps after a call to table->mark_columns_used_by_index().
- New item function register_field_in_read_map(), for marking used columns
in table->read_map. Used by filesort() to mark all used columns
- Maintain in TABLE->merge_keys set of all keys that are used in query.
(Simplices some optimization loops)
- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
but the field in the clustered key is not assumed to be part of all index.
(used in opt_range.cc for faster loops)
- dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
mark all columns as usable. The 'dbug_' version is primarily intended
inside a handler when it wants to just call Field:store() & Field::val()
functions, but don't need the column maps set for any other usage.
(ie:: bitmap_is_set() is never called)
- We can't use compare_records() to skip updates for handlers that returns
a partial column set and the read_set doesn't cover all columns in the
write set. The reason for this is that if we have a column marked only for
write we can't in the MySQL level know if the value changed or not.
The reason this worked before was that MySQL marked all to be written
columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
bug'.
- open_table_from_share() does not anymore setup temporary MEM_ROOT
object as a thread specific variable for the handler. Instead we
send the to-be-used MEMROOT to get_new_handler().
(Simpler, faster code)
Bugs fixed:
- Column marking was not done correctly in a lot of cases.
(ALTER TABLE, when using triggers, auto_increment fields etc)
(Could potentially result in wrong values inserted in table handlers
relying on that the old column maps or field->set_query_id was correct)
Especially when it comes to triggers, there may be cases where the
old code would cause lost/wrong values for NDB and/or InnoDB tables.
- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
This allowed me to remove some wrong warnings about:
"Some non-transactional changed tables couldn't be rolled back"
- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
(thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
some warnings about
"Some non-transactional changed tables couldn't be rolled back")
- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
which could cause delete_table to report random failures.
- Fixed core dumps for some tests when running with --debug
- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after
crash)
- slow_logs was not properly initialized, which could maybe cause
extra/lost entries in slow log.
- If we get an duplicate row on insert, change column map to read and
write all columns while retrying the operation. This is required by
the definition of REPLACE and also ensures that fields that are only
part of UPDATE are properly handled. This fixed a bug in NDB and
REPLACE where REPLACE wrongly copied some column values from the replaced
row.
- For table handler that doesn't support NULL in keys, we would give an error
when creating a primary key with NULL fields, even after the fields has been
automaticly converted to NOT NULL.
- Creating a primary key on a SPATIAL key, would fail if field was not
declared as NOT NULL.
Cleanups:
- Removed not used condition argument to setup_tables
- Removed not needed item function reset_query_id_processor().
- Field->add_index is removed. Now this is instead maintained in
(field->flags & FIELD_IN_ADD_INDEX)
- Field->fieldnr is removed (use field->field_index instead)
- New argument to filesort() to indicate that it should return a set of
row pointers (not used columns). This allowed me to remove some references
to sql_command in filesort and should also enable us to return column
results in some cases where we couldn't before.
- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
bitmap, which allowed me to use bitmap functions instead of looping over
all fields to create some needed bitmaps. (Faster and smaller code)
- Broke up found too long lines
- Moved some variable declaration at start of function for better code
readability.
- Removed some not used arguments from functions.
(setup_fields(), mysql_prepare_insert_check_table())
- setup_fields() now takes an enum instead of an int for marking columns
usage.
- For internal temporary tables, use handler::write_row(),
handler::delete_row() and handler::update_row() instead of
handler::ha_xxxx() for faster execution.
- Changed some constants to enum's and define's.
- Using separate column read and write sets allows for easier checking
of timestamp field was set by statement.
- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
- Don't build table->normalized_path as this is now identical to table->path
(after bar's fixes to convert filenames)
- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
do comparision with the 'convert-dbug-for-diff' tool.
Things left to do in 5.1:
- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
Mats has promised to look into this.
- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
(I added several test cases for this, but in this case it's better that
someone else also tests this throughly).
Lars has promosed to do this.
2006-06-04 17:52:22 +02:00
|
|
|
|
|
|
|
int ha_heap::reset()
|
|
|
|
{
|
|
|
|
return heap_reset(file);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
int ha_heap::delete_all_rows()
|
|
|
|
{
|
|
|
|
heap_clear(file);
|
2005-01-06 12:00:13 +01:00
|
|
|
if (table->s->tmp_table == NO_TMP_TABLE)
|
2006-01-27 18:44:33 +01:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
We can perform this safely since only one writer at the time is
|
|
|
|
allowed on the table.
|
|
|
|
*/
|
2005-11-08 06:26:37 +01:00
|
|
|
file->s->key_stat_version++;
|
2006-01-27 18:44:33 +01:00
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int ha_heap::external_lock(THD *thd, int lock_type)
|
|
|
|
{
|
|
|
|
return 0; // No external locking
|
2001-12-06 13:10:51 +01:00
|
|
|
}
|
2000-07-31 21:29:14 +02:00
|
|
|
|
2004-05-06 15:53:01 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
Disable indexes.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
disable_indexes()
|
|
|
|
mode mode of operation:
|
|
|
|
HA_KEY_SWITCH_NONUNIQ disable all non-unique keys
|
|
|
|
HA_KEY_SWITCH_ALL disable all keys
|
|
|
|
HA_KEY_SWITCH_NONUNIQ_SAVE dis. non-uni. and make persistent
|
|
|
|
HA_KEY_SWITCH_ALL_SAVE dis. all keys and make persistent
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
Disable indexes and clear keys to use for scanning.
|
|
|
|
|
|
|
|
IMPLEMENTATION
|
|
|
|
HA_KEY_SWITCH_NONUNIQ is not implemented.
|
|
|
|
HA_KEY_SWITCH_NONUNIQ_SAVE is not implemented with HEAP.
|
|
|
|
HA_KEY_SWITCH_ALL_SAVE is not implemented with HEAP.
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 ok
|
|
|
|
HA_ERR_WRONG_COMMAND mode not implemented.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int ha_heap::disable_indexes(uint mode)
|
|
|
|
{
|
|
|
|
int error;
|
|
|
|
|
|
|
|
if (mode == HA_KEY_SWITCH_ALL)
|
|
|
|
{
|
|
|
|
if (!(error= heap_disable_indexes(file)))
|
|
|
|
set_keys_for_scanning();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* mode not implemented */
|
|
|
|
error= HA_ERR_WRONG_COMMAND;
|
|
|
|
}
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Enable indexes.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
enable_indexes()
|
|
|
|
mode mode of operation:
|
|
|
|
HA_KEY_SWITCH_NONUNIQ enable all non-unique keys
|
|
|
|
HA_KEY_SWITCH_ALL enable all keys
|
|
|
|
HA_KEY_SWITCH_NONUNIQ_SAVE en. non-uni. and make persistent
|
|
|
|
HA_KEY_SWITCH_ALL_SAVE en. all keys and make persistent
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
Enable indexes and set keys to use for scanning.
|
|
|
|
The indexes might have been disabled by disable_index() before.
|
|
|
|
The function works only if both data and indexes are empty,
|
|
|
|
since the heap storage engine cannot repair the indexes.
|
|
|
|
To be sure, call handler::delete_all_rows() before.
|
|
|
|
|
|
|
|
IMPLEMENTATION
|
|
|
|
HA_KEY_SWITCH_NONUNIQ is not implemented.
|
|
|
|
HA_KEY_SWITCH_NONUNIQ_SAVE is not implemented with HEAP.
|
|
|
|
HA_KEY_SWITCH_ALL_SAVE is not implemented with HEAP.
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 ok
|
|
|
|
HA_ERR_CRASHED data or index is non-empty. Delete all rows and retry.
|
|
|
|
HA_ERR_WRONG_COMMAND mode not implemented.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int ha_heap::enable_indexes(uint mode)
|
|
|
|
{
|
|
|
|
int error;
|
|
|
|
|
|
|
|
if (mode == HA_KEY_SWITCH_ALL)
|
|
|
|
{
|
|
|
|
if (!(error= heap_enable_indexes(file)))
|
|
|
|
set_keys_for_scanning();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* mode not implemented */
|
|
|
|
error= HA_ERR_WRONG_COMMAND;
|
|
|
|
}
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Test if indexes are disabled.
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
indexes_are_disabled()
|
|
|
|
no parameters
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 indexes are not disabled
|
|
|
|
1 all indexes are disabled
|
|
|
|
[2 non-unique indexes are disabled - NOT YET IMPLEMENTED]
|
|
|
|
*/
|
|
|
|
|
|
|
|
int ha_heap::indexes_are_disabled(void)
|
|
|
|
{
|
|
|
|
return heap_indexes_are_disabled(file);
|
|
|
|
}
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
THR_LOCK_DATA **ha_heap::store_lock(THD *thd,
|
|
|
|
THR_LOCK_DATA **to,
|
|
|
|
enum thr_lock_type lock_type)
|
|
|
|
{
|
|
|
|
if (lock_type != TL_IGNORE && file->lock.type == TL_UNLOCK)
|
|
|
|
file->lock.type=lock_type;
|
|
|
|
*to++= &file->lock;
|
|
|
|
return to;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
We have to ignore ENOENT entries as the HEAP table is created on open and
|
|
|
|
not when doing a CREATE on the table.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int ha_heap::delete_table(const char *name)
|
|
|
|
{
|
2005-11-23 21:45:02 +01:00
|
|
|
int error= heap_delete_table(name);
|
2000-07-31 21:29:14 +02:00
|
|
|
return error == ENOENT ? 0 : error;
|
|
|
|
}
|
|
|
|
|
2005-11-06 08:29:03 +01:00
|
|
|
|
|
|
|
void ha_heap::drop_table(const char *name)
|
|
|
|
{
|
|
|
|
heap_drop_table(file);
|
|
|
|
close();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2000-07-31 21:29:14 +02:00
|
|
|
int ha_heap::rename_table(const char * from, const char * to)
|
|
|
|
{
|
|
|
|
return heap_rename(from,to);
|
|
|
|
}
|
|
|
|
|
2004-05-16 13:48:32 +02:00
|
|
|
|
|
|
|
ha_rows ha_heap::records_in_range(uint inx, key_range *min_key,
|
|
|
|
key_range *max_key)
|
2000-08-29 11:31:01 +02:00
|
|
|
{
|
2004-05-16 13:48:32 +02:00
|
|
|
KEY *key=table->key_info+inx;
|
|
|
|
if (key->algorithm == HA_KEY_ALG_BTREE)
|
|
|
|
return hp_rb_records_in_range(file, inx, min_key, max_key);
|
|
|
|
|
2004-10-23 02:30:27 +02:00
|
|
|
if (!min_key || !max_key ||
|
|
|
|
min_key->length != max_key->length ||
|
2004-05-16 13:48:32 +02:00
|
|
|
min_key->length != key->key_length ||
|
|
|
|
min_key->flag != HA_READ_KEY_EXACT ||
|
|
|
|
max_key->flag != HA_READ_AFTER_KEY)
|
2004-05-17 11:10:22 +02:00
|
|
|
return HA_POS_ERROR; // Can only use exact keys
|
2005-06-24 19:47:18 +02:00
|
|
|
|
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),
- New optional handler function introduced: reset()
This is called after every DML statement to make it easy for a handler to
statement specific cleanups.
(The only case it's not called is if force the file to be closed)
- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
should be moved to handler::reset()
- table->read_set contains a bitmap over all columns that are needed
in the query. read_row() and similar functions only needs to read these
columns
- table->write_set contains a bitmap over all columns that will be updated
in the query. write_row() and update_row() only needs to update these
columns.
The above bitmaps should now be up to date in all context
(including ALTER TABLE, filesort()).
The handler is informed of any changes to the bitmap after
fix_fields() by calling the virtual function
handler::column_bitmaps_signal(). If the handler does caching of
these bitmaps (instead of using table->read_set, table->write_set),
it should redo the caching in this code. as the signal() may be sent
several times, it's probably best to set a variable in the signal
and redo the caching on read_row() / write_row() if the variable was
set.
- Removed the read_set and write_set bitmap objects from the handler class
- Removed all column bit handling functions from the handler class.
(Now one instead uses the normal bitmap functions in my_bitmap.c instead
of handler dedicated bitmap functions)
- field->query_id is removed. One should instead instead check
table->read_set and table->write_set if a field is used in the query.
- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
instead use table->read_set to check for which columns to retrieve.
- If a handler needs to call Field->val() or Field->store() on columns
that are not used in the query, one should install a temporary
all-columns-used map while doing so. For this, we provide the following
functions:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
field->val();
dbug_tmp_restore_column_map(table->read_set, old_map);
and similar for the write map:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
field->val();
dbug_tmp_restore_column_map(table->write_set, old_map);
If this is not done, you will sooner or later hit a DBUG_ASSERT
in the field store() / val() functions.
(For not DBUG binaries, the dbug_tmp_restore_column_map() and
dbug_tmp_restore_column_map() are inline dummy functions and should
be optimized away be the compiler).
- If one needs to temporary set the column map for all binaries (and not
just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
methods) one should use the functions tmp_use_all_columns() and
tmp_restore_column_map() instead of the above dbug_ variants.
- All 'status' fields in the handler base class (like records,
data_file_length etc) are now stored in a 'stats' struct. This makes
it easier to know what status variables are provided by the base
handler. This requires some trivial variable names in the extra()
function.
- New virtual function handler::records(). This is called to optimize
COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
(stats.records is not supposed to be an exact value. It's only has to
be 'reasonable enough' for the optimizer to be able to choose a good
optimization path).
- Non virtual handler::init() function added for caching of virtual
constants from engine.
- Removed has_transactions() virtual method. Now one should instead return
HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
transactions.
- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
that is to be used with 'new handler_name()' to allocate the handler
in the right area. The xxxx_create_handler() function is also
responsible for any initialization of the object before returning.
For example, one should change:
static handler *myisam_create_handler(TABLE_SHARE *table)
{
return new ha_myisam(table);
}
->
static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
{
return new (mem_root) ha_myisam(table);
}
- New optional virtual function: use_hidden_primary_key().
This is called in case of an update/delete when
(table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
but we don't have a primary key. This allows the handler to take precisions
in remembering any hidden primary key to able to update/delete any
found row. The default handler marks all columns to be read.
- handler::table_flags() now returns a ulonglong (to allow for more flags).
- New/changed table_flags()
- HA_HAS_RECORDS Set if ::records() is supported
- HA_NO_TRANSACTIONS Set if engine doesn't support transactions
- HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
Set if we should mark all primary key columns for
read when reading rows as part of a DELETE
statement. If there is no primary key,
all columns are marked for read.
- HA_PARTIAL_COLUMN_READ Set if engine will not read all columns in some
cases (based on table->read_set)
- HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- HA_DUPP_POS Renamed to HA_DUPLICATE_POS
- HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
Set this if we should mark ALL key columns for
read when when reading rows as part of a DELETE
statement. In case of an update we will mark
all keys for read for which key part changed
value.
- HA_STATS_RECORDS_IS_EXACT
Set this if stats.records is exact.
(This saves us some extra records() calls
when optimizing COUNT(*))
- Removed table_flags()
- HA_NOT_EXACT_COUNT Now one should instead use HA_HAS_RECORDS if
handler::records() gives an exact count() and
HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
- HA_READ_RND_SAME Removed (no one supported this one)
- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
- Renamed handler::dupp_pos to handler::dup_pos
- Removed not used variable handler::sortkey
Upper level handler changes:
- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
cache is updated on engine creation time and updated on open.
MySQL level changes (not obvious from the above):
- DBUG_ASSERT() added to check that column usage matches what is set
in the column usage bit maps. (This found a LOT of bugs in current
column marking code).
- In 5.1 before, all used columns was marked in read_set and only updated
columns was marked in write_set. Now we only mark columns for which we
need a value in read_set.
- Column bitmaps are created in open_binary_frm() and open_table_from_share().
(Before this was in table.cc)
- handler::table_flags() calls are replaced with handler::ha_table_flags()
- For calling field->val() you must have the corresponding bit set in
table->read_set. For calling field->store() you must have the
corresponding bit set in table->write_set. (There are asserts in
all store()/val() functions to catch wrong usage)
- thd->set_query_id is renamed to thd->mark_used_columns and instead
of setting this to an integer value, this has now the values:
MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
Changed also all variables named 'set_query_id' to mark_used_columns.
- In filesort() we now inform the handler of exactly which columns are needed
doing the sort and choosing the rows.
- The TABLE_SHARE object has a 'all_set' column bitmap one can use
when one needs a column bitmap with all columns set.
(This is used for table->use_all_columns() and other places)
- The TABLE object has 3 column bitmaps:
- def_read_set Default bitmap for columns to be read
- def_write_set Default bitmap for columns to be written
- tmp_set Can be used as a temporary bitmap when needed.
The table object has also two pointer to bitmaps read_set and write_set
that the handler should use to find out which columns are used in which way.
- count() optimization now calls handler::records() instead of using
handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
- Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
- Added TABLE parameter to cp_buffer_from_ref()
- Don't close tables created with CREATE ... SELECT but keep them in
the table cache. (Faster usage of newly created tables).
New interfaces:
- table->clear_column_bitmaps() to initialize the bitmaps for tables
at start of new statements.
- table->column_bitmaps_set() to set up new column bitmaps and signal
the handler about this.
- table->column_bitmaps_set_no_signal() for some few cases where we need
to setup new column bitmaps but don't signal the handler (as the handler
has already been signaled about these before). Used for the momement
only in opt_range.cc when doing ROR scans.
- table->use_all_columns() to install a bitmap where all columns are marked
as use in the read and the write set.
- table->default_column_bitmaps() to install the normal read and write
column bitmaps, but not signaling the handler about this.
This is mainly used when creating TABLE instances.
- table->mark_columns_needed_for_delete(),
table->mark_columns_needed_for_delete() and
table->mark_columns_needed_for_insert() to allow us to put additional
columns in column usage maps if handler so requires.
(The handler indicates what it neads in handler->table_flags())
- table->prepare_for_position() to allow us to tell handler that it
needs to read primary key parts to be able to store them in
future table->position() calls.
(This replaces the table->file->ha_retrieve_all_pk function)
- table->mark_auto_increment_column() to tell handler are going to update
columns part of any auto_increment key.
- table->mark_columns_used_by_index() to mark all columns that is part of
an index. It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
it to quickly know that it only needs to read colums that are part
of the key. (The handler can also use the column map for detecting this,
but simpler/faster handler can just monitor the extra() call).
- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
also mark all columns that is used by the given key.
- table->restore_column_maps_after_mark_index() to restore to default
column maps after a call to table->mark_columns_used_by_index().
- New item function register_field_in_read_map(), for marking used columns
in table->read_map. Used by filesort() to mark all used columns
- Maintain in TABLE->merge_keys set of all keys that are used in query.
(Simplices some optimization loops)
- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
but the field in the clustered key is not assumed to be part of all index.
(used in opt_range.cc for faster loops)
- dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
mark all columns as usable. The 'dbug_' version is primarily intended
inside a handler when it wants to just call Field:store() & Field::val()
functions, but don't need the column maps set for any other usage.
(ie:: bitmap_is_set() is never called)
- We can't use compare_records() to skip updates for handlers that returns
a partial column set and the read_set doesn't cover all columns in the
write set. The reason for this is that if we have a column marked only for
write we can't in the MySQL level know if the value changed or not.
The reason this worked before was that MySQL marked all to be written
columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
bug'.
- open_table_from_share() does not anymore setup temporary MEM_ROOT
object as a thread specific variable for the handler. Instead we
send the to-be-used MEMROOT to get_new_handler().
(Simpler, faster code)
Bugs fixed:
- Column marking was not done correctly in a lot of cases.
(ALTER TABLE, when using triggers, auto_increment fields etc)
(Could potentially result in wrong values inserted in table handlers
relying on that the old column maps or field->set_query_id was correct)
Especially when it comes to triggers, there may be cases where the
old code would cause lost/wrong values for NDB and/or InnoDB tables.
- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
This allowed me to remove some wrong warnings about:
"Some non-transactional changed tables couldn't be rolled back"
- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
(thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
some warnings about
"Some non-transactional changed tables couldn't be rolled back")
- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
which could cause delete_table to report random failures.
- Fixed core dumps for some tests when running with --debug
- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after
crash)
- slow_logs was not properly initialized, which could maybe cause
extra/lost entries in slow log.
- If we get an duplicate row on insert, change column map to read and
write all columns while retrying the operation. This is required by
the definition of REPLACE and also ensures that fields that are only
part of UPDATE are properly handled. This fixed a bug in NDB and
REPLACE where REPLACE wrongly copied some column values from the replaced
row.
- For table handler that doesn't support NULL in keys, we would give an error
when creating a primary key with NULL fields, even after the fields has been
automaticly converted to NOT NULL.
- Creating a primary key on a SPATIAL key, would fail if field was not
declared as NOT NULL.
Cleanups:
- Removed not used condition argument to setup_tables
- Removed not needed item function reset_query_id_processor().
- Field->add_index is removed. Now this is instead maintained in
(field->flags & FIELD_IN_ADD_INDEX)
- Field->fieldnr is removed (use field->field_index instead)
- New argument to filesort() to indicate that it should return a set of
row pointers (not used columns). This allowed me to remove some references
to sql_command in filesort and should also enable us to return column
results in some cases where we couldn't before.
- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
bitmap, which allowed me to use bitmap functions instead of looping over
all fields to create some needed bitmaps. (Faster and smaller code)
- Broke up found too long lines
- Moved some variable declaration at start of function for better code
readability.
- Removed some not used arguments from functions.
(setup_fields(), mysql_prepare_insert_check_table())
- setup_fields() now takes an enum instead of an int for marking columns
usage.
- For internal temporary tables, use handler::write_row(),
handler::delete_row() and handler::update_row() instead of
handler::ha_xxxx() for faster execution.
- Changed some constants to enum's and define's.
- Using separate column read and write sets allows for easier checking
of timestamp field was set by statement.
- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
- Don't build table->normalized_path as this is now identical to table->path
(after bar's fixes to convert filenames)
- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
do comparision with the 'convert-dbug-for-diff' tool.
Things left to do in 5.1:
- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
Mats has promised to look into this.
- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
(I added several test cases for this, but in this case it's better that
someone else also tests this throughly).
Lars has promosed to do this.
2006-06-04 17:52:22 +02:00
|
|
|
if (stats.records <= 1)
|
|
|
|
return stats.records;
|
2006-02-02 16:17:18 +01:00
|
|
|
|
2005-06-24 19:47:18 +02:00
|
|
|
/* Assert that info() did run. We need current statistics here. */
|
2006-03-30 02:11:37 +02:00
|
|
|
DBUG_ASSERT(key_stat_version == file->s->key_stat_version);
|
2004-12-07 14:47:00 +01:00
|
|
|
return key->rec_per_key[key->key_parts-1];
|
2000-08-29 11:31:01 +02:00
|
|
|
}
|
|
|
|
|
2003-11-28 11:18:13 +01:00
|
|
|
|
|
|
|
int ha_heap::create(const char *name, TABLE *table_arg,
|
2002-08-30 11:40:40 +02:00
|
|
|
HA_CREATE_INFO *create_info)
|
2000-07-31 21:29:14 +02:00
|
|
|
{
|
2005-01-06 12:00:13 +01:00
|
|
|
uint key, parts, mem_per_row= 0, keys= table_arg->s->keys;
|
2002-10-07 14:49:03 +02:00
|
|
|
uint auto_key= 0, auto_key_type= 0;
|
2002-11-21 14:56:48 +01:00
|
|
|
ha_rows max_rows;
|
2002-06-07 13:47:36 +02:00
|
|
|
HP_KEYDEF *keydef;
|
|
|
|
HA_KEYSEG *seg;
|
|
|
|
int error;
|
2005-01-06 12:00:13 +01:00
|
|
|
TABLE_SHARE *share= table_arg->s;
|
2005-03-15 10:32:12 +01:00
|
|
|
bool found_real_auto_increment= 0;
|
2002-06-07 13:47:36 +02:00
|
|
|
|
2005-01-06 12:00:13 +01:00
|
|
|
for (key= parts= 0; key < keys; key++)
|
2003-11-28 11:18:13 +01:00
|
|
|
parts+= table_arg->key_info[key].key_parts;
|
2002-06-07 13:47:36 +02:00
|
|
|
|
2005-01-06 12:00:13 +01:00
|
|
|
if (!(keydef= (HP_KEYDEF*) my_malloc(keys * sizeof(HP_KEYDEF) +
|
2002-08-30 11:40:40 +02:00
|
|
|
parts * sizeof(HA_KEYSEG),
|
|
|
|
MYF(MY_WME))))
|
2002-06-07 13:47:36 +02:00
|
|
|
return my_errno;
|
2005-01-06 12:00:13 +01:00
|
|
|
seg= my_reinterpret_cast(HA_KEYSEG*) (keydef + keys);
|
|
|
|
for (key= 0; key < keys; key++)
|
2002-06-07 13:47:36 +02:00
|
|
|
{
|
2003-11-28 11:18:13 +01:00
|
|
|
KEY *pos= table_arg->key_info+key;
|
2002-06-07 13:47:36 +02:00
|
|
|
KEY_PART_INFO *key_part= pos->key_part;
|
|
|
|
KEY_PART_INFO *key_part_end= key_part + pos->key_parts;
|
|
|
|
|
|
|
|
keydef[key].keysegs= (uint) pos->key_parts;
|
|
|
|
keydef[key].flag= (pos->flags & (HA_NOSAME | HA_NULL_ARE_EQUAL));
|
|
|
|
keydef[key].seg= seg;
|
2005-01-14 19:49:45 +01:00
|
|
|
|
|
|
|
switch (pos->algorithm) {
|
|
|
|
case HA_KEY_ALG_UNDEF:
|
|
|
|
case HA_KEY_ALG_HASH:
|
|
|
|
keydef[key].algorithm= HA_KEY_ALG_HASH;
|
|
|
|
mem_per_row+= sizeof(char*) * 2; // = sizeof(HASH_INFO)
|
|
|
|
break;
|
|
|
|
case HA_KEY_ALG_BTREE:
|
|
|
|
keydef[key].algorithm= HA_KEY_ALG_BTREE;
|
|
|
|
mem_per_row+=sizeof(TREE_ELEMENT)+pos->key_length+sizeof(char*);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
DBUG_ASSERT(0); // cannot happen
|
|
|
|
}
|
2002-06-07 13:47:36 +02:00
|
|
|
|
|
|
|
for (; key_part != key_part_end; key_part++, seg++)
|
|
|
|
{
|
|
|
|
Field *field= key_part->field;
|
2004-12-06 01:00:37 +01:00
|
|
|
|
2002-06-07 13:47:36 +02:00
|
|
|
if (pos->algorithm == HA_KEY_ALG_BTREE)
|
|
|
|
seg->type= field->key_type();
|
|
|
|
else
|
|
|
|
{
|
2004-12-06 01:00:37 +01:00
|
|
|
if ((seg->type = field->key_type()) != (int) HA_KEYTYPE_TEXT &&
|
2004-12-18 04:19:21 +01:00
|
|
|
seg->type != HA_KEYTYPE_VARTEXT1 &&
|
|
|
|
seg->type != HA_KEYTYPE_VARTEXT2 &&
|
|
|
|
seg->type != HA_KEYTYPE_VARBINARY1 &&
|
|
|
|
seg->type != HA_KEYTYPE_VARBINARY2)
|
2004-10-05 15:02:09 +02:00
|
|
|
seg->type= HA_KEYTYPE_BINARY;
|
2002-06-07 13:47:36 +02:00
|
|
|
}
|
|
|
|
seg->start= (uint) key_part->offset;
|
|
|
|
seg->length= (uint) key_part->length;
|
2004-12-06 01:00:37 +01:00
|
|
|
seg->flag= key_part->key_part_flag;
|
|
|
|
|
2007-03-27 10:49:48 +02:00
|
|
|
if (field->flags & (ENUM_FLAG | SET_FLAG))
|
|
|
|
seg->charset= &my_charset_bin;
|
|
|
|
else
|
|
|
|
seg->charset= field->charset();
|
2002-06-07 13:47:36 +02:00
|
|
|
if (field->null_ptr)
|
|
|
|
{
|
|
|
|
seg->null_bit= field->null_bit;
|
2003-11-28 11:18:13 +01:00
|
|
|
seg->null_pos= (uint) (field->null_ptr - (uchar*) table_arg->record[0]);
|
2002-06-07 13:47:36 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
seg->null_bit= 0;
|
|
|
|
seg->null_pos= 0;
|
|
|
|
}
|
2005-03-16 00:15:45 +01:00
|
|
|
if (field->flags & AUTO_INCREMENT_FLAG &&
|
|
|
|
table_arg->found_next_number_field &&
|
2005-03-17 16:44:24 +01:00
|
|
|
key == share->next_number_index)
|
2005-03-16 00:15:45 +01:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
Store key number and type for found auto_increment key
|
|
|
|
We have to store type as seg->type can differ from it
|
|
|
|
*/
|
|
|
|
auto_key= key+ 1;
|
2002-10-07 14:49:03 +02:00
|
|
|
auto_key_type= field->key_type();
|
2005-03-16 00:15:45 +01:00
|
|
|
}
|
2002-06-07 13:47:36 +02:00
|
|
|
}
|
|
|
|
}
|
2005-01-06 12:00:13 +01:00
|
|
|
mem_per_row+= MY_ALIGN(share->reclength + 1, sizeof(char*));
|
2005-11-23 21:45:02 +01:00
|
|
|
max_rows = (ha_rows) (table_arg->in_use->variables.max_heap_table_size /
|
2006-11-27 23:47:21 +01:00
|
|
|
(ulonglong) mem_per_row);
|
2005-03-15 10:32:12 +01:00
|
|
|
if (table_arg->found_next_number_field)
|
|
|
|
{
|
2005-03-15 16:43:32 +01:00
|
|
|
keydef[share->next_number_index].flag|= HA_AUTO_KEY;
|
|
|
|
found_real_auto_increment= share->next_number_key_offset == 0;
|
2005-03-15 10:32:12 +01:00
|
|
|
}
|
2002-10-07 14:49:03 +02:00
|
|
|
HP_CREATE_INFO hp_create_info;
|
2005-03-16 00:15:45 +01:00
|
|
|
hp_create_info.auto_key= auto_key;
|
2002-10-07 14:49:03 +02:00
|
|
|
hp_create_info.auto_key_type= auto_key_type;
|
|
|
|
hp_create_info.auto_increment= (create_info->auto_increment_value ?
|
|
|
|
create_info->auto_increment_value - 1 : 0);
|
2005-01-14 19:49:45 +01:00
|
|
|
hp_create_info.max_table_size=current_thd->variables.max_heap_table_size;
|
2005-04-06 16:22:21 +02:00
|
|
|
hp_create_info.with_auto_increment= found_real_auto_increment;
|
2005-01-14 19:49:45 +01:00
|
|
|
max_rows = (ha_rows) (hp_create_info.max_table_size / mem_per_row);
|
2005-11-23 21:45:02 +01:00
|
|
|
error= heap_create(name,
|
2005-01-15 13:09:45 +01:00
|
|
|
keys, keydef, share->reclength,
|
2005-01-06 12:00:13 +01:00
|
|
|
(ulong) ((share->max_rows < max_rows &&
|
|
|
|
share->max_rows) ?
|
|
|
|
share->max_rows : max_rows),
|
|
|
|
(ulong) share->min_rows, &hp_create_info);
|
2002-06-07 13:47:36 +02:00
|
|
|
my_free((gptr) keydef, MYF(0));
|
|
|
|
if (file)
|
|
|
|
info(HA_STATUS_NO_LOCK | HA_STATUS_CONST | HA_STATUS_VARIABLE);
|
|
|
|
return (error);
|
2000-07-31 21:29:14 +02:00
|
|
|
}
|
2002-10-07 14:49:03 +02:00
|
|
|
|
2003-11-28 11:18:13 +01:00
|
|
|
|
2002-10-07 14:49:03 +02:00
|
|
|
void ha_heap::update_create_info(HA_CREATE_INFO *create_info)
|
|
|
|
{
|
|
|
|
table->file->info(HA_STATUS_AUTO);
|
|
|
|
if (!(create_info->used_fields & HA_CREATE_USED_AUTO))
|
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),
- New optional handler function introduced: reset()
This is called after every DML statement to make it easy for a handler to
statement specific cleanups.
(The only case it's not called is if force the file to be closed)
- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
should be moved to handler::reset()
- table->read_set contains a bitmap over all columns that are needed
in the query. read_row() and similar functions only needs to read these
columns
- table->write_set contains a bitmap over all columns that will be updated
in the query. write_row() and update_row() only needs to update these
columns.
The above bitmaps should now be up to date in all context
(including ALTER TABLE, filesort()).
The handler is informed of any changes to the bitmap after
fix_fields() by calling the virtual function
handler::column_bitmaps_signal(). If the handler does caching of
these bitmaps (instead of using table->read_set, table->write_set),
it should redo the caching in this code. as the signal() may be sent
several times, it's probably best to set a variable in the signal
and redo the caching on read_row() / write_row() if the variable was
set.
- Removed the read_set and write_set bitmap objects from the handler class
- Removed all column bit handling functions from the handler class.
(Now one instead uses the normal bitmap functions in my_bitmap.c instead
of handler dedicated bitmap functions)
- field->query_id is removed. One should instead instead check
table->read_set and table->write_set if a field is used in the query.
- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
instead use table->read_set to check for which columns to retrieve.
- If a handler needs to call Field->val() or Field->store() on columns
that are not used in the query, one should install a temporary
all-columns-used map while doing so. For this, we provide the following
functions:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
field->val();
dbug_tmp_restore_column_map(table->read_set, old_map);
and similar for the write map:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
field->val();
dbug_tmp_restore_column_map(table->write_set, old_map);
If this is not done, you will sooner or later hit a DBUG_ASSERT
in the field store() / val() functions.
(For not DBUG binaries, the dbug_tmp_restore_column_map() and
dbug_tmp_restore_column_map() are inline dummy functions and should
be optimized away be the compiler).
- If one needs to temporary set the column map for all binaries (and not
just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
methods) one should use the functions tmp_use_all_columns() and
tmp_restore_column_map() instead of the above dbug_ variants.
- All 'status' fields in the handler base class (like records,
data_file_length etc) are now stored in a 'stats' struct. This makes
it easier to know what status variables are provided by the base
handler. This requires some trivial variable names in the extra()
function.
- New virtual function handler::records(). This is called to optimize
COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
(stats.records is not supposed to be an exact value. It's only has to
be 'reasonable enough' for the optimizer to be able to choose a good
optimization path).
- Non virtual handler::init() function added for caching of virtual
constants from engine.
- Removed has_transactions() virtual method. Now one should instead return
HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
transactions.
- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
that is to be used with 'new handler_name()' to allocate the handler
in the right area. The xxxx_create_handler() function is also
responsible for any initialization of the object before returning.
For example, one should change:
static handler *myisam_create_handler(TABLE_SHARE *table)
{
return new ha_myisam(table);
}
->
static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
{
return new (mem_root) ha_myisam(table);
}
- New optional virtual function: use_hidden_primary_key().
This is called in case of an update/delete when
(table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
but we don't have a primary key. This allows the handler to take precisions
in remembering any hidden primary key to able to update/delete any
found row. The default handler marks all columns to be read.
- handler::table_flags() now returns a ulonglong (to allow for more flags).
- New/changed table_flags()
- HA_HAS_RECORDS Set if ::records() is supported
- HA_NO_TRANSACTIONS Set if engine doesn't support transactions
- HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
Set if we should mark all primary key columns for
read when reading rows as part of a DELETE
statement. If there is no primary key,
all columns are marked for read.
- HA_PARTIAL_COLUMN_READ Set if engine will not read all columns in some
cases (based on table->read_set)
- HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- HA_DUPP_POS Renamed to HA_DUPLICATE_POS
- HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
Set this if we should mark ALL key columns for
read when when reading rows as part of a DELETE
statement. In case of an update we will mark
all keys for read for which key part changed
value.
- HA_STATS_RECORDS_IS_EXACT
Set this if stats.records is exact.
(This saves us some extra records() calls
when optimizing COUNT(*))
- Removed table_flags()
- HA_NOT_EXACT_COUNT Now one should instead use HA_HAS_RECORDS if
handler::records() gives an exact count() and
HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
- HA_READ_RND_SAME Removed (no one supported this one)
- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
- Renamed handler::dupp_pos to handler::dup_pos
- Removed not used variable handler::sortkey
Upper level handler changes:
- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
cache is updated on engine creation time and updated on open.
MySQL level changes (not obvious from the above):
- DBUG_ASSERT() added to check that column usage matches what is set
in the column usage bit maps. (This found a LOT of bugs in current
column marking code).
- In 5.1 before, all used columns was marked in read_set and only updated
columns was marked in write_set. Now we only mark columns for which we
need a value in read_set.
- Column bitmaps are created in open_binary_frm() and open_table_from_share().
(Before this was in table.cc)
- handler::table_flags() calls are replaced with handler::ha_table_flags()
- For calling field->val() you must have the corresponding bit set in
table->read_set. For calling field->store() you must have the
corresponding bit set in table->write_set. (There are asserts in
all store()/val() functions to catch wrong usage)
- thd->set_query_id is renamed to thd->mark_used_columns and instead
of setting this to an integer value, this has now the values:
MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
Changed also all variables named 'set_query_id' to mark_used_columns.
- In filesort() we now inform the handler of exactly which columns are needed
doing the sort and choosing the rows.
- The TABLE_SHARE object has a 'all_set' column bitmap one can use
when one needs a column bitmap with all columns set.
(This is used for table->use_all_columns() and other places)
- The TABLE object has 3 column bitmaps:
- def_read_set Default bitmap for columns to be read
- def_write_set Default bitmap for columns to be written
- tmp_set Can be used as a temporary bitmap when needed.
The table object has also two pointer to bitmaps read_set and write_set
that the handler should use to find out which columns are used in which way.
- count() optimization now calls handler::records() instead of using
handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
- Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
- Added TABLE parameter to cp_buffer_from_ref()
- Don't close tables created with CREATE ... SELECT but keep them in
the table cache. (Faster usage of newly created tables).
New interfaces:
- table->clear_column_bitmaps() to initialize the bitmaps for tables
at start of new statements.
- table->column_bitmaps_set() to set up new column bitmaps and signal
the handler about this.
- table->column_bitmaps_set_no_signal() for some few cases where we need
to setup new column bitmaps but don't signal the handler (as the handler
has already been signaled about these before). Used for the momement
only in opt_range.cc when doing ROR scans.
- table->use_all_columns() to install a bitmap where all columns are marked
as use in the read and the write set.
- table->default_column_bitmaps() to install the normal read and write
column bitmaps, but not signaling the handler about this.
This is mainly used when creating TABLE instances.
- table->mark_columns_needed_for_delete(),
table->mark_columns_needed_for_delete() and
table->mark_columns_needed_for_insert() to allow us to put additional
columns in column usage maps if handler so requires.
(The handler indicates what it neads in handler->table_flags())
- table->prepare_for_position() to allow us to tell handler that it
needs to read primary key parts to be able to store them in
future table->position() calls.
(This replaces the table->file->ha_retrieve_all_pk function)
- table->mark_auto_increment_column() to tell handler are going to update
columns part of any auto_increment key.
- table->mark_columns_used_by_index() to mark all columns that is part of
an index. It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
it to quickly know that it only needs to read colums that are part
of the key. (The handler can also use the column map for detecting this,
but simpler/faster handler can just monitor the extra() call).
- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
also mark all columns that is used by the given key.
- table->restore_column_maps_after_mark_index() to restore to default
column maps after a call to table->mark_columns_used_by_index().
- New item function register_field_in_read_map(), for marking used columns
in table->read_map. Used by filesort() to mark all used columns
- Maintain in TABLE->merge_keys set of all keys that are used in query.
(Simplices some optimization loops)
- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
but the field in the clustered key is not assumed to be part of all index.
(used in opt_range.cc for faster loops)
- dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
mark all columns as usable. The 'dbug_' version is primarily intended
inside a handler when it wants to just call Field:store() & Field::val()
functions, but don't need the column maps set for any other usage.
(ie:: bitmap_is_set() is never called)
- We can't use compare_records() to skip updates for handlers that returns
a partial column set and the read_set doesn't cover all columns in the
write set. The reason for this is that if we have a column marked only for
write we can't in the MySQL level know if the value changed or not.
The reason this worked before was that MySQL marked all to be written
columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
bug'.
- open_table_from_share() does not anymore setup temporary MEM_ROOT
object as a thread specific variable for the handler. Instead we
send the to-be-used MEMROOT to get_new_handler().
(Simpler, faster code)
Bugs fixed:
- Column marking was not done correctly in a lot of cases.
(ALTER TABLE, when using triggers, auto_increment fields etc)
(Could potentially result in wrong values inserted in table handlers
relying on that the old column maps or field->set_query_id was correct)
Especially when it comes to triggers, there may be cases where the
old code would cause lost/wrong values for NDB and/or InnoDB tables.
- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
This allowed me to remove some wrong warnings about:
"Some non-transactional changed tables couldn't be rolled back"
- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
(thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
some warnings about
"Some non-transactional changed tables couldn't be rolled back")
- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
which could cause delete_table to report random failures.
- Fixed core dumps for some tests when running with --debug
- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after
crash)
- slow_logs was not properly initialized, which could maybe cause
extra/lost entries in slow log.
- If we get an duplicate row on insert, change column map to read and
write all columns while retrying the operation. This is required by
the definition of REPLACE and also ensures that fields that are only
part of UPDATE are properly handled. This fixed a bug in NDB and
REPLACE where REPLACE wrongly copied some column values from the replaced
row.
- For table handler that doesn't support NULL in keys, we would give an error
when creating a primary key with NULL fields, even after the fields has been
automaticly converted to NOT NULL.
- Creating a primary key on a SPATIAL key, would fail if field was not
declared as NOT NULL.
Cleanups:
- Removed not used condition argument to setup_tables
- Removed not needed item function reset_query_id_processor().
- Field->add_index is removed. Now this is instead maintained in
(field->flags & FIELD_IN_ADD_INDEX)
- Field->fieldnr is removed (use field->field_index instead)
- New argument to filesort() to indicate that it should return a set of
row pointers (not used columns). This allowed me to remove some references
to sql_command in filesort and should also enable us to return column
results in some cases where we couldn't before.
- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
bitmap, which allowed me to use bitmap functions instead of looping over
all fields to create some needed bitmaps. (Faster and smaller code)
- Broke up found too long lines
- Moved some variable declaration at start of function for better code
readability.
- Removed some not used arguments from functions.
(setup_fields(), mysql_prepare_insert_check_table())
- setup_fields() now takes an enum instead of an int for marking columns
usage.
- For internal temporary tables, use handler::write_row(),
handler::delete_row() and handler::update_row() instead of
handler::ha_xxxx() for faster execution.
- Changed some constants to enum's and define's.
- Using separate column read and write sets allows for easier checking
of timestamp field was set by statement.
- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
- Don't build table->normalized_path as this is now identical to table->path
(after bar's fixes to convert filenames)
- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
do comparision with the 'convert-dbug-for-diff' tool.
Things left to do in 5.1:
- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
Mats has promised to look into this.
- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
(I added several test cases for this, but in this case it's better that
someone else also tests this throughly).
Lars has promosed to do this.
2006-06-04 17:52:22 +02:00
|
|
|
create_info->auto_increment_value= stats.auto_increment_value;
|
2002-10-07 14:49:03 +02:00
|
|
|
}
|
|
|
|
|
2006-06-02 22:21:32 +02:00
|
|
|
void ha_heap::get_auto_increment(ulonglong offset, ulonglong increment,
|
|
|
|
ulonglong nb_desired_values,
|
|
|
|
ulonglong *first_value,
|
|
|
|
ulonglong *nb_reserved_values)
|
2002-10-07 14:49:03 +02:00
|
|
|
{
|
|
|
|
ha_heap::info(HA_STATUS_AUTO);
|
2006-06-04 20:05:22 +02:00
|
|
|
*first_value= stats.auto_increment_value;
|
2006-06-02 22:21:32 +02:00
|
|
|
/* such table has only table-level locking so reserves up to +inf */
|
|
|
|
*nb_reserved_values= ULONGLONG_MAX;
|
2002-10-07 14:49:03 +02:00
|
|
|
}
|
2005-07-22 22:43:59 +02:00
|
|
|
|
|
|
|
|
|
|
|
bool ha_heap::check_if_incompatible_data(HA_CREATE_INFO *info,
|
|
|
|
uint table_changes)
|
|
|
|
{
|
|
|
|
/* Check that auto_increment value was not changed */
|
2007-02-28 11:27:19 +01:00
|
|
|
if ((info->used_fields & HA_CREATE_USED_AUTO &&
|
|
|
|
info->auto_increment_value != 0) ||
|
|
|
|
table_changes == IS_EQUAL_NO ||
|
|
|
|
table_changes & IS_EQUAL_PACK_LENGTH) // Not implemented yet
|
2005-07-22 22:43:59 +02:00
|
|
|
return COMPATIBLE_DATA_NO;
|
|
|
|
return COMPATIBLE_DATA_YES;
|
|
|
|
}
|
2006-04-13 22:49:29 +02:00
|
|
|
|
2006-05-28 14:51:01 +02:00
|
|
|
struct st_mysql_storage_engine heap_storage_engine=
|
2006-09-27 06:26:04 +02:00
|
|
|
{ MYSQL_HANDLERTON_INTERFACE_VERSION };
|
2006-05-28 14:51:01 +02:00
|
|
|
|
2006-04-13 22:49:29 +02:00
|
|
|
mysql_declare_plugin(heap)
|
|
|
|
{
|
|
|
|
MYSQL_STORAGE_ENGINE_PLUGIN,
|
2006-05-28 14:51:01 +02:00
|
|
|
&heap_storage_engine,
|
|
|
|
"MEMORY",
|
2006-05-02 13:11:00 +02:00
|
|
|
"MySQL AB",
|
2006-05-28 14:51:01 +02:00
|
|
|
"Hash based, stored in memory, useful for temporary tables",
|
2006-10-05 09:41:29 +02:00
|
|
|
PLUGIN_LICENSE_GPL,
|
2006-05-28 14:51:01 +02:00
|
|
|
heap_init,
|
2006-04-13 22:49:29 +02:00
|
|
|
NULL,
|
2006-05-04 18:39:47 +02:00
|
|
|
0x0100, /* 1.0 */
|
2006-08-30 23:27:29 +02:00
|
|
|
NULL, /* status variables */
|
|
|
|
NULL, /* system variables */
|
|
|
|
NULL /* config options */
|
2006-04-13 22:49:29 +02:00
|
|
|
}
|
|
|
|
mysql_declare_plugin_end;
|