From 7f5f1c4dcae4aac4050a37dc29445f16cd703291 Mon Sep 17 00:00:00 2001 From: Sydonian <794346190@qq.com> Date: Wed, 30 Oct 2024 17:17:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B0=83=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/models/models.go | 36 ++++++++++++++++++---------- common/pkgs/db2/model/model.go | 44 +++++++++++++++++++++++++++------- 2 files changed, 60 insertions(+), 20 deletions(-) diff --git a/common/models/models.go b/common/models/models.go index 817ecdf..49c0177 100644 --- a/common/models/models.go +++ b/common/models/models.go @@ -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 { diff --git a/common/pkgs/db2/model/model.go b/common/pkgs/db2/model/model.go index 3fd069e..9db304a 100644 --- a/common/pkgs/db2/model/model.go +++ b/common/pkgs/db2/model/model.go @@ -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" }