Revert to copy

Signed-off-by: Yang Zhang <[email protected]>
tikv · Jan 3, 2024 · cb9cb1c · cb9cb1c
1 parent 83d2939
commit cb9cb1c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/db/column_family.cc b/db/column_family.cc
@@ -50,13 +50,10 @@ ColumnFamilyHandleImpl::ColumnFamilyHandleImpl(
   }
 }
 
-ColumnFamilyHandleImpl::ColumnFamilyHandleImpl(ColumnFamilyHandleImpl&& other) {
-  cfd_ = other.cfd_;
-  db_ = other.db_;
-  mutex_ = other.mutex_;
-  other.cfd_ = nullptr;
-  other.db_ = nullptr;
-  other.mutex_ = nullptr;
+ColumnFamilyHandleImpl::ColumnFamilyHandleImpl(
+  const ColumnFamilyHandleImpl& other)
+  : cfd_(other.cfd_), db_(other.db_), mutex_(other.mutex_) {
+    cfd_->Ref();
 }
 
 ColumnFamilyHandleImpl::~ColumnFamilyHandleImpl() {

diff --git a/db/column_family.h b/db/column_family.h
@@ -162,7 +162,7 @@ class ColumnFamilyHandleImpl : public ColumnFamilyHandle {
   // create while holding the mutex
   ColumnFamilyHandleImpl(
       ColumnFamilyData* cfd, DBImpl* db, InstrumentedMutex* mutex);
-  ColumnFamilyHandleImpl(ColumnFamilyHandleImpl&& other);
+  ColumnFamilyHandleImpl(const ColumnFamilyHandleImpl& other);
   // destroy without mutex
   virtual ~ColumnFamilyHandleImpl();
   virtual ColumnFamilyData* cfd() const { return cfd_; }