opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4360 from swordqiu/hotfix/qj-update-vendor-20191226

Browse Source 
update vendor
This commit is contained in:
Zexi Li
2019-12-27 15:58:25 +08:00
committed by GitHub
parent f5b5bcfea6 a10804747e
commit 6965bddfbc
4 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -137,7 +137,7 @@ require (
yunion.io/x/log v0.0.0-20190629062853-9f6483a7103d
yunion.io/x/pkg v0.0.0-20191221094533-5097f12f41ac
yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e
yunion.io/x/sqlchemy v0.0.0-20191223103213-67358d3737b6
yunion.io/x/sqlchemy v0.0.0-20191226074733-6eb73845bfb7
yunion.io/x/structarg v0.0.0-20190809075558-115bed041de3
)
go.sum
+2 -2
View File
@@ -675,7 +675,7 @@ yunion.io/x/pkg v0.0.0-20191221094533-5097f12f41ac h1:upUF6LBhCKx9c/OUzSUwfv50oC
yunion.io/x/pkg v0.0.0-20191221094533-5097f12f41ac/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E=
yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e h1:v+EzIadodSwkdZ/7bremd7J8J50Cise/HCylsOJngmo=
yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e/go.mod h1:0iFKpOs1y4lbCxeOmq3Xx/0AcQoewVPwj62eRluioEo=
yunion.io/x/sqlchemy v0.0.0-20191223103213-67358d3737b6 h1:sxM1xAJetpHl+jRVqDWzMJuWw2usCRrhmOPdDPt7N9E=
yunion.io/x/sqlchemy v0.0.0-20191223103213-67358d3737b6/go.mod h1:FTdwPdGhMgh4E+UFXc9klI1Ok34fMuybTT+jLhOaIjI=
yunion.io/x/sqlchemy v0.0.0-20191226074733-6eb73845bfb7 h1:nK047S9fIjIBkB9Yyo2e6itUA7TpmFsd7/a6mGKjNU0=
yunion.io/x/sqlchemy v0.0.0-20191226074733-6eb73845bfb7/go.mod h1:FTdwPdGhMgh4E+UFXc9klI1Ok34fMuybTT+jLhOaIjI=
yunion.io/x/structarg v0.0.0-20190809075558-115bed041de3 h1:bfC8EhXYvyGYldRWlzxiCM39Zfj3s3+zham9mW2h2LE=
yunion.io/x/structarg v0.0.0-20190809075558-115bed041de3/go.mod h1:EP6NSv2C0zzqBDTKumv8hPWLb3XvgMZDHQRfyuOrQng=
vendor/modules.txt
Vendored
+1 -1
View File
@@ -839,7 +839,7 @@ yunion.io/x/pkg/util/workqueue
yunion.io/x/pkg/utils
# yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e
yunion.io/x/s3cli
# yunion.io/x/sqlchemy v0.0.0-20191223103213-67358d3737b6
# yunion.io/x/sqlchemy v0.0.0-20191226074733-6eb73845bfb7
yunion.io/x/sqlchemy
# yunion.io/x/structarg v0.0.0-20190809075558-115bed041de3
yunion.io/x/structarg
vendor/yunion.io/x/sqlchemy/sync.go
Generated Vendored
+41 -16
View File
@@ -174,25 +174,39 @@ func compareColumnSpec(c1, c2 IColumnSpec) int {
return strings.Compare(c1.Name(), c2.Name())
}
func diffCols(tableName string, cols1 []IColumnSpec, cols2 []IColumnSpec) ([]IColumnSpec, []IColumnSpec, []IColumnSpec) {
type sUpdateColumnSpec struct {
oldCol IColumnSpec
newCol IColumnSpec
}
func diffCols(tableName string, cols1 []IColumnSpec, cols2 []IColumnSpec) ([]IColumnSpec, []sUpdateColumnSpec, []IColumnSpec) {
sort.Slice(cols1, func(i, j int) bool {
return compareColumnSpec(cols1[i], cols1[j]) < 0
})
sort.Slice(cols2, func(i, j int) bool {
return compareColumnSpec(cols2[i], cols2[j]) < 0
})
// for i := range cols1 {
// log.Debugf("%s %v", cols1[i].DefinitionString(), cols1[i].IsPrimary())
// }
// for i := range cols2 {
// log.Debugf("%s %v", cols2[i].DefinitionString(), cols2[i].IsPrimary())
// }
i := 0
j := 0
remove := make([]IColumnSpec, 0)
update := make([]IColumnSpec, 0)
update := make([]sUpdateColumnSpec, 0)
add := make([]IColumnSpec, 0)
for i < len(cols1) || j < len(cols2) {
if i < len(cols1) && j < len(cols2) {
comp := compareColumnSpec(cols1[i], cols2[j])
if comp == 0 {
if cols1[i].DefinitionString() != cols2[j].DefinitionString() {
log.Infof("UPDATE %s: %s => %s", tableName, cols1[i].DefinitionString(), cols2[j].DefinitionString())
update = append(update, cols2[j])
if cols1[i].DefinitionString() != cols2[j].DefinitionString() || cols1[i].IsPrimary() != cols2[j].IsPrimary() {
log.Infof("UPDATE %s: %s(primary:%v) => %s(primary:%v)", tableName, cols1[i].DefinitionString(), cols1[i].IsPrimary(), cols2[j].DefinitionString(), cols2[j].IsPrimary())
update = append(update, sUpdateColumnSpec{
oldCol: cols1[i],
newCol: cols2[j],
})
}
i += 1
j += 1
@@ -295,19 +309,28 @@ func (ts *STableSpec) SyncSQL() []string {
changePrimary = true
}
}
// for _, col := range update {
// if col.IsPrimary() {
// changePrimary = true
// }
// }
for _, cols := range update {
if cols.oldCol.IsPrimary() != cols.newCol.IsPrimary() {
changePrimary = true
}
}
for _, col := range add {
if col.IsPrimary() {
changePrimary = true
}
}
if changePrimary {
sql := fmt.Sprintf("DROP PRIMARY KEY")
alters = append(alters, sql)
oldHasPrimary := false
for _, c := range cols {
if c.IsPrimary() {
oldHasPrimary = true
break
}
}
if oldHasPrimary {
sql := fmt.Sprintf("DROP PRIMARY KEY")
alters = append(alters, sql)
}
}
/* IGNORE DROP STATEMENT */
for _, col := range remove {
@@ -315,8 +338,8 @@ func (ts *STableSpec) SyncSQL() []string {
// alters = append(alters, sql)
log.Infof("ALTER TABLE %s %s;", ts.name, sql)
}
for _, col := range update {
sql := fmt.Sprintf("MODIFY %s", col.DefinitionString())
for _, cols := range update {
sql := fmt.Sprintf("MODIFY %s", cols.newCol.DefinitionString())
alters = append(alters, sql)
}
for _, col := range add {
@@ -330,8 +353,10 @@ func (ts *STableSpec) SyncSQL() []string {
primaries = append(primaries, fmt.Sprintf("`%s`", c.Name()))
}
}
sql := fmt.Sprintf("ADD PRIMARY KEY(%s)", strings.Join(primaries, ", "))
alters = append(alters, sql)
if len(primaries) > 0 {
sql := fmt.Sprintf("ADD PRIMARY KEY(%s)", strings.Join(primaries, ", "))
alters = append(alters, sql)
}
}
if len(alters) > 0 {