Paths

Table of Contentst

-
services/backup/blob_client/src/
-
backup/
-
blob_client/
-
src/
-
lib.rs
-
put_client.rs

[DRAFT] [services] Backup - Connect to Blob - Use Result
AbandonedPublic
Actions

Authored by • karol on Aug 24 2022, 5:57 AM.

Details

Reviewers

varun
tomek
• jon

Summary

Depends on D4944

I discovered that I can just use Result in Rust and catch std::exception in c++

Test Plan

Test plan in D4946

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

• karol created this revision.Aug 24 2022, 5:57 AM

Herald added subscribers: • abosh, atul, tomek, ashoat. · View Herald TranscriptAug 24 2022, 5:57 AM

• karol retitled this revision from [services] Backup - Connect to Blob - Use Result to [DRAFT] [services] Backup - Connect to Blob - Use Result.Aug 24 2022, 6:04 AM

• karol edited the summary of this revision. (Show Details)

• karol edited the test plan for this revision. (Show Details)

• karol added reviewers: varun, tomek.

• karol added a parent revision: D4944: [DRAFT] [services] Backup - Connect to Blob - add error messages for async errors.

• karol added a child revision: D4946: [DRAFT] [services] Backup - Connect to Blob - Update put client.

Harbormaster completed remote builds in B11581: Diff 15922.Aug 24 2022, 6:08 AM

• karol requested review of this revision.Aug 24 2022, 6:08 AM

tomek requested changes to this revision.Aug 29 2022, 4:59 AM

tomek added inline comments.

services/backup/blob_client/src/put_client.rs
114 ↗	(On Diff #15922)	Why do we assign here? Can't we just return the value? https://docs.rs/tokio/latest/tokio/runtime/struct.Runtime.html#method.block_on This runs the given future on the current thread, blocking until it is complete, and yielding its resolved result.
149 ↗	(On Diff #15922)	Why this function doesn't need to call `check_error`?

This revision now requires changes to proceed.Aug 29 2022, 4:59 AM

Herald added a reviewer: • jon. · View Herald TranscriptAug 29 2022, 4:59 AM

update

services/backup/blob_client/src/put_client.rs
114 ↗	(On Diff #15922)	This is nice, but we should assign since we have to reassign `client.rx` in the end eventually. So, if we wanted to return from the `block_on`, we'd have to have an internal variable in the async block anyway.
149 ↗	(On Diff #15922)	It should call it

Harbormaster failed remote builds in B11710: Diff 16099!Aug 30 2022, 2:43 AM

• karol planned changes to this revision.Aug 30 2022, 2:45 AM

Abandoning this stack in favor of the new one that starts @ D5002.

All the comments have been either addressed inline or in the new stack.

Revision Contents
Changeset List

Path

Size

services/

backup/

blob_client/

src/

lib.rs

12 lines

put_client.rs

24 lines

Diff 16099

View Options

services/backup/blob_client/src/lib.rs

Show First 20 Lines • Show All 130 Lines • ▼ Show 20 Lines	SQL`

CREATE TABLE sessions (		CREATE TABLE sessions (
id bigint(20) NOT NULL,		id bigint(20) NOT NULL,
user bigint(20) NOT NULL,		user bigint(20) NOT NULL,
cookie bigint(20) NOT NULL,		cookie bigint(20) NOT NULL,
query json NOT NULL,		query json NOT NULL,
creation_time bigint(20) NOT NULL,		creation_time bigint(20) NOT NULL,
last_update bigint(20) NOT NULL,		last_update bigint(20) NOT NULL,
last_validated bigint(20) NOT NULL		last_validated bigint(20) NOT NULL,
		public_key char(116) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1;		) ENGINE=InnoDB DEFAULT CHARSET=latin1;

CREATE TABLE threads (		CREATE TABLE threads (
id bigint(20) NOT NULL,		id bigint(20) NOT NULL,
type tinyint(3) NOT NULL,		type tinyint(3) NOT NULL,
name varchar(191) COLLATE utf8mb4_bin DEFAULT NULL,		name varchar(191) COLLATE utf8mb4_bin DEFAULT NULL,
description mediumtext COLLATE utf8mb4_bin,		description mediumtext COLLATE utf8mb4_bin,
parent_thread_id bigint(20) DEFAULT NULL,		parent_thread_id bigint(20) DEFAULT NULL,
Show All 30 Lines	SQL`
secret varchar(255) NOT NULL,		secret varchar(255) NOT NULL,
creation_time bigint(20) NOT NULL,		creation_time bigint(20) NOT NULL,
extra json DEFAULT NULL		extra json DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8;		) ENGINE=InnoDB DEFAULT CHARSET=utf8;

CREATE TABLE users (		CREATE TABLE users (
id bigint(20) NOT NULL,		id bigint(20) NOT NULL,
username varchar(${usernameMaxLength}) COLLATE utf8mb4_bin NOT NULL,		username varchar(${usernameMaxLength}) COLLATE utf8mb4_bin NOT NULL,
hash char(60) COLLATE utf8mb4_bin DEFAULT NULL,		hash char(60) COLLATE utf8mb4_bin NOT NULL,
avatar varchar(191) COLLATE utf8mb4_bin DEFAULT NULL,		avatar varchar(191) COLLATE utf8mb4_bin DEFAULT NULL,
creation_time bigint(20) NOT NULL		creation_time bigint(20) NOT NULL,
		public_key char(116) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;		) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

CREATE TABLE relationships_undirected (		CREATE TABLE relationships_undirected (
user1 bigint(20) NOT NULL,		user1 bigint(20) NOT NULL,
user2 bigint(20) NOT NULL,		user2 bigint(20) NOT NULL,
status tinyint(1) UNSIGNED NOT NULL		status tinyint(1) UNSIGNED NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1;		) ENGINE=InnoDB DEFAULT CHARSET=latin1;

▲ Show 20 Lines • Show All 85 Lines • ▼ Show 20 Lines	SQL`
ADD KEY entry (entry);		ADD KEY entry (entry);

ALTER TABLE roles		ALTER TABLE roles
ADD PRIMARY KEY (id),		ADD PRIMARY KEY (id),
ADD KEY thread (thread);		ADD KEY thread (thread);

ALTER TABLE sessions		ALTER TABLE sessions
ADD PRIMARY KEY (id),		ADD PRIMARY KEY (id),
ADD KEY user (user);		ADD KEY user (user),
		ADD UNIQUE INDEX public_key (public_key);

ALTER TABLE threads		ALTER TABLE threads
ADD PRIMARY KEY (id),		ADD PRIMARY KEY (id),
ADD INDEX parent_thread_id (parent_thread_id),		ADD INDEX parent_thread_id (parent_thread_id),
ADD INDEX containing_thread_id (containing_thread_id),		ADD INDEX containing_thread_id (containing_thread_id),
ADD INDEX community (community);		ADD INDEX community (community);

ALTER TABLE updates		ALTER TABLE updates
ADD PRIMARY KEY (id),		ADD PRIMARY KEY (id),
ADD INDEX user_time (user,time),		ADD INDEX user_time (user,time),
ADD INDEX target_time (target, time),		ADD INDEX target_time (target, time),
ADD INDEX user_key_target_type_time (user, \`key\`, target, type, time),		ADD INDEX user_key_target_type_time (user, \`key\`, target, type, time),
ADD INDEX user_key_type_time (user, \`key\`, type, time),		ADD INDEX user_key_type_time (user, \`key\`, type, time),
ADD INDEX user_key_time (user, \`key\`, time);		ADD INDEX user_key_time (user, \`key\`, time);

ALTER TABLE uploads		ALTER TABLE uploads
ADD PRIMARY KEY (id),		ADD PRIMARY KEY (id),
ADD INDEX container (container);		ADD INDEX container (container);

ALTER TABLE users		ALTER TABLE users
ADD PRIMARY KEY (id),		ADD PRIMARY KEY (id),
ADD UNIQUE KEY username (username);		ADD UNIQUE KEY username (username),
		ADD UNIQUE INDEX public_key (public_key);

ALTER TABLE relationships_undirected		ALTER TABLE relationships_undirected
ADD UNIQUE KEY user1_user2 (user1,user2),		ADD UNIQUE KEY user1_user2 (user1,user2),
ADD UNIQUE KEY user2_user1 (user2,user1);		ADD UNIQUE KEY user2_user1 (user2,user1);

ALTER TABLE relationships_directed		ALTER TABLE relationships_directed
ADD UNIQUE KEY user1_user2 (user1,user2),		ADD UNIQUE KEY user1_user2 (user1,user2),
ADD UNIQUE KEY user2_user1 (user2,user1);		ADD UNIQUE KEY user2_user1 (user2,user1);
▲ Show 20 Lines • Show All 87 Lines • Show Last 20 Lines