Cherry picks from 4.1 to 3.4#500
Merged
Merged
Conversation
Make currentThread an AtomicLong so isInsideExecutor() reads a consistent, visible value across pool threads. Clear it with compareAndSet in the finally block so a task that has already claimed the thread for the next run is not cleared.
* Implemented Kotlin Serialization for Fleece * Implemented serialization-based API extensions - Collection.getDocumentAs(), save() - Result.data() - ResultSet.data() * Implemented Collection.delete(DocumentModel) * Allow null docID when saving new DocumentModel * Fixes from code review (not all fixed) - serializeToFleece() now returns a FLSliceResult not a ByteArray. - Callers of the above use `use` to release the memory when done. - Use `use` to release Fleece iterators. - Collection.save(DocumentModel) interprets a null conflict handler as last-write-wins. This fixes a NPE bug too. * FLValue.asString() should be marked @nullable per Jim. Fixed FleeceDeserialization to handle null by returning "" instead. * Ensure MutableDocument.setContentFromModel doesn't lose backing store Co-authored-by: Jens Alfke <jens@couchbase.com>
…PI changes
* Replace var with explicit FLDict type in Document.setContent (common is compiled at Java 8)
* Suppress PMD SingularField and SpotBugs URF_UNREAD_FIELD on Document.extraBackingStore (keep-alive field)
* Add null check on FLValue.fromData() result in Document.setContent (NP_NULL_ON_SOME_PATH)
* Move serialization tests from test/java to test/kotlin so that only the android-ktx test builds compile them :
- FleeceSerializationTest.kt moved as-is
- ResultTest.kt renamed to ResultSerializationTest.kt
- Serialization test and TestModel extracted from CollectionTest.kt into new CollectionSerializationTest.kt
btAttached() (incoming) now calls c4socket_retain, matching btOpen(), to balance the c4socket_release in NativeC4Socket_closed. Without it the incoming socket was double-freed on teardown (SIGABRT, invalid refCount -6666666).
|
This is a release branch and commits are restricted. Please confirm this PR is one of the following:
|
Member
Author
|
3.4 / 4.1 parity |
pasin
reviewed
Jun 19, 2026
Member
Author
pasin
approved these changes
Jun 19, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
All commits came in as-is without conflict