[BugFix] [Metadata] fix metadata cache And add an expiration date (#3198

)
DataLinkDC · Feb 28, 2024 · 1ec4d28 · 1ec4d28
1 parent daf59c7
commit 1ec4d28
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/dinky-admin/src/main/java/org/dinky/configure/cache/PaimonCache.java b/dinky-admin/src/main/java/org/dinky/configure/cache/PaimonCache.java
@@ -37,6 +37,7 @@
 
 import cn.hutool.cache.impl.TimedCache;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
 
 public class PaimonCache extends AbstractValueAdaptingCache {
     private static final Class<CacheData> clazz = CacheData.class;
@@ -45,7 +46,7 @@ public class PaimonCache extends AbstractValueAdaptingCache {
     /**
      * TIMEOUT CACHE
      */
-    private final cn.hutool.cache.Cache<Object, Object> cache = new TimedCache<>(1000 * 60 * 30);
+    private final cn.hutool.cache.Cache<Object, Object> cache = new TimedCache<>(1000 * 60 * 10);
 
     public PaimonCache(String cacheName) {
         super(true);
@@ -98,6 +99,7 @@ public void put(Object key, Object value) {
         cache.put(strKey, value);
         PaimonUtil.createOrGetTable(TABLE_NAME, clazz);
         CacheData cacheData = CacheData.builder()
+                .cacheTime(DateUtil.format(DateUtil.date(), "yyyy-MM-dd HH:mm"))
                 .cacheName(cacheName)
                 .key(strKey)
                 .data(serialize(value))

diff --git a/dinky-admin/src/main/java/org/dinky/controller/DataSourceController.java b/dinky-admin/src/main/java/org/dinky/controller/DataSourceController.java
@@ -78,6 +78,7 @@ public class DataSourceController {
      * @param dataBaseDTO {@link DataBaseDTO}
      * @return {@link Result}< {@link Void}>
      */
+    @CacheEvict(cacheNames = "metadata_schema", key = "#dataBaseDTO.id")
     @PutMapping("/saveOrUpdate")
     @Log(title = "Insert Or Update DataBase", businessType = BusinessType.INSERT_OR_UPDATE)
     @ApiOperation("Insert Or Update DataBase")

diff --git a/dinky-common/src/main/java/org/dinky/data/paimon/CacheData.java b/dinky-common/src/main/java/org/dinky/data/paimon/CacheData.java
@@ -40,8 +40,14 @@
 @Options({
     @Option(key = "file.format", value = "parquet"),
     @Option(key = "snapshot.time-retained", value = "10 s"),
+    @Option(key = "partition.expiration-time", value = "10min"),
+    @Option(key = "partition.expiration-check-interval", value = "2min"),
+    @Option(key = "partition.timestamp-formatter", value = "yyyy-MM-dd HH:mm"),
+    @Option(key = "partition.timestamp-pattern", value = "$cacheTime"),
 })
 public class CacheData implements Serializable {
+    @PartitionKey
+    private String cacheTime;
 
     @PartitionKey
     private String cacheName;