TrueCloudLab/frostfs-sdk-go
30
0
Fork 20
Code Issues 30 Pull requests 1 Releases Activity Actions

policy: Check for redundant selectors and filters #154

Merged
fyrchik merged 1 commit from acid-ant/frostfs-sdk-go:bugfix/150-check-redundant into master 2023-09-04 14:12:55 +00:00
Conversation 0 Commits 1 Files changed 3 +107 -63
acid-ant commented 2023-08-29 05:44:08 +00:00
Member
Copy link

Close #150
Policy REP 1 SELECT 4 FROM * AS X will fail with error policy: found redundant selector.
REP 1 IN X SELECT 4 FROM * AS X FILTER 'UN' EQ 'RU' AS F - with error policy: found redundant filter

Signed-off-by: Anton Nikiforov an.nikiforov@yadro.com

Close #150 Policy `REP 1 SELECT 4 FROM * AS X` will fail with error `policy: found redundant selector`. `REP 1 IN X SELECT 4 FROM * AS X FILTER 'UN' EQ 'RU' AS F` - with error `policy: found redundant filter` Signed-off-by: Anton Nikiforov <an.nikiforov@yadro.com>
acid-ant requested review from storage-core-committers 2023-08-29 05:44:20 +00:00
acid-ant requested review from storage-core-developers 2023-08-29 05:44:34 +00:00
dstepanov-yadro approved these changes 2023-08-29 07:29:26 +00:00
fyrchik reviewed 2023-08-29 07:32:58 +00:00
netmap/policy.go Outdated
@ -553,2 +553,3 @@
if err := validatePolicy(*p); err != nil {
if err := validatePolicy(*parsed); err != nil {
//if err := validatePolicy(*p); err != nil {
fyrchik commented 2023-08-29 06:55:54 +00:00
Owner
Copy link

What's this comment for?

What's this comment for?
acid-ant commented 2023-08-29 11:16:19 +00:00
Author
Member
Copy link

Ooops, removed.

Ooops, removed.
fyrchik marked this conversation as resolved
netmap/policy.go Outdated
@ -864,0 +864,4 @@
seenSelectors := map[string]*netmap.Selector{}
for i := range p.selectors {
if p.selectors[i].GetName() == "" {
return fmt.Errorf("%w: use keyword AS to provide name for selector", errRedundantSelector)
fyrchik commented 2023-08-29 07:00:39 +00:00
Owner
Copy link

It's is errRedundantSelector, but maybe errUnnamedSelector would be better? Like unnamed selectors are useless, make sure to pair REP and SELECT clauses: "REP .. IN X" + "SELECT ... AS X"

It's is `errRedundantSelector`, but maybe `errUnnamedSelector` would be better? Like `unnamed selectors are useless, make sure to pair REP and SELECT clauses: "REP .. IN X" + "SELECT ... AS X"`
acid-ant commented 2023-08-29 11:16:37 +00:00
Author
Member
Copy link

Agree, sounds better. Updated.

Agree, sounds better. Updated.
fyrchik marked this conversation as resolved
netmap/policy.go Outdated
@ -864,0 +866,4 @@
if p.selectors[i].GetName() == "" {
return fmt.Errorf("%w: use keyword AS to provide name for selector", errRedundantSelector)
}
if flt := p.selectors[i].GetFilter(); flt != mainFilterName {
fyrchik commented 2023-08-29 07:29:47 +00:00
Owner
Copy link

What happens if flt be is an empty string here?

What happens if `flt` be is an empty string here?
acid-ant commented 2023-08-29 11:10:55 +00:00
Author
Member
Copy link

Thought about this too earlier. In this case, we will have the different error: policy: syntax error: line 1:68 mismatched input '<EOF>' expecting 'AS

Thought about this too earlier. In this case, we will have the different error: `policy: syntax error: line 1:68 mismatched input '<EOF>' expecting 'AS`
👍 1
fyrchik commented 2023-09-04 11:08:32 +00:00
Owner
Copy link

Hm, this makes me think -- what if we just change the grammar for selectors too? I.e. make this obligatory https://git.frostfs.info/TrueCloudLab/frostfs-sdk-go/src/branch/master/netmap/parser/Query.g4#L21

For validation we could just check used/unused then.

Hm, this makes me think -- what if we just change the grammar for selectors too? I.e. make this obligatory https://git.frostfs.info/TrueCloudLab/frostfs-sdk-go/src/branch/master/netmap/parser/Query.g4#L21 For validation we could just check used/unused then.
netmap/policy.go Outdated
@ -864,3 +885,2 @@
for i := range p.replicas {
if sel := p.replicas[i].GetSelector(); sel != "" && !seenSelectors[sel] {
return fmt.Errorf("%w: '%s'", errUnknownSelector, sel)
var sel *netmap.Selector
fyrchik commented 2023-08-29 07:30:31 +00:00
Owner
Copy link

This variable is used once inside an if, maybe move it there sel :=?

This variable is used once inside an `if`, maybe move it there `sel :=`?
acid-ant commented 2023-08-29 11:15:55 +00:00
Author
Member
Copy link

Right, garbage from the previous implementation, updated.

Right, garbage from the previous implementation, updated.
fyrchik marked this conversation as resolved
netmap/policy_decode_test.go Outdated
@ -0,0 +42,4 @@
var p PlacementPolicy
for _, testCase := range testCases {
require.NoError(t, p.DecodeString(testCase), fmt.Sprintf("unable parse %s", testCase))
fyrchik commented 2023-08-29 07:03:01 +00:00
Owner
Copy link

I believe require naturally supports format strings: require.NoError(..., "unable to parse %s", testCase)

I believe `require` naturally supports format strings: `require.NoError(..., "unable to parse %s", testCase)`
acid-ant commented 2023-08-29 11:15:11 +00:00
Author
Member
Copy link

Fixed.

Fixed.
fyrchik marked this conversation as resolved
acid-ant force-pushed bugfix/150-check-redundant from 0886d18d49 to 9c0b33c6fa 2023-08-29 11:14:57 +00:00 Compare
acid-ant force-pushed bugfix/150-check-redundant from 9c0b33c6fa to b5fe52d6bd 2023-08-29 11:17:03 +00:00 Compare
aarifullin approved these changes 2023-08-30 07:47:05 +00:00
fyrchik merged commit b5fe52d6bd into master 2023-09-04 14:12:55 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
dstepanov-yadro
aarifullin
Labels
Clear labels   
P0

Highest

  
P1

High

  
P2

Medium

  
P3

Low

  
good first issue

Good for newcomers

  
pool

Tasks related to client pool

  
Infrastructure

Infrastructure, Automation, CI/CD or DevOps related stuff

  
blocked

The issue or PR is blocked by something

  
bug

Something is not working

  
config

Configuration format update or breaking change

  
discussion

Talking about something in order to reach a decision or to exchange ideas

  
documentation

Documentation related

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
go

Language features adoption

  
help wanted

Extra attention is needed

  
internal

   
invalid

Something is wrong

  
kludge

This is a kludge and we know it

  
observability

Related to metrics, tracing and logs

  
perfomance

Perfomance related

  
question

More information is needed

  
refactoring

Refactoring

  
wontfix

This won't be fixed

No labels
P0
P1
P2
P3
good first issue
pool
Infrastructure
blocked
bug
config
discussion
documentation
duplicate
enhancement
go
help wanted
internal
invalid
kludge
observability
perfomance
question
refactoring
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
4 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: TrueCloudLab/frostfs-sdk-go#154
No description provided.
Delete branch "acid-ant/frostfs-sdk-go:bugfix/150-check-redundant"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?