Skip to content

Commit 094df93

Browse files
committed
segment tracing: fix some silly exceptions when generating trace for nightly vectors indexing
1 parent c53a42d commit 094df93

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

src/python/benchUtil.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
import pickle
2121
import pwd
2222
import re
23+
import shlex
2324
import shutil
2425
import statistics
2526
import subprocess
2627
import sys
2728
import time
2829
import traceback
2930
import types
30-
import shlex
3131
from shutil import which
3232

3333
import common

src/python/infostream_to_segments.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,10 @@ def to_verbose_string(self, global_start_time, global_end_time, with_line_number
238238
else:
239239
s += " (merge: " + " ".join(self.source[1]) + ")"
240240
l.append(s)
241-
md = f" {self.max_doc:,} max_doc"
241+
if self.max_doc is None:
242+
md = " N/A max_doc"
243+
else:
244+
md = f" {self.max_doc:,} max_doc"
242245
if self.size_mb is not None:
243246
md += f" ({self.max_doc / self.size_mb:,.1f} docs/MB)"
244247
l.append(md)
@@ -1034,8 +1037,8 @@ def main():
10341037
if m is not None:
10351038
print(f"got start full flush {line_number}")
10361039
# we should NOT be in the middle of a flush-by-RAM? hmm but what if commit
1037-
# is called when we are ...?
1038-
assert trigger_flush_thread_name is None, f"{trigger_flush_thread_name} on line {line_number}"
1040+
# is called when we are ...? Indeed, nightly benchy tickled this:
1041+
# assert trigger_flush_thread_name is None, f"{trigger_flush_thread_name} on line {line_number}"
10391042
timestamp = parse_timestamp(m.group(1))
10401043
thread_name = m.group(2)
10411044
full_flush_events.append([timestamp, None])

src/python/segments_to_html.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,11 @@ def main():
683683

684684
assert segment.name not in segment_name_to_segment, f"segment name {segment.name} appears twice?"
685685
segment_name_to_segment[segment.name] = segment
686-
label = f"{segment.name}: docs={segment.max_doc:,}"
686+
if segment.max_doc is None:
687+
max_doc_string = "N/A"
688+
else:
689+
max_doc_string = f"{segment.max_doc:,}"
690+
label = f"{segment.name}: docs={max_doc_string}"
687691
if segment.size_mb is not None:
688692
label += f" mb={segment.size_mb:,.1f}"
689693

0 commit comments

Comments
 (0)