mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
088e2395f1
The following type conversions was done:
- Changed byte to uchar
- Changed gptr to uchar*
- Change my_string to char *
- Change my_size_t to size_t
- Change size_s to size_t
Removed declaration of byte, gptr, my_string, my_size_t and size_s.
Following function parameter changes was done:
- All string functions in mysys/strings was changed to use size_t
instead of uint for string lengths.
- All read()/write() functions changed to use size_t (including vio).
- All protocoll functions changed to use size_t instead of uint
- Functions that used a pointer to a string length was changed to use size_t*
- Changed malloc(), free() and related functions from using gptr to use void *
as this requires fewer casts in the code and is more in line with how the
standard functions work.
- Added extra length argument to dirname_part() to return the length of the
created string.
- Changed (at least) following functions to take uchar* as argument:
- db_dump()
- my_net_write()
- net_write_command()
- net_store_data()
- DBUG_DUMP()
- decimal2bin() & bin2decimal()
- Changed my_compress() and my_uncompress() to use size_t. Changed one
argument to my_uncompress() from a pointer to a value as we only return
one value (makes function easier to use).
- Changed type of 'pack_data' argument to packfrm() to avoid casts.
- Changed in readfrm() and writefrom(), ha_discover and handler::discover()
the type for argument 'frmdata' to uchar** to avoid casts.
- Changed most Field functions to use uchar* instead of char* (reduced a lot of
casts).
- Changed field->val_xxx(xxx, new_ptr) to take const pointers.
Other changes:
- Removed a lot of not needed casts
- Added a few new cast required by other changes
- Added some cast to my_multi_malloc() arguments for safety (as string lengths
needs to be uint, not size_t).
- Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done
explicitely as this conflict was often hided by casting the function to
hash_get_key).
- Changed some buffers to memory regions to uchar* to avoid casts.
- Changed some string lengths from uint to size_t.
- Changed field->ptr to be uchar* instead of char*. This allowed us to
get rid of a lot of casts.
- Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar
- Include zlib.h in some files as we needed declaration of crc32()
- Changed MY_FILE_ERROR to be (size_t) -1.
- Changed many variables to hold the result of my_read() / my_write() to be
size_t. This was needed to properly detect errors (which are
returned as (size_t) -1).
- Removed some very old VMS code
- Changed packfrm()/unpackfrm() to not be depending on uint size
(portability fix)
- Removed windows specific code to restore cursor position as this
causes slowdown on windows and we should not mix read() and pread()
calls anyway as this is not thread safe. Updated function comment to
reflect this. Changed function that depended on original behavior of
my_pwrite() to itself restore the cursor position (one such case).
- Added some missing checking of return value of malloc().
- Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow.
- Changed type of table_def::m_size from my_size_t to ulong to reflect that
m_size is the number of elements in the array, not a string/memory
length.
- Moved THD::max_row_length() to table.cc (as it's not depending on THD).
Inlined max_row_length_blob() into this function.
- More function comments
- Fixed some compiler warnings when compiled without partitions.
- Removed setting of LEX_STRING() arguments in declaration (portability fix).
- Some trivial indentation/variable name changes.
- Some trivial code simplifications:
- Replaced some calls to alloc_root + memcpy to use
strmake_root()/strdup_root().
- Changed some calls from memdup() to strmake() (Safety fix)
- Simpler loops in client-simple.c
109 lines
4.2 KiB
C
109 lines
4.2 KiB
C
/* Copyright (C) 2000-2002, 2004 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* This file is included in all heap-files */
|
|
|
|
#include <my_base.h> /* This includes global */
|
|
#ifdef THREAD
|
|
#include <my_pthread.h>
|
|
#endif
|
|
#include "heap.h" /* Structs & some defines */
|
|
#include "my_tree.h"
|
|
|
|
/*
|
|
When allocating keys /rows in the internal block structure, do it
|
|
within the following boundaries.
|
|
|
|
The challenge is to find the balance between allocate as few blocks
|
|
as possible and keep memory consumption down.
|
|
*/
|
|
|
|
#define HP_MIN_RECORDS_IN_BLOCK 16
|
|
#define HP_MAX_RECORDS_IN_BLOCK 8192
|
|
|
|
/* Some extern variables */
|
|
|
|
extern LIST *heap_open_list,*heap_share_list;
|
|
|
|
#define test_active(info) \
|
|
if (!(info->update & HA_STATE_AKTIV))\
|
|
{ my_errno=HA_ERR_NO_ACTIVE_RECORD; DBUG_RETURN(-1); }
|
|
#define hp_find_hash(A,B) ((HASH_INFO*) hp_find_block((A),(B)))
|
|
|
|
/* Find pos for record and update it in info->current_ptr */
|
|
#define hp_find_record(info,pos) (info)->current_ptr= hp_find_block(&(info)->s->block,pos)
|
|
|
|
typedef struct st_hp_hash_info
|
|
{
|
|
struct st_hp_hash_info *next_key;
|
|
uchar *ptr_to_rec;
|
|
} HASH_INFO;
|
|
|
|
typedef struct {
|
|
HA_KEYSEG *keyseg;
|
|
uint key_length;
|
|
uint search_flag;
|
|
} heap_rb_param;
|
|
|
|
/* Prototypes for intern functions */
|
|
|
|
extern HP_SHARE *hp_find_named_heap(const char *name);
|
|
extern int hp_rectest(HP_INFO *info,const uchar *old);
|
|
extern uchar *hp_find_block(HP_BLOCK *info,ulong pos);
|
|
extern int hp_get_new_block(HP_BLOCK *info, size_t* alloc_length);
|
|
extern void hp_free(HP_SHARE *info);
|
|
extern uchar *hp_free_level(HP_BLOCK *block,uint level,HP_PTRS *pos,
|
|
uchar *last_pos);
|
|
extern int hp_write_key(HP_INFO *info, HP_KEYDEF *keyinfo,
|
|
const uchar *record, uchar *recpos);
|
|
extern int hp_rb_write_key(HP_INFO *info, HP_KEYDEF *keyinfo,
|
|
const uchar *record, uchar *recpos);
|
|
extern int hp_rb_delete_key(HP_INFO *info,HP_KEYDEF *keyinfo,
|
|
const uchar *record,uchar *recpos,int flag);
|
|
extern int hp_delete_key(HP_INFO *info,HP_KEYDEF *keyinfo,
|
|
const uchar *record,uchar *recpos,int flag);
|
|
extern HASH_INFO *_heap_find_hash(HP_BLOCK *block,ulong pos);
|
|
extern uchar *hp_search(HP_INFO *info,HP_KEYDEF *keyinfo,const uchar *key,
|
|
uint nextflag);
|
|
extern uchar *hp_search_next(HP_INFO *info, HP_KEYDEF *keyinfo,
|
|
const uchar *key, HASH_INFO *pos);
|
|
extern ulong hp_hashnr(HP_KEYDEF *keyinfo,const uchar *key);
|
|
extern ulong hp_rec_hashnr(HP_KEYDEF *keyinfo,const uchar *rec);
|
|
extern ulong hp_mask(ulong hashnr,ulong buffmax,ulong maxlength);
|
|
extern void hp_movelink(HASH_INFO *pos,HASH_INFO *next_link,
|
|
HASH_INFO *newlink);
|
|
extern int hp_rec_key_cmp(HP_KEYDEF *keydef,const uchar *rec1,
|
|
const uchar *rec2,
|
|
my_bool diff_if_only_endspace_difference);
|
|
extern int hp_key_cmp(HP_KEYDEF *keydef,const uchar *rec,
|
|
const uchar *key);
|
|
extern void hp_make_key(HP_KEYDEF *keydef,uchar *key,const uchar *rec);
|
|
extern uint hp_rb_make_key(HP_KEYDEF *keydef, uchar *key,
|
|
const uchar *rec, uchar *recpos);
|
|
extern uint hp_rb_key_length(HP_KEYDEF *keydef, const uchar *key);
|
|
extern uint hp_rb_null_key_length(HP_KEYDEF *keydef, const uchar *key);
|
|
extern uint hp_rb_var_key_length(HP_KEYDEF *keydef, const uchar *key);
|
|
extern my_bool hp_if_null_in_key(HP_KEYDEF *keyinfo, const uchar *record);
|
|
extern int hp_close(register HP_INFO *info);
|
|
extern void hp_clear(HP_SHARE *info);
|
|
extern void hp_clear_keys(HP_SHARE *info);
|
|
extern uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old,
|
|
key_part_map keypart_map);
|
|
#ifdef THREAD
|
|
extern pthread_mutex_t THR_LOCK_heap;
|
|
#else
|
|
#define pthread_mutex_lock(A)
|
|
#define pthread_mutex_unlock(A)
|
|
#endif
|