Below is the list of changes that have just been committed into a local
5.1 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.2213 06/03/01 10:20:40 jonas@stripped +7 -0
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
storage/ndb/src/kernel/SimBlockList.cpp
1.14 06/03/01 10:20:38 jonas@stripped +1 -2
merge
storage/ndb/src/kernel/vm/SimulatedBlock.hpp
1.22 06/03/01 10:18:56 jonas@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/lgman.hpp
1.7 06/03/01 10:18:56 jonas@stripped +0 -3
Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp
1.15 06/03/01 10:18:56 jonas@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
1.19 06/03/01 10:18:56 jonas@stripped +0 -1
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
1.81 06/03/01 10:18:56 jonas@stripped +0 -0
Auto merged
storage/ndb/include/kernel/ndb_limits.h
1.24 06/03/01 10:18:56 jonas@stripped +0 -0
Auto merged
# 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: jonas
# Host: perch.ndb.mysql.com
# Root: /home/jonas/src/51-ndb/RESYNC
--- 1.14/storage/ndb/src/kernel/blocks/lgman.cpp 2006-02-23 15:09:19 +01:00
+++ 1.15/storage/ndb/src/kernel/blocks/lgman.cpp 2006-03-01 10:18:56 +01:00
@@ -852,6 +852,7 @@
m_last_lsn = 0;
m_last_synced_lsn = 0;
m_last_sync_req_lsn = 0;
+ m_max_sync_req_lsn = 0;
m_last_read_lsn = 0;
m_file_pos[0].m_ptr_i= m_file_pos[1].m_ptr_i = RNIL;
@@ -1055,8 +1056,11 @@
wait.p->m_sync_lsn= lsn;
memcpy(&wait.p->m_callback, &req->m_callback,
sizeof(SimulatedBlock::Callback));
- }
+ ptr.p->m_max_sync_req_lsn = lsn > ptr.p->m_max_sync_req_lsn ?
+ lsn : ptr.p->m_max_sync_req_lsn;
+ }
+
if(ptr.p->m_last_sync_req_lsn < lsn &&
! (ptr.p->m_state & Lgman::Logfile_group::LG_FORCE_SYNC_THREAD))
{
@@ -1116,16 +1120,16 @@
}
- Ptr<Lgman::Log_waiter> last;
- if(list.last(last) &&
- last.p->m_sync_lsn > force_lsn &&
- ptr.p->m_last_sync_req_lsn < last.p->m_sync_lsn)
+
+ Uint64 max_req_lsn = ptr.p->m_max_sync_req_lsn;
+ if(max_req_lsn > force_lsn &&
+ max_req_lsn > ptr.p->m_last_sync_req_lsn)
{
ndbrequire(ptr.p->m_state & Lgman::Logfile_group::LG_FORCE_SYNC_THREAD);
signal->theData[0] = LgmanContinueB::FORCE_LOG_SYNC;
signal->theData[1] = ptr.i;
- signal->theData[2] = last.p->m_sync_lsn >> 32;
- signal->theData[3] = last.p->m_sync_lsn & 0xFFFFFFFF;
+ signal->theData[2] = max_req_lsn >> 32;
+ signal->theData[3] = max_req_lsn & 0xFFFFFFFF;
sendSignalWithDelay(reference(), GSN_CONTINUEB, signal, 10, 4);
}
else
--- 1.6/storage/ndb/src/kernel/blocks/lgman.hpp 2006-02-23 14:20:44 +01:00
+++ 1.7/storage/ndb/src/kernel/blocks/lgman.hpp 2006-03-01 10:18:56 +01:00
@@ -28,6 +28,9 @@
#include "diskpage.hpp"
#include <signaldata/GetTabInfo.hpp>
+#include <WOPool.hpp>
+#include <SLFifoList.hpp>
+
class Lgman : public SimulatedBlock
{
public:
@@ -77,18 +80,19 @@
public:
struct Log_waiter
{
+ Callback m_callback;
union {
Uint32 m_size;
Uint64 m_sync_lsn;
};
Uint32 m_block;
- Callback m_callback;
- union {
- Uint32 nextPool;
- Uint32 nextList;
- };
- Uint32 prevList;
+ Uint32 nextList;
+ Uint32 m_magic;
};
+
+ typedef RecordPool<Log_waiter, WOPool> Log_waiter_pool;
+ typedef SLFifoListImpl<Log_waiter_pool, Log_waiter> Log_waiter_list;
+ typedef LocalSLFifoListImpl<Log_waiter_pool, Log_waiter> Local_log_waiter_list;
struct Undofile
{
@@ -190,7 +194,7 @@
Uint64 m_last_read_lsn;
Uint64 m_last_lcp_lsn;
};
- DLFifoList<Log_waiter>::Head m_log_sync_waiters;
+ Log_waiter_list::Head m_log_sync_waiters;
Buffer_idx m_tail_pos[3]; // 0 is cut, 1 is saved, 2 is current
Buffer_idx m_file_pos[2]; // 0 tail, 1 head = { file_ptr_i, page_no }
@@ -200,7 +204,7 @@
DLFifoList<Undofile>::Head m_meta_files;// Files being created or dropped
Uint32 m_free_buffer_words; // Free buffer page words
- DLFifoList<Log_waiter>::Head m_log_buffer_waiters;
+ Log_waiter_list::Head m_log_buffer_waiters;
Page_map::Head m_buffer_pages; // Pairs of { ptr.i, count }
struct Position {
Buffer_idx m_current_page; // { m_buffer_pages.i, left in range }
@@ -235,7 +239,7 @@
friend class Logfile_client;
ArrayPool<Undofile> m_file_pool;
ArrayPool<Logfile_group> m_logfile_group_pool;
- ArrayPool<Log_waiter> m_log_waiter_pool;
+ Log_waiter_pool m_log_waiter_pool;
Page_map::DataBufferPool m_data_buffer_pool;
--- 1.23/storage/ndb/include/kernel/ndb_limits.h 2006-02-16 10:07:16 +01:00
+++ 1.24/storage/ndb/include/kernel/ndb_limits.h 2006-03-01 10:18:56 +01:00
@@ -150,10 +150,4 @@
*/
#define LCP_RESTORE_BUFFER (4*32)
-/*
- * Log buffer pages
- * 8M
- */
-#define LGMAN_LOG_BUFFER (8*32)
-
#endif
--- 1.80/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp 2006-02-20 08:40:20 +01:00
+++ 1.81/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp 2006-03-01 10:18:56 +01:00
@@ -15325,8 +15325,6 @@
execute(signal, op->m_callback, 0);
}
-CArray<KeyDescriptor> g_key_descriptor_pool;
-
void
Dbdict::drop_file_prepare_start(Signal* signal, SchemaOp* op)
{
--- 1.13/storage/ndb/src/kernel/SimBlockList.cpp 2006-02-16 13:12:22 +01:00
+++ 1.14/storage/ndb/src/kernel/SimBlockList.cpp 2006-03-01 10:20:38 +01:00
@@ -15,6 +15,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
#include "SimBlockList.hpp"
+#include <Emulator.hpp>
#include <SimulatedBlock.hpp>
#include <Cmvmi.hpp>
#include <Ndbfs.hpp>
@@ -69,7 +70,7 @@
#endif
void
-SimBlockList::load(Configuration & conf){
+SimBlockList::load(EmulatorData& data){
noOfBlocks = NO_OF_BLOCKS;
theList = new SimulatedBlock * [noOfBlocks];
Dbdict* dbdict = 0;
@@ -78,12 +79,13 @@
Lgman* lg = 0;
Tsman* ts = 0;
- Block_context ctx(conf, * (Ndbd_mem_manager*)0);
+ Block_context ctx(conf, *data.m_mem_manager);
SimulatedBlock * fs = 0;
{
Uint32 dl;
- const ndb_mgm_configuration_iterator * p = conf.getOwnConfigIterator();
+ const ndb_mgm_configuration_iterator * p =
+ ctx.m_config.getOwnConfigIterator();
if(p && !ndb_mgm_get_int_parameter(p, CFG_DB_DISCLESS, &dl) && dl){
fs = NEW_BLOCK(VoidFs)(ctx);
} else {
--- 1.21/storage/ndb/src/kernel/vm/SimulatedBlock.hpp 2006-02-16 13:12:22 +01:00
+++ 1.22/storage/ndb/src/kernel/vm/SimulatedBlock.hpp 2006-03-01 10:18:56 +01:00
@@ -53,6 +53,7 @@
#include <signaldata/ReadConfig.hpp>
#include <signaldata/UpgradeStartup.hpp>
#include "ndbd_malloc_impl.hpp"
+#include <blocks/record_types.hpp>
/**
* Something for filesystem access
@@ -93,6 +94,7 @@
friend class Page_cache_client;
friend class Lgman;
friend class Logfile_client;
+ friend struct Pool_context;
public:
friend class BlockComponent;
virtual ~SimulatedBlock();
@@ -427,7 +429,8 @@
protected:
ArrayPool<GlobalPage>& m_global_page_pool;
-
+ ArrayPool<GlobalPage>& m_shared_page_pool;
+
private:
/**
* Node state
| Thread |
|---|
| • bk commit into 5.1 tree (jonas:1.2213) | jonas | 1 Mar |
