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.

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

Merge 3.2.1 RC2 to master #3338

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open

Merge 3.2.1 RC2 to master #3338

wants to merge 48 commits into from

Conversation

velicuvlad
Copy link
Contributor

No description provided.

pasin and others added 30 commits March 15, 2024 14:59
NSPrivacyAccessedAPITypes and NSPrivacyCollectedDataTypes are required for generating the App’s privacy report even though in the Apple doc, the only required key for 3rd party SDK is NSPrivacyAccessedAPITypes. This commit adds all keys in case the other keys are required in the future by Apple.
* Test 5, 6, 10, 11, 12, 13, 14, 16, 17, 18, 20, 22, 23, 24, 25 : Use centroids = 8.
* Test 5, 6, 7, 8, 9, 10, 11, 12, 14, 17, 18, 20, 22, 24, 25 : Verify that the index is trained.
* Test16 : Verify that the index is untrained.
* Test 20 : Add the step to create the query after the index was deleted.
* Without explicitly set the version, the tool intelligently picks the version number from the podspec file. This may be OK unless we forgot to update the version in the podspec or we cannot update the version until the release time.

* Explicitly set the version number when generating the doc. If the version is not specified, there will be no version shown in the doc.
* update VS version

* update LiteCore to 3.2.0-159

* disable check for trained index to pass test
* import private module defined in modulemap

* check for errors using swift definitions instead of obj-c
* set project to macos 12 and fix issues

* remove MYAnonymousIdentity from project - not used

* update LiteCore

* change from long to double to handle floating comparison testExpiryNoGreaterThanDate
* Ported the fix from release/3.1 branch.

* Used the same approach as CBL-C to generate CE and EE exported symbole file. The workflow will be updating CBL.txt or CBL_EE.txt (Contains EE only symbols) at Objective-C/Exports folder and run generate_exports.sh script. The final export symbol files will be in the Objective-C/Exports/Generated folder.

* Ensured to include all symbols by cross checking with the symbols extracted from the header files.

* Removed obsoleted predefined classes which don’t exist anymore.
… instance (#3278)

* init logging for MutableDocument

* fix typo
* fix obj-c ref in swift api

* fix some other mistakes or spacing within Swift API Docs
…cument is saved (#3287)

* change Document.collection API

* add tests

* remove TODO
* Update LiteCore to 3.2.9-189
* Updated LiteCore to 3.2.9-189.
* Updated VS extension to 1.0.0-42.
* I have noticed that recently the macOS agent on Github Action is much slower than before. I have added `expTimeout` variable for the default expectation timeout and increased a timeout to 20 seconds.
…ack (#3285)

* Directly ported the fix from release/3.1 branch.

* Implemented CBLContextManager class for retaining and mapping the object with its pointer value which can be used as  the context for LiteCore's callbacks (e.g. use when creating c4queryobserver objects). The implementation simply stores the object in a map by using its memory address as the key and returns the memory address as the pointer value.

* Updated CBLQueryObserver to use CBLContextManager to make sure that the released query context can be detected and not be used. When using the query context, the query context is retained.

* Added a test for CBSE-16662 which is related to this issue and two tests to check that there are no notification received without crash (CBL-5660) after removing the token.

* Added an internal debug build only C4QueryObserverCallbackDelayInterval config for testing the fix.
- Update to LiteCore 3.2.0-195 and VS-43
* build for test only in Actions

* build and test for both macOS and iOS in Jenkins
…ng (#3294)

* Updated test 3 and added test 27.
* The implementation update is in the EE repo.
* Implemented Lazy Vector Index and Test for Swift
* Refactored VectorSearchTest in both Swift and Objective-C to reduce duplicate codes.
* Updated some API docs.
* The companion change commit is in the EE repo.
* Implemented Replicator log heiroglyphics by using symbols to describe replicator.

* Removed ":" that separates log meesage and the replicator heiroglyphics as it seems to be redundant.
* Implemented Extension.enableVectorSearch in both Objective-C and Swift.

* Moved the logic from CBLDatabase.mm to CBLExtension in ee repo.

* Used LiteCore 61cfa302d61b8baef2c2cfeeb79c24653e1603a0 temporarily to allow the function to be implemented.
…lt value (#3298)

* add numProbes property and fix tests

* all VS tests enabled now

* LiteCore 3.2.0-210

* update VS to 1.0.0-52

* rename test class names
* update Defaults and exported symbols

* fix isLazy
Made the CBLErrors.h a private header for CBL_Swift and CBL_EE_Swift target.
* Fixed the circular reference b/w CBLCollection and CBLQueryIndex.
* Fixed warning in tests.
… called beforehand (#3302)

* Update test 26/27 per new behaviour

* LiteCore 3.2.0-211
* update defaults for euclideanSquare

* fix tests
* Used new Vector Search SQL in Tests
* Separated the base xctest class to have no tests, otherwise the tests in the base class will be included in the sub classes as well.
* Used forward declaration where possibles in CBLQueryIndex / CBLIndexUpdater implementation.
* Fixed warning in URLEndpointListenerTests and Replicator Tests.
* Used LiteCore 3.2.0-215 and VS 1.0.0-56
pasin and others added 18 commits July 11, 2024 14:41
* Fixed _kCBLDefaultLogFileUsePlaintext symbol.
* Added missing deprecated kCBLDefaultLogFileUsePlainText.
* Used LiteCore RC v3.2.0-219 (554bf8f7)
* Used VS 1.0.0-57
* Fixed objective-c API doc generating script.
* Fixed VectorSearchTest 17 and 26.
* Removed non-existing file from xcode project.
* Updated LiteCore to 3.2.0-220.
* Used VS 1.0.0-58.
* Fixed an incorrect test name.
* LiteCore 3.2.0-223
* cherry picked 5c10248 from release/3.1 branch. A couple of small, easy-to-resolve conflicts - nothing important. CBL-6066: Implement Database Full-Sync Option (#3317)

- Implemented FullSync DatabaseConfiguration property.
- Only Obj-C tests do check for c4db_config2 kC4DB_DiskSyncFull flag
)

* port CBL-6140  from release/3.1

* enable testDatabaseChange and testDocumentChange
NSURL cannot be created with only host and port anymore starting from iOS 17. Changed to use CFURLCreateWithString directly.
* ArrayIndex template

* add CBLArrayIndexConfiguration to CouchbaseLite.h and exports

* add header to CE modulemap
* LiteCore 3.2.1-5

* Obj-C tests and api update

* Swift tests and api update

* CBL-5899
…er (#3335)

* get c4doc using kDocGetAll content lvl for this
* added docID to CBL c4doc
* LiteCore 3.2.1-12
@velicuvlad velicuvlad marked this pull request as ready for review November 4, 2024 13:19
@velicuvlad
Copy link
Contributor Author

Check submodule fails because LiteCore points to the 3.2.1 RC instead of a 4.0 commit. I couldn't find a 4.0 build that passes all tests on iOS. Nonetheless, this is still an update compared to the existing master, and because it has been proposed to go out, it is considered stable until proven otherwise. So will like to merge this in.

Copy link
Contributor

@bmeike bmeike left a comment

Choose a reason for hiding this comment

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

YOW!!! Hope you are testing this carefully.

Were there merge conflicts?

@@ -91,6 +92,7 @@ _kCBLBlobContentTypeProperty
_kCBLBlobDigestProperty
_kCBLBlobLengthProperty
_kCBLBlobType
_kCBLDefaultDatabaseFullSync
Copy link
Contributor

@pasin pasin Nov 4, 2024

Choose a reason for hiding this comment

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

Need _kCBLDefaultDatabaseMmapEnabled here as well.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants