Flexible File Filtering Feature for Blobfuse Mounting #1435
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 |
|---|---|---|
|
|
@@ -20,4 +20,4 @@ test/manual_scripts/cachetest.go | |
| lint.log | ||
| azure-storage-fuse | ||
| bfusemon | ||
| test/scripts/dirIterate.go | ||
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,42 @@ | ||
| package filter | ||
|
|
||
| import ( | ||
| "sync/atomic" | ||
|
|
||
| "github.com/Azure/azure-storage-fuse/v2/internal" | ||
| ) | ||
|
|
||
| func (fl *UserInputFilters) ApplyFilterOnBlobs(fileInfos []*internal.ObjAttr) []*internal.ObjAttr { //function called from azstorage.go streamDir func | ||
| if len(fileInfos) == 0 { | ||
| return fileInfos | ||
| } | ||
| fv := &FileValidator{ | ||
| workers: 16, | ||
| atomicflag: 0, | ||
| fileCnt: 0, | ||
| FilterArr: fl.FilterArr, | ||
| } | ||
| 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,40 @@ | ||
| package filter | ||
|
|
||
| import ( | ||
| "errors" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| "github.com/Azure/azure-storage-fuse/v2/internal" | ||
| ) | ||
|
|
||
| // formatFilter and its attributes | ||
| type FormatFilter struct { | ||
| ext_type string | ||
| } | ||
|
|
||
| // Apply fucntion for format filter , check wheather a file passes the constraints | ||
| func (filter FormatFilter) Apply(fileInfo *internal.ObjAttr) bool { | ||
| // 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 | ||
| } | ||
|
|
||
| // used for dynamic creation of formatFilter using map | ||
| func newFormatFilter(args ...interface{}) Filter { | ||
| 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,76 @@ | ||
| package filter | ||
|
|
||
| import ( | ||
| "errors" | ||
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/Azure/azure-storage-fuse/v2/internal" | ||
| ) | ||
|
|
||
| // modTimeFilter and its attributes | ||
| type modTimeFilter struct { | ||
| opr string | ||
| value time.Time | ||
| } | ||
|
|
||
| // Apply fucntion for modTime filter , check wheather a file passes the constraints | ||
| func (filter modTimeFilter) Apply(fileInfo *internal.ObjAttr) bool { | ||
| // 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 | ||
| } | ||
|
|
||
| // used for dynamic creation of modTimeFilter using map | ||
| func newModTimeFilter(args ...interface{}) Filter { | ||
| 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,41 @@ | ||
| package filter | ||
|
|
||
| import ( | ||
| "errors" | ||
| "regexp" | ||
| "strings" | ||
|
|
||
| "github.com/Azure/azure-storage-fuse/v2/internal" | ||
| ) | ||
|
|
||
| // RegexFilter and its attributes | ||
| type regexFilter struct { | ||
| regex_inp *regexp.Regexp | ||
| } | ||
|
|
||
| // Apply fucntion for regex filter , check wheather a file passes the constraints | ||
| func (filter regexFilter) Apply(fileInfo *internal.ObjAttr) bool { | ||
| // fmt.Println("regex filter ", filter.regex_inp, " file name ", (*fileInfo).Name) DEBUG PRINT | ||
| return filter.regex_inp.MatchString((*fileInfo).Name) | ||
| } | ||
|
|
||
| // used for dynamic creation of regexFilter | ||
| func newRegexFilter(args ...interface{}) Filter { | ||
| 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 | ||
| } |
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.
Better to return here instead of copying over the slice again.