Flexible File Filtering Feature for Blobfuse Mounting #1435
+670
−4
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,3 +21,4 @@ lint.log | |
| azure-storage-fuse | ||
| bfusemon | ||
| test/scripts/dirIterate.go | ||
| filterbin | ||
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package filter | ||
|
|
||
| import ( | ||
| "sync/atomic" | ||
|
|
||
| "github.com/Azure/azure-storage-fuse/v2/internal" | ||
| ) | ||
|
|
||
| var GlbFilterArr [][]Filter //it will store the fliters, outer array splitted by ||, inner array splitted by && | ||
|
There was a problem hiding this comment. As part of design we shall move these filters to be a class so that there can be multiple instances of such filters across the blobfuse code. Current design of having it as a global variable restricts that only one such filter can exists in scope of blobfuse instance. |
||
|
|
||
| func ApplyFilterOnBlobs(fileInfos []*internal.ObjAttr) []*internal.ObjAttr { //function called from azstorage.go streamDir func | ||
|
There was a problem hiding this comment. From outside it shall be an object based call.
|
||
| fv := &FileValidator{ | ||
| workers: 16, | ||
| atomicflag: 0, | ||
| fileCnt: 0, | ||
| FilterArr: GlbFilterArr, | ||
| } | ||
| fv.wgo.Add(1) //kept outside thread | ||
| fv.outputChan = make(chan *opdata, fv.workers) | ||
| fv.fileInpQueue = make(chan *internal.ObjAttr, fv.workers) | ||
|
|
||
| go fv.RecieveOutput() //thread parellely reading from ouput channel | ||
|
|
||
| for w := 1; w <= fv.workers; w++ { | ||
| // fv.wgi.Add(1) | ||
| go fv.ChkFile() //go routines for each worker (thread) are called | ||
| } | ||
| for _, fileinfo := range fileInfos { | ||
| // fmt.Println("passedFile: ", *fileinfo) | ||
| fv.fileInpQueue <- fileinfo //push all files one by one in channel , if channel is full , it will wait | ||
| fv.fileCnt++ //incrementing filecount, this will be used to close output channel | ||
| } | ||
|
|
||
| atomic.StoreInt32(&fv.atomicflag, 1) | ||
| close(fv.fileInpQueue) //close channel once all files have been processed | ||
| // fv.wgi.Wait() | ||
| fv.wgo.Wait() //wait for completion of all threads | ||
| // fmt.Println("All workers stopped ") //exit | ||
|
|
||
| return fv.finalFiles | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package filter | ||
|
|
||
| import ( | ||
| "errors" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| "github.com/Azure/azure-storage-fuse/v2/internal" | ||
| ) | ||
|
|
||
| type FormatFilter struct { //formatFilter and its attributes | ||
| ext_type string | ||
| } | ||
|
|
||
| func (filter FormatFilter) Apply(fileInfo *internal.ObjAttr) bool { //Apply fucntion for format filter , check wheather a file passes the constraints | ||
| // fmt.Println("Format Filter ", filter, " file name ", (*fileInfo).Name) DEBUG PRINT | ||
| fileExt := filepath.Ext((*fileInfo).Name) | ||
| chkstr := "." + filter.ext_type | ||
| // fmt.Println(fileExt, " For file :", fileInfo.Name) | ||
| return chkstr == fileExt | ||
| } | ||
|
|
||
| func newFormatFilter(args ...interface{}) Filter { // used for dynamic creation of formatFilter using map | ||
| return FormatFilter{ | ||
| ext_type: args[0].(string), | ||
| } | ||
| } | ||
|
|
||
| func giveFormatFilterObj(singleFilter *string) (Filter, error) { | ||
| (*singleFilter) = strings.Map(StringConv, (*singleFilter)) | ||
| erro := errors.New("invalid filter, no files passed") | ||
| if (len((*singleFilter)) <= 7) || ((*singleFilter)[6] != '=') || (!((*singleFilter)[7] >= 'a' && (*singleFilter)[7] <= 'z')) { //since len(format) = 6, at next position (ie index 6) there should be "=" only and assuming extention type starts from an alphabet | ||
| return nil, erro | ||
| } | ||
| value := (*singleFilter)[7:] //7 is used because len(format) = 6 + 1 | ||
| return newFormatFilter(value), nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package filter | ||
|
|
||
| import ( | ||
| "errors" | ||
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/Azure/azure-storage-fuse/v2/internal" | ||
| ) | ||
|
|
||
| type modTimeFilter struct { //modTimeFilter and its attributes | ||
| opr string | ||
| value time.Time | ||
| } | ||
|
|
||
| func (filter modTimeFilter) Apply(fileInfo *internal.ObjAttr) bool { //Apply fucntion for modTime filter , check wheather a file passes the constraints | ||
| // fmt.Println("modTime Filter ", filter.opr, " ", filter.value, " file name ", (*fileInfo).Name) DEBUG PRINT | ||
| fileModTimestr := (*fileInfo).Mtime.UTC().Format(time.RFC1123) | ||
| fileModTime, _ := time.Parse(time.RFC1123, fileModTimestr) | ||
| // fmt.Println(fileModTime, "this is file mod time") | ||
|
|
||
| if (filter.opr == "<=") && (fileModTime.Before(filter.value) || fileModTime.Equal(filter.value)) { | ||
| return true | ||
| } else if (filter.opr == ">=") && (fileModTime.After(filter.value) || fileModTime.Equal(filter.value)) { | ||
| return true | ||
| } else if (filter.opr == ">") && (fileModTime.After(filter.value)) { | ||
| return true | ||
| } else if (filter.opr == "<") && (fileModTime.Before(filter.value)) { | ||
| return true | ||
| } else if (filter.opr == "=") && (fileModTime.Equal(filter.value)) { | ||
| return true | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func newModTimeFilter(args ...interface{}) Filter { // used for dynamic creation of modTimeFilter using map | ||
| return modTimeFilter{ | ||
| opr: args[0].(string), | ||
| value: args[1].(time.Time), | ||
| } | ||
| } | ||
|
|
||
| func giveModtimeFilterObj(singleFilter *string) (Filter, error) { | ||
| erro := errors.New("invalid filter, no files passed") | ||
| if strings.Contains((*singleFilter), "<=") { | ||
| splitedParts := strings.Split((*singleFilter), "<=") | ||
| timeRFC1123str := strings.TrimSpace(splitedParts[1]) | ||
| timeRFC1123, _ := time.Parse(time.RFC1123, timeRFC1123str) | ||
| return newModTimeFilter("<=", timeRFC1123), nil | ||
| } else if strings.Contains((*singleFilter), ">=") { | ||
| splitedParts := strings.Split((*singleFilter), ">=") | ||
| timeRFC1123str := strings.TrimSpace(splitedParts[1]) | ||
| timeRFC1123, _ := time.Parse(time.RFC1123, timeRFC1123str) | ||
| return newModTimeFilter(">=", timeRFC1123), nil | ||
| } else if strings.Contains((*singleFilter), "<") { | ||
| splitedParts := strings.Split((*singleFilter), "<") | ||
| timeRFC1123str := strings.TrimSpace(splitedParts[1]) | ||
| timeRFC1123, _ := time.Parse(time.RFC1123, timeRFC1123str) | ||
| return newModTimeFilter("<", timeRFC1123), nil | ||
| } else if strings.Contains((*singleFilter), ">") { | ||
| splitedParts := strings.Split((*singleFilter), ">") | ||
| timeRFC1123str := strings.TrimSpace(splitedParts[1]) | ||
| timeRFC1123, _ := time.Parse(time.RFC1123, timeRFC1123str) | ||
| return newModTimeFilter(">", timeRFC1123), nil | ||
| } else if strings.Contains((*singleFilter), "=") { | ||
| splitedParts := strings.Split((*singleFilter), "=") | ||
| timeRFC1123str := strings.TrimSpace(splitedParts[1]) | ||
| timeRFC1123, _ := time.Parse(time.RFC1123, timeRFC1123str) | ||
| return newModTimeFilter("=", timeRFC1123), nil | ||
| } else { | ||
| return nil, erro | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package filter | ||
|
|
||
| import ( | ||
| "errors" | ||
| "regexp" | ||
| "strings" | ||
|
|
||
| "github.com/Azure/azure-storage-fuse/v2/internal" | ||
| ) | ||
|
|
||
| type regexFilter struct { //RegexFilter and its attributes | ||
| regex_inp *regexp.Regexp | ||
| } | ||
|
|
||
| func (filter regexFilter) Apply(fileInfo *internal.ObjAttr) bool { //Apply fucntion for regex filter , check wheather a file passes the constraints | ||
| // fmt.Println("regex filter ", filter.regex_inp, " file name ", (*fileInfo).Name) DEBUG PRINT | ||
| return filter.regex_inp.MatchString((*fileInfo).Name) | ||
| } | ||
|
|
||
| func newRegexFilter(args ...interface{}) Filter { // used for dynamic creation of regexFilter | ||
| return regexFilter{ | ||
| regex_inp: args[0].(*regexp.Regexp), | ||
| } | ||
| } | ||
|
|
||
| func giveRegexFilterObj(singleFilter *string) (Filter, error) { | ||
| (*singleFilter) = strings.Map(StringConv, (*singleFilter)) | ||
| erro := errors.New("invalid filter, no files passed") | ||
| if (len((*singleFilter)) <= 6) || ((*singleFilter)[5] != '=') { //since len(regex) = 5, at next position (ie index 5) there should be "=" pnly | ||
| return nil, erro | ||
| } | ||
| value := (*singleFilter)[6:] //6 is used because len(regex) = 5 + 1 | ||
| pattern, err := regexp.Compile(value) | ||
| if err != nil { | ||
| return nil, erro | ||
| } | ||
| return newRegexFilter(pattern), nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| package filter | ||
|
|
||
| import ( | ||
| "errors" | ||
| "strconv" | ||
| "strings" | ||
|
|
||
| "github.com/Azure/azure-storage-fuse/v2/internal" | ||
| ) | ||
|
|
||
| type SizeFilter struct { //SizeFilter and its attributes | ||
| opr string | ||
| value float64 | ||
| } | ||
|
|
||
| func (filter SizeFilter) Apply(fileInfo *internal.ObjAttr) bool { //Apply fucntion for size filter , check wheather a file passes the constraints | ||
| // fmt.Println("size filter ", filter, " file name ", (*fileInfo).Name) DEBUG PRINT | ||
|
|
||
| if (filter.opr == "<=") && ((*fileInfo).Size <= int64(filter.value)) { | ||
| return true | ||
| } else if (filter.opr == ">=") && ((*fileInfo).Size >= int64(filter.value)) { | ||
| return true | ||
| } else if (filter.opr == ">") && ((*fileInfo).Size > int64(filter.value)) { | ||
| return true | ||
| } else if (filter.opr == "<") && ((*fileInfo).Size < int64(filter.value)) { | ||
| return true | ||
| } else if (filter.opr == "=") && ((*fileInfo).Size == int64(filter.value)) { | ||
| return true | ||
| } | ||
| return false | ||
| } | ||
|
|
||
| func newSizeFilter(args ...interface{}) Filter { // used for dynamic creation of sizeFilter | ||
| return SizeFilter{ | ||
| opr: args[0].(string), | ||
| value: args[1].(float64), | ||
| } | ||
| } | ||
|
|
||
| func giveSizeFilterObj(singleFilter *string) (Filter, error) { | ||
| (*singleFilter) = strings.Map(StringConv, (*singleFilter)) //remove all spaces and make all upperCase to lowerCase | ||
| sinChk := (*singleFilter)[4:5] //single char after size (ex- size=7888 , here sinChk will be "=") | ||
| doubChk := (*singleFilter)[4:6] //2 chars after size (ex- size>=8908 , here doubChk will be ">=") | ||
| erro := errors.New("invalid filter, no files passed") | ||
| if !((sinChk == "=") || (sinChk == ">") || (sinChk == "<") || (doubChk == ">=") || (doubChk == "<=")) { | ||
| return nil, erro | ||
| } | ||
| value := (*singleFilter)[5:] // 5 is used since len(size) = 4 and + 1 | ||
| floatVal, err := strconv.ParseFloat(value, 64) | ||
| if err != nil { | ||
| if (*singleFilter)[5] != '=' { | ||
| return nil, erro | ||
| } else { | ||
| value := (*singleFilter)[6:] // 5 is used since len(size) = 4 and + 2 | ||
| floatVal, err = strconv.ParseFloat(value, 64) | ||
| if err != nil { | ||
| return nil, erro | ||
| } | ||
| return newSizeFilter((*singleFilter)[4:6], floatVal), nil // 4 to 6 will give operator ex "<=" | ||
| } | ||
| } else { | ||
| return newSizeFilter((*singleFilter)[4:5], floatVal), nil | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is this binary file _debug* which can be removed from the PR.