From aa00c8f96cc2a57eaf474bbc78b35ee3ba3a8450 Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Sat, 6 Jan 2024 21:25:09 +0800
Subject: [PATCH] same problem in MVHashMap.Write

---
 core/blockstm/mvhashmap.go | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/core/blockstm/mvhashmap.go b/core/blockstm/mvhashmap.go
index 51fcce63f1..38b075b0d8 100644
--- a/core/blockstm/mvhashmap.go
+++ b/core/blockstm/mvhashmap.go
@@ -121,34 +121,23 @@ func (mv *MVHashMap) Write(k Key, v Version, data interface{}) {
 		return
 	})
 
-	cells.rw.RLock()
-	ci, ok := cells.tm.Get(v.TxnIndex)
-	cells.rw.RUnlock()
-
-	if ok {
+	cells.rw.Lock()
+	if ci, ok := cells.tm.Get(v.TxnIndex); !ok {
+		cells.tm.Put(v.TxnIndex, &WriteCell{
+			flag:        FlagDone,
+			incarnation: v.Incarnation,
+			data:        data,
+		})
+	} else {
 		if ci.(*WriteCell).incarnation > v.Incarnation {
 			panic(fmt.Errorf("existing transaction value does not have lower incarnation: %v, %v",
 				k, v.TxnIndex))
 		}
-
 		ci.(*WriteCell).flag = FlagDone
 		ci.(*WriteCell).incarnation = v.Incarnation
 		ci.(*WriteCell).data = data
-	} else {
-		cells.rw.Lock()
-		if ci, ok = cells.tm.Get(v.TxnIndex); !ok {
-			cells.tm.Put(v.TxnIndex, &WriteCell{
-				flag:        FlagDone,
-				incarnation: v.Incarnation,
-				data:        data,
-			})
-		} else {
-			ci.(*WriteCell).flag = FlagDone
-			ci.(*WriteCell).incarnation = v.Incarnation
-			ci.(*WriteCell).data = data
-		}
-		cells.rw.Unlock()
 	}
+	cells.rw.Unlock()
 }
 
 func (mv *MVHashMap) ReadStorage(k Key, fallBack func() any) any {