summaryrefslogtreecommitdiff
path: root/storage/tokudb/ha_tokudb.h
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2017-08-02 12:17:21 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2017-08-03 11:48:44 +0300
commitb1a2031ff96f132bf065d6b41593a842478a6659 (patch)
tree572f7607c4660f555a9e3da9c431f9c7c68bfae3 /storage/tokudb/ha_tokudb.h
parent97c53cdfcc01a4f47d2757f5ca0b040f0e5a30e5 (diff)
downloadmariadb-git-b1a2031ff96f132bf065d6b41593a842478a6659.tar.gz
5.6.36-82.1
Diffstat (limited to 'storage/tokudb/ha_tokudb.h')
-rw-r--r--storage/tokudb/ha_tokudb.h41
1 files changed, 30 insertions, 11 deletions
diff --git a/storage/tokudb/ha_tokudb.h b/storage/tokudb/ha_tokudb.h
index a25e322568d..f90f4130b37 100644
--- a/storage/tokudb/ha_tokudb.h
+++ b/storage/tokudb/ha_tokudb.h
@@ -799,6 +799,19 @@ public:
#else
void start_bulk_insert(ha_rows rows);
#endif
+ static int bulk_insert_poll(void* extra, float progress);
+ static void loader_add_index_err(DB* db,
+ int i,
+ int err,
+ DBT* key,
+ DBT* val,
+ void* error_extra);
+ static void loader_dup(DB* db,
+ int i,
+ int err,
+ DBT* key,
+ DBT* val,
+ void* error_extra);
int end_bulk_insert();
int end_bulk_insert(bool abort);
@@ -938,17 +951,23 @@ public:
#endif
private:
- int tokudb_add_index(
- TABLE *table_arg,
- KEY *key_info,
- uint num_of_keys,
- DB_TXN* txn,
- bool* inc_num_DBs,
- bool* modified_DB
- );
- void restore_add_index(TABLE* table_arg, uint num_of_keys, bool incremented_numDBs, bool modified_DBs);
- int drop_indexes(TABLE *table_arg, uint *key_num, uint num_of_keys, KEY *key_info, DB_TXN* txn);
- void restore_drop_indexes(TABLE *table_arg, uint *key_num, uint num_of_keys);
+ int tokudb_add_index(TABLE* table_arg,
+ KEY* key_info,
+ uint num_of_keys,
+ DB_TXN* txn,
+ bool* inc_num_DBs,
+ bool* modified_DB);
+ static int tokudb_add_index_poll(void *extra, float progress);
+ void restore_add_index(TABLE* table_arg,
+ uint num_of_keys,
+ bool incremented_numDBs,
+ bool modified_DBs);
+ int drop_indexes(TABLE* table_arg,
+ uint* key_num,
+ uint num_of_keys,
+ KEY* key_info,
+ DB_TXN* txn);
+ void restore_drop_indexes(TABLE* table_arg, uint* key_num, uint num_of_keys);
public:
// delete all rows from the table