|
52 | 52 | #include <signaldata/FsReadWriteReq.hpp> |
53 | 53 | #include <signaldata/FsRef.hpp> |
54 | 54 | #include <signaldata/GetTabInfo.hpp> |
55 | | -#include <signaldata/GetTableId.hpp> |
56 | 55 | #include <signaldata/HotSpareRep.hpp> |
57 | 56 | #include <signaldata/NFCompleteRep.hpp> |
58 | 57 | #include <signaldata/NodeFailRep.hpp> |
@@ -2225,7 +2224,6 @@ Dbdict::Dbdict(Block_context& ctx): |
2225 | 2224 | // Transit signals |
2226 | 2225 | addRecSignal(GSN_DUMP_STATE_ORD, &Dbdict::execDUMP_STATE_ORD); |
2227 | 2226 | addRecSignal(GSN_GET_TABINFOREQ, &Dbdict::execGET_TABINFOREQ); |
2228 | | - addRecSignal(GSN_GET_TABLEID_REQ, &Dbdict::execGET_TABLEDID_REQ); |
2229 | 2227 | addRecSignal(GSN_GET_TABINFOREF, &Dbdict::execGET_TABINFOREF); |
2230 | 2228 | addRecSignal(GSN_GET_TABINFO_CONF, &Dbdict::execGET_TABINFO_CONF); |
2231 | 2229 | addRecSignal(GSN_CONTINUEB, &Dbdict::execCONTINUEB); |
@@ -10755,66 +10753,6 @@ Dbdict::execALTER_TABLE_REF(Signal* signal) |
10755 | 10753 | /* ---------------------------------------------------------------- */ |
10756 | 10754 | /* **************************************************************** */ |
10757 | 10755 |
|
10758 | | -void Dbdict::execGET_TABLEDID_REQ(Signal * signal) |
10759 | | -{ |
10760 | | - jamEntry(); |
10761 | | - ndbrequire(signal->getNoOfSections() == 1); |
10762 | | - GetTableIdReq const * req = (GetTableIdReq *)signal->getDataPtr(); |
10763 | | - Uint32 senderData = req->senderData; |
10764 | | - Uint32 senderRef = req->senderRef; |
10765 | | - Uint32 len = req->len; |
10766 | | - |
10767 | | - if(len>PATH_MAX) |
10768 | | - { |
10769 | | - jam(); |
10770 | | - sendGET_TABLEID_REF((Signal*)signal, |
10771 | | - (GetTableIdReq *)req, |
10772 | | - GetTableIdRef::TableNameTooLong); |
10773 | | - return; |
10774 | | - } |
10775 | | - |
10776 | | - char tableName[PATH_MAX]; |
10777 | | - SectionHandle handle(this, signal); |
10778 | | - SegmentedSectionPtr ssPtr; |
10779 | | - handle.getSection(ssPtr,GetTableIdReq::TABLE_NAME); |
10780 | | - copy((Uint32*)tableName, ssPtr); |
10781 | | - releaseSections(handle); |
10782 | | - |
10783 | | - DictObject * obj_ptr_p = get_object(tableName, len); |
10784 | | - if(obj_ptr_p == 0 || !DictTabInfo::isTable(obj_ptr_p->m_type)){ |
10785 | | - jam(); |
10786 | | - sendGET_TABLEID_REF(signal, |
10787 | | - (GetTableIdReq *)req, |
10788 | | - GetTableIdRef::TableNotDefined); |
10789 | | - return; |
10790 | | - } |
10791 | | - |
10792 | | - TableRecordPtr tablePtr; |
10793 | | - c_tableRecordPool_.getPtr(tablePtr, obj_ptr_p->m_object_ptr_i); |
10794 | | - |
10795 | | - GetTableIdConf * conf = (GetTableIdConf *)req; |
10796 | | - conf->tableId = tablePtr.p->tableId; |
10797 | | - conf->schemaVersion = tablePtr.p->tableVersion; |
10798 | | - conf->senderData = senderData; |
10799 | | - sendSignal(senderRef, GSN_GET_TABLEID_CONF, signal, |
10800 | | - GetTableIdConf::SignalLength, JBB); |
10801 | | -} |
10802 | | - |
10803 | | - |
10804 | | -void Dbdict::sendGET_TABLEID_REF(Signal* signal, |
10805 | | - GetTableIdReq * req, |
10806 | | - GetTableIdRef::ErrorCode errorCode) |
10807 | | -{ |
10808 | | - GetTableIdRef * const ref = (GetTableIdRef *)req; |
10809 | | - /** |
10810 | | - * The format of GetTabInfo Req/Ref is the same |
10811 | | - */ |
10812 | | - BlockReference retRef = req->senderRef; |
10813 | | - ref->err = errorCode; |
10814 | | - sendSignal(retRef, GSN_GET_TABLEID_REF, signal, |
10815 | | - GetTableIdRef::SignalLength, JBB); |
10816 | | -} |
10817 | | - |
10818 | 10756 | /* ---------------------------------------------------------------- */ |
10819 | 10757 | // Get a full table description. |
10820 | 10758 | /* ---------------------------------------------------------------- */ |
|
0 commit comments