Fixes writer max annotation option doesn't work. #260
Merged
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.
Description:
This PR is working on amazon-ion/ion-python#165 on ion-c layer and the fix of ion-python layer is here.
Step by step fix:
IERR_NO_MEMORY
error when max_annotation_count is so large. The root is because we only allocate default memory (In this case, it's 1024 bytes) for temp_buffer where the annotation bytes is stored. The code details is here. So I calculated how much bytes we need for annotations:p_options->max_annotation_count * sizeof(ION_SYMBOL)
p_options->max_annotation_count * sizeof(ION_SYMBOL) + ION_WRITER_TEMP_BUFFER_DEFAULT
bytes for temp_buffer (see change below line 278) where it has+ION_WRITER_TEMP_BUFFER_DEFAULT
at the end. So we calculate how many bytes annotations need first, then addION_WRITER_TEMP_BUFFER_DEFAULT
for other fields, which solves the issue and passes all tests.Tests:
This change passes ion-c tests, ion-python tests and ion-hash-python tests.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.