Skip to content

Commit

Permalink
update metas
Browse files Browse the repository at this point in the history
  • Loading branch information
@CodingPoeta
CodingPoeta committed Jan 17, 2025
1 parent 6413191 commit 7d36859
Show file tree
Hide file tree
Showing 4 changed files with 58 additions and 37 deletions.
10 changes: 10 additions & 0 deletions pkg/meta/redis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1745,6 +1745,16 @@ func (m *redisMeta) doRename(ctx Context, parentSrc Ino, nameSrc string, parentD
if err := tx.Watch(ctx, keys...).Err(); err != nil {
return err
}
if dino > 0 {
if ino == dino {
return errno(nil)
}
if typ == TypeDirectory && dtyp != TypeDirectory {
return syscall.ENOTDIR
} else if typ != TypeDirectory && dtyp == TypeDirectory {
return syscall.EISDIR
}
}

keys = []string{m.inodeKey(parentSrc), m.inodeKey(parentDst), m.inodeKey(ino)}
if dino > 0 {
Expand Down
75 changes: 40 additions & 35 deletions pkg/meta/sql.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,8 @@ func retriveUrlConnsOptions(murl string) (string, int, int, int, int) {

var vOpenConns int = 0
var vIdleConns int = runtime.GOMAXPROCS(-1) * 2
var vIdleTime int = 300
var vLifeTime int = 0
var vIdleTime int = 300
var vLifeTime int = 0

if optIndex != -1 {
baseurl := murl[:optIndex]
Expand All @@ -307,11 +307,11 @@ func retriveUrlConnsOptions(murl string) (string, int, int, int, int) {
}
if vals.Has("max_idle_time") {
vIdleTime, _ = strconv.Atoi(vals.Get("max_idle_time"))
vals.Del("max_idle_time");
vals.Del("max_idle_time")
}
if vals.Has("max_life_time") {
vLifeTime, _ = strconv.Atoi(vals.Get("max_life_time"))
vals.Del("max_life_time");
vals.Del("max_life_time")
}
optsurl = vals.Encode()
}
Expand Down Expand Up @@ -1245,17 +1245,17 @@ func (m *dbMeta) upsertSlice(s *xorm.Session, inode Ino, indx uint32, buf []byte
driver := m.Name()
if driver == "sqlite3" || driver == "postgres" {
_, err = s.Exec(`
INSERT INTO jfs_chunk (inode, indx, slices)
VALUES (?, ?, ?)
ON CONFLICT (inode, indx)
DO UPDATE SET slices=jfs_chunk.slices || ?`, inode, indx, buf, buf)
INSERT INTO jfs_chunk (inode, indx, slices)
VALUES (?, ?, ?)
ON CONFLICT (inode, indx)
DO UPDATE SET slices=jfs_chunk.slices || ?`, inode, indx, buf, buf)
} else {
var r sql.Result
r, err = s.Exec(`
INSERT INTO jfs_chunk (inode, indx, slices)
VALUES (?, ?, ?)
ON DUPLICATE KEY UPDATE
slices=concat(slices, ?)`, inode, indx, buf, buf)
INSERT INTO jfs_chunk (inode, indx, slices)
VALUES (?, ?, ?)
ON DUPLICATE KEY UPDATE
slices=concat(slices, ?)`, inode, indx, buf, buf)
n, _ := r.RowsAffected()
*insert = n == 1 // https://dev.mysql.com/doc/refman/5.7/en/insert-on-duplicate.html
}
Expand Down Expand Up @@ -2052,31 +2052,36 @@ func (m *dbMeta) doRename(ctx Context, parentSrc Ino, nameSrc string, parentDst
dn.Parent = parentSrc
}
}
} else if de.Inode == se.Inode {
return nil
} else if se.Type == TypeDirectory && de.Type != TypeDirectory {
return syscall.ENOTDIR
} else if de.Type == TypeDirectory {
if se.Type != TypeDirectory {
return syscall.EISDIR
}
exist, err := s.Exist(&edge{Parent: de.Inode})
if err != nil {
return err
}
if exist {
return syscall.ENOTEMPTY
}
dpn.Nlink--
dstnlink--
dupdate = true
if trash > 0 {
dn.Parent = trash
}
} else {
if de.Type == TypeDirectory {
exist, err := s.Exist(&edge{Parent: de.Inode})
if err != nil {
return err
}
if exist {
return syscall.ENOTEMPTY
}
dpn.Nlink--
dstnlink--
dupdate = true
if trash > 0 {
dn.Parent = trash
}
} else {
if trash == 0 {
dn.Nlink--
if de.Type == TypeFile && dn.Nlink == 0 {
opened = m.of.IsOpen(dn.Inode)
}
defer func() { m.of.InvalidateChunk(dino, invalidateAttrOnly) }()
} else if dn.Parent > 0 {
dn.Parent = trash
if trash == 0 {
dn.Nlink--
if de.Type == TypeFile && dn.Nlink == 0 {
opened = m.of.IsOpen(dn.Inode)
}
defer func() { m.of.InvalidateChunk(dino, invalidateAttrOnly) }()
} else if dn.Parent > 0 {
dn.Parent = trash
}
}
if ctx.Uid() != 0 && dpn.Mode&01000 != 0 && ctx.Uid() != dpn.Uid && ctx.Uid() != dn.Uid {
Expand Down
6 changes: 6 additions & 0 deletions pkg/meta/tkv.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1592,6 +1592,12 @@ func (m *kvMeta) doRename(ctx Context, parentSrc Ino, nameSrc string, parentDst
tattr.Parent = parentSrc
}
}
} else if dino == ino {
return nil
} else if typ == TypeDirectory && dtyp != TypeDirectory {
return syscall.ENOTDIR
} else if typ != TypeDirectory && dtyp == TypeDirectory {
return syscall.EISDIR
} else {
if dtyp == TypeDirectory {
if tx.exist(m.entryKey(dino, "")) {
Expand Down
4 changes: 2 additions & 2 deletions sdk/java/libjfs/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -869,12 +869,12 @@ func jfs_rmr(pid int64, h int64, cpath *C.char) int32 {
}

//export jfs_rename
func jfs_rename(pid int64, h int64, oldpath *C.char, newpath *C.char) int32 {
func jfs_rename(pid int64, h int64, oldpath *C.char, newpath *C.char, flags uint32) int32 {
w := F(h)
if w == nil {
return EINVAL
}
return errno(w.Rename(w.withPid(pid), C.GoString(oldpath), C.GoString(newpath), meta.RenameNoReplace))
return errno(w.Rename(w.withPid(pid), C.GoString(oldpath), C.GoString(newpath), flags))
}

//export jfs_truncate
Expand Down

0 comments on commit 7d36859

Please sign in to comment.