Merge branch 'vk_delete_bug_fix' into 'devbranch'

error handling bug fix, removed logs

See merge request !187

dalmdl/corefdb/bucket/packbucket.go

@@ -71,9 +71,7 @@ func (pb *PackBucket) Find(filePaths []string, queries []string, data *gjson.Res
 	}
 	queries = append(queries, `#[fileType==`+requestedFileType+`]`)
 	resultArray := "[]"
-	loggermdl.LogError("len", len(filePaths))
 	for i := range filePaths {
-		loggermdl.LogError("path", filePaths[i])
 		locker := locker.NewLocker(filePaths[i])
 		packFile, err := filetype.NewPackFile(filePaths[i], pb.InFileIndexSchemaMap, pb.Bucket.SecurityProvider, locker)
 		defer packFile.Close()
@@ -108,7 +106,6 @@ func (pb *PackBucket) Update(filePaths []string, queries []string, data *gjson.R
 
 	for i := range filePaths {
 		locker := locker.NewLocker(filePaths[i])
-		loggermdl.LogError("filePaths[i]", filePaths[i])
 		packFile, err := filetype.NewPackFile(filePaths[i], pb.InFileIndexSchemaMap, pb.Bucket.SecurityProvider, locker)
 		defer packFile.Close()
 		if err != nil {

dalmdl/corefdb/corefdb.go

@@ -424,9 +424,10 @@ func DeleteDataFromFDB(dbName, indexID string, rs *gjson.Result, queries []strin
 	}
 	if _, ok := bucketObj.(*bucket.SimpleBucket); ok {
 		for path := range indexKeyValueMap {
-			loggermdl.LogError("deleting path", path)
 			err := index.Delete(path)
-			errList = append(errList, err)
+			if err != nil {
+				errList = append(errList, err)
+			}
 		}
 	}
 	return cnt, errList
@@ -496,7 +497,6 @@ func SaveMediaInFDB(dbName, indexID string, mediaData []byte, data *gjson.Result
 		loggermdl.LogError(err)
 		return recordPath, err
 	}
-	loggermdl.LogError("path after", path)
 	updatedJSONObj := gjson.Parse(updatedJSON)
 	err = index.AddEntry(path, &updatedJSONObj)
 	if err != nil {

dalmdl/corefdb/index/indexstore.go

@@ -4,7 +4,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"corelab.mkcl.org/MKCLOS/coredevelopmentplatform/corepkgv2/loggermdl"
 	"corelab.mkcl.org/MKCLOS/coredevelopmentplatform/corepkgv2/securitymdl"
 
 	"github.com/tidwall/buntdb"
@@ -38,7 +37,6 @@ func (i IndexStore) Close() error {
 func (i *IndexStore) Set(key, value string) (err error) {
 	err = i.store.Update(func(tx *buntdb.Tx) error {
 		key = strings.ReplaceAll(key, "\\", "/")
-		loggermdl.LogError("set path", key)
 		_, _, err := tx.Set(key, value, nil)
 		if err != nil {
 			return err
@@ -52,7 +50,6 @@ func (i *IndexStore) AddMany(keyValMap map[string]string) (err error) {
 	err = i.store.Update(func(tx *buntdb.Tx) error {
 		for key, val := range keyValMap {
 			key = strings.ReplaceAll(key, "\\", "/")
-			loggermdl.LogError("set many", key)
 			_, _, err := tx.Set(key, val, nil)
 			if err != nil {
 				return err
@@ -65,7 +62,6 @@ func (i *IndexStore) AddMany(keyValMap map[string]string) (err error) {
 
 func (i *IndexStore) Get(path string) (val string, err error) {
 	path = strings.ReplaceAll(path, "\\", "/")
-	loggermdl.LogError("Get path", path)
 
 	found := false
 	err = i.store.View(func(tx *buntdb.Tx) error {
@@ -94,7 +90,6 @@ func (i *IndexStore) GetOneByQuery(queries []string) (entry Entry, found bool, e
 					Key:   filepath.Join(key),
 					Value: value,
 				}
-				loggermdl.LogError("get one", entry)
 
 				return true
 			}
@@ -119,7 +114,6 @@ func (i *IndexStore) GetManyByQuery(queries []string) (map[string]string, error)
 			return true
 		})
 	})
-	loggermdl.LogError("Get GetManyByQuery", entryMap)
 	return entryMap, err
 }
 
@@ -132,7 +126,6 @@ func (i *IndexStore) GetMany() (map[string]string, error) {
 			return true
 		})
 	})
-	loggermdl.LogError("Get GetMany", entryMap)
 
 	return entryMap, err
 }
@@ -140,7 +133,6 @@ func (i *IndexStore) GetMany() (map[string]string, error) {
 func (i *IndexStore) Delete(key string) error {
 	key = strings.ReplaceAll(key, "\\", "/")
 	err := i.store.Update(func(tx *buntdb.Tx) error {
-		loggermdl.LogError("delete", key)
 		_, err := tx.Delete(key)
 		if err != nil {
 			return err