Page MenuHomePhabricator
Differential D8604

[CommCoreModule] implement C++ DraftStore
ClosedPublic
Actions

Authored by kamil on Jul 24 2023, 6:06 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Apr 6, 8:49 AM
Unknown Object (File)
Mon, Mar 31, 7:18 AM
Unknown Object (File)
Mar 15 2025, 6:31 PM
Unknown Object (File)
Mar 13 2025, 10:31 AM
Unknown Object (File)
Mar 13 2025, 10:31 AM
Unknown Object (File)
Mar 13 2025, 10:31 AM
Unknown Object (File)
Mar 13 2025, 10:31 AM
Unknown Object (File)
Mar 13 2025, 10:27 AM
View All Files
Subscribers
ashoat
marcin

Details

Reviewers
michal
• jon
atul
tomek
marcin
Commits
rCOMMe3069eac7e0d: [CommCoreModule] implement C++ DraftStore
Summary

Grouping logic in one class to make it cleaner and reuse some code.

NOTE: I will wait with creating diffs for the rest of the stores until this is accepted because rest will be very similar to this one.

Depends on: D8603

Test Plan

Build iOS and Android and play with drafts to make sure functionality still works.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kamil created this revision.Jul 24 2023, 6:06 AM
kamil held this revision as a draft.
Herald added a subscriber: ashoat. · View Herald TranscriptJul 24 2023, 6:06 AM
kamil added a parent revision: D8603: [CommCoreModule] introduce BaseDataStore template class.Jul 24 2023, 6:07 AM
Harbormaster completed remote builds in B21140: Diff 28962.Jul 24 2023, 6:24 AM
kamil published this revision for review.Jul 24 2023, 6:25 AM
atul accepted this revision.Jul 24 2023, 11:10 PM
atul added a subscriber: marcin.

Would be good to get signoff from @tomek or @marcin before landing

This revision is now accepted and ready to land.Jul 24 2023, 11:10 PM
kamil added a reviewer: marcin. kamil added 1 blocking reviewer(s): tomek.Jul 25 2023, 1:52 AM
In D8604#253487, @atul wrote:

Would be good to get signoff from @tomek or @marcin before landing

Thanks @atul

This revision now requires review to proceed.Jul 25 2023, 1:52 AM
michal accepted this revision.Jul 25 2023, 2:18 AM
tomek accepted this revision.Jul 25 2023, 3:17 AM
tomek added inline comments.
native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/DataStores/DraftStore.cpp
14–17 ↗(On Diff #28962)

Why do we need these?

This revision is now accepted and ready to land.Jul 25 2023, 3:17 AM
kamil mentioned this in D8659: [CommCoreModule] implement C++ ThreadStore.Jul 28 2023, 10:56 AM
kamil added a child revision: D8659: [CommCoreModule] implement C++ ThreadStore.Jul 28 2023, 11:08 AM
kamil added inline comments.Jul 31 2023, 6:12 AM
native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/DataStores/DraftStore.cpp
14–17 ↗(On Diff #28962)

Thanks for pointing this out.

The constructor will be updated because we want to pass std::shared_ptr<facebook::react::CallInvoker> jsInvoker via constructor.

The default destructor is not needed because is not doing anything and this class is not virtual.

kamil updated this revision to Diff 29267.Jul 31 2023, 6:20 AM

rebase

Harbormaster completed remote builds in B21363: Diff 29267.Jul 31 2023, 6:43 AM
Closed by commit rCOMMe3069eac7e0d: [CommCoreModule] implement C++ DraftStore (authored by kamil). · Explain WhyJul 31 2023, 8:03 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMMe3069eac7e0d: [CommCoreModule] implement C++ DraftStore.
kamil mentioned this in rCOMMef04728fafd8: [CommCoreModule] implement C++ ThreadStore.
kamil mentioned this in D8681: [native] remove unused `using namespace`.Jul 31 2023, 10:01 AM
kamil mentioned this in rCOMM20127c72f417: [native] remove unused `using namespace`.Aug 1 2023, 5:43 AM

Revision Contents
Changeset List

PathSize
native/
cpp/
CommonCpp/
NativeModules/
5 lines
2 lines
103 lines
6 lines
PersistentStorageUtilities/
DataStores/
2 lines
29 lines
67 lines
ios/
Comm.xcodeproj/
6 lines

Diff 29283

View Options

native/cpp/CommonCpp/NativeModules/CMakeLists.txt

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines text = ''
if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then
# mysql directory should exist if MariaDB has been initialized # mysql directory should exist if MariaDB has been initialized
echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2
"${lib.getBin mariadb}/bin/mariadb-install-db" \ "${lib.getBin mariadb}/bin/mariadb-install-db" \
--datadir="$MARIADB_DATA_HOME" \ --datadir="$MARIADB_DATA_HOME" \
--auth-root-authentication-method=socket --auth-root-authentication-method=socket
fi fi
# Check if MariaDB server was already started "${../scripts/start_comm_daemon.sh}" \
set +e # allow for pgrep to not find matches mariadbd \
# BSD pgrep doesn't have a "count" feature, use wc then trim whitespace MariaDB \
mariadb_count=$(pgrep mariadbd | wc -l | xargs echo) "${mariadb-entrypoint}/bin/mariadb-init" \
set -e "$MARIADB_PIDFILE"
if [[ "$mariadb_count" -eq "0" ]]; then
echo "Starting MariaDB server"
# No MariaDB present, start our own
# Launch in subshell so if the original terminal is closed, the process
# will be inherited instead of also being forced closed
("${mariadb-entrypoint}/bin/mariadb-init" &
echo "$!" > "$MARIADB_PIDFILE")
echo "Waiting for MariaDB to come up" echo "Waiting for MariaDB to come up"
while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done
elif [[ "$mariadb_count" -eq "1" ]]; then
# Check if it was started by this script
running_pid="$(pgrep mariadbd)"
if [[ ! -f "$MARIADB_PIDFILE" ]] || \
[[ "$(cat "$MARIADB_PIDFILE")" != "$running_pid" ]]; then
echo "Existing MariaDB instance found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
else
echo "Many MariaDB instances found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
# Initialize comm user, database, and secrets file for MariaDB # Initialize comm user, database, and secrets file for MariaDB
# Connecting through socket doesn't require a password # Connecting through socket doesn't require a password
userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \
-Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';"
) )
if [[ "$userCount" -eq 0 ]]; then if [[ "$userCount" -eq 0 ]]; then
PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6)
Show All 29 Lines
View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.h

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines text = ''
if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then
# mysql directory should exist if MariaDB has been initialized # mysql directory should exist if MariaDB has been initialized
echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2
"${lib.getBin mariadb}/bin/mariadb-install-db" \ "${lib.getBin mariadb}/bin/mariadb-install-db" \
--datadir="$MARIADB_DATA_HOME" \ --datadir="$MARIADB_DATA_HOME" \
--auth-root-authentication-method=socket --auth-root-authentication-method=socket
fi fi
# Check if MariaDB server was already started "${../scripts/start_comm_daemon.sh}" \
set +e # allow for pgrep to not find matches mariadbd \
# BSD pgrep doesn't have a "count" feature, use wc then trim whitespace MariaDB \
mariadb_count=$(pgrep mariadbd | wc -l | xargs echo) "${mariadb-entrypoint}/bin/mariadb-init" \
set -e "$MARIADB_PIDFILE"
if [[ "$mariadb_count" -eq "0" ]]; then
echo "Starting MariaDB server"
# No MariaDB present, start our own
# Launch in subshell so if the original terminal is closed, the process
# will be inherited instead of also being forced closed
("${mariadb-entrypoint}/bin/mariadb-init" &
echo "$!" > "$MARIADB_PIDFILE")
echo "Waiting for MariaDB to come up" echo "Waiting for MariaDB to come up"
while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done
elif [[ "$mariadb_count" -eq "1" ]]; then
# Check if it was started by this script
running_pid="$(pgrep mariadbd)"
if [[ ! -f "$MARIADB_PIDFILE" ]] || \
[[ "$(cat "$MARIADB_PIDFILE")" != "$running_pid" ]]; then
echo "Existing MariaDB instance found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
else
echo "Many MariaDB instances found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
# Initialize comm user, database, and secrets file for MariaDB # Initialize comm user, database, and secrets file for MariaDB
# Connecting through socket doesn't require a password # Connecting through socket doesn't require a password
userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \
-Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';"
) )
if [[ "$userCount" -eq 0 ]]; then if [[ "$userCount" -eq 0 ]]; then
PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6)
Show All 29 Lines
View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines text = ''
if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then
# mysql directory should exist if MariaDB has been initialized # mysql directory should exist if MariaDB has been initialized
echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2
"${lib.getBin mariadb}/bin/mariadb-install-db" \ "${lib.getBin mariadb}/bin/mariadb-install-db" \
--datadir="$MARIADB_DATA_HOME" \ --datadir="$MARIADB_DATA_HOME" \
--auth-root-authentication-method=socket --auth-root-authentication-method=socket
fi fi
# Check if MariaDB server was already started "${../scripts/start_comm_daemon.sh}" \
set +e # allow for pgrep to not find matches mariadbd \
# BSD pgrep doesn't have a "count" feature, use wc then trim whitespace MariaDB \
mariadb_count=$(pgrep mariadbd | wc -l | xargs echo) "${mariadb-entrypoint}/bin/mariadb-init" \
set -e "$MARIADB_PIDFILE"
if [[ "$mariadb_count" -eq "0" ]]; then
echo "Starting MariaDB server"
# No MariaDB present, start our own
# Launch in subshell so if the original terminal is closed, the process
# will be inherited instead of also being forced closed
("${mariadb-entrypoint}/bin/mariadb-init" &
echo "$!" > "$MARIADB_PIDFILE")
echo "Waiting for MariaDB to come up" echo "Waiting for MariaDB to come up"
while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done
elif [[ "$mariadb_count" -eq "1" ]]; then
# Check if it was started by this script
running_pid="$(pgrep mariadbd)"
if [[ ! -f "$MARIADB_PIDFILE" ]] || \
[[ "$(cat "$MARIADB_PIDFILE")" != "$running_pid" ]]; then
echo "Existing MariaDB instance found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
else
echo "Many MariaDB instances found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
# Initialize comm user, database, and secrets file for MariaDB # Initialize comm user, database, and secrets file for MariaDB
# Connecting through socket doesn't require a password # Connecting through socket doesn't require a password
userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \
-Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';"
) )
if [[ "$userCount" -eq 0 ]]; then if [[ "$userCount" -eq 0 ]]; then
PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6)
Show All 29 Lines
View Options

native/cpp/CommonCpp/NativeModules/DraftStoreOperations.h

Show First 20 Lines • Show All 54 Lines • ▼ Show 20 Lines text = ''
if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then if [[ ! -d "$MARIADB_DATA_HOME"/mysql ]]; then
# mysql directory should exist if MariaDB has been initialized # mysql directory should exist if MariaDB has been initialized
echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2 echo "Initializing MariaDB database at $MARIADB_DATA_HOME" >&2
"${lib.getBin mariadb}/bin/mariadb-install-db" \ "${lib.getBin mariadb}/bin/mariadb-install-db" \
--datadir="$MARIADB_DATA_HOME" \ --datadir="$MARIADB_DATA_HOME" \
--auth-root-authentication-method=socket --auth-root-authentication-method=socket
fi fi
# Check if MariaDB server was already started "${../scripts/start_comm_daemon.sh}" \
set +e # allow for pgrep to not find matches mariadbd \
# BSD pgrep doesn't have a "count" feature, use wc then trim whitespace MariaDB \
mariadb_count=$(pgrep mariadbd | wc -l | xargs echo) "${mariadb-entrypoint}/bin/mariadb-init" \
set -e "$MARIADB_PIDFILE"
if [[ "$mariadb_count" -eq "0" ]]; then
echo "Starting MariaDB server"
# No MariaDB present, start our own
# Launch in subshell so if the original terminal is closed, the process
# will be inherited instead of also being forced closed
("${mariadb-entrypoint}/bin/mariadb-init" &
echo "$!" > "$MARIADB_PIDFILE")
echo "Waiting for MariaDB to come up" echo "Waiting for MariaDB to come up"
while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done while [[ ! -S "$MYSQL_UNIX_PORT" ]]; do sleep 1; done
elif [[ "$mariadb_count" -eq "1" ]]; then
# Check if it was started by this script
running_pid="$(pgrep mariadbd)"
if [[ ! -f "$MARIADB_PIDFILE" ]] || \
[[ "$(cat "$MARIADB_PIDFILE")" != "$running_pid" ]]; then
echo "Existing MariaDB instance found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
else
echo "Many MariaDB instances found outside of nix environment" >&2
echo "Please stop existing services and attempt 'mariadb-up' again" >&2
exit 1
fi
# Initialize comm user, database, and secrets file for MariaDB # Initialize comm user, database, and secrets file for MariaDB
# Connecting through socket doesn't require a password # Connecting through socket doesn't require a password
userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \ userCount=$("${lib.getBin mariadb}/bin/mariadb" -u "$USER" \
-Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';" -Bse "SELECT COUNT(1) FROM mysql.user WHERE user = 'comm';"
) )
if [[ "$userCount" -eq 0 ]]; then if [[ "$userCount" -eq 0 ]]; then
PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6) PASS=$("${lib.getBin openssl}/bin/openssl" rand -hex 6)
Show All 29 Lines
View Options

native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/DataStores/BaseDataStore.h

Loading...
View Options

native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/DataStores/DraftStore.h

Loading...
View Options

native/cpp/CommonCpp/NativeModules/PersistentStorageUtilities/DataStores/DraftStore.cpp

Loading...
View Options

native/ios/Comm.xcodeproj/project.pbxproj

Loading...