Update infra_libs to 1.1.15 / 0b44aba87c1c6538439df6d24a409870810747ab

client/third_party/infra_libs/ts_mon/common/distribution.py

Index: client/third_party/infra_libs/ts_mon/common/distribution.py
diff --git a/client/third_party/infra_libs/ts_mon/common/distribution.py b/client/third_party/infra_libs/ts_mon/common/distribution.py
index 44c28c1978b741f076f8771ef905f325b81f890e..847ac0f3bcbc3cc34064888ff77a74a3c3464bc1 100644
--- a/client/third_party/infra_libs/ts_mon/common/distribution.py
+++ b/client/third_party/infra_libs/ts_mon/common/distribution.py
@@ -6,31 +6,53 @@ import bisect
 import collections
 
 
-class Bucketer(object):
+class _Bucketer(object):
   """Bucketing function for histograms recorded by the Distribution class."""
 
-  def __init__(self, width, growth_factor, num_finite_buckets):
+  def __init__(self, width, growth_factor, num_finite_buckets, scale=1.0):
     """The bucket sizes are controlled by width and growth_factor, and the total
     number of buckets is set by num_finite_buckets:
 
     Args:
-      width: fixed size of each bucket.
+      width: fixed size of each bucket (ignores |scale|).
       growth_factor: if non-zero, the size of each bucket increases by another
           multiplicative factor of this factor (see lower bound formula below).
       num_finite_buckets: the number of finite buckets.  There are two
           additional buckets - an underflow and an overflow bucket - that have
           lower and upper bounds of Infinity.
+      scale: overall scale factor to apply to buckets, if using geometric
+          buckets.
 
     Specify a width for fixed-size buckets or specify a growth_factor for bucket
-    sizes that follow a geometric progression.  Specifying both is valid as
-    well::
+    sizes that follow a geometric progression.  Specifying both is not valid.
 
-      lower bound of bucket i = width * i + growth_factor ^ (i - 1)
+    For fixed-size buckets::
+
+      The i'th bucket covers the interval [(i-1) * width, i * width),  where i
+      ranges from 1 to num_finite_buckets, inclusive:
+
+      bucket number                   lower bound      upper bound
+      i == 0 (underflow)              -inf             0
+      1 <= i <= num_buckets           (i-1) * width    i * width
+      i == num_buckets+1 (overflow)   (i-1) * width    +inf
+
+    For geometric buckets::
+
+      The i'th bucket covers the interval [factor^(i-1), factor^i) * scale
+      where i ranges from 1 to num_finite_buckets inclusive.
+
+      bucket number                   lower bound            upper bound
+      i == 0 (underflow)              -inf                   scale
+      1 <= i <= num_buckets           factor^(i-1) * scale   factor^i * scale
+      i == num_buckets+1 (overflow)   factor^(i-1) * scale   +inf
     """
 
     if num_finite_buckets < 0:
       raise ValueError('num_finite_buckets must be >= 0 (was %d)' %
           num_finite_buckets)
+    if width != 0 and growth_factor != 0:
+      raise ValueError('a Bucketer must be created with either a width or a '
+                       'growth factor, not both')
 
     self.width = width
     self.growth_factor = growth_factor
@@ -38,23 +60,26 @@ class Bucketer(object):
     self.total_buckets = num_finite_buckets + 2
     self.underflow_bucket = 0
     self.overflow_bucket = self.total_buckets - 1
+    self.scale = scale
 
-    self._lower_bounds = list(self._generate_lower_bounds())
+    if width != 0:
+      self._lower_bounds = [float('-Inf')] + self._linear_bounds()
+    else:
+      self._lower_bounds = [float('-Inf')] + self._exponential_bounds()
 
-  def _generate_lower_bounds(self):
-    yield float('-Inf')
-    yield 0
+    # Sanity check the bucket lower bounds we created.
+    assert len(self._lower_bounds) == self.total_buckets
+    assert all(x < y for x, y in zip(
+        self._lower_bounds, self._lower_bounds[1:])), (
+        'bucket boundaries must be monotonically increasing')
 
-    previous = 0
-    for i in xrange(self.num_finite_buckets):
-      lower_bound = self.width * (i + 1)
-      if self.growth_factor != 0:
-        lower_bound += self.growth_factor ** i
+  def _linear_bounds(self):
+    return [self.width * i for i in xrange(self.num_finite_buckets + 1)]
 
-      if lower_bound <= previous:
-        raise ValueError('bucket boundaries must be monotonically increasing')
-      yield lower_bound
-      previous = lower_bound
+  def _exponential_bounds(self):
+    return [
+        self.scale * self.growth_factor ** i
+        for i in xrange(self.num_finite_buckets + 1)]
 
   def bucket_for_value(self, value):
     """Returns the index of the bucket that this value belongs to."""
@@ -75,35 +100,18 @@ class Bucketer(object):
       return (self._lower_bounds[bucket], float('Inf'))
     return (self._lower_bounds[bucket], self._lower_bounds[bucket + 1])
 
-  def all_bucket_boundaries(self):
-    """Generator that produces the [lower, upper) bounds of all buckets.
-
-    This is equivalent to calling::
-
-      (b.bucket_boundaries(i) for i in xrange(b.total_buckets))
-
-    but is more efficient.
-    """
-
-    lower = self._lower_bounds[0]
-    for i in xrange(1, self.total_buckets):
-      upper = self._lower_bounds[i]
-      yield (lower, upper)
-      lower = upper
-
-    yield (lower, float('Inf'))
-
 
 def FixedWidthBucketer(width, num_finite_buckets=100):
   """Convenience function that returns a fixed width Bucketer."""
-  return Bucketer(width=width, growth_factor=0.0,
+  return _Bucketer(width=width, growth_factor=0.0,
       num_finite_buckets=num_finite_buckets)
 
 
-def GeometricBucketer(growth_factor=10**0.2, num_finite_buckets=100):
+def GeometricBucketer(growth_factor=10**0.2, num_finite_buckets=100,
+                      scale=1.0):
   """Convenience function that returns a geometric progression Bucketer."""
-  return Bucketer(width=0, growth_factor=growth_factor,
-      num_finite_buckets=num_finite_buckets)
+  return _Bucketer(width=0, growth_factor=growth_factor,
+      num_finite_buckets=num_finite_buckets, scale=scale)
 
 
 class Distribution(object):