make column storage and LDBLOCKs disabled by default

Author: danielhrisca

src/asammdf/blocks/mdf_v4.py

@@ -389,7 +389,15 @@ def __init__(
 
         progress = kwargs.get("progress", None)
 
-        self._column_storage = False
+        if self.version >= "4.20":
+            self._column_storage = kwargs.get("column_storage", False)
+            if self._column_storage:
+                self._use_ld_blocks = True
+            else:
+                self._use_ld_blocks = kwargs.get("use_ld_blocks", False)
+        else:
+            self._column_storage = False
+            self._use_ld_blocks = False
 
         self._units_map = {}
         self._mapped_file = None
@@ -448,11 +456,6 @@ def __init__(
             self.identification = FileIdentificationBlock(version=version)
             self.version: str = version
 
-            if self.version >= "4.20":
-                self._column_storage = kwargs.get("column_storage", False)
-            else:
-                self._column_storage = False
-
             self.name = Path("__new__.mf4")
 
         self._parent: MDF | None = None
@@ -529,6 +532,7 @@ def _read(
 
         if self.version >= "4.20":
             self._column_storage = self._kwargs.get("column_storage", False)
+
         else:
             self._column_storage = False
 
@@ -4082,7 +4086,7 @@ def append(
                 np.packbits(array(invalidation_bits_list).T).reshape((cycles_nr, invalidation_bytes_nr))
             ).ravel()
 
-            if self.version < "4.20":
+            if not self._use_ld_blocks:
                 fields.append((bytes_array, invalidation_bytes_nr))
 
             for ch in gp.channels:
@@ -4107,7 +4111,6 @@ def append(
         # data group
         gp.sorted = True
 
-
         data_block = data_block_from_arrays(fields, cycles_nr, THREAD_COUNT)
         size = len(data_block)
         data_block_view = memoryview(data_block)
@@ -4117,7 +4120,7 @@ def append(
         record_size = offset + invalidation_bytes_nr
 
         if size:
-            if self.version < "4.20":
+            if not self._use_ld_blocks:
                 block_size = 32 * 1024 * 1024 // record_size * record_size
 
                 count = ceil(size / block_size)
@@ -6537,7 +6540,7 @@ def extend(self, index: int, signals: Sequence[tuple[NDArray[Any], NDArray[np.bo
                 np.packbits(array(inval_bits).T).reshape((cycles_nr, invalidation_bytes_nr))
             ).ravel()
 
-            if self.version < "4.20":
+            if not self._use_ld_blocks:
                 fields.append((inval_bits_vals, invalidation_bytes_nr))
 
         samples_bytes = data_block_from_arrays(fields, added_cycles, THREAD_COUNT)
@@ -6552,7 +6555,7 @@ def extend(self, index: int, signals: Sequence[tuple[NDArray[Any], NDArray[np.bo
         record_size = gp.channel_group.samples_byte_nr + gp.channel_group.invalidation_bytes_nr
 
         if size:
-            if self.version < "4.20":
+            if not self._use_ld_blocks:
                 block_size = 32 * 1024 * 1024 // record_size * record_size
 
                 count = ceil(size / block_size)
@@ -6582,7 +6585,7 @@ def extend(self, index: int, signals: Sequence[tuple[NDArray[Any], NDArray[np.bo
 
             else:
                 raw_size = size
-                data = lz_compress(samples, store_size=True)
+                data = lz_compress(samples_bytes, store_size=True)
                 size = len(data)
                 stream.write(data)
 

src/asammdf/blocks/utils.py

@@ -2054,9 +2054,9 @@ def writelines(self, lines):
                 return os.write(self.file, line)
 
 
-def validate_blocks(blocks: list[SignalDataBlockInfo], record_size: int) -> bool:
+def validate_blocks(blocks: list[DataBlockInfo], record_size: int) -> bool:
     for block in blocks:
-        if block.original_size % record_size:
+        if block.original_size % record_size or block.invalidation_block is not None:
             return False
 
     return True