facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-12 09:48:05 +03:00
Code Issues Projects Releases Wiki Activity

rust/async: Port fbcode to std::future Thrift clients

Browse Source 
Summary:
This diff rewrites all use of Thrift-generated `client` modules to `client_async`, then inserts `.compat()` calls to cast the std::future::Future objects produced by `client_async` back to futures::Future objects as they would have been produced by `client`, thus preserving the behavior.

https://docs.rs/futures/0.3.1/futures/future/trait.TryFutureExt.html#method.compat

This diff is just the minimal change to allow deleting the old futures 0.1 Thrift client. We'll follow up further in each of these projects to remove the compat shims by migrating off of futures 0.1 entirely.

Reviewed By: bolinfest

Differential Revision: D18392206

fbshipit-source-id: b58d2b6bf7a3d3adebc31d04e332a0917c8a6f28
This commit is contained in:
David Tolnay 2019-11-08 12:33:15 -08:00 committed by Facebook Github Bot
parent 38c3b10bda
commit 6f2ec04783
1 changed files with 68 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
apiserver/client/src/lib.rs
View File

@ -8,9 +8,9 @@
use std::sync::Arc;
use futures_ext::BoxFuture;
use futures_ext::{BoxFuture, FutureExt};
use apiserver_thrift::client::{make_MononokeAPIService, MononokeAPIService};
use apiserver_thrift::client_async::{make_MononokeAPIService, MononokeAPIService};
use apiserver_thrift::types::{
MononokeBlob, MononokeBranches, MononokeChangeset, MononokeDirectory, MononokeDirectoryUnodes,
MononokeFileHistory, MononokeGetBlobParams, MononokeGetBranchesParams,
@ -20,6 +20,7 @@ use apiserver_thrift::types::{
MononokeRevision, MononokeTreeHash,
};
use fbinit::FacebookInit;
use futures_preview::future::TryFutureExt;
use srclient::SRChannelBuilder;
pub struct MononokeAPIClient {
@ -54,27 +55,36 @@ impl MononokeAPIClient {
MononokeRevision::commit_hash(revision)
};
self.inner.get_raw(&MononokeGetRawParams {
repo: self.repo.clone(),
revision: rev,
path: path.into_bytes(),
})
self.inner
.get_raw(&MononokeGetRawParams {
repo: self.repo.clone(),
revision: rev,
path: path.into_bytes(),
})
.compat()
.boxify()
}
pub fn get_changeset(
&self,
revision: String,
) -> BoxFuture<MononokeChangeset, failure_ext::Error> {
self.inner.get_changeset(&MononokeGetChangesetParams {
repo: self.repo.clone(),
revision: MononokeRevision::commit_hash(revision),
})
self.inner
.get_changeset(&MononokeGetChangesetParams {
repo: self.repo.clone(),
revision: MononokeRevision::commit_hash(revision),
})
.compat()
.boxify()
}
pub fn get_branches(&self) -> BoxFuture<MononokeBranches, failure_ext::Error> {
self.inner.get_branches(&MononokeGetBranchesParams {
repo: self.repo.clone(),
})
self.inner
.get_branches(&MononokeGetBranchesParams {
repo: self.repo.clone(),
})
.compat()
.boxify()
}
pub fn get_file_history(
@ -84,13 +94,16 @@ impl MononokeAPIClient {
limit: i32,
skip: i32,
) -> BoxFuture<MononokeFileHistory, failure_ext::Error> {
self.inner.get_file_history(&MononokeGetFileHistoryParams {
repo: self.repo.clone(),
revision: MononokeRevision::commit_hash(revision),
path: path.into_bytes(),
limit,
skip,
})
self.inner
.get_file_history(&MononokeGetFileHistoryParams {
repo: self.repo.clone(),
revision: MononokeRevision::commit_hash(revision),
path: path.into_bytes(),
limit,
skip,
})
.compat()
.boxify()
}
pub fn get_last_commit_on_path(
@ -104,6 +117,8 @@ impl MononokeAPIClient {
revision: MononokeRevision::commit_hash(revision),
path: path.into_bytes(),
})
.compat()
.boxify()
}
pub fn list_directory(
@ -111,11 +126,14 @@ impl MononokeAPIClient {
revision: String,
path: String,
) -> BoxFuture<MononokeDirectory, failure_ext::Error> {
self.inner.list_directory(&MononokeListDirectoryParams {
repo: self.repo.clone(),
revision: MononokeRevision::commit_hash(revision),
path: path.into_bytes(),
})
self.inner
.list_directory(&MononokeListDirectoryParams {
repo: self.repo.clone(),
revision: MononokeRevision::commit_hash(revision),
path: path.into_bytes(),
})
.compat()
.boxify()
}
pub fn list_directory_unodes(
@ -129,6 +147,8 @@ impl MononokeAPIClient {
revision: MononokeRevision::commit_hash(revision),
path: path.into_bytes(),
})
.compat()
.boxify()
}
pub fn is_ancestor(
@ -136,24 +156,33 @@ impl MononokeAPIClient {
ancestor: String,
descendant: String,
) -> BoxFuture<bool, failure_ext::Error> {
self.inner.is_ancestor(&MononokeIsAncestorParams {
repo: self.repo.clone(),
ancestor: MononokeRevision::commit_hash(ancestor),
descendant: MononokeRevision::commit_hash(descendant),
})
self.inner
.is_ancestor(&MononokeIsAncestorParams {
repo: self.repo.clone(),
ancestor: MononokeRevision::commit_hash(ancestor),
descendant: MononokeRevision::commit_hash(descendant),
})
.compat()
.boxify()
}
pub fn get_blob(&self, hash: String) -> BoxFuture<MononokeBlob, failure_ext::Error> {
self.inner.get_blob(&MononokeGetBlobParams {
repo: self.repo.clone(),
blob_hash: MononokeNodeHash { hash },
})
self.inner
.get_blob(&MononokeGetBlobParams {
repo: self.repo.clone(),
blob_hash: MononokeNodeHash { hash },
})
.compat()
.boxify()
}
pub fn get_tree(&self, hash: String) -> BoxFuture<MononokeDirectory, failure_ext::Error> {
self.inner.get_tree(&MononokeGetTreeParams {
repo: self.repo.clone(),
tree_hash: MononokeTreeHash { hash },
})
self.inner
.get_tree(&MononokeGetTreeParams {
repo: self.repo.clone(),
tree_hash: MononokeTreeHash { hash },
})
.compat()
.boxify()
}
}