parameter hash_dir for FileStorage

sbench/file_storage.py

@@ -25,14 +25,12 @@ class FileStorage(Storage):
 
     def _get_dir(self, run: 'Run') -> str:
         sub_dirs = list(run.assign.values())
-        if not self.hash_dir:
-            result = os.path.join(*sub_dirs)
-        else:
+        if self.hash_dir:
             hval = hashlib.sha256(
                 ';'.join(sub_dirs).encode('utf-8')
             ).hexdigest()
-            result = os.path.join(hval[:2], hval[2:4], hval[4:])
-        return result
+            sub_dirs = [hval[:2], hval[2:4], hval[4:]]
+        return os.path.join(self.bench.get_dir(), 'runs', *sub_dirs)
 
     def _get_mdata_file(self, run: 'Run') -> str:
         return os.path.join(self._get_dir(run), '_mdata.json')

sbench/test_sbench.py

@@ -39,7 +39,8 @@ def mk_test_ls_benchmark() -> Benchmark:
             "recursive == 'recursive' => dir != 'tmp'"
         ],
         "storage": {
-            "type": "file"
+            "type": "file",
+            "hash_dir": True
         }
     })