From a4973cd93436fb789acca8bbd9e6dab005e7b105 Mon Sep 17 00:00:00 2001 From: "Bradley C. Kuszmaul" <bradley@tokutek.com> Date: Fri, 11 Nov 2011 19:42:41 +0000 Subject: [PATCH] [t:4133] Candidate #4133 (set version to 16). git-svn-id: file:///svn/toku/tokudb@36855 c7de825b-a66e-492c-adef-691d508d4ae1 --- newbrt/brt-serialize.c | 4 +++- newbrt/brt_layout_version.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/newbrt/brt-serialize.c b/newbrt/brt-serialize.c index d70d5e85fa5..dcb59e2dd94 100644 --- a/newbrt/brt-serialize.c +++ b/newbrt/brt-serialize.c @@ -1825,6 +1825,7 @@ serialize_brt_header_min_size (u_int32_t version) { switch(version) { + case BRT_LAYOUT_VERSION_16: case BRT_LAYOUT_VERSION_15: size += 4; // basement node size size += 8; // num_blocks_to_upgrade_14 (previously num_blocks_to_upgrade, now one int each for upgrade from 13, 14 @@ -2218,7 +2219,8 @@ deserialize_brtheader_versioned (int fd, struct rbuf *rb, struct brt_header **br case BRT_LAYOUT_VERSION_14: h->basementnodesize = 128*1024; // basement nodes added in v15 //fall through on purpose - case BRT_LAYOUT_VERSION_15: + case BRT_LAYOUT_VERSION_16: + case BRT_LAYOUT_VERSION_15: // this may no properly support version 15, we'll fix that on upgrade. invariant(h->layout_version == BRT_LAYOUT_VERSION); h->upgrade_brt_performed = FALSE; if (upgrade) { diff --git a/newbrt/brt_layout_version.h b/newbrt/brt_layout_version.h index 8209ab5d257..5c23ab62472 100644 --- a/newbrt/brt_layout_version.h +++ b/newbrt/brt_layout_version.h @@ -19,6 +19,7 @@ enum brt_layout_version_e { BRT_LAYOUT_VERSION_13 = 13, // Diff from 12 to 13: Fixed loader pivot bug, added build_id to every node, timestamps to brtheader BRT_LAYOUT_VERSION_14 = 14, // Diff from 13 to 14: Added MVCC; deprecated TOKU_DB_VALCMP_BUILTIN(_13); Remove fingerprints; Support QUICKLZ; add end-to-end checksum on uncompressed data. BRT_LAYOUT_VERSION_15 = 15, // Diff from 14 to 15: basement nodes, last verification time + BRT_LAYOUT_VERSION_16 = 16, // Dr. No: No subtree estimates, partition layout information represented more transparently. BRT_NEXT_VERSION, // the version after the current version BRT_LAYOUT_VERSION = BRT_NEXT_VERSION-1, // A hack so I don't have to change this line. BRT_LAYOUT_MIN_SUPPORTED_VERSION = BRT_LAYOUT_VERSION_13, // Minimum version supported -- 2.30.9