build(dep): Bump governor from 0.5.1 to 0.6.0 (#3761)

apache · Dec 16, 2023 · 6980cd1 · 6980cd1
1 parent 00b5a16
commit 6980cd1
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 57 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -245,7 +245,7 @@ foundationdb = { version = "0.8.0", features = [
   "embedded-fdb-include",
 ], optional = true }
 futures = { version = "0.3", default-features = false, features = ["std"] }
-governor = { version = "0.5", optional = true, features = ["std"] }
+governor = { version = "0.6.0", optional = true, features = ["std"] }
 hdrs = { version = "0.3.0", optional = true, features = ["async_file"] }
 hrana-client-proto = { version = "0.2.1", optional = true }
 http = "0.2.9"

diff --git a/core/src/layers/throttle.rs b/core/src/layers/throttle.rs
@@ -29,7 +29,6 @@ use governor::clock::DefaultClock;
 use governor::middleware::NoOpMiddleware;
 use governor::state::InMemoryState;
 use governor::state::NotKeyed;
-use governor::NegativeMultiDecision;
 use governor::Quota;
 use governor::RateLimiter;
 
@@ -221,24 +220,22 @@ impl<R: oio::Write> oio::Write for ThrottleWrapper<R> {
 
         loop {
             match self.limiter.check_n(buf_length) {
-                Ok(_) => return self.inner.poll_write(cx, bs),
-                Err(negative) => match negative {
+                Ok(res) => match res {
+                    Ok(_) => return self.inner.poll_write(cx, bs),
                     // the query is valid but the Decider can not accommodate them.
-                    NegativeMultiDecision::BatchNonConforming(_, not_until) => {
+                    Err(not_until) => {
                         let _ = not_until.wait_time_from(DefaultClock::default().now());
                         // TODO: Should lock the limiter and wait for the wait_time, or should let other small requests go first?
 
                         // FIXME: we should sleep here.
                         // tokio::time::sleep(wait_time).await;
                     }
-                    // the query was invalid as the rate limit parameters can "never" accommodate the number of cells queried for.
-                    NegativeMultiDecision::InsufficientCapacity(_) => {
-                        return Poll::Ready(Err(Error::new(
-                            ErrorKind::RateLimited,
-                            "InsufficientCapacity due to burst size being smaller than the request size",
-                        )))
-                    }
                 },
+                // the query was invalid as the rate limit parameters can "never" accommodate the number of cells queried for.
+                Err(_) => return Poll::Ready(Err(Error::new(
+                    ErrorKind::RateLimited,
+                    "InsufficientCapacity due to burst size being smaller than the request size",
+                ))),
             }
         }
     }
@@ -258,21 +255,19 @@ impl<R: oio::BlockingWrite> oio::BlockingWrite for ThrottleWrapper<R> {
 
         loop {
             match self.limiter.check_n(buf_length) {
-                Ok(_) => return self.inner.write(bs),
-                Err(negative) => match negative {
+                Ok(res) => match res {
+                    Ok(_) => return self.inner.write(bs),
                     // the query is valid but the Decider can not accommodate them.
-                    NegativeMultiDecision::BatchNonConforming(_, not_until) => {
+                    Err(not_until) => {
                         let wait_time = not_until.wait_time_from(DefaultClock::default().now());
                         thread::sleep(wait_time);
                     }
-                    // the query was invalid as the rate limit parameters can "never" accommodate the number of cells queried for.
-                    NegativeMultiDecision::InsufficientCapacity(_) => {
-                        return Err(Error::new(
-                            ErrorKind::RateLimited,
-                            "InsufficientCapacity due to burst size being smaller than the request size",
-                        ))
-                    }
                 },
+                // the query was invalid as the rate limit parameters can "never" accommodate the number of cells queried for.
+                Err(_) => return Err(Error::new(
+                    ErrorKind::RateLimited,
+                    "InsufficientCapacity due to burst size being smaller than the request size",
+                )),
             }
         }
     }