Do not access the old block cache in read/write operation with a new btree

greensky00 · chiyoung · commit a9af05197e1d · 2016-11-29T05:19:12.000Z
Change-Id: I9b67b37499a962c3e4611d375e207eb578d395af Reviewed-on: http://review.couchbase.org/70365 Reviewed-by: Chiyoung Seo <chiyoung@couchbase.com> Tested-by: Chiyoung Seo <chiyoung@couchbase.com>
diff --git a/src/filemgr.cc b/src/filemgr.cc
@@ -2176,7 +2176,8 @@ fdb_status FileMgr::read_FileMgr(bid_t bid, void *buf,
         return FDB_RESULT_READ_FAIL;
     }
 
-    if (global_config.getNcacheBlock() > 0) {
+    if (global_config.getNcacheBlock() > 0 &&
+        !ver_btreev2_format(getVersion())) {
         lock_no = bid % DLOCK_MAX;
         (void)lock_no;
 
@@ -2392,7 +2393,8 @@ fdb_status FileMgr::writeOffset(bid_t bid, uint64_t offset, uint64_t len,
         }
     }
 
-    if (global_config.getNcacheBlock() > 0) {
+    if (global_config.getNcacheBlock() > 0 &&
+        !ver_btreev2_format(getVersion())) {
         lock_no = bid % DLOCK_MAX;
         (void)lock_no;
 

Original file line number	Diff line number	Diff line change
`@@ -2176,7 +2176,8 @@ fdb_status FileMgr::read_FileMgr(bid_t bid, void *buf,`
`2176`	`2176`	`return FDB_RESULT_READ_FAIL;`
`2177`	`2177`	`}`
`2178`	`2178`
`2179`		`- if (global_config.getNcacheBlock() > 0) {`
	`2179`	`+ if (global_config.getNcacheBlock() > 0 &&`
	`2180`	`+ !ver_btreev2_format(getVersion())) {`
`2180`	`2181`	`lock_no = bid % DLOCK_MAX;`
`2181`	`2182`	`(void)lock_no;`
`2182`	`2183`
`@@ -2392,7 +2393,8 @@ fdb_status FileMgr::writeOffset(bid_t bid, uint64_t offset, uint64_t len,`
`2392`	`2393`	`}`
`2393`	`2394`	`}`
`2394`	`2395`
`2395`		`- if (global_config.getNcacheBlock() > 0) {`
	`2396`	`+ if (global_config.getNcacheBlock() > 0 &&`
	`2397`	`+ !ver_btreev2_format(getVersion())) {`
`2396`	`2398`	`lock_no = bid % DLOCK_MAX;`
`2397`	`2399`	`(void)lock_no;`
`2398`	`2400`