Page MenuHomePhabricator
Differential D12074

[SQLite] remove Outbound P2P messages based on `messageID` and `deviceID`
ClosedPublic
Actions

Authored by kamil on May 16 2024, 7:14 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Feb 21, 7:39 AM
Unknown Object (File)
Fri, Feb 21, 7:39 AM
Unknown Object (File)
Fri, Feb 21, 7:38 AM
Unknown Object (File)
Jan 22 2025, 1:27 AM
Unknown Object (File)
Jan 13 2025, 6:58 PM
Unknown Object (File)
Jan 13 2025, 6:53 PM
Unknown Object (File)
Jan 13 2025, 6:20 PM
Unknown Object (File)
Dec 23 2024, 5:15 PM
View All 47 Files
Subscribers
ashoat

Details

Reviewers
tomek
marcin
Commits
rCOMMdcb171a7b9fa: [SQLite] remove Outbound P2P messages based on `messageID` and `deviceID`
Summary

After processing the other peer will send only messageID - not full OutboundP2PMessage.

Depends on D12071

Test Plan

Tests

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kamil created this revision.May 16 2024, 7:14 AM
kamil held this revision as a draft.
Herald added a subscriber: ashoat. · View Herald TranscriptMay 16 2024, 7:14 AM
Harbormaster completed remote builds in B28985: Diff 40289.May 16 2024, 7:29 AM
kamil added a child revision: D12075: [SQLite] remove `deviceID` param when getting all Outbound P2P messages.May 16 2024, 7:33 AM
kamil added inline comments.May 16 2024, 10:11 AM
native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
1149 ↗(On Diff #40289)

debugging leftover

kamil published this revision for review.May 17 2024, 3:23 AM
kamil added inline comments.
native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
2149–2152 ↗(On Diff #40289)

not sure about indentation here

marcin added inline comments.May 17 2024, 6:28 AM
native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
2149–2152 ↗(On Diff #40289)

The convention is to sue the same SQL formatting conventions as we have on the keyserver. Take a look here: https://github.com/CommE2E/comm/blob/master/keyserver/src/creators/invite-link-creator.js#L158-L164

2159–2161 ↗(On Diff #40289)

Please use SQLiteDataConverters.h

2164–2169 ↗(On Diff #40289)

You can remove those lines - SQLiteStatementWrapper destructor does it automatically.

kamil updated this revision to Diff 40588.May 23 2024, 8:26 AM

address review

Harbormaster completed remote builds in B29215: Diff 40588.May 23 2024, 8:42 AM
marcin accepted this revision.May 23 2024, 8:42 AM
This revision is now accepted and ready to land.May 23 2024, 8:42 AM
Closed by commit rCOMMdcb171a7b9fa: [SQLite] remove Outbound P2P messages based on `messageID` and `deviceID` (authored by kamil). · Explain WhyMay 23 2024, 9:02 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMMdcb171a7b9fa: [SQLite] remove Outbound P2P messages based on `messageID` and `deviceID`.

Revision Contents
Changeset List

PathSize
native/
cpp/
CommonCpp/
DatabaseManagers/
3 lines
3 lines
31 lines
web/
shared-worker/
_generated/
queries/
11 lines
types/
3 lines

Diff 40595

View Options

native/cpp/CommonCpp/DatabaseManagers/DatabaseQueryExecutor.h

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines const mediaID =
request.type === 'image' || request.type === 'encrypted_image' request.type === 'image' || request.type === 'encrypted_image'
? request.uploadID ? request.uploadID
: null; : null;
const query = SQL` const query = SQL`
START TRANSACTION; START TRANSACTION;
UPDATE uploads UPDATE uploads
SET container = NULL SET user_container = NULL
WHERE uploader = ${viewer.userID} WHERE uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL AND thread IS NULL
) )
); );
UPDATE uploads UPDATE uploads
SET container = ${viewer.userID} SET user_container = ${viewer.userID}
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL; AND thread IS NULL;
UPDATE users UPDATE users
SET avatar = ${newAvatarValue} SET avatar = ${newAvatarValue}
WHERE id = ${viewer.userID} WHERE id = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND thread IS NULL AND thread IS NULL
) )
); );
COMMIT; COMMIT;
SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID}; AND user_container = ${viewer.userID};
`; `;
const [resultSet] = await dbQuery(query, { multipleStatements: true }); const [resultSet] = await dbQuery(query, { multipleStatements: true });
const selectResult = resultSet.pop(); const selectResult = resultSet.pop();
const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer); const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer);
const updates: CreateUpdatesResult = await createUserAvatarUpdates( const updates: CreateUpdatesResult = await createUserAvatarUpdates(
viewer, viewer,
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines
View Options

native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines const mediaID =
request.type === 'image' || request.type === 'encrypted_image' request.type === 'image' || request.type === 'encrypted_image'
? request.uploadID ? request.uploadID
: null; : null;
const query = SQL` const query = SQL`
START TRANSACTION; START TRANSACTION;
UPDATE uploads UPDATE uploads
SET container = NULL SET user_container = NULL
WHERE uploader = ${viewer.userID} WHERE uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL AND thread IS NULL
) )
); );
UPDATE uploads UPDATE uploads
SET container = ${viewer.userID} SET user_container = ${viewer.userID}
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL; AND thread IS NULL;
UPDATE users UPDATE users
SET avatar = ${newAvatarValue} SET avatar = ${newAvatarValue}
WHERE id = ${viewer.userID} WHERE id = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND thread IS NULL AND thread IS NULL
) )
); );
COMMIT; COMMIT;
SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID}; AND user_container = ${viewer.userID};
`; `;
const [resultSet] = await dbQuery(query, { multipleStatements: true }); const [resultSet] = await dbQuery(query, { multipleStatements: true });
const selectResult = resultSet.pop(); const selectResult = resultSet.pop();
const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer); const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer);
const updates: CreateUpdatesResult = await createUserAvatarUpdates( const updates: CreateUpdatesResult = await createUserAvatarUpdates(
viewer, viewer,
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines
View Options

native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines const mediaID =
request.type === 'image' || request.type === 'encrypted_image' request.type === 'image' || request.type === 'encrypted_image'
? request.uploadID ? request.uploadID
: null; : null;
const query = SQL` const query = SQL`
START TRANSACTION; START TRANSACTION;
UPDATE uploads UPDATE uploads
SET container = NULL SET user_container = NULL
WHERE uploader = ${viewer.userID} WHERE uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL AND thread IS NULL
) )
); );
UPDATE uploads UPDATE uploads
SET container = ${viewer.userID} SET user_container = ${viewer.userID}
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL; AND thread IS NULL;
UPDATE users UPDATE users
SET avatar = ${newAvatarValue} SET avatar = ${newAvatarValue}
WHERE id = ${viewer.userID} WHERE id = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND thread IS NULL AND thread IS NULL
) )
); );
COMMIT; COMMIT;
SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID}; AND user_container = ${viewer.userID};
`; `;
const [resultSet] = await dbQuery(query, { multipleStatements: true }); const [resultSet] = await dbQuery(query, { multipleStatements: true });
const selectResult = resultSet.pop(); const selectResult = resultSet.pop();
const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer); const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer);
const updates: CreateUpdatesResult = await createUserAvatarUpdates( const updates: CreateUpdatesResult = await createUserAvatarUpdates(
viewer, viewer,
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines
View Options

web/shared-worker/_generated/comm_query_executor.wasm

Show First 20 Lines • Show All 122 Lines • ▼ Show 20 Lines const mediaID =
request.type === 'image' || request.type === 'encrypted_image' request.type === 'image' || request.type === 'encrypted_image'
? request.uploadID ? request.uploadID
: null; : null;
const query = SQL` const query = SQL`
START TRANSACTION; START TRANSACTION;
UPDATE uploads UPDATE uploads
SET container = NULL SET user_container = NULL
WHERE uploader = ${viewer.userID} WHERE uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL AND thread IS NULL
) )
); );
UPDATE uploads UPDATE uploads
SET container = ${viewer.userID} SET user_container = ${viewer.userID}
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container IS NULL AND container IS NULL
AND user_container IS NULL
AND thread IS NULL; AND thread IS NULL;
UPDATE users UPDATE users
SET avatar = ${newAvatarValue} SET avatar = ${newAvatarValue}
WHERE id = ${viewer.userID} WHERE id = ${viewer.userID}
AND ( AND (
${mediaID} IS NULL ${mediaID} IS NULL
OR EXISTS ( OR EXISTS (
SELECT 1 SELECT 1
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID} AND user_container = ${viewer.userID}
AND thread IS NULL AND thread IS NULL
) )
); );
COMMIT; COMMIT;
SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra SELECT id AS upload_id, secret AS upload_secret, extra AS upload_extra
FROM uploads FROM uploads
WHERE id = ${mediaID} WHERE id = ${mediaID}
AND uploader = ${viewer.userID} AND uploader = ${viewer.userID}
AND container = ${viewer.userID}; AND user_container = ${viewer.userID};
`; `;
const [resultSet] = await dbQuery(query, { multipleStatements: true }); const [resultSet] = await dbQuery(query, { multipleStatements: true });
const selectResult = resultSet.pop(); const selectResult = resultSet.pop();
const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer); const knownUserInfos: UserInfos = await fetchKnownUserInfos(viewer);
const updates: CreateUpdatesResult = await createUserAvatarUpdates( const updates: CreateUpdatesResult = await createUserAvatarUpdates(
viewer, viewer,
▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines
View Options

web/shared-worker/queries/outbound-p2p-message-queries.test.js

Loading...
View Options

web/shared-worker/types/sqlite-query-executor.js

Loading...