Browse Source

修复调试问题

gitlink
Sydonian 1 year ago
parent
commit
7f5f1c4dca
2 changed files with 60 additions and 20 deletions
  1. +24
    -12
      common/models/models.go
  2. +36
    -8
      common/pkgs/db2/model/model.go

+ 24
- 12
common/models/models.go View File

@@ -7,10 +7,14 @@ import (
)

type ObjectBlock struct {
ObjectID cdssdk.ObjectID `gorm:"colunm:ObjectID; primaryKey" json:"objectID"`
Index int `gorm:"colunm:Index; primaryKey" json:"index"`
StorageID cdssdk.StorageID `gorm:"colunm:StorageID; primaryKey" json:"storageID"` // 这个块应该在哪个节点上
FileHash cdssdk.FileHash `gorm:"colunm:FileHash" json:"fileHash"`
ObjectID cdssdk.ObjectID `gorm:"column:ObjectID; primaryKey" json:"objectID"`
Index int `gorm:"column:Index; primaryKey" json:"index"`
StorageID cdssdk.StorageID `gorm:"column:StorageID; primaryKey" json:"storageID"` // 这个块应该在哪个节点上
FileHash cdssdk.FileHash `gorm:"column:FileHash" json:"fileHash"`
}

func (ObjectBlock) TableName() string {
return "ObjectBlock"
}

type ObjectDetail struct {
@@ -102,17 +106,25 @@ type LocalMachineInfo struct {
}

type PackageAccessStat struct {
PackageID cdssdk.PackageID `gorm:"colunm:PackageID; primaryKey" json:"packageID"`
StorageID cdssdk.StorageID `gorm:"colunm:StorageID; primaryKey" json:"storageID"`
Amount float64 `gorm:"colunm:Amount" json:"amount"` // 前一日的读取量的滑动平均值
Counter float64 `gorm:"colunm:Counter" json:"counter"` // 当日的读取量
PackageID cdssdk.PackageID `gorm:"column:PackageID; primaryKey" json:"packageID"`
StorageID cdssdk.StorageID `gorm:"column:StorageID; primaryKey" json:"storageID"`
Amount float64 `gorm:"column:Amount" json:"amount"` // 前一日的读取量的滑动平均值
Counter float64 `gorm:"column:Counter" json:"counter"` // 当日的读取量
}

func (PackageAccessStat) TableName() string {
return "PackageAccessStat"
}

type ObjectAccessStat struct {
ObjectID cdssdk.ObjectID `gorm:"colunm:ObjectID; primaryKey" json:"objectID"`
StorageID cdssdk.StorageID `gorm:"colunm:StorageID; primaryKey" json:"storageID"`
Amount float64 `gorm:"colunm:Amount" json:"amount"` // 前一日的读取量的滑动平均值
Counter float64 `gorm:"colunm:Counter" json:"counter"` // 当日的读取量
ObjectID cdssdk.ObjectID `gorm:"column:ObjectID; primaryKey" json:"objectID"`
StorageID cdssdk.StorageID `gorm:"column:StorageID; primaryKey" json:"storageID"`
Amount float64 `gorm:"column:Amount" json:"amount"` // 前一日的读取量的滑动平均值
Counter float64 `gorm:"column:Counter" json:"counter"` // 当日的读取量
}

func (ObjectAccessStat) TableName() string {
return "ObjectAccessStat"
}

type StorageDetail struct {


+ 36
- 8
common/pkgs/db2/model/model.go View File

@@ -14,8 +14,12 @@ import (
type Storage = cdssdk.Storage

type User struct {
UserID cdssdk.UserID `gorm:"colunm:UserID" json:"userID"`
Password string `gorm:"colunm:Password" json:"password"`
UserID cdssdk.UserID `gorm:"column:UserID" json:"userID"`
Password string `gorm:"column:Password" json:"password"`
}

func (User) TableName() string {
return "User"
}

type UserBucket struct {
@@ -23,16 +27,28 @@ type UserBucket struct {
BucketID cdssdk.BucketID `gorm:"column:BucketID; primaryKey" json:"bucketID"`
}

func (UserBucket) TableName() string {
return "UserBucket"
}

type UserNode struct {
UserID cdssdk.UserID `gorm:"column:UserID; primaryKey" json:"userID"`
NodeID cdssdk.NodeID `gorm:"column:NodeID; primaryKey" json:"nodeID"`
}

func (UserNode) TableName() string {
return "UserNode"
}

type UserStorage struct {
UserID cdssdk.UserID `gorm:"column:UserID; primaryKey" json:"userID"`
StorageID cdssdk.StorageID `gorm:"column:StorageID; primaryKey" json:"storageID"`
}

func (UserStorage) TableName() string {
return "UserStorage"
}

type Bucket = cdssdk.Bucket

type Package = cdssdk.Package
@@ -76,10 +92,14 @@ func (o *RedundancyWarpper) Scan(src interface{}) error {
type ObjectBlock = stgmod.ObjectBlock

type Cache struct {
FileHash cdssdk.FileHash `gorm:"colunm:FileHash; primaryKey" json:"fileHash"`
StorageID cdssdk.StorageID `gorm:"colunm:StorageID; primaryKey" json:"storageID"`
CreateTime time.Time `gorm:"colunm:CreateTime" json:"createTime"`
Priority int `gorm:"colunm:Priority" json:"priority"`
FileHash cdssdk.FileHash `gorm:"column:FileHash; primaryKey" json:"fileHash"`
StorageID cdssdk.StorageID `gorm:"column:StorageID; primaryKey" json:"storageID"`
CreateTime time.Time `gorm:"column:CreateTime" json:"createTime"`
Priority int `gorm:"column:Priority" json:"priority"`
}

func (Cache) TableName() string {
return "Cache"
}

const (
@@ -96,7 +116,15 @@ type StoragePackage struct {
State string `gorm:"column:State" json:"state"`
}

func (StoragePackage) TableName() string {
return "StoragePackage"
}

type Location struct {
LocationID cdssdk.LocationID `gorm:"colunm:LocationID; primaryKey; autoIncrement" json:"locationID"`
Name string `gorm:"colunm:Name" json:"name"`
LocationID cdssdk.LocationID `gorm:"column:LocationID; primaryKey; autoIncrement" json:"locationID"`
Name string `gorm:"column:Name" json:"name"`
}

func (Location) TableName() string {
return "Location"
}

Loading…
Cancel
Save