cleanup: remove unconditional #ifdef's

MariaDB · HugoWenTD · Nov 25, 2023 · Jan 19, 2024 · Feb 5, 2024 · Jan 8, 2024
commit 16846b5d0c75a9b9ac53c13e272f8b5fded2e93b
diff --git a/config.h.cmake b/config.h.cmake
@@ -501,14 +501,6 @@
 #cmakedefine HAVE_EncryptAes128Gcm 1
 #cmakedefine HAVE_hkdf 1
 
-/*
- Stuff that always need to be defined (compile breaks without it)
-*/
-#define HAVE_SPATIAL 1
-#define HAVE_RTREE_KEYS 1
-#define HAVE_QUERY_CACHE 1
-#define BIG_TABLES 1
-
 /*
  Important storage engines (those that really need define 
  WITH_<ENGINE>_STORAGE_ENGINE for the whole server)

diff --git a/include/my_base.h b/include/my_base.h
@@ -666,13 +666,8 @@ typedef struct st_page_range
 #define unused_page_range { UNUSED_PAGE_NO, UNUSED_PAGE_NO }
 
 /* For number of records */
-#ifdef BIG_TABLES
 #define rows2double(A) ulonglong2double(A)
 typedef my_off_t ha_rows;
-#else
-#define rows2double(A) (double) (A)
-typedef ulong ha_rows;
-#endif
 
 #define HA_POS_ERROR (~ (ha_rows) 0)
 #define HA_OFFSET_ERROR (~ (my_off_t) 0)

diff --git a/include/myisampack.h b/include/myisampack.h
@@ -234,14 +234,8 @@
 
 /* Fix to avoid warnings when sizeof(ha_rows) == sizeof(long) */
 
-#ifdef BIG_TABLES
 #define mi_rowstore(T,A) mi_int8store(T, A)
 #define mi_rowkorr(T) mi_uint8korr(T)
-#else
-#define mi_rowstore(T,A) { mi_int4store(T, 0);\
- mi_int4store(((uchar*) (T) + 4), A); }
-#define mi_rowkorr(T) mi_uint4korr((const uchar*) (T) + 4)
-#endif
 
 #if SIZEOF_OFF_T > 4
 #define mi_sizestore(T,A) mi_int8store(T, A)

diff --git a/libmysqld/emb_qcache.cc b/libmysqld/emb_qcache.cc
@@ -16,7 +16,6 @@
 #include "mariadb.h"
 #include "sql_priv.h"
 
-#ifdef HAVE_QUERY_CACHE
 #include <mysql.h>
 #include "sql_basic_types.h"
 #include "emb_qcache.h"
@@ -497,6 +496,3 @@ int emb_load_querycache_result(THD *thd, Querycache_stream *src)
 err:
  DBUG_RETURN(1);
 }
-
-#endif /*HAVE_QUERY_CACHE*/
-
diff --git a/sql/cset_narrowing.cc b/sql/cset_narrowing.cc
@@ -14,10 +14,6 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
 
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
 #include "mariadb.h"
 #include "sql_priv.h"
 #include "sql_select.h"

diff --git a/sql/debug_sync.h b/sql/debug_sync.h
@@ -22,10 +22,6 @@
  Declarations for the Debug Sync Facility. See debug_sync.cc for details.
 */
 
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
 class THD;
 
 #if defined(ENABLED_DEBUG_SYNC)

diff --git a/sql/field.cc b/sql/field.cc
@@ -23,10 +23,6 @@
  This file implements classes defined in field.h
 */
 
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
 #include "mariadb.h"
 #include "sql_priv.h"
 #include "sql_select.h"

diff --git a/sql/field.h b/sql/field.h
@@ -21,10 +21,6 @@
  variables must declare the size_of() member function.
 */
 
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
 #include "mysqld.h" /* system_charset_info */
 #include "table.h" /* TABLE */
 #include "sql_string.h" /* String */

diff --git a/sql/gcalc_slicescan.cc b/sql/gcalc_slicescan.cc
@@ -19,8 +19,6 @@
 #include <my_sys.h>
 #include <m_string.h>
 
-#ifdef HAVE_SPATIAL
-
 #include "gcalc_slicescan.h"
 
 
@@ -2010,6 +2008,3 @@ double Gcalc_scan_iterator::get_pure_double(const Gcalc_internal_coord *d,
  res*= -1.0;
  return res;
 }
-
-
-#endif /* HAVE_SPATIAL */
diff --git a/sql/gcalc_tools.cc b/sql/gcalc_tools.cc
@@ -17,8 +17,6 @@
 
 #include "mariadb.h"
 
-#ifdef HAVE_SPATIAL
-
 #include "gcalc_tools.h"
 #include "spatial.h"
 
@@ -1466,6 +1464,3 @@ void Gcalc_operation_reducer::reset()
  m_res_hook= (Gcalc_dyn_list::Item **)&m_result;
  free_list(m_first_active_thread);
 }
-
-#endif /*HAVE_SPATIAL*/
-
diff --git a/sql/handler.cc b/sql/handler.cc
@@ -2160,10 +2160,8 @@ commit_one_phase_2(THD *thd, bool all, THD_TRANS *trans, bool is_real_trans)
  trans->no_2pc=0;
  if (all)
  {
-#ifdef HAVE_QUERY_CACHE
  if (thd->transaction->changed_tables)
  query_cache.invalidate(thd, thd->transaction->changed_tables);
-#endif
  }
  }
 

diff --git a/sql/handler.h b/sql/handler.h
@@ -21,10 +21,6 @@
 
 /* Definitions for parameters to do with handler-routines */
 
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
 #include "sql_const.h"
 #include "sql_basic_types.h"
 #include "mysqld.h" /* server_id */

diff --git a/sql/hash_filo.cc b/sql/hash_filo.cc
@@ -19,10 +19,6 @@
 ** to usage.
 */
 
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
 #include "mariadb.h"
 #include "sql_priv.h"
 #include "hash_filo.h"

diff --git a/sql/hash_filo.h b/sql/hash_filo.h
@@ -22,10 +22,6 @@
 #ifndef HASH_FILO_H
 #define HASH_FILO_H
 
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class interface */
-#endif
-
 #include "hash.h" /* my_hash_get_key, my_hash_free_key, HASH */
 #include "m_string.h" /* bzero */
 #include "mysqld.h" /* key_hash_filo_lock */

diff --git a/sql/item.cc b/sql/item.cc
@@ -15,10 +15,6 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
 
-
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
 #include "mariadb.h" /* NO_EMBEDDED_ACCESS_CHECKS */
 #include "sql_priv.h"
 #include <mysql.h>

diff --git a/sql/item.h b/sql/item.h
@@ -17,11 +17,6 @@
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
 
-
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
 #include "sql_priv.h" /* STRING_BUFFER_USUAL_SIZE */
 #include "unireg.h"
 #include "sql_const.h" /* RAND_TABLE_BIT, MAX_FIELD_NAME */

diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
@@ -22,10 +22,6 @@
  This file defines all compare functions
 */
 
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
 #include "mariadb.h"
 #include "sql_priv.h"
 #include <m_ctype.h>

diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
@@ -19,10 +19,6 @@
 
 /* compare and test functions */
 
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
 #include "item_func.h" /* Item_int_func, Item_bool_func */
 #include "item.h"
 #include "opt_rewrite_date_cmp.h"

diff --git a/sql/item_create.cc b/sql/item_create.cc
@@ -49,9 +49,7 @@ get_native_fct_hash_key(const uchar *buff, size_t *length,
 }
 
 
-#ifdef HAVE_SPATIAL
 extern Native_func_registry_array native_func_registry_array_geom;
-#endif
 
 
 /*
@@ -6622,20 +6620,16 @@ Native_functions_hash::find(THD *thd, const LEX_CSTRING &name) const
 int item_create_init()
 {
  size_t count= native_func_registry_array.count();
-#ifdef HAVE_SPATIAL
  count+= native_func_registry_array_geom.count();
-#endif
 
  if (native_functions_hash.init(count) ||
  native_functions_hash.append(native_func_registry_array.elements(),
  native_func_registry_array.count()))
  return true;
 
-#ifdef HAVE_SPATIAL
  if (native_functions_hash.append(native_func_registry_array_geom.elements(),
  native_func_registry_array_geom.count()))
  return true;
-#endif
 
  count+= oracle_func_registry_array.count();
 
@@ -6644,11 +6638,9 @@ int item_create_init()
  native_func_registry_array.count()))
  return true;
 
-#ifdef HAVE_SPATIAL
  if (native_functions_hash_oracle.append(native_func_registry_array_geom.elements(),
  native_func_registry_array_geom.count()))
  return true;
-#endif
 
  return 
  native_functions_hash_oracle.replace(oracle_func_registry_array.elements(),

diff --git a/sql/item_func.cc b/sql/item_func.cc
@@ -21,10 +21,6 @@
  This file defines all numerical functions
 */
 
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
 #include "sql_plugin.h"
 #include "sql_priv.h"
 /*

diff --git a/sql/item_func.h b/sql/item_func.h
@@ -19,10 +19,6 @@
 
 /* Function items used by mysql */
 
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
 #ifdef HAVE_IEEEFP_H
 extern "C" /* Bug in BSDI include file */
 {

diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc
@@ -22,10 +22,6 @@
  This file defines all spatial functions
 */
 
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
 #include "mariadb.h"
 #include "sql_priv.h"
 /*
@@ -35,7 +31,6 @@
 */
 #include "sql_class.h" // THD, set_var.h: THD
 #include "set_var.h"
-#ifdef HAVE_SPATIAL
 #include <m_ctype.h>
 #include "opt_range.h"
 #include "item_geofunc.h"
@@ -4078,5 +4073,3 @@ static Native_func_registry func_array_geom[] =
 Native_func_registry_array
  native_func_registry_array_geom(func_array_geom,
  array_elements(func_array_geom));
-
-#endif /*HAVE_SPATIAL*/
diff --git a/sql/item_geofunc.h b/sql/item_geofunc.h
@@ -20,12 +20,6 @@
 
 /* This file defines all spatial functions */
 
-#ifdef HAVE_SPATIAL
-
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
 #include "sql_type_geom.h"
 #include "item.h"
 #include "gstream.h"
@@ -1279,10 +1273,4 @@ class Item_func_gis_debug: public Item_long_func
 #define GEOM_NEW(thd, obj_constructor) new (thd->mem_root) obj_constructor
 #define GEOM_TYPE(x) (x)
 
-#else /*HAVE_SPATIAL*/
-
-#define GEOM_NEW(thd, obj_constructor) NULL
-#define GEOM_TYPE(x) NULL
-
-#endif /*HAVE_SPATIAL*/
 #endif /* ITEM_GEOFUNC_INCLUDED */
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
@@ -27,10 +27,6 @@
  (This shouldn't be needed)
 */
 
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
 #include "mariadb.h" // HAVE_*
 
 #include "sql_priv.h"

diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h
@@ -21,10 +21,6 @@
 
 /* This file defines all string functions */
 
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
 extern size_t username_char_length;
 
 class Item_str_func :public Item_func

diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
@@ -25,10 +25,6 @@
  methods (sql_select.h/sql_select.cc)
 */
 
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
 #include "mariadb.h"
 #include "sql_priv.h"
 /*

diff --git a/sql/item_subselect.h b/sql/item_subselect.h
@@ -18,10 +18,6 @@
 
 /* subselect Item */
 
-#ifdef USE_PRAGMA_INTERFACE
-#pragma interface /* gcc class implementation */
-#endif
-
 #include <queues.h>
 
 class st_select_lex;

diff --git a/sql/item_sum.cc b/sql/item_sum.cc
@@ -22,10 +22,6 @@
  Sum functions (COUNT, MIN...)
 */
 
-#ifdef USE_PRAGMA_IMPLEMENTATION
-#pragma implementation // gcc: Class implementation
-#endif
-
 #include "mariadb.h"
 #include "sql_priv.h"
 #include "sql_select.h"