Skip to content

Commit 7fdd9e2

Browse files
committed
float timestamp
1 parent fcbb052 commit 7fdd9e2

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

src/pool/bbpool.py

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ class BBPool(Pool):
3131
# 'key.2': UNIX TIMESTAMP
3232
}
3333

34-
buckets_count = 0
35-
items_count = 0;
34+
buckets_num_total = 0
35+
items_num_total = 0;
3636

3737
prev_time = None
3838
prev_buckets_count = 0
@@ -98,7 +98,7 @@ def flush(self, key=None):
9898
def rotate_belt(self, belt_index, flush=False):
9999
"""Try to rotate belt"""
100100

101-
now = int(time.time())
101+
now = time.time()
102102

103103
if flush:
104104
# explicit flush requested
@@ -129,25 +129,25 @@ def rotate_belt(self, belt_index, flush=False):
129129
# too many buckets on the belt
130130
# time to rotate belt and flush the most-right-bucket
131131

132-
buckets_num = len(self.belts[belt_index])
133-
last_bucket_size = len(self.belts[belt_index][buckets_num-1])
132+
buckets_on_belt_num = len(self.belts[belt_index])
133+
most_right_bucket_size = len(self.belts[belt_index][buckets_on_belt_num-1])
134134

135-
self.buckets_count += 1
136-
self.items_count += last_bucket_size
135+
self.buckets_num_total += 1
136+
self.items_num_total += most_right_bucket_size
137137

138-
logging.info('rot now:%d bktcnt:%d bktcontentcnt: %d index:%s reason:%s bktsonbelt:%d bktsize:%d beltnum:%d',
139-
now,
140-
self.buckets_count,
141-
self.items_count,
142-
str(belt_index),
143-
rotate_reason,
144-
buckets_num,
145-
last_bucket_size,
146-
len(self.belts)
147-
)
138+
logging.info('rot now:%f bktttl:%d bktitemsttl: %d index:%s reason:%s bktsonbelt:%d bktsize:%d beltnum:%d',
139+
now,
140+
self.buckets_num_total,
141+
self.items_num_total,
142+
str(belt_index),
143+
rotate_reason,
144+
buckets_on_belt_num,
145+
most_right_bucket_size,
146+
len(self.belts),
147+
)
148148

149149
# time to flush data for specified key
150-
self.writer_builder.param('csv_file_path_suffix_parts', [str(now), str(self.buckets_count)])
150+
self.writer_builder.param('csv_file_path_suffix_parts', [str(int(now)), str(self.buckets_num_total)])
151151
writer = self.writer_builder.get()
152152
writer.insert(self.belts[belt_index].pop())
153153
writer.close()
@@ -160,8 +160,8 @@ def rotate_belt(self, belt_index, flush=False):
160160
# can calculate belt speed
161161
window_size = now - self.prev_time
162162
if window_size > 0:
163-
buckets_per_sec = (self.buckets_count - self.prev_buckets_count)/window_size
164-
items_per_sec = (self.items_count - self.prev_items_count) / window_size
163+
buckets_per_sec = (self.buckets_num_total - self.prev_buckets_count) / window_size
164+
items_per_sec = (self.items_num_total - self.prev_items_count) / window_size
165165
logging.info(
166166
'PERF - buckets_per_sec:%f items_per_sec:%f for last %d sec',
167167
buckets_per_sec,
@@ -172,8 +172,8 @@ def rotate_belt(self, belt_index, flush=False):
172172
logging.info("PERF - buckets window size=0 can not calc performance for this window")
173173

174174
self.prev_time = now
175-
self.prev_buckets_count = self.buckets_count
176-
self.prev_items_count = self.items_count
175+
self.prev_buckets_count = self.buckets_num_total
176+
self.prev_items_count = self.items_num_total
177177

178178
# belt rotated
179179
return True

0 commit comments

Comments
 (0)