From 0c0dc62c2b0ff46d9f8121c6d23e57fa1810395f Mon Sep 17 00:00:00 2001
From: godotg <jaysunxiao@gmail.com>
Date: Tue, 2 Jul 2024 12:56:05 +0800
Subject: [PATCH] perf[cow]: CopyOnWriteHashMap equals and hashcode

---
 .../test/java/com/zfoo/orm/accessor/MapTest.java    |  2 +-
 .../java/com/zfoo/orm/entity/bag/MapEntity.java     |  6 +++---
 .../collection/concurrent/ConcurrentArrayList.java  | 13 +++++--------
 .../collection/concurrent/CopyOnWriteHashMap.java   | 10 ++++++++++
 .../concurrent/CopyOnWriteHashMapLongObject.java    | 10 ++++++++++
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/orm/src/test/java/com/zfoo/orm/accessor/MapTest.java b/orm/src/test/java/com/zfoo/orm/accessor/MapTest.java
index 6b5abd44..ea1781c2 100644
--- a/orm/src/test/java/com/zfoo/orm/accessor/MapTest.java
+++ b/orm/src/test/java/com/zfoo/orm/accessor/MapTest.java
@@ -89,7 +89,7 @@ public class MapTest {
         bagMap.put("bag3", bagItem3);
         bagMap.put("bag4", null);
 
-        var map = new HashMap<String, Map<String, String>>();
+        var map = new CopyOnWriteHashMap<String, Map<String, String>>();
         map.put("a", Map.of("b", "b"));
         entity.setBaseMap(map);
 
diff --git a/orm/src/test/java/com/zfoo/orm/entity/bag/MapEntity.java b/orm/src/test/java/com/zfoo/orm/entity/bag/MapEntity.java
index 6e27fcae..ecf9cba3 100644
--- a/orm/src/test/java/com/zfoo/orm/entity/bag/MapEntity.java
+++ b/orm/src/test/java/com/zfoo/orm/entity/bag/MapEntity.java
@@ -34,7 +34,7 @@ public class MapEntity implements IEntity<Long> {
     private CopyOnWriteHashMap<Long, CopyOnWriteHashMap<Integer,Integer>> copyOnWriteHashMap = new CopyOnWriteHashMap<>();
     private Map<String, BagItem> bagMap = new HashMap<>();
 
-    private Map<String, Map<String, String>> baseMap = new HashMap<>();
+    private CopyOnWriteHashMap<String, Map<String, String>> baseMap = new CopyOnWriteHashMap<>();
 
     private Map<Long, String> longStringMap = new HashMap<>();
     private Map<Integer, String> intStringMap = new HashMap<>();
@@ -101,11 +101,11 @@ public class MapEntity implements IEntity<Long> {
         this.bagMap = bagMap;
     }
 
-    public Map<String, Map<String, String>> getBaseMap() {
+    public CopyOnWriteHashMap<String, Map<String, String>> getBaseMap() {
         return baseMap;
     }
 
-    public void setBaseMap(Map<String, Map<String, String>> baseMap) {
+    public void setBaseMap(CopyOnWriteHashMap<String, Map<String, String>> baseMap) {
         this.baseMap = baseMap;
     }
 
diff --git a/protocol/src/main/java/com/zfoo/protocol/collection/concurrent/ConcurrentArrayList.java b/protocol/src/main/java/com/zfoo/protocol/collection/concurrent/ConcurrentArrayList.java
index 5988f5be..d35bb1fd 100644
--- a/protocol/src/main/java/com/zfoo/protocol/collection/concurrent/ConcurrentArrayList.java
+++ b/protocol/src/main/java/com/zfoo/protocol/collection/concurrent/ConcurrentArrayList.java
@@ -270,15 +270,12 @@ public class ConcurrentArrayList<E> implements List<E> {
 
     @Override
     public boolean equals(Object o) {
-        if (o == null) {
-            return false;
+        lock.lock();
+        try {
+            return list.equals(o);
+        } finally {
+            lock.unlock();
         }
-
-        if (this != o) {
-            return false;
-        }
-
-        return list.equals(o);
     }
 
     @Override
diff --git a/protocol/src/main/java/com/zfoo/protocol/collection/concurrent/CopyOnWriteHashMap.java b/protocol/src/main/java/com/zfoo/protocol/collection/concurrent/CopyOnWriteHashMap.java
index 4fadaa4a..f1996618 100644
--- a/protocol/src/main/java/com/zfoo/protocol/collection/concurrent/CopyOnWriteHashMap.java
+++ b/protocol/src/main/java/com/zfoo/protocol/collection/concurrent/CopyOnWriteHashMap.java
@@ -133,4 +133,14 @@ public class CopyOnWriteHashMap<K, V> implements Map<K, V> {
     public Set<Entry<K, V>> entrySet() {
         return map.entrySet();
     }
+
+    @Override
+    public boolean equals(Object o) {
+        return map.equals(o);
+    }
+
+    @Override
+    public int hashCode() {
+        return map.hashCode();
+    }
 }
diff --git a/protocol/src/main/java/com/zfoo/protocol/collection/concurrent/CopyOnWriteHashMapLongObject.java b/protocol/src/main/java/com/zfoo/protocol/collection/concurrent/CopyOnWriteHashMapLongObject.java
index e7057fe9..ce65f28b 100644
--- a/protocol/src/main/java/com/zfoo/protocol/collection/concurrent/CopyOnWriteHashMapLongObject.java
+++ b/protocol/src/main/java/com/zfoo/protocol/collection/concurrent/CopyOnWriteHashMapLongObject.java
@@ -137,4 +137,14 @@ public class CopyOnWriteHashMapLongObject<V> implements Map<Long, V> {
     public Set<Entry<Long, V>> entrySet() {
         return map.entrySet();
     }
+
+    @Override
+    public boolean equals(Object o) {
+        return map.equals(o);
+    }
+
+    @Override
+    public int hashCode() {
+        return map.hashCode();
+    }
 }