优化代码

dfs-store/src/main/java/cn/reghao/dfs/store/db/repository/ObjectRepository.java

@@ -40,18 +40,16 @@ public class ObjectRepository {
         dataBlockMapper.saveAll(list);
     }
 
-    @CacheEvict(cacheNames = "oss:store:objectMeta", key = "#objectName")
+    @CacheEvict(cacheNames = "oss:store:objectMeta", key = "#fileMeta.objectName")
     @Transactional(rollbackFor = Exception.class)
-    public void deleteObject(String objectName) {
-        FileMeta fileMeta = fileMetaMapper.findByObjectName(objectName);
+    public void deleteObject(FileMeta fileMeta) {
         String contentId = fileMeta.getContentId();
         List<FileMeta> list = fileMetaMapper.findByContentId(contentId);
         if (list.size() == 1) {
-            FileMeta fileMeta1 = list.get(0);
             DataBlock dataBlock = dataBlockMapper.findByContentId(contentId);
             String absolutePath = dataBlock.getAbsolutePath();
 
-            fileMetaMapper.delete(fileMeta1);
+            fileMetaMapper.delete(fileMeta);
             dataBlockMapper.delete(dataBlock);
             FileUtils.deleteQuietly(new File(absolutePath));
         } else {
@@ -61,37 +59,21 @@ public class ObjectRepository {
 
     public void deleteByObjectId(String objectId) {
         FileMeta fileMeta = fileMetaMapper.findByObjectId(objectId);
-        String contentId = fileMeta.getContentId();
-        List<FileMeta> list = fileMetaMapper.findByContentId(contentId);
-        if (list.size() == 1) {
-            FileMeta fileMeta1 = list.get(0);
-            DataBlock dataBlock = dataBlockMapper.findByContentId(contentId);
-            String absolutePath = dataBlock.getAbsolutePath();
-
-            fileMetaMapper.delete(fileMeta1);
-            dataBlockMapper.delete(dataBlock);
-            FileUtils.deleteQuietly(new File(absolutePath));
-        } else {
-            fileMetaMapper.delete(fileMeta);
-        }
+        deleteObject(fileMeta);
     }
 
     public void deleteByObjectIds(List<String> objectIds) {
         objectIds.forEach(this::deleteByObjectId);
     }
 
-    @Cacheable(cacheNames = "oss:store:fileMeta", key = "#objectName", unless = "#result == null")
     public FileMeta getByObjectName(String objectName) {
-        log.info("cache miss");
         return fileMetaMapper.findByObjectName(objectName);
     }
 
     public FileMeta getByObjectId(String objectId) {
-        log.info("cache miss");
         return fileMetaMapper.findByObjectId(objectId);
     }
 
-    @Cacheable(cacheNames = "oss:store:fileMeta", key = "#sha256sum", unless = "#result == null")
     public FileMeta getBySha256sum(String sha256sum) {
         return fileMetaMapper.findBySha256sum(sha256sum);
     }

dfs-store/src/main/java/cn/reghao/dfs/store/model/po/ImageFile.java

@@ -15,14 +15,11 @@ import lombok.NoArgsConstructor;
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class ImageFile extends BaseObject<Integer> {
+    // 原始文件的 objectId
     private String imageFileId;
     private Integer width;
     private Integer height;
     private Boolean horizontal;
-    private String jpegObjectId;
-    private String jpegUrl;
-    private String webpObjectId;
-    private String webpUrl;
 
     public ImageFile(String imageFileId, Integer width, Integer height) {
         this.imageFileId = imageFileId;
@@ -30,26 +27,4 @@ public class ImageFile extends BaseObject<Integer> {
         this.height = height;
         this.horizontal = width > height;
     }
-
-    public ImageFile(String imageFileId, Integer width, Integer height, Boolean horizontal,
-                     String jpegObjectId, String jpegUrl) {
-        this.imageFileId = imageFileId;
-        this.width = width;
-        this.height = height;
-        this.horizontal = horizontal;
-        this.jpegObjectId = jpegObjectId;
-        this.jpegUrl = jpegUrl;
-    }
-
-    public ImageFile(String imageFileId, Integer width, Integer height, Boolean horizontal,
-                     String jpegObjectId, String jpegUrl, String webpObjectId, String webpUrl) {
-        this.imageFileId = imageFileId;
-        this.width = width;
-        this.height = height;
-        this.horizontal = horizontal;
-        this.jpegObjectId = jpegObjectId;
-        this.jpegUrl = jpegUrl;
-        this.webpObjectId = webpObjectId;
-        this.webpUrl = webpUrl;
-    }
 }

dfs-store/src/main/java/cn/reghao/dfs/store/model/po/VideoFile.java

@@ -15,6 +15,7 @@ import lombok.Setter;
 @Setter
 @Getter
 public class VideoFile extends BaseObject<Integer> {
+    // 原始文件的 objectId
     private String videoFileId;
     private Boolean horizontal;
     // 单位秒

dfs-store/src/main/java/cn/reghao/dfs/store/service/PutObjectService.java

@@ -88,6 +88,6 @@ public class PutObjectService {
     }
 
     public void deleteObject(String objectId) {
-        //objectRepository.deleteByObjectId(objectId);
+        objectRepository.deleteByObjectId(objectId);
     }
 }

dfs-store/src/test/java/MediaFileTest.java

@@ -27,65 +27,7 @@ public class MediaFileTest {
     @Autowired
     FileMetaMapper fileMetaMapper;
 
-    public void mediaTest() {
-        videoUrlTest();
-        log.info("------------------------------------------------------------");
-        imageFileTest();
-    }
-
     @Test
     public void videoUrlTest() {
-        List<VideoUrl> list = videoUrlMapper.findAll();
-        for (VideoUrl videoUrl : list) {
-            process(videoUrl);
-        }
-    }
-
-    private void process(VideoUrl videoUrl) {
-        String videoFileId = videoUrl.getVideoFileId();
-        VideoFile videoFile = videoFileMapper.findByVideoFileId(videoFileId);
-        if (videoFile == null) {
-            log.error("videoFileId {} not exist in video_file", videoFileId);
-            return;
-        }
-
-        String objectId = videoUrl.getObjectId();
-        FileMeta fileMeta = fileMetaMapper.findByObjectId(objectId);
-        if (fileMeta == null) {
-            log.error("objectId {} not exist in file_meta", objectId);
-        }
-    }
-
-    @Autowired
-    ImageFileMapper imageFileMapper;
-    @Test
-    public void imageFileTest() {
-        List<ImageFile> list = imageFileMapper.findAll();
-        for (ImageFile imageFile : list) {
-            process(imageFile);
-        }
-    }
-
-    private void process(ImageFile imageFile) {
-        String jpegObjectId = imageFile.getJpegObjectId();
-        FileMeta fileMeta = fileMetaMapper.findByObjectId(jpegObjectId);
-        if (fileMeta == null) {
-            log.error("jpegObjectId {} not exist in file_meta", jpegObjectId);
-        }
-
-        String webpObjectId = imageFile.getWebpObjectId();
-        if (webpObjectId != null) {
-            FileMeta fileMeta1 = fileMetaMapper.findByObjectId(webpObjectId);
-            if (fileMeta1 == null) {
-                log.error("webpObjectId {} not exist in file_meta", webpObjectId);
-            }
-        }
-    }
-
-    @Test
-    public void test11() {
-        int scope = 4;
-        List<String> list = List.of("eadf4146d67846f7abdf8ce63e354440", "98d20cf30c27417c8e5bcdb83e18562b");
-        fileMetaMapper.updateScopeByObjectIds(scope, list);
     }
 }