diff options
author | unknown <magnus@neptunus.(none)> | 2004-07-15 09:25:23 +0200 |
---|---|---|
committer | unknown <magnus@neptunus.(none)> | 2004-07-15 09:25:23 +0200 |
commit | 8a23601e060013312368fe6b7f24b113ef2d77f1 (patch) | |
tree | 1d7e7be7b3a5563708b6d645adcca3fb1ff0c9e9 /ndb/include | |
parent | 715158b790c17f25460aa454d8c185bcc012f9b1 (diff) | |
download | mariadb-git-8a23601e060013312368fe6b7f24b113ef2d77f1.tar.gz |
Remove the remains of SCAN_TABINFO signal
ndb/include/kernel/GlobalSignalNumbers.h:
Remove unused signal number for GSN_SCAN_TABINFO
ndb/include/kernel/signaldata/ScanTab.hpp:
Remove definition of old signal ScanTabInfo
ndb/src/common/debugger/signaldata/ScanTab.cpp:
Removed old print function for SCAN_TABINFO
ndb/src/common/debugger/signaldata/SignalNames.cpp:
Removed name for GSN_SCAN_TABINFO
ndb/src/ndbapi/NdbApiSignal.cpp:
Removed SCAN_TABINFO and old comment
ndb/src/ndbapi/NdbConnectionScan.cpp:
Removed duplicate definition of WAIFOR_SCAN_TIMEOUT, real one is in NdbScanOperation.cpp
ndb/src/ndbapi/NdbScanOperation.cpp:
Removed duplicate debug printout
ndb/src/ndbapi/Ndbif.cpp:
Removed SCAN_TABINFO
Diffstat (limited to 'ndb/include')
-rw-r--r-- | ndb/include/kernel/GlobalSignalNumbers.h | 2 | ||||
-rw-r--r-- | ndb/include/kernel/signaldata/ScanTab.hpp | 70 |
2 files changed, 1 insertions, 71 deletions
diff --git a/ndb/include/kernel/GlobalSignalNumbers.h b/ndb/include/kernel/GlobalSignalNumbers.h index 7b70f4c3ac0..a16860561b5 100644 --- a/ndb/include/kernel/GlobalSignalNumbers.h +++ b/ndb/include/kernel/GlobalSignalNumbers.h @@ -84,7 +84,7 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; #define GSN_SCAN_NEXTREQ 28 #define GSN_SCAN_TABCONF 29 -#define GSN_SCAN_TABINFO 30 +// 30 unused #define GSN_SCAN_TABREF 31 #define GSN_SCAN_TABREQ 32 #define GSN_KEYINFO20 33 diff --git a/ndb/include/kernel/signaldata/ScanTab.hpp b/ndb/include/kernel/signaldata/ScanTab.hpp index 1c11bdee4ae..ab2978e48da 100644 --- a/ndb/include/kernel/signaldata/ScanTab.hpp +++ b/ndb/include/kernel/signaldata/ScanTab.hpp @@ -271,76 +271,6 @@ private: #define STATUS_SHIFT (8) #define STATUS_MASK (0xFF) -/** - * - * SENDER: Dbtc, API - * RECIVER: API, Dbtc - */ -class ScanTabInfo { - /** - * Reciver(s) and Sender(s) - */ - friend class NdbConnection; - friend class Dbtc; - - /** - * For printing - */ - friend bool printSCANTABINFO(FILE * output, const Uint32 * theData, Uint32 len, Uint16 receiverBlockNo); - -public: - /** - * Length of signal - */ - STATIC_CONST( SignalLength = 17 ); - -private: - - // Type definitions - - /** - * DATA VARIABLES - */ - UintR apiConnectPtr; // DATA 0 - UintR operLenAndIdx[16]; // DATA 1-16 - - /** - * Get:ers for operLenAndIdx - */ - static Uint32 getLen(const UintR & operLenAndIdx); - static Uint8 getIdx(const UintR & operLenAndIdx); - -}; - - -/** - * Operation length and index - * - l = Length of operation - 24 Bits -> Max 16777215 (Bit 0-24) - i = Index of operation - 7 Bits -> Max 255 (Bit 25-32) - - 1111111111222222222233 - 01234567890123456789012345678901 - llllllllllllllllllllllllliiiiiii -*/ - -#define LENGTH_SHIFT (0) -#define LENGTH_MASK (0xFFFFFF) - -#define INDEX_SHIFT (24) -#define INDEX_MASK (0xFF) - -inline -Uint32 -ScanTabInfo::getLen(const UintR & operLenAndIdx){ - return (Uint32)((operLenAndIdx >> LENGTH_SHIFT) & LENGTH_MASK); -} - -inline -Uint8 -ScanTabInfo::getIdx(const UintR & operLenAndIdx){ - return (Uint8)((operLenAndIdx >> INDEX_SHIFT) & INDEX_MASK); -} /** * |