Page MenuHomePhabricator
Differential D3178

[services] Backup - Reuse remove logic
ClosedPublic
Actions

Authored by • karol on Feb 11 2022, 3:42 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 9, 4:59 AM
Unknown Object (File)
Sun, Mar 9, 4:59 AM
Unknown Object (File)
Sun, Mar 9, 4:58 AM
Unknown Object (File)
Sun, Mar 9, 4:58 AM
Unknown Object (File)
Sun, Mar 9, 4:58 AM
Unknown Object (File)
Sun, Mar 9, 4:58 AM
Unknown Object (File)
Sun, Mar 9, 4:53 AM
Unknown Object (File)
Mon, Feb 24, 7:53 AM
View All Files
Subscribers
• adrian
ashoat
atul
• benschac
tomek

Details

Reviewers
tomek
• max
varun
ashoat
Commits
rCOMM051afff095af: [services] Backup - Reuse remove logic
Summary

Reuse innerRemoveItem for BackupItem`s and LogItems

Depends on D3177

Test Plan
cd services
yarn test-backup-service

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

• karol created this revision.Feb 11 2022, 3:42 AM
Herald added subscribers: atul, • adrian, tomek, ashoat. · View Herald TranscriptFeb 11 2022, 3:42 AM
• karol edited the summary of this revision. (Show Details)Feb 11 2022, 3:49 AM
• karol edited the test plan for this revision. (Show Details)
• karol added reviewers: tomek, • max, varun.
• karol added a parent revision: D3177: [services] Backup - Fix primary key logic.
• karol added a child revision: D3179: [services] Blob - Fix logic for primary key.Feb 11 2022, 3:53 AM
Harbormaster completed remote builds in B6746: Diff 9563.Feb 11 2022, 3:58 AM
• karol requested review of this revision.Feb 11 2022, 3:58 AM
tomek requested changes to this revision.Feb 11 2022, 7:54 AM
tomek added inline comments.
services/backup/docker-server/contents/server/src/DatabaseManager.cpp
33–36 ↗(On Diff #9563)

This is really confusing. On one hand, we use PrimaryKey to describe db structure by having column names in it. And now, we use the same object to store primary key value.
Additionally, primaryKeyValue is created by taking some fields from item and we pass both of them to this function - it doesn't make too much sense.

We should instead add a method to Item e.g. getPrimaryKeyValue and use this method here. And I think we should have separate types for PrimaryKey and PrimaryKeyValue just to avoid them being confused with each other.

This revision now requires changes to proceed.Feb 11 2022, 7:54 AM
• karol mentioned this in D3177: [services] Backup - Fix primary key logic.Feb 14 2022, 3:28 AM
• karol added inline comments.Feb 14 2022, 4:06 AM
services/backup/docker-server/contents/server/src/DatabaseManager.cpp
33–36 ↗(On Diff #9563)

When I was writing this code I realized this can be confusing. Didn't really have an idea on how to overcome this.

We can do getPrimaryKeyValue and also "separate" these types: PrimaryKey and PrimaryKeyValue. My idea is that they can be the same but have different names just to make it more clear.

• karol updated this revision to Diff 9604.Feb 14 2022, 4:31 AM

changes requested in the review

Harbormaster completed remote builds in B6782: Diff 9604.Feb 14 2022, 4:38 AM
• karol mentioned this in D3179: [services] Blob - Fix logic for primary key.Feb 14 2022, 5:31 AM
tomek requested changes to this revision.Feb 14 2022, 6:22 AM
tomek added inline comments.
services/backup/docker-server/contents/server/src/DatabaseManager.cpp
31–37 ↗(On Diff #9604)

Can't we just take primaryKeyValue from the item?

This revision now requires changes to proceed.Feb 14 2022, 6:22 AM
• karol added inline comments.Feb 15 2022, 5:05 AM
services/backup/docker-server/contents/server/src/DatabaseManager.cpp
31–37 ↗(On Diff #9604)

Yes! Thanks!

• karol updated this revision to Diff 9661.Feb 15 2022, 5:16 AM

update

Harbormaster completed remote builds in B6822: Diff 9661.Feb 15 2022, 5:24 AM
tomek accepted this revision.Feb 15 2022, 7:22 AM

Nice!

This revision is now accepted and ready to land.Feb 15 2022, 7:22 AM
Herald added a reviewer: ashoat. · View Herald TranscriptFeb 15 2022, 7:22 AM
Herald added a subscriber: • benschac. · View Herald Transcript
This revision now requires review to proceed.Feb 15 2022, 7:22 AM
ashoat accepted this revision.Feb 15 2022, 7:57 PM
This revision is now accepted and ready to land.Feb 15 2022, 7:57 PM
• karol updated this revision to Diff 9727.Feb 16 2022, 6:32 AM

update

Harbormaster completed remote builds in B6879: Diff 9727.Feb 16 2022, 6:37 AM
Closed by commit rCOMM051afff095af: [services] Backup - Reuse remove logic (authored by • karol). · Explain WhyMar 4 2022, 4:06 AM
This revision was automatically updated to reflect the committed changes.
• karol added a commit: rCOMM051afff095af: [services] Backup - Reuse remove logic.

Revision Contents
Changeset List

PathSize
services/
backup/
docker-server/
contents/
server/
src/
2 lines
45 lines

Diff 10066

View Options

services/backup/docker-server/contents/server/src/DatabaseManager.h

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { FlatList, Platform } from 'react-native'; import { FlatList, Platform } from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context'; import { SafeAreaView } from 'react-native-safe-area-context';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import { import {
childThreadInfos, childThreadInfos,
communityThreadSelector, communityThreadSelector,
} from 'lib/selectors/thread-selectors'; } from 'lib/selectors/thread-selectors';
import { threadIsChannel } from 'lib/shared/thread-utils'; import {
import { type ThreadInfo, communitySubthreads } from 'lib/types/thread-types'; createRecursiveDrawerItemsData,
appendSuffix,
} from 'lib/utils/drawer-utils.react';
import { useNavigateToThread } from '../chat/message-list-types'; import { useNavigateToThread } from '../chat/message-list-types';
import { useStyles } from '../themes/colors'; import { useStyles } from '../themes/colors';
import type { TextStyle } from '../types/styles';
import CommunityDrawerItemCommunity from './community-drawer-item-cummunity.react'; import CommunityDrawerItemCommunity from './community-drawer-item-cummunity.react';
const maxDepth = 2; const maxDepth = 2;
const safeAreaEdges = Platform.select({ const safeAreaEdges = Platform.select({
ios: ['top'], ios: ['top'],
default: ['top', 'bottom'], default: ['top', 'bottom'],
}); });
Show All 10 Linesfunction CommunityDrawerContent(): React.Node {
const navigateToThread = useNavigateToThread(); const navigateToThread = useNavigateToThread();
const childThreadInfosMap = useSelector(childThreadInfos); const childThreadInfosMap = useSelector(childThreadInfos);
const setOpenCommunnityOrClose = React.useCallback((index: string) => { const setOpenCommunnityOrClose = React.useCallback((index: string) => {
setOpenCommunity(open => (open === index ? null : index)); setOpenCommunity(open => (open === index ? null : index));
}, []); }, []);
const renderItem = React.useCallback( const renderItem = React.useCallback(
({ item }) => { ({ item }) => {
const itemData = {
threadInfo: item.threadInfo,
itemChildren: item.itemChildren,
labelStyle: item.labelStyle,
hasSubchannelsButton: item.subchannelsButton,
};
return ( return (
<CommunityDrawerItemCommunity <CommunityDrawerItemCommunity
key={item.key} key={item.threadInfo.id}
itemData={itemData} itemData={item}
toggleExpanded={setOpenCommunnityOrClose} toggleExpanded={setOpenCommunnityOrClose}
expanded={itemData.threadInfo.id === openCommunity} expanded={item.threadInfo.id === openCommunity}
navigateToThread={navigateToThread} navigateToThread={navigateToThread}
/> />
); );
}, },
michalUnsubmitted
Not Done
Inline Actions
}, []);
const renderItem = React.useCallback(
- ({ item }) => {
- return (
+ ({ item }) => (
<CommunityDrawerItemCommunity
key={item.threadInfo.id}
itemData={item}
toggleExpanded={setOpenCommunnityOrClose}
expanded={item.threadInfo.id === openCommunity}
navigateToThread={navigateToThread}
/>
- );
- },
+ ),
[navigateToThread, openCommunity, setOpenCommunnityOrClose],

This now can be simplified.

michal: This now can be simplified.
[navigateToThread, openCommunity, setOpenCommunnityOrClose], [navigateToThread, openCommunity, setOpenCommunnityOrClose],
); );
const labelStylesObj = useStyles(labelUnboundStyles); const labelStylesObj = useStyles(labelUnboundStyles);
const labelStyles = React.useMemo( const labelStyles = React.useMemo(
() => [ () => [
labelStylesObj.level0Label, labelStylesObj.level0Label,
labelStylesObj.level1Label, labelStylesObj.level1Label,
labelStylesObj.level2Label, labelStylesObj.level2Label,
], ],
[labelStylesObj], [labelStylesObj],
); );
const drawerItemsData = React.useMemo( const drawerItemsData = React.useMemo(
() => () =>
createRecursiveDrawerItemsData( createRecursiveDrawerItemsData(
childThreadInfosMap, childThreadInfosMap,
communitiesSuffixed, communitiesSuffixed,
labelStyles, labelStyles,
maxDepth,
), ),
[childThreadInfosMap, communitiesSuffixed, labelStyles], [childThreadInfosMap, communitiesSuffixed, labelStyles],
); );
return ( return (
<SafeAreaView style={styles.drawerContent} edges={safeAreaEdges}> <SafeAreaView style={styles.drawerContent} edges={safeAreaEdges}>
<FlatList data={drawerItemsData} renderItem={renderItem} /> <FlatList data={drawerItemsData} renderItem={renderItem} />
</SafeAreaView> </SafeAreaView>
); );
} }
function createRecursiveDrawerItemsData(
childThreadInfosMap: { +[id: string]: $ReadOnlyArray<ThreadInfo> },
communities: $ReadOnlyArray<ThreadInfo>,
labelStyles: $ReadOnlyArray<TextStyle>,
) {
const result = communities.map(community => ({
key: community.id,
threadInfo: community,
itemChildren: [],
labelStyle: labelStyles[0],
subchannelsButton: false,
}));
let queue = result.map(item => [item, 0]);
for (let i = 0; i < queue.length; i++) {
const [item, lvl] = queue[i];
const itemChildThreadInfos = childThreadInfosMap[item.threadInfo.id] ?? [];
if (lvl < maxDepth) {
item.itemChildren = itemChildThreadInfos
.filter(childItem => communitySubthreads.includes(childItem.type))
.map(childItem => ({
threadInfo: childItem,
itemChildren: [],
labelStyle: labelStyles[Math.min(lvl + 1, labelStyles.length - 1)],
hasSubchannelsButton:
lvl + 1 === maxDepth &&
threadHasSubchannels(childItem, childThreadInfosMap),
}));
queue = queue.concat(
item.itemChildren.map(childItem => [childItem, lvl + 1]),
);
}
}
return result;
}
function threadHasSubchannels(
threadInfo: ThreadInfo,
childThreadInfosMap: { +[id: string]: $ReadOnlyArray<ThreadInfo> },
) {
if (!childThreadInfosMap[threadInfo.id]?.length) {
return false;
}
return childThreadInfosMap[threadInfo.id].some(thread =>
threadIsChannel(thread),
);
}
function appendSuffix(chats: $ReadOnlyArray<ThreadInfo>): ThreadInfo[] {
const result = [];
const names = new Map<string, number>();
for (const chat of chats) {
let name = chat.uiName;
const numberOfOccurrences = names.get(name);
names.set(name, (numberOfOccurrences ?? 0) + 1);
if (numberOfOccurrences) {
name = `${name} (${numberOfOccurrences.toString()})`;
}
result.push({ ...chat, uiName: name });
}
return result;
}
const unboundStyles = { const unboundStyles = {
drawerContent: { drawerContent: {
flex: 1, flex: 1,
paddingRight: 8, paddingRight: 8,
paddingTop: 8, paddingTop: 8,
backgroundColor: 'drawerBackgroud', backgroundColor: 'drawerBackgroud',
}, },
}; };
Show All 26 Lines
View Options

services/backup/docker-server/contents/server/src/DatabaseManager.cpp

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { FlatList, Platform } from 'react-native'; import { FlatList, Platform } from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context'; import { SafeAreaView } from 'react-native-safe-area-context';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import { import {
childThreadInfos, childThreadInfos,
communityThreadSelector, communityThreadSelector,
} from 'lib/selectors/thread-selectors'; } from 'lib/selectors/thread-selectors';
import { threadIsChannel } from 'lib/shared/thread-utils'; import {
import { type ThreadInfo, communitySubthreads } from 'lib/types/thread-types'; createRecursiveDrawerItemsData,
appendSuffix,
} from 'lib/utils/drawer-utils.react';
import { useNavigateToThread } from '../chat/message-list-types'; import { useNavigateToThread } from '../chat/message-list-types';
import { useStyles } from '../themes/colors'; import { useStyles } from '../themes/colors';
import type { TextStyle } from '../types/styles';
import CommunityDrawerItemCommunity from './community-drawer-item-cummunity.react'; import CommunityDrawerItemCommunity from './community-drawer-item-cummunity.react';
const maxDepth = 2; const maxDepth = 2;
const safeAreaEdges = Platform.select({ const safeAreaEdges = Platform.select({
ios: ['top'], ios: ['top'],
default: ['top', 'bottom'], default: ['top', 'bottom'],
}); });
Show All 10 Linesfunction CommunityDrawerContent(): React.Node {
const navigateToThread = useNavigateToThread(); const navigateToThread = useNavigateToThread();
const childThreadInfosMap = useSelector(childThreadInfos); const childThreadInfosMap = useSelector(childThreadInfos);
const setOpenCommunnityOrClose = React.useCallback((index: string) => { const setOpenCommunnityOrClose = React.useCallback((index: string) => {
setOpenCommunity(open => (open === index ? null : index)); setOpenCommunity(open => (open === index ? null : index));
}, []); }, []);
const renderItem = React.useCallback( const renderItem = React.useCallback(
({ item }) => { ({ item }) => {
const itemData = {
threadInfo: item.threadInfo,
itemChildren: item.itemChildren,
labelStyle: item.labelStyle,
hasSubchannelsButton: item.subchannelsButton,
};
return ( return (
<CommunityDrawerItemCommunity <CommunityDrawerItemCommunity
key={item.key} key={item.threadInfo.id}
itemData={itemData} itemData={item}
toggleExpanded={setOpenCommunnityOrClose} toggleExpanded={setOpenCommunnityOrClose}
expanded={itemData.threadInfo.id === openCommunity} expanded={item.threadInfo.id === openCommunity}
navigateToThread={navigateToThread} navigateToThread={navigateToThread}
/> />
); );
}, },
michalUnsubmitted
Not Done
Inline Actions
}, []);
const renderItem = React.useCallback(
- ({ item }) => {
- return (
+ ({ item }) => (
<CommunityDrawerItemCommunity
key={item.threadInfo.id}
itemData={item}
toggleExpanded={setOpenCommunnityOrClose}
expanded={item.threadInfo.id === openCommunity}
navigateToThread={navigateToThread}
/>
- );
- },
+ ),
[navigateToThread, openCommunity, setOpenCommunnityOrClose],

This now can be simplified.

michal: This now can be simplified.
[navigateToThread, openCommunity, setOpenCommunnityOrClose], [navigateToThread, openCommunity, setOpenCommunnityOrClose],
); );
const labelStylesObj = useStyles(labelUnboundStyles); const labelStylesObj = useStyles(labelUnboundStyles);
const labelStyles = React.useMemo( const labelStyles = React.useMemo(
() => [ () => [
labelStylesObj.level0Label, labelStylesObj.level0Label,
labelStylesObj.level1Label, labelStylesObj.level1Label,
labelStylesObj.level2Label, labelStylesObj.level2Label,
], ],
[labelStylesObj], [labelStylesObj],
); );
const drawerItemsData = React.useMemo( const drawerItemsData = React.useMemo(
() => () =>
createRecursiveDrawerItemsData( createRecursiveDrawerItemsData(
childThreadInfosMap, childThreadInfosMap,
communitiesSuffixed, communitiesSuffixed,
labelStyles, labelStyles,
maxDepth,
), ),
[childThreadInfosMap, communitiesSuffixed, labelStyles], [childThreadInfosMap, communitiesSuffixed, labelStyles],
); );
return ( return (
<SafeAreaView style={styles.drawerContent} edges={safeAreaEdges}> <SafeAreaView style={styles.drawerContent} edges={safeAreaEdges}>
<FlatList data={drawerItemsData} renderItem={renderItem} /> <FlatList data={drawerItemsData} renderItem={renderItem} />
</SafeAreaView> </SafeAreaView>
); );
} }
function createRecursiveDrawerItemsData(
childThreadInfosMap: { +[id: string]: $ReadOnlyArray<ThreadInfo> },
communities: $ReadOnlyArray<ThreadInfo>,
labelStyles: $ReadOnlyArray<TextStyle>,
) {
const result = communities.map(community => ({
key: community.id,
threadInfo: community,
itemChildren: [],
labelStyle: labelStyles[0],
subchannelsButton: false,
}));
let queue = result.map(item => [item, 0]);
for (let i = 0; i < queue.length; i++) {
const [item, lvl] = queue[i];
const itemChildThreadInfos = childThreadInfosMap[item.threadInfo.id] ?? [];
if (lvl < maxDepth) {
item.itemChildren = itemChildThreadInfos
.filter(childItem => communitySubthreads.includes(childItem.type))
.map(childItem => ({
threadInfo: childItem,
itemChildren: [],
labelStyle: labelStyles[Math.min(lvl + 1, labelStyles.length - 1)],
hasSubchannelsButton:
lvl + 1 === maxDepth &&
threadHasSubchannels(childItem, childThreadInfosMap),
}));
queue = queue.concat(
item.itemChildren.map(childItem => [childItem, lvl + 1]),
);
}
}
return result;
}
function threadHasSubchannels(
threadInfo: ThreadInfo,
childThreadInfosMap: { +[id: string]: $ReadOnlyArray<ThreadInfo> },
) {
if (!childThreadInfosMap[threadInfo.id]?.length) {
return false;
}
return childThreadInfosMap[threadInfo.id].some(thread =>
threadIsChannel(thread),
);
}
function appendSuffix(chats: $ReadOnlyArray<ThreadInfo>): ThreadInfo[] {
const result = [];
const names = new Map<string, number>();
for (const chat of chats) {
let name = chat.uiName;
const numberOfOccurrences = names.get(name);
names.set(name, (numberOfOccurrences ?? 0) + 1);
if (numberOfOccurrences) {
name = `${name} (${numberOfOccurrences.toString()})`;
}
result.push({ ...chat, uiName: name });
}
return result;
}
const unboundStyles = { const unboundStyles = {
drawerContent: { drawerContent: {
flex: 1, flex: 1,
paddingRight: 8, paddingRight: 8,
paddingTop: 8, paddingTop: 8,
backgroundColor: 'drawerBackgroud', backgroundColor: 'drawerBackgroud',
}, },
}; };
Show All 26 Lines