mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
5a759d31f7
Benefits of this patch: - Removed a lot of calls to strlen(), especially for field_string - Strings generated by parser are now const strings, less chance of accidently changing a string - Removed a lot of calls with LEX_STRING as parameter (changed to pointer) - More uniform code - Item::name_length was not kept up to date. Now fixed - Several bugs found and fixed (Access to null pointers, access of freed memory, wrong arguments to printf like functions) - Removed a lot of casts from (const char*) to (char*) Changes: - This caused some ABI changes - lex_string_set now uses LEX_CSTRING - Some fucntions are now taking const char* instead of char* - Create_field::change and after changed to LEX_CSTRING - handler::connect_string, comment and engine_name() changed to LEX_CSTRING - Checked printf() related calls to find bugs. Found and fixed several errors in old code. - A lot of changes from LEX_STRING to LEX_CSTRING, especially related to parsing and events. - Some changes from LEX_STRING and LEX_STRING & to LEX_CSTRING* - Some changes for char* to const char* - Added printf argument checking for my_snprintf() - Introduced null_clex_str, star_clex_string, temp_lex_str to simplify code - Added item_empty_name and item_used_name to be able to distingush between items that was given an empty name and items that was not given a name This is used in sql_yacc.yy to know when to give an item a name. - select table_name."*' is not anymore same as table_name.* - removed not used function Item::rename() - Added comparision of item->name_length before some calls to my_strcasecmp() to speed up comparison - Moved Item_sp_variable::make_field() from item.h to item.cc - Some minimal code changes to avoid copying to const char * - Fixed wrong error message in wsrep_mysql_parse() - Fixed wrong code in find_field_in_natural_join() where real_item() was set when it shouldn't - ER_ERROR_ON_RENAME was used with extra arguments. - Removed some (wrong) ER_OUTOFMEMORY, as alloc_root will already give the error. TODO: - Check possible unsafe casts in plugin/auth_examples/qa_auth_interface.c - Change code to not modify LEX_CSTRING for database name (as part of lower_case_table_names)
139 lines
4.4 KiB
C
139 lines
4.4 KiB
C
#ifndef MYSQL_SERVICE_THD_ALLOC_INCLUDED
|
|
/* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
|
|
|
|
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
|
|
|
|
/**
|
|
@file
|
|
This service provides functions to allocate memory in a connection local
|
|
memory pool. The memory allocated there will be automatically freed at the
|
|
end of the statement, don't use it for allocations that should live longer
|
|
than that. For short living allocations this is more efficient than
|
|
using my_malloc and friends, and automatic "garbage collection" allows not
|
|
to think about memory leaks.
|
|
|
|
The pool is best for small to medium objects, don't use it for large
|
|
allocations - they are better served with my_malloc.
|
|
*/
|
|
|
|
#ifndef MYSQL_ABI_CHECK
|
|
#include <stdlib.h>
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
struct st_mysql_lex_string
|
|
{
|
|
char *str;
|
|
size_t length;
|
|
};
|
|
typedef struct st_mysql_lex_string MYSQL_LEX_STRING;
|
|
|
|
struct st_mysql_const_lex_string
|
|
{
|
|
const char *str;
|
|
size_t length;
|
|
};
|
|
typedef struct st_mysql_const_lex_string MYSQL_CONST_LEX_STRING;
|
|
|
|
extern struct thd_alloc_service_st {
|
|
void *(*thd_alloc_func)(MYSQL_THD, unsigned int);
|
|
void *(*thd_calloc_func)(MYSQL_THD, unsigned int);
|
|
char *(*thd_strdup_func)(MYSQL_THD, const char *);
|
|
char *(*thd_strmake_func)(MYSQL_THD, const char *, unsigned int);
|
|
void *(*thd_memdup_func)(MYSQL_THD, const void*, unsigned int);
|
|
MYSQL_CONST_LEX_STRING *(*thd_make_lex_string_func)(MYSQL_THD,
|
|
MYSQL_CONST_LEX_STRING *,
|
|
const char *, unsigned int, int);
|
|
} *thd_alloc_service;
|
|
|
|
#ifdef MYSQL_DYNAMIC_PLUGIN
|
|
|
|
#define thd_alloc(thd,size) (thd_alloc_service->thd_alloc_func((thd), (size)))
|
|
|
|
#define thd_calloc(thd,size) (thd_alloc_service->thd_calloc_func((thd), (size)))
|
|
|
|
#define thd_strdup(thd,str) (thd_alloc_service->thd_strdup_func((thd), (str)))
|
|
|
|
#define thd_strmake(thd,str,size) \
|
|
(thd_alloc_service->thd_strmake_func((thd), (str), (size)))
|
|
|
|
#define thd_memdup(thd,str,size) \
|
|
(thd_alloc_service->thd_memdup_func((thd), (str), (size)))
|
|
|
|
#define thd_make_lex_string(thd, lex_str, str, size, allocate_lex_string) \
|
|
(thd_alloc_service->thd_make_lex_string_func((thd), (lex_str), (str), \
|
|
(size), (allocate_lex_string)))
|
|
|
|
#else
|
|
|
|
/**
|
|
Allocate memory in the connection's local memory pool
|
|
|
|
@details
|
|
When properly used in place of @c my_malloc(), this can significantly
|
|
improve concurrency. Don't use this or related functions to allocate
|
|
large chunks of memory. Use for temporary storage only. The memory
|
|
will be freed automatically at the end of the statement; no explicit
|
|
code is required to prevent memory leaks.
|
|
|
|
@see alloc_root()
|
|
*/
|
|
void *thd_alloc(MYSQL_THD thd, unsigned int size);
|
|
/**
|
|
@see thd_alloc()
|
|
*/
|
|
void *thd_calloc(MYSQL_THD thd, unsigned int size);
|
|
/**
|
|
@see thd_alloc()
|
|
*/
|
|
char *thd_strdup(MYSQL_THD thd, const char *str);
|
|
/**
|
|
@see thd_alloc()
|
|
*/
|
|
char *thd_strmake(MYSQL_THD thd, const char *str, unsigned int size);
|
|
/**
|
|
@see thd_alloc()
|
|
*/
|
|
void *thd_memdup(MYSQL_THD thd, const void* str, unsigned int size);
|
|
|
|
/**
|
|
Create a LEX_STRING in this connection's local memory pool
|
|
|
|
@param thd user thread connection handle
|
|
@param lex_str pointer to LEX_STRING object to be initialized
|
|
@param str initializer to be copied into lex_str
|
|
@param size length of str, in bytes
|
|
@param allocate_lex_string flag: if TRUE, allocate new LEX_STRING object,
|
|
instead of using lex_str value
|
|
@return NULL on failure, or pointer to the LEX_STRING object
|
|
|
|
@see thd_alloc()
|
|
*/
|
|
MYSQL_CONST_LEX_STRING
|
|
*thd_make_lex_string(MYSQL_THD thd, MYSQL_CONST_LEX_STRING *lex_str,
|
|
const char *str, unsigned int size,
|
|
int allocate_lex_string);
|
|
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#define MYSQL_SERVICE_THD_ALLOC_INCLUDED
|
|
#endif
|
|
|