Merge branch 'master' into bump-ui-versions

pingcap · Nov 22, 2021 · 6267c75 · 6267c75
2 parents 0924000 + 7ce4e0e
commit 6267c75
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/pkg/keyvisual/storage/model.go b/pkg/keyvisual/storage/model.go
@@ -7,6 +7,8 @@ import (
 	"encoding/gob"
 	"time"
 
+	"gorm.io/gorm"
+
 	"github.com/pingcap/tidb-dashboard/pkg/dbstore"
 	"github.com/pingcap/tidb-dashboard/pkg/keyvisual/matrix"
 )
@@ -66,7 +68,9 @@ func CreateTableAxisModelIfNotExists(db *dbstore.DB) (bool, error) {
 }
 
 func ClearTableAxisModel(db *dbstore.DB) error {
-	return db.Delete(&AxisModel{}).Error
+	return db.Session(&gorm.Session{AllowGlobalUpdate: true}).
+		Delete(&AxisModel{}).
+		Error
 }
 
 func FindAxisModelsOrderByTime(db *dbstore.DB, layerNum uint8) ([]*AxisModel, error) {

diff --git a/pkg/keyvisual/storage/model_test.go b/pkg/keyvisual/storage/model_test.go
@@ -63,7 +63,7 @@ func (t *testDbstoreSuite) TestClearTableAxisModel(c *C) {
 	if err != nil {
 		c.Fatalf("Count table AxisModel error: %v", err)
 	}
-	c.Assert(count, Equals, 1)
+	c.Assert(count, Equals, int64(1))
 
 	err = ClearTableAxisModel(t.db)
 	c.Assert(err, IsNil)
@@ -72,7 +72,7 @@ func (t *testDbstoreSuite) TestClearTableAxisModel(c *C) {
 	if err != nil {
 		c.Fatalf("Count table AxisModel error: %v", err)
 	}
-	c.Assert(count, Equals, 0)
+	c.Assert(count, Equals, int64(0))
 }
 
 func (t *testDbstoreSuite) TestAxisModelFunc(c *C) {
@@ -112,7 +112,7 @@ func (t *testDbstoreSuite) TestAxisModelFunc(c *C) {
 	if err != nil {
 		c.Fatalf("Count table AxisModel error: %v", err)
 	}
-	c.Assert(count, Equals, 0)
+	c.Assert(count, Equals, int64(0))
 
 	err = axisModel.Delete(t.db)
 	c.Assert(err, IsNil)
@@ -146,7 +146,7 @@ func (t *testDbstoreSuite) TestAxisModelsFindAndDelete(c *C) {
 	if err != nil {
 		c.Fatalf("Count table AxisModel error: %v", err)
 	}
-	c.Assert(count, Equals, int(maxLayerNum)*axisModelNumEachLayer)
+	c.Assert(count, Equals, int64(int(maxLayerNum)*axisModelNumEachLayer))
 
 	findLayerNum := maxLayerNum - 1
 	axisModels, err := FindAxisModelsOrderByTime(t.db, findLayerNum)
@@ -164,7 +164,7 @@ func (t *testDbstoreSuite) TestAxisModelsFindAndDelete(c *C) {
 	if err != nil {
 		c.Fatalf("Count table AxisModel error: %v", err)
 	}
-	c.Assert(count, Equals, int(maxLayerNum-1)*axisModelNumEachLayer)
+	c.Assert(count, Equals, int64(int(maxLayerNum-1)*axisModelNumEachLayer))
 }
 
 func axisModelsDeepEqual(obtainedAxisModels []*AxisModel, expectedAxisModels []*AxisModel, c *C) {