From: Ole John Aske Date: May 11 2011 1:31pm Subject: bzr commit into mysql-5.1-telco-7.0 branch (ole.john.aske:4368) List-Archive: http://lists.mysql.com/commits/137084 Message-Id: <20110511133149.A9D89222@fimafeng09.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8259647950959503918==" --===============8259647950959503918== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0/ based on revid:magnus.blaudd@stripped 4368 Ole John Aske 2011-05-11 Remove unused field & methods fron 'class NdbReceiver' 1. Method NdbReceiver::copyout() is unused -> remove 2. Struct m_recattr is unused after removal of ::copyout() -> remove 3. Field m_record::m_column_count is unused ->remove 4. Union enclosing m_recattr & m_record only contains m_record after '3.' -> remove 5. Remove argument 'column_count' from ::do_setup_ndbrecord() is it was used to set the obsolete 'm_record::m_column_count'. modified: storage/ndb/include/ndbapi/NdbReceiver.hpp storage/ndb/src/ndbapi/NdbOperationExec.cpp storage/ndb/src/ndbapi/NdbQueryOperation.cpp storage/ndb/src/ndbapi/NdbReceiver.cpp storage/ndb/src/ndbapi/NdbScanOperation.cpp === modified file 'storage/ndb/include/ndbapi/NdbReceiver.hpp' --- a/storage/ndb/include/ndbapi/NdbReceiver.hpp 2011-02-09 14:18:53 +0000 +++ b/storage/ndb/include/ndbapi/NdbReceiver.hpp 2011-05-11 13:31:44 +0000 @@ -118,7 +118,7 @@ private: */ void do_setup_ndbrecord(const NdbRecord *ndb_record, Uint32 batch_size, Uint32 key_size, Uint32 read_range_no, - Uint32 rowsize, char *buf, Uint32 column_count); + Uint32 rowsize, char *buf); static Uint32 ndbrecord_rowsize(const NdbRecord *ndb_record, @@ -137,33 +137,27 @@ private: new NdbRecord style operation. */ bool m_using_ndb_record; - union { - /* members used for NdbRecAttr operation. */ - struct { - Uint32 m_hidden_count; - } m_recattr; - - /* members used for NdbRecord operation. */ - struct { - Uint32 m_column_count; - const NdbRecord *m_ndb_record; - char *m_row; - /* Block of memory used to receive all rows in a batch during scan. */ - char *m_row_buffer; - /* - Offsets between two rows in m_row_buffer. - This can be different from m_ndb_record->m_row_size, as we sometimes - store extra information after each row (range_no and keyinfo). - For non-scan operations, this is set to zero. - */ - Uint32 m_row_offset; - /* - m_read_range_no is true if we are storing the range_no at the end of - each row during scans. - */ - bool m_read_range_no; - } m_record; - }; + + /* members used for NdbRecord operation. */ + struct { + const NdbRecord *m_ndb_record; + char *m_row; + /* Block of memory used to receive all rows in a batch during scan. */ + char *m_row_buffer; + /* + Offsets between two rows in m_row_buffer. + This can be different from m_ndb_record->m_row_size, as we sometimes + store extra information after each row (range_no and keyinfo). + For non-scan operations, this is set to zero. + */ + Uint32 m_row_offset; + /* + m_read_range_no is true if we are storing the range_no at the end of + each row during scans. + */ + bool m_read_range_no; + } m_record; + class NdbRecAttr* theFirstRecAttr; class NdbRecAttr* theCurrentRecAttr; @@ -212,7 +206,6 @@ private: bool hasResults() const { return m_result_rows > 0; } bool nextResult() const { return m_current_row < m_result_rows; } - NdbRecAttr* copyout(NdbReceiver&); Uint32 receive_packed_recattr(NdbRecAttr**, Uint32 bmlen, const Uint32* aDataPtr, Uint32 aLength); Uint32 receive_packed_ndbrecord(Uint32 bmlen, === modified file 'storage/ndb/src/ndbapi/NdbOperationExec.cpp' --- a/storage/ndb/src/ndbapi/NdbOperationExec.cpp 2011-04-28 07:47:53 +0000 +++ b/storage/ndb/src/ndbapi/NdbOperationExec.cpp 2011-05-11 13:31:44 +0000 @@ -1032,7 +1032,6 @@ NdbOperation::buildSignalsNdbRecord(Uint readMask.set(attrId); requestedCols++; } - theReceiver.m_record.m_column_count= requestedCols; /* Are there any columns to read via NdbRecord? */ if (requestedCols > 0) === modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp' --- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp 2011-05-05 11:06:08 +0000 +++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp 2011-05-11 13:31:44 +0000 @@ -4069,8 +4069,7 @@ NdbQueryOperationImpl::prepareReceiver() 0 /*key_size*/, 0 /*read_range_no*/, getRowSize(), - rowBuf, - 0); + rowBuf); m_resultStreams[i]->getReceiver().prepareSend(); } // So that we can test for for buffer overrun. === modified file 'storage/ndb/src/ndbapi/NdbReceiver.cpp' --- a/storage/ndb/src/ndbapi/NdbReceiver.cpp 2011-04-06 14:16:13 +0000 +++ b/storage/ndb/src/ndbapi/NdbReceiver.cpp 2011-05-11 13:31:44 +0000 @@ -60,7 +60,6 @@ NdbReceiver::init(ReceiverType type, boo m_record.m_row_buffer= NULL; m_record.m_row_offset= 0; m_record.m_read_range_no= false; - m_record.m_column_count= 0; } theFirstRecAttr = NULL; theCurrentRecAttr = NULL; @@ -216,8 +215,7 @@ NdbReceiver::calculate_batch_size(Uint32 void NdbReceiver::do_setup_ndbrecord(const NdbRecord *ndb_record, Uint32 batch_size, Uint32 key_size, Uint32 read_range_no, - Uint32 rowsize, char *row_buffer, - Uint32 column_count) + Uint32 rowsize, char *row_buffer) { m_using_ndb_record= true; m_record.m_ndb_record= ndb_record; @@ -225,7 +223,6 @@ NdbReceiver::do_setup_ndbrecord(const Nd m_record.m_row_buffer= row_buffer; m_record.m_row_offset= rowsize; m_record.m_read_range_no= read_range_no; - m_record.m_column_count= column_count; } //static @@ -261,26 +258,6 @@ NdbReceiver::ndbrecord_rowsize(const Ndb return rowsize; } -NdbRecAttr* -NdbReceiver::copyout(NdbReceiver & dstRec){ - assert(!m_using_ndb_record); - NdbRecAttr *src = m_rows[m_current_row++]; - NdbRecAttr *dst = dstRec.theFirstRecAttr; - NdbRecAttr *start = src; - Uint32 tmp = m_recattr.m_hidden_count; - while(tmp--) - src = src->next(); - - while(dst){ - Uint32 len = src->get_size_in_bytes(); - dst->receive_data((Uint32*)src->aRef(), len); - src = src->next(); - dst = dst->next(); - } - - return start; -} - /** * pad * This function determines how much 'padding' should be applied === modified file 'storage/ndb/src/ndbapi/NdbScanOperation.cpp' --- a/storage/ndb/src/ndbapi/NdbScanOperation.cpp 2011-04-27 10:48:16 +0000 +++ b/storage/ndb/src/ndbapi/NdbScanOperation.cpp 2011-05-11 13:31:44 +0000 @@ -395,8 +395,6 @@ NdbScanOperation::generatePackedReadAIs( columnCount++; } - theReceiver.m_record.m_column_count= columnCount; - int result= 0; /* Are there any columns to read via NdbRecord? @@ -2335,8 +2333,7 @@ int NdbScanOperation::prepareSendScan(Ui { m_receivers[i]->do_setup_ndbrecord(m_attribute_record, batch_size, key_size, m_read_range_no, - rowsize, buf, - theReceiver.m_record.m_column_count); + rowsize, buf); buf+= bufsize; } --===============8259647950959503918== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/ole.john.aske@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@stripped\ # ldyacfqrxouq124w # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0/ # testament_sha1: 929e8621df8ed93bade59a785c3485d8fce695d5 # timestamp: 2011-05-11 15:31:49 +0200 # base_revision_id: magnus.blaudd@stripped\ # pow2htrkjikefx5n # # Begin bundle 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 xcSMznCo1iN2RJj5i7kinChIFYlCsAA= --===============8259647950959503918==--