From c16bd45a8757c157f3d966d63ddbbbc52218b907 Mon Sep 17 00:00:00 2001 From: Ricky Han Date: Sat, 8 Feb 2020 21:50:02 -0500 Subject: [PATCH] lower integration test workload and upgrade deps --- Cargo.lock | 34 +++++++++++++++---------------- Cargo.toml | 4 ++-- crates/tdb-cli/Cargo.toml | 4 ++-- crates/tdb-core/Cargo.toml | 4 ++-- crates/tdb-server-core/Cargo.toml | 4 ++-- tests/integration_test.rs | 4 ++-- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fa2a177e..6cba958e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -159,7 +159,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "byteorder" -version = "1.3.2" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -167,7 +167,7 @@ name = "bytes" version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -273,7 +273,7 @@ dependencies = [ "rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde-hjson 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", "yaml-rust 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1527,7 +1527,7 @@ name = "regex-automata" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1699,7 +1699,7 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.46" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1806,7 +1806,7 @@ dependencies = [ "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", "serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "wasm-bindgen 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1829,11 +1829,11 @@ name = "tdb_cli" version = "0.5.1" dependencies = [ "bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", "tdb_core 0.5.1", ] @@ -1844,7 +1844,7 @@ dependencies = [ "alloc_counter 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "csv 1.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1854,7 +1854,7 @@ dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1865,7 +1865,7 @@ dependencies = [ "alloc_counter 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "async-std 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "circular-queue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1879,7 +1879,7 @@ dependencies = [ "reqwest 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", "surf 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "tdb_core 0.5.1", "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1891,7 +1891,7 @@ dependencies = [ name = "tectonicdb" version = "0.5.1" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "fern 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1904,7 +1904,7 @@ dependencies = [ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", "tdb_cli 0.5.1", "tdb_core 0.5.1", "tdb_server_core 0.5.1", @@ -2181,7 +2181,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", "wasm-bindgen-macro 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2373,7 +2373,7 @@ dependencies = [ "checksum bstr 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "502ae1441a0a5adb8fbd38a5955a6416b9493e92b465de5e4a9bde6a539c2c48" "checksum bufstream 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8" "checksum bumpalo 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5fb8038c1ddc0a5f73787b130f4cc75151e96ed33e417fde765eb5a81e3532f4" -"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" +"checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" "checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" "checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" @@ -2546,7 +2546,7 @@ dependencies = [ "checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" "checksum serde-hjson 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6a3a4e0ea8a88553209f6cc6cfe8724ecad22e1acf372793c27d995290fe74f8" "checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" -"checksum serde_json 1.0.46 (registry+https://github.com/rust-lang/crates.io-index)" = "21b01d7f0288608a01dca632cf1df859df6fd6ffa885300fc275ce2ba6221953" +"checksum serde_json 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "15913895b61e0be854afd32fd4163fcd2a3df34142cf2cb961b310ce694cbf90" "checksum serde_test 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5" "checksum serde_urlencoded 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" "checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" diff --git a/Cargo.toml b/Cargo.toml index ecbcbb5c..3a92663a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,8 +41,8 @@ itertools = "0.8.2" clap = "2.33.0" serde = "1.0.104" serde_derive = "1.0.104" -serde_json = "1.0.46" -byteorder = "1.3.2" +serde_json = "1.0.47" +byteorder = "1.3.4" indoc = "0.3.4" linefeed = "0.6.0" memmap = "0.7.0" diff --git a/crates/tdb-cli/Cargo.toml b/crates/tdb-cli/Cargo.toml index 31e0f951..b43bc6c5 100644 --- a/crates/tdb-cli/Cargo.toml +++ b/crates/tdb-cli/Cargo.toml @@ -11,9 +11,9 @@ readme = "../../README.md" [dependencies] tdb_core = { path = "../tdb-core", version = "0.5.0" } -byteorder = "1.3.2" +byteorder = "1.3.4" log = "0.4.8" bufstream = "0.1.4" serde = "1.0.104" serde_derive = "1.0.104" -serde_json = "1.0.46" +serde_json = "1.0.47" diff --git a/crates/tdb-core/Cargo.toml b/crates/tdb-core/Cargo.toml index d76ac026..5cdbc41f 100644 --- a/crates/tdb-core/Cargo.toml +++ b/crates/tdb-core/Cargo.toml @@ -12,7 +12,7 @@ readme = "../../README.md" [dependencies] csv = "1.1.3" bitflags = "1.2.1" -byteorder = "1.3.2" +byteorder = "1.3.4" indexmap = "1.3.2" chrono = "0.4.10" @@ -21,7 +21,7 @@ log = "0.4.8" serde = "1.0.104" serde_derive = "1.0.104" -serde_json = "1.0.46" +serde_json = "1.0.47" libc = "0.2.66" alloc_counter = { version = "0.0.4", optional = true } diff --git a/crates/tdb-server-core/Cargo.toml b/crates/tdb-server-core/Cargo.toml index 7bcb2136..41df36c5 100644 --- a/crates/tdb-server-core/Cargo.toml +++ b/crates/tdb-server-core/Cargo.toml @@ -16,10 +16,10 @@ circular-queue = "0.2.3" async-std = "1.5.0" futures = "0.3.4" ctrlc = "3.1.3" -byteorder = "1.3.2" +byteorder = "1.3.4" serde_derive = "1.0.104" -serde_json = "1.0.46" +serde_json = "1.0.47" log = "0.4.8" clap = "2.33.0" diff --git a/tests/integration_test.rs b/tests/integration_test.rs index e858bcca..b2fe47e1 100644 --- a/tests/integration_test.rs +++ b/tests/integration_test.rs @@ -23,13 +23,13 @@ fn it_works() { let _server = task::spawn(tdb_server_core::server::run_server(&host, &port, settings)); let cli = tdb_cli::client_from_env(); - tdb_cli::benchmark(cli, 100_000); + tdb_cli::benchmark(cli, 10_000); let mut cli = tdb_cli::client_from_env(); cli.use_db("benchmark").unwrap(); task::sleep(Duration::from_secs(15)).await; let ret = cli.cmd("COUNT ALL IN MEM\n").unwrap(); - assert_eq!(ret, "100000"); + assert_eq!(ret, "10000"); }); }