From f88f71c51fbde5840c5038955dd655a08e2395b1 Mon Sep 17 00:00:00 2001 From: Deklan Dieterly Date: Tue, 13 Oct 2015 17:05:03 -0600 Subject: [PATCH] Store {} when value_meta is empty Always store {} when value_meta is empty for Influxdb. Needed because the Java Influxdb driver is capable of storing an empty string, but the Python Influxdb driver is not. Change-Id: Id6b7b795454afc1a4ab2e6230c6a9d3bd94790f7 --- .../persister/repository/influxdb/InfluxV9MetricRepo.java | 4 ++-- monasca_persister/persister.py | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9MetricRepo.java b/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9MetricRepo.java index 2435306b..9aeb16b4 100644 --- a/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9MetricRepo.java +++ b/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9MetricRepo.java @@ -95,9 +95,9 @@ public class InfluxV9MetricRepo extends InfluxMetricRepo { String valueMetaJSONString = measurement.getValueMetaJSONString(); - if (valueMetaJSONString == null) { + if (valueMetaJSONString == null || valueMetaJSONString.isEmpty()) { - valueMap.put("value_meta", ""); + valueMap.put("value_meta", "{}"); } else { diff --git a/monasca_persister/persister.py b/monasca_persister/persister.py index c1aecd54..2dd23305 100644 --- a/monasca_persister/persister.py +++ b/monasca_persister/persister.py @@ -517,7 +517,7 @@ class MetricPersister(AbstractPersister): else: - value_meta = '' + value_meta = {} LOG.debug('value_meta: %s', value_meta) @@ -533,8 +533,7 @@ class MetricPersister(AbstractPersister): "fields": { "value": value, "value_meta": json.dumps(value_meta, - ensure_ascii=False).encode( - 'utf8') if value_meta else value_meta.encode('utf8') + ensure_ascii=False).encode('utf8') }, "tags": tags}