Bug #25080442 PARTITIONED TABLES USE MORE MEMORY IN 5.7 THAN 5.6

Merge branch 'mysql-5.7' into mysql-trunk

Author: Aditya A

storage/innobase/handler/ha_innodb.cc

@@ -9078,7 +9078,9 @@ ha_innobase::index_end(void)
 {
 	DBUG_ENTER("index_end");
 
-	m_prebuilt->index->last_sel_cur->release();
+	if(m_prebuilt->index->last_sel_cur) {
+		m_prebuilt->index->last_sel_cur->release();
+	}
 
 	active_index = MAX_KEY;
 
@@ -13423,8 +13425,11 @@ ha_innobase::delete_table(
 
 	if (handler != NULL) {
 		for (dict_index_t* index = UT_LIST_GET_FIRST(handler->indexes);
-		     index != NULL;
+		     index != NULL && index->last_ins_cur;
 		     index = UT_LIST_GET_NEXT(indexes, index)) {
+			/* last_ins_cur and last_sel_cur are allocated
+			together,therfore only checking last_ins_cur
+			before releasing mtr */
 			index->last_ins_cur->release();
 			index->last_sel_cur->release();
 		}

storage/innobase/include/dict0dict.h

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2012, Facebook Inc.
 
 This program is free software; you can redistribute it and/or modify it under
@@ -1966,6 +1966,12 @@ uint32_t
 dict_sdi_get_copy_num(
 	table_id_t	table_id);
 
+/** Allocate memory for intrinsic cache elements in the index
+ * @param[in]      index   index object */
+UNIV_INLINE
+void
+dict_allocate_mem_intrinsic_cache(
+                dict_index_t*           index);
 #endif /* !UNIV_HOTBACKUP */
 
 #include "dict0dict.ic"

storage/innobase/include/dict0dict.ic

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
 
 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
@@ -1534,6 +1534,26 @@ dict_table_have_virtual_index(
 
 	return(false);
 }
+/** Allocate memory for intrinsic cache elements in the index
+@param[in]      index   index object */
+UNIV_INLINE
+void
+dict_allocate_mem_intrinsic_cache(
+                dict_index_t*           index)
+{
+
+        index->last_ins_cur =
+                static_cast<last_ops_cur_t*>(mem_heap_alloc(
+                        index->heap, sizeof(last_ops_cur_t)));
+
+        new (index->last_ins_cur) last_ops_cur_t();
+
+        index->last_sel_cur =
+                static_cast<last_ops_cur_t*>(mem_heap_alloc(
+                        index->heap, sizeof(last_ops_cur_t)));
+
+        new (index->last_sel_cur) last_ops_cur_t();
+}
 
 /** Generate a table_id from space id for SDI Index.
 @param[in]	space_id	InnoDB tablespace id

storage/innobase/include/dict0mem.h

@@ -919,10 +919,6 @@ class last_ops_cur_t
 system clustered index when there is no primary key. */
 const char innobase_index_reserve_name[] = "GEN_CLUST_INDEX";
 
-/* Estimated number of offsets in records (based on columns)
-to start with. */
-#define OFFS_IN_REC_NORMAL_SIZE		100
-
 /** Data structure for an index.  Most fields will be
 initialized to 0, NULL or FALSE in dict_mem_index_create(). */
 struct dict_index_t{

storage/innobase/include/dict0mem.ic

@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2015, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2017, Oracle and/or its affiliates. All Rights Reserved.
 
 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
@@ -72,33 +72,10 @@ dict_mem_fill_index_struct(
 	index->allow_duplicates = false;
 	index->nulls_equal = false;
 	index->disable_ahi = false;
-
+	index->last_ins_cur = nullptr;
+	index->last_sel_cur = nullptr;
 	new (&index->rec_cache) rec_cache_t();
 
-	if (heap != NULL) {
-		index->last_ins_cur =
-			static_cast<last_ops_cur_t*>(mem_heap_alloc(
-				heap, sizeof(last_ops_cur_t)));
-
-		new (index->last_ins_cur) last_ops_cur_t();
-
-		index->last_sel_cur =
-			static_cast<last_ops_cur_t*>(mem_heap_alloc(
-				heap, sizeof(last_ops_cur_t)));
-
-		new (index->last_sel_cur) last_ops_cur_t();
-
-		index->rec_cache.offsets =
-			static_cast<ulint*>(mem_heap_alloc(
-				heap, sizeof(ulint) * OFFS_IN_REC_NORMAL_SIZE));
-
-		index->rec_cache.sz_of_offsets = OFFS_IN_REC_NORMAL_SIZE;
-	} else {
-		index->last_ins_cur = NULL;
-		index->last_sel_cur = NULL;
-		index->rec_cache.offsets = NULL;
-	}
-
 #ifdef UNIV_DEBUG
 	index->magic_n = DICT_INDEX_MAGIC_N;
 #endif /* UNIV_DEBUG */

storage/innobase/rem/rec.h

@@ -150,7 +150,7 @@ significant bit denotes that the tail of a field is stored off-page. */
 
 /* Number of elements that should be initially allocated for the
 offsets[] array, first passed to rec_get_offsets() */
-#define REC_OFFS_NORMAL_SIZE	OFFS_IN_REC_NORMAL_SIZE
+#define REC_OFFS_NORMAL_SIZE	100
 #define REC_OFFS_SMALL_SIZE	10
 
 /* Get the base address of offsets.  The extra_size is stored at

storage/innobase/row/row0ins.cc

@@ -2749,7 +2749,9 @@ row_ins_clust_index_entry_low(
 		doesn't fit the provided slot then existing record is added
 		to free list and new record is inserted. This also means
 		cursor that we have cached for SELECT is now invalid. */
-		index->last_sel_cur->invalid = true;
+		if(index->last_sel_cur) {
+			index->last_sel_cur->invalid = true;
+		}
 
 		ut_ad(thr != NULL);
 		err = row_ins_clust_index_entry_by_modify(
@@ -3315,7 +3317,9 @@ row_ins_sec_index_entry_low(
 		is doesn't fit the provided slot then existing record is added
 		to free list and new record is inserted. This also means
 		cursor that we have cached for SELECT is now invalid. */
-		index->last_sel_cur->invalid = true;
+		if(index->last_sel_cur) {
+			index->last_sel_cur->invalid = true;
+		}
 
 		/* There is already an index entry with a long enough common
 		prefix, we must convert the insert into a modify of an
@@ -3448,6 +3452,10 @@ row_ins_clust_index_entry(
 
 	if (index->table->is_intrinsic()
 	    && dict_index_is_auto_gen_clust(index)) {
+		/* Check if the memory allocated for intrinsic cache*/
+		if(!index->last_ins_cur) {
+			dict_allocate_mem_intrinsic_cache(index);
+		}
 		err = row_ins_sorted_clust_index_entry(
 			BTR_MODIFY_LEAF, index, entry, n_ext, thr);
 	} else {
@@ -3468,6 +3476,9 @@ row_ins_clust_index_entry(
 	/* Try then pessimistic descent to the B-tree */
 	if (!index->table->is_intrinsic()) {
 		log_free_check();
+	} else if(!index->last_sel_cur) {
+		dict_allocate_mem_intrinsic_cache(index);
+		index->last_sel_cur->invalid = true;
 	} else {
 		index->last_sel_cur->invalid = true;
 	}
@@ -3555,6 +3566,9 @@ row_ins_sec_index_entry(
 
 		if (!index->table->is_intrinsic()) {
 			log_free_check();
+		} else if(!index->last_sel_cur) {
+			dict_allocate_mem_intrinsic_cache(index);
+			index->last_sel_cur->invalid = true;
 		} else {
 			index->last_sel_cur->invalid = true;
 		}

storage/innobase/row/row0mysql.cc

@@ -2276,7 +2276,9 @@ row_update_for_mysql_using_cursor(
 				node->upd_ext ? node->upd_ext->n_ext : 0,
 				false);
 			/* Commit the open mtr as we are processing UPDATE. */
-			index->last_ins_cur->release();
+			if (index->last_ins_cur) {
+				index->last_ins_cur->release();
+			}
 		} else {
 			err = row_ins_sec_index_entry(index, entry, thr, false);
 		}
@@ -2320,7 +2322,10 @@ row_del_upd_for_mysql_using_cursor(
 	to change. */
 	thr = que_fork_get_first_thr(prebuilt->upd_graph);
 	clust_index = prebuilt->table->first_index();
-	clust_index->last_ins_cur->release();
+
+	if(clust_index->last_ins_cur) {
+		clust_index->last_ins_cur->release();
+	}
 
 	/* Step-1: Select the appropriate cursor that will help build
 	the original row and updated row. */
@@ -2721,9 +2726,14 @@ row_delete_all_rows(
 	dict_table_t*	table)
 {
 	ut_ad(table->is_temporary());
+	dict_index_t*	index;
+
+	index = table->first_index();
 	/* Step-0: If there is cached insert position along with mtr
 	commit it before starting delete/update action. */
-	table->first_index()->last_ins_cur->release();
+	if (index->last_ins_cur) {
+		index->last_ins_cur->release();
+	}
 
 	bool			found;
 	const page_size_t	page_size(
@@ -2733,7 +2743,7 @@ row_delete_all_rows(
 	/* Step-1: Now truncate all the indexes and re-create them.
 	Note: This is ddl action even though delete all rows is
 	DML action. Any error during this action is ir-reversible. */
-	for (dict_index_t* index = UT_LIST_GET_FIRST(table->indexes);
+	for (index = UT_LIST_GET_FIRST(table->indexes);
 	     index != NULL;
 	     index = UT_LIST_GET_NEXT(indexes, index)) {
 

storage/innobase/row/row0sel.cc

@@ -4238,9 +4238,15 @@ row_search_no_mvcc(
 	ut_ad(index && pcur && search_tuple);
 
 	/* Step-0: Re-use the cached mtr. */
-	mtr_t*		mtr = &index->last_sel_cur->mtr;
+	mtr_t*		mtr;
 	dict_index_t*	clust_index = index->table->first_index();
 
+	if(!index->last_sel_cur) {
+		dict_allocate_mem_intrinsic_cache(index);
+	}
+
+	mtr = &index->last_sel_cur->mtr;
+
 	/* Step-1: Build the select graph. */
 	if (direction == 0 && prebuilt->sel_graph == NULL) {
 		row_prebuild_sel_graph(prebuilt);