diff options
| author | unknown <joreland@mysql.com> | 2004-08-19 07:43:06 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2004-08-19 07:43:06 +0200 |
| commit | 68da9ff3393a56632d5ffa4579d0002115c217bf (patch) | |
| tree | a7a7fee8e1d770a6559ea019aaa625921eda8a89 /ndb/include | |
| parent | c378cb825a5077ba0d983358e30260cc305e060f (diff) | |
| download | mariadb-git-68da9ff3393a56632d5ffa4579d0002115c217bf.tar.gz | |
wl2025 - fix suma & backup
pluse remove "first_batch_size" and instead put
batch_size on next_scan_req
ndb/include/kernel/signaldata/ScanFrag.hpp:
Rename
* concurrency -> batch_size_bytes
* batch_byte_size -> batch_size_bytes
Removed first_batch_size and
added size parameters to SCAN_NEXTREQ
ndb/src/kernel/blocks/backup/Backup.cpp:
Adopt to SCAN_FRAG_CHANGES
ndb/src/kernel/blocks/backup/Backup.hpp:
Adopt to SCAN_FRAG_CHANGES
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Renamed
scanCompletedOperations -> m_curr_batch_size_rows
scanConcurrentOperations -> m_max_batch_size_rows
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Renamed
scanCompletedOperations -> m_curr_batch_size_rows
scanConcurrentOperations -> m_max_batch_size_rows
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Adopt to SCAN_FRAG_CHANGES
ndb/src/kernel/blocks/suma/Suma.cpp:
Adopt to SCAN_FRAG_CHANGES
Diffstat (limited to 'ndb/include')
| -rw-r--r-- | ndb/include/kernel/signaldata/ScanFrag.hpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ndb/include/kernel/signaldata/ScanFrag.hpp b/ndb/include/kernel/signaldata/ScanFrag.hpp index 6871ae7e977..d3a89b8dc25 100644 --- a/ndb/include/kernel/signaldata/ScanFrag.hpp +++ b/ndb/include/kernel/signaldata/ScanFrag.hpp @@ -33,7 +33,7 @@ class ScanFragReq { */ friend class Dblqh; public: - STATIC_CONST( SignalLength = 13 ); + STATIC_CONST( SignalLength = 12 ); public: Uint32 senderData; @@ -46,10 +46,9 @@ public: Uint32 transId1; Uint32 transId2; Uint32 clientOpPtr; - Uint32 concurrency; - Uint32 batch_byte_size; - Uint32 first_batch_size; - + Uint32 batch_size_rows; + Uint32 batch_size_bytes; + static Uint32 getLockMode(const Uint32 & requestInfo); static Uint32 getHoldLockFlag(const Uint32 & requestInfo); static Uint32 getKeyinfoFlag(const Uint32 & requestInfo); @@ -176,13 +175,15 @@ class ScanFragNextReq { friend bool printSCANFRAGNEXTREQ(FILE * output, const Uint32 * theData, Uint32 len, Uint16 receiverBlockNo); public: - STATIC_CONST( SignalLength = 4 ); + STATIC_CONST( SignalLength = 6 ); public: Uint32 senderData; Uint32 closeFlag; Uint32 transId1; Uint32 transId2; + Uint32 batch_size_rows; + Uint32 batch_size_bytes; }; /** |