feat(segments): Segment AND'ing #1915
Merged
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
yquansah
changed the title
yquansah
force-pushed
the
segment-anding
branch
from
585c63b
to
dd803a9
Compare
markphelps
previously requested changes
Aug 1, 2023
yquansah
force-pushed
the
segment-anding
branch
from
e2f936a
to
8c1d4bc
Compare
* feat(update): UI for Rule updates * feat(rollouts/rules): Updating UI for rollouts and rules * feat(update): UI for Rule updates * feat: Add readonly attributes to edit forms * chore: address comments * chore: fix logic for updating
markphelps
reviewed
Aug 9, 2023
* chore: fix reset of rules/rollouts * chore: fix null error with segment
…nd UX around adding segments (#1975) * feat(rules/rollouts): hide or and and based on segment keys length, and change UX for adding segments * chore: fix UI integration tests
* feat(rules): Make segment be one of two types * chore: force segment operator to be OR for one segment
* chore: print statements chore: revise query chore: remove unnecessary lines * chore: defer close ruleMetaRows * chore: remove orderBy since we are sorting at the end of the function * chore: fix double quotes for rank for MySQL support
markphelps
reviewed
Aug 11, 2023
| SegmentOperator flipt.SegmentOperator `json:"segmentOperator,omitempty"` | ||
| } | ||
|
|
||
| type EvaluationSegment struct { |
There was a problem hiding this comment.
we should probably put the JSON struct tags on this just to be safe since this will also be cached
There was a problem hiding this comment.
@markphelps Thank you for this. I could have just committed directly to this now that I think about it. Here is the PR: #1984
GeorgeMac
approved these changes
Aug 15, 2023
| From(tableRolloutSegments). | ||
| Where(sq.And{sq.Eq{"rollout_id": rollout.Id}, sq.Eq{"namespace_key": rollout.NamespaceKey}}). | ||
| Where(sq.And{sq.Eq{"rollout_id": rollout.Id}}). |
There was a problem hiding this comment.
Suggested change
| Where(sq.And{sq.Eq{"rollout_id": rollout.Id}}). | |
| Where(sq.Eq{"rollout_id": rollout.Id}). |
|
|
||
| rows, err := builder.Select("segment_key"). | ||
| From(tableRolloutSegmentReferences). | ||
| Where(sq.And{sq.Eq{"rollout_segment_id": rolloutSegmentId}, sq.Eq{"namespace_key": rollout.NamespaceKey}}). |
There was a problem hiding this comment.
Suggested change
| Where(sq.And{sq.Eq{"rollout_segment_id": rolloutSegmentId}, sq.Eq{"namespace_key": rollout.NamespaceKey}}). | |
| Where(sq.Eq{"rollout_segment_id": rolloutSegmentId, "namespace_key": rollout.NamespaceKey}). |
internal/storage/sql/common/util.go
Outdated
Comment on lines
49
to
57
| result := make([]string, 0) | ||
|
|
||
| if len(segmentKeys) > 0 { | ||
| result = append(result, segmentKeys...) | ||
| } else if segmentKey != "" { | ||
| result = append(result, segmentKey) | ||
| } | ||
|
|
||
| return removeDuplicates(result) |
There was a problem hiding this comment.
Take it or leave it optimization:
Suggested change
| result := make([]string, 0) | |
| if len(segmentKeys) > 0 { | |
| result = append(result, segmentKeys...) | |
| } else if segmentKey != "" { | |
| result = append(result, segmentKey) | |
| } | |
| return removeDuplicates(result) | |
| if len(segmentKeys) > 0 { | |
| return removeDuplicates(segmentKeys) | |
| } else if segmentKey != "" { | |
| return []string{segmentKey} | |
| } | |
| return nil |
internal/storage/sql/common/rule.go
Outdated
| RunWith(tx). | ||
| Set("segment_operator", segmentOperator). | ||
| Set("updated_at", &fliptsql.Timestamp{Timestamp: timestamppb.Now()}). | ||
| Where(sq.And{sq.Eq{"id": r.Id}, sq.Eq{"namespace_key": r.NamespaceKey}, sq.Eq{"flag_key": r.FlagKey}}). |
There was a problem hiding this comment.
Another small optimization. sq.And and sq.Eq are maps. So each time they're stated we're allocating a map. Squirell with implicity AND all the k/v equalities in a single sq.Eq map.
Suggested change
| Where(sq.And{sq.Eq{"id": r.Id}, sq.Eq{"namespace_key": r.NamespaceKey}, sq.Eq{"flag_key": r.FlagKey}}). | |
| Where(sq.Eq{"id": r.Id, "namespace_key": r.NamespaceKey, "flag_key": r.FlagKey}). |
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.
Segment AND'ing project.
Supporting the ability for users to add multiple segments to their rules/rollouts for evaluations.