openstack/monasca-thresh
Code Issues Proposed changes

Add support for drizzle jdbc connector

Browse Source 
Mysql jdbc connector returns an Integer when querying period and period.
Drizzle jdbc connector returns a Long. Adding appropriate conversions.

Change-Id: Ie96b10347dbd52b4e0e267f5fbb7cf3d6d6eafff
This commit is contained in:
Roland Hochmuth 2015-09-02 11:58:32 -06:00
parent 9aeec27d13
commit 4334a8e44a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
thresh/src/main/java/monasca/thresh/infrastructure/persistence/AlarmDefinitionDAOImpl.java
View File

@ -22,6 +22,7 @@ import monasca.common.model.alarm.AlarmExpression;
import monasca.common.model.alarm.AlarmOperator;
import monasca.common.model.alarm.AlarmSubExpression;
import monasca.common.model.metric.MetricDefinition;
import monasca.common.util.Conversions;
import monasca.thresh.domain.model.AlarmDefinition;
import monasca.thresh.domain.model.SubExpression;
import monasca.thresh.domain.service.AlarmDefinitionDAO;
@ -84,8 +85,10 @@ public class AlarmDefinitionDAOImpl implements AlarmDefinitionDAO {
String metricName = (String) row.get("metric_name");
AlarmOperator operator = AlarmOperator.fromJson((String) row.get("operator"));
Double threshold = (Double) row.get("threshold");
Integer period = (Integer) row.get("period");
Integer periods = (Integer) row.get("periods");
// MySQL connector returns an Integer, Drizzle returns a Long for period and periods.
// Need to convert the results appropriately based on type.
Integer period = Conversions.variantToInteger(row.get("period"));
Integer periods = Conversions.variantToInteger(row.get("periods"));
Map<String, String> dimensions = new HashMap<>();
while (addedDimension(dimensions, id, rows, index)) {
index++;