使用 cn.reghao.jutil.jdk.store 替换 cn.reghao.oss.store.util.store

oss-store/src/main/java/cn/reghao/oss/store/config/spring/FileLifecycle.java

@@ -1,10 +1,10 @@
 package cn.reghao.oss.store.config.spring;
 
+import cn.reghao.jutil.jdk.store.LocalStores;
 import cn.reghao.oss.store.config.OssProperties;
 import cn.reghao.oss.store.db.mapper.DataBlockMapper;
 import cn.reghao.oss.store.model.vo.SubDirCount;
 import cn.reghao.oss.store.task.FileTask;
-import cn.reghao.oss.store.util.store.LocalStores;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.boot.ApplicationArguments;
@@ -12,6 +12,7 @@ import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,8 +36,22 @@ public class FileLifecycle implements ApplicationRunner, DisposableBean {
 
     @Override
     public void run(ApplicationArguments args) throws Exception {
+        initLocalStore();
+
+        log.info("执行文件任务...");
+        fileTask.exec();
+        log.info("文件任务执行完成...");
+    }
+
+    private void initLocalStore() throws IOException {
         log.info("初始化本地磁盘...");
         List<String> diskDirs = ossProperties.getDiskDirs();
+        for (String diskDir : diskDirs) {
+            File dir = new File(diskDir);
+            if (!dir.exists()) {
+                dir.mkdirs();
+            }
+        }
         LocalStores.init(diskDirs);
 
         for (String diskDir : diskDirs) {
@@ -54,10 +69,6 @@ public class FileLifecycle implements ApplicationRunner, DisposableBean {
             LocalStores.initStoreDirs(diskDir, map);
         }
         log.info("本地磁盘数据初始化完成...");
-
-        log.info("执行文件任务...");
-        fileTask.exec();
-        log.info("文件任务执行完成...");
     }
 
     @Override

oss-store/src/main/java/cn/reghao/oss/store/service/FileStoreService.java

@@ -1,7 +1,7 @@
 package cn.reghao.oss.store.service;
 
-import cn.reghao.oss.store.util.store.LoadBalancer;
-import cn.reghao.oss.store.util.store.StoreDir;
+import cn.reghao.jutil.jdk.store.LoadBalancer;
+import cn.reghao.jutil.jdk.store.StoreDir;
 import org.apache.commons.io.FileUtils;
 import org.springframework.stereotype.Service;
 

oss-store/src/main/java/cn/reghao/oss/store/util/store/LoadBalancer.java

@@ -1,16 +0,0 @@
-package cn.reghao.oss.store.util.store;
-
-import java.util.*;
-
-/**
- * @author reghao
- * @date 2022-03-22 13:53:08
- */
-public class LoadBalancer {
-    public StoreDir getStoreDir(long fileSize) {
-        LocalStore localStore = LocalStores.getMaxStore(fileSize);
-        List<StoreDir> subDirs = LocalStores.getSubDirs(localStore.getDiskDir());
-        subDirs.sort(Comparator.comparingInt(StoreDir::getTotal));
-        return subDirs.get(0);
-    }
-}

oss-store/src/main/java/cn/reghao/oss/store/util/store/LocalStore.java

@@ -1,66 +0,0 @@
-package cn.reghao.oss.store.util.store;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.concurrent.atomic.AtomicLong;
-
-/**
- * 表示一块磁盘
- *
- * @author reghao
- * @date 2022-05-23 15:00:59
- */
-public class LocalStore {
-    // disk mounted directory
-    private final String diskDir;
-    private final long total;
-    private final AtomicLong available;
-    private final long max;
-
-    public LocalStore(String diskDir, long total, long available, double maxPercent) {
-        this.diskDir = diskDir;
-        this.total = total;
-        this.available = new AtomicLong(available);
-        BigDecimal bigDecimal1 = new BigDecimal(total*10);
-        BigDecimal bigDecimal2 = new BigDecimal(maxPercent*10);
-        BigDecimal result = bigDecimal1.divide(bigDecimal2, RoundingMode.DOWN);
-        this.max = result.longValue();
-    }
-
-    public String getDiskDir() {
-        return diskDir;
-    }
-
-    public long getTotal() {
-        return total;
-    }
-
-    public long getAvailable() {
-        return available.get();
-    }
-
-    public void setCurrentAvailable(long currentAvailable) {
-        available.getAndSet(currentAvailable);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = 17;
-        result = result * 31 + diskDir.hashCode();
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (other == this) {
-            return true;
-        }
-
-        if (other instanceof LocalStore) {
-            LocalStore o = (LocalStore) other;
-            return o.diskDir.equals(diskDir);
-        } else {
-            return false;
-        }
-    }
-}

oss-store/src/main/java/cn/reghao/oss/store/util/store/LocalStores.java

@@ -1,89 +0,0 @@
-package cn.reghao.oss.store.util.store;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.FileStore;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.*;
-
-/**
- * @author reghao
- * @date 2022-05-23 18:21:22
- */
-public class LocalStores {
-    private static final Map<String, LocalStore> storeMap = new HashMap<>();
-    private static final Map<String, Map<String, StoreDir>> storeDirMap = new HashMap<>();
-
-    public static void init(List<String> diskDirs) throws IOException {
-        Set<String> set = new HashSet<>();
-        for (String diskDir : diskDirs) {
-            FileStore fileStore = Files.getFileStore(Path.of(diskDir));
-            String logicalDisk = fileStore.name();
-            if (set.add(logicalDisk)) {
-                long total = fileStore.getTotalSpace();
-                long available = fileStore.getUsableSpace();
-                LocalStore localStore = new LocalStore(diskDir, total, available, 0.9);
-                storeMap.put(diskDir, localStore);
-                storeDirMap.computeIfAbsent(diskDir, k -> new HashMap<>());
-                createSubDirs(diskDir);
-            }
-        }
-    }
-
-    public static void initStoreDirs(String diskDir, Map<String, Integer> map) {
-        Map<String, StoreDir> map1 = storeDirMap.get(diskDir);
-        if (map1 == null) {
-            return;
-        }
-
-        map.forEach((path, total) -> {
-            StoreDir storeDir = map1.get(path);
-            if (storeDir != null) {
-                storeDir.setTotal(total);
-            }
-        });
-    }
-
-    private static void createSubDirs(String diskDir) throws IOException {
-        int total = 128;
-        for (int i = 0; i < total; i++) {
-            for (int j = 0; j < total; j++) {
-                String baseDir = String.format("%s%s/%s/", diskDir, i, j);
-                File dir = new File(baseDir);
-                if (!dir.exists() && !dir.mkdirs()) {
-                    String msg = String.format("create %s failed", dir);
-                    throw new IOException(msg);
-                }
-
-                storeDirMap.get(diskDir).put(baseDir, new StoreDir(baseDir));
-            }
-        }
-    }
-
-    // TODO 优化算法, 处理异常
-    public static LocalStore getMaxStore(long size) {
-        Map<String, Long> map = new HashMap<>();
-        for (Map.Entry<String, LocalStore> entry : storeMap.entrySet()) {
-            String diskDir = entry.getKey();
-            LocalStore localStore = entry.getValue();
-            long currentAvailable = localStore.getAvailable() - size;
-            map.put(diskDir, currentAvailable);
-        }
-
-        List<String> diskDirs = new ArrayList<>();
-        // diskDirs 中的元素升序排列
-        map.entrySet().stream()
-                .sorted(Map.Entry.comparingByValue())
-                .forEachOrdered(b -> diskDirs.add(b.getKey()));
-
-        String maxDisk = diskDirs.get(diskDirs.size()-1);
-        LocalStore localStore = storeMap.get(maxDisk);
-        localStore.setCurrentAvailable(map.get(maxDisk));
-        return localStore;
-    }
-    
-    public static List<StoreDir> getSubDirs(String diskDir) {
-        return new ArrayList<>(storeDirMap.get(diskDir).values());
-    }
-}

oss-store/src/main/java/cn/reghao/oss/store/util/store/StoreDir.java

@@ -1,37 +0,0 @@
-package cn.reghao.oss.store.util.store;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * @author reghao
- * @date 2022-05-23 23:31:21
- */
-public class StoreDir {
-    private final String baseDir;
-    private final AtomicInteger total;
-
-    public StoreDir(String baseDir) {
-        this.baseDir = baseDir;
-        this.total = new AtomicInteger(0);
-    }
-
-    public String getBaseDir() {
-        return baseDir;
-    }
-
-    public void setTotal(int total) {
-        this.total.setPlain(total);
-    }
-
-    public int getTotal() {
-        return total.get();
-    }
-
-    public void incr() {
-        this.total.incrementAndGet();
-    }
-
-    public void decr() {
-        this.total.decrementAndGet();
-    }
-}