Page MenuHomePhabricator
Differential D5036

[services] Rust Integration - Backup - c++ - Multiple put clients
ClosedPublic
Actions

Authored by • karol on Sep 2 2022, 3:52 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 8, 11:36 PM
Unknown Object (File)
Tue, Apr 8, 11:36 PM
Unknown Object (File)
Tue, Apr 8, 11:36 PM
Unknown Object (File)
Tue, Apr 8, 11:36 PM
Unknown Object (File)
Tue, Apr 8, 11:36 PM
Unknown Object (File)
Thu, Apr 3, 4:44 AM
Unknown Object (File)
Tue, Apr 1, 10:33 AM
Unknown Object (File)
Tue, Apr 1, 10:33 AM
View All Files
Subscribers
• abosh
ashoat
atul
tomek

Details

Reviewers
• jon
tomek
• max
Commits
rCOMM26475982e7b9: [services] Rust Integration - Backup - c++ - Multiple put clients
Summary

Depends on D5035

In order to be able to handle multiple connections at the same time, we have to store a collection of clients in the rust state instead of having just one.

Here, I'm making the c++ calls to rust for the put client valid.

Test Plan
cd services
yarn run-integration-tests backup

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

• karol created this revision.Sep 2 2022, 3:52 AM
Herald added a reviewer: • jon. · View Herald TranscriptSep 2 2022, 3:52 AM
Herald added subscribers: • abosh, atul, tomek, ashoat. · View Herald Transcript
• karol mentioned this in D5035: [services] Rust Integration - Backup - Rust - Multiple put clients.Sep 2 2022, 3:59 AM
• karol edited the summary of this revision. (Show Details)
• karol edited the test plan for this revision. (Show Details)
• karol added reviewers: tomek, • max.
• karol added a parent revision: D5035: [services] Rust Integration - Backup - Rust - Multiple put clients.
• karol added a child revision: D5037: [services] Rust Integration - Backup - Rust - Multiple get clients.
• karol edited the test plan for this revision. (Show Details)
Harbormaster completed remote builds in B11830: Diff 16235.Sep 2 2022, 4:02 AM
• karol requested review of this revision.Sep 2 2022, 4:02 AM
tomek requested changes to this revision.Sep 5 2022, 8:05 AM

Can we avoid having to put an additional argument to every call? This is error-prone.

This revision now requires changes to proceed.Sep 5 2022, 8:05 AM
• karol requested review of this revision.Sep 6 2022, 4:33 AM
In D5036#147000, @tomek wrote:

Can we avoid having to put an additional argument to every call? This is error-prone.

I think so, I'm not sure if this is so much error-prone, why?

We have to specify what holder do we refer to. I don't know how else would we do that.

• karol added a comment.Sep 6 2022, 7:10 AM

I think I meant "I don't think so" instead of "I think so", sorry.

tomek requested changes to this revision.Sep 7 2022, 6:15 AM
In D5036#147321, @karol wrote:
In D5036#147000, @tomek wrote:

Can we avoid having to put an additional argument to every call? This is error-prone.

I think so, I'm not sure if this is so much error-prone, why?

We have to specify what holder do we refer to. I don't know how else would we do that.

If all the functions share the same context, we can create a struct and make functions methods of this struct (described in D5036).

I'm not sure if this is so much error-prone, why?

In each function we need to remember to pass exactly the same string. The problem is that we accept any string as a type, so the only way to make sure we use the same value is by careful reading, which isn't maintainable. If the solution with struct is a hard one, we can consider keeping this approach, but maybe there are other ways of achieving that.

This revision now requires changes to proceed.Sep 7 2022, 6:15 AM
• karol requested review of this revision.Sep 8 2022, 6:39 AM

I see your point. I would go with a follow-up for this as it looks uncertain and it may be quite a lot of work/refactoring.

https://linear.app/comm/issue/ENG-1759/avoid-specifying-context-for-each-rust-function

tomek requested changes to this revision.Sep 9 2022, 4:38 AM
tomek added inline comments.
services/backup/src/Reactors/server/AddAttachmentsUtility.cpp
72

Is a cstring a recommended type to handle strings when using cxx?

This revision now requires changes to proceed.Sep 9 2022, 4:38 AM
• karol requested review of this revision.Sep 9 2022, 6:44 AM
• karol added inline comments.
services/backup/src/Reactors/server/AddAttachmentsUtility.cpp
72

This is really similar to what you pointed out in D5035: we could use something smoother than const char* for passing strings and I agree. Let's discuss it there.

tomek accepted this revision.Sep 13 2022, 10:50 AM
tomek added inline comments.
services/backup/src/Reactors/server/AddAttachmentsUtility.cpp
72

It would be a lot more efficient if this diff was updated instead of creating a follow-up

This revision is now accepted and ready to land.Sep 13 2022, 10:50 AM
• karol updated this revision to Diff 16737.Sep 16 2022, 1:53 AM
• karol edited the summary of this revision. (Show Details)

rebase

This revision was landed with ongoing or failed builds.Sep 16 2022, 1:54 AM
Closed by commit rCOMM26475982e7b9: [services] Rust Integration - Backup - c++ - Multiple put clients (authored by • karol). · Explain Why
This revision was automatically updated to reflect the committed changes.
• karol mentioned this in rCOMM1a07b32b94a7: [services] Rust Integration - Backup - Rust - Multiple put clients.
• karol added a commit: rCOMM26475982e7b9: [services] Rust Integration - Backup - c++ - Multiple put clients.
Harbormaster completed remote builds in B12202: Diff 16737.Sep 16 2022, 2:04 AM

Revision Contents
Changeset List

PathSize
services/
backup/
src/
Reactors/
server/
44 lines
43 lines
55 lines

Diff 16235

View Options

services/backup/src/Reactors/server/AddAttachmentsUtility.cpp

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { useDispatch } from 'react-redux'; import { useDispatch } from 'react-redux';
import { logOut, logOutActionTypes } from 'lib/actions/user-actions.js'; import { logOut, logOutActionTypes } from 'lib/actions/user-actions.js';
import { preRequestUserStateSelector } from 'lib/selectors/account-selectors.js'; import { preRequestUserStateSelector } from 'lib/selectors/account-selectors.js';
import { import {
cookieSelector, cookieSelector,
urlPrefixSelector, urlPrefixSelector,
connectionSelector, connectionSelector,
lastCommunicatedPlatformDetailsSelector, lastCommunicatedPlatformDetailsSelector,
} from 'lib/selectors/keyserver-selectors.js'; } from 'lib/selectors/keyserver-selectors.js';
import { isLoggedIn } from 'lib/selectors/user-selectors.js'; import { isLoggedIn } from 'lib/selectors/user-selectors.js';
import { accountHasPassword } from 'lib/shared/account-utils.js'; import { accountHasPassword } from 'lib/shared/account-utils.js';
import { useInitialNotificationsEncryptedMessage } from 'lib/shared/crypto-utils.js';
import Socket, { type BaseSocketProps } from 'lib/socket/socket.react.js'; import Socket, { type BaseSocketProps } from 'lib/socket/socket.react.js';
import { logInActionSources } from 'lib/types/account-types.js'; import { logInActionSources } from 'lib/types/account-types.js';
import { import {
useServerCall, useServerCall,
useDispatchActionPromise, useDispatchActionPromise,
fetchNewCookieFromNativeCredentials, fetchNewCookieFromNativeCredentials,
} from 'lib/utils/action-utils.js'; } from 'lib/utils/action-utils.js';
import { InputStateContext } from './input/input-state.js'; import { InputStateContext } from './input/input-state.js';
import { import {
activeMessageListSelector, activeMessageListSelector,
nativeCalendarQuery, nativeCalendarQuery,
} from './navigation/nav-selectors.js'; } from './navigation/nav-selectors.js';
import { NavContext } from './navigation/navigation-context.js'; import { NavContext } from './navigation/navigation-context.js';
import { useSelector } from './redux/redux-utils.js'; import { useSelector } from './redux/redux-utils.js';
import { noDataAfterPolicyAcknowledgmentSelector } from './selectors/account-selectors.js'; import { noDataAfterPolicyAcknowledgmentSelector } from './selectors/account-selectors.js';
import { import {
openSocketSelector, openSocketSelector,
sessionIdentificationSelector, sessionIdentificationSelector,
nativeGetClientResponsesSelector, nativeGetClientResponsesSelector,
nativeSessionStateFuncSelector, nativeSessionStateFuncSelector,
} from './selectors/socket-selectors.js'; } from './selectors/socket-selectors.js';
import Alert from './utils/alert.js'; import Alert from './utils/alert.js';
import { useInitialNotificationsEncryptedMessage } from './utils/crypto-utils.js'; import { nativeNotificationsSessionCreator } from './utils/crypto-utils.js';
import { decompressMessage } from './utils/decompress.js'; import { decompressMessage } from './utils/decompress.js';
const NativeSocket: React.ComponentType<BaseSocketProps> = const NativeSocket: React.ComponentType<BaseSocketProps> =
React.memo<BaseSocketProps>(function NativeSocket(props: BaseSocketProps) { React.memo<BaseSocketProps>(function NativeSocket(props: BaseSocketProps) {
const inputState = React.useContext(InputStateContext); const inputState = React.useContext(InputStateContext);
const navContext = React.useContext(NavContext); const navContext = React.useContext(NavContext);
const cookie = useSelector(cookieSelector); const cookie = useSelector(cookieSelector);
Show All 11 Lines React.memo<BaseSocketProps>(function NativeSocket(props: BaseSocketProps) {
const currentUserInfo = useSelector(state => state.currentUserInfo); const currentUserInfo = useSelector(state => state.currentUserInfo);
const openSocket = useSelector(openSocketSelector); const openSocket = useSelector(openSocketSelector);
invariant(openSocket, 'openSocket failed to be created'); invariant(openSocket, 'openSocket failed to be created');
const sessionIdentification = useSelector(sessionIdentificationSelector); const sessionIdentification = useSelector(sessionIdentificationSelector);
const preRequestUserState = useSelector(preRequestUserStateSelector); const preRequestUserState = useSelector(preRequestUserStateSelector);
const getInitialNotificationsEncryptedMessage = const getInitialNotificationsEncryptedMessage =
useInitialNotificationsEncryptedMessage(); useInitialNotificationsEncryptedMessage(
nativeNotificationsSessionCreator,
);
const getClientResponses = useSelector(state => const getClientResponses = useSelector(state =>
nativeGetClientResponsesSelector({ nativeGetClientResponsesSelector({
redux: state, redux: state,
navContext, navContext,
getInitialNotificationsEncryptedMessage, getInitialNotificationsEncryptedMessage,
}), }),
); );
▲ Show 20 Lines • Show All 98 Lines • Show Last 20 Lines
View Options

services/backup/src/Reactors/server/CreateNewBackupReactor.cpp

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { useDispatch } from 'react-redux'; import { useDispatch } from 'react-redux';
import { logOut, logOutActionTypes } from 'lib/actions/user-actions.js'; import { logOut, logOutActionTypes } from 'lib/actions/user-actions.js';
import { preRequestUserStateSelector } from 'lib/selectors/account-selectors.js'; import { preRequestUserStateSelector } from 'lib/selectors/account-selectors.js';
import { import {
cookieSelector, cookieSelector,
urlPrefixSelector, urlPrefixSelector,
connectionSelector, connectionSelector,
lastCommunicatedPlatformDetailsSelector, lastCommunicatedPlatformDetailsSelector,
} from 'lib/selectors/keyserver-selectors.js'; } from 'lib/selectors/keyserver-selectors.js';
import { isLoggedIn } from 'lib/selectors/user-selectors.js'; import { isLoggedIn } from 'lib/selectors/user-selectors.js';
import { accountHasPassword } from 'lib/shared/account-utils.js'; import { accountHasPassword } from 'lib/shared/account-utils.js';
import { useInitialNotificationsEncryptedMessage } from 'lib/shared/crypto-utils.js';
import Socket, { type BaseSocketProps } from 'lib/socket/socket.react.js'; import Socket, { type BaseSocketProps } from 'lib/socket/socket.react.js';
import { logInActionSources } from 'lib/types/account-types.js'; import { logInActionSources } from 'lib/types/account-types.js';
import { import {
useServerCall, useServerCall,
useDispatchActionPromise, useDispatchActionPromise,
fetchNewCookieFromNativeCredentials, fetchNewCookieFromNativeCredentials,
} from 'lib/utils/action-utils.js'; } from 'lib/utils/action-utils.js';
import { InputStateContext } from './input/input-state.js'; import { InputStateContext } from './input/input-state.js';
import { import {
activeMessageListSelector, activeMessageListSelector,
nativeCalendarQuery, nativeCalendarQuery,
} from './navigation/nav-selectors.js'; } from './navigation/nav-selectors.js';
import { NavContext } from './navigation/navigation-context.js'; import { NavContext } from './navigation/navigation-context.js';
import { useSelector } from './redux/redux-utils.js'; import { useSelector } from './redux/redux-utils.js';
import { noDataAfterPolicyAcknowledgmentSelector } from './selectors/account-selectors.js'; import { noDataAfterPolicyAcknowledgmentSelector } from './selectors/account-selectors.js';
import { import {
openSocketSelector, openSocketSelector,
sessionIdentificationSelector, sessionIdentificationSelector,
nativeGetClientResponsesSelector, nativeGetClientResponsesSelector,
nativeSessionStateFuncSelector, nativeSessionStateFuncSelector,
} from './selectors/socket-selectors.js'; } from './selectors/socket-selectors.js';
import Alert from './utils/alert.js'; import Alert from './utils/alert.js';
import { useInitialNotificationsEncryptedMessage } from './utils/crypto-utils.js'; import { nativeNotificationsSessionCreator } from './utils/crypto-utils.js';
import { decompressMessage } from './utils/decompress.js'; import { decompressMessage } from './utils/decompress.js';
const NativeSocket: React.ComponentType<BaseSocketProps> = const NativeSocket: React.ComponentType<BaseSocketProps> =
React.memo<BaseSocketProps>(function NativeSocket(props: BaseSocketProps) { React.memo<BaseSocketProps>(function NativeSocket(props: BaseSocketProps) {
const inputState = React.useContext(InputStateContext); const inputState = React.useContext(InputStateContext);
const navContext = React.useContext(NavContext); const navContext = React.useContext(NavContext);
const cookie = useSelector(cookieSelector); const cookie = useSelector(cookieSelector);
Show All 11 Lines React.memo<BaseSocketProps>(function NativeSocket(props: BaseSocketProps) {
const currentUserInfo = useSelector(state => state.currentUserInfo); const currentUserInfo = useSelector(state => state.currentUserInfo);
const openSocket = useSelector(openSocketSelector); const openSocket = useSelector(openSocketSelector);
invariant(openSocket, 'openSocket failed to be created'); invariant(openSocket, 'openSocket failed to be created');
const sessionIdentification = useSelector(sessionIdentificationSelector); const sessionIdentification = useSelector(sessionIdentificationSelector);
const preRequestUserState = useSelector(preRequestUserStateSelector); const preRequestUserState = useSelector(preRequestUserStateSelector);
const getInitialNotificationsEncryptedMessage = const getInitialNotificationsEncryptedMessage =
useInitialNotificationsEncryptedMessage(); useInitialNotificationsEncryptedMessage(
nativeNotificationsSessionCreator,
);
const getClientResponses = useSelector(state => const getClientResponses = useSelector(state =>
nativeGetClientResponsesSelector({ nativeGetClientResponsesSelector({
redux: state, redux: state,
navContext, navContext,
getInitialNotificationsEncryptedMessage, getInitialNotificationsEncryptedMessage,
}), }),
); );
▲ Show 20 Lines • Show All 98 Lines • Show Last 20 Lines
View Options

services/backup/src/Reactors/server/SendLogReactor.cpp

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { useDispatch } from 'react-redux'; import { useDispatch } from 'react-redux';
import { logOut, logOutActionTypes } from 'lib/actions/user-actions.js'; import { logOut, logOutActionTypes } from 'lib/actions/user-actions.js';
import { preRequestUserStateSelector } from 'lib/selectors/account-selectors.js'; import { preRequestUserStateSelector } from 'lib/selectors/account-selectors.js';
import { import {
cookieSelector, cookieSelector,
urlPrefixSelector, urlPrefixSelector,
connectionSelector, connectionSelector,
lastCommunicatedPlatformDetailsSelector, lastCommunicatedPlatformDetailsSelector,
} from 'lib/selectors/keyserver-selectors.js'; } from 'lib/selectors/keyserver-selectors.js';
import { isLoggedIn } from 'lib/selectors/user-selectors.js'; import { isLoggedIn } from 'lib/selectors/user-selectors.js';
import { accountHasPassword } from 'lib/shared/account-utils.js'; import { accountHasPassword } from 'lib/shared/account-utils.js';
import { useInitialNotificationsEncryptedMessage } from 'lib/shared/crypto-utils.js';
import Socket, { type BaseSocketProps } from 'lib/socket/socket.react.js'; import Socket, { type BaseSocketProps } from 'lib/socket/socket.react.js';
import { logInActionSources } from 'lib/types/account-types.js'; import { logInActionSources } from 'lib/types/account-types.js';
import { import {
useServerCall, useServerCall,
useDispatchActionPromise, useDispatchActionPromise,
fetchNewCookieFromNativeCredentials, fetchNewCookieFromNativeCredentials,
} from 'lib/utils/action-utils.js'; } from 'lib/utils/action-utils.js';
import { InputStateContext } from './input/input-state.js'; import { InputStateContext } from './input/input-state.js';
import { import {
activeMessageListSelector, activeMessageListSelector,
nativeCalendarQuery, nativeCalendarQuery,
} from './navigation/nav-selectors.js'; } from './navigation/nav-selectors.js';
import { NavContext } from './navigation/navigation-context.js'; import { NavContext } from './navigation/navigation-context.js';
import { useSelector } from './redux/redux-utils.js'; import { useSelector } from './redux/redux-utils.js';
import { noDataAfterPolicyAcknowledgmentSelector } from './selectors/account-selectors.js'; import { noDataAfterPolicyAcknowledgmentSelector } from './selectors/account-selectors.js';
import { import {
openSocketSelector, openSocketSelector,
sessionIdentificationSelector, sessionIdentificationSelector,
nativeGetClientResponsesSelector, nativeGetClientResponsesSelector,
nativeSessionStateFuncSelector, nativeSessionStateFuncSelector,
} from './selectors/socket-selectors.js'; } from './selectors/socket-selectors.js';
import Alert from './utils/alert.js'; import Alert from './utils/alert.js';
import { useInitialNotificationsEncryptedMessage } from './utils/crypto-utils.js'; import { nativeNotificationsSessionCreator } from './utils/crypto-utils.js';
import { decompressMessage } from './utils/decompress.js'; import { decompressMessage } from './utils/decompress.js';
const NativeSocket: React.ComponentType<BaseSocketProps> = const NativeSocket: React.ComponentType<BaseSocketProps> =
React.memo<BaseSocketProps>(function NativeSocket(props: BaseSocketProps) { React.memo<BaseSocketProps>(function NativeSocket(props: BaseSocketProps) {
const inputState = React.useContext(InputStateContext); const inputState = React.useContext(InputStateContext);
const navContext = React.useContext(NavContext); const navContext = React.useContext(NavContext);
const cookie = useSelector(cookieSelector); const cookie = useSelector(cookieSelector);
Show All 11 Lines React.memo<BaseSocketProps>(function NativeSocket(props: BaseSocketProps) {
const currentUserInfo = useSelector(state => state.currentUserInfo); const currentUserInfo = useSelector(state => state.currentUserInfo);
const openSocket = useSelector(openSocketSelector); const openSocket = useSelector(openSocketSelector);
invariant(openSocket, 'openSocket failed to be created'); invariant(openSocket, 'openSocket failed to be created');
const sessionIdentification = useSelector(sessionIdentificationSelector); const sessionIdentification = useSelector(sessionIdentificationSelector);
const preRequestUserState = useSelector(preRequestUserStateSelector); const preRequestUserState = useSelector(preRequestUserStateSelector);
const getInitialNotificationsEncryptedMessage = const getInitialNotificationsEncryptedMessage =
useInitialNotificationsEncryptedMessage(); useInitialNotificationsEncryptedMessage(
nativeNotificationsSessionCreator,
);
const getClientResponses = useSelector(state => const getClientResponses = useSelector(state =>
nativeGetClientResponsesSelector({ nativeGetClientResponsesSelector({
redux: state, redux: state,
navContext, navContext,
getInitialNotificationsEncryptedMessage, getInitialNotificationsEncryptedMessage,
}), }),
); );
▲ Show 20 Lines • Show All 98 Lines • Show Last 20 Lines