Fix cocurrent upload package

models/packages/package.go

@@ -128,14 +128,21 @@ func TryInsertPackage(ctx context.Context, p *Package) (*Package, error) {
 LowerName: p.LowerName,
 }
 
-has, err := e.Get(key)
+has, err := e.Exist(key)
 if err != nil {
 return nil, err
 }
 if has {
 return key, ErrDuplicatePackage
 }
 if _, err = e.Insert(p); err != nil {
+has, err := e.Exist(key)
+if err != nil {
+return nil, err
+}
+if has {
+return key, ErrDuplicatePackage
+}
 return nil, err
 }
 return p, nil

models/packages/package_blob.go

@@ -35,14 +35,21 @@ type PackageBlob struct {
 func GetOrInsertBlob(ctx context.Context, pb *PackageBlob) (*PackageBlob, bool, error) {
 e := db.GetEngine(ctx)
 
-has, err := e.Get(pb)
+has, err := e.Exist(pb)
 if err != nil {
 return nil, false, err
 }
 if has {
 return pb, true, nil
 }
 if _, err = e.Insert(pb); err != nil {
+has, err := e.Exist(pb)
+if err != nil {
+return nil, false, err
+}
+if has {
+return pb, true, nil
+}
 return nil, false, err
 }
 return pb, false, nil

models/packages/package_file.go

@@ -53,14 +53,21 @@ func TryInsertFile(ctx context.Context, pf *PackageFile) (*PackageFile, error) {
 CompositeKey: pf.CompositeKey,
 }
 
-has, err := e.Get(key)
+has, err := e.Exist(key)
 if err != nil {
 return nil, err
 }
 if has {
 return pf, ErrDuplicatePackageFile
 }
 if _, err = e.Insert(pf); err != nil {
+has, err := e.Exist(key)
+if err != nil {
+return nil, err
+}
+if has {
+return pf, ErrDuplicatePackageFile
+}
 return nil, err
 }
 return pf, nil

models/packages/package_version.go

@@ -46,14 +46,21 @@ func GetOrInsertVersion(ctx context.Context, pv *PackageVersion) (*PackageVersio
 LowerVersion: pv.LowerVersion,
 }
 
-has, err := e.Get(key)
+has, err := e.Exist(key)
 if err != nil {
 return nil, err
 }
 if has {
 return key, ErrDuplicatePackageVersion
 }
 if _, err = e.Insert(pv); err != nil {
+has, err := e.Exist(key)
+if err != nil {
+return nil, err
+}
+if has {
+return key, ErrDuplicatePackageVersion
+}
 return nil, err
 }
 return pv, nil

routers/api/packages/container/blob.go

@@ -38,12 +38,11 @@ func saveAsPackageBlob(hsr packages_module.HashedSizeReader, pi *packages_servic
 }
 var err error
 if p, err = packages_model.TryInsertPackage(ctx, p); err != nil {
-if err == packages_model.ErrDuplicatePackage {
-created = false
-} else {
+if err != packages_model.ErrDuplicatePackage {
 log.Error("Error inserting package: %v", err)
 return err
 }
+created = false
 }
 
 if created {