From b3c5b176c27e948d86f42b75ffe584f9b1c07752 Mon Sep 17 00:00:00 2001
From: Ruonan Wang <jason.ruonan.wang@gmail.com>
Date: Thu, 20 Apr 2017 22:58:08 -0400
Subject: [PATCH] minor fix for json keys
---
source/dataman/DataMan.cpp | 5 ++++-
source/dataman/DataManBase.cpp | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/source/dataman/DataMan.cpp b/source/dataman/DataMan.cpp
index 5d8f446a4..9e2b237bf 100644
--- a/source/dataman/DataMan.cpp
+++ b/source/dataman/DataMan.cpp
@@ -61,7 +61,10 @@ void DataMan::add_stream(json p_jmsg)
man->init(p_jmsg);
this->add_next(method, man);
}
- add_man_to_path("zfp", method);
+ if (p_jmsg["compress_method"] != nullptr)
+ {
+ add_man_to_path(p_jmsg["compress_method"], method);
+ }
}
void DataMan::flush() { flush_next(); }
diff --git a/source/dataman/DataManBase.cpp b/source/dataman/DataManBase.cpp
index feb55a86b..b7ab68271 100644
--- a/source/dataman/DataManBase.cpp
+++ b/source/dataman/DataManBase.cpp
@@ -152,8 +152,10 @@ int DataManBase::put_end(const void *p_data, json &p_jmsg)
m_profiling["manager_mbs"] =
m_profiling["total_mb"].get<double>() /
m_profiling["total_manager_time"].get<double>();
- if (p_jmsg["compressed_size"] != nullptr)
+ if (p_jmsg["compressed_size"].is_number())
p_jmsg["putbytes"] = p_jmsg["compressed_size"].get<size_t>();
+ else
+ p_jmsg.erase("compressed_size");
put_next(p_data, p_jmsg);
return 0;
}
--
GitLab