[services] Backup - Blob Put Client - Update put API
ClosedPublic
Actions

services/backup/blob_client/src/lib.rs
13 ↗	(On Diff #16164)	Do you think this comment is useful? For me, if names start with `put` it is obvious that these are a part of `put`, but feel free to keep it if it's useful for you.
15 ↗	(On Diff #16164)	It would be great if we could avoid having `unsafe` at function level, so that safe code could call it. I prefer having `unsafe` sections as small as possible, so maybe we can have an unsafe block in the function instead of the whole unsafe function?

This revision is now accepted and ready to land.Sep 5 2022, 2:13 AM

• karol added inline comments.Sep 5 2022, 5:59 AM

services/backup/blob_client/src/lib.rs
13 ↗	(On Diff #16164)	For me, it looks better once there's also the `get` section, but I can remove this, not a problem.
15 ↗	(On Diff #16164)	Rust complains: pointer argument requires that the function be marked unsafe I assume we have to mark these functions `unsafe`. I don't fully understand your concern, they're about to be called from c++ exclusively and I didn't notice any impact of `unsafe` on how we call them in c++ really. And I don't think we'll want to use them from rust.

update comment

remove comment

Harbormaster completed remote builds in B11905: Diff 16348.Sep 6 2022, 1:28 AM

Harbormaster completed remote builds in B11906: Diff 16349.

tomek added inline comments.Sep 6 2022, 6:40 AM

services/backup/blob_client/src/lib.rs
15 ↗	(On Diff #16164)	Ok, that surprising. I thought that only dereferencing a raw pointer is unsafe. https://doc.rust-lang.org/book/ch19-01-unsafe-rust.html#unsafe-superpowers So maybe what happens here is that Rust automatically dereferences a raw pointer when it is a function argument... I don't fully understand your concern, they're about to be called from c++ exclusively and I didn't notice any impact of unsafe on how we call them in c++ really. The issue is not on C++ side but on the Rust one. If we mark the function as unsafe, we can use unsafe operations in the whole function. According to the book: People are fallible, and mistakes will happen, but by requiring these five unsafe operations to be inside blocks annotated with unsafe you’ll know that any errors related to memory safety must be within an unsafe block. Keep unsafe blocks small; you’ll be thankful later when you investigate memory bugs. It is a good practice to keep unsafe blocks as small as possible.

tomek mentioned this in D5009: [services] Backup - Blob Put Client - Add initialize.Sep 6 2022, 6:51 AM

• karol added inline comments.Sep 8 2022, 1:14 AM

services/backup/blob_client/src/lib.rs
15 ↗	(On Diff #16164)	Discussed offline. I understand that it's better to make `unsafe` areas as small as possible but here we have no choice, I'm afraid.

rebase

Harbormaster completed remote builds in B11981: Diff 16436.Sep 8 2022, 4:06 AM

Closed by commit rCOMM0e63f2b49414: [services] Backup - Blob Put Client - Update put API (authored by • karol). · Explain WhySep 8 2022, 4:10 AM

This revision was automatically updated to reflect the committed changes.

• karol added a commit: rCOMM0e63f2b49414: [services] Backup - Blob Put Client - Update put API.

Revision Contents
Changeset List

Path

Size

services/

backup/

blob_client/

src/

lib.rs

11 lines

put_client.rs

17 lines

Diff 16349

View Options

services/backup/blob_client/src/lib.rs

// @flow		// @flow

import * as React from 'react';		import * as React from 'react';
import { Text } from 'react-native';		import { Text } from 'react-native';

import { oldValidUsernameRegexString } from 'lib/shared/account-utils.js';		import { oldValidUsernameRegexString } from 'lib/shared/account-utils.js';
import {		import {
getNewTextAndSelection,		getNewTextAndSelection,
encodeChatMentionText,		encodeChatMentionText,
type Selection,		type Selection,
type TypeaheadTooltipActionItem,		type TypeaheadTooltipActionItem,
type MentionTypeaheadSuggestionItem,		type MentionTypeaheadSuggestionItem,
} from 'lib/shared/mention-utils.js';		} from 'lib/shared/mention-utils.js';
		import { validChatNameRegexString } from 'lib/shared/thread-utils.js';
import { stringForUserExplicit } from 'lib/shared/user-utils.js';		import { stringForUserExplicit } from 'lib/shared/user-utils.js';

		import ThreadAvatar from '../avatars/thread-avatar.react.js';
import UserAvatar from '../avatars/user-avatar.react.js';		import UserAvatar from '../avatars/user-avatar.react.js';
import type { TypeaheadTooltipStyles } from '../chat/typeahead-tooltip.react.js';		import type { TypeaheadTooltipStyles } from '../chat/typeahead-tooltip.react.js';

// Native regex is a little bit different than web one as		// Native regex is a little bit different than web one as
// there are no named capturing groups yet on native.		// there are no named capturing groups yet on native.
const nativeMentionTypeaheadRegex: RegExp = new RegExp(		const nativeMentionTypeaheadRegex: RegExp = new RegExp(
`((^(.\|\n)*\\s+)\|^)@(${oldValidUsernameRegexString})?$`,		`((^(.\|\n)*\\s+)\|^)@(${oldValidUsernameRegexString}\|${validChatNameRegexString})?$`,
);		);

export type TypeaheadTooltipActionsParams<SuggestionType> = {		export type TypeaheadTooltipActionsParams<SuggestionType> = {
+suggestions: $ReadOnlyArray<SuggestionType>,		+suggestions: $ReadOnlyArray<SuggestionType>,
+textBeforeAtSymbol: string,		+textBeforeAtSymbol: string,
+text: string,		+text: string,
+textPrefix: string,		+textPrefix: string,
+focusAndUpdateTextAndSelection: (text: string, selection: Selection) => void,		+focusAndUpdateTextAndSelection: (text: string, selection: Selection) => void,
Show All 31 Lines	if (suggestion.type === 'user') {
});		});
},		},
actionButtonContent: {		actionButtonContent: {
type: 'user',		type: 'user',
userInfo,		userInfo,
},		},
});		});
} else if (suggestion.type === 'chat') {		} else if (suggestion.type === 'chat') {
const { chat } = suggestion;		const { threadInfo } = suggestion;
const mentionText = `@[[${chat.id}:${encodeChatMentionText(		const mentionText = `@[[${threadInfo.id}:${encodeChatMentionText(
chat.uiName,		threadInfo.uiName,
)}]]`;		)}]]`;
actions.push({		actions.push({
key: chat.id,		key: threadInfo.id,
execute: () => {		execute: () => {
const { newText, newSelectionStart } = getNewTextAndSelection(		const { newText, newSelectionStart } = getNewTextAndSelection(
textBeforeAtSymbol,		textBeforeAtSymbol,
text,		text,
textPrefix,		textPrefix,
mentionText,		mentionText,
);		);
focusAndUpdateTextAndSelection(newText, {		focusAndUpdateTextAndSelection(newText, {
start: newSelectionStart,		start: newSelectionStart,
end: newSelectionStart,		end: newSelectionStart,
});		});
},		},
actionButtonContent: {		actionButtonContent: {
type: 'chat',		type: 'chat',
chat,		threadInfo,
},		},
});		});
}		}
}		}
return actions;		return actions;
}		}

export type TypeaheadTooltipButtonRendererParams<SuggestionItemType> = {		export type TypeaheadTooltipButtonRendererParams<SuggestionItemType> = {
+item: TypeaheadTooltipActionItem<SuggestionItemType>,		+item: TypeaheadTooltipActionItem<SuggestionItemType>,
+styles: TypeaheadTooltipStyles,		+styles: TypeaheadTooltipStyles,
};		};
function mentionTypeaheadTooltipButtonRenderer({		function mentionTypeaheadTooltipButtonRenderer({
item,		item,
styles,		styles,
}: TypeaheadTooltipButtonRendererParams<MentionTypeaheadSuggestionItem>): React.Node {		}: TypeaheadTooltipButtonRendererParams<MentionTypeaheadSuggestionItem>): React.Node {
let avatarComponent = null;		let avatarComponent = null;
let typeaheadTooltipButtonText = null;		let typeaheadTooltipButtonText = null;
if (item.actionButtonContent.type === 'user') {		if (item.actionButtonContent.type === 'user') {
avatarComponent = (		avatarComponent = (
<UserAvatar size="small" userID={item.actionButtonContent.userInfo.id} />		<UserAvatar size="small" userID={item.actionButtonContent.userInfo.id} />
);		);
typeaheadTooltipButtonText = item.actionButtonContent.userInfo.username;		typeaheadTooltipButtonText = item.actionButtonContent.userInfo.username;
		} else if (item.actionButtonContent.type === 'chat') {
		typeaheadTooltipButtonText = item.actionButtonContent.threadInfo.uiName;
		avatarComponent = (
		<ThreadAvatar
		size="small"
		threadInfo={item.actionButtonContent.threadInfo}
		/>
		);
}		}
return (		return (
<>		<>
{avatarComponent}		{avatarComponent}
<Text style={styles.buttonLabel} numberOfLines={1}>		<Text style={styles.buttonLabel} numberOfLines={1}>
{typeaheadTooltipButtonText}		{typeaheadTooltipButtonText}
</Text>		</Text>
</>		</>
);		);
}		}

export {		export {
nativeMentionTypeaheadRegex,		nativeMentionTypeaheadRegex,
mentionTypeaheadTooltipActions,		mentionTypeaheadTooltipActions,
mentionTypeaheadTooltipButtonRenderer,		mentionTypeaheadTooltipButtonRenderer,
};		};

View Options

services/backup/blob_client/src/put_client.rs

// @flow		// @flow

import * as React from 'react';		import * as React from 'react';
import { Text } from 'react-native';		import { Text } from 'react-native';

import { oldValidUsernameRegexString } from 'lib/shared/account-utils.js';		import { oldValidUsernameRegexString } from 'lib/shared/account-utils.js';
import {		import {
getNewTextAndSelection,		getNewTextAndSelection,
encodeChatMentionText,		encodeChatMentionText,
type Selection,		type Selection,
type TypeaheadTooltipActionItem,		type TypeaheadTooltipActionItem,
type MentionTypeaheadSuggestionItem,		type MentionTypeaheadSuggestionItem,
} from 'lib/shared/mention-utils.js';		} from 'lib/shared/mention-utils.js';
		import { validChatNameRegexString } from 'lib/shared/thread-utils.js';
import { stringForUserExplicit } from 'lib/shared/user-utils.js';		import { stringForUserExplicit } from 'lib/shared/user-utils.js';

		import ThreadAvatar from '../avatars/thread-avatar.react.js';
import UserAvatar from '../avatars/user-avatar.react.js';		import UserAvatar from '../avatars/user-avatar.react.js';
import type { TypeaheadTooltipStyles } from '../chat/typeahead-tooltip.react.js';		import type { TypeaheadTooltipStyles } from '../chat/typeahead-tooltip.react.js';

// Native regex is a little bit different than web one as		// Native regex is a little bit different than web one as
// there are no named capturing groups yet on native.		// there are no named capturing groups yet on native.
const nativeMentionTypeaheadRegex: RegExp = new RegExp(		const nativeMentionTypeaheadRegex: RegExp = new RegExp(
`((^(.\|\n)*\\s+)\|^)@(${oldValidUsernameRegexString})?$`,		`((^(.\|\n)*\\s+)\|^)@(${oldValidUsernameRegexString}\|${validChatNameRegexString})?$`,
);		);

export type TypeaheadTooltipActionsParams<SuggestionType> = {		export type TypeaheadTooltipActionsParams<SuggestionType> = {
+suggestions: $ReadOnlyArray<SuggestionType>,		+suggestions: $ReadOnlyArray<SuggestionType>,
+textBeforeAtSymbol: string,		+textBeforeAtSymbol: string,
+text: string,		+text: string,
+textPrefix: string,		+textPrefix: string,
+focusAndUpdateTextAndSelection: (text: string, selection: Selection) => void,		+focusAndUpdateTextAndSelection: (text: string, selection: Selection) => void,
Show All 31 Lines	if (suggestion.type === 'user') {
});		});
},		},
actionButtonContent: {		actionButtonContent: {
type: 'user',		type: 'user',
userInfo,		userInfo,
},		},
});		});
} else if (suggestion.type === 'chat') {		} else if (suggestion.type === 'chat') {
const { chat } = suggestion;		const { threadInfo } = suggestion;
const mentionText = `@[[${chat.id}:${encodeChatMentionText(		const mentionText = `@[[${threadInfo.id}:${encodeChatMentionText(
chat.uiName,		threadInfo.uiName,
)}]]`;		)}]]`;
actions.push({		actions.push({
key: chat.id,		key: threadInfo.id,
execute: () => {		execute: () => {
const { newText, newSelectionStart } = getNewTextAndSelection(		const { newText, newSelectionStart } = getNewTextAndSelection(
textBeforeAtSymbol,		textBeforeAtSymbol,
text,		text,
textPrefix,		textPrefix,
mentionText,		mentionText,
);		);
focusAndUpdateTextAndSelection(newText, {		focusAndUpdateTextAndSelection(newText, {
start: newSelectionStart,		start: newSelectionStart,
end: newSelectionStart,		end: newSelectionStart,
});		});
},		},
actionButtonContent: {		actionButtonContent: {
type: 'chat',		type: 'chat',
chat,		threadInfo,
},		},
});		});
}		}
}		}
return actions;		return actions;
}		}

export type TypeaheadTooltipButtonRendererParams<SuggestionItemType> = {		export type TypeaheadTooltipButtonRendererParams<SuggestionItemType> = {
+item: TypeaheadTooltipActionItem<SuggestionItemType>,		+item: TypeaheadTooltipActionItem<SuggestionItemType>,
+styles: TypeaheadTooltipStyles,		+styles: TypeaheadTooltipStyles,
};		};
function mentionTypeaheadTooltipButtonRenderer({		function mentionTypeaheadTooltipButtonRenderer({
item,		item,
styles,		styles,
}: TypeaheadTooltipButtonRendererParams<MentionTypeaheadSuggestionItem>): React.Node {		}: TypeaheadTooltipButtonRendererParams<MentionTypeaheadSuggestionItem>): React.Node {
let avatarComponent = null;		let avatarComponent = null;
let typeaheadTooltipButtonText = null;		let typeaheadTooltipButtonText = null;
if (item.actionButtonContent.type === 'user') {		if (item.actionButtonContent.type === 'user') {
avatarComponent = (		avatarComponent = (
<UserAvatar size="small" userID={item.actionButtonContent.userInfo.id} />		<UserAvatar size="small" userID={item.actionButtonContent.userInfo.id} />
);		);
typeaheadTooltipButtonText = item.actionButtonContent.userInfo.username;		typeaheadTooltipButtonText = item.actionButtonContent.userInfo.username;
		} else if (item.actionButtonContent.type === 'chat') {
		typeaheadTooltipButtonText = item.actionButtonContent.threadInfo.uiName;
		avatarComponent = (
		<ThreadAvatar
		size="small"
		threadInfo={item.actionButtonContent.threadInfo}
		/>
		);
}		}
return (		return (
<>		<>
{avatarComponent}		{avatarComponent}
<Text style={styles.buttonLabel} numberOfLines={1}>		<Text style={styles.buttonLabel} numberOfLines={1}>
{typeaheadTooltipButtonText}		{typeaheadTooltipButtonText}
</Text>		</Text>
</>		</>
);		);
}		}

export {		export {
nativeMentionTypeaheadRegex,		nativeMentionTypeaheadRegex,
mentionTypeaheadTooltipActions,		mentionTypeaheadTooltipActions,
mentionTypeaheadTooltipButtonRenderer,		mentionTypeaheadTooltipButtonRenderer,
};		};

[services] Backup - Blob Put Client - Update put APIClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 16349

services/backup/blob_client/src/lib.rs

services/backup/blob_client/src/put_client.rs

[services] Backup - Blob Put Client - Update put API
ClosedPublic
Actions

Revision Contents
Changeset List