Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka 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.1922 05/07/04 14:16:36 pekka@stripped +3 -0
ndb - wl#1751 wl#2455 fixes to preceding CS
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp
1.35 05/07/04 14:01:06 pekka@stripped +5 -0
fixes to previous CS
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
1.10 05/07/04 14:01:06 pekka@stripped +14 -19
fixes to previous CS
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
1.42 05/07/04 14:01:06 pekka@stripped +21 -18
fixes to previous CS
# 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: pekka
# Host: clam.ndb.mysql.com
# Root: /export/space/pekka/ndb/version/my51-vs
--- 1.41/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp 2005-07-03 16:31:48 +02:00
+++ 1.42/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp 2005-07-04 14:01:06 +02:00
@@ -428,9 +428,10 @@
}
// set to first tuple position
+ const Uint32 firstTupleNo = ! buildPtr.p->m_build_vs ? 0 : 1;
buildPtr.p->m_fragNo= 0;
buildPtr.p->m_pageId= 0;
- buildPtr.p->m_tupleNo= 0;
+ buildPtr.p->m_tupleNo= firstTupleNo;
// start build
buildIndex(signal, buildPtr.i);
return;
@@ -453,6 +454,8 @@
tablePtr.i= buildReq->getTableId();
ptrCheckGuard(tablePtr, cnoOfTablerec, tablerec);
+ const Uint32 firstTupleNo = ! buildPtr.p->m_build_vs ? 0 : 1;
+
#ifdef TIME_MEASUREMENT
MicroSecondTimer start;
MicroSecondTimer stop;
@@ -474,7 +477,7 @@
ljam();
buildPtr.p->m_fragNo++;
buildPtr.p->m_pageId= 0;
- buildPtr.p->m_tupleNo= 0;
+ buildPtr.p->m_tupleNo= firstTupleNo;
break;
}
ptrCheckGuard(fragPtr, cnoOfFragrec, fragrecord);
@@ -484,29 +487,30 @@
ljam();
buildPtr.p->m_fragNo++;
buildPtr.p->m_pageId= 0;
- buildPtr.p->m_tupleNo= 0;
+ buildPtr.p->m_tupleNo= firstTupleNo;
break;
}
Uint32 realPageId= getRealpid(fragPtr.p, buildPtr.p->m_pageId);
pagePtr.i= realPageId;
ptrCheckGuard(pagePtr, cnoOfPage, cpage);
Uint32 pageState= pagePtr.p->page_state;
- Uint32 pageIndex = ~0;
+ // skip empty page
+ if (pageState == ZEMPTY_MM) {
+ ljam();
+ buildPtr.p->m_pageId++;
+ buildPtr.p->m_tupleNo= firstTupleNo;
+ break;
+ }
// get tuple
+ Uint32 pageIndex = ~0;
const Tuple_header* tuple_ptr = 0;
if (! buildPtr.p->m_build_vs) {
- if (pageState != ZTH_MM_FREE && pageState != ZTH_MM_FULL) {
- ljam();
- buildPtr.p->m_pageId++;
- buildPtr.p->m_tupleNo= 0;
- break;
- }
Uint32 tupheadsize= tablePtr.p->m_offsets[MM].m_fix_header_size;
- pageIndex= buildPtr.p->m_tupleNo * tupheadsize;
+ pageIndex = buildPtr.p->m_tupleNo * tupheadsize;
if (pageIndex + tupheadsize > Fix_page::DATA_WORDS) {
ljam();
buildPtr.p->m_pageId++;
- buildPtr.p->m_tupleNo= 0;
+ buildPtr.p->m_tupleNo= firstTupleNo;
break;
}
tuple_ptr = (Tuple_header*)&pagePtr.p->m_data[pageIndex];
@@ -517,21 +521,20 @@
break;
}
} else {
+ pageIndex = buildPtr.p->m_tupleNo;
Var_page* page_ptr = (Var_page*)pagePtr.p;
- if (buildPtr.p->m_tupleNo >= page_ptr->high_index) {
+ if (pageIndex >= page_ptr->high_index) {
ljam();
buildPtr.p->m_pageId++;
- buildPtr.p->m_tupleNo= 0;
+ buildPtr.p->m_tupleNo= firstTupleNo;
break;
}
- if ((page_ptr->get_index_word(buildPtr.p->m_tupleNo) & 0xFFFF0000) == 0) {
+ if ((page_ptr->get_index_word(pageIndex) & 0xFFFF0000) == 0) {
ljam();
buildPtr.p->m_tupleNo++;
break;
}
- tuple_ptr = (Tuple_header*)page_ptr->get_ptr(buildPtr.p->m_tupleNo);
- ndbrequire(! (tuple_ptr->m_header_bits & Tuple_header::FREE));
- pageIndex = buildPtr.p->m_tupleNo;
+ tuple_ptr = (Tuple_header*)page_ptr->get_ptr(pageIndex);
}
Uint32 tupVersion= tuple_ptr->get_tuple_version();
OperationrecPtr pageOperPtr;
--- 1.34/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp 2005-04-30 13:42:57 +02:00
+++ 1.35/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp 2005-07-04 14:01:06 +02:00
@@ -471,6 +471,11 @@
page_header= (Var_page*)page_ptr.p;
page_header->init();
insert_free_page(frag_ptr, page_header, MAX_FREE_LIST - 1);
+ /*
+ * Tup scan and index build check ZEMPTY_MM to skip un-init()ed
+ * page. Change state here. For varsize it means "page in use".
+ */
+ page_ptr.p->page_state = ZTH_MM_FREE;
} else {
ptrCheckGuard(page_ptr, cnoOfPage, cpage);
ljam();
--- 1.9/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp 2005-07-03 16:31:48 +02:00
+++ 1.10/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp 2005-07-04 14:01:06 +02:00
@@ -165,7 +165,7 @@
jam();
const PagePos& pos = scan.m_scanPos;
NextScanConf* const conf = (NextScanConf*)signal->getDataPtrSend();
- conf->scanPtr = scan.m_userPtr; // fix also in 5.0
+ conf->scanPtr = scan.m_userPtr;
conf->accOperationPtr = (Uint32)-1; // no lock returned
conf->fragId = frag.fragmentId;
conf->localKey[0] = pos.m_key.ref();
@@ -199,17 +199,17 @@
{
ScanOp& scan = *scanPtr.p;
// set to first fragment, first page, first tuple
+ const Uint32 first_page_idx = ! scan.m_scan_vs ? 0 : 1;
PagePos& pos = scan.m_scanPos;
pos.m_fragId = scan.m_fragId;
pos.m_key.m_page_no = 0;
- pos.m_key.m_page_idx = 0;
+ pos.m_key.m_page_idx = first_page_idx;
// just before
pos.m_match = false;
// let scanNext() do the work
scan.m_state = ScanOp::Next;
}
-// TODO optimize this + index build
void
Dbtup::scanNext(Signal* signal, ScanOpPtr scanPtr)
{
@@ -223,6 +223,7 @@
fragPtr.i = scan.m_fragPtrI;
ptrCheckGuard(fragPtr, cnoOfFragrec, fragrecord);
Fragrecord& frag = *fragPtr.p;
+ const Uint32 first_page_idx = ! scan.m_scan_vs ? 0 : 1;
while (true) {
// TODO time-slice here after X loops
jam();
@@ -237,17 +238,17 @@
pagePtr.i = realPageId;
ptrCheckGuard(pagePtr, cnoOfPage, cpage);
Uint32 pageState = pagePtr.p->page_state;
+ // skip empty page
+ if (pageState == ZEMPTY_MM) {
+ jam();
+ key.m_page_no++;
+ key.m_page_idx = first_page_idx;
+ pos.m_match = false;
+ continue;
+ }
// get next tuple
const Tuple_header* th = 0;
if (! scan.m_scan_vs) {
- if (pageState != ZTH_MM_FREE &&
- pageState != ZTH_MM_FULL) {
- jam();
- key.m_page_no++;
- key.m_page_idx = 0;
- pos.m_match = false;
- continue;
- }
Uint32 tupheadsize = tablePtr.p->m_offsets[MM].m_fix_header_size;
if (pos.m_match)
key.m_page_idx += tupheadsize;
@@ -255,7 +256,7 @@
if (key.m_page_idx + tupheadsize > Fix_page::DATA_WORDS) {
jam();
key.m_page_no++;
- key.m_page_idx = 0;
+ key.m_page_idx = first_page_idx;
pos.m_match = false;
continue;
}
@@ -273,7 +274,7 @@
if (key.m_page_idx >= page_ptr->high_index) {
jam();
key.m_page_no++;
- key.m_page_idx = 0;
+ key.m_page_idx = first_page_idx;
pos.m_match = false;
continue;
}
@@ -282,14 +283,8 @@
jam();
continue;
}
- /*
- * Found slot. Due to index reorg it is possible to see tuple
- * twice or (maybe) miss existing tuple. XXX fix later.
- */
th = (Tuple_header*)page_ptr->get_ptr(key.m_page_idx);
- ndbrequire(! (th->m_header_bits & Tuple_header::FREE));
}
- // TODO check for operation and return latest in own tx
scan.m_state = ScanOp::Locked;
break;
}
| Thread |
|---|
| • bk commit into 5.1 tree (pekka:1.1922) | pekka | 4 Jul |
