ndb - jamify (better) DbtupDiskAlloc (9763d0d0) · Commits · Software / OSDI20 Artifacts / mariadb

storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,7 @@ inline const Uint32* ALIGN_WORD(const void* ptr)
		// DbtupDebug.cpp 30000
		// DbtupVarAlloc.cpp 32000
		// DbtupScan.cpp 33000
		// DbtupDiskAlloc.cpp 35000
		//------------------------------------------------------------------

		/*

storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp

+50 −9

Original line number	Diff line number	Diff line
		@@ -108,7 +108,10 @@ void Dbtup::removeActiveOpList(Operationrec* const regOperPtr,
		* Release copy tuple
		*/
		if(!regOperPtr->m_copy_tuple_location.isNull())
		{
		ljam();
		c_undo_buffer.free_copy_tuple(&regOperPtr->m_copy_tuple_location);
		}

		if (regOperPtr->op_struct.in_active_list) {
		regOperPtr->op_struct.in_active_list= false;
		@@ -172,6 +175,7 @@ Dbtup::dealloc_tuple(Signal* signal,
		Uint32 extra_bits = Tuple_header::FREED;
		if (bits & Tuple_header::DISK_PART)
		{
		ljam();
		Local_key disk;
		memcpy(&disk, ptr->get_disk_ref_ptr(regTabPtr), sizeof(disk));
		PagePtr tmpptr;
		@@ -184,6 +188,7 @@ Dbtup::dealloc_tuple(Signal* signal,
		if (! (bits & (Tuple_header::LCP_SKIP \| Tuple_header::ALLOC)) &&
		lcpScan_ptr_i != RNIL)
		{
		ljam();
		ScanOpPtr scanOp;
		c_scanOpPool.getPtr(scanOp, lcpScan_ptr_i);
		Local_key rowid = regOperPtr->m_tuple_location;
		@@ -191,6 +196,7 @@ Dbtup::dealloc_tuple(Signal* signal,
		rowid.m_page_no = page->frag_page_id;
		if (rowid > scanpos)
		{
		ljam();
		extra_bits = Tuple_header::LCP_KEEP; // Note REMOVE FREE
		ptr->m_operation_ptr_i = lcp_keep_list;
		regFragPtr->m_lcp_keep_list = rowid.ref();
		@@ -231,11 +237,13 @@ Dbtup::commit_operation(Signal* signal,
		Uint32 mm_vars= regTabPtr->m_attributes[MM].m_no_of_varsize;
		if(mm_vars == 0)
		{
		ljam();
		memcpy(tuple_ptr, copy, 4*fixsize);
		disk_ptr= (Tuple_header)(((Uint32)copy)+fixsize);
		}
		else
		{
		ljam();
		/**
		* Var_part_ref is only stored in allocated tuple
		* so memcpy from copy, will over write it...
		@@ -260,6 +268,7 @@ Dbtup::commit_operation(Signal* signal,

		if(copy_bits & Tuple_header::MM_SHRINK)
		{
		ljam();
		vpagePtrP->shrink_entry(tmp.m_page_idx, (sz + 3) >> 2);
		update_free_page_list(regFragPtr, vpagePtr);
		}
		@@ -270,6 +279,7 @@ Dbtup::commit_operation(Signal* signal,
		if (regTabPtr->m_no_of_disk_attributes &&
		(copy_bits & Tuple_header::DISK_INLINE))
		{
		ljam();
		Local_key key;
		memcpy(&key, copy->get_disk_ref_ptr(regTabPtr), sizeof(Local_key));
		Uint32 logfile_group_id= regFragPtr->m_logfile_group_id;
		@@ -280,22 +290,26 @@ Dbtup::commit_operation(Signal* signal,
		Uint32 sz, *dst;
		if(copy_bits & Tuple_header::DISK_ALLOC)
		{
		ljam();
		disk_page_alloc(signal, regTabPtr, regFragPtr, &key, diskPagePtr, gci);
		}

		if(regTabPtr->m_attributes[DD].m_no_of_varsize == 0)
		{
		ljam();
		sz= regTabPtr->m_offsets[DD].m_fix_header_size;
		dst= ((Fix_page*)diskPagePtr.p)->get_ptr(key.m_page_idx, sz);
		}
		else
		{
		ljam();
		dst= ((Var_page*)diskPagePtr.p)->get_ptr(key.m_page_idx);
		sz= ((Var_page*)diskPagePtr.p)->get_entry_len(key.m_page_idx);
		}

		if(! (copy_bits & Tuple_header::DISK_ALLOC))
		{
		ljam();
		disk_page_undo_update(diskPagePtr.p,
		&key, dst, sz, gci, logfile_group_id);
		}
		@@ -309,6 +323,7 @@ Dbtup::commit_operation(Signal* signal,

		if(lcpScan_ptr_i != RNIL && (bits & Tuple_header::ALLOC))
		{
		ljam();
		ScanOpPtr scanOp;
		c_scanOpPool.getPtr(scanOp, lcpScan_ptr_i);
		Local_key rowid = regOperPtr->m_tuple_location;
		@@ -316,6 +331,7 @@ Dbtup::commit_operation(Signal* signal,
		rowid.m_page_no = pagePtr.p->frag_page_id;
		if(rowid > scanpos)
		{
		ljam();
		copy_bits \|= Tuple_header::LCP_SKIP;
		}
		}
		@@ -374,8 +390,11 @@ Dbtup::disk_page_commit_callback(Signal* signal,

		execTUP_COMMITREQ(signal);
		if(signal->theData[0] == 0)
		{
		ljam();
		c_lqh->tupcommit_conf_callback(signal, regOperPtr.p->userpointer);
		}
		}

		void
		Dbtup::disk_page_log_buffer_callback(Signal* signal,
		@@ -412,6 +431,7 @@ Dbtup::disk_page_log_buffer_callback(Signal* signal,
		void
		Dbtup::fix_commit_order(OperationrecPtr opPtr)
		{
		ljam();
		ndbassert(!opPtr.p->is_first_operation());
		OperationrecPtr firstPtr = opPtr;
		while(firstPtr.p->prevActiveOp != RNIL)
		@@ -437,8 +457,11 @@ Dbtup::fix_commit_order(OperationrecPtr opPtr)
		c_operation_pool.getPtr(seco)->prevActiveOp = opPtr.i;
		c_operation_pool.getPtr(prev)->nextActiveOp = firstPtr.i;
		if(next != RNIL)
		{
		ljam();
		c_operation_pool.getPtr(next)->prevActiveOp = firstPtr.i;
		}
		}

		/* ----------------------------------------------------------------- */
		/* --------------- COMMIT THIS PART OF A TRANSACTION --------------- */
		@@ -502,6 +525,7 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
		bool get_page = false;
		if(regOperPtr.p->op_struct.m_load_diskpage_on_commit)
		{
		ljam();
		Page_cache_client::Request req;
		ndbassert(regOperPtr.p->is_first_operation() &&
		regOperPtr.p->is_last_operation());
		@@ -511,6 +535,7 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
		*/
		if(!regOperPtr.p->m_copy_tuple_location.isNull())
		{
		ljam();
		Tuple_header* tmp= (Tuple_header*)
		c_undo_buffer.get_ptr(&regOperPtr.p->m_copy_tuple_location);

		@@ -520,7 +545,7 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
		if (unlikely(regOperPtr.p->op_struct.op_type == ZDELETE &&
		tmp->m_header_bits & Tuple_header::DISK_ALLOC))
		{
		jam();
		ljam();
		/**
		* Insert+Delete
		*/
		@@ -532,11 +557,13 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
		c_lgman->free_log_space(regFragPtr.p->m_logfile_group_id,
		regOperPtr.p->m_undo_buffer_space);
		ndbout_c("insert+delete");
		ljamEntry();
		goto skip_disk;
		}
		}
		else
		{
		ljam();
		// initial delete
		ndbassert(regOperPtr.p->op_struct.op_type == ZDELETE);
		memcpy(&req.m_page,
		@@ -560,11 +587,14 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
		/**
		* Timeslice
		*/
		ljam();
		signal->theData[0] = 1;
		return;
		case -1:
		ndbrequire("NOT YET IMPLEMENTED" == 0);
		break;
		default:
		ljam();
		}
		get_page = true;

		@@ -581,6 +611,7 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)

		if(regOperPtr.p->op_struct.m_wait_log_buffer)
		{
		ljam();
		ndbassert(regOperPtr.p->is_first_operation() &&
		regOperPtr.p->is_last_operation());

		@@ -592,18 +623,23 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)

		Logfile_client lgman(this, c_lgman, regFragPtr.p->m_logfile_group_id);
		int res= lgman.get_log_buffer(signal, sz, &cb);
		ljamEntry();
		switch(res){
		case 0:
		ljam();
		signal->theData[0] = 1;
		return;
		case -1:
		ndbrequire("NOT YET IMPLEMENTED" == 0);
		break;
		default:
		ljam();
		}
		}

		if(!tuple_ptr)
		{
		ljam();
		tuple_ptr = (Tuple_header*)
		get_ptr(&page, &regOperPtr.p->m_tuple_location,regTabPtr.p);
		}
		@@ -612,6 +648,7 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)

		if(get_tuple_state(regOperPtr.p) == TUPLE_PREPARED)
		{
		ljam();
		/**
		* Execute all tux triggers at first commit
		* since previous tuple is otherwise removed...
		@@ -637,6 +674,7 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)

		if(regOperPtr.p->is_last_operation())
		{
		ljam();
		/**
		* Perform "real" commit
		*/
		@@ -647,12 +685,14 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)

		if(regOperPtr.p->op_struct.op_type != ZDELETE)
		{
		ljam();
		commit_operation(signal, gci, tuple_ptr, page,
		regOperPtr.p, regFragPtr.p, regTabPtr.p);
		removeActiveOpList(regOperPtr.p, tuple_ptr);
		}
		else
		{
		ljam();
		removeActiveOpList(regOperPtr.p, tuple_ptr);
		if (get_page)
		ndbassert(tuple_ptr->m_header_bits & Tuple_header::DISK_PART);
		@@ -662,6 +702,7 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
		}
		else
		{
		ljam();
		removeActiveOpList(regOperPtr.p, tuple_ptr);
		}

storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp

+97 −58

File changed.

Preview size limit exceeded, changes collapsed.