日常查询由mysql改为clickhouse

EdgeNode/internal/caches/manager.go

@@ -1,7 +1,6 @@
 package caches
 
 import (
-	"fmt"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
 	teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
@@ -10,7 +9,6 @@ import (
 	memutils "github.com/TeaOSLab/EdgeNode/internal/utils/mem"
 	"github.com/iwind/TeaGo/lists"
 	"github.com/iwind/TeaGo/types"
-	"golang.org/x/sys/unix"
 	"strconv"
 	"sync"
 )
@@ -191,44 +189,6 @@ func (this *Manager) StorageMap() map[int64]StorageInterface {
 	return this.storageMap
 }
 
-// TotalDiskSize 消耗的磁盘尺寸
-func (this *Manager) TotalDiskSize() int64 {
-	this.locker.RLock()
-	defer this.locker.RUnlock()
-
-	var total = int64(0)
-	var sidMap = map[string]bool{} // partition sid => bool
-	for _, storage := range this.storageMap {
-		// 这里不能直接用 storage.TotalDiskSize() 相加，因为多个缓存策略缓存目录可能处在同一个分区目录下
-		fileStorage, ok := storage.(*FileStorage)
-		if ok {
-			var options = fileStorage.options // copy
-			if options != nil {
-				var dir = options.Dir // copy
-				if len(dir) == 0 {
-					continue
-				}
-				var stat = &unix.Statfs_t{}
-				err := unix.Statfs(dir, stat)
-				if err != nil {
-					continue
-				}
-				var sid = fmt.Sprintf("%d_%d", stat.Fsid.Val[0], stat.Fsid.Val[1])
-				if sidMap[sid] {
-					continue
-				}
-				sidMap[sid] = true
-				total += int64(stat.Blocks-stat.Bfree) * int64(stat.Bsize) // we add extra int64() for darwin
-			}
-		}
-	}
-
-	if total < 0 {
-		total = 0
-	}
-
-	return total
-}
 
 // TotalMemorySize 消耗的内存尺寸
 func (this *Manager) TotalMemorySize() int64 {

EdgeNode/internal/caches/manager_unix.go

@@ -0,0 +1,48 @@
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+//go:build !windows
+
+package caches
+
+import (
+	"fmt"
+	"golang.org/x/sys/unix"
+)
+
+// TotalDiskSize 消耗的磁盘尺寸
+func (this *Manager) TotalDiskSize() int64 {
+	this.locker.RLock()
+	defer this.locker.RUnlock()
+
+	var total = int64(0)
+	var sidMap = map[string]bool{} // partition sid => bool
+	for _, storage := range this.storageMap {
+		// 这里不能直接用 storage.TotalDiskSize() 相加，因为多个缓存策略缓存目录可能处在同一个分区目录下
+		fileStorage, ok := storage.(*FileStorage)
+		if ok {
+			var options = fileStorage.options // copy
+			if options != nil {
+				var dir = options.Dir // copy
+				if len(dir) == 0 {
+					continue
+				}
+				var stat = &unix.Statfs_t{}
+				err := unix.Statfs(dir, stat)
+				if err != nil {
+					continue
+				}
+				var sid = fmt.Sprintf("%d_%d", stat.Fsid.Val[0], stat.Fsid.Val[1])
+				if sidMap[sid] {
+					continue
+				}
+				sidMap[sid] = true
+				total += int64(stat.Blocks-stat.Bfree) * int64(stat.Bsize) // we add extra int64() for darwin
+			}
+		}
+	}
+
+	if total < 0 {
+		total = 0
+	}
+
+	return total
+}

EdgeNode/internal/caches/storage_file.go

@@ -35,7 +35,6 @@ import (
 	"strings"
 	"sync"
 	"sync/atomic"
-	"syscall"
 	"time"
 )
 
@@ -736,7 +735,7 @@ func (this *FileStorage) openWriter(key string, expiredAt int64, status int, hea
 
 	// 尝试锁定，如果锁定失败，则直接返回
 	fsutils.WriterLimiter.Ack()
-	err = syscall.Flock(int(writer.Fd()), syscall.LOCK_EX|syscall.LOCK_NB)
+	err = tryLockFile(int(writer.Fd()))
 	fsutils.WriterLimiter.Release()
 	if err != nil {
 		removeOnFailure = false

EdgeNode/internal/caches/storage_utils_unix.go

@@ -0,0 +1,9 @@
+//go:build !windows
+
+package caches
+
+import "syscall"
+
+func tryLockFile(fd int) error {
+	return syscall.Flock(fd, syscall.LOCK_EX|syscall.LOCK_NB)
+}