Enhance 'sort' field parser to handle various sort formats #139
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
pivovarit
force-pushed
the
parse-map-sort
branch
4 times, most recently
from
d048179 to
88a645d
Compare
trzysiek
reviewed
May 17, 2024
pivovarit
force-pushed
the
parse-map-sort
branch
2 times, most recently
from
1804a80 to
2ec1aed
Compare
pivovarit
changed the title
trzysiek
approved these changes
May 17, 2024
Comment on lines
+1174
to
+1204
| return sortFields | ||
| case map[string]interface{}: | ||
| sortFields := make([]string, 0) | ||
|
|
||
| for fieldName, fieldValue := range sortMaps { | ||
| if strings.HasPrefix(fieldName, "_") && cw.Table.GetFieldInfo(cw.Ctx, fieldName) == clickhouse.NotExists { | ||
| // TODO Elastic internal fields will need to be supported in the future | ||
| continue | ||
| } | ||
| if fieldValue, ok := fieldValue.(string); ok { | ||
| sortFields = append(sortFields, fmt.Sprintf("%s %s", strconv.Quote(fieldName), fieldValue)) | ||
| } | ||
| } | ||
|
|
||
| return sortFields | ||
|
|
||
| case map[string]string: | ||
| sortFields := make([]string, 0) | ||
|
|
||
| for fieldName, fieldValue := range sortMaps { | ||
| if strings.HasPrefix(fieldName, "_") && cw.Table.GetFieldInfo(cw.Ctx, fieldName) == clickhouse.NotExists { | ||
| // TODO Elastic internal fields will need to be supported in the future | ||
| continue | ||
| } | ||
| sortFields = append(sortFields, fmt.Sprintf("%s %s", strconv.Quote(fieldName), fieldValue)) | ||
| } | ||
|
|
||
| return sortFields |
There was a problem hiding this comment.
in previous implementation, we do ResolveField. Don't we want to do it in these 2 cases as well?
There was a problem hiding this comment.
this is handled at the beginning of each search processing, so we never reach here with nonexistent columns - I will unify that
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.
Parse shorthand forms of
sortfields like:and:
Also, rewrote tests to run as separate test cases instead of a single test with a loop