测试

Author: evtrouble

CMakeLists.txt

@@ -173,9 +173,9 @@ ADD_SUBDIRECTORY(src/observer)
 ADD_SUBDIRECTORY(test/perf)
 ADD_SUBDIRECTORY(tools)
 
-IF (WITH_BENCHMARK)
-    ADD_SUBDIRECTORY(benchmark)
-ENDIF(WITH_BENCHMARK)
+# IF (WITH_BENCHMARK)
+#     ADD_SUBDIRECTORY(benchmark)
+# ENDIF(WITH_BENCHMARK)
 
 IF(WITH_UNIT_TESTS)
     # ADD_SUBDIRECTORY(unittest)

src/observer/storage/buffer/frame.cpp

@@ -76,13 +76,13 @@ void Frame::write_latch(intptr_t xid)
 
   lock_.lock();
 
-#ifdef DEBUG
-  write_locker_ = xid;
-  ++write_recursive_count_;
-  TRACE("frame write lock success."
-        "this=%p, pin=%d, frameId=%s, write locker=%lx(recursive=%d), xid=%lx, lbt=%s",
-        this, pin_count_.load(), frame_id_.to_string().c_str(), write_locker_, write_recursive_count_, xid, lbt());
-#endif
+// #ifdef DEBUG
+//   write_locker_ = xid;
+//   ++write_recursive_count_;
+//   TRACE("frame write lock success."
+//         "this=%p, pin=%d, frameId=%s, write locker=%lx(recursive=%d), xid=%lx, lbt=%s",
+//         this, pin_count_.load(), frame_id_.to_string().c_str(), write_locker_, write_recursive_count_, xid, lbt());
+// #endif
 }
 
 void Frame::write_unlatch() { write_unlatch(get_default_debug_xid()); }
@@ -102,8 +102,8 @@ void Frame::write_unlatch(intptr_t xid)
       "write_locker=%lx, this=%p, pin=%d, frameId=%s, xid=%lx, lbt=%s",
       write_locker_, this, pin_count_.load(), frame_id_.to_string().c_str(), xid, lbt());
 
-  TRACE("frame write unlock success. this=%p, pin=%d, frameId=%s, xid=%lx, lbt=%s",
-        this, pin_count_.load(), frame_id_.to_string().c_str(), xid, lbt());
+  // TRACE("frame write unlock success. this=%p, pin=%d, frameId=%s, xid=%lx, lbt=%s",
+  //       this, pin_count_.load(), frame_id_.to_string().c_str(), xid, lbt());
 
   if (--write_recursive_count_ == 0) {
     write_locker_ = 0;
@@ -132,15 +132,15 @@ void Frame::read_latch(intptr_t xid)
 
   lock_.lock_shared();
 
-  {
-#ifdef DEBUG
-    scoped_lock debug_lock(debug_lock_);
-    ++read_lockers_[xid];
-    TRACE("frame read lock success."
-          "this=%p, pin=%d, frameId=%s, xid=%lx, recursive=%d, lbt=%s",
-          this, pin_count_.load(), frame_id_.to_string().c_str(), xid, read_lockers_[xid], lbt());
-#endif
-  }
+//   {
+// #ifdef DEBUG
+//     scoped_lock debug_lock(debug_lock_);
+//     ++read_lockers_[xid];
+//     TRACE("frame read lock success."
+//           "this=%p, pin=%d, frameId=%s, xid=%lx, recursive=%d, lbt=%s",
+//           this, pin_count_.load(), frame_id_.to_string().c_str(), xid, read_lockers_[xid], lbt());
+// #endif
+//   }
 }
 
 bool Frame::try_read_latch()
@@ -160,16 +160,16 @@ bool Frame::try_read_latch()
   }
 
   bool ret = lock_.try_lock_shared();
-  if (ret) {
-#ifdef DEBUG
-    debug_lock_.lock();
-    ++read_lockers_[xid];
-    TRACE("frame read lock success."
-          "this=%p, pin=%d, frameId=%s, xid=%lx, recursive=%d, lbt=%s",
-          this, pin_count_.load(), frame_id_.to_string().c_str(), xid, read_lockers_[xid], lbt());
-    debug_lock_.unlock();
-#endif
-  }
+//   if (ret) {
+// #ifdef DEBUG
+//     debug_lock_.lock();
+//     ++read_lockers_[xid];
+//     TRACE("frame read lock success."
+//           "this=%p, pin=%d, frameId=%s, xid=%lx, recursive=%d, lbt=%s",
+//           this, pin_count_.load(), frame_id_.to_string().c_str(), xid, read_lockers_[xid], lbt());
+//     debug_lock_.unlock();
+// #endif
+//   }
 
   return ret;
 }
@@ -201,9 +201,9 @@ void Frame::read_unlatch(intptr_t xid)
 #endif
   }
 
-  TRACE("frame read unlock success."
-        "this=%p, pin=%d, frameId=%s, xid=%lx, lbt=%s",
-        this, pin_count_.load(), frame_id_.to_string().c_str(), xid, lbt());
+  // TRACE("frame read unlock success."
+  //       "this=%p, pin=%d, frameId=%s, xid=%lx, lbt=%s",
+  //       this, pin_count_.load(), frame_id_.to_string().c_str(), xid, lbt());
 
   lock_.unlock_shared();
 }
@@ -215,10 +215,10 @@ void Frame::pin()
   [[maybe_unused]] intptr_t xid       = get_default_debug_xid();
   [[maybe_unused]] int      pin_count = ++pin_count_;
 
-  TRACE("after frame pin. "
-        "this=%p, write locker=%lx, read locker has xid %d? pin=%d, frameId=%s, xid=%lx, lbt=%s",
-        this, write_locker_, read_lockers_.find(xid) != read_lockers_.end(), 
-        pin_count, frame_id_.to_string().c_str(), xid, lbt());
+  // TRACE("after frame pin. "
+  //       "this=%p, write locker=%lx, read locker has xid %d? pin=%d, frameId=%s, xid=%lx, lbt=%s",
+  //       this, write_locker_, read_lockers_.find(xid) != read_lockers_.end(), 
+  //       pin_count, frame_id_.to_string().c_str(), xid, lbt());
 }
 
 int Frame::unpin()
@@ -233,10 +233,10 @@ int Frame::unpin()
   scoped_lock debug_lock(debug_lock_);
 
   int pin_count = --pin_count_;
-  TRACE("after frame unpin. "
-        "this=%p, write locker=%lx, read locker has xid? %d, pin=%d, frameId=%s, xid=%lx, lbt=%s",
-        this, write_locker_, read_lockers_.find(xid) != read_lockers_.end(), 
-        pin_count, frame_id_.to_string().c_str(), xid, lbt());
+  // TRACE("after frame unpin. "
+  //       "this=%p, write locker=%lx, read locker has xid? %d, pin=%d, frameId=%s, xid=%lx, lbt=%s",
+  //       this, write_locker_, read_lockers_.find(xid) != read_lockers_.end(), 
+  //       pin_count, frame_id_.to_string().c_str(), xid, lbt());
 
   if (0 == pin_count) {
     ASSERT(write_locker_ == 0,

src/observer/storage/trx/mvcc_trx.cpp

@@ -34,7 +34,7 @@ RC MvccTrxKit::init()
   fields_ = vector<FieldMeta>{
       // field_id in trx fields is invisible.
       FieldMeta("__trx_xid_begin", AttrType::INTS, 0 /*attr_offset*/, 4 /*attr_len*/, false /*visible*/, 1/*field_id*/),
-      FieldMeta("__trx_xid_end", AttrType::INTS, 0 /*attr_offset*/, 4 /*attr_len*/, false /*visible*/, 2/*field_id*/)};
+      FieldMeta("__trx_xid_end", AttrType::INTS, 4 /*attr_offset*/, 4 /*attr_len*/, false /*visible*/, 2/*field_id*/)};
 
   LOG_INFO("init mvcc trx kit done.");
   return RC::SUCCESS;