tiennm99/zfoo
1
0
Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-05-21 04:25:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

ref[ttl]: delete ttl index

Browse Source
This commit is contained in:
godotg
2024-07-02 11:04:16 +08:00
parent 14816b193d
commit e2ca94297a
5 changed files with 17 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
orm/src/main/java/com/zfoo/orm/anno/Index.java
-2
View File
@@ -28,6 +28,4 @@ public @interface Index {
boolean unique();
// 默认小于0不开启TTL文档超时索引
long ttlExpireAfterSeconds() default -1L;
}
orm/src/main/java/com/zfoo/orm/manager/OrmManager.java
+16 -21
View File
@@ -42,6 +42,8 @@ import org.bson.Document;
import org.bson.codecs.configuration.CodecRegistries;
import org.bson.codecs.pojo.PojoCodecProvider;
import org.bson.types.ObjectId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.aop.framework.AopProxyUtils;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
@@ -63,6 +65,9 @@ import java.util.concurrent.TimeUnit;
* @author godotg
*/
public class OrmManager implements IOrmManager {
private static final Logger logger = LoggerFactory.getLogger(OrmManager.class);
private OrmConfig ormConfig;
private MongoClient mongoClient;
@@ -154,18 +159,15 @@ public class OrmManager implements IOrmManager {
}
}
if (!hasIndex) {
var isUnique = index.isUnique();
var isAscending = index.isAscending();
var indexOptions = new IndexOptions();
indexOptions.unique(index.isUnique());
if (index.getTtlExpireAfterSeconds() > 0) {
indexOptions.expireAfter(index.getTtlExpireAfterSeconds(), TimeUnit.SECONDS);
}
if (index.isAscending()) {
collection.createIndex(Indexes.ascending(fieldName), indexOptions);
} else {
collection.createIndex(Indexes.descending(fieldName), indexOptions);
}
indexOptions.unique(isUnique);
String indexName = isAscending
? collection.createIndex(Indexes.ascending(fieldName), indexOptions)
: collection.createIndex(Indexes.descending(fieldName), indexOptions);
logger.info("orm auto created index:[{}] ascending:[{}] field:[{}] unique:[{}]", indexName, isAscending, fieldName, isUnique);
}
}
}
@@ -185,7 +187,8 @@ public class OrmManager implements IOrmManager {
}
}
if (!hasIndex) {
collection.createIndex(Indexes.text(fieldName));
String indexName = collection.createIndex(Indexes.text(fieldName));
logger.info("orm auto created text index:[{}] field:[{}]", indexName, fieldName);
}
}
}
@@ -386,15 +389,7 @@ public class OrmManager implements IOrmManager {
for (var field : fields) {
var indexAnnotation = field.getAnnotation(Index.class);
if (indexAnnotation.ttlExpireAfterSeconds() > 0) {
var fieldType = field.getGenericType();
if (!(fieldType == Date.class || field.getGenericType().toString().equals("java.util.List<java.util.Date>"))) {
// MongoDB规定TTL类型必须是Date，List<Date>的其中一种类型
throw new IllegalArgumentException(StringUtils.format("MongoDB TTL type:[{}] must be Date or List<Date>", field.getName()));
}
}
IndexDef indexDef = new IndexDef(field, indexAnnotation.ascending(), indexAnnotation.unique(), indexAnnotation.ttlExpireAfterSeconds());
IndexDef indexDef = new IndexDef(field, indexAnnotation.ascending(), indexAnnotation.unique());
indexDefMap.put(field.getName(), indexDef);
}
orm/src/main/java/com/zfoo/orm/model/IndexDef.java
+1 -9
View File
@@ -22,13 +22,11 @@ public class IndexDef {
private Field field;
private boolean ascending;
private boolean unique;
private long ttlExpireAfterSeconds;
public IndexDef(Field field, boolean ascending, boolean unique, long ttlExpireAfterSeconds) {
public IndexDef(Field field, boolean ascending, boolean unique) {
this.field = field;
this.ascending = ascending;
this.unique = unique;
this.ttlExpireAfterSeconds = ttlExpireAfterSeconds;
}
public Field getField() {
@@ -55,11 +53,5 @@ public class IndexDef {
this.unique = unique;
}
public long getTtlExpireAfterSeconds() {
return ttlExpireAfterSeconds;
}
public void setTtlExpireAfterSeconds(long ttlExpireAfterSeconds) {
this.ttlExpireAfterSeconds = ttlExpireAfterSeconds;
}
}
orm/src/test/java/com/zfoo/orm/accessor/TtlTest.java
-38
View File
@@ -1,38 +0,0 @@
/*
* Copyright (C) 2020 The zfoo Authors
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and limitations under the License.
*/
package com.zfoo.orm.accessor;
import com.zfoo.orm.OrmContext;
import com.zfoo.orm.entity.MailEntity;
import com.zfoo.scheduler.util.TimeUtils;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import java.util.Date;
/**
* @author godotg
*/
@Ignore
public class TtlTest {
@Test
public void ttlTest() {
var context = new ClassPathXmlApplicationContext("application.xml");
OrmContext.getOrmManager().getCollection(MailEntity.class).drop();
var mailEntity = MailEntity.valueOf("d", "godot", "hello ttl", new Date(TimeUtils.now()));
OrmContext.getAccessor().insert(mailEntity);
}
}
orm/src/test/java/com/zfoo/orm/entity/MailEntity.java
-3
View File
@@ -35,9 +35,6 @@ public class MailEntity implements IEntity<String> {
private String content;
// @Index(ascending = true, unique = false, ttlExpireAfterSeconds = 10)
// private Date createDate;
@Index(ascending = true, unique = false, ttlExpireAfterSeconds = 10)
private Date createDate;
public static MailEntity valueOf(String id, String userName, String content, Date createDate) {