mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
1a793de9e4
warnings in sql_trigger.cc and sql_view.cc". According to the current version of C++ standard offsetof() macro can't be used for non-POD types. So warnings were emitted when we tried to use this macro for TABLE_LIST and Table_triggers_list classes. Note that despite of these warnings it was probably safe thing to do. This fix tries to circumvent this limitation by implementing custom version of offsetof() macro to be used with these classes. This hack should go away once we will refactor File_parser class. Alternative approaches such as disabling this warning for sql_trigger.cc/sql_view.cc or for the whole server were considered less explicit. Also I was unable to find a way to disable particular warning for particular _part_ of file in GCC. sql/parse_file.h: Introduced auxillary macro which can be used instead of offsetof() to get offsets of members in class for non-POD types without getting warnings (assuming that all instances of the class has same offsets for same members). sql/sql_trigger.cc: Use my_offsetof() macro instead of standard offsetof() macro with Table_triggers_list class in order to avoid warnings (offsetof() cannot be used for non-POD types according to the standard). sql/sql_view.cc: Use my_offsetof() macro instead of standard offsetof() macro with TABLE_LIST class in order to avoid warnings (offsetof() cannot be used for non-POD types according to the standard).
126 lines
4.3 KiB
C++
126 lines
4.3 KiB
C++
/* -*- C++ -*- */
|
|
/* Copyright (C) 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; 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 */
|
|
|
|
#ifndef _PARSE_FILE_H_
|
|
#define _PARSE_FILE_H_
|
|
|
|
#define PARSE_FILE_TIMESTAMPLENGTH 19
|
|
|
|
enum file_opt_type {
|
|
FILE_OPTIONS_STRING, /* String (LEX_STRING) */
|
|
FILE_OPTIONS_ESTRING, /* Escaped string (LEX_STRING) */
|
|
FILE_OPTIONS_ULONGLONG, /* ulonglong parameter (ulonglong) */
|
|
FILE_OPTIONS_REV, /* Revision version number (ulonglong) */
|
|
FILE_OPTIONS_TIMESTAMP, /* timestamp (LEX_STRING have to be
|
|
allocated with length 20 (19+1) */
|
|
FILE_OPTIONS_STRLIST, /* list of escaped strings
|
|
(List<LEX_STRING>) */
|
|
FILE_OPTIONS_ULLLIST /* list of ulonglong values
|
|
(List<ulonglong>) */
|
|
};
|
|
|
|
struct File_option
|
|
{
|
|
LEX_STRING name; /* Name of the option */
|
|
int offset; /* offset to base address of value */
|
|
file_opt_type type; /* Option type */
|
|
};
|
|
|
|
|
|
/*
|
|
This hook used to catch no longer supported keys and process them for
|
|
backward compatibility.
|
|
*/
|
|
|
|
class Unknown_key_hook
|
|
{
|
|
public:
|
|
Unknown_key_hook() {} /* Remove gcc warning */
|
|
virtual ~Unknown_key_hook() {} /* Remove gcc warning */
|
|
virtual bool process_unknown_string(char *&unknown_key, gptr base,
|
|
MEM_ROOT *mem_root, char *end)= 0;
|
|
};
|
|
|
|
|
|
/* Dummy hook for parsers which do not need hook for unknown keys */
|
|
|
|
class File_parser_dummy_hook: public Unknown_key_hook
|
|
{
|
|
public:
|
|
File_parser_dummy_hook() {} /* Remove gcc warning */
|
|
virtual bool process_unknown_string(char *&unknown_key, gptr base,
|
|
MEM_ROOT *mem_root, char *end);
|
|
};
|
|
|
|
extern File_parser_dummy_hook file_parser_dummy_hook;
|
|
|
|
bool get_file_options_ulllist(char *&ptr, char *end, char *line,
|
|
gptr base, File_option *parameter,
|
|
MEM_ROOT *mem_root);
|
|
|
|
char *
|
|
parse_escaped_string(char *ptr, char *end, MEM_ROOT *mem_root, LEX_STRING *str);
|
|
|
|
class File_parser;
|
|
File_parser *sql_parse_prepare(const LEX_STRING *file_name,
|
|
MEM_ROOT *mem_root, bool bad_format_errors);
|
|
|
|
my_bool
|
|
sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name,
|
|
const LEX_STRING *type,
|
|
gptr base, File_option *parameters, uint versions);
|
|
my_bool rename_in_schema_file(const char *schema, const char *old_name,
|
|
const char *new_name, ulonglong revision,
|
|
uint num_view_backups);
|
|
|
|
class File_parser: public Sql_alloc
|
|
{
|
|
char *buff, *start, *end;
|
|
LEX_STRING file_type;
|
|
my_bool content_ok;
|
|
public:
|
|
File_parser() :buff(0), start(0), end(0), content_ok(0)
|
|
{ file_type.str= 0; file_type.length= 0; }
|
|
|
|
my_bool ok() { return content_ok; }
|
|
LEX_STRING *type() { return &file_type; }
|
|
my_bool parse(gptr base, MEM_ROOT *mem_root,
|
|
struct File_option *parameters, uint required,
|
|
Unknown_key_hook *hook);
|
|
|
|
friend File_parser *sql_parse_prepare(const LEX_STRING *file_name,
|
|
MEM_ROOT *mem_root,
|
|
bool bad_format_errors);
|
|
};
|
|
|
|
|
|
/*
|
|
Custom version of standard offsetof() macro which can be used to get
|
|
offsets of members in class for non-POD types (according to the current
|
|
version of C++ standard offsetof() macro can't be used in such cases and
|
|
attempt to do so causes warnings to be emitted, OTOH in many cases it is
|
|
still OK to assume that all instances of the class has the same offsets
|
|
for the same members).
|
|
|
|
This is temporary solution which should be removed once File_parser class
|
|
and related routines are refactored.
|
|
*/
|
|
|
|
#define my_offsetof(TYPE, MEMBER) \
|
|
((size_t)((char *)&(((TYPE *)0x10)->MEMBER) - (char*)0x10))
|
|
|
|
#endif /* _PARSE_FILE_H_ */
|