Commit Graph

26 Commits

Author SHA1 Message Date
Jeremy Fitzhardinge
ac31713c84 rust: failure cleanup pass
Summary:
Don't use failure's bail!() and ensure!() macros.

Instead, failure_ext provides:
- bail_err!(err) - Converts its single parameter to the expected error and returns; ie `return Err(From::from(err));`
- bail_msg!(fmt, ...) - takes format string parameters and returns a `failure::err_msg()` error
- ensure_err!(), ensure_msg!() - corresponding changes

Also:
- remove all stray references to error-chain
- remove direct references to failure_derive (it's reexported via failure and failure_ext)
- replace uses of `Err(foo)?;` with `bail_err!()` (since `bail_err` unconditionally returns, but `Err(x)?` does not in principle, which can affect type inference)

Reviewed By: kulshrax

Differential Revision: D6507717

fbshipit-source-id: 635fb6f8c96d185b195dff171ea9c8db9e83af10
2017-12-07 14:10:17 -08:00
Jeremy Fitzhardinge
dc5e78c1c1 rust: mass convert scm/mononoke/... to use failure
Summary:
Convert scm/mononoke to use failure, and update common/rust crates it depends on as well.

What it looks like is a lot of deleted code...

General strategy:
- common/rust/failure_ext adds some things that are in git failure that aren't yet in crates.io (`bail!` and `ensure!`, `Result<T, Error>`)
- everything returns `Result<T, failure::Error>`
- crates with real error get an error type, with a derived Fail implementation
  - replicate error-chain by defining an `enum ErrorKind` where the fields match the declared errors in the error! macro
- crates with dummy error-chain (no local errors) lose it
- `.chain_err()` -> `.context()` or `.with_context()`

So far the only place I've needed to extract an error is in a unit test.
Having a single unified error type has simplified a lot of things, and removed a lot of error type parameters, error conversion, etc, etc.

Reviewed By: sid0

Differential Revision: D6446584

fbshipit-source-id: 744640ca2997d4a85513c4519017f2e2e78a73f5
2017-12-05 18:11:13 -08:00
Arun Kulshreshtha
fd2c414961 Update to Rust 1.21
Summary:
This diff does a few things:
  - Change the rust versions in `third-party{2,-buck}/config.py` to 1.21.
  - Update the tp2 symlinks for `rust` and `rust-crates-io`
  - Fix build breakages due to new errors/warnings from rustc.

Reviewed By: jsgf, Imxset21

Differential Revision: D6319954

fbshipit-source-id: cd4fe9e0d6f26c1a6c9c3f1256d84cb002bb83d6
2017-11-29 15:21:41 -08:00
Simon Farnsworth
5519eae489 Make Bookmarks a parameterless trait
Summary:
As part of removing excess genericism, make Bookmarks a trait with no
associated types or type parameters. I will revisit error types here once I
have removed the Repo trait - these are not ideal, but enough to get things
going

Reviewed By: StanislavGlebik

Differential Revision: D6405315

fbshipit-source-id: 814c106612a061e1766f1ea9a9428a13a73bd007
2017-11-27 08:05:02 -08:00
Arun Kulshreshtha
2ac5581e5d Add DbBookmarks to bookmarks-test
Summary: Add DbBookmarks to the common bookmarks test crate, which runs tests that all bookmarks implementations must pass.

Reviewed By: farnz

Differential Revision: D6215852

fbshipit-source-id: 64238c584eb05cbccdef78a68cec6c8f93b14df1
2017-11-08 16:16:27 -08:00
Arun Kulshreshtha
918b1f2dbe Add MySQL-backed Bookmarks implementation
Summary: Add a new implementation of the Bookmarks trait backed by a MySQL database.

Reviewed By: farnz

Differential Revision: D6215856

fbshipit-source-id: 4258a6195a946917a1878e87a53f9bbc6ca64400
2017-11-08 16:16:27 -08:00
Arun Kulshreshtha
43b85874f3 Use NodeHashes instead of Strings for values in bookmarks-test
Summary: In practice, Mononoke requires that the Value associated type of the Bookmarks trait be NodeHash. As a result, in the case of DbBookmarks, rather than making the implementation fully generic over values, I've made it specialized for NodeHashes for simplicity's sake. This means in order to use these tests, they need to store NodeHashes instead of Strings.

Reviewed By: farnz

Differential Revision: D6217789

fbshipit-source-id: 3f0f04180eb0869eb9de3da7be634d95c2b24d84
2017-11-08 16:16:27 -08:00
Arun Kulshreshtha
83293f1441 Add Core to test harness in bookmarks-test
Summary:
The `Bookmarks` trait assumes that the underlying implementation is asynchronous (as evidenced by the fact that all methods return `Future`s). Most non-toy implementations of an asynchronous bookmark store will need to schedule arbitrary tasks on the Core executing the returned Futures. (In some cases, the constructor itself may need to schedule tasks on the Core.) As such, this test harness should expose a Core to each test in a first class way (rather than trying to shoehorn it in via the `state`, which doesn't actually quite work here).

Existing implementations can just ignore the Core.

Reviewed By: jsgf

Differential Revision: D6215855

fbshipit-source-id: ea3f28bdaec667111b384db29d0c7c49954398e5
2017-11-08 12:30:47 -08:00
Siddharth Agarwal
dfd53e9233 filekv: allow specifying a version during set
Summary:
This field is optional. We need to ensure in linknodes that the
version is always set to a fixed value so that linknode blobs written out to
disk are deterministic.

Reviewed By: jsgf

Differential Revision: D6214032

fbshipit-source-id: c1eea7bf28bb096c1d23165e1f50ff2dc6d21274
2017-11-02 13:10:56 -07:00
Siddharth Agarwal
acda30f2fb replace AsRef<Path> with Into<PathBuf> in a few spots
Summary:
We need ownership of the buffer in all of these cases, and
`AsRef<Path>` could potentially create unnecessary copies.

Reviewed By: jsgf

Differential Revision: D6214034

fbshipit-source-id: 806a87bfe3b125febaaaaf26c8b8dcac407de145
2017-11-02 13:10:56 -07:00
Siddharth Agarwal
a730eb9ec9 bookmarks: unify bookmark tests
Summary:
All bookmark implementations, including the upcoming MySQL-based one,
should work with these tests.  Don't duplicate them in every test crate.

Reviewed By: StanislavGlebik

Differential Revision: D6075454

fbshipit-source-id: 547e3c2c98326a6fdca55a562811924ebec93796
2017-10-17 09:09:48 -07:00
Siddharth Agarwal
10b1993ca0 factor out file-based key-value store from FileBookmarks
Summary:
This code is generally useful and will also be used for linknodes.

Note that I marked `filekv` as a copy of `filebookmarks` to preserve blame
info. Git doesn't track renames so this unfortunately won't be transferred to
the open source repo.

Reviewed By: farnz

Differential Revision: D6015776

fbshipit-source-id: 2c17e2440e25e6179dd71d16a87095ad1b346b49
2017-10-10 07:29:30 -07:00
Siddharth Agarwal
86f4489e7c move bookmarks::Version into a separate crate
Summary:
This Version type is going to form the basis for other key-value
stores like linknodes, so it needs to be moved into a separate crate.

I've chosen `storage_types` as the name because it seems to be the most obvious
candidate.

Reviewed By: jsgf

Differential Revision: D6015772

fbshipit-source-id: 52de7866d68fdec2a4908626679a6f08c5f73402
2017-10-10 07:29:30 -07:00
Siddharth Agarwal
7351b25695 rustfmt a few files
Summary:
Will be making functional changes to these files separately and don't
want the two to interfere.

Reviewed By: jsgf

Differential Revision: D6015773

fbshipit-source-id: 26529ce4075ac47e5f0e80177319e1beb90c2076
2017-10-10 07:29:30 -07:00
Siddharth Agarwal
359ca05ac8 cleanup deprecated tokio APIs in bookmarks crate
Summary:
Realized that this didn't have `#![deny(warnings)]`, so deprecated
tokio APIs hadn't been cleaned up.

Reviewed By: farnz

Differential Revision: D6015774

fbshipit-source-id: 10f8e8b28b7d6e81ef88ca2382e331cde822ac66
2017-10-10 07:29:30 -07:00
Zach Zagorski
8d043552f4 Remove deprecated tokio APIs from stockbookmarks
Summary: Change usage of BoxStream from futures crate to futures-ext crate and replace stream::iter() with stream::iter_ok().

Reviewed By: jsgf

Differential Revision: D5938460

fbshipit-source-id: bfb90844e646079d72b35495f409591a65686978
2017-10-06 09:35:37 -07:00
Siddharth Agarwal
de9df8c5e2 remove deprecated tokio APIs from filebookmarks
Summary:
I'm going to factor out some of this code into a new crate, and I want
to get these changes out of the way first.

Reviewed By: lukaspiatkowski

Differential Revision: D5924471

fbshipit-source-id: 7007638ce688e62397637ff6f9a2e51247ec9312
2017-09-28 22:10:04 -07:00
Dzmitry Dulko
63e92b7825 Remove usage of deprecated Tokio APIs
Summary: Switch to new futures API

Reviewed By: sid0

Differential Revision: D5888635

fbshipit-source-id: 22c06797ee62ce08132526369764607f3a73ceef
2017-09-23 10:50:20 -07:00
Jeremy Fitzhardinge
faa58a1052 mononoke: bookmarks: use ! for membookmarks errors
Summary: membookmarks can't fail, so use `!` for its `Error` type

Reviewed By: sid0

Differential Revision: D5849875

fbshipit-source-id: 5dbb4edf9bb57dde55877d2c90936b51dcc5d7ff
2017-09-19 16:11:54 -07:00
Siddharth Agarwal
81f2ac473b make bookmark error type implement std::error::Error
Summary: All its users need this, and it makes sense.

Reviewed By: jsgf

Differential Revision: D5847753

fbshipit-source-id: 042c7b5637e5f83918fa9bc5d131c8745d7bbc3e
2017-09-18 00:35:52 -07:00
Siddharth Agarwal
a74542da60 update and pull in uuid + subprocess
Summary:
Finally got an update working by removing the `mysql_async` crate.

Some notes:

* The `mysql_async` crate was responsible in this case: see https://github.com/rust-lang/cargo/issues/4066#issuecomment-328210204 for why.
* tokio/futures deprecated a bunch of stuff. I've filed a TODO for now.
* We finally pulled in error-chain 0.11, which has a bunch of nice improvements.

Reviewed By: kulshrax

Differential Revision: D5798282

fbshipit-source-id: a38a7b17ee0205428e2ea63334722aa408582493
2017-09-08 17:05:38 -07:00
Arun Kulshreshtha
8b6310dcef Switch from url to percent_encoding crate in FileBookmarks
Summary:
The url::percent_encoding module was split into its own crate. Use
that instead.

Reviewed By: jsgf

Differential Revision: D5769525

fbshipit-source-id: 4d95c5d791e486f56a16091ffa5114b3cfbfd47e
2017-09-07 10:50:55 -07:00
Jeremy Fitzhardinge
144bea971a mononoke: bookmarks: add helpers for boxing Bookmarks trait objects
Summary:
Add BoxedBookmark to assist in boxing a Bookmark trait, and implement Bookmark
for Box<_> and Arc<_> Bookmark trait objects.

Reviewed By: sid0

Differential Revision: D5540675

fbshipit-source-id: 7582adbd2858f6814d57b7e54089b922886a4d54
2017-08-02 17:43:24 -07:00
Jeremy Fitzhardinge
09b25e1507 mononoke: bookmarks: fold ListBookmarks into Bookmarks
Summary:
In practice, no users of Bookmarks will not want listing, and all
implementations need to be able to support it.

Reviewed By: StanislavGlebik

Differential Revision: D5540672

fbshipit-source-id: d64a3894c7cd14d329bd23809525935461289bc3
2017-08-02 17:43:24 -07:00
Jeremy Fitzhardinge
6cfc6704b6 mononoke: stockbookmarks: make Error a parameter
Summary: Allow the error type to be any type the internal errors can be converted to.

Reviewed By: sid0

Differential Revision: D5540671

fbshipit-source-id: 1077132d25bcc13ba2a3a509c916f2e07ac10dcf
2017-08-02 17:43:24 -07:00
facebook-github-bot
2b6af6b941 Initial commit
fbshipit-source-id: f75baa4ff6aa71973f677b752d7aba582cf4927f
2017-07-27 18:00:19 -07:00