From 405e6d4bf5e884afe38b68a19e9b0c95e7724dfb Mon Sep 17 00:00:00 2001 From: Jake Goulding Date: Fri, 20 Aug 2021 16:14:10 -0400 Subject: [PATCH 1/4] refactor: avoid manual iteration --- iox_data_generator/src/agent.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/iox_data_generator/src/agent.rs b/iox_data_generator/src/agent.rs index d4c92e99a0..358a441b9c 100644 --- a/iox_data_generator/src/agent.rs +++ b/iox_data_generator/src/agent.rs @@ -135,11 +135,9 @@ impl Agent { let mut total_points = 0; let mut points = self.generate().await?; - let mut batches = 1; while !points.is_empty() { - while batches < batch_size { + for _ in 0..batch_size { points.append(&mut self.generate().await?); - batches += 1; } info!("[agent {}] sending {} points", self.name, points.len()); total_points += points.len(); @@ -148,7 +146,6 @@ impl Agent { .await .context(CouldNotWritePoints)?; points = self.generate().await?; - batches = 1; } Ok(total_points) } From f11ad0bf1d079fc03a23af180bb6952bc1b66dc0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Aug 2021 01:16:38 +0000 Subject: [PATCH 2/4] chore(deps): bump serde from 1.0.127 to 1.0.128 Bumps [serde](https://github.com/serde-rs/serde) from 1.0.127 to 1.0.128. - [Release notes](https://github.com/serde-rs/serde/releases) - [Commits](https://github.com/serde-rs/serde/compare/v1.0.127...v1.0.128) --- updated-dependencies: - dependency-name: serde dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 8 ++++---- influxdb_iox_client/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2f41cb7897..ea7bd73ef1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3983,9 +3983,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8" +checksum = "1056a0db1978e9dbf0f6e4fca677f6f9143dc1c19de346f22cac23e422196834" dependencies = [ "serde_derive", ] @@ -4014,9 +4014,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc" +checksum = "13af2fbb8b60a8950d6c72a56d2095c28870367cc8e10c55e9745bac4995a2c4" dependencies = [ "proc-macro2", "quote", diff --git a/influxdb_iox_client/Cargo.toml b/influxdb_iox_client/Cargo.toml index 00c659457b..55d1dd3d1d 100644 --- a/influxdb_iox_client/Cargo.toml +++ b/influxdb_iox_client/Cargo.toml @@ -21,7 +21,7 @@ http = "0.2.3" hyper = "0.14" prost = "0.8" rand = "0.8.3" -serde = "1.0.118" +serde = "1.0.128" serde_json = { version = "1.0.44", optional = true } thiserror = "1.0.23" tokio = { version = "1.0", features = ["macros"] } From 0d4bc4190fe4dd07907a929ebcd126e66e994d5c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Aug 2021 01:17:06 +0000 Subject: [PATCH 3/4] chore(deps): bump assert_cmd from 1.0.8 to 2.0.0 Bumps [assert_cmd](https://github.com/assert-rs/assert_cmd) from 1.0.8 to 2.0.0. - [Release notes](https://github.com/assert-rs/assert_cmd/releases) - [Changelog](https://github.com/assert-rs/assert_cmd/blob/master/CHANGELOG.md) - [Commits](https://github.com/assert-rs/assert_cmd/compare/v1.0.8...v2.0.0) --- updated-dependencies: - dependency-name: assert_cmd dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2f41cb7897..9551a1773c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -191,9 +191,9 @@ dependencies = [ [[package]] name = "assert_cmd" -version = "1.0.8" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c98233c6673d8601ab23e77eb38f999c51100d46c5703b17288c57fddf3a1ffe" +checksum = "54f002ce7d0c5e809ebb02be78fd503aeed4a511fd0fcaff6e6914cbdabbfa33" dependencies = [ "bstr", "doc-comment", diff --git a/Cargo.toml b/Cargo.toml index 14e2703c8a..2b2f220f54 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -142,7 +142,7 @@ parking_lot = "0.11.1" write_buffer = { path = "write_buffer" } # Crates.io dependencies, in alphabetical order -assert_cmd = "1.0.0" +assert_cmd = "2.0.0" flate2 = "1.0" hex = "0.4.2" predicates = "2.0.2" From 37c81fb483024079a09d323aac18298500dcabf9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Aug 2021 11:26:28 +0000 Subject: [PATCH 4/4] chore(deps): bump cloud-storage from 0.9.0 to 0.10.2 Bumps [cloud-storage](https://github.com/ThouCheese/cloud-storage-rs) from 0.9.0 to 0.10.2. - [Release notes](https://github.com/ThouCheese/cloud-storage-rs/releases) - [Changelog](https://github.com/ThouCheese/cloud-storage-rs/blob/master/CHANGELOG.md) - [Commits](https://github.com/ThouCheese/cloud-storage-rs/commits) --- updated-dependencies: - dependency-name: cloud-storage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- object_store/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9551a1773c..b70ce13a70 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -602,9 +602,9 @@ dependencies = [ [[package]] name = "cloud-storage" -version = "0.9.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e781cbdd8c1c39dc43698f7a0f736abe624b9fa5f2aa952fb1fa2478291349b0" +checksum = "6882d1c3788951dcfa4afe71da40a2a3913b3a81e2485b130f64714ce76b39c2" dependencies = [ "base64 0.13.0", "bytes", diff --git a/object_store/Cargo.toml b/object_store/Cargo.toml index 2878df400e..814f7f1f1d 100644 --- a/object_store/Cargo.toml +++ b/object_store/Cargo.toml @@ -13,7 +13,7 @@ azure_storage = { git = "https://github.com/Azure/azure-sdk-for-rust.git", rev = bytes = "1.0" chrono = "0.4" # Google Cloud Storage integration -cloud-storage = {version = "0.9.0", optional = true} +cloud-storage = {version = "0.10.2", optional = true} futures = "0.3" itertools = "0.10.1" percent-encoding = "2.1"