[修改] 分片逻辑修改为基于ID

openflare_server/model/sharding.go

@@ -4,20 +4,28 @@ import (
 	"fmt"
 	"sort"
 	"strings"
+	"sync"
 
+	"github.com/bwmarrin/snowflake"
 	"gorm.io/gorm"
 	"gorm.io/sharding"
 )
 
 const observabilityShardCount = 10
 
+var (
+	observabilityIDNode     *snowflake.Node
+	observabilityIDNodeErr  error
+	observabilityIDNodeOnce sync.Once
+)
+
 func registerSharding(db *gorm.DB, backend string) error {
 	if db == nil {
 		return nil
 	}
 	_ = backend
 	if err := db.Use(sharding.Register(sharding.Config{
-		ShardingKey:         "node_id",
+		ShardingKey:         "id",
 		NumberOfShards:      observabilityShardCount,
 		PrimaryKeyGenerator: sharding.PKCustom,
 		PrimaryKeyGeneratorFn: func(tableIdx int64) int64 {
@@ -37,6 +45,14 @@ func shardedObservabilityTables() []any {
 	}
 }
 
+func shardedObservabilityBaseTables() []string {
+	return []string{
+		"node_metric_snapshots",
+		"node_request_reports",
+		"node_access_logs",
+	}
+}
+
 func isShardedObservabilityTable(tableName string) bool {
 	switch strings.TrimSpace(tableName) {
 	case "node_metric_snapshots", "node_request_reports", "node_access_logs":
@@ -62,10 +78,60 @@ func observabilityShardSuffixes() []string {
 	return suffixes
 }
 
+func observabilityShardSuffixForID(id uint) string {
+	return fmt.Sprintf("_%02d", uint64(id)%uint64(observabilityShardCount))
+}
+
+func observabilityShardTableForID(baseTable string, id uint) string {
+	return baseTable + observabilityShardSuffixForID(id)
+}
+
+func legacyObservabilityShardTableName(tableName string) string {
+	return tableName + "_legacy_v2_to_v3"
+}
+
+func normalizeShardedDB(db *gorm.DB) *gorm.DB {
+	if db != nil {
+		return db
+	}
+	return DB
+}
+
+func nextObservabilityID() (uint, error) {
+	observabilityIDNodeOnce.Do(func() {
+		observabilityIDNode, observabilityIDNodeErr = snowflake.NewNode(0)
+	})
+	if observabilityIDNodeErr != nil {
+		return 0, observabilityIDNodeErr
+	}
+	id := observabilityIDNode.Generate().Int64()
+	if id <= 0 {
+		return 0, fmt.Errorf("generated invalid observability id %d", id)
+	}
+	return uint(id), nil
+}
+
+func assignObservabilityID(id *uint) error {
+	if id == nil || *id != 0 {
+		return nil
+	}
+	generated, err := nextObservabilityID()
+	if err != nil {
+		return err
+	}
+	*id = generated
+	return nil
+}
+
 func queryAcrossShards[T any](baseTable string, query func(tx *gorm.DB) ([]T, error)) ([]T, error) {
+	return queryAcrossShardsWithDB(DB, baseTable, query)
+}
+
+func queryAcrossShardsWithDB[T any](db *gorm.DB, baseTable string, query func(tx *gorm.DB) ([]T, error)) ([]T, error) {
 	items := make([]T, 0)
+	db = normalizeShardedDB(db)
 	for _, table := range observabilityShardTables(baseTable) {
-		rows, err := query(DB.Table(table))
+		rows, err := query(db.Table(table))
 		if err != nil {
 			return nil, err
 		}