Below is the list of changes that have just been committed into a local
5.1-ndb repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1856 05/04/18 06:55:19 joreland@stripped +7 -0
wl1870 - ndb
fix bug in redo log running
ndb/src/kernel/blocks/restore.hpp
1.9 05/04/18 06:55:14 joreland@stripped +1 -0
Keep count of rows restored
ndb/src/kernel/blocks/restore.cpp
1.14 05/04/18 06:55:14 joreland@stripped +6 -4
Keep count of rows restored
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
1.69 05/04/18 06:55:14 joreland@stripped +9 -0
Make sure to init all log parts
for correct REDO log execution
ndb/src/common/debugger/signaldata/StartRec.cpp
1.2 05/04/18 06:55:14 joreland@stripped +20 -0
Add signal printer for START_FRAG_REQ
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
1.12 05/04/18 06:55:14 joreland@stripped +1 -0
Add signal printer for START_FRAG_REQ
ndb/include/kernel/signaldata/StartFragReq.hpp
1.2 05/04/18 06:55:14 joreland@stripped +1 -0
Add signal printer for START_FRAG_REQ
ndb/include/kernel/signaldata/SignalData.hpp
1.10 05/04/18 06:55:14 joreland@stripped +1 -0
Add signal printer for START_FRAG_REQ
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: joreland
# Host: eel.hemma.oreland.se.ndb.mysql.com
# Root: /home/jonas/src/mysql-5.1-ndb-dd
--- 1.13/ndb/src/kernel/blocks/restore.cpp Fri Apr 15 09:14:17 2005
+++ 1.14/ndb/src/kernel/blocks/restore.cpp Mon Apr 18 06:55:14 2005
@@ -252,8 +252,6 @@
Uint32
Restore::init_file(const RestoreLcpReq* req, FilePtr file_ptr)
{
- ndbout_c("RESTORE table: %d", req->tableId);
-
new (file_ptr.p) File();
file_ptr.p->m_sender_ref = req->senderRef;
file_ptr.p->m_sender_data = req->senderData;
@@ -273,7 +271,7 @@
file_ptr.p->m_current_file_page = 0;
file_ptr.p->m_outstanding_reads = 0;
file_ptr.p->m_outstanding_operations = 0;
-
+ file_ptr.p->m_rows_restored = 0;
LocalDataBuffer<15> pages(m_databuffer_pool, file_ptr.p->m_pages);
LocalDataBuffer<15> columns(m_databuffer_pool, file_ptr.p->m_columns);
@@ -339,6 +337,10 @@
m_global_page_pool.release(* it.data);
}
+ ndbout_c("RESTORE table: %d %lld rows applied",
+ file_ptr.p->m_table_id,
+ file_ptr.p->m_rows_restored);
+
columns.release();
pages.release();
m_file_list.release(file_ptr);
@@ -1027,7 +1029,7 @@
ndbassert(file_ptr.p->m_outstanding_operations);
file_ptr.p->m_outstanding_operations--;
-
+ file_ptr.p->m_rows_restored++;
if(file_ptr.p->m_outstanding_operations == 0 && file_ptr.p->m_fd == RNIL)
{
RestoreLcpConf* rep= (RestoreLcpConf*)signal->getDataPtrSend();
--- 1.8/ndb/src/kernel/blocks/restore.hpp Tue Apr 12 11:01:29 2005
+++ 1.9/ndb/src/kernel/blocks/restore.hpp Mon Apr 18 06:55:14 2005
@@ -103,6 +103,7 @@
Uint32 m_current_file_page; // Where in file
Uint32 m_outstanding_reads; //
Uint32 m_outstanding_operations;
+ Uint64 m_rows_restored;
Uint32 m_current_page_index; // Where in page list are we
List::Head m_pages;
--- 1.9/ndb/include/kernel/signaldata/SignalData.hpp Wed Jan 19 08:14:46 2005
+++ 1.10/ndb/include/kernel/signaldata/SignalData.hpp Mon Apr 18 06:55:14 2005
@@ -222,5 +222,6 @@
GSN_PRINT_SIGNATURE(printCONTINUEB_NDBFS);
GSN_PRINT_SIGNATURE(printCONTINUEB_DBDIH);
+GSN_PRINT_SIGNATURE(printSTART_FRAG_REQ);
#endif
--- 1.1/ndb/include/kernel/signaldata/StartFragReq.hpp Wed Apr 14 10:23:55 2004
+++ 1.2/ndb/include/kernel/signaldata/StartFragReq.hpp Mon Apr 18 06:55:14 2005
@@ -32,6 +32,7 @@
public:
STATIC_CONST( SignalLength = 19 );
+ friend bool printSTART_FRAG_REQ(FILE *, const Uint32 *, Uint32, Uint16);
private:
Uint32 userPtr;
Uint32 userRef;
--- 1.11/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp Fri Jan 14 09:09:30 2005
+++ 1.12/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp Mon Apr 18 06:55:14 2005
@@ -145,6 +145,7 @@
{ GSN_SYSTEM_ERROR, printSYSTEM_ERROR },
{ GSN_START_RECREQ, printSTART_REC_REQ },
{ GSN_START_RECCONF, printSTART_REC_CONF },
+ { GSN_START_FRAGREQ, printSTART_FRAG_REQ },
{ GSN_NF_COMPLETEREP, printNF_COMPLETE_REP },
{ GSN_SIGNAL_DROPPED_REP, printSIGNAL_DROPPED_REP },
{ GSN_FAIL_REP, printFAIL_REP },
--- 1.1/ndb/src/common/debugger/signaldata/StartRec.cpp Wed Apr 14 10:24:08 2004
+++ 1.2/ndb/src/common/debugger/signaldata/StartRec.cpp Mon Apr 18 06:55:14 2005
@@ -17,6 +17,7 @@
#include <RefConvert.hpp>
#include <signaldata/StartRec.hpp>
+#include <signaldata/StartFragReq.hpp>
bool
printSTART_REC_REQ(FILE * output,
@@ -50,3 +51,22 @@
return true;
}
+
+bool
+printSTART_FRAG_REQ(FILE * output, const Uint32 * theData,
+ Uint32 len, Uint16 receiverBlockNo) {
+ const StartFragReq * const sig = (StartFragReq *)theData;
+ fprintf(output, " userPtr: %x\n", sig->userPtr);
+ fprintf(output, " userRef: %x\n", sig->userRef);
+ fprintf(output, " tableId: %x fragId: %d\n", sig->tableId, sig->fragId);
+ fprintf(output, " lcpNo: %x lcpId: %d\n", sig->lcpNo, sig->lcpId);
+ fprintf(output, " noOfLogNodes: %x\n", sig->noOfLogNodes);
+ for(Uint32 i = 0; i<sig->noOfLogNodes; i++)
+ fprintf(output, " [ node: %d start: %d last: %d ]",
+ sig->lqhLogNode[i],
+ sig->startGci[i],
+ sig->lastGci[i]);
+ fprintf(output, "\n");
+ return true;
+}
+
--- 1.68/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp Thu Apr 14 16:25:00 2005
+++ 1.69/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp Mon Apr 18 06:55:14 2005
@@ -13528,6 +13528,15 @@
}//if
}
+ for(Uint32 i = 1; i<4; i++)
+ {
+ LogPartRecordPtr tmp;
+ tmp.i = i;
+ ptrAss(tmp, logPartRecord);
+ tmp.p->logStartGci = logPartPtr.p->logStartGci;
+ tmp.p->logLastGci = logPartPtr.p->logLastGci;
+ }
+
if (logPartPtr.p->logStartGci == (UintR)-1) {
jam();
/* --------------------------------------------------------------------
| Thread |
|---|
| • bk commit into 5.1-ndb tree (joreland:1.1856) | jonas.oreland | 18 Apr |
