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

mononoke: use parse mysql options in benchmark filestore

Browse Source 
Summary:
benchmark_filestore XDB subcommands uses mysql and has option of using either myrouter or mysql. In this diff I used `args::parse_mysql_options` function to parse the arguments instead of manual processing and get a `MysqlOptions` object.
This is needed later to pass a connection pool object through the `MysqlOptions` struct (see the next diff).

Reviewed By: ahornby

Differential Revision: D25587898

fbshipit-source-id: 66fcfd98ad8f3f9e285ca9635d8f625aa680d7ff
This commit is contained in:
Aida Getoeva 2020-12-17 15:44:56 -08:00 committed by Facebook GitHub Bot
parent 9677a6ba17
commit 8ecb9977a5
1 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
eden/mononoke/cmds/benchmark_filestore.rs
View File

@ -24,7 +24,7 @@ use futures::{
use futures_stats::{FutureStats, TimedFutureExt};
use mononoke_types::{ContentMetadata, MononokeId};
use rand::Rng;
use sql_ext::facebook::ReadConnectionType;
use sql_ext::facebook::{MysqlConnectionType, ReadConnectionType};
use sqlblob::Sqlblob;
use std::fmt::Debug;
use std::num::NonZeroU32;
@ -201,44 +201,48 @@ async fn get_blob<'a>(
(CMD_XDB, Some(sub)) => {
let shardmap = sub.value_of(ARG_SHARDMAP).unwrap().to_string();
let shard_count = sub.value_of(ARG_SHARD_COUNT).unwrap().parse()?;
let blobstore = if let Some(port) = sub.value_of(ARG_MYROUTER_PORT) {
let port = port.parse()?;
Sqlblob::with_myrouter(
fb,
shardmap,
port,
ReadConnectionType::Replica,
shard_count,
false,
put_behaviour,
config_store,
)
.compat()
.await?
} else if sub.is_present(ARG_USE_MYSQL_CLIENT) {
Sqlblob::with_mysql(
fb,
shardmap,
shard_count,
ReadConnectionType::Replica,
false,
put_behaviour,
config_store,
)
.compat()
.await?
} else {
Sqlblob::with_raw_xdb_shardmap(
fb,
shardmap,
ReadConnectionType::Replica,
shard_count,
false,
put_behaviour,
config_store,
)
.compat()
.await?
let mysql_options = args::parse_mysql_options(&matches);
let blobstore = match mysql_options.connection_type {
MysqlConnectionType::Myrouter(port) => {
Sqlblob::with_myrouter(
fb,
shardmap,
port,
ReadConnectionType::Replica,
shard_count,
false,
put_behaviour,
config_store,
)
.compat()
.await?
}
MysqlConnectionType::Mysql => {
Sqlblob::with_mysql(
fb,
shardmap,
shard_count,
ReadConnectionType::Replica,
false,
put_behaviour,
config_store,
)
.compat()
.await?
}
MysqlConnectionType::RawXDB => {
Sqlblob::with_raw_xdb_shardmap(
fb,
shardmap,
ReadConnectionType::Replica,
shard_count,
false,
put_behaviour,
config_store,
)
.compat()
.await?
}
};
Arc::new(blobstore)
}