summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-03-30 15:57:08 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-03-30 15:57:08 +0300
commit35425cfc55b461176f3e1c60d0435595b772ff3a (patch)
tree1f756f34d34a42dbbe791e707f2f271ef1fb86bd
parentbdba1d46bbf08044274cbb5a94a6cb395485c0af (diff)
downloadmariadb-git-35425cfc55b461176f3e1c60d0435595b772ff3a.tar.gz
Cleanup: Remove some unused functions
-rw-r--r--sql/ha_partition.h6
-rw-r--r--sql/handler.cc189
-rw-r--r--sql/handler.h86
-rw-r--r--storage/federatedx/ha_federatedx.cc2
4 files changed, 4 insertions, 279 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h
index 2fccc37ec1f..3e481d9d67c 100644
--- a/sql/ha_partition.h
+++ b/sql/ha_partition.h
@@ -3,7 +3,7 @@
/*
Copyright (c) 2005, 2012, Oracle and/or its affiliates.
- Copyright (c) 2009, 2021, MariaDB Corporation.
+ Copyright (c) 2009, 2022, MariaDB Corporation.
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
@@ -793,10 +793,6 @@ public:
NOTE: This cannot be cached since it can depend on TRANSACTION ISOLATION
LEVEL which is dynamic, see bug#39084.
- HA_READ_RND_SAME:
- Not currently used. (Means that the handler supports the rnd_same() call)
- (MyISAM, HEAP)
-
HA_TABLE_SCAN_ON_INDEX:
Used to avoid scanning full tables on an index. If this flag is set then
the handler always has a primary key (hidden if not defined) and this
diff --git a/sql/handler.cc b/sql/handler.cc
index 87592beb5d3..8ac6375ed7c 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2016, Oracle and/or its affiliates.
- Copyright (c) 2009, 2018, MariaDB Corporation.
+ Copyright (c) 2009, 2022, MariaDB Corporation.
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
@@ -2531,11 +2531,6 @@ double handler::keyread_time(uint index, uint ranges, ha_rows rows)
len*rows/(stats.block_size+1)/TIME_FOR_COMPARE ;
}
-void **handler::ha_data(THD *thd) const
-{
- return thd_ha_data(thd, ht);
-}
-
THD *handler::ha_thd(void) const
{
DBUG_ASSERT(!table || !table->in_use || table->in_use == current_thd);
@@ -6271,17 +6266,6 @@ void handler::unlock_shared_ha_data()
mysql_mutex_unlock(&table_share->LOCK_ha_data);
}
-/** @brief
- Dummy function which accept information about log files which is not need
- by handlers
-*/
-void signal_log_not_needed(struct handlerton, char *log_file)
-{
- DBUG_ENTER("signal_log_not_needed");
- DBUG_PRINT("enter", ("logfile '%s'", log_file));
- DBUG_VOID_RETURN;
-}
-
void handler::set_lock_type(enum thr_lock_type lock)
{
table->reginfo.lock_type= lock;
@@ -6384,177 +6368,6 @@ void ha_fake_trx_id(THD *thd)
#endif /* WITH_WSREP */
-#ifdef TRANS_LOG_MGM_EXAMPLE_CODE
-/*
- Example of transaction log management functions based on assumption that logs
- placed into a directory
-*/
-#include <my_dir.h>
-#include <my_sys.h>
-int example_of_iterator_using_for_logs_cleanup(handlerton *hton)
-{
- void *buffer;
- int res= 1;
- struct handler_iterator iterator;
- struct handler_log_file_data data;
-
- if (!hton->create_iterator)
- return 1; /* iterator creator is not supported */
-
- if ((*hton->create_iterator)(hton, HA_TRANSACTLOG_ITERATOR, &iterator) !=
- HA_ITERATOR_OK)
- {
- /* error during creation of log iterator or iterator is not supported */
- return 1;
- }
- while((*iterator.next)(&iterator, (void*)&data) == 0)
- {
- printf("%s\n", data.filename.str);
- if (data.status == HA_LOG_STATUS_FREE &&
- mysql_file_delete(INSTRUMENT_ME,
- data.filename.str, MYF(MY_WME)))
- goto err;
- }
- res= 0;
-err:
- (*iterator.destroy)(&iterator);
- return res;
-}
-
-
-/*
- Here we should get info from handler where it save logs but here is
- just example, so we use constant.
- IMHO FN_ROOTDIR ("/") is safe enough for example, because nobody has
- rights on it except root and it consist of directories only at lest for
- *nix (sorry, can't find windows-safe solution here, but it is only example).
-*/
-#define fl_dir FN_ROOTDIR
-
-
-/** @brief
- Dummy function to return log status should be replaced by function which
- really detect the log status and check that the file is a log of this
- handler.
-*/
-enum log_status fl_get_log_status(char *log)
-{
- MY_STAT stat_buff;
- if (mysql_file_stat(INSTRUMENT_ME, log, &stat_buff, MYF(0)))
- return HA_LOG_STATUS_INUSE;
- return HA_LOG_STATUS_NOSUCHLOG;
-}
-
-
-struct fl_buff
-{
- LEX_STRING *names;
- enum log_status *statuses;
- uint32 entries;
- uint32 current;
-};
-
-
-int fl_log_iterator_next(struct handler_iterator *iterator,
- void *iterator_object)
-{
- struct fl_buff *buff= (struct fl_buff *)iterator->buffer;
- struct handler_log_file_data *data=
- (struct handler_log_file_data *) iterator_object;
- if (buff->current >= buff->entries)
- return 1;
- data->filename= buff->names[buff->current];
- data->status= buff->statuses[buff->current];
- buff->current++;
- return 0;
-}
-
-
-void fl_log_iterator_destroy(struct handler_iterator *iterator)
-{
- my_free(iterator->buffer);
-}
-
-
-/** @brief
- returns buffer, to be assigned in handler_iterator struct
-*/
-enum handler_create_iterator_result
-fl_log_iterator_buffer_init(struct handler_iterator *iterator)
-{
- MY_DIR *dirp;
- struct fl_buff *buff;
- char *name_ptr;
- uchar *ptr;
- FILEINFO *file;
- uint32 i;
-
- /* to be able to make my_free without crash in case of error */
- iterator->buffer= 0;
-
- if (!(dirp = my_dir(fl_dir, MYF(MY_THREAD_SPECIFIC))))
- {
- return HA_ITERATOR_ERROR;
- }
- if ((ptr= (uchar*)my_malloc(ALIGN_SIZE(sizeof(fl_buff)) +
- ((ALIGN_SIZE(sizeof(LEX_STRING)) +
- sizeof(enum log_status) +
- + FN_REFLEN + 1) *
- (uint) dirp->number_off_files),
- MYF(MY_THREAD_SPECIFIC))) == 0)
- {
- return HA_ITERATOR_ERROR;
- }
- buff= (struct fl_buff *)ptr;
- buff->entries= buff->current= 0;
- ptr= ptr + (ALIGN_SIZE(sizeof(fl_buff)));
- buff->names= (LEX_STRING*) (ptr);
- ptr= ptr + ((ALIGN_SIZE(sizeof(LEX_STRING)) *
- (uint) dirp->number_off_files));
- buff->statuses= (enum log_status *)(ptr);
- name_ptr= (char *)(ptr + (sizeof(enum log_status) *
- (uint) dirp->number_off_files));
- for (i=0 ; i < (uint) dirp->number_off_files ; i++)
- {
- enum log_status st;
- file= dirp->dir_entry + i;
- if ((file->name[0] == '.' &&
- ((file->name[1] == '.' && file->name[2] == '\0') ||
- file->name[1] == '\0')))
- continue;
- if ((st= fl_get_log_status(file->name)) == HA_LOG_STATUS_NOSUCHLOG)
- continue;
- name_ptr= strxnmov(buff->names[buff->entries].str= name_ptr,
- FN_REFLEN, fl_dir, file->name, NullS);
- buff->names[buff->entries].length= (name_ptr -
- buff->names[buff->entries].str);
- buff->statuses[buff->entries]= st;
- buff->entries++;
- }
-
- iterator->buffer= buff;
- iterator->next= &fl_log_iterator_next;
- iterator->destroy= &fl_log_iterator_destroy;
- my_dirend(dirp);
- return HA_ITERATOR_OK;
-}
-
-
-/* An example of a iterator creator */
-enum handler_create_iterator_result
-fl_create_iterator(enum handler_iterator_type type,
- struct handler_iterator *iterator)
-{
- switch(type) {
- case HA_TRANSACTLOG_ITERATOR:
- return fl_log_iterator_buffer_init(iterator);
- default:
- return HA_ITERATOR_UNSUPPORTED;
- }
-}
-#endif /*TRANS_LOG_MGM_EXAMPLE_CODE*/
-
-
bool HA_CREATE_INFO::check_conflicting_charset_declarations(CHARSET_INFO *cs)
{
if ((used_fields & HA_CREATE_USED_DEFAULT_CHARSET) &&
diff --git a/sql/handler.h b/sql/handler.h
index 27836f1735f..9bbe8e2fe5e 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -783,31 +783,6 @@ typedef bool (stat_print_fn)(THD *thd, const char *type, size_t type_len,
enum ha_stat_type { HA_ENGINE_STATUS, HA_ENGINE_LOGS, HA_ENGINE_MUTEX };
extern MYSQL_PLUGIN_IMPORT st_plugin_int *hton2plugin[MAX_HA];
-/* Transaction log maintains type definitions */
-enum log_status
-{
- HA_LOG_STATUS_FREE= 0, /* log is free and can be deleted */
- HA_LOG_STATUS_INUSE= 1, /* log can't be deleted because it is in use */
- HA_LOG_STATUS_NOSUCHLOG= 2 /* no such log (can't be returned by
- the log iterator status) */
-};
-/*
- Function for signaling that the log file changed its state from
- LOG_STATUS_INUSE to LOG_STATUS_FREE
-
- Now it do nothing, will be implemented as part of new transaction
- log management for engines.
- TODO: implement the function.
-*/
-void signal_log_not_needed(struct handlerton, char *log_file);
-/*
- Data of transaction log iterator.
-*/
-struct handler_log_file_data {
- LEX_STRING filename;
- enum log_status status;
-};
-
/*
Definitions for engine-specific table/field/index options in the CREATE TABLE.
@@ -922,46 +897,6 @@ typedef struct st_ha_create_table_option {
struct st_mysql_sys_var *var;
} ha_create_table_option;
-enum handler_iterator_type
-{
- /* request of transaction log iterator */
- HA_TRANSACTLOG_ITERATOR= 1
-};
-enum handler_create_iterator_result
-{
- HA_ITERATOR_OK, /* iterator created */
- HA_ITERATOR_UNSUPPORTED, /* such type of iterator is not supported */
- HA_ITERATOR_ERROR /* error during iterator creation */
-};
-
-/*
- Iterator structure. Can be used by handler/handlerton for different purposes.
-
- Iterator should be created in the way to point "before" the first object
- it iterate, so next() call move it to the first object or return !=0 if
- there is nothing to iterate through.
-*/
-struct handler_iterator {
- /*
- Moves iterator to next record and return 0 or return !=0
- if there is no records.
- iterator_object will be filled by this function if next() returns 0.
- Content of the iterator_object depend on iterator type.
- */
- int (*next)(struct handler_iterator *, void *iterator_object);
- /*
- Free resources allocated by iterator, after this call iterator
- is not usable.
- */
- void (*destroy)(struct handler_iterator *);
- /*
- Pointer to buffer for the iterator to use.
- Should be allocated by function which created the iterator and
- destroyed by freed by above "destroy" call
- */
- void *buffer;
-};
-
class handler;
class group_by_handler;
struct Query;
@@ -1223,22 +1158,6 @@ struct handlerton
const char *query, uint query_length,
const char *db, const char *table_name);
- /*
- Get log status.
- If log_status is null then the handler do not support transaction
- log information (i.e. log iterator can't be created).
- (see example of implementation in handler.cc, TRANS_LOG_MGM_EXAMPLE_CODE)
-
- */
- enum log_status (*get_log_status)(handlerton *hton, char *log);
-
- /*
- Iterators creator.
- Presence of the pointer should be checked before using
- */
- enum handler_create_iterator_result
- (*create_iterator)(handlerton *hton, enum handler_iterator_type type,
- struct handler_iterator *fill_this_in);
void (*abort_transaction)(handlerton *hton, THD *bf_thd,
THD *victim_thd, my_bool signal);
int (*set_checkpoint)(handlerton *hton, const XID* xid);
@@ -3291,15 +3210,13 @@ public:
inline int ha_read_first_row(uchar *buf, uint primary_key);
/**
- The following 3 function is only needed for tables that may be
+ The following 2 function is only needed for tables that may be
internal temporary tables during joins.
*/
virtual int remember_rnd_pos()
{ return HA_ERR_WRONG_COMMAND; }
virtual int restart_rnd_next(uchar *buf)
{ return HA_ERR_WRONG_COMMAND; }
- virtual int rnd_same(uchar *buf, uint inx)
- { return HA_ERR_WRONG_COMMAND; }
virtual ha_rows records_in_range(uint inx, key_range *min_key,
key_range *max_key)
@@ -3970,7 +3887,6 @@ public:
TABLE_SHARE* get_table_share() { return table_share; }
protected:
/* Service methods for use by storage engines. */
- void **ha_data(THD *) const;
THD *ha_thd(void) const;
/**
diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc
index 65947c730e0..80497ec4e76 100644
--- a/storage/federatedx/ha_federatedx.cc
+++ b/storage/federatedx/ha_federatedx.cc
@@ -1720,7 +1720,7 @@ ha_rows ha_federatedx::records_in_range(uint inx, key_range *start_key,
federatedx_txn *ha_federatedx::get_txn(THD *thd, bool no_create)
{
- federatedx_txn **txnp= (federatedx_txn **) ha_data(thd);
+ federatedx_txn **txnp= (federatedx_txn **) thd_ha_data(thd, ht);
if (!*txnp && !no_create)
*txnp= new federatedx_txn();
return *txnp;