From 0dd0de3efaa62a78fae4684e6eed9caf30717429 Mon Sep 17 00:00:00 2001
From: Theodore Chang <tlcfem@gmail.com>
Date: Fri, 4 Apr 2025 03:02:13 +0200
Subject: [PATCH 1/2] Disable use of blocked TOC in storage module
---
nomad/archive/storage.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/nomad/archive/storage.py b/nomad/archive/storage.py
index 29102e1eae..086a1baaf2 100644
--- a/nomad/archive/storage.py
+++ b/nomad/archive/storage.py
@@ -329,6 +329,8 @@ def read_archive(file_or_path: str | BytesIO, **kwargs) -> ArchiveReader:
from .storage_v2 import ArchiveReader as ArchiveReaderNew
from .storage_v2 import ArchiveWriter as ArchiveWriterNew
+ kwargs['use_blocked_toc'] = False
+
# todo: replace implementation to enable automatic conversion
# if isinstance(file_or_path, str):
# from nomad.archive.converter import convert_archive
--
GitLab
From dabb74b055cff0678753da0cc63db7ce5cc3e088 Mon Sep 17 00:00:00 2001
From: Theodore Chang <tlcfem@gmail.com>
Date: Fri, 4 Apr 2025 03:49:00 +0200
Subject: [PATCH 2/2] Comment out blocked TOC assertions in archive tests
---
tests/archive/test_archive.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/archive/test_archive.py b/tests/archive/test_archive.py
index 0c35c9b5b0..b69d8c3af1 100644
--- a/tests/archive/test_archive.py
+++ b/tests/archive/test_archive.py
@@ -204,13 +204,13 @@ def test_read_archive_multi(monkeypatch, example_uuid, example_entry, use_blocke
f = BytesIO(packed_archive)
with read_archive(f, use_blocked_toc=use_blocked_toc) as reader:
- if use_blocked_toc:
- reader._load_toc_block(0)
- assert reader._toc.get(create_example_uuid(0)) is not None
- assert len(reader._toc) == _entries_per_block
- reader._load_toc_block(archive_size - 1)
- assert reader._toc.get(create_example_uuid(archive_size - 1)) is not None
- assert len(reader._toc) > _entries_per_block
+ # if use_blocked_toc:
+ # reader._load_toc_block(0)
+ # assert reader._toc.get(create_example_uuid(0)) is not None
+ # assert len(reader._toc) == _entries_per_block
+ # reader._load_toc_block(archive_size - 1)
+ # assert reader._toc.get(create_example_uuid(archive_size - 1)) is not None
+ # assert len(reader._toc) > _entries_per_block
for i in range(0, archive_size):
reader.get(create_example_uuid(i)) is not None
--
GitLab