increments version number; minor release fixes

Author: looselycoupled

btrdb/stream.py

@@ -20,7 +20,6 @@
 import uuid as uuidlib
 from copy import deepcopy
 from collections.abc import Sequence
-from datetime import timedelta
 
 from btrdb.utils.buffer import PointBuffer
 from btrdb.point import RawPoint, StatPoint
@@ -888,14 +887,12 @@ def count(self):
         params = self._params_from_filters()
         start = params.get("start", MINIMUM_TIME)
         end = params.get("end", MAXIMUM_TIME)
-
-        pointwidth = self.pointwidth if self.pointwidth is not None else 62
         versions = self._pinned_versions if self._pinned_versions else {}
-
         count = 0
+
         for s in self._streams:
             version = versions.get(s.uuid, 0)
-            count += s.count(start, end, pointwidth, version)
+            count += s.count(start, end, version=version)
 
         return count
 

btrdb/version.py

@@ -17,10 +17,10 @@
 
 __version_info__ = {
     'major': 5,
-    'minor': 6,
-    'micro': 1,
+    'minor': 8,
+    'micro': 0,
     'releaselevel': 'final',
-    'serial': 12,
+    'serial': 13,
 }
 
 ##########################################################################

tests/btrdb/test_base.py

@@ -26,7 +26,7 @@
 ## Test Constants
 ##########################################################################
 
-EXPECTED_VERSION = "5.6.1"
+EXPECTED_VERSION = "5.8"
 
 
 ##########################################################################

tests/btrdb/test_stream.py

@@ -593,13 +593,13 @@ def test_count(self):
         endpoint.alignedWindows = Mock(return_value=windows)
         stream = Stream(btrdb=BTrDB(endpoint), uuid=uu)
 
-        assert stream.count() == 26
+        assert stream.count(precise=False, version=0) == 26
         stream._btrdb.ep.alignedWindows.assert_called_once_with(
-            uu, MINIMUM_TIME, MAXIMUM_TIME, 62, 0
+            uu, MINIMUM_TIME, MAXIMUM_TIME, 60, 0
         )
 
-        stream.count(10, 1000, 48, 1200)
-        stream._btrdb.ep.alignedWindows.assert_called_with(uu, 10, 1000, 48, 1200)
+        stream.count(10, 1000, 8, version=1200)
+        stream._btrdb.ep.alignedWindows.assert_called_with(uu, 10, 1000, 8, 1200)
 
 
     ##########################################################################
@@ -1226,8 +1226,8 @@ def test_count(self):
         ])
 
         assert streams.count() == 52
-        endpoint.alignedWindows.assert_any_call(uu1, MINIMUM_TIME, MAXIMUM_TIME, 62, 0)
-        endpoint.alignedWindows.assert_any_call(uu2, MINIMUM_TIME, MAXIMUM_TIME, 62, 0)
+        endpoint.alignedWindows.assert_any_call(uu1, MINIMUM_TIME, MAXIMUM_TIME, 60, 0)
+        endpoint.alignedWindows.assert_any_call(uu2, MINIMUM_TIME, MAXIMUM_TIME, 60, 0)
 
 
     def test_count_filtered(self):
@@ -1242,14 +1242,18 @@ def test_count_filtered(self):
             Stream(btrdb=BTrDB(endpoint), uuid=uu1),
             Stream(btrdb=BTrDB(endpoint), uuid=uu2),
         ])
+        windows = [
+            [(StatPointProto(time=1,min=2,mean=3,max=4,count=5,stddev=6), StatPointProto(time=2,min=3,mean=4,max=5,count=6,stddev=7)), 42],
+            [(StatPointProto(time=3,min=4,mean=5,max=6,count=7,stddev=8), StatPointProto(time=4,min=5,mean=6,max=7,count=8,stddev=9)), 42],
+        ]
+        endpoint.alignedWindows = Mock(return_value=windows)
 
         streams = streams.filter(start=10, end=1000)
         streams.pin_versions({uu1: 42, uu2: 99})
-        streams.pointwidth = 48
 
         streams.count()
-        endpoint.alignedWindows.assert_any_call(uu1, 10, 1000, 48, 42)
-        endpoint.alignedWindows.assert_any_call(uu2, 10, 1000, 48, 99)
+        endpoint.alignedWindows.assert_any_call(uu1, 10, 1000, 8, 42)
+        endpoint.alignedWindows.assert_any_call(uu2, 10, 1000, 8, 99)