aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base/data_set.py
diff options
context:
space:
mode:
authorAlexander Kabui2021-11-23 14:13:25 +0300
committerAlexander Kabui2021-11-23 14:13:25 +0300
commitbda4e460667909d47fd3a167391ca6fbe34cd61b (patch)
tree6d7c21869e2783073446d674958e3cbaf40d7801 /wqflask/base/data_set.py
parentaa9a06d927bdc2b5221e58559f24921a0ff72cd8 (diff)
parentfcfd7be522ce914b0aa11cd4555aeab2d2141428 (diff)
downloadgenenetwork2-bda4e460667909d47fd3a167391ca6fbe34cd61b.tar.gz
resolve merge conflicts
Diffstat (limited to 'wqflask/base/data_set.py')
-rw-r--r--wqflask/base/data_set.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 4d75e7ee..49ece9dd 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -757,6 +757,7 @@ class DataSet:
# Postgres doesn't have that limit, so we can get rid of this after we transition
chunk_size = 50
number_chunks = int(math.ceil(len(sample_ids) / chunk_size))
+
cached_results = fetch_cached_results(self.name, self.type)
if cached_results is None:
trait_sample_data = []
@@ -814,7 +815,6 @@ class DataSet:
cache_dataset_results(
self.name, self.type, self.trait_data)
-
else:
self.trait_data = cached_results