CASSGO-71 Make HostFilter interface easier to test #1874
Conversation
This file contains hidden or 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
Currently external HostFilter implementations cannot be tested against HostFilter interface. To fix that the Accept method should have an interface as the parameter instead of HostInfo so that it is possible to mock it. Patch by: Mykyta Oleksiienko; Revieved by: ***; For CASSGO-71.
|
@joao-r-reis, could you please review the PR? |
tengu-alt
reviewed
Apr 9, 2025
| Set(v string) error | ||
| UnmarshalCQL(info TypeInfo, data []byte) error | ||
| AtLeast(major, minor, patch int) bool | ||
| String() string | ||
| } | ||
|
|
||
| // HostFilterFunc converts a func(host HostInfo) bool into a HostFilter |
There was a problem hiding this comment.
I think it also needs to be updated to func(host Host) bool
joao-r-reis
changed the title
joao-r-reis
reviewed
Apr 21, 2025
| @@ -480,6 +480,12 @@ func TestCAS(t *testing.T) { | |||
| t.Fatalf("insert should have not been applied: title=%v revID=%v modified=%v", titleCAS, revidCAS, modifiedCAS) | |||
| } | |||
|
|
|||
| // TODO: This test failing with error due to "function dateof" on cassandra side. | |||
| // It was officially removed in version 5.0.0. The recommended replacement for dateOf is the toTimestamp function. | |||
| // As we are not testing against deprecated cassandra versions, it makes sense to update tests to keep them up to date | |||
There was a problem hiding this comment.
I believe this was done in #1828 so once that is merged and this PR is rebased it should be fixed
| @@ -227,9 +227,6 @@ func (s *Session) handleNodeUp(eventIp net.IP, eventPort int) { | |||
| return | |||
| } | |||
|
|
|||
| if d := host.Version().nodeUpDelay(); d > 0 { | |||
| Set(v string) error | ||
| UnmarshalCQL(info TypeInfo, data []byte) error | ||
| AtLeast(major, minor, patch int) bool | ||
| String() string |
There was a problem hiding this comment.
I think this needs some changes, just making an interface out of the methods of the private type feels wrong here, we shouldn't expose Set or Unmarshal method and we should definitely expose a way to get the actual version fields.
Ideally CassVersion would be:
type CassVersion interface {
Major() int
Minor() int
Patch() int
Qualifier() string
String() string
}
The methods on cassVersion can be converted into global private functions.
func (c *cassVersion) Set(v string) error
func (c *cassVersion) UnmarshalCQL(info TypeInfo, data []byte) error
func (c *cassVersion) unmarshal(data []byte) error {
func (c cassVersion) Before(major, minor, patch int) bool
func (c cassVersion) AtLeast(major, minor, patch int) bool
func parseCassVersion(v string) (CassVersion, error) {
c := &cassVersion{}
if v == "" {
return c, nil
}
return c.unmarshalCQL(nil, []byte(v))
}
func (c *cassVersion) unmarshalCQL(info TypeInfo, data []byte) error {
return c.unmarshal(data)
}
// can be kept as is
func (c *cassVersion) unmarshal(data []byte) error
// these two should just be global, private and have `CassVersion` parameters instead
func before(v1 CassVersion, v2 CassVersion) bool
func atLeast(v1 CassVersion, v2 CassVersion) bool
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.
Closes #1311
Currently, external HostFilter implementations cannot be tested against HostFilter interface.
To fix that, the Accept method has an Host interface as the parameter instead of HostInfo so that it is possible to mock it.