Page MenuHomePhabricator
Differential D8487

[native] replace `folly::Optional` with `std::optional`
ClosedPublic
Actions

Authored by kamil on Jul 12 2023, 6:15 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Mar 15, 6:10 PM
Unknown Object (File)
Fri, Mar 7, 1:59 AM
Unknown Object (File)
Wed, Mar 5, 10:05 PM
Unknown Object (File)
Wed, Mar 5, 8:02 AM
Unknown Object (File)
Wed, Mar 5, 1:55 AM
Unknown Object (File)
Tue, Mar 4, 5:53 PM
Unknown Object (File)
Tue, Mar 4, 5:53 PM
Unknown Object (File)
Tue, Mar 4, 5:53 PM
View All Files
Subscribers
ashoat

Details

Reviewers
michal
tomek
• jon
atul
marcin
Commits
rCOMMa3388afb3ec8: [native] replace `folly::Optional` with `std::optional`
Summary

The point is to avoid adding folly dependency on web.

Emscripten C++17 compatibility will be handled in subsequent diff.

Depends on D8472

Test Plan
  1. Log out
  2. Call getOlmPersistAccountData() -> should return nullopt`
  3. Log in
  4. Call getOlmPersistAccountData()` -> should return string
  5. Tested on both iOS and Android.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kamil created this revision.Jul 12 2023, 6:15 AM
kamil held this revision as a draft.
Herald added a subscriber: ashoat. · View Herald TranscriptJul 12 2023, 6:15 AM
kamil added a child revision: D8488: [nix] Enable C++17 support for Emscripten.Jul 12 2023, 6:18 AM
Harbormaster completed remote builds in B20902: Diff 28633.Jul 12 2023, 6:32 AM
kamil published this revision for review.Jul 12 2023, 7:36 AM
michal added inline comments.Jul 14 2023, 2:21 AM
native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp
944–946 ↗(On Diff #28633)

I think this didn't need to be changed (std::optional also has ->), but I haven't used it personally, so maybe there is some difference, and it doesn't really matter anyway.

michal accepted this revision.Jul 14 2023, 2:21 AM
This revision is now accepted and ready to land.Jul 14 2023, 2:21 AM
kamil added a reviewer: marcin.Jul 17 2023, 2:25 AM
This revision now requires review to proceed.Jul 17 2023, 2:25 AM
tomek accepted this revision.Jul 17 2023, 4:43 AM
marcin accepted this revision.Jul 18 2023, 1:43 AM
This revision is now accepted and ready to land.Jul 18 2023, 1:43 AM
kamil removed a parent revision: D8472: [native] add entity and methods for redux-persist storage.Jul 19 2023, 6:46 AM
kamil updated this revision to Diff 28886.Jul 20 2023, 6:32 AM
kamil added a parent revision: D8472: [native] add entity and methods for redux-persist storage.

use -> operator

kamil removed a parent revision: D8472: [native] add entity and methods for redux-persist storage.Jul 20 2023, 6:33 AM
Harbormaster completed remote builds in B21084: Diff 28886.Jul 20 2023, 6:50 AM
Closed by commit rCOMMa3388afb3ec8: [native] replace `folly::Optional` with `std::optional` (authored by kamil). · Explain WhyJul 20 2023, 6:56 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMMa3388afb3ec8: [native] replace `folly::Optional` with `std::optional`.

Revision Contents
Changeset List

PathSize
native/
cpp/
CommonCpp/
DatabaseManagers/
2 lines
2 lines
6 lines
NativeModules/
4 lines

Diff 28887

View Options

native/cpp/CommonCpp/DatabaseManagers/DatabaseQueryExecutor.h

// @flow // @flow
import fs from 'fs'; import fs from 'fs';
import { policyTypes } from 'lib/facts/policies.js'; import { policyTypes } from 'lib/facts/policies.js';
import { messageTypes } from 'lib/types/message-types.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { processMessagesInDBForSearch } from '../database/search-utils.js'; import { processMessagesInDBForSearch } from '../database/search-utils.js';
import { updateRolesAndPermissionsForAllThreads } from '../updaters/thread-permission-updaters.js'; import { updateRolesAndPermissionsForAllThreads } from '../updaters/thread-permission-updaters.js';
const migrations: $ReadOnlyMap<number, () => Promise<void>> = new Map([ const migrations: $ReadOnlyMap<number, () => Promise<void>> = new Map([
[ [
0, 0,
▲ Show 20 Lines • Show All 139 Lines • ▼ Show 20 Lines [
async () => { async () => {
await dbQuery( await dbQuery(
SQL` SQL`
ALTER TABLE uploads ALTER TABLE uploads
ADD COLUMN IF NOT EXISTS thread bigint(20) DEFAULT NULL, ADD COLUMN IF NOT EXISTS thread bigint(20) DEFAULT NULL,
ADD INDEX IF NOT EXISTS thread (thread); ADD INDEX IF NOT EXISTS thread (thread);
UPDATE uploads UPDATE uploads
SET thread = ( SET thread = (
SELECT thread FROM messages SELECT thread FROM messages
WHERE messages.id = uploads.container WHERE messages.id = uploads.container
); );
`, `,
{ multipleStatements: true }, { multipleStatements: true },
); );
}, },
], ],
[ [
16, 16,
async () => { async () => {
▲ Show 20 Lines • Show All 171 Lines • ▼ Show 20 Lines async () => {
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD UNIQUE KEY (name), ADD UNIQUE KEY (name),
ADD INDEX community_primary (community, \`primary\`); ADD INDEX community_primary (community, \`primary\`);
`, `,
{ multipleStatements: true }, { multipleStatements: true },
); );
}, },
], ],
[
32,
async () => {
await dbQuery(SQL`
UPDATE messages
SET target_message = JSON_VALUE(content, "$.sourceMessageID")
WHERE type = ${messageTypes.SIDEBAR_SOURCE};
`);
},
],
]); ]);
const newDatabaseVersion: number = Math.max(...migrations.keys()); const newDatabaseVersion: number = Math.max(...migrations.keys());
async function writeJSONToFile(data: any, filePath: string): Promise<void> { async function writeJSONToFile(data: any, filePath: string): Promise<void> {
console.warn(`updating ${filePath} to ${JSON.stringify(data)}`); console.warn(`updating ${filePath} to ${JSON.stringify(data)}`);
const fileHandle = await fs.promises.open(filePath, 'w'); const fileHandle = await fs.promises.open(filePath, 'w');
await fileHandle.writeFile(JSON.stringify(data, null, ' '), 'utf8'); await fileHandle.writeFile(JSON.stringify(data, null, ' '), 'utf8');
await fileHandle.close(); await fileHandle.close();
▲ Show 20 Lines • Show All 89 Lines • Show Last 20 Lines
View Options

native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h

// @flow // @flow
import fs from 'fs'; import fs from 'fs';
import { policyTypes } from 'lib/facts/policies.js'; import { policyTypes } from 'lib/facts/policies.js';
import { messageTypes } from 'lib/types/message-types.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { processMessagesInDBForSearch } from '../database/search-utils.js'; import { processMessagesInDBForSearch } from '../database/search-utils.js';
import { updateRolesAndPermissionsForAllThreads } from '../updaters/thread-permission-updaters.js'; import { updateRolesAndPermissionsForAllThreads } from '../updaters/thread-permission-updaters.js';
const migrations: $ReadOnlyMap<number, () => Promise<void>> = new Map([ const migrations: $ReadOnlyMap<number, () => Promise<void>> = new Map([
[ [
0, 0,
▲ Show 20 Lines • Show All 139 Lines • ▼ Show 20 Lines [
async () => { async () => {
await dbQuery( await dbQuery(
SQL` SQL`
ALTER TABLE uploads ALTER TABLE uploads
ADD COLUMN IF NOT EXISTS thread bigint(20) DEFAULT NULL, ADD COLUMN IF NOT EXISTS thread bigint(20) DEFAULT NULL,
ADD INDEX IF NOT EXISTS thread (thread); ADD INDEX IF NOT EXISTS thread (thread);
UPDATE uploads UPDATE uploads
SET thread = ( SET thread = (
SELECT thread FROM messages SELECT thread FROM messages
WHERE messages.id = uploads.container WHERE messages.id = uploads.container
); );
`, `,
{ multipleStatements: true }, { multipleStatements: true },
); );
}, },
], ],
[ [
16, 16,
async () => { async () => {
▲ Show 20 Lines • Show All 171 Lines • ▼ Show 20 Lines async () => {
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD UNIQUE KEY (name), ADD UNIQUE KEY (name),
ADD INDEX community_primary (community, \`primary\`); ADD INDEX community_primary (community, \`primary\`);
`, `,
{ multipleStatements: true }, { multipleStatements: true },
); );
}, },
], ],
[
32,
async () => {
await dbQuery(SQL`
UPDATE messages
SET target_message = JSON_VALUE(content, "$.sourceMessageID")
WHERE type = ${messageTypes.SIDEBAR_SOURCE};
`);
},
],
]); ]);
const newDatabaseVersion: number = Math.max(...migrations.keys()); const newDatabaseVersion: number = Math.max(...migrations.keys());
async function writeJSONToFile(data: any, filePath: string): Promise<void> { async function writeJSONToFile(data: any, filePath: string): Promise<void> {
console.warn(`updating ${filePath} to ${JSON.stringify(data)}`); console.warn(`updating ${filePath} to ${JSON.stringify(data)}`);
const fileHandle = await fs.promises.open(filePath, 'w'); const fileHandle = await fs.promises.open(filePath, 'w');
await fileHandle.writeFile(JSON.stringify(data, null, ' '), 'utf8'); await fileHandle.writeFile(JSON.stringify(data, null, ' '), 'utf8');
await fileHandle.close(); await fileHandle.close();
▲ Show 20 Lines • Show All 89 Lines • Show Last 20 Lines
View Options

native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp

// @flow // @flow
import fs from 'fs'; import fs from 'fs';
import { policyTypes } from 'lib/facts/policies.js'; import { policyTypes } from 'lib/facts/policies.js';
import { messageTypes } from 'lib/types/message-types.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { processMessagesInDBForSearch } from '../database/search-utils.js'; import { processMessagesInDBForSearch } from '../database/search-utils.js';
import { updateRolesAndPermissionsForAllThreads } from '../updaters/thread-permission-updaters.js'; import { updateRolesAndPermissionsForAllThreads } from '../updaters/thread-permission-updaters.js';
const migrations: $ReadOnlyMap<number, () => Promise<void>> = new Map([ const migrations: $ReadOnlyMap<number, () => Promise<void>> = new Map([
[ [
0, 0,
▲ Show 20 Lines • Show All 139 Lines • ▼ Show 20 Lines [
async () => { async () => {
await dbQuery( await dbQuery(
SQL` SQL`
ALTER TABLE uploads ALTER TABLE uploads
ADD COLUMN IF NOT EXISTS thread bigint(20) DEFAULT NULL, ADD COLUMN IF NOT EXISTS thread bigint(20) DEFAULT NULL,
ADD INDEX IF NOT EXISTS thread (thread); ADD INDEX IF NOT EXISTS thread (thread);
UPDATE uploads UPDATE uploads
SET thread = ( SET thread = (
SELECT thread FROM messages SELECT thread FROM messages
WHERE messages.id = uploads.container WHERE messages.id = uploads.container
); );
`, `,
{ multipleStatements: true }, { multipleStatements: true },
); );
}, },
], ],
[ [
16, 16,
async () => { async () => {
▲ Show 20 Lines • Show All 171 Lines • ▼ Show 20 Lines async () => {
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD UNIQUE KEY (name), ADD UNIQUE KEY (name),
ADD INDEX community_primary (community, \`primary\`); ADD INDEX community_primary (community, \`primary\`);
`, `,
{ multipleStatements: true }, { multipleStatements: true },
); );
}, },
], ],
[
32,
async () => {
await dbQuery(SQL`
UPDATE messages
SET target_message = JSON_VALUE(content, "$.sourceMessageID")
WHERE type = ${messageTypes.SIDEBAR_SOURCE};
`);
},
],
]); ]);
const newDatabaseVersion: number = Math.max(...migrations.keys()); const newDatabaseVersion: number = Math.max(...migrations.keys());
async function writeJSONToFile(data: any, filePath: string): Promise<void> { async function writeJSONToFile(data: any, filePath: string): Promise<void> {
console.warn(`updating ${filePath} to ${JSON.stringify(data)}`); console.warn(`updating ${filePath} to ${JSON.stringify(data)}`);
const fileHandle = await fs.promises.open(filePath, 'w'); const fileHandle = await fs.promises.open(filePath, 'w');
await fileHandle.writeFile(JSON.stringify(data, null, ' '), 'utf8'); await fileHandle.writeFile(JSON.stringify(data, null, ' '), 'utf8');
await fileHandle.close(); await fileHandle.close();
▲ Show 20 Lines • Show All 89 Lines • Show Last 20 Lines
View Options

native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp

// @flow // @flow
import fs from 'fs'; import fs from 'fs';
import { policyTypes } from 'lib/facts/policies.js'; import { policyTypes } from 'lib/facts/policies.js';
import { messageTypes } from 'lib/types/message-types.js';
import { dbQuery, SQL } from '../database/database.js'; import { dbQuery, SQL } from '../database/database.js';
import { processMessagesInDBForSearch } from '../database/search-utils.js'; import { processMessagesInDBForSearch } from '../database/search-utils.js';
import { updateRolesAndPermissionsForAllThreads } from '../updaters/thread-permission-updaters.js'; import { updateRolesAndPermissionsForAllThreads } from '../updaters/thread-permission-updaters.js';
const migrations: $ReadOnlyMap<number, () => Promise<void>> = new Map([ const migrations: $ReadOnlyMap<number, () => Promise<void>> = new Map([
[ [
0, 0,
▲ Show 20 Lines • Show All 139 Lines • ▼ Show 20 Lines [
async () => { async () => {
await dbQuery( await dbQuery(
SQL` SQL`
ALTER TABLE uploads ALTER TABLE uploads
ADD COLUMN IF NOT EXISTS thread bigint(20) DEFAULT NULL, ADD COLUMN IF NOT EXISTS thread bigint(20) DEFAULT NULL,
ADD INDEX IF NOT EXISTS thread (thread); ADD INDEX IF NOT EXISTS thread (thread);
UPDATE uploads UPDATE uploads
SET thread = ( SET thread = (
SELECT thread FROM messages SELECT thread FROM messages
WHERE messages.id = uploads.container WHERE messages.id = uploads.container
); );
`, `,
{ multipleStatements: true }, { multipleStatements: true },
); );
}, },
], ],
[ [
16, 16,
async () => { async () => {
▲ Show 20 Lines • Show All 171 Lines • ▼ Show 20 Lines async () => {
ADD PRIMARY KEY (id), ADD PRIMARY KEY (id),
ADD UNIQUE KEY (name), ADD UNIQUE KEY (name),
ADD INDEX community_primary (community, \`primary\`); ADD INDEX community_primary (community, \`primary\`);
`, `,
{ multipleStatements: true }, { multipleStatements: true },
); );
}, },
], ],
[
32,
async () => {
await dbQuery(SQL`
UPDATE messages
SET target_message = JSON_VALUE(content, "$.sourceMessageID")
WHERE type = ${messageTypes.SIDEBAR_SOURCE};
`);
},
],
]); ]);
const newDatabaseVersion: number = Math.max(...migrations.keys()); const newDatabaseVersion: number = Math.max(...migrations.keys());
async function writeJSONToFile(data: any, filePath: string): Promise<void> { async function writeJSONToFile(data: any, filePath: string): Promise<void> {
console.warn(`updating ${filePath} to ${JSON.stringify(data)}`); console.warn(`updating ${filePath} to ${JSON.stringify(data)}`);
const fileHandle = await fs.promises.open(filePath, 'w'); const fileHandle = await fs.promises.open(filePath, 'w');
await fileHandle.writeFile(JSON.stringify(data, null, ' '), 'utf8'); await fileHandle.writeFile(JSON.stringify(data, null, ' '), 'utf8');
await fileHandle.close(); await fileHandle.close();
▲ Show 20 Lines • Show All 89 Lines • Show Last 20 Lines