Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

meta/sql: add primary key for all tables #1913

Merged
merged 3 commits into from
Apr 26, 2022
Merged

meta/sql: add primary key for all tables #1913

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f1907b
add pk for all tables
davies Apr 26, 2022
e696e69
test compatibility
davies Apr 26, 2022
b2ecf55
Update version_compatible.yml
davies Apr 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/version_compatible.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
pull_request:
#The branches below must be a subset of the branches above
branches:
- main
- release-**
paths-ignore:
- 'docs/**'
Expand Down
37 changes: 22 additions & 15 deletions pkg/meta/sql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ type counter struct {
}

type edge struct {
Id int64 `xorm:"pk bigserial"`
Parent Ino `xorm:"unique(edge) notnull"`
Name []byte `xorm:"unique(edge) varbinary(255) notnull"`
Inode Ino `xorm:"notnull"`
Expand Down Expand Up @@ -82,6 +83,7 @@ type namedNode struct {
}

type chunk struct {
Id int64 `xorm:"pk bigserial"`
Inode Ino `xorm:"unique(chunk) notnull"`
Indx uint32 `xorm:"unique(chunk) notnull"`
Slices []byte `xorm:"blob notnull"`
Expand All @@ -105,19 +107,22 @@ type symlink struct {
}

type xattr struct {
Id int64 `xorm:"pk bigserial"`
Inode Ino `xorm:"unique(name) notnull"`
Name string `xorm:"unique(name) notnull"`
Value []byte `xorm:"blob notnull"`
}

type flock struct {
Id int64 `xorm:"pk bigserial"`
Inode Ino `xorm:"notnull unique(flock)"`
Sid uint64 `xorm:"notnull unique(flock)"`
Owner int64 `xorm:"notnull unique(flock)"`
Ltype byte `xorm:"notnull"`
}

type plock struct {
Id int64 `xorm:"pk bigserial"`
Inode Ino `xorm:"notnull unique(plock)"`
Sid uint64 `xorm:"notnull unique(plock)"`
Owner int64 `xorm:"notnull unique(plock)"`
Expand All @@ -137,6 +142,7 @@ type session2 struct {
}

type sustained struct {
Id int64 `xorm:"pk bigserial"`
Sid uint64 `xorm:"unique(sustained) notnull"`
Inode Ino `xorm:"unique(sustained) notnull"`
}
Expand All @@ -152,6 +158,7 @@ type dbMeta struct {
db *xorm.Engine
snap *dbSnap
}

type dbSnap struct {
node map[Ino]*node
symlink map[Ino]*symlink
Expand Down Expand Up @@ -767,7 +774,7 @@ func (m *dbMeta) appendSlice(s *xorm.Session, inode Ino, indx uint32, buf []byte
}
if err == nil {
if n, _ := r.RowsAffected(); n == 0 {
err = mustInsert(s, &chunk{inode, indx, buf})
err = mustInsert(s, &chunk{Inode: inode, Indx: indx, Slices: buf})
}
}
return err
Expand Down Expand Up @@ -1053,7 +1060,7 @@ func (m *dbMeta) doMknod(ctx Context, parent Ino, name string, _type uint8, mode
}
}

if err = mustInsert(s, &edge{parent, []byte(name), ino, _type}, &n); err != nil {
if err = mustInsert(s, &edge{Parent: parent, Name: []byte(name), Inode: ino, Type: _type}, &n); err != nil {
return err
}
if parent != TrashInode {
Expand Down Expand Up @@ -1157,15 +1164,15 @@ func (m *dbMeta) doUnlink(ctx Context, parent Ino, name string) syscall.Errno {
return err
}
if trash > 0 {
if err = mustInsert(s, &edge{trash, []byte(fmt.Sprintf("%d-%d-%s", parent, e.Inode, string(e.Name))), e.Inode, e.Type}); err != nil {
if err = mustInsert(s, &edge{Parent: trash, Name: []byte(fmt.Sprintf("%d-%d-%s", parent, e.Inode, string(e.Name))), Inode: e.Inode, Type: e.Type}); err != nil {
return err
}
}
} else {
switch e.Type {
case TypeFile:
if opened {
if err = mustInsert(s, sustained{m.sid, e.Inode}); err != nil {
if err = mustInsert(s, sustained{Sid: m.sid, Inode: e.Inode}); err != nil {
return err
}
if _, err := s.Cols("nlink", "ctime").Update(&n, &node{Inode: e.Inode}); err != nil {
Expand Down Expand Up @@ -1279,7 +1286,7 @@ func (m *dbMeta) doRmdir(ctx Context, parent Ino, name string) syscall.Errno {
if _, err = s.Cols("ctime", "parent").Update(&n, &node{Inode: n.Inode}); err != nil {
return err
}
if err = mustInsert(s, &edge{trash, []byte(fmt.Sprintf("%d-%d-%s", parent, e.Inode, string(e.Name))), e.Inode, e.Type}); err != nil {
if err = mustInsert(s, &edge{Parent: trash, Name: []byte(fmt.Sprintf("%d-%d-%s", parent, e.Inode, string(e.Name))), Inode: e.Inode, Type: e.Type}); err != nil {
return err
}
} else {
Expand Down Expand Up @@ -1476,7 +1483,7 @@ func (m *dbMeta) doRename(ctx Context, parentSrc Ino, nameSrc string, parentDst
return err
}
name := fmt.Sprintf("%d-%d-%s", parentDst, dino, de.Name)
if err = mustInsert(s, &edge{trash, []byte(name), dino, de.Type}); err != nil {
if err = mustInsert(s, &edge{Parent: trash, Name: []byte(name), Inode: dino, Type: de.Type}); err != nil {
return err
}
} else if de.Type != TypeDirectory && dn.Nlink > 0 {
Expand All @@ -1489,7 +1496,7 @@ func (m *dbMeta) doRename(ctx Context, parentSrc Ino, nameSrc string, parentDst
if _, err := s.Cols("nlink", "ctime").Update(&dn, &node{Inode: dino}); err != nil {
return err
}
if err = mustInsert(s, sustained{m.sid, dino}); err != nil {
if err = mustInsert(s, sustained{Sid: m.sid, Inode: dino}); err != nil {
return err
}
} else {
Expand Down Expand Up @@ -1520,7 +1527,7 @@ func (m *dbMeta) doRename(ctx Context, parentSrc Ino, nameSrc string, parentDst
return err
}
}
if err = mustInsert(s, &edge{parentDst, de.Name, se.Inode, se.Type}); err != nil {
if err = mustInsert(s, &edge{Parent: parentDst, Name: de.Name, Inode: se.Inode, Type: se.Type}); err != nil {
return err
}
}
Expand Down Expand Up @@ -1743,7 +1750,7 @@ func (m *dbMeta) doDeleteSustainedInode(sid uint64, inode Ino) error {
if err = mustInsert(s, &delfile{inode, n.Length, time.Now().Unix()}); err != nil {
return err
}
_, err = s.Delete(&sustained{sid, inode})
_, err = s.Delete(&sustained{Sid: sid, Inode: inode})
if err != nil {
return err
}
Expand Down Expand Up @@ -1831,7 +1838,7 @@ func (m *dbMeta) Write(ctx Context, inode Ino, indx uint32, off uint32, slice Sl
return err
}
} else {
if err = mustInsert(s, &chunk{inode, indx, buf}); err != nil {
if err = mustInsert(s, &chunk{Inode: inode, Indx: indx, Slices: buf}); err != nil {
return err
}
}
Expand Down Expand Up @@ -2386,7 +2393,7 @@ func (m *dbMeta) ListXattr(ctx Context, inode Ino, names *[]byte) syscall.Errno

func (m *dbMeta) doSetXattr(ctx Context, inode Ino, name string, value []byte, flags uint32) syscall.Errno {
return errno(m.txn(func(s *xorm.Session) error {
var x = xattr{inode, name, value}
var x = xattr{Inode: inode, Name: name, Value: value}
var err error
var n int64
switch flags {
Expand All @@ -2396,7 +2403,7 @@ func (m *dbMeta) doSetXattr(ctx Context, inode Ino, name string, value []byte, f
err = syscall.EEXIST
}
case XattrReplace:
n, err = s.Update(&x, &xattr{inode, name, nil})
n, err = s.Update(&x, &xattr{Inode: inode, Name: name})
if err == nil && n == 0 {
err = ENOATTR
}
Expand All @@ -2411,7 +2418,7 @@ func (m *dbMeta) doSetXattr(ctx Context, inode Ino, name string, value []byte, f
} else {
n, err = s.Insert(&x)
if err != nil || n == 0 {
n, err = s.Update(&x, &xattr{inode, name, nil})
n, err = s.Update(&x, &xattr{Inode: inode, Name: name})
}
}
if err == nil && n == 0 {
Expand Down Expand Up @@ -2826,7 +2833,7 @@ func (m *dbMeta) loadEntry(e *DumpedEntry, cs *DumpedCounters, refs map[uint64]*
cs.NextChunk = int64(s.Chunkid) + 1
}
}
beansCh <- &chunk{inode, c.Index, slices}
beansCh <- &chunk{Inode: inode, Indx: c.Index, Slices: slices}
}
} else if n.Type == TypeDirectory {
n.Length = 4 << 10
Expand Down Expand Up @@ -2864,7 +2871,7 @@ func (m *dbMeta) loadEntry(e *DumpedEntry, cs *DumpedCounters, refs map[uint64]*
if len(e.Xattrs) > 0 {
bar.IncrTotal(int64(len(e.Xattrs)))
for _, x := range e.Xattrs {
beansCh <- &xattr{inode, x.Name, unescape(x.Value)}
beansCh <- &xattr{Inode: inode, Name: x.Name, Value: unescape(x.Value)}
}
}
beansCh <- n
Expand Down