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

fix sql insert with duplicated primary key

Browse Source
This commit is contained in:
Chris Lu
2020-09-02 10:09:49 -07:00
parent 9ea290aa12
commit ed62f52452
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ import (
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
"strings"
) )
type AbstractSqlStore struct { type AbstractSqlStore struct {
@@ -68,12 +69,9 @@ func (store *AbstractSqlStore) InsertEntry(ctx context.Context, entry *filer.Ent
res, err := store.getTxOrDB(ctx).ExecContext(ctx, store.SqlInsert, util.HashStringToLong(dir), name, dir, meta) res, err := store.getTxOrDB(ctx).ExecContext(ctx, store.SqlInsert, util.HashStringToLong(dir), name, dir, meta)
if err != nil { if err != nil {
return fmt.Errorf("insert %s: %s", entry.FullPath, err) if !strings.Contains(strings.ToLower(err.Error()), "duplicate") {
} return fmt.Errorf("kv insert: %s", err)
}
affectedRows, err := res.RowsAffected()
if err == nil && affectedRows > 0 {
return nil
} }
// now the insert failed possibly due to duplication constraints // now the insert failed possibly due to duplication constraints