Skip to content

Enable Snappy compression support in LevelDb in cmake builds #885

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

Merged
merged 13 commits into from
Apr 12, 2022
Merged

Enable Snappy compression support in LevelDb in cmake builds #885

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
19b11f4
firestore.cmake: patch leveldb to enable snappy support
dconeybe Apr 7, 2022
5eb52fc
external_rules.cmake: do not overwrite leveldb.cmake from firestore
dconeybe Apr 5, 2022
7898b46
release_build_files/readme.md: release notes entry added
dconeybe Apr 7, 2022
7a057de
leveldb_snappy_test.cc added
dconeybe Apr 7, 2022
c4b8ed5
leveldb_snappy_test.cc: add newline at end of file
dconeybe Apr 7, 2022
f9a0ef7
Merge remote-tracking branch 'origin/main' into snappy
dconeybe Apr 8, 2022
7dfbda9
Add snappy to embedded libraries in packaging step, and snappy namesp…
jonsimantov Apr 8, 2022
f6ed5df
Merge branch 'dconeybe/snappy' of https://github.com/firebase/firebas…
jonsimantov Apr 8, 2022
0f694b3
Add leveldb_snappy_test.cc into project.pbxproj
dconeybe Apr 8, 2022
8bb6bf5
Fix release notes entry to mention RTDB as well as Firestore
dconeybe Apr 9, 2022
be2a2c7
Avoid even compiling leveldb_snappy_test.cc on Android
dconeybe Apr 11, 2022
07023a9
leveldb_snappy_test.cc: add SKIP_TEST_ON_IOS
dconeybe Apr 11, 2022
ec98825
leveldb_snappy_test.cc: add missing #include "firebase_test_framework.h"
dconeybe Apr 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/external/firestore_snappy.patch.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ index b71a77535..2556d7041 100644
endif()

-set(version 1.22)
+set(version e0d5f83a4f80060fe5b5d80025f0ad049bca430e)
+set(version 1.23)
+
+ExternalProject_Get_property(snappy SOURCE_DIR)
+set(snappy_source_dir "${SOURCE_DIR}")
Expand Down
2 changes: 2 additions & 0 deletions release_build_files/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,8 @@ code.
## Release Notes
### Upcoming Release
- Changes
- Firestore/Database (Desktop): Upgrade LevelDb dependency to 1.23
([#886](https://github.com/firebase/firebase-cpp-sdk/pull/886)).
- Firestore (desktop): Enabled Snappy compression support in LevelDb
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this enabled in RTDB now as well? (I noticed the linker error happened in the database integration test too, so it may be using it in both?

Copy link
Contributor

@jonsimantov jonsimantov Apr 8, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Also a nit: Desktop and LevelDB need more capital letters (I think probably also fix LevelDB above)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. In cmake, if Firestore is included in the build then both RTDB and Firestore share the LevelDb library from Firestore. However, if Firestore is excluded from the build then RTDB will use a LevelDb without Snappy support. We should probably do something about this. We had a meeting yesterday where it sounded like a good idea might be to unconditionally download the firebase_ios_sdk and use LevelDb from it regardless of whether or not Firestore is being used. Would you like to hold off merging this until we figure that out?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh wait, I see you were pointing out that the release notes entry needed a correction. I've updated it in 8bb6bf5.

([#885](https://github.com/firebase/firebase-cpp-sdk/pull/885)).

Expand Down