2006-04-11 15:45:10 +02:00
|
|
|
/* Copyright (C) 2006 MySQL AB
|
|
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
|
|
|
|
|
|
/* This file should be included when using maria_funktions */
|
|
|
|
|
|
|
|
|
|
#ifndef _maria_h
|
|
|
|
|
#define _maria_h
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
|
extern "C" {
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef _my_base_h
|
|
|
|
|
#include <my_base.h>
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef _m_ctype_h
|
|
|
|
|
#include <m_ctype.h>
|
|
|
|
|
#endif
|
|
|
|
|
#ifndef _keycache_h
|
|
|
|
|
#include "keycache.h"
|
|
|
|
|
#endif
|
|
|
|
|
#include "my_handler.h"
|
|
|
|
|
#include "ft_global.h"
|
|
|
|
|
#include <myisamchk.h>
|
|
|
|
|
#include <mysql/plugin.h>
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Limit max keys according to HA_MAX_POSSIBLE_KEY; See myisamchk.h for details
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#if MAX_INDEXES > HA_MAX_POSSIBLE_KEY
|
|
|
|
|
#define MARIA_MAX_KEY HA_MAX_POSSIBLE_KEY /* Max allowed keys */
|
|
|
|
|
#else
|
|
|
|
|
#define MARIA_MAX_KEY MAX_INDEXES /* Max allowed keys */
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#define MARIA_MAX_MSG_BUF 1024 /* used in CHECK TABLE, REPAIR TABLE */
|
|
|
|
|
#define MARIA_NAME_IEXT ".MAI"
|
|
|
|
|
#define MARIA_NAME_DEXT ".MAD"
|
|
|
|
|
/* Max extra space to use when sorting keys */
|
|
|
|
|
#define MARIA_MAX_TEMP_LENGTH 2*1024L*1024L*1024L
|
|
|
|
|
/* Possible values for maria_block_size (must be power of 2) */
|
|
|
|
|
#define MARIA_KEY_BLOCK_LENGTH 8192 /* default key block length */
|
|
|
|
|
#define MARIA_MIN_KEY_BLOCK_LENGTH 1024 /* Min key block length */
|
|
|
|
|
#define MARIA_MAX_KEY_BLOCK_LENGTH 32768
|
|
|
|
|
#define maria_portable_sizeof_char_ptr 8
|
2007-01-18 20:38:14 +01:00
|
|
|
#define MARIA_MAX_KEY_LENGTH 1000 /* Max length in bytes */
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
In the following macros '_keyno_' is 0 .. keys-1.
|
|
|
|
|
If there can be more keys than bits in the key_map, the highest bit
|
|
|
|
|
is for all upper keys. They cannot be switched individually.
|
|
|
|
|
This means that clearing of high keys is ignored, setting one high key
|
|
|
|
|
sets all high keys.
|
|
|
|
|
*/
|
|
|
|
|
#define MARIA_KEYMAP_BITS (8 * SIZEOF_LONG_LONG)
|
|
|
|
|
#define MARIA_KEYMAP_HIGH_MASK (ULL(1) << (MARIA_KEYMAP_BITS - 1))
|
|
|
|
|
#define maria_get_mask_all_keys_active(_keys_) \
|
|
|
|
|
(((_keys_) < MARIA_KEYMAP_BITS) ? \
|
|
|
|
|
((ULL(1) << (_keys_)) - ULL(1)) : \
|
|
|
|
|
(~ ULL(0)))
|
|
|
|
|
#if MARIA_MAX_KEY > MARIA_KEYMAP_BITS
|
|
|
|
|
#define maria_is_key_active(_keymap_,_keyno_) \
|
|
|
|
|
(((_keyno_) < MARIA_KEYMAP_BITS) ? \
|
|
|
|
|
test((_keymap_) & (ULL(1) << (_keyno_))) : \
|
|
|
|
|
test((_keymap_) & MARIA_KEYMAP_HIGH_MASK))
|
|
|
|
|
#define maria_set_key_active(_keymap_,_keyno_) \
|
|
|
|
|
(_keymap_)|= (((_keyno_) < MARIA_KEYMAP_BITS) ? \
|
|
|
|
|
(ULL(1) << (_keyno_)) : \
|
|
|
|
|
MARIA_KEYMAP_HIGH_MASK)
|
|
|
|
|
#define maria_clear_key_active(_keymap_,_keyno_) \
|
|
|
|
|
(_keymap_)&= (((_keyno_) < MARIA_KEYMAP_BITS) ? \
|
|
|
|
|
(~ (ULL(1) << (_keyno_))) : \
|
|
|
|
|
(~ (ULL(0))) /*ignore*/ )
|
|
|
|
|
#else
|
|
|
|
|
#define maria_is_key_active(_keymap_,_keyno_) \
|
|
|
|
|
test((_keymap_) & (ULL(1) << (_keyno_)))
|
|
|
|
|
#define maria_set_key_active(_keymap_,_keyno_) \
|
|
|
|
|
(_keymap_)|= (ULL(1) << (_keyno_))
|
|
|
|
|
#define maria_clear_key_active(_keymap_,_keyno_) \
|
|
|
|
|
(_keymap_)&= (~ (ULL(1) << (_keyno_)))
|
|
|
|
|
#endif
|
|
|
|
|
#define maria_is_any_key_active(_keymap_) \
|
|
|
|
|
test((_keymap_))
|
|
|
|
|
#define maria_is_all_keys_active(_keymap_,_keys_) \
|
|
|
|
|
((_keymap_) == maria_get_mask_all_keys_active(_keys_))
|
|
|
|
|
#define maria_set_all_keys_active(_keymap_,_keys_) \
|
|
|
|
|
(_keymap_)= maria_get_mask_all_keys_active(_keys_)
|
|
|
|
|
#define maria_clear_all_keys_active(_keymap_) \
|
|
|
|
|
(_keymap_)= 0
|
|
|
|
|
#define maria_intersect_keys_active(_to_,_from_) \
|
|
|
|
|
(_to_)&= (_from_)
|
|
|
|
|
#define maria_is_any_intersect_keys_active(_keymap1_,_keys_,_keymap2_) \
|
|
|
|
|
((_keymap1_) & (_keymap2_) & \
|
|
|
|
|
maria_get_mask_all_keys_active(_keys_))
|
|
|
|
|
#define maria_copy_keys_active(_to_,_maxkeys_,_from_) \
|
|
|
|
|
(_to_)= (maria_get_mask_all_keys_active(_maxkeys_) & \
|
|
|
|
|
(_from_))
|
|
|
|
|
|
|
|
|
|
/* Param to/from maria_info */
|
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
typedef ulonglong MARIA_RECORD_POS;
|
|
|
|
|
|
2006-04-11 15:45:10 +02:00
|
|
|
typedef struct st_maria_isaminfo /* Struct from h_info */
|
|
|
|
|
{
|
|
|
|
|
ha_rows records; /* Records in database */
|
|
|
|
|
ha_rows deleted; /* Deleted records in database */
|
2007-01-18 20:38:14 +01:00
|
|
|
MARIA_RECORD_POS recpos; /* Pos for last used record */
|
|
|
|
|
MARIA_RECORD_POS newrecpos; /* Pos if we write new record */
|
|
|
|
|
MARIA_RECORD_POS dup_key_pos; /* Position to record with dup key */
|
2006-04-11 15:45:10 +02:00
|
|
|
my_off_t data_file_length; /* Length of data file */
|
|
|
|
|
my_off_t max_data_file_length, index_file_length;
|
|
|
|
|
my_off_t max_index_file_length, delete_length;
|
|
|
|
|
ulong reclength; /* Recordlength */
|
|
|
|
|
ulong mean_reclength; /* Mean recordlength (if packed) */
|
|
|
|
|
ulonglong auto_increment;
|
|
|
|
|
ulonglong key_map; /* Which keys are used */
|
|
|
|
|
char *data_file_name, *index_file_name;
|
|
|
|
|
uint keys; /* Number of keys in use */
|
|
|
|
|
uint options; /* HA_OPTION_... used */
|
|
|
|
|
int errkey, /* With key was dupplicated on err */
|
|
|
|
|
sortkey; /* clustered by this key */
|
|
|
|
|
File filenr; /* (uniq) filenr for datafile */
|
|
|
|
|
time_t create_time; /* When table was created */
|
|
|
|
|
time_t check_time;
|
|
|
|
|
time_t update_time;
|
|
|
|
|
uint reflength;
|
|
|
|
|
ulong record_offset;
|
|
|
|
|
ulong *rec_per_key; /* for sql optimizing */
|
|
|
|
|
} MARIA_INFO;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct st_maria_create_info
|
|
|
|
|
{
|
|
|
|
|
const char *index_file_name, *data_file_name; /* If using symlinks */
|
|
|
|
|
ha_rows max_rows;
|
|
|
|
|
ha_rows reloc_rows;
|
|
|
|
|
ulonglong auto_increment;
|
|
|
|
|
ulonglong data_file_length;
|
|
|
|
|
ulonglong key_file_length;
|
2007-01-18 20:38:14 +01:00
|
|
|
uint null_bytes;
|
2006-04-11 15:45:10 +02:00
|
|
|
uint old_options;
|
2007-01-18 20:38:14 +01:00
|
|
|
enum data_file_type org_data_file_type;
|
2006-04-11 15:45:10 +02:00
|
|
|
uint8 language;
|
2007-01-18 20:38:14 +01:00
|
|
|
my_bool with_auto_increment, transactional;
|
2006-04-11 15:45:10 +02:00
|
|
|
} MARIA_CREATE_INFO;
|
|
|
|
|
|
|
|
|
|
struct st_maria_info; /* For referense */
|
|
|
|
|
struct st_maria_share;
|
|
|
|
|
typedef struct st_maria_info MARIA_HA;
|
|
|
|
|
struct st_maria_s_param;
|
|
|
|
|
|
|
|
|
|
typedef struct st_maria_keydef /* Key definition with open & info */
|
|
|
|
|
{
|
|
|
|
|
struct st_maria_share *share; /* Pointer to base (set in open) */
|
|
|
|
|
uint16 keysegs; /* Number of key-segment */
|
|
|
|
|
uint16 flag; /* NOSAME, PACK_USED */
|
|
|
|
|
|
|
|
|
|
uint8 key_alg; /* BTREE, RTREE */
|
|
|
|
|
uint16 block_length; /* Length of keyblock (auto) */
|
|
|
|
|
uint16 underflow_block_length; /* When to execute underflow */
|
|
|
|
|
uint16 keylength; /* Tot length of keyparts (auto) */
|
|
|
|
|
uint16 minlength; /* min length of (packed) key (auto) */
|
|
|
|
|
uint16 maxlength; /* max length of (packed) key (auto) */
|
|
|
|
|
uint32 version; /* For concurrent read/write */
|
|
|
|
|
uint32 ftparser_nr; /* distinct ftparser number */
|
|
|
|
|
|
|
|
|
|
HA_KEYSEG *seg, *end;
|
|
|
|
|
struct st_mysql_ftparser *parser; /* Fulltext [pre]parser */
|
2007-01-18 20:38:14 +01:00
|
|
|
int (*bin_search)(struct st_maria_info *info,
|
|
|
|
|
struct st_maria_keydef *keyinfo, byte *page, byte *key,
|
|
|
|
|
uint key_len, uint comp_flag, byte **ret_pos,
|
|
|
|
|
byte *buff, my_bool *was_last_key);
|
|
|
|
|
uint(*get_key)(struct st_maria_keydef *keyinfo, uint nod_flag,
|
|
|
|
|
byte **page, byte *key);
|
|
|
|
|
int (*pack_key)(struct st_maria_keydef *keyinfo, uint nod_flag,
|
|
|
|
|
byte *next_key, byte *org_key, byte *prev_key,
|
|
|
|
|
const byte *key, struct st_maria_s_param *s_temp);
|
|
|
|
|
void (*store_key)(struct st_maria_keydef *keyinfo, byte *key_pos,
|
2006-04-11 15:45:10 +02:00
|
|
|
struct st_maria_s_param *s_temp);
|
2007-01-18 20:38:14 +01:00
|
|
|
int (*ck_insert)(struct st_maria_info *inf, uint k_nr, byte *k, uint klen);
|
|
|
|
|
int (*ck_delete)(struct st_maria_info *inf, uint k_nr, byte *k, uint klen);
|
2006-04-11 15:45:10 +02:00
|
|
|
} MARIA_KEYDEF;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#define MARIA_UNIQUE_HASH_LENGTH 4
|
|
|
|
|
|
|
|
|
|
typedef struct st_maria_unique_def /* Segment definition of unique */
|
|
|
|
|
{
|
|
|
|
|
uint16 keysegs; /* Number of key-segment */
|
2007-01-18 20:38:14 +01:00
|
|
|
uint8 key; /* Mapped to which key */
|
2006-04-11 15:45:10 +02:00
|
|
|
uint8 null_are_equal;
|
|
|
|
|
HA_KEYSEG *seg, *end;
|
|
|
|
|
} MARIA_UNIQUEDEF;
|
|
|
|
|
|
|
|
|
|
typedef struct st_maria_decode_tree /* Decode huff-table */
|
|
|
|
|
{
|
|
|
|
|
uint16 *table;
|
|
|
|
|
uint quick_table_bits;
|
|
|
|
|
byte *intervalls;
|
|
|
|
|
} MARIA_DECODE_TREE;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
struct st_maria_bit_buff;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Note that null markers should always be first in a row !
|
|
|
|
|
When creating a column, one should only specify:
|
|
|
|
|
type, length, null_bit and null_pos
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
typedef struct st_maria_columndef /* column information */
|
|
|
|
|
{
|
2007-01-18 20:38:14 +01:00
|
|
|
uint64 offset; /* Offset to position in row */
|
|
|
|
|
enum en_fieldtype type;
|
2006-04-11 15:45:10 +02:00
|
|
|
uint16 length; /* length of field */
|
2007-01-18 20:38:14 +01:00
|
|
|
uint16 fill_length;
|
|
|
|
|
uint16 null_pos; /* Position for null marker */
|
|
|
|
|
uint16 empty_pos; /* Position for empty marker */
|
|
|
|
|
uint8 null_bit; /* If column may be NULL */
|
|
|
|
|
uint8 empty_bit; /* If column may be empty */
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
|
#ifndef NOT_PACKED_DATABASES
|
2007-01-18 20:38:14 +01:00
|
|
|
void(*unpack)(struct st_maria_columndef *rec,
|
|
|
|
|
struct st_maria_bit_buff *buff,
|
|
|
|
|
byte *start, byte *end);
|
2006-04-11 15:45:10 +02:00
|
|
|
enum en_fieldtype base_type;
|
|
|
|
|
uint space_length_bits, pack_type;
|
|
|
|
|
MARIA_DECODE_TREE *huff_tree;
|
|
|
|
|
#endif
|
|
|
|
|
} MARIA_COLUMNDEF;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
extern ulong maria_block_size;
|
|
|
|
|
extern ulong maria_concurrent_insert;
|
2007-01-18 20:38:14 +01:00
|
|
|
extern my_bool maria_flush, maria_single_user;
|
|
|
|
|
extern my_bool maria_delay_key_write, maria_delay_rec_write;
|
2006-04-11 15:45:10 +02:00
|
|
|
extern my_off_t maria_max_temp_length;
|
|
|
|
|
extern ulong maria_bulk_insert_tree_size, maria_data_pointer_size;
|
|
|
|
|
extern KEY_CACHE maria_key_cache_var, *maria_key_cache;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Prototypes for maria-functions */
|
|
|
|
|
|
|
|
|
|
extern int maria_init(void);
|
|
|
|
|
extern void maria_end(void);
|
|
|
|
|
extern int maria_close(struct st_maria_info *file);
|
|
|
|
|
extern int maria_delete(struct st_maria_info *file, const byte *buff);
|
|
|
|
|
extern struct st_maria_info *maria_open(const char *name, int mode,
|
|
|
|
|
uint wait_if_locked);
|
|
|
|
|
extern int maria_panic(enum ha_panic_function function);
|
|
|
|
|
extern int maria_rfirst(struct st_maria_info *file, byte *buf, int inx);
|
|
|
|
|
extern int maria_rkey(struct st_maria_info *file, byte *buf, int inx,
|
|
|
|
|
const byte *key,
|
|
|
|
|
uint key_len, enum ha_rkey_function search_flag);
|
|
|
|
|
extern int maria_rlast(struct st_maria_info *file, byte *buf, int inx);
|
|
|
|
|
extern int maria_rnext(struct st_maria_info *file, byte *buf, int inx);
|
|
|
|
|
extern int maria_rnext_same(struct st_maria_info *info, byte *buf);
|
|
|
|
|
extern int maria_rprev(struct st_maria_info *file, byte *buf, int inx);
|
2007-01-18 20:38:14 +01:00
|
|
|
extern int maria_rrnd(struct st_maria_info *file, byte *buf,
|
|
|
|
|
MARIA_RECORD_POS pos);
|
2006-04-11 15:45:10 +02:00
|
|
|
extern int maria_scan_init(struct st_maria_info *file);
|
|
|
|
|
extern int maria_scan(struct st_maria_info *file, byte *buf);
|
2007-01-18 20:38:14 +01:00
|
|
|
extern void maria_scan_end(struct st_maria_info *file);
|
2006-04-11 15:45:10 +02:00
|
|
|
extern int maria_rsame(struct st_maria_info *file, byte *record, int inx);
|
|
|
|
|
extern int maria_rsame_with_pos(struct st_maria_info *file, byte *record,
|
2007-01-18 20:38:14 +01:00
|
|
|
int inx, MARIA_RECORD_POS pos);
|
2006-04-11 15:45:10 +02:00
|
|
|
extern int maria_update(struct st_maria_info *file, const byte *old,
|
|
|
|
|
byte *new_record);
|
|
|
|
|
extern int maria_write(struct st_maria_info *file, byte *buff);
|
2007-01-18 20:38:14 +01:00
|
|
|
extern MARIA_RECORD_POS maria_position(struct st_maria_info *file);
|
2006-04-11 15:45:10 +02:00
|
|
|
extern int maria_status(struct st_maria_info *info, MARIA_INFO *x, uint flag);
|
|
|
|
|
extern int maria_lock_database(struct st_maria_info *file, int lock_type);
|
2007-01-18 20:38:14 +01:00
|
|
|
extern int maria_create(const char *name, enum data_file_type record_type,
|
|
|
|
|
uint keys, MARIA_KEYDEF *keydef,
|
2006-04-11 15:45:10 +02:00
|
|
|
uint columns, MARIA_COLUMNDEF *columndef,
|
|
|
|
|
uint uniques, MARIA_UNIQUEDEF *uniquedef,
|
|
|
|
|
MARIA_CREATE_INFO *create_info, uint flags);
|
|
|
|
|
extern int maria_delete_table(const char *name);
|
|
|
|
|
extern int maria_rename(const char *from, const char *to);
|
|
|
|
|
extern int maria_extra(struct st_maria_info *file,
|
|
|
|
|
enum ha_extra_function function, void *extra_arg);
|
Completion of merge of mysql-5.1 into mysql-maria.
Manually imported changes done to MyISAM (include/myisam.h,
storage/myisam/*, sql/ha_myisam.*, mysql-test/t/myisam.test,
mysql-test/t/ps_2myisam.test) the last
months into Maria (tedious, should do it more frequently in the
future), including those not done at the previous 5.1->Maria merge
(please in the future don't forget to apply MyISAM changes to Maria
when you merge 5.1 into Maria).
Note: I didn't try to import anything which could be MyISAM-related
in other tests of mysql-test (I didn't want to dig in all csets),
but as QA is working to make most tests re-usable for other engines
(Falcon), it is likely that we'll benefit from this and just have
to set engine=Maria somewhere to run those tests on Maria.
func_group and partition tests fail but they already do in main 5.1
on my machine. No Valgrind error in t/*maria*.test.
Monty: please see the commit comment of maria.result and check.
BitKeeper/deleted/.del-ha_maria.m4:
Delete: config/ac-macros/ha_maria.m4
configure.in:
fix for the new way of enabling engines
include/maria.h:
importing changes done to MyISAM the last months into Maria
include/my_handler.h:
importing changes done to MyISAM the last months into Maria
include/myisam.h:
importing changes done to MyISAM the last months into Maria
mysql-test/r/maria.result:
identical to myisam.result, except the engine name in some places
AND in the line testing key_block_size=1000000000000000000:
Maria gives a key block size of 8192 while MyISAM gives 4096;
is it explainable by the difference between MARIA_KEY_BLOCK_LENGTH
and the same constant in MyISAM? Monty?
mysql-test/r/ps_maria.result:
identical to ps_2myisam.result (except the engine name in some places)
mysql-test/t/maria.test:
instead of engine=maria everywhere, I use @@storage_engine (reduces
the diff with myisam.test).
importing changes done to MyISAM the last months into Maria
mysys/my_handler.c:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.cc:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.h:
importing changes done to MyISAM the last months into Maria
sql/mysqld.cc:
unneeded
storage/maria/Makefile.am:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_check.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_create.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_delete_table.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_dynrec.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_extra.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_boolean_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_eval.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_nlq_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_parser.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ftdefs.h:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_key.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_open.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_page.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rkey.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rsamepos.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_index.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_mbr.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_sort.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test2.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test3.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_write.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_chk.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_def.h:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_ftdump.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_pack.c:
importing changes done to MyISAM the last months into Maria
2006-08-10 16:36:54 +02:00
|
|
|
extern int maria_reset(struct st_maria_info *file);
|
2006-04-11 15:45:10 +02:00
|
|
|
extern ha_rows maria_records_in_range(struct st_maria_info *info, int inx,
|
|
|
|
|
key_range *min_key, key_range *max_key);
|
|
|
|
|
extern int maria_is_changed(struct st_maria_info *info);
|
|
|
|
|
extern int maria_delete_all_rows(struct st_maria_info *info);
|
|
|
|
|
extern uint maria_get_pointer_length(ulonglong file_length, uint def);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* this is used to pass to mysql_mariachk_table */
|
|
|
|
|
|
|
|
|
|
#define MARIA_CHK_REPAIR 1 /* equivalent to mariachk -r */
|
|
|
|
|
#define MARIA_CHK_VERIFY 2 /* Verify, run repair if failure */
|
|
|
|
|
|
2006-12-19 19:15:53 +01:00
|
|
|
typedef uint maria_bit_type;
|
|
|
|
|
|
|
|
|
|
typedef struct st_maria_bit_buff
|
|
|
|
|
{ /* Used for packing of record */
|
|
|
|
|
maria_bit_type current_byte;
|
|
|
|
|
uint bits;
|
|
|
|
|
uchar *pos, *end, *blob_pos, *blob_end;
|
|
|
|
|
uint error;
|
|
|
|
|
} MARIA_BIT_BUFF;
|
|
|
|
|
|
|
|
|
|
|
2006-04-11 15:45:10 +02:00
|
|
|
typedef struct st_maria_sort_info
|
|
|
|
|
{
|
|
|
|
|
#ifdef THREAD
|
|
|
|
|
/* sync things */
|
|
|
|
|
pthread_mutex_t mutex;
|
|
|
|
|
pthread_cond_t cond;
|
|
|
|
|
#endif
|
|
|
|
|
MARIA_HA *info;
|
|
|
|
|
HA_CHECK *param;
|
|
|
|
|
char *buff;
|
|
|
|
|
SORT_KEY_BLOCKS *key_block, *key_block_end;
|
|
|
|
|
SORT_FT_BUF *ft_buf;
|
|
|
|
|
my_off_t filelength, dupp, buff_length;
|
|
|
|
|
ha_rows max_records;
|
|
|
|
|
uint current_key, total_keys;
|
|
|
|
|
uint got_error, threads_running;
|
|
|
|
|
myf myf_rw;
|
|
|
|
|
enum data_file_type new_data_file_type;
|
|
|
|
|
} MARIA_SORT_INFO;
|
|
|
|
|
|
|
|
|
|
typedef struct st_maria_sort_param
|
|
|
|
|
{
|
|
|
|
|
pthread_t thr;
|
|
|
|
|
IO_CACHE read_cache, tempfile, tempfile_for_exceptions;
|
|
|
|
|
DYNAMIC_ARRAY buffpek;
|
2006-12-19 19:15:53 +01:00
|
|
|
MARIA_BIT_BUFF bit_buff; /* For parallel repair of packrec. */
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
|
MARIA_KEYDEF *keyinfo;
|
|
|
|
|
MARIA_SORT_INFO *sort_info;
|
|
|
|
|
HA_KEYSEG *seg;
|
2007-01-18 20:38:14 +01:00
|
|
|
byte **sort_keys;
|
2006-04-11 15:45:10 +02:00
|
|
|
byte *rec_buff;
|
|
|
|
|
void *wordlist, *wordptr;
|
Completion of merge of mysql-5.1 into mysql-maria.
Manually imported changes done to MyISAM (include/myisam.h,
storage/myisam/*, sql/ha_myisam.*, mysql-test/t/myisam.test,
mysql-test/t/ps_2myisam.test) the last
months into Maria (tedious, should do it more frequently in the
future), including those not done at the previous 5.1->Maria merge
(please in the future don't forget to apply MyISAM changes to Maria
when you merge 5.1 into Maria).
Note: I didn't try to import anything which could be MyISAM-related
in other tests of mysql-test (I didn't want to dig in all csets),
but as QA is working to make most tests re-usable for other engines
(Falcon), it is likely that we'll benefit from this and just have
to set engine=Maria somewhere to run those tests on Maria.
func_group and partition tests fail but they already do in main 5.1
on my machine. No Valgrind error in t/*maria*.test.
Monty: please see the commit comment of maria.result and check.
BitKeeper/deleted/.del-ha_maria.m4:
Delete: config/ac-macros/ha_maria.m4
configure.in:
fix for the new way of enabling engines
include/maria.h:
importing changes done to MyISAM the last months into Maria
include/my_handler.h:
importing changes done to MyISAM the last months into Maria
include/myisam.h:
importing changes done to MyISAM the last months into Maria
mysql-test/r/maria.result:
identical to myisam.result, except the engine name in some places
AND in the line testing key_block_size=1000000000000000000:
Maria gives a key block size of 8192 while MyISAM gives 4096;
is it explainable by the difference between MARIA_KEY_BLOCK_LENGTH
and the same constant in MyISAM? Monty?
mysql-test/r/ps_maria.result:
identical to ps_2myisam.result (except the engine name in some places)
mysql-test/t/maria.test:
instead of engine=maria everywhere, I use @@storage_engine (reduces
the diff with myisam.test).
importing changes done to MyISAM the last months into Maria
mysys/my_handler.c:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.cc:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.h:
importing changes done to MyISAM the last months into Maria
sql/mysqld.cc:
unneeded
storage/maria/Makefile.am:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_check.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_create.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_delete_table.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_dynrec.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_extra.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_boolean_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_eval.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_nlq_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_parser.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ftdefs.h:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_key.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_open.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_page.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rkey.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rsamepos.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_index.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_mbr.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_sort.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test2.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test3.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_write.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_chk.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_def.h:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_ftdump.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_pack.c:
importing changes done to MyISAM the last months into Maria
2006-08-10 16:36:54 +02:00
|
|
|
MEM_ROOT wordroot;
|
2006-04-11 15:45:10 +02:00
|
|
|
char *record;
|
|
|
|
|
MY_TMPDIR *tmpdir;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
The next two are used to collect statistics, see maria_update_key_parts for
|
|
|
|
|
description.
|
|
|
|
|
*/
|
|
|
|
|
ulonglong unique[HA_MAX_KEY_SEG+1];
|
|
|
|
|
ulonglong notnull[HA_MAX_KEY_SEG+1];
|
|
|
|
|
|
2007-01-18 20:38:14 +01:00
|
|
|
MARIA_RECORD_POS pos,max_pos,filepos,start_recpos;
|
2006-04-11 15:45:10 +02:00
|
|
|
uint key, key_length,real_key_length,sortbuff_size;
|
|
|
|
|
uint maxbuffers, keys, find_length, sort_keys_length;
|
|
|
|
|
my_bool fix_datafile, master;
|
2006-12-19 19:15:53 +01:00
|
|
|
my_bool calc_checksum; /* calculate table checksum */
|
2007-01-18 20:38:14 +01:00
|
|
|
my_size_t rec_buff_size;
|
2006-04-11 15:45:10 +02:00
|
|
|
|
|
|
|
|
int (*key_cmp)(struct st_maria_sort_param *, const void *, const void *);
|
2007-01-18 20:38:14 +01:00
|
|
|
int (*key_read)(struct st_maria_sort_param *, byte *);
|
|
|
|
|
int (*key_write)(struct st_maria_sort_param *, const byte *);
|
2006-04-11 15:45:10 +02:00
|
|
|
void (*lock_in_memory)(HA_CHECK *);
|
2007-01-18 20:38:14 +01:00
|
|
|
NEAR int (*write_keys)(struct st_maria_sort_param *, register byte **,
|
2006-04-11 15:45:10 +02:00
|
|
|
uint , struct st_buffpek *, IO_CACHE *);
|
|
|
|
|
NEAR uint (*read_to_buffer)(IO_CACHE *,struct st_buffpek *, uint);
|
|
|
|
|
NEAR int (*write_key)(struct st_maria_sort_param *, IO_CACHE *,char *,
|
|
|
|
|
uint, uint);
|
|
|
|
|
} MARIA_SORT_PARAM;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* functions in maria_check */
|
2007-01-18 20:38:14 +01:00
|
|
|
void maria_chk_init(HA_CHECK *param);
|
2006-04-11 15:45:10 +02:00
|
|
|
int maria_chk_status(HA_CHECK *param, MARIA_HA *info);
|
|
|
|
|
int maria_chk_del(HA_CHECK *param, register MARIA_HA *info, uint test_flag);
|
|
|
|
|
int maria_chk_size(HA_CHECK *param, MARIA_HA *info);
|
|
|
|
|
int maria_chk_key(HA_CHECK *param, MARIA_HA *info);
|
|
|
|
|
int maria_chk_data_link(HA_CHECK *param, MARIA_HA *info, int extend);
|
|
|
|
|
int maria_repair(HA_CHECK *param, register MARIA_HA *info,
|
|
|
|
|
my_string name, int rep_quick);
|
|
|
|
|
int maria_sort_index(HA_CHECK *param, register MARIA_HA *info,
|
|
|
|
|
my_string name);
|
|
|
|
|
int maria_repair_by_sort(HA_CHECK *param, register MARIA_HA *info,
|
|
|
|
|
const char *name, int rep_quick);
|
|
|
|
|
int maria_repair_parallel(HA_CHECK *param, register MARIA_HA *info,
|
|
|
|
|
const char *name, int rep_quick);
|
|
|
|
|
int maria_change_to_newfile(const char *filename, const char *old_ext,
|
2007-01-18 20:38:14 +01:00
|
|
|
const char *new_ext, myf myflags);
|
2006-04-11 15:45:10 +02:00
|
|
|
void maria_lock_memory(HA_CHECK *param);
|
|
|
|
|
int maria_update_state_info(HA_CHECK *param, MARIA_HA *info, uint update);
|
|
|
|
|
void maria_update_key_parts(MARIA_KEYDEF *keyinfo, ulong *rec_per_key_part,
|
2007-01-18 20:38:14 +01:00
|
|
|
ulonglong *unique, ulonglong *notnull,
|
|
|
|
|
ulonglong records);
|
2006-04-11 15:45:10 +02:00
|
|
|
int maria_filecopy(HA_CHECK *param, File to, File from, my_off_t start,
|
2007-01-18 20:38:14 +01:00
|
|
|
my_off_t length, const char *type);
|
2006-04-11 15:45:10 +02:00
|
|
|
int maria_movepoint(MARIA_HA *info, byte *record, my_off_t oldpos,
|
2007-01-18 20:38:14 +01:00
|
|
|
my_off_t newpos, uint prot_key);
|
2006-04-11 15:45:10 +02:00
|
|
|
int maria_write_data_suffix(MARIA_SORT_INFO *sort_info, my_bool fix_datafile);
|
|
|
|
|
int maria_test_if_almost_full(MARIA_HA *info);
|
2007-01-18 20:38:14 +01:00
|
|
|
int maria_recreate_table(HA_CHECK *param, MARIA_HA **org_info, char *filename);
|
2006-04-11 15:45:10 +02:00
|
|
|
int maria_disable_indexes(MARIA_HA *info);
|
|
|
|
|
int maria_enable_indexes(MARIA_HA *info);
|
|
|
|
|
int maria_indexes_are_disabled(MARIA_HA *info);
|
|
|
|
|
void maria_disable_non_unique_index(MARIA_HA *info, ha_rows rows);
|
|
|
|
|
my_bool maria_test_if_sort_rep(MARIA_HA *info, ha_rows rows, ulonglong key_map,
|
|
|
|
|
my_bool force);
|
|
|
|
|
|
|
|
|
|
int maria_init_bulk_insert(MARIA_HA *info, ulong cache_size, ha_rows rows);
|
|
|
|
|
void maria_flush_bulk_insert(MARIA_HA *info, uint inx);
|
|
|
|
|
void maria_end_bulk_insert(MARIA_HA *info);
|
|
|
|
|
int maria_assign_to_key_cache(MARIA_HA *info, ulonglong key_map,
|
|
|
|
|
KEY_CACHE *key_cache);
|
|
|
|
|
void maria_change_key_cache(KEY_CACHE *old_key_cache,
|
|
|
|
|
KEY_CACHE *new_key_cache);
|
|
|
|
|
int maria_preload(MARIA_HA *info, ulonglong key_map, my_bool ignore_leaves);
|
|
|
|
|
|
|
|
|
|
/* fulltext functions */
|
|
|
|
|
FT_INFO *maria_ft_init_search(uint,void *, uint, byte *, uint,
|
|
|
|
|
CHARSET_INFO *, byte *);
|
|
|
|
|
|
|
|
|
|
/* 'Almost-internal' Maria functions */
|
|
|
|
|
|
|
|
|
|
void _ma_update_auto_increment_key(HA_CHECK *param, MARIA_HA *info,
|
|
|
|
|
my_bool repair);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
#endif
|