Commit 214aff23 authored by Hallvard Furuseth's avatar Hallvard Furuseth Committed by Howard Chu
Browse files

Move misplaced OVERFLOW_NOTYET code

...so it would set pgno,txnid in the MDB_dovpage, not the actual ovpage
parent 74928f6a
...@@ -1044,11 +1044,13 @@ typedef struct MDB_ovpage { ...@@ -1044,11 +1044,13 @@ typedef struct MDB_ovpage {
mdb_size_t op_pages; mdb_size_t op_pages;
} MDB_ovpage; } MDB_ovpage;
#if OVERFLOW_NOTYET
/** Header for a dirty overflow page in memory */ /** Header for a dirty overflow page in memory */
typedef struct MDB_dovpage { typedef struct MDB_dovpage {
MDB_page_header mp_hdr; MDB_page_header mp_hdr;
void *mp_ptr; void *mp_ptr;
} MDB_dovpage; } MDB_dovpage;
#endif
/** The number of overflow pages needed to store the given size. */ /** The number of overflow pages needed to store the given size. */
#define OVPAGES(size, psize) ((PAGEHDRSZ-1 + (size)) / (psize) + 1) #define OVPAGES(size, psize) ((PAGEHDRSZ-1 + (size)) / (psize) + 1)
...@@ -2674,14 +2676,16 @@ search_done: ...@@ -2674,14 +2676,16 @@ search_done:
} else { } else {
txn->mt_next_pgno = pgno + num; txn->mt_next_pgno = pgno + num;
} }
np->mp_pgno = pgno;
np->mp_txnid = txn->mt_txnid;
#if OVERFLOW_NOTYET #if OVERFLOW_NOTYET
if (ov) { if (ov) {
dph->mp_hdr = np->mp_hdr; dph->mp_hdr = np->mp_hdr;
dph->mp_ptr = np; dph->mp_ptr = np;
np = (MDB_page *)dph; np = (MDB_page *)dph;
} }
#endif
np->mp_pgno = pgno;
np->mp_txnid = txn->mt_txnid;
#if OVERFLOW_NOTYET
mdb_page_dirty(txn, np, ov); mdb_page_dirty(txn, np, ov);
#else #else
mdb_page_dirty(txn, np); mdb_page_dirty(txn, np);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment