Skip to content

Commit ea9b83d

Browse files
committed
Bug#32983249 REMOVES CODE RELATED TO UNUSED GET_TABLEID_* SIGNAL
Removes all the code related to GET_TABLEID_* signals since no supported version of cluster is currently using them. Change-Id: I5912ff3eb5fc3929c40f0d48cea3fd09056eef48
1 parent b78868b commit ea9b83d

File tree

7 files changed

+9
-186
lines changed

7 files changed

+9
-186
lines changed

storage/ndb/include/kernel/GlobalSignalNumbers.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2003, 2021, Oracle and/or its affiliates.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License, version 2.0,
@@ -76,9 +76,10 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES;
7676
#define GSN_GET_TABINFOREQ 24
7777
#define GSN_GET_TABINFO_CONF 190
7878

79-
#define GSN_GET_TABLEID_REQ 683
80-
#define GSN_GET_TABLEID_REF 684
81-
#define GSN_GET_TABLEID_CONF 685
79+
/* Signals removed from 8.0.27 */
80+
/* 683 used to be GET_TABLEID_REQ, no longer used */
81+
/* 684 used to be GET_TABLEID_REF, no longer used */
82+
/* 685 used to be GET_TABLEID_CONF, no longer used */
8283

8384
#define GSN_DIHNDBTAMPER 25
8485
#define GSN_NODE_FAILREP 26

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

Lines changed: 0 additions & 106 deletions
This file was deleted.

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

Lines changed: 0 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
#include <signaldata/FsReadWriteReq.hpp>
5353
#include <signaldata/FsRef.hpp>
5454
#include <signaldata/GetTabInfo.hpp>
55-
#include <signaldata/GetTableId.hpp>
5655
#include <signaldata/HotSpareRep.hpp>
5756
#include <signaldata/NFCompleteRep.hpp>
5857
#include <signaldata/NodeFailRep.hpp>
@@ -2225,7 +2224,6 @@ Dbdict::Dbdict(Block_context& ctx):
22252224
// Transit signals
22262225
addRecSignal(GSN_DUMP_STATE_ORD, &Dbdict::execDUMP_STATE_ORD);
22272226
addRecSignal(GSN_GET_TABINFOREQ, &Dbdict::execGET_TABINFOREQ);
2228-
addRecSignal(GSN_GET_TABLEID_REQ, &Dbdict::execGET_TABLEDID_REQ);
22292227
addRecSignal(GSN_GET_TABINFOREF, &Dbdict::execGET_TABINFOREF);
22302228
addRecSignal(GSN_GET_TABINFO_CONF, &Dbdict::execGET_TABINFO_CONF);
22312229
addRecSignal(GSN_CONTINUEB, &Dbdict::execCONTINUEB);
@@ -10755,66 +10753,6 @@ Dbdict::execALTER_TABLE_REF(Signal* signal)
1075510753
/* ---------------------------------------------------------------- */
1075610754
/* **************************************************************** */
1075710755

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-
1081810756
/* ---------------------------------------------------------------- */
1081910757
// Get a full table description.
1082010758
/* ---------------------------------------------------------------- */

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2003, 2021, Oracle and/or its affiliates.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License, version 2.0,
@@ -44,7 +44,6 @@
4444
#include <SignalCounter.hpp>
4545
#include <Bitmask.hpp>
4646
#include <AttributeList.hpp>
47-
#include <signaldata/GetTableId.hpp>
4847
#include <signaldata/GetTabInfo.hpp>
4948
#include <signaldata/DictTabInfo.hpp>
5049
#include <signaldata/CreateTable.hpp>
@@ -871,7 +870,6 @@ class Dbdict: public SimulatedBlock {
871870
void execDICTSTARTREQ(Signal* signal);
872871

873872
void execGET_TABINFOREQ(Signal* signal);
874-
void execGET_TABLEDID_REQ(Signal* signal);
875873
void execGET_TABINFOREF(Signal* signal);
876874
void execGET_TABINFO_CONF(Signal* signal);
877875
void execCONTINUEB(Signal* signal);
@@ -4476,10 +4474,6 @@ class Dbdict: public SimulatedBlock {
44764474
GetTabInfoRef::ErrorCode errorCode,
44774475
Uint32 errorLine);
44784476

4479-
void sendGET_TABLEID_REF(Signal* signal,
4480-
GetTableIdReq * req,
4481-
GetTableIdRef::ErrorCode errorCode);
4482-
44834477
void sendGetTabResponse(Signal* signal);
44844478

44854479
/* ------------------------------------------------------------ */

storage/ndb/src/kernel/blocks/suma/Suma.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636

3737
#include <signaldata/ListTables.hpp>
3838
#include <signaldata/GetTabInfo.hpp>
39-
#include <signaldata/GetTableId.hpp>
4039
#include <signaldata/DictTabInfo.hpp>
4140
#include <signaldata/SumaImpl.hpp>
4241
#include <signaldata/ScanFrag.hpp>

storage/ndb/src/kernel/blocks/suma/Suma.hpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2003, 2021, Oracle and/or its affiliates.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License, version 2.0,
@@ -69,9 +69,6 @@ class Suma : public SimulatedBlock {
6969
void execGET_TABINFOREF(Signal* signal);
7070
void execGET_TABINFO_CONF(Signal* signal);
7171

72-
void execGET_TABLEID_CONF(Signal* signal);
73-
void execGET_TABLEID_REF(Signal* signal);
74-
7572
void execDROP_TAB_CONF(Signal* signal);
7673
void execALTER_TAB_REQ(Signal* signal);
7774
void execCREATE_TAB_CONF(Signal* signal);

storage/ndb/src/kernel/vm/Emulator.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
2+
Copyright (c) 2003, 2021, Oracle and/or its affiliates.
33
44
This program is free software; you can redistribute it and/or modify
55
it under the terms of the GNU General Public License, version 2.0,
@@ -144,7 +144,7 @@ static const char* const jamFileNames[] =
144144
"ConfigChange.hpp", // 7
145145
"CreateIndx.hpp", // 8
146146
"StartInfo.hpp", // 9
147-
"GetTableId.hpp", // 10
147+
"GetTableId.hpp", // 10 DELETED FILE
148148
"NextScan.hpp", // 11
149149
"DihFragCount.hpp", // 12
150150
"CmInit.hpp", // 13

0 commit comments

Comments
 (0)