refactoring

2 files changed, 1 insertions, 45 deletions

diff --git a/weed/filer/filer_delete_entry.go b/weed/filer/filer_delete_entry.go
index dae0b28ef..3fdb84f03 100644
--- a/weed/filer/filer_delete_entry.go
+++ b/weed/filer/filer_delete_entry.go
@@ -50,7 +50,7 @@ func (f *Filer) DeleteEntryMetaAndData(ctx context.Context, p util.FullPath, isR
 	}
 
 	if shouldDeleteChunks && !isDeleteCollection {
-		f.DirectDeleteChunks(entry.GetChunks())
+		f.DeleteChunks(p, entry.GetChunks())
 	}
 
 	if isDeleteCollection {
diff --git a/weed/filer/filer_deletion.go b/weed/filer/filer_deletion.go
index 84c5ed4c0..5a40b6ee3 100644
--- a/weed/filer/filer_deletion.go
+++ b/weed/filer/filer_deletion.go
@@ -70,50 +70,6 @@ func (f *Filer) loopProcessingDeletion() {
 	}
 }
 
-func (f *Filer) doDeleteFileIds(fileIds []string) {
-
-	lookupFunc := LookupByMasterClientFn(f.MasterClient)
-	DeletionBatchSize := 100000 // roughly 20 bytes cost per file id.
-
-	for len(fileIds) > 0 {
-		var toDeleteFileIds []string
-		if len(fileIds) > DeletionBatchSize {
-			toDeleteFileIds = fileIds[:DeletionBatchSize]
-			fileIds = fileIds[DeletionBatchSize:]
-		} else {
-			toDeleteFileIds = fileIds
-			fileIds = fileIds[:0]
-		}
-		deletionCount := len(toDeleteFileIds)
-		_, err := operation.DeleteFilesWithLookupVolumeId(f.GrpcDialOption, toDeleteFileIds, lookupFunc)
-		if err != nil {
-			if !strings.Contains(err.Error(), storage.ErrorDeleted.Error()) {
-				glog.V(0).Infof("deleting fileIds len=%d error: %v", deletionCount, err)
-			}
-		}
-	}
-}
-
-func (f *Filer) DirectDeleteChunks(chunks []*filer_pb.FileChunk) {
-	var fileIdsToDelete []string
-	for _, chunk := range chunks {
-		if !chunk.IsChunkManifest {
-			fileIdsToDelete = append(fileIdsToDelete, chunk.GetFileIdString())
-			continue
-		}
-		dataChunks, manifestResolveErr := ResolveOneChunkManifest(f.MasterClient.LookupFileId, chunk)
-		if manifestResolveErr != nil {
-			glog.V(0).Infof("failed to resolve manifest %s: %v", chunk.FileId, manifestResolveErr)
-		}
-		for _, dChunk := range dataChunks {
-			fileIdsToDelete = append(fileIdsToDelete, dChunk.GetFileIdString())
-		}
-		fileIdsToDelete = append(fileIdsToDelete, chunk.GetFileIdString())
-	}
-
-	f.doDeleteFileIds(fileIdsToDelete)
-}
-
 func (f *Filer) DeleteUncommittedChunks(chunks []*filer_pb.FileChunk) {
 	f.doDeleteChunks(chunks)
 }