mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +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
110 lines
3.8 KiB
C
110 lines
3.8 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* This file should be included when using merge_isam_funktions */
|
|
|
|
#ifndef _myisammrg_h
|
|
#define _myisammrg_h
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#ifndef _my_base_h
|
|
#include <my_base.h>
|
|
#endif
|
|
#ifndef _myisam_h
|
|
#include <myisam.h>
|
|
#endif
|
|
|
|
#include <queues.h>
|
|
|
|
#define MYRG_NAME_EXT ".MRG"
|
|
|
|
/* In which table to INSERT rows */
|
|
#define MERGE_INSERT_DISABLED 0
|
|
#define MERGE_INSERT_TO_FIRST 1
|
|
#define MERGE_INSERT_TO_LAST 2
|
|
|
|
extern TYPELIB merge_insert_method;
|
|
|
|
/* Param to/from myrg_info */
|
|
|
|
typedef struct st_mymerge_info /* Struct from h_info */
|
|
{
|
|
ulonglong records; /* Records in database */
|
|
ulonglong deleted; /* Deleted records in database */
|
|
ulonglong recpos; /* Pos for last used record */
|
|
ulonglong data_file_length;
|
|
uint reclength; /* Recordlength */
|
|
int errkey; /* With key was dupplicated on err */
|
|
uint options; /* HA_OPTION_... used */
|
|
ulong *rec_per_key; /* for sql optimizing */
|
|
} MYMERGE_INFO;
|
|
|
|
typedef struct st_myrg_table_info
|
|
{
|
|
struct st_myisam_info *table;
|
|
ulonglong file_offset;
|
|
} MYRG_TABLE;
|
|
|
|
typedef struct st_myrg_info
|
|
{
|
|
MYRG_TABLE *open_tables,*current_table,*end_table,*last_used_table;
|
|
ulonglong records; /* records in tables */
|
|
ulonglong del; /* Removed records */
|
|
ulonglong data_file_length;
|
|
ulong cache_size;
|
|
uint merge_insert_method;
|
|
uint tables,options,reclength,keys;
|
|
my_bool cache_in_use;
|
|
LIST open_list;
|
|
QUEUE by_key;
|
|
ulong *rec_per_key_part; /* for sql optimizing */
|
|
} MYRG_INFO;
|
|
|
|
|
|
/* Prototypes for merge-functions */
|
|
|
|
extern int myrg_close(MYRG_INFO *file);
|
|
extern int myrg_delete(MYRG_INFO *file,const uchar *buff);
|
|
extern MYRG_INFO *myrg_open(const char *name,int mode,int wait_if_locked);
|
|
extern int myrg_panic(enum ha_panic_function function);
|
|
extern int myrg_rfirst(MYRG_INFO *file,uchar *buf,int inx);
|
|
extern int myrg_rlast(MYRG_INFO *file,uchar *buf,int inx);
|
|
extern int myrg_rnext(MYRG_INFO *file,uchar *buf,int inx);
|
|
extern int myrg_rprev(MYRG_INFO *file,uchar *buf,int inx);
|
|
extern int myrg_rnext_same(MYRG_INFO *file,uchar *buf);
|
|
extern int myrg_rkey(MYRG_INFO *info,uchar *buf,int inx, const uchar *key,
|
|
key_part_map keypart_map, enum ha_rkey_function search_flag);
|
|
extern int myrg_rrnd(MYRG_INFO *file,uchar *buf,ulonglong pos);
|
|
extern int myrg_rsame(MYRG_INFO *file,uchar *record,int inx);
|
|
extern int myrg_update(MYRG_INFO *file,const uchar *old,uchar *new_rec);
|
|
extern int myrg_write(MYRG_INFO *info,uchar *rec);
|
|
extern int myrg_status(MYRG_INFO *file,MYMERGE_INFO *x,int flag);
|
|
extern int myrg_lock_database(MYRG_INFO *file,int lock_type);
|
|
extern int myrg_create(const char *name, const char **table_names,
|
|
uint insert_method, my_bool fix_names);
|
|
extern int myrg_extra(MYRG_INFO *file,enum ha_extra_function function,
|
|
void *extra_arg);
|
|
extern int myrg_reset(MYRG_INFO *info);
|
|
extern void myrg_extrafunc(MYRG_INFO *info,invalidator_by_filename inv);
|
|
extern ha_rows myrg_records_in_range(MYRG_INFO *info, int inx,
|
|
key_range *min_key, key_range *max_key);
|
|
|
|
extern ulonglong myrg_position(MYRG_INFO *info);
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
#endif
|