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

Back port PR #8716 #8722

Merged
merged 4 commits into from
Aug 18, 2017
Merged

Back port PR #8716 #8722

merged 4 commits into from
Aug 18, 2017

Conversation

stuartcarnie
Copy link
Contributor

@stuartcarnie stuartcarnie commented Aug 18, 2017 •
edited
Loading

Required for all non-trivial PRs
  • Rebased/mergable
  • Tests pass
  • CHANGELOG.md updated

@stuartcarnie
inputs are closed if Merge returns error and use <type>FinalizerIterator
f0dadf6 
* <type>FinalizerIterator sets a runtime finalizer and calls Close
  when garbage collected. This will ensure any associated cursors
  are closed and the associated TSM files released
* `query.Iterators#Merge` call could return an error and the inputs
  would not be closed, causing a cursor leak

(cherry picked from commit 823f903)
@stuartcarnie
redundant allocation is overwritten by line 1769
02930b0 
(cherry picked from commit c86dc0d)
@stuartcarnie
naming
18e7e3c 
(cherry picked from commit 25edd7b)
@stuartcarnie
update CHANGELOG
31f3f62
e-dard
e-dard approved these changes Aug 18, 2017
View reviewed changes
Copy link
Contributor

@e-dard e-dard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

@stuartcarnie stuartcarnie merged commit 22c97f5 into 1.3 Aug 18, 2017
@stuartcarnie stuartcarnie deleted the sgc-13-backports branch August 18, 2017 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@e-dard e-dard e-dard approved these changes

@benbjohnson benbjohnson benbjohnson approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@stuartcarnie @benbjohnson @e-dard