From a2fbc08b1add39ea1de66a96be5bdc5a28eacc9a Mon Sep 17 00:00:00 2001 From: godotg Date: Mon, 1 Jul 2024 15:49:06 +0800 Subject: [PATCH] ref[EntityDef]: remove entity class from EntityDef to EntityCache --- .../java/com/zfoo/orm/cache/EntityCache.java | 43 ++++++++----------- .../java/com/zfoo/orm/manager/OrmManager.java | 23 ++++++---- .../java/com/zfoo/orm/model/EntityDef.java | 9 +--- 3 files changed, 34 insertions(+), 41 deletions(-) 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 76b94e54..745250ca 100644 --- a/orm/src/main/java/com/zfoo/orm/cache/EntityCache.java +++ b/orm/src/main/java/com/zfoo/orm/cache/EntityCache.java @@ -54,6 +54,7 @@ public class EntityCache, E extends IEntity> imple private static final int DEFAULT_BATCH_SIZE = 512; + private final Class clazz; private final EntityDef entityDef; private final LazyCache> cache; @@ -61,9 +62,11 @@ public class EntityCache, E extends IEntity> imple private IEntityWrapper wrapper; - public EntityCache(EntityDef entityDef) { + @SuppressWarnings("unchecked") + public EntityCache(Class> entityClass, EntityDef entityDef) { + this.clazz = (Class) entityClass; // 创建CacheVersion - var entityWrapper = new EntityWrapper(entityDef.getClazz()); + var entityWrapper = new EntityWrapper(entityClass); if (GraalVmUtils.isGraalVM()) { wrapper = entityWrapper; } else { @@ -90,12 +93,10 @@ public class EntityCache, E extends IEntity> imple // 缓存失效之前，将数据写入数据库 var entity = pnode.getEntity(); - @SuppressWarnings("unchecked") - var entityClass = (Class) entityDef.getClazz(); - EventBus.asyncExecute(entityClass.hashCode(), new Runnable() { + EventBus.asyncExecute(clazz.hashCode(), new Runnable() { @Override public void run() { - var collection = OrmContext.getOrmManager().getCollection(entityClass); + var collection = OrmContext.getOrmManager().getCollection(clazz); var version = wrapper.gvs(entity); wrapper.svs(entity, version + 1); @@ -138,19 +139,19 @@ public class EntityCache, E extends IEntity> imple return pnode.getEntity(); } - @SuppressWarnings("unchecked") - var entity = (E) OrmContext.getAccessor().load(pk, (Class>) entityDef.getClazz()); + var entity = OrmContext.getAccessor().load(pk, clazz); // 如果数据库中不存在则给一个默认值 if (entity == null) { // 数据库无法加载缓存，返回默认值 - logger.warn("[{}] can not load [pk:{}] and use null to replace it", entityDef.getClazz().getSimpleName(), pk); + logger.warn("[{}] can not load [pk:{}] and use null to replace it", clazz.getSimpleName(), pk); } pnode = new PNode<>(entity); cache.put(pk, pnode); return entity; } + @SuppressWarnings("unchecked") @Override public E loadOrCreate(PK pk) { AssertionUtils.notNull(pk); @@ -159,8 +160,7 @@ public class EntityCache, E extends IEntity> imple return pnode.getEntity(); } - @SuppressWarnings("unchecked") - var entity = (E) OrmContext.getAccessor().load(pk, (Class>) entityDef.getClazz()); + var entity = (E) OrmContext.getAccessor().load(pk, clazz); // 如果数据库中不存在则给一个默认值 if (entity == null) { @@ -267,7 +267,7 @@ public class EntityCache, E extends IEntity> imple @Override public void persistAll() { if (entityDef.isThreadSafe()) { - EventBus.asyncExecute(entityDef.getClazz().hashCode(), () -> persistAllBlock()); + EventBus.asyncExecute(clazz.hashCode(), () -> persistAllBlock()); } else { var currentTime = TimeUtils.currentTimeMillis(); // key为threadId @@ -289,7 +289,7 @@ public class EntityCache, E extends IEntity> imple var updateList = entry.getValue(); var executor = ThreadUtils.executorByThreadId(threadId); if (executor == null) { - EventBus.asyncExecute(entityDef.getClazz().hashCode(), () -> doPersist(updateList)); + EventBus.asyncExecute(clazz.hashCode(), () -> doPersist(updateList)); } else { // 使用scheduler均匀的分配入库的时间点，减少数据库的并发写入压力 SchedulerBus.schedule(() -> executor.execute(() -> doPersist(updateList)), count++ * 100L, TimeUnit.MILLISECONDS); @@ -321,9 +321,6 @@ public class EntityCache, E extends IEntity> imple return; } - @SuppressWarnings("unchecked") - var entityClass = (Class) entityDef.getClazz(); - var page = Page.valueOf(1, DEFAULT_BATCH_SIZE, updateList.size()); var maxPageSize = page.totalPage(); @@ -331,7 +328,7 @@ public class EntityCache, E extends IEntity> imple page.setPage(currentPage); var currentUpdateList = page.currentPageList(updateList); try { - var collection = OrmContext.getOrmManager().getCollection(entityClass).withWriteConcern(WriteConcern.ACKNOWLEDGED); + var collection = OrmContext.getOrmManager().getCollection(clazz).withWriteConcern(WriteConcern.ACKNOWLEDGED); var batchList = currentUpdateList.stream() .map(it -> { @@ -354,9 +351,9 @@ public class EntityCache, E extends IEntity> imple // mostly because the document that needs to be updated is the same as the document in the database // 开始执行容错操作（大部分原因都是因为需要更新的文档和数据库的文档相同） logger.warn("persistAll(): [{}] batch update [{}] not equal to final update [{}], and try to use persistAllAndCompare() to update every single entity." - , entityClass.getSimpleName(), currentUpdateList.size(), result.getModifiedCount()); + , clazz.getSimpleName(), currentUpdateList.size(), result.getModifiedCount()); } catch (Throwable t) { - logger.error("persistAll(): [{}] batch update unknown error and try ", entityClass.getSimpleName(), t); + logger.error("persistAll(): [{}] batch update unknown error and try ", clazz.getSimpleName(), t); } persistAllAndCompare(currentUpdateList); } @@ -369,11 +366,9 @@ public class EntityCache, E extends IEntity> imple return; } - @SuppressWarnings("unchecked") - var entityClass = (Class) entityDef.getClazz(); var ids = updateList.stream().map(it -> it.id()).toList(); - var dbList = OrmContext.getQuery(entityClass).in("_id", ids).queryAll(); + var dbList = OrmContext.getQuery(clazz).in("_id", ids).queryAll(); var dbMap = dbList.stream().collect(Collectors.toMap(key -> key.id(), value -> value)); for (var entity : updateList) { var id = entity.id(); @@ -381,7 +376,7 @@ public class EntityCache, E extends IEntity> imple if (dbEntity == null) { cache.remove(entity.id()); - logger.warn("[database:{}] not found entity [id:{}]", entityClass.getSimpleName(), id); + logger.warn("[database:{}] not found entity [id:{}]", clazz.getSimpleName(), id); continue; } @@ -407,7 +402,7 @@ public class EntityCache, E extends IEntity> imple // 数据库版本号较大，说明缓存的数据不是最新的，直接清除缓存，下次重新加载 cache.remove(id); load(id); - logger.warn("[database:{}] document of entity [id:{}] version [{}] is greater than cache [vs:{}]", entityClass.getSimpleName(), id, dbEntityVersion, entityVersion); + logger.warn("[database:{}] document of entity [id:{}] version [{}] is greater than cache [vs:{}]", clazz.getSimpleName(), id, dbEntityVersion, entityVersion); continue; } } diff --git a/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java b/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java index dd123d77..cb346c83 100644 --- a/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java +++ b/orm/src/main/java/com/zfoo/orm/manager/OrmManager.java @@ -85,15 +85,18 @@ public class OrmManager implements IOrmManager { this.ormConfig = ormConfig; } + @SuppressWarnings("unchecked") @Override public void initBefore() { var entityDefMap = entityClass(); - for (var entityDef : entityDefMap.values()) { + for (var entry : entityDefMap.entrySet()) { + var entityClass = entry.getKey(); + var entityDef = entry.getValue(); @SuppressWarnings("rawtypes") - var entityCaches = new EntityCache(entityDef); - entityCachesMap.put(entityDef.getClazz(), entityCaches); - allEntityCachesUsableMap.put(entityDef.getClazz(), false); + var entityCaches = new EntityCache(entityClass, entityDef); + entityCachesMap.put(entityClass, entityCaches); + allEntityCachesUsableMap.put(entityClass, false); } var pojoCodecProvider = PojoCodecProvider.builder().automatic(true).register(new MapCodecProvider()).build(); @@ -134,10 +137,12 @@ public class OrmManager implements IOrmManager { mongodbDatabase = mongoClient.getDatabase(hostConfig.getDatabase()); // 创建索引 - for (var entityDef : entityDefMap.values()) { + for (var entry : entityDefMap.entrySet()) { + var entityClass = entry.getKey(); + var entityDef = entry.getValue(); var indexDefMap = entityDef.getIndexDefMap(); if (CollectionUtils.isNotEmpty(indexDefMap)) { - var collection = getCollection(entityDef.getClazz()); + var collection = getCollection(entityClass); for (var indexDef : indexDefMap.entrySet()) { var fieldName = indexDef.getKey(); var index = indexDef.getValue(); @@ -169,7 +174,7 @@ public class OrmManager implements IOrmManager { if (CollectionUtils.isNotEmpty(indexTextDefMap)) { AssertionUtils.isTrue(indexTextDefMap.size() == 1 , StringUtils.format("A collection can have only one text index [{}]", JsonUtils.object2String(indexTextDefMap.keySet()))); - var collection = getCollection(entityDef.getClazz()); + var collection = getCollection(entityClass); for (var indexTextDef : indexTextDefMap.entrySet()) { var fieldName = indexTextDef.getKey(); var hasIndex = false; @@ -396,7 +401,7 @@ public class OrmManager implements IOrmManager { indexTextDefMap.put(field.getName(), indexTextDef); } - return EntityDef.valueOf(clazz, !hasUnsafeCollection, cacheStrategy.getSize(), cacheStrategy.getExpireMillisecond(), persisterStrategy, indexDefMap, indexTextDefMap); + return EntityDef.valueOf(!hasUnsafeCollection, cacheStrategy.getSize(), cacheStrategy.getExpireMillisecond(), persisterStrategy, indexDefMap, indexTextDefMap); } private void checkEntity(Class clazz) { @@ -453,7 +458,7 @@ public class OrmManager implements IOrmManager { // @Version标识的字段必须是long类型 var versionFields = ReflectionUtils.getFieldsByAnnoInPOJOClass(clazz, Version.class); if (ArrayUtils.isNotEmpty(versionFields)) { - AssertionUtils.isTrue(versionFields.length == 1,"The Entity[{}] must have only one @Version annotation", clazz.getSimpleName()); + AssertionUtils.isTrue(versionFields.length == 1, "The Entity[{}] must have only one @Version annotation", clazz.getSimpleName()); var versionField = versionFields[0]; // idField必须用private修饰 AssertionUtils.isTrue(Modifier.isPrivate(versionField.getModifiers()), "The version of the Entity[{}] must be private", clazz.getSimpleName()); diff --git a/orm/src/main/java/com/zfoo/orm/model/EntityDef.java b/orm/src/main/java/com/zfoo/orm/model/EntityDef.java index caae6fe0..1ae1a9af 100644 --- a/orm/src/main/java/com/zfoo/orm/model/EntityDef.java +++ b/orm/src/main/java/com/zfoo/orm/model/EntityDef.java @@ -21,8 +21,6 @@ import java.util.Map; */ public class EntityDef { - private Class> clazz; - // 线程安全指的是内部没有使用集合或者使用的集合全部支持并发操作 private boolean threadSafe; @@ -37,10 +35,9 @@ public class EntityDef { private Map indexTextDefMap; - public static EntityDef valueOf(Class> clazz, boolean threadSafe, int cacheSize, long expireMillisecond + public static EntityDef valueOf(boolean threadSafe, int cacheSize, long expireMillisecond , PersisterStrategy persisterStrategy, Map indexDefMap, Map indexTextDefMap) { var entityDef = new EntityDef(); - entityDef.clazz = clazz; entityDef.threadSafe = threadSafe; entityDef.cacheSize = cacheSize; entityDef.expireMillisecond = expireMillisecond; @@ -50,10 +47,6 @@ public class EntityDef { return entityDef; } - public Class> getClazz() { - return clazz; - } - public boolean isThreadSafe() { return threadSafe; }