Skip to content

Commit

Permalink
make lint happy.
Browse files Browse the repository at this point in the history
  • Loading branch information
PaienNate committed Oct 22, 2024
1 parent f9c4b57 commit 1064ba4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
7 changes: 4 additions & 3 deletions dice/model/gormcache.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package model
import (
"context"
"errors"
"fmt"
"strconv"
"time"

"github.com/go-gorm/caches/v4"
Expand All @@ -23,7 +23,7 @@ type buntDBCacher struct {

func generateHashKey(key string) string {
hash := murmur3.Sum64([]byte(key))
return fmt.Sprintf("%x", hash) // 返回十六进制字符串
return strconv.FormatUint(hash, 16) // 返回十六进制字符串
}

// Get 从缓存中获取与给定键关联的数据。
Expand All @@ -48,7 +48,8 @@ func (c *buntDBCacher) Get(_ context.Context, key string, q *caches.Query[any])
// 如果键在数据库中不存在,记录信息并返回nil, nil。
if errors.Is(err, buntdb.ErrNotFound) {
c.missCount++ // Increment miss count
return nil, nil
// 此处不得不忽略,因为这个cache的实现机理就是如此,除非修改gorm cache的源码。
return nil, nil //nolint:nilnil
}

// 如果发生其他错误,返回错误信息。
Expand Down
15 changes: 7 additions & 8 deletions dice/model/log.go
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ func LogDelete(db *gorm.DB, groupID string, logName string) bool {

// 开启事务
tx := db.Begin()
if err := tx.Error; err != nil {
if err = tx.Error; err != nil {
return false
}
defer func() {
Expand All @@ -370,12 +370,12 @@ func LogDelete(db *gorm.DB, groupID string, logName string) bool {
}()

// 删除 log_id 相关的 log_items 记录
if err := tx.Where("log_id = ?", logID).Delete(&LogOneItem{}).Error; err != nil {
if err = tx.Where("log_id = ?", logID).Delete(&LogOneItem{}).Error; err != nil {
return false
}

// 删除 log_id 相关的 logs 记录
if err := tx.Where("id = ?", logID).Delete(&LogInfo{}).Error; err != nil {
if err = tx.Where("id = ?", logID).Delete(&LogInfo{}).Error; err != nil {
return false
}

Expand All @@ -398,7 +398,7 @@ func LogAppend(db *gorm.DB, groupID string, logName string, logItem *LogOneItem)

// 开始事务
tx := db.Begin()
if err := tx.Error; err != nil {
if err = tx.Error; err != nil {
return false
}
defer func() {
Expand All @@ -410,15 +410,14 @@ func LogAppend(db *gorm.DB, groupID string, logName string, logItem *LogOneItem)
if logID == 0 {
// 创建一个新的 log
newLog := LogInfo{Name: logName, GroupID: groupID, CreatedAt: nowTimestamp, UpdatedAt: nowTimestamp}
if err := tx.Create(&newLog).Error; err != nil {
if err = tx.Create(&newLog).Error; err != nil {
return false
}
logID = newLog.ID
}

// 向 log_items 表中添加一条信息
// Pinenutn: 由此可以推知,CommandInfo必然是一个 map[string]interface{}
//data, err := json.Marshal(logItem.CommandInfo)

if err != nil {
return false
Expand All @@ -438,12 +437,12 @@ func LogAppend(db *gorm.DB, groupID string, logName string, logItem *LogOneItem)
UniformID: logItem.UniformID,
}

if err := tx.Create(&newLogItem).Error; err != nil {
if err = tx.Create(&newLogItem).Error; err != nil {
return false
}

// 更新 logs 表中的 updated_at 字段
if err := tx.Model(&LogInfo{}).Where("id = ?", logID).Update("updated_at", nowTimestamp).Error; err != nil {
if err = tx.Model(&LogInfo{}).Where("id = ?", logID).Update("updated_at", nowTimestamp).Error; err != nil {
return false
}

Expand Down

0 comments on commit 1064ba4

Please sign in to comment.