Rewrite Accessor to fix array access issues, also add a Delete method #142
+343
−133
Conversation
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
geseq
requested changes
Aug 29, 2023
| if nextObj.Kind() == reflect.Interface { | ||
| nextObj = nextObj.Elem() | ||
| } | ||
| // fmt.Printf("key: %s %v\n", key, nextObj.Kind()) |
There was a problem hiding this comment.
Suggested change
| // fmt.Printf("key: %s %v\n", key, nextObj.Kind()) |
| key := path[index] | ||
| arrayIndex := getArrayIndex(key) | ||
| var nextObj reflect.Value | ||
| // fmt.Printf("current: %s %v\n", key, currentObj.Kind()) |
There was a problem hiding this comment.
Suggested change
| // fmt.Printf("current: %s %v\n", key, currentObj.Kind()) |
| if nextArrayIndex >= 0 { | ||
| // next element will be an array | ||
| if !nextObj.IsValid() || nextObj.Kind() != reflect.Slice { | ||
| // fmt.Printf("new slice for %s\n", key) |
There was a problem hiding this comment.
Suggested change
| // fmt.Printf("new slice for %s\n", key) |
| // fmt.Printf("new slice for %s\n", key) | ||
| newObj = reflect.ValueOf(make([]interface{}, nextArrayIndex+1, max(nextArrayIndex+1, 8))) | ||
| } else if nextObj.Len() <= nextArrayIndex { | ||
| // fmt.Printf("nextObj %s len %d cap %d\n", key, nextObj.Len(), nextObj.Cap()) |
There was a problem hiding this comment.
Suggested change
| // fmt.Printf("nextObj %s len %d cap %d\n", key, nextObj.Len(), nextObj.Cap()) |
| break | ||
| // next element will be an normal object | ||
| if !nextObj.IsValid() || nextObj.Kind() != reflect.Map { | ||
| // fmt.Printf("new map for %s\n", key) |
There was a problem hiding this comment.
Suggested change
| // fmt.Printf("new map for %s\n", key) |
| return current | ||
| } | ||
| if newObj != nextObj || (value != nil && index == lastIndex) { | ||
| // fmt.Printf("assign key %s to %v\n", key, newObj) |
There was a problem hiding this comment.
Suggested change
| // fmt.Printf("assign key %s to %v\n", key, newObj) |
| // arrayAccessRegexString is the regex used to extract the array number | ||
| // from the access path | ||
| arrayAccessRegexString = `^(.+)\[([0-9]+)\]$` | ||
| type notFoundError struct{} |
There was a problem hiding this comment.
why don't we just make this
var NotFoundError = errors.New("not found")
| idx, err := strconv.ParseUint(key[1:len(key)-1], 10, 64) | ||
| if err != nil { | ||
| // should not happen, otherwise the path is invalid | ||
| panic(err) |
There was a problem hiding this comment.
I would still rather not panic and instead return error here.
|
@Niels-Be Would you be open on writing benchmarks tests for the affected code to measure the performance impact? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
This is a rewrite of the accessor code to fix a lot of issues with access to arrays.
I added some tests that were failing bevor this rewrite.
There should be no breaking changes with this code.
However the new code could allow errors to be forwarded to the caller.
e.g. for Get() to differentiate between not found and json null value.
Or to notify the caller about an invalid path expression.
Maybe add new methods for this?
In this PR all errors are just swallowed to keep compatibility.
Additionally a new Delete method (as requested in #141) is introduced which was trivial to add with the new code.
Checklist
task testtask lint