Page MenuHomePhabricator
Differential D3779

[services] Backup - Fix: add missing pragma once to headers
ClosedPublic
Actions

Authored by • karol on Apr 19 2022, 5:11 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 1, 9:34 PM
Unknown Object (File)
Tue, Apr 1, 6:04 AM
Unknown Object (File)
Mon, Mar 31, 9:02 AM
Unknown Object (File)
Sun, Mar 30, 2:17 PM
Unknown Object (File)
Sat, Mar 29, 6:49 AM
Unknown Object (File)
Sun, Mar 16, 12:04 PM
Unknown Object (File)
Fri, Mar 14, 1:57 AM
Unknown Object (File)
Fri, Mar 14, 1:57 AM
View All Files
Subscribers
• abosh
• adrian
ashoat
atul
• benschac
tomek

Details

Reviewers
tomek
ashoat
Commits
rCOMM47ffd8e524ed: [services] Backup - Fix: add missing pragma once to headers
Summary

Depends on D3485

This is more like a best practice, but it's pretty important and may lead to unpleasant errors

Test Plan
cd services
yarn run-backup-service

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

• karol created this revision.Apr 19 2022, 5:11 AM
Herald added subscribers: • abosh, • benschac, atul and 3 others. · View Herald TranscriptApr 19 2022, 5:11 AM
• karol edited the summary of this revision. (Show Details)Apr 19 2022, 5:12 AM
• karol edited the test plan for this revision. (Show Details)
• karol added a reviewer: tomek.
• karol added a parent revision: D3485: [services] Backup - Remove backup base Docker image.
• karol added a child revision: D3780: [services] Backup - Move reactors' implementations to source files.
Harbormaster completed remote builds in B8304: Diff 11600.Apr 19 2022, 5:18 AM
• karol requested review of this revision.Apr 19 2022, 5:18 AM
ashoat accepted this revision.Apr 19 2022, 11:48 AM
This revision is now accepted and ready to land.Apr 19 2022, 11:48 AM
tomek accepted this revision.Apr 21 2022, 9:16 AM

It would be great if we had a tool that would force us to start every header file with this directive

• karol updated this revision to Diff 11784.Apr 22 2022, 3:44 AM

rebase

• karol added a comment.Apr 22 2022, 3:45 AM

Yes, kind of a shame we all missed that.

Harbormaster completed remote builds in B8445: Diff 11784.Apr 22 2022, 4:01 AM
Closed by commit rCOMM47ffd8e524ed: [services] Backup - Fix: add missing pragma once to headers (authored by • karol). · Explain WhyApr 27 2022, 2:38 AM
This revision was automatically updated to reflect the committed changes.
• karol added a commit: rCOMM47ffd8e524ed: [services] Backup - Fix: add missing pragma once to headers.

Revision Contents
Changeset List

PathSize
services/
backup/
src/
Reactors/
client/
base-reactors/
2 lines
2 lines
2 lines

Diff 11600

View Options

services/backup/src/Reactors/client/base-reactors/ClientBidiReactorBase.h

Show First 20 Lines • Show All 218 Lines • ▼ Show 20 Linesfunction generateOpsForUserUpdates(payload: {
return payload.updatesResult.newUpdates return payload.updatesResult.newUpdates
.map(update => .map(update =>
updateSpecs[update.type].generateOpsForUserInfoUpdates?.(update), updateSpecs[update.type].generateOpsForUserInfoUpdates?.(update),
) )
.filter(Boolean) .filter(Boolean)
.flat(); .flat();
} }
function discardKeyserverUsernames(
newUserInfos: UserInfos,
stateUserInfos: UserInfos,
): UserInfos {
let result: UserInfos = {};
for (const id in newUserInfos) {
const username = stateUserInfos[id] ? stateUserInfos[id].username : null;
result = {
...result,
[id]: {
...newUserInfos[id],
username,
},
};
}
return result;
}
type ReduceUserInfosResult = [ type ReduceUserInfosResult = [
UserStore, UserStore,
$ReadOnlyArray<ClientUserInconsistencyReportCreationRequest>, $ReadOnlyArray<ClientUserInconsistencyReportCreationRequest>,
$ReadOnlyArray<UserStoreOperation>, $ReadOnlyArray<UserStoreOperation>,
]; ];
function handleUserInfoUpdates( function handleUserInfoUpdates(
state: UserStore, state: UserStore,
▲ Show 20 Lines • Show All 74 Lines • ▼ Show 20 Lines ) {
if (action.type === joinThreadActionTypes.success) { if (action.type === joinThreadActionTypes.success) {
keyserverID = action.payload.keyserverID; keyserverID = action.payload.keyserverID;
} else { } else {
keyserverID = extractKeyserverIDFromID(action.payload.newThreadID); keyserverID = extractKeyserverIDFromID(action.payload.newThreadID);
} }
if (keyserverID !== authoritativeKeyserverID()) { if (keyserverID !== authoritativeKeyserverID()) {
return [state, [], []]; return [state, [], []];
} }
const newUserInfos: UserInfos = _keyBy(userInfo => userInfo.id)( const keyserverUserInfos: UserInfos = _keyBy(userInfo => userInfo.id)(
action.payload.userInfos, action.payload.userInfos,
); );
const newUserInfos = discardKeyserverUsernames(
keyserverUserInfos,
state.userInfos,
);
const userStoreOps: $ReadOnlyArray<UserStoreOperation> = const userStoreOps: $ReadOnlyArray<UserStoreOperation> =
convertUserInfosToReplaceUserOps(newUserInfos); convertUserInfosToReplaceUserOps(newUserInfos);
const processedUserInfos: UserInfos = processUserStoreOps( const processedUserInfos: UserInfos = processUserStoreOps(
state.userInfos, state.userInfos,
userStoreOps, userStoreOps,
); );
if (!_isEqual(state.userInfos)(processedUserInfos)) { if (!_isEqual(state.userInfos)(processedUserInfos)) {
▲ Show 20 Lines • Show All 236 Lines • Show Last 20 Lines
View Options

services/backup/src/Reactors/client/base-reactors/ClientReadReactorBase.h

Show First 20 Lines • Show All 218 Lines • ▼ Show 20 Linesfunction generateOpsForUserUpdates(payload: {
return payload.updatesResult.newUpdates return payload.updatesResult.newUpdates
.map(update => .map(update =>
updateSpecs[update.type].generateOpsForUserInfoUpdates?.(update), updateSpecs[update.type].generateOpsForUserInfoUpdates?.(update),
) )
.filter(Boolean) .filter(Boolean)
.flat(); .flat();
} }
function discardKeyserverUsernames(
newUserInfos: UserInfos,
stateUserInfos: UserInfos,
): UserInfos {
let result: UserInfos = {};
for (const id in newUserInfos) {
const username = stateUserInfos[id] ? stateUserInfos[id].username : null;
result = {
...result,
[id]: {
...newUserInfos[id],
username,
},
};
}
return result;
}
type ReduceUserInfosResult = [ type ReduceUserInfosResult = [
UserStore, UserStore,
$ReadOnlyArray<ClientUserInconsistencyReportCreationRequest>, $ReadOnlyArray<ClientUserInconsistencyReportCreationRequest>,
$ReadOnlyArray<UserStoreOperation>, $ReadOnlyArray<UserStoreOperation>,
]; ];
function handleUserInfoUpdates( function handleUserInfoUpdates(
state: UserStore, state: UserStore,
▲ Show 20 Lines • Show All 74 Lines • ▼ Show 20 Lines ) {
if (action.type === joinThreadActionTypes.success) { if (action.type === joinThreadActionTypes.success) {
keyserverID = action.payload.keyserverID; keyserverID = action.payload.keyserverID;
} else { } else {
keyserverID = extractKeyserverIDFromID(action.payload.newThreadID); keyserverID = extractKeyserverIDFromID(action.payload.newThreadID);
} }
if (keyserverID !== authoritativeKeyserverID()) { if (keyserverID !== authoritativeKeyserverID()) {
return [state, [], []]; return [state, [], []];
} }
const newUserInfos: UserInfos = _keyBy(userInfo => userInfo.id)( const keyserverUserInfos: UserInfos = _keyBy(userInfo => userInfo.id)(
action.payload.userInfos, action.payload.userInfos,
); );
const newUserInfos = discardKeyserverUsernames(
keyserverUserInfos,
state.userInfos,
);
const userStoreOps: $ReadOnlyArray<UserStoreOperation> = const userStoreOps: $ReadOnlyArray<UserStoreOperation> =
convertUserInfosToReplaceUserOps(newUserInfos); convertUserInfosToReplaceUserOps(newUserInfos);
const processedUserInfos: UserInfos = processUserStoreOps( const processedUserInfos: UserInfos = processUserStoreOps(
state.userInfos, state.userInfos,
userStoreOps, userStoreOps,
); );
if (!_isEqual(state.userInfos)(processedUserInfos)) { if (!_isEqual(state.userInfos)(processedUserInfos)) {
▲ Show 20 Lines • Show All 236 Lines • Show Last 20 Lines
View Options

services/backup/src/Reactors/client/base-reactors/ClientWriteReactorBase.h

Show First 20 Lines • Show All 218 Lines • ▼ Show 20 Linesfunction generateOpsForUserUpdates(payload: {
return payload.updatesResult.newUpdates return payload.updatesResult.newUpdates
.map(update => .map(update =>
updateSpecs[update.type].generateOpsForUserInfoUpdates?.(update), updateSpecs[update.type].generateOpsForUserInfoUpdates?.(update),
) )
.filter(Boolean) .filter(Boolean)
.flat(); .flat();
} }
function discardKeyserverUsernames(
newUserInfos: UserInfos,
stateUserInfos: UserInfos,
): UserInfos {
let result: UserInfos = {};
for (const id in newUserInfos) {
const username = stateUserInfos[id] ? stateUserInfos[id].username : null;
result = {
...result,
[id]: {
...newUserInfos[id],
username,
},
};
}
return result;
}
type ReduceUserInfosResult = [ type ReduceUserInfosResult = [
UserStore, UserStore,
$ReadOnlyArray<ClientUserInconsistencyReportCreationRequest>, $ReadOnlyArray<ClientUserInconsistencyReportCreationRequest>,
$ReadOnlyArray<UserStoreOperation>, $ReadOnlyArray<UserStoreOperation>,
]; ];
function handleUserInfoUpdates( function handleUserInfoUpdates(
state: UserStore, state: UserStore,
▲ Show 20 Lines • Show All 74 Lines • ▼ Show 20 Lines ) {
if (action.type === joinThreadActionTypes.success) { if (action.type === joinThreadActionTypes.success) {
keyserverID = action.payload.keyserverID; keyserverID = action.payload.keyserverID;
} else { } else {
keyserverID = extractKeyserverIDFromID(action.payload.newThreadID); keyserverID = extractKeyserverIDFromID(action.payload.newThreadID);
} }
if (keyserverID !== authoritativeKeyserverID()) { if (keyserverID !== authoritativeKeyserverID()) {
return [state, [], []]; return [state, [], []];
} }
const newUserInfos: UserInfos = _keyBy(userInfo => userInfo.id)( const keyserverUserInfos: UserInfos = _keyBy(userInfo => userInfo.id)(
action.payload.userInfos, action.payload.userInfos,
); );
const newUserInfos = discardKeyserverUsernames(
keyserverUserInfos,
state.userInfos,
);
const userStoreOps: $ReadOnlyArray<UserStoreOperation> = const userStoreOps: $ReadOnlyArray<UserStoreOperation> =
convertUserInfosToReplaceUserOps(newUserInfos); convertUserInfosToReplaceUserOps(newUserInfos);
const processedUserInfos: UserInfos = processUserStoreOps( const processedUserInfos: UserInfos = processUserStoreOps(
state.userInfos, state.userInfos,
userStoreOps, userStoreOps,
); );
if (!_isEqual(state.userInfos)(processedUserInfos)) { if (!_isEqual(state.userInfos)(processedUserInfos)) {
▲ Show 20 Lines • Show All 236 Lines • Show Last 20 Lines