From b3dc38dd2a3eec6ee5eb0a21ef1623c769041424 Mon Sep 17 00:00:00 2001
From: awake <lqh19980716@163.com>
Date: Mon, 21 Oct 2024 14:45:23 +0800
Subject: [PATCH] perf[orm]: code style

---
 .../java/com/zfoo/orm/accessor/IAccessor.java |  2 --
 .../zfoo/orm/accessor/MongodbAccessor.java    | 31 -------------------
 .../java/com/zfoo/orm/cache/EntityCache.java  | 24 +++++++++++++-
 3 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/orm/src/main/java/com/zfoo/orm/accessor/IAccessor.java b/orm/src/main/java/com/zfoo/orm/accessor/IAccessor.java
index 4f015bb46..b74caaf6d 100644
--- a/orm/src/main/java/com/zfoo/orm/accessor/IAccessor.java
+++ b/orm/src/main/java/com/zfoo/orm/accessor/IAccessor.java
@@ -34,8 +34,6 @@ public interface IAccessor {
 
     <PK extends Comparable<PK>, E extends IEntity<PK>> void batchUpdate(List<E> entities);
 
-    <PK extends Comparable<PK>, E extends IEntity<PK>> void batchUpdateNode(List<PNode<PK,E>> entities);
-
     <PK extends Comparable<PK>, E extends IEntity<PK>> boolean delete(E entity);
 
     <PK extends Comparable<PK>, E extends IEntity<PK>> boolean delete(PK pk, Class<E> entityClazz);
diff --git a/orm/src/main/java/com/zfoo/orm/accessor/MongodbAccessor.java b/orm/src/main/java/com/zfoo/orm/accessor/MongodbAccessor.java
index f580086cc..0036cd174 100644
--- a/orm/src/main/java/com/zfoo/orm/accessor/MongodbAccessor.java
+++ b/orm/src/main/java/com/zfoo/orm/accessor/MongodbAccessor.java
@@ -104,37 +104,6 @@ public <PK extends Comparable<PK>, E extends IEntity<PK>> void batchUpdate(List<
         }
     }
 
-    @Override
-    public <PK extends Comparable<PK>, E extends IEntity<PK>> void batchUpdateNode(List<PNode<PK,E>> nodes) {
-        if (CollectionUtils.isEmpty(nodes)) {
-            return;
-        }
-
-        try {
-            @SuppressWarnings("unchecked")
-            var entityClazz = (Class<E>) nodes.get(0).getClass();
-            var collection = OrmContext.getOrmManager().getCollection(entityClazz);
-            List<E> entities = nodes.stream().map(PNode::getEntity).toList();
-            var batchList = entities.stream()
-                    .map(it -> new ReplaceOneModel<E>(Filters.eq("_id", it.id()), it))
-                    .toList();
-
-            var result = collection.bulkWrite(batchList, new BulkWriteOptions().ordered(false));
-
-            //设置修改时间
-            long  currentTime = TimeUtils.currentTimeMillis();
-            nodes.forEach(k->k.resetTime(currentTime));
-
-            if (result.getMatchedCount() != entities.size()) {
-                // 在数据库的批量更新操作中需要更新的数量和最终更新的数量不相同
-                logger.warn("database:[{}] update size:[{}] not equal with matched size:[{}](some entity of id not exist in database)"
-                        , entityClazz.getSimpleName(), entities.size(), result.getMatchedCount());
-            }
-        } catch (Throwable t) {
-            logger.error("batchUpdate unknown exception", t);
-        }
-    }
-
     @Override
     public <PK extends Comparable<PK>, E extends IEntity<PK>> boolean delete(E entity) {
         @SuppressWarnings("unchecked")
diff --git a/orm/src/main/java/com/zfoo/orm/cache/EntityCache.java b/orm/src/main/java/com/zfoo/orm/cache/EntityCache.java
index 1bcc85ffb..72ecff7e2 100644
--- a/orm/src/main/java/com/zfoo/orm/cache/EntityCache.java
+++ b/orm/src/main/java/com/zfoo/orm/cache/EntityCache.java
@@ -309,7 +309,29 @@ private void doPersistNoVersion(List<PNode<PK,E>> updateList) {
         for (var currentPage = 1; currentPage <= maxPageSize; currentPage++) {
             page.setPage(currentPage);
             var currentUpdateList = page.currentPageList(updateList);
-            OrmContext.getAccessor().batchUpdateNode(currentUpdateList);
+            try {
+                @SuppressWarnings("unchecked")
+                var entityClazz = (Class<E>) currentUpdateList.get(0).getClass();
+                var collection = OrmContext.getOrmManager().getCollection(entityClazz);
+                List<E> entities = currentUpdateList.stream().map(PNode::getEntity).toList();
+                var batchList = entities.stream()
+                        .map(it -> new ReplaceOneModel<E>(Filters.eq("_id", it.id()), it))
+                        .toList();
+
+                var result = collection.bulkWrite(batchList, new BulkWriteOptions().ordered(false));
+
+                //设置修改时间
+                long  currentTime = TimeUtils.currentTimeMillis();
+                currentUpdateList.forEach(k->k.resetTime(currentTime));
+
+                if (result.getMatchedCount() != entities.size()) {
+                    // 在数据库的批量更新操作中需要更新的数量和最终更新的数量不相同
+                    logger.warn("database:[{}] update size:[{}] not equal with matched size:[{}](some entity of id not exist in database)"
+                            , entityClazz.getSimpleName(), entities.size(), result.getMatchedCount());
+                }
+            } catch (Throwable t) {
+                logger.error("batchUpdate unknown exception", t);
+            }
         }
     }