Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fix memory pools & race issues #178

Merged
merged 1 commit into from
Mar 3, 2024
Merged

fix: fix memory pools & race issues #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions default_validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@

// Validate validates the default values declared in the swagger spec
func (d *defaultValidator) Validate() *Result {
errs := poolOfResults.BorrowResult() // will redeem when merged
errs := pools.poolOfResults.BorrowResult() // will redeem when merged

if d == nil || d.SpecValidator == nil {
return errs
Expand All @@ -97,7 +97,7 @@
// every default value that is specified must validate against the schema for that property
// headers, items, parameters, schema

res := poolOfResults.BorrowResult() // will redeem when merged
res := pools.poolOfResults.BorrowResult() // will redeem when merged
s := d.SpecValidator

for method, pathItem := range s.expandedAnalyzer().Operations() {
Expand All @@ -119,6 +119,8 @@
if red.HasErrorsOrWarnings() {
res.AddErrors(defaultValueDoesNotValidateMsg(param.Name, param.In))
res.Merge(red)
} else if red.wantsRedeemOnMerge {
pools.poolOfResults.RedeemResult(red)

Check warning on line 123 in default_validator.go

View check run for this annotation

Codecov / codecov/patch

default_validator.go#L123 

Added line #L123 was not covered by tests
}
}

Expand All @@ -128,6 +130,8 @@
if red.HasErrorsOrWarnings() {
res.AddErrors(defaultValueItemsDoesNotValidateMsg(param.Name, param.In))
res.Merge(red)
} else if red.wantsRedeemOnMerge {
pools.poolOfResults.RedeemResult(red)
}
}

Expand All @@ -137,6 +141,8 @@
if red.HasErrorsOrWarnings() {
res.AddErrors(defaultValueDoesNotValidateMsg(param.Name, param.In))
res.Merge(red)
} else if red.wantsRedeemOnMerge {
pools.poolOfResults.RedeemResult(red)
}
}
}
Expand Down Expand Up @@ -188,6 +194,8 @@
if red.HasErrorsOrWarnings() {
res.AddErrors(defaultValueHeaderDoesNotValidateMsg(operationID, nm, responseName))
res.Merge(red)
} else if red.wantsRedeemOnMerge {
pools.poolOfResults.RedeemResult(red)

Check warning on line 198 in default_validator.go

View check run for this annotation

Codecov / codecov/patch

default_validator.go#L198 

Added line #L198 was not covered by tests
}
}

Expand All @@ -197,6 +205,8 @@
if red.HasErrorsOrWarnings() {
res.AddErrors(defaultValueHeaderItemsDoesNotValidateMsg(operationID, nm, responseName))
res.Merge(red)
} else if red.wantsRedeemOnMerge {
pools.poolOfResults.RedeemResult(red)
}
}

Expand All @@ -216,6 +226,8 @@
// Additional message to make sure the context of the error is not lost
res.AddErrors(defaultValueInDoesNotValidateMsg(operationID, responseName))
res.Merge(red)
} else if red.wantsRedeemOnMerge {
pools.poolOfResults.RedeemResult(red)
}
}
return res
Expand All @@ -227,7 +239,7 @@
return nil
}
d.beingVisited(path)
res := poolOfResults.BorrowResult()
res := pools.poolOfResults.BorrowResult()
s := d.SpecValidator

if schema.Default != nil {
Expand Down Expand Up @@ -273,7 +285,7 @@
// TODO: Temporary duplicated code. Need to refactor with examples

func (d *defaultValidator) validateDefaultValueItemsAgainstSchema(path, in string, root interface{}, items *spec.Items) *Result {
res := poolOfResults.BorrowResult()
res := pools.poolOfResults.BorrowResult()
s := d.SpecValidator
if items != nil {
if items.Default != nil {
Expand Down
24 changes: 16 additions & 8 deletions example_validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
// - individual property
// - responses
func (ex *exampleValidator) Validate() *Result {
errs := poolOfResults.BorrowResult()
errs := pools.poolOfResults.BorrowResult()

if ex == nil || ex.SpecValidator == nil {
return errs
Expand All @@ -75,7 +75,7 @@
// in: schemas, properties, object, items
// not in: headers, parameters without schema

res := poolOfResults.BorrowResult()
res := pools.poolOfResults.BorrowResult()
s := ex.SpecValidator

for method, pathItem := range s.expandedAnalyzer().Operations() {
Expand All @@ -97,6 +97,8 @@
if red.HasErrorsOrWarnings() {
res.AddWarnings(exampleValueDoesNotValidateMsg(param.Name, param.In))
res.MergeAsWarnings(red)
} else if red.wantsRedeemOnMerge {
pools.poolOfResults.RedeemResult(red)

Check warning on line 101 in example_validator.go

View check run for this annotation

Codecov / codecov/patch

example_validator.go#L101 

Added line #L101 was not covered by tests
}
}

Expand All @@ -106,8 +108,8 @@
if red.HasErrorsOrWarnings() {
res.AddWarnings(exampleValueItemsDoesNotValidateMsg(param.Name, param.In))
res.Merge(red)
} else {
poolOfResults.RedeemResult(red)
} else if red.wantsRedeemOnMerge {
pools.poolOfResults.RedeemResult(red)
}
}

Expand All @@ -117,8 +119,8 @@
if red.HasErrorsOrWarnings() {
res.AddWarnings(exampleValueDoesNotValidateMsg(param.Name, param.In))
res.Merge(red)
} else {
poolOfResults.RedeemResult(red)
} else if red.wantsRedeemOnMerge {
pools.poolOfResults.RedeemResult(red)
}
}
}
Expand Down Expand Up @@ -170,6 +172,8 @@
if red.HasErrorsOrWarnings() {
res.AddWarnings(exampleValueHeaderDoesNotValidateMsg(operationID, nm, responseName))
res.MergeAsWarnings(red)
} else if red.wantsRedeemOnMerge {
pools.poolOfResults.RedeemResult(red)

Check warning on line 176 in example_validator.go

View check run for this annotation

Codecov / codecov/patch

example_validator.go#L176 

Added line #L176 was not covered by tests
}
}

Expand All @@ -179,6 +183,8 @@
if red.HasErrorsOrWarnings() {
res.AddWarnings(exampleValueHeaderItemsDoesNotValidateMsg(operationID, nm, responseName))
res.MergeAsWarnings(red)
} else if red.wantsRedeemOnMerge {
pools.poolOfResults.RedeemResult(red)
}
}

Expand All @@ -198,6 +204,8 @@
// Additional message to make sure the context of the error is not lost
res.AddWarnings(exampleValueInDoesNotValidateMsg(operationID, responseName))
res.Merge(red)
} else if red.wantsRedeemOnMerge {
pools.poolOfResults.RedeemResult(red)
}
}

Expand Down Expand Up @@ -225,7 +233,7 @@
}
ex.beingVisited(path)
s := ex.SpecValidator
res := poolOfResults.BorrowResult()
res := pools.poolOfResults.BorrowResult()

if schema.Example != nil {
res.MergeAsWarnings(
Expand Down Expand Up @@ -271,7 +279,7 @@
//

func (ex *exampleValidator) validateExampleValueItemsAgainstSchema(path, in string, root interface{}, items *spec.Items) *Result {
res := poolOfResults.BorrowResult()
res := pools.poolOfResults.BorrowResult()
s := ex.SpecValidator
if items != nil {
if items.Example != nil {
Expand Down
Loading
Loading