gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplifying dirhash to 64bit integer

Browse Source
This commit is contained in:
Chris Lu
2018-05-26 21:24:03 -07:00
parent 955eae3500
commit 87b3b84471
3 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
weed/filer2/abstract_sql/abstract_sql_store.go
View File

@@ -21,7 +21,7 @@ func (store *AbstractSqlStore) InsertEntry(entry *filer2.Entry) (err error) {
}
res, err := store.DB.Exec("INSERT INTO filemeta (dirhash,name,directory,meta) VALUES(?,?,?,?)",
md5hash(dir), name, dir, meta)
hashToLong(dir), name, dir, meta)
if err != nil {
return fmt.Errorf("mysql insert %s: %s", entry.FullPath, err)
}
@@ -42,7 +42,7 @@ func (store *AbstractSqlStore) UpdateEntry(entry *filer2.Entry) (err error) {
}
res, err := store.DB.Exec("UPDATE filemeta SET meta=? WHERE dirhash=? AND name=? AND directory=?",
meta, md5hash(dir), name, dir)
meta, hashToLong(dir), name, dir)
if err != nil {
return fmt.Errorf("mysql update %s: %s", entry.FullPath, err)
}
@@ -58,7 +58,7 @@ func (store *AbstractSqlStore) FindEntry(fullpath filer2.FullPath) (*filer2.Entr
dir, name := fullpath.DirAndName()
row := store.DB.QueryRow("SELECT meta FROM filemeta WHERE dirhash=? AND name=? AND directory=?",
md5hash(dir), name, dir)
hashToLong(dir), name, dir)
var data []byte
if err := row.Scan(&data); err != nil {
return nil, fmt.Errorf("mysql read entry %s: %v", fullpath, err)
@@ -81,7 +81,7 @@ func (store *AbstractSqlStore) DeleteEntry(fullpath filer2.FullPath) (*filer2.En
dir, name := fullpath.DirAndName()
res, err := store.DB.Exec("DELETE FROM filemeta WHERE dirhash=? AND name=? AND directory=?",
md5hash(dir), name, dir)
hashToLong(dir), name, dir)
if err != nil {
return nil, fmt.Errorf("mysql delete %s: %s", fullpath, err)
}
@@ -101,7 +101,7 @@ func (store *AbstractSqlStore) ListDirectoryEntries(fullpath filer2.FullPath, st
sqlText = "SELECT NAME, meta FROM filemeta WHERE dirhash=? AND name>=? AND directory=? LIMIT ?"
}
rows, err := store.DB.Query(sqlText, md5hash(string(fullpath)), startFileName, string(fullpath), limit)
rows, err := store.DB.Query(sqlText, hashToLong(string(fullpath)), startFileName, string(fullpath), limit)
if err != nil {
return nil, fmt.Errorf("mysql list %s : %v", fullpath, err)
}