1 files changed, 11 insertions, 36 deletions

diff --git a/storage/innobase/dict/dict0defrag_bg.cc b/storage/innobase/dict/dict0defrag_bg.cc
index 949bbbc0d74..69038d4cb77 100644
--- a/storage/innobase/dict/dict0defrag_bg.cc
+++ b/storage/innobase/dict/dict0defrag_bg.cc
@@ -39,27 +39,13 @@ static ib_mutex_t		defrag_pool_mutex;
 static mysql_pfs_key_t		defrag_pool_mutex_key;
 #endif
 
-/** Indices whose defrag stats need to be saved to persistent storage.*/
-struct defrag_pool_item_t {
-	table_id_t	table_id;
-	index_id_t	index_id;
-};
-
-/** Allocator type, used by std::vector */
-typedef ut_allocator<defrag_pool_item_t>
-	defrag_pool_allocator_t;
-
-/** The multitude of tables to be defragmented- an STL vector */
-typedef std::vector<defrag_pool_item_t, defrag_pool_allocator_t>
-	defrag_pool_t;
-
 /** Iterator type for iterating over the elements of objects of type
 defrag_pool_t. */
 typedef defrag_pool_t::iterator		defrag_pool_iterator_t;
 
 /** Pool where we store information on which tables are to be processed
 by background defragmentation. */
-static defrag_pool_t*			defrag_pool;
+defrag_pool_t			defrag_pool;
 
 extern bool dict_stats_start_shutdown;
 
@@ -70,14 +56,6 @@ dict_defrag_pool_init(void)
 /*=======================*/
 {
 	ut_ad(!srv_read_only_mode);
-	/* JAN: TODO: MySQL 5.7 PSI
-	const PSI_memory_key	key2 = mem_key_dict_defrag_pool_t;
-
-	defrag_pool = UT_NEW(defrag_pool_t(defrag_pool_allocator_t(key2)), key2);
-
-	recalc_pool->reserve(RECALC_POOL_INITIAL_SLOTS);
-	*/
-	defrag_pool = new std::vector<defrag_pool_item_t, defrag_pool_allocator_t>();
 
 	/* We choose SYNC_STATS_DEFRAG to be below SYNC_FSP_PAGE. */
 	mutex_create(LATCH_ID_DEFRAGMENT_MUTEX, &defrag_pool_mutex);
@@ -92,10 +70,7 @@ dict_defrag_pool_deinit(void)
 {
 	ut_ad(!srv_read_only_mode);
 
-	defrag_pool->clear();
 	mutex_free(&defrag_pool_mutex);
-
-	UT_DELETE(defrag_pool);
 }
 
 /*****************************************************************//**
@@ -115,16 +90,16 @@ dict_stats_defrag_pool_get(
 
 	mutex_enter(&defrag_pool_mutex);
 
-	if (defrag_pool->empty()) {
+	if (defrag_pool.empty()) {
 		mutex_exit(&defrag_pool_mutex);
 		return(false);
 	}
 
-	defrag_pool_item_t& item = defrag_pool->back();
+	defrag_pool_item_t& item = defrag_pool.back();
 	*table_id = item.table_id;
 	*index_id = item.index_id;
 
-	defrag_pool->pop_back();
+	defrag_pool.pop_back();
 
 	mutex_exit(&defrag_pool_mutex);
 
@@ -149,8 +124,8 @@ dict_stats_defrag_pool_add(
 	mutex_enter(&defrag_pool_mutex);
 
 	/* quit if already in the list */
-	for (defrag_pool_iterator_t iter = defrag_pool->begin();
-	     iter != defrag_pool->end();
+	for (defrag_pool_iterator_t iter = defrag_pool.begin();
+	     iter != defrag_pool.end();
 	     ++iter) {
 		if ((*iter).table_id == index->table->id
 		    && (*iter).index_id == index->id) {
@@ -161,7 +136,7 @@ dict_stats_defrag_pool_add(
 
 	item.table_id = index->table->id;
 	item.index_id = index->id;
-	defrag_pool->push_back(item);
+	defrag_pool.push_back(item);
 
 	mutex_exit(&defrag_pool_mutex);
 
@@ -183,14 +158,14 @@ dict_stats_defrag_pool_del(
 
 	mutex_enter(&defrag_pool_mutex);
 
-	defrag_pool_iterator_t iter = defrag_pool->begin();
-	while (iter != defrag_pool->end()) {
+	defrag_pool_iterator_t iter = defrag_pool.begin();
+	while (iter != defrag_pool.end()) {
 		if ((table && (*iter).table_id == table->id)
 		    || (index
 			&& (*iter).table_id == index->table->id
 			&& (*iter).index_id == index->id)) {
 			/* erase() invalidates the iterator */
-			iter = defrag_pool->erase(iter);
+			iter = defrag_pool.erase(iter);
 			if (index)
 				break;
 		} else {
@@ -252,7 +227,7 @@ void
 dict_defrag_process_entries_from_defrag_pool()
 /*==========================================*/
 {
-	while (defrag_pool->size() && !dict_stats_start_shutdown) {
+	while (defrag_pool.size() && !dict_stats_start_shutdown) {
 		dict_stats_process_entry_from_defrag_pool();
 	}
 }