mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-04-18 21:44:02 +03:00
9608533d92
mcsconfig.h and my_config.h have the following pre-processor definitions: 1. Conflicting definitions coming from the standard cmake definitions: - PACKAGE - PACKAGE_BUGREPORT - PACKAGE_NAME - PACKAGE_STRING - PACKAGE_TARNAME - PACKAGE_VERSION - VERSION 2. Conflicting definitions of other kinds: - HAVE_STRTOLL - this is a dirt in MariaDB headers. Should be fixed in the server code. my_config.h erroneously performs "#define HAVE_STRTOLL" instead of "#define HAVE_STRTOLL 1". in some cases. The former is not CMake compatible style. The latter is. 3. Non-conflicting definitions: Otherwise, mcsconfig.h and my_config.h should be mutually compatible, because both are generated by cmake on the same host machine. So they should have exactly equal definitions like "HAVE_XXX", "SIZEOF_XXX", etc. Observations: - It's OK to include both mcsconfig.h and my_config.h providing that we suppress duplicate definition of the above conflicting types #1 and #2. - There is no a need to suppress duplicate definitions mentioned in #3, as they are compatible! - my_sys.h and m_ctype.h must always follow a CMake configuation header, either my_config.h or mcsconfig.h (or both). They must never be included without any preceeding configuration header. This change make sure that we resolve conflicts by: - either disallowing inclusion of mcsconfig.h and my_config.h at the same time - or by hiding conflicting definitions #1 and #2 (with their later restoring). - also, by making sure that my_sys.h and m_ctype.h always follow a CMake configuration file. Details: - idb_mysql.h can now only be included only after my_config.h An attempt to use idb_mysql.h with mcsconfig.h instead of my_config.h is caught by the "#error" preprocessor directive. - mariadb_my_sys.h can now be only included after mcsconfig.h. An attempt to use mariadb_my_sys.h without mcscofig.h (e.g. with my_config.h) is also caught by "#error". - collation.h now can now be included in two ways. It now has the following effective structure: #if defined(PREFER_MY_CONFIG_H) && defined(MY_CONFIG_H) // Remember current conflicting definitions on the preprocessor stack // Undefine current conflicting definitions #endif #include "mcsconfig.h" #include "m_ctype.h" #if defined(PREFER_MY_CONFIG_H) && defined(MY_CONFIG_H) # Restore conflicting definitions from the preprocessor stack #endif and can be included as follows: a. using only mcsconfig.h as a configuration header: // my_config.h must not be included so far #include "collation.h" b. using my_config.h as the first included configuration file: #define PREFER_MY_CONFIG_H // Force conflict resolution #include "my_config.h" // can be included directly or indirectly ... #include "collation.h" Other changes: - Adding helper header files utils/common/mcsconfig_conflicting_defs_remember.h utils/common/mcsconfig_conflicting_defs_restore.h utils/common/mcsconfig_conflicting_defs_undef.h to perform conflict resolution easier. - Removing `#include "collation.h"` from a number of files, as it's automatically included from rowgroup.h. - Removing redundant `#include "utils_utf8.h"`. This change is not directly related to the problem being fixed, but it's nice to remove redundant directives for both collation.h and utils_utf8.h from all the files that do not really need them. (this change could probably have gone as a separate commit) - Changing my_init() to MY_INIT(argv[0]) in the MCS services sources. After the fix of the complitation failure it appeared that ColumnStore services compiled with the debug build crash due to recent changes in safemalloc. The crash happened in strcmp() with `my_progname` as an argument (where my_progname is a mysys global variable). This problem should probably be fixed on the server side as well to avoid passing NULL. But, the majority of MariaDB executable programs also use MY_INIT(argv[0]) rather than my_init(). So let's make MCS do like the other programs do.
122 lines
2.6 KiB
C++
122 lines
2.6 KiB
C++
/* Copyright (C) 2014 InfiniDB, Inc.
|
|
|
|
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 Street, Fifth Floor, Boston,
|
|
MA 02110-1301, USA. */
|
|
//One include file to deal with all the MySQL pollution of the
|
|
// global namespace
|
|
//
|
|
// Don't include ANY mysql headers anywhere except here!
|
|
#ifndef IDB_MYSQL_H__
|
|
#define IDB_MYSQL_H__
|
|
|
|
#ifdef TEST_MCSCONFIG_H
|
|
#error mcsconfig.h was included before idb_mysql.h
|
|
#endif
|
|
|
|
#ifdef _MSC_VER
|
|
#include <stdint.h>
|
|
#if _MSC_VER >= 1800
|
|
template <class T> bool isnan(T);
|
|
#endif
|
|
#endif
|
|
|
|
//#define INFINIDB_DEBUG
|
|
//#define DEBUG_WALK_COND
|
|
|
|
#define MYSQL_SERVER 1 //needed for definition of struct THD in mysql_priv.h
|
|
#define USE_CALPONT_REGEX
|
|
|
|
#undef LOG_INFO
|
|
|
|
#ifdef _DEBUG
|
|
#ifndef _MSC_VER
|
|
#ifndef SAFE_MUTEX
|
|
#define SAFE_MUTEX
|
|
#endif
|
|
#ifndef SAFEMALLOC
|
|
#define SAFEMALLOC
|
|
#endif
|
|
#endif
|
|
#ifndef ENABLED_DEBUG_SYNC
|
|
#define ENABLED_DEBUG_SYNC
|
|
#endif
|
|
|
|
#define DBUG_ON 1
|
|
#undef DBUG_OFF
|
|
#else
|
|
#undef SAFE_MUTEX
|
|
#undef SAFEMALLOC
|
|
#undef ENABLED_DEBUG_SYNC
|
|
#undef DBUG_ON
|
|
#define DBUG_OFF 1
|
|
#endif
|
|
#ifdef _MSC_VER
|
|
#define MYSQL_DYNAMIC_PLUGIN
|
|
#define DONT_DEFINE_VOID
|
|
#ifdef ETIMEDOUT
|
|
#undef ETIMEDOUT
|
|
#endif
|
|
#endif
|
|
|
|
#include "sql_plugin.h"
|
|
#include "sql_table.h"
|
|
#include "sql_select.h"
|
|
#include "mysqld_error.h"
|
|
#include "item_windowfunc.h"
|
|
#include "sql_cte.h"
|
|
#include "tztime.h"
|
|
#include "derived_handler.h"
|
|
#include "select_handler.h"
|
|
#include "rpl_rli.h"
|
|
#include "my_dbug.h"
|
|
|
|
// Now clean up the pollution as best we can...
|
|
#include "mcsconfig_conflicting_defs_undef.h"
|
|
#undef min
|
|
#undef max
|
|
#undef UNKNOWN
|
|
#undef test
|
|
#undef pthread_mutex_init
|
|
#undef pthread_mutex_lock
|
|
#undef pthread_mutex_unlock
|
|
#undef pthread_mutex_destroy
|
|
#undef pthread_mutex_wait
|
|
#undef pthread_mutex_timedwait
|
|
#undef pthread_mutex_t
|
|
#undef pthread_cond_wait
|
|
#undef pthread_cond_timedwait
|
|
#undef pthread_mutex_trylock
|
|
#undef sleep
|
|
#undef getpid
|
|
#undef SIZEOF_LONG
|
|
#undef DEBUG
|
|
#undef set_bits
|
|
#undef likely
|
|
|
|
namespace
|
|
{
|
|
inline char* idb_mysql_query_str(THD* thd)
|
|
{
|
|
#if MYSQL_VERSION_ID >= 50172
|
|
return thd->query();
|
|
#else
|
|
return thd->query;
|
|
#endif
|
|
}
|
|
}
|
|
|
|
#endif
|
|
// vim:ts=4 sw=4:
|