neilotoole/sq
1
1
Fork 0
mirror of https://github.com/neilotoole/sq.git synced 2024-11-30 19:09:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

#261: jsonw: deadlock occurred when record was large, due to mutex on Flush() call (#262)

Browse Source 
* jsonw: deadlock occurred when record was large, due to mutex on Flush() call
This commit is contained in:
Neil O'Toole 2023-06-19 10:55:38 -06:00 committed by GitHub
parent c502039728
commit eedc11ec46
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CHANGELOG.md
View File

@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
Breaking changes are annotated with ☢️. Breaking changes are annotated with ☢️.
## [v0.38.1] - 2023-06-19
### Fixed
- [#261]: The JSON writer (`--json`) could get deadlocked when a record contained
a large amount of data, triggering an internal `Flush()` (which is mutex-guarded)
from within the mutex-guarded `WriteRecords()` method.
## [v0.38.0] - 2023-06-18 ## [v0.38.0] - 2023-06-18
This release has significant improvements (and breaking changes) This release has significant improvements (and breaking changes)
@ -42,7 +50,6 @@ to SLQ (`sq`'s query language).
9 9
``` ```
### Fixed ### Fixed
- Literals can now be selected ([docs](https://sq.io/docs/query/#select-literal)). - Literals can now be selected ([docs](https://sq.io/docs/query/#select-literal)).
@ -599,6 +606,7 @@ make working with lots of sources much easier.
[#254]: https://github.com/neilotoole/sq/issues/254 [#254]: https://github.com/neilotoole/sq/issues/254
[#256]: https://github.com/neilotoole/sq/issues/256 [#256]: https://github.com/neilotoole/sq/issues/256
[#258]: https://github.com/neilotoole/sq/issues/258 [#258]: https://github.com/neilotoole/sq/issues/258
[#261]: https://github.com/neilotoole/sq/issues/261
[v0.15.2]: https://github.com/neilotoole/sq/releases/tag/v0.15.2 [v0.15.2]: https://github.com/neilotoole/sq/releases/tag/v0.15.2
[v0.15.3]: https://github.com/neilotoole/sq/compare/v0.15.2...v0.15.3 [v0.15.3]: https://github.com/neilotoole/sq/compare/v0.15.2...v0.15.3
@ -638,3 +646,4 @@ make working with lots of sources much easier.
[v0.37.0]: https://github.com/neilotoole/sq/compare/v0.36.2...v0.37.0 [v0.37.0]: https://github.com/neilotoole/sq/compare/v0.36.2...v0.37.0
[v0.37.1]: https://github.com/neilotoole/sq/compare/v0.37.0...v0.37.1 [v0.37.1]: https://github.com/neilotoole/sq/compare/v0.37.0...v0.37.1
[v0.38.0]: https://github.com/neilotoole/sq/compare/v0.37.1...v0.38.0 [v0.38.0]: https://github.com/neilotoole/sq/compare/v0.37.1...v0.38.0
[v0.38.1]: https://github.com/neilotoole/sq/compare/v0.38.0...v0.38.1

9
cli/output/jsonw/recordwriter.go
View File

@ -135,7 +135,7 @@ func (w *stdWriter) writeRecord(rec record.Record) error {
w.b = w.b[:0] w.b = w.b[:0]
if w.outBuf.Len() > w.pr.FlushThreshold { if w.outBuf.Len() > w.pr.FlushThreshold {
return w.Flush() return w.doFlush()
} }
return nil return nil
@ -145,11 +145,14 @@ func (w *stdWriter) writeRecord(rec record.Record) error {
func (w *stdWriter) Flush() error { func (w *stdWriter) Flush() error {
w.mu.Lock() w.mu.Lock()
defer w.mu.Unlock() defer w.mu.Unlock()
return w.doFlush()
}
func (w *stdWriter) doFlush() error {
if w.err != nil { if w.err != nil {
return w.err return w.err
} }
_, err := w.outBuf.WriteTo(w.out) if _, err := w.outBuf.WriteTo(w.out); err != nil {
if err != nil {
return errz.Err(err) return errz.Err(err)
} }
return nil return nil