Skip to content

Add check to ensure file index is used correctly #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 14, 2024
Merged

Add check to ensure file index is used correctly #333

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9883974
Add check for when reader is rewinded
wbrannon Aug 14, 2024
57558ee
Set default index element if just starting to read file
wbrannon Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion python/fusion_engine_client/parsers/mixed_log_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,9 @@ def _print_progress(self, file_size=None):
if file_size is None:
file_size = min(self.file_size_bytes, self.max_bytes)

if self.total_bytes_read - self.last_print_bytes > 10e6 or self.total_bytes_read == file_size:
if self.total_bytes_read < self.last_print_bytes or \
self.total_bytes_read - self.last_print_bytes > 10e6 or \
self.total_bytes_read == file_size:
elapsed_sec = (datetime.now() - self.start_time).total_seconds()
self.logger.log(logging.INFO if show_progress else logging.DEBUG,
'Processed %d/%d bytes (%.1f%%). [elapsed=%.1f sec, rate=%.1f MB/s]' %
Expand Down Expand Up @@ -589,6 +591,8 @@ def filter_in_place(self, key, clear_existing: Union[bool, str] = False,
if self.index is not None:
if len(self.index) == 0:
self.next_index_elem = 0
elif prev_offset_bytes < 0:
self.next_index_elem = 0
else:
idx = np.argmax(self.index.offset > prev_offset_bytes)
if idx == 0 and self.index.offset[0] <= prev_offset_bytes:
Expand Down
Loading