Merge perch.ndb.mysql.com:/home/jonas/src/51-work (bff6df92) · Commits · Software / OSDI20 Artifacts / mariadb

storage/ndb/include/kernel/signaldata/DropFilegroup.hpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -150,6 +150,7 @@ struct DropFileRef {
		enum ErrorCode {
		NoError = 0,
		Busy = 701,
		NotMaster = 702,
		NoSuchFile = 766,
		DropUndoFileNotSupported = 769,
		InvalidSchemaObjectVersion = 774

storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp

+74 −9

Original line number	Diff line number	Diff line
		@@ -13396,6 +13396,24 @@ Dbdict::execCREATE_FILE_REQ(Signal* signal){
		Uint32 requestInfo = req->requestInfo;

		do {
		if(getOwnNodeId() != c_masterNodeId){
		jam();
		ref->errorCode = CreateFileRef::NotMaster;
		ref->status = 0;
		ref->errorKey = 0;
		ref->errorLine = __LINE__;
		break;
		}

		if (c_blockState != BS_IDLE){
		jam();
		ref->errorCode = CreateFileRef::Busy;
		ref->status = 0;
		ref->errorKey = 0;
		ref->errorLine = __LINE__;
		break;
		}

		Ptr<SchemaTransaction> trans_ptr;
		if (! c_Trans.seize(trans_ptr)){
		ref->errorCode = CreateFileRef::Busy;
		@@ -13455,6 +13473,9 @@ Dbdict::execCREATE_FILE_REQ(Signal* signal){
		tmp.init<CreateObjRef>(rg, GSN_CREATE_OBJ_REF, trans_key);
		sendSignal(rg, GSN_CREATE_OBJ_REQ, signal,
		CreateObjReq::SignalLength, JBB);

		c_blockState = BS_CREATE_TAB;

		return;
		} while(0);

		@@ -13480,26 +13501,26 @@ Dbdict::execCREATE_FILEGROUP_REQ(Signal* signal){
		Uint32 type = req->objType;

		do {
		Ptr<SchemaTransaction> trans_ptr;
		if (! c_Trans.seize(trans_ptr)){
		ref->errorCode = CreateFilegroupRef::Busy;
		if(getOwnNodeId() != c_masterNodeId){
		jam();
		ref->errorCode = CreateFilegroupRef::NotMaster;
		ref->status = 0;
		ref->errorKey = 0;
		ref->errorLine = __LINE__;
		break;
		}

		if(getOwnNodeId() != c_masterNodeId){
		if (c_blockState != BS_IDLE){
		jam();
		ref->errorCode = CreateFilegroupRef::NotMaster;
		ref->errorCode = CreateFilegroupRef::Busy;
		ref->status = 0;
		ref->errorKey = 0;
		ref->errorLine = __LINE__;
		break;
		}

		if (c_blockState != BS_IDLE){
		jam();
		Ptr<SchemaTransaction> trans_ptr;
		if (! c_Trans.seize(trans_ptr)){
		ref->errorCode = CreateFilegroupRef::Busy;
		ref->status = 0;
		ref->errorKey = 0;
		@@ -13554,6 +13575,9 @@ Dbdict::execCREATE_FILEGROUP_REQ(Signal* signal){
		tmp.init<CreateObjRef>(rg, GSN_CREATE_OBJ_REF, trans_key);
		sendSignal(rg, GSN_CREATE_OBJ_REQ, signal,
		CreateObjReq::SignalLength, JBB);

		c_blockState = BS_CREATE_TAB;

		return;
		} while(0);

		@@ -13581,6 +13605,22 @@ Dbdict::execDROP_FILE_REQ(Signal* signal)
		Uint32 version = req->file_version;

		do {
		if(getOwnNodeId() != c_masterNodeId){
		jam();
		ref->errorCode = DropFileRef::NotMaster;
		ref->errorKey = 0;
		ref->errorLine = __LINE__;
		break;
		}

		if (c_blockState != BS_IDLE){
		jam();
		ref->errorCode = DropFileRef::Busy;
		ref->errorKey = 0;
		ref->errorLine = __LINE__;
		break;
		}

		Ptr<File> file_ptr;
		if (!c_file_hash.find(file_ptr, objId))
		{
		@@ -13636,6 +13676,9 @@ Dbdict::execDROP_FILE_REQ(Signal* signal)
		tmp.init<CreateObjRef>(rg, GSN_DROP_OBJ_REF, trans_key);
		sendSignal(rg, GSN_DROP_OBJ_REQ, signal,
		DropObjReq::SignalLength, JBB);

		c_blockState = BS_CREATE_TAB;

		return;
		} while(0);

		@@ -13663,6 +13706,22 @@ Dbdict::execDROP_FILEGROUP_REQ(Signal* signal)
		Uint32 version = req->filegroup_version;

		do {
		if(getOwnNodeId() != c_masterNodeId){
		jam();
		ref->errorCode = DropFilegroupRef::NotMaster;
		ref->errorKey = 0;
		ref->errorLine = __LINE__;
		break;
		}

		if (c_blockState != BS_IDLE){
		jam();
		ref->errorCode = DropFilegroupRef::Busy;
		ref->errorKey = 0;
		ref->errorLine = __LINE__;
		break;
		}

		Ptr<Filegroup> filegroup_ptr;
		if (!c_filegroup_hash.find(filegroup_ptr, objId))
		{
		@@ -13718,6 +13777,9 @@ Dbdict::execDROP_FILEGROUP_REQ(Signal* signal)
		tmp.init<CreateObjRef>(rg, GSN_DROP_OBJ_REF, trans_key);
		sendSignal(rg, GSN_DROP_OBJ_REQ, signal,
		DropObjReq::SignalLength, JBB);

		c_blockState = BS_CREATE_TAB;

		return;
		} while(0);

		@@ -13892,6 +13954,7 @@ Dbdict::trans_commit_complete_done(Signal* signal,
		//@todo check api failed
		sendSignal(trans_ptr.p->m_senderRef, GSN_CREATE_FILEGROUP_CONF, signal,
		CreateFilegroupConf::SignalLength, JBB);

		break;
		}
		case GSN_CREATE_FILE_REQ:{
		@@ -13935,6 +13998,7 @@ Dbdict::trans_commit_complete_done(Signal* signal,
		}

		c_Trans.release(trans_ptr);
		ndbrequire(c_blockState == BS_CREATE_TAB);
		c_blockState = BS_IDLE;
		return;
		}
		@@ -14047,6 +14111,7 @@ Dbdict::trans_abort_complete_done(Signal* signal,
		}

		c_Trans.release(trans_ptr);
		ndbrequire(c_blockState == BS_CREATE_TAB);
		c_blockState = BS_IDLE;
		return;
		}

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -170,7 +170,6 @@ void Dbtup::execTUP_ABORTREQ(Signal* signal)
		/**
		* Aborting last operation that performed ALLOC
		*/
		ndbout_c("clearing ALLOC");
		tuple_ptr->m_header_bits &= ~(Uint32)Tuple_header::ALLOC;
		tuple_ptr->m_header_bits \|= Tuple_header::FREED;
		}

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

+29 −4

Original line number	Diff line number	Diff line
		@@ -473,13 +473,16 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
		ptrCheckGuard(regTabPtr, no_of_tablerec, tablerec);

		PagePtr page;
		Tuple_header* tuple_ptr= 0;
		Tuple_header* tuple_ptr= (Tuple_header*)
		get_ptr(&page, &regOperPtr.p->m_tuple_location, regTabPtr.p);

		bool get_page = false;
		if(regOperPtr.p->op_struct.m_load_diskpage_on_commit)
		{
		Page_cache_client::Request req;
		ndbassert(regOperPtr.p->is_first_operation() &&
		regOperPtr.p->is_last_operation());

		Page_cache_client::Request req;
		/**
		* Check for page
		*/
		@@ -490,15 +493,33 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)

		memcpy(&req.m_page,
		tmp->get_disk_ref_ptr(regTabPtr.p), sizeof(Local_key));

		if (unlikely(regOperPtr.p->op_struct.op_type == ZDELETE &&
		tmp->m_header_bits & Tuple_header::DISK_ALLOC))
		{
		jam();
		/**
		* Insert+Delete
		*/
		regOperPtr.p->op_struct.m_load_diskpage_on_commit = 0;
		regOperPtr.p->op_struct.m_wait_log_buffer = 0;
		disk_page_abort_prealloc(signal, regFragPtr.p,
		&req.m_page, req.m_page.m_page_idx);

		c_lgman->free_log_space(regFragPtr.p->m_logfile_group_id,
		regOperPtr.p->m_undo_buffer_space);
		ndbout_c("insert+delete");
		goto skip_disk;
		}
		}
		else
		{
		// initial delete
		ndbassert(regOperPtr.p->op_struct.op_type == ZDELETE);
		tuple_ptr= (Tuple_header*)
		get_ptr(&page, &regOperPtr.p->m_tuple_location, regTabPtr.p);
		memcpy(&req.m_page,
		tuple_ptr->get_disk_ref_ptr(regTabPtr.p), sizeof(Local_key));

		ndbassert(tuple_ptr->m_header_bits & Tuple_header::DISK_PART);
		}
		req.m_callback.m_callbackData= regOperPtr.i;
		req.m_callback.m_callbackFunction =
		@@ -522,6 +543,7 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
		ndbrequire("NOT YET IMPLEMENTED" == 0);
		break;
		}
		get_page = true;
		disk_page_set_dirty((Ptr<Page>)&m_pgman.m_ptr);
		regOperPtr.p->m_commit_disk_callback_page= res;
		regOperPtr.p->op_struct.m_load_diskpage_on_commit= 0;
		@@ -555,6 +577,7 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
		tuple_ptr = (Tuple_header*)
		get_ptr(&page, &regOperPtr.p->m_tuple_location,regTabPtr.p);
		}
		skip_disk:
		req_struct.m_tuple_ptr = tuple_ptr;

		if(get_tuple_state(regOperPtr.p) == TUPLE_PREPARED)
		@@ -599,6 +622,8 @@ void Dbtup::execTUP_COMMITREQ(Signal* signal)
		else
		{
		removeActiveOpList(regOperPtr.p, tuple_ptr);
		if (get_page)
		ndbassert(tuple_ptr->m_header_bits & Tuple_header::DISK_PART);
		dealloc_tuple(signal, gci, page.p, tuple_ptr,
		regOperPtr.p, regFragPtr.p, regTabPtr.p);
		}

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -1053,6 +1053,7 @@ Dbtup::disk_page_abort_prealloc_callback(Signal* signal,
		Ptr<Fragrecord> fragPtr;
		getFragmentrec(fragPtr, pagePtr.p->m_fragment_id, tabPtr.p);

		disk_page_set_dirty(pagePtr);
		disk_page_abort_prealloc_callback_1(signal, fragPtr.p, pagePtr, sz);
		}

		@@ -1074,6 +1075,13 @@ Dbtup::disk_page_abort_prealloc_callback_1(Signal* signal,
		ddassert(alloc.calc_page_free_bits(free - used) == old_idx);
		Uint32 new_idx = alloc.calc_page_free_bits(free - used + sz);

		#ifdef VM_TRACE
		Local_key key;
		key.m_page_no = pagePtr.p->m_page_no;
		key.m_file_no = pagePtr.p->m_file_no;
		ndbout << "disk_page_abort_prealloc_callback_1" << key << endl;
		#endif

		Ptr<Extent_info> extentPtr;
		c_extent_pool.getPtr(extentPtr, ext);
		if (old_idx != new_idx)