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.1979 05/08/31 08:41:54 jonas@eel.(none) +5 -0
ndb diskdata -
fix abort due to log space
storage/ndb/src/kernel/blocks/lgman.hpp
1.38 05/08/31 08:41:50 jonas@eel.(none) +1 -0
recompute free_file_words on SR
storage/ndb/src/kernel/blocks/lgman.cpp
1.54 05/08/31 08:41:50 jonas@eel.(none) +39 -29
recompute free_file_words on SR
storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp
1.10 05/08/31 08:41:50 jonas@eel.(none) +1 -0
new assert, makeing sure we dont free same tuple twice
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
1.72 05/08/31 08:41:50 jonas@eel.(none) +7 -3
handle abort of out of log space correctly
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
1.56 05/08/31 08:41:49 jonas@eel.(none) +19 -16
dont free a tuple that didnt get inserted (due to abort)
# 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: eel.(none)
# Root: /home/jonas/src/mysql-5.1-ndb-dd
--- 1.9/storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp 2005-07-15 13:26:12 +02:00
+++ 1.10/storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp 2005-08-31 08:41:50 +02:00
@@ -58,6 +58,7 @@
assert(freePageOffset < DATA_WORDS);
m_data[freePageOffset] = (0x8000 << 16) + startOfList;
+ assert(! (m_data[freePageOffset + 1] & Dbtup::Tuple_header::FREE));
m_data[freePageOffset + 1] = Dbtup::Tuple_header::FREE;
if (endOfList == 0xFFFF) {
--- 1.53/storage/ndb/src/kernel/blocks/lgman.cpp 2005-08-31 06:46:10 +02:00
+++ 1.54/storage/ndb/src/kernel/blocks/lgman.cpp 2005-08-31 08:41:50 +02:00
@@ -767,6 +767,35 @@
ptr.p->m_free_buffer_words = pages * File_formats::UNDO_PAGE_WORDS;
}
+Uint32
+Lgman::compute_free_file_pages(Ptr<Logfile_group> ptr)
+{
+ Buffer_idx head= ptr.p->m_file_pos[HEAD];
+ Buffer_idx tail= ptr.p->m_file_pos[TAIL];
+ Uint32 pages = 0;
+ if (head.m_ptr_i == tail.m_ptr_i && head.m_idx < tail.m_idx)
+ {
+ pages += tail.m_idx - head.m_idx;
+ }
+ else
+ {
+ Ptr<Undofile> file;
+ m_file_pool.getPtr(file, head.m_ptr_i);
+ LocalDLFifoList<Undofile> list(m_file_pool, ptr.p->m_files);
+
+ do
+ {
+ pages += (file.p->m_file_size - head.m_idx - 1);
+ if(!list.next(file))
+ list.first(file);
+ head.m_idx = 0;
+ } while(file.i != tail.m_ptr_i);
+
+ pages += tail.m_idx - head.m_idx;
+ }
+ return pages;
+}
+
void
Lgman::free_logbuffer_memory(Ptr<Logfile_group> ptr)
{
@@ -2560,10 +2589,9 @@
*/
ndbassert(ptr.p->m_state == 0);
ptr.p->m_state = Logfile_group::LG_ONLINE;
- LocalDLFifoList<Undofile> files(m_file_pool, ptr.p->m_files);
- Uint32 pages= ptr.p->m_pos[PRODUCER].m_current_pos.m_idx;
Buffer_idx tail= ptr.p->m_file_pos[TAIL];
-
+ Uint32 pages= ptr.p->m_pos[PRODUCER].m_current_pos.m_idx;
+
while(pages)
{
Ptr<Undofile> file;
@@ -2572,10 +2600,11 @@
Uint32 size= file.p->m_file_size;
ndbassert(size >= page);
Uint32 diff= size - page;
-
+
if(pages >= diff)
{
pages -= diff;
+ LocalDLFifoList<Undofile> files(m_file_pool, ptr.p->m_files);
if(!files.next(file))
files.first(file);
tail.m_idx = 1;
@@ -2593,8 +2622,10 @@
ptr.p->m_file_pos[TAIL] = tail;
init_logbuffer_pointers(ptr);
+ ptr.p->m_free_file_words = (Uint64)File_formats::UNDO_PAGE_WORDS *
+ (Uint64)compute_free_file_pages(ptr);
ptr.p->m_next_reply_ptr_i = ptr.p->m_file_pos[HEAD].m_ptr_i;
-
+
signal->theData[0] = LgmanContinueB::FLUSH_LOG;
signal->theData[1] = ptr.i;
sendSignal(reference(), GSN_CONTINUEB, signal, 2, JBB);
@@ -2709,31 +2740,10 @@
void
Lgman::validate_logfile_group(Ptr<Logfile_group> ptr, const char * heading)
{
- Buffer_idx head= ptr.p->m_file_pos[HEAD];
- Buffer_idx tail= ptr.p->m_file_pos[TAIL];
- Uint32 pages = 0;
-
- if (head.m_ptr_i == tail.m_ptr_i && head.m_idx < tail.m_idx)
- {
- pages += tail.m_idx - head.m_idx;
- }
- else
- {
-
- Ptr<Undofile> file;
- m_file_pool.getPtr(file, head.m_ptr_i);
- LocalDLFifoList<Undofile> list(m_file_pool, ptr.p->m_files);
+ if (ptr.p->m_file_pos[HEAD].m_ptr_i == RNIL)
+ return;
- do
- {
- pages += (file.p->m_file_size - head.m_idx - 1);
- if(!list.next(file))
- list.first(file);
- head.m_idx = 0;
- } while(file.i != tail.m_ptr_i);
-
- pages += tail.m_idx - head.m_idx;
- }
+ Uint32 pages = compute_free_file_pages(ptr);
Uint32 group_pages =
((ptr.p->m_free_file_words + File_formats::UNDO_PAGE_WORDS - 1)/ File_formats::UNDO_PAGE_WORDS) ;
--- 1.37/storage/ndb/src/kernel/blocks/lgman.hpp 2005-08-31 06:46:10 +02:00
+++ 1.38/storage/ndb/src/kernel/blocks/lgman.hpp 2005-08-31 08:41:50 +02:00
@@ -227,6 +227,7 @@
bool alloc_logbuffer_memory(Ptr<Logfile_group>, Uint32 pages);
void init_logbuffer_pointers(Ptr<Logfile_group>);
void free_logbuffer_memory(Ptr<Logfile_group>);
+ Uint32 compute_free_file_pages(Ptr<Logfile_group>);
Uint32* get_log_buffer(Ptr<Logfile_group>, Uint32 sz);
void process_log_buffer_waiters(Signal* signal, Ptr<Logfile_group>);
Uint32 next_page(Logfile_group* ptrP, Uint32 i);
--- 1.55/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp 2005-08-24 08:49:49 +02:00
+++ 1.56/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp 2005-08-31 08:41:49 +02:00
@@ -43,26 +43,29 @@
getFragmentrec(regFragPtr, frag_id, regTabPtr.p);
ndbassert(regFragPtr.p != NULL);
- Local_key tmp;
- tmp.m_page_no= getRealpid(regFragPtr.p, frag_page_id);
- tmp.m_page_idx= page_index;
-
- PagePtr pagePtr;
- Tuple_header* ptr= (Tuple_header*)get_ptr(&pagePtr, &tmp, regTabPtr.p);
-
- if (regTabPtr.p->m_attributes[MM].m_no_of_varsize)
+ if (! (((frag_page_id << MAX_TUPLES_BITS) + page_index) == ~0))
{
- ljam();
+ Local_key tmp;
+ tmp.m_page_no= getRealpid(regFragPtr.p, frag_page_id);
+ tmp.m_page_idx= page_index;
- if(ptr->m_header_bits & Tuple_header::CHAINED_ROW)
+ PagePtr pagePtr;
+ Tuple_header* ptr= (Tuple_header*)get_ptr(&pagePtr, &tmp, regTabPtr.p);
+
+ if (regTabPtr.p->m_attributes[MM].m_no_of_varsize)
{
- free_var_part(regFragPtr.p, regTabPtr.p,
- *(Var_part_ref*)ptr->get_var_part_ptr(regTabPtr.p),
- Var_page::CHAIN);
+ ljam();
+
+ if(ptr->m_header_bits & Tuple_header::CHAINED_ROW)
+ {
+ free_var_part(regFragPtr.p, regTabPtr.p,
+ *(Var_part_ref*)ptr->get_var_part_ptr(regTabPtr.p),
+ Var_page::CHAIN);
+ }
+ free_var_part(regFragPtr.p, regTabPtr.p, &tmp, (Var_page*)pagePtr.p, 0);
+ } else {
+ free_fix_rec(regFragPtr.p, regTabPtr.p, &tmp, (Fix_page*)pagePtr.p);
}
- free_var_part(regFragPtr.p, regTabPtr.p, &tmp, (Var_page*)pagePtr.p, 0);
- } else {
- free_fix_rec(regFragPtr.p, regTabPtr.p, &tmp, (Fix_page*)pagePtr.p);
}
}
--- 1.71/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp 2005-08-31 06:46:10 +02:00
+++ 1.72/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp 2005-08-31 08:41:50 +02:00
@@ -215,8 +215,8 @@
//ndbout_c("execTUP_ALLOCREQ");
signal->theData[0]= 0;
- signal->theData[1]= 0;
- signal->theData[2]= 0;
+ signal->theData[1]= ~0 >> MAX_TUPLES_BITS;
+ signal->theData[2]= (1 << MAX_TUPLES_BITS) - 1;
return;
mem_error:
@@ -1327,7 +1327,7 @@
{
terrorCode= res;
regOperPtr.p->m_undo_buffer_space= 0;
- goto error;
+ goto log_space_error;
}
}
}
@@ -1452,6 +1452,10 @@
error:
tupkeyErrorLab(signal);
+ return -1;
+
+log_space_error:
+ early_tupkey_error(signal);
return -1;
}
| Thread |
|---|
| • bk commit into 5.1 tree (jonas:1.1979) | jonas | 31 Aug |
