Merge pull request #86 from esc/fix/new_blocksize

default blocksize has changed in blosc
Blosc · Oct 30, 2018 · 3e1cdeb · 3e1cdeb
2 parents b273d36 + 69a9e7e
commit 3e1cdeb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/test_cmdline/test_codec.cram b/test_cmdline/test_codec.cram
@@ -86,9 +86,9 @@ Try using an alternative codec ('lz4' should be available):
   blpk: 'offsets':
   blpk: \[13496,[1-9]\d*,[1-9]\d*,[1-9]\d*,[1-9]\d*,...\] (re)
   blpk: First chunk blosc header:
-  blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 49), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 131072), ('ctbytes', 174045)])
+  blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 33), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 524288), ('ctbytes', 134215)])
   blpk: First chunk blosc flags: 
-  blpk: OrderedDict([('byte_shuffle', True), ('pure_memcpy', False), ('bit_shuffle', False), ('split_blocks', True), ('codec', 'lz4')])
+  blpk: OrderedDict([('byte_shuffle', True), ('pure_memcpy', False), ('bit_shuffle', False), ('split_blocks', False), ('codec', 'lz4')])
   $ rm data.dat.blp
 
 Try using an  codec that is not available:

diff --git a/test_cmdline/test_info.cram b/test_cmdline/test_info.cram
@@ -30,7 +30,7 @@ Get some info on the file:
   blpk: 'offsets':
   blpk: \[13496,[1-9]\d*,[1-9]\d*,[1-9]\d*,[1-9]\d*,...\] (re)
   blpk: First chunk blosc header:
-  blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 1), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 131072), ('ctbytes', 248901)])
+  blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 1), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 524288), ('ctbytes', 191870)])
   blpk: First chunk blosc flags: 
   blpk: OrderedDict([('byte_shuffle', True), ('pure_memcpy', False), ('bit_shuffle', False), ('split_blocks', False), ('codec', 'blosclz')])
   $ blpk i data.dat.blp
@@ -47,7 +47,7 @@ Get some info on the file:
   blpk: 'offsets':
   blpk: \[13496,[1-9]\d*,[1-9]\d*,[1-9]\d*,[1-9]\d*,...\] (re)
   blpk: First chunk blosc header:
-  blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 1), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 131072), ('ctbytes', 248901)])
+  blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 1), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 524288), ('ctbytes', 191870)])
   blpk: First chunk blosc flags: 
   blpk: OrderedDict([('byte_shuffle', True), ('pure_memcpy', False), ('bit_shuffle', False), ('split_blocks', False), ('codec', 'blosclz')])
   $ rm data.dat.blp

diff --git a/test_cmdline/test_metadata.cram b/test_cmdline/test_metadata.cram
@@ -39,7 +39,7 @@ Add metadata to the file:
   blpk:     meta_comp_size: 6[2-5]\.0B \(6[2-5]B\) (re)
   blpk:     user_codec: b?'' (re)
   blpk: First chunk blosc header:
-  blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 1), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 131072), ('ctbytes', 248901)])
+  blpk: OrderedDict([('version', 2), ('versionlz', 1), ('flags', 1), ('typesize', 8), ('nbytes', 1048576), ('blocksize', 524288), ('ctbytes', 191870)])
   blpk: First chunk blosc flags: 
   blpk: OrderedDict([('byte_shuffle', True), ('pure_memcpy', False), ('bit_shuffle', False), ('split_blocks', False), ('codec', 'blosclz')])
   $ blpk decompress data.dat.blp data.dat.dcmp

diff --git a/test_cmdline/test_verbose_debug.cram b/test_cmdline/test_verbose_debug.cram
@@ -286,19 +286,19 @@ Try using --debug with metadata:
   blpk: read compressed metadata of size: '6[2-5]' (re)
   blpk: Read raw offsets: b?'.*' (re)
   blpk: Offsets: \[1100, [1-9]\d*, [1-9]\d*, [1-9]\d*\] (re)
-  blpk: blosc_header: OrderedDict\(\[\('version', 2\), \('versionlz', 1\), \('flags', 1\), \('typesize', 8\), \('nbytes', 52428800\), \('blocksize', 131072\), \('ctbytes', [1-9]\d*\)\]\) (re)
+  blpk: blosc_header: OrderedDict\(\[\('version', 2\), \('versionlz', 1\), \('flags', 1\), \('typesize', 8\), \('nbytes', 52428800\), \('blocksize', [1-9]\d*\), \('ctbytes', [1-9]\d*\)\]\) (re)
   blpk: decompressing chunk '0'
   blpk: checksum OK \(adler32\)\: .* (re)
   blpk: chunk handled, in: [1-9]\d*\.[1-9]\d*M \([1-9]\d*B\) out: 50\.0M \(52428800B\) (re)
-  blpk: blosc_header: OrderedDict\(\[\('version', 2\), \('versionlz', 1\), \('flags', 1\), \('typesize', 8\), \('nbytes', 52428800\), \('blocksize', 131072\), \('ctbytes', [1-9]\d*\)\]\) (re)
+  blpk: blosc_header: OrderedDict\(\[\('version', 2\), \('versionlz', 1\), \('flags', 1\), \('typesize', 8\), \('nbytes', 52428800\), \('blocksize', [1-9]\d*\), \('ctbytes', [1-9]\d*\)\]\) (re)
   blpk: decompressing chunk '1'
   blpk: checksum OK \(adler32\)\: .* (re)
   blpk: chunk handled, in: [1-9]\d*\.[1-9]\d*M \([1-9]\d*B\) out: 50\.0M \(52428800B\) (re)
-  blpk: blosc_header: OrderedDict\(\[\('version', 2\), \('versionlz', 1\), \('flags', 1\), \('typesize', 8\), \('nbytes', 52428800\), \('blocksize', 131072\), \('ctbytes', [1-9]\d*\)\]\) (re)
+  blpk: blosc_header: OrderedDict\(\[\('version', 2\), \('versionlz', 1\), \('flags', 1\), \('typesize', 8\), \('nbytes', 52428800\), \('blocksize', [1-9]\d*\), \('ctbytes', [1-9]\d*\)\]\) (re)
   blpk: decompressing chunk '2'
   blpk: checksum OK \(adler32\)\: .* (re)
   blpk: chunk handled, in: [1-9]\d*\.[1-9]\d*M \([1-9]\d*B\) out: 50\.0M \(52428800B\) (re)
-  blpk: blosc_header: OrderedDict\(\[\('version', 2\), \('versionlz', 1\), \('flags', 1\), \('typesize', 8\), \('nbytes', 2713600\), \('blocksize', 131072\), \('ctbytes', [1-9]\d*\)\]\) (re)
+  blpk: blosc_header: OrderedDict\(\[\('version', 2\), \('versionlz', 1\), \('flags', 1\), \('typesize', 8\), \('nbytes', 2713600\), \('blocksize', [1-9]\d*\), \('ctbytes', [1-9]\d*\)\]\) (re)
   blpk: decompressing chunk '3' (last)
   blpk: checksum OK \(adler32\)\: .* (re)
   blpk: chunk handled, in: [1-9]\d*\.[1-9]\d*K \([1-9]\d*B\) out: 2\.59M \(2713600B\) (re)