.classpath | 1 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1D.java | 11 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1H.java | 7 modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric6H.java | 11 modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigrator.java | 148 ++++++++++ modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java | 22 - modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsTable.java | 22 + modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java | 16 - 8 files changed, 204 insertions(+), 34 deletions(-)
New commits: commit 68e0d2b86b047bd71a3062319fb91dc07ce9faf0 Author: Stefan Negrea snegrea@redhat.com Date: Wed Dec 19 15:38:20 2012 -0600
Initial data migrator work, only aggregate tables included.
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1D.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1D.java index 33cef49..35c958b 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1D.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1D.java @@ -36,14 +36,19 @@ import javax.persistence.Table; * @author Greg Hinkle */ @Entity -@NamedQueries( { @NamedQuery(name = MeasurementDataNumeric1D.GET_NUM_AGGREGATE, query = "SELECT min(nmd.min), avg(nmd.value), max(nmd.max) " - + "FROM MeasurementDataNumeric1D nmd " - + "WHERE nmd.id.scheduleId = :schedId AND nmd.id.timestamp BETWEEN :start AND :end") }) +@NamedQueries({ + @NamedQuery(name = MeasurementDataNumeric1D.GET_NUM_AGGREGATE, query = "SELECT min(nmd.min), avg(nmd.value), max(nmd.max) " + + "FROM MeasurementDataNumeric1D nmd " + + "WHERE nmd.id.scheduleId = :schedId AND nmd.id.timestamp BETWEEN :start AND :end"), + @NamedQuery(name = MeasurementDataNumeric1D.QUERY_FIND_ALL, query = "SELECT m From MeasurementDataNumeric1D m"), + @NamedQuery(name = MeasurementDataNumeric1D.QUERY_DELETE_ALL, query = "DELETE FROM MeasurementDataNumeric1D m ") }) @Table(name = "RHQ_MEASUREMENT_DATA_NUM_1D") public class MeasurementDataNumeric1D extends MeasurementData implements Serializable { private static final long serialVersionUID = 1L;
public static final String GET_NUM_AGGREGATE = "MeasurementDataNumeric1D.getNumAggregate"; + public static final String QUERY_FIND_ALL = "MeasurementDataNumeric1D.findAll"; + public static final String QUERY_DELETE_ALL = "MeasurementDataNumeric1D.deleteAll";
@Column(precision = 24, scale = 3) private Double value; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1H.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1H.java index 1b75d3f..6766293 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1H.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric1H.java @@ -36,12 +36,17 @@ import javax.persistence.Table; * @author Greg Hinkle */ @Entity -@NamedQueries( { @NamedQuery(name = MeasurementDataNumeric1H.GET_MAX_TIMESTAMP, query = "SELECT max(nmd.id.timestamp) FROM MeasurementDataNumeric1H nmd") }) +@NamedQueries({ + @NamedQuery(name = MeasurementDataNumeric1H.GET_MAX_TIMESTAMP, query = "SELECT max(nmd.id.timestamp) FROM MeasurementDataNumeric1H nmd"), + @NamedQuery(name = MeasurementDataNumeric1H.QUERY_FIND_ALL, query = "SELECT m From MeasurementDataNumeric1H m"), + @NamedQuery(name = MeasurementDataNumeric1H.QUERY_DELETE_ALL, query = "DELETE FROM MeasurementDataNumeric1D m ") }) @Table(name = "RHQ_MEASUREMENT_DATA_NUM_1H") public class MeasurementDataNumeric1H extends MeasurementData implements Serializable { private static final long serialVersionUID = 1L;
public static final String GET_MAX_TIMESTAMP = "MeasurementDataNumeric1H.getMaxTimestamp"; + public static final String QUERY_FIND_ALL = "MeasurementDataNumeric1H.findAll"; + public static final String QUERY_DELETE_ALL = "MeasurementDataNumeric1H.deleteAll";
@Column(precision = 24, scale = 3) private Double value; diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric6H.java b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric6H.java index 366d21f..75f3aed 100644 --- a/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric6H.java +++ b/modules/core/domain/src/main/java/org/rhq/core/domain/measurement/MeasurementDataNumeric6H.java @@ -36,14 +36,19 @@ import javax.persistence.Table; * @author Greg Hinkle */ @Entity -@NamedQueries( { @NamedQuery(name = MeasurementDataNumeric6H.GET_NUM_AGGREGATE, query = "SELECT min(nmd.min), avg(nmd.value), max(nmd.max) " - + "FROM MeasurementDataNumeric6H nmd " - + "WHERE nmd.id.scheduleId = :schedId AND nmd.id.timestamp BETWEEN :start AND :end") }) +@NamedQueries({ + @NamedQuery(name = MeasurementDataNumeric6H.GET_NUM_AGGREGATE, query = "SELECT min(nmd.min), avg(nmd.value), max(nmd.max) " + + "FROM MeasurementDataNumeric6H nmd " + + "WHERE nmd.id.scheduleId = :schedId AND nmd.id.timestamp BETWEEN :start AND :end"), + @NamedQuery(name = MeasurementDataNumeric6H.QUERY_FIND_ALL, query = "SELECT m From MeasurementDataNumeric6H m"), + @NamedQuery(name = MeasurementDataNumeric6H.QUERY_DELETE_ALL, query = "DELETE FROM MeasurementDataNumeric6H m ") }) @Table(name = "RHQ_MEASUREMENT_DATA_NUM_6H") public class MeasurementDataNumeric6H extends MeasurementData implements Serializable { private static final long serialVersionUID = 1L;
public static final String GET_NUM_AGGREGATE = "MeasurementDataNumeric6H.getNumAggregate"; + public static final String QUERY_FIND_ALL = "MeasurementDataNumeric6H.findAll"; + public static final String QUERY_DELETE_ALL = "MeasurementDataNumeric6H.deleteAll";
@Column(precision = 24, scale = 3) private Double value; diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigrator.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigrator.java new file mode 100644 index 0000000..c783f93 --- /dev/null +++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigrator.java @@ -0,0 +1,148 @@ +/* + * RHQ Management Platform + * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.server.metrics; + +import java.util.Date; +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.Query; + +import com.datastax.driver.core.BoundStatement; +import com.datastax.driver.core.PreparedStatement; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.exceptions.NoHostAvailableException; + +import org.rhq.core.domain.measurement.MeasurementDataNumeric1D; +import org.rhq.core.domain.measurement.MeasurementDataNumeric1H; +import org.rhq.core.domain.measurement.MeasurementDataNumeric6H; + +/** + * @author Stefan Negrea + * + */ +public class DataMigrator { + + private final EntityManager entityManager; + + private Session session; + + public DataMigrator(EntityManager entityManager, Session session) { + this.entityManager = entityManager; + this.session = session; + } + + public void migrateData() { + + migrateRawData(); + migrateOneHourData(); + migrateSixHourData(); + migrateTwentyFourHourData(); + + clearAllData(); + } + + private void migrateRawData() { + + } + + @SuppressWarnings("unchecked") + private void migrateOneHourData() { + Query q = this.entityManager.createNamedQuery(MeasurementDataNumeric1H.QUERY_FIND_ALL); + List<MeasurementDataNumeric1H> existingData = q.getResultList(); + + try { + PreparedStatement statement = createPreparedStatement(MetricsTable.ONE_HOUR); + + for (MeasurementDataNumeric1H measurement : existingData) { + insertData(statement, measurement.getScheduleId(), measurement.getMin(), measurement.getMax(), + Double.parseDouble(measurement.getValue().toString()), measurement.getTimestamp()); + } + } catch (NoHostAvailableException e) { + throw new CQLException(e); + } + } + + @SuppressWarnings("unchecked") + private void migrateSixHourData() { + Query q = this.entityManager.createNamedQuery(MeasurementDataNumeric6H.QUERY_FIND_ALL); + List<MeasurementDataNumeric6H> existingData = q.getResultList(); + + try { + PreparedStatement statement = createPreparedStatement(MetricsTable.SIX_HOUR); + + for (MeasurementDataNumeric6H measurement : existingData) { + insertData(statement, measurement.getScheduleId(), measurement.getMin(), measurement.getMax(), + Double.parseDouble(measurement.getValue().toString()), measurement.getTimestamp()); + } + } catch (NoHostAvailableException e) { + throw new CQLException(e); + } + } + + private void migrateTwentyFourHourData() { + Query q = this.entityManager.createNamedQuery(MeasurementDataNumeric1D.QUERY_FIND_ALL); + List<MeasurementDataNumeric1D> existingData = q.getResultList(); + + try { + PreparedStatement statement = createPreparedStatement(MetricsTable.TWENTY_FOUR_HOUR); + + for (MeasurementDataNumeric1D measurement : existingData) { + insertData(statement, measurement.getScheduleId(), measurement.getMin(), measurement.getMax(), + Double.parseDouble(measurement.getValue().toString()), measurement.getTimestamp()); + } + } catch (NoHostAvailableException e) { + throw new CQLException(e); + } + } + + private void clearAllData() { + Query q = this.entityManager.createNamedQuery(MeasurementDataNumeric1H.QUERY_DELETE_ALL); + q.executeUpdate(); + + q = this.entityManager.createNamedQuery(MeasurementDataNumeric6H.QUERY_DELETE_ALL); + q.executeUpdate(); + + q = this.entityManager.createNamedQuery(MeasurementDataNumeric1D.QUERY_DELETE_ALL); + q.executeUpdate(); + } + + private PreparedStatement createPreparedStatement(MetricsTable metricsTable) throws NoHostAvailableException { + String cql = "INSERT INTO " + metricsTable + " (schedule_id, time, type, value) VALUES (?, ?, ?, ?) USING TTL " + + metricsTable.getTTL(); + PreparedStatement statement = session.prepare(cql); + return statement; + } + + private void insertData(PreparedStatement statement, int scheduleId, double min, double max, double average, + long timestamp) + throws NoHostAvailableException { + BoundStatement boundStatement = statement.bind(scheduleId, new Date(timestamp), AggregateType.MIN.ordinal(), + min); + session.execute(boundStatement); + + boundStatement = statement.bind(scheduleId, new Date(timestamp), AggregateType.MAX.ordinal(), max); + session.execute(boundStatement); + + boundStatement = statement.bind(scheduleId, new Date(timestamp), AggregateType.AVG.ordinal(), average); + session.execute(boundStatement); + } +}
commit 0f568515957ad84a82b3e71ea42df03f8c186e6a Author: Stefan Negrea snegrea@redhat.com Date: Wed Dec 19 14:19:06 2012 -0600
Update metrics table enum to have default ttl for data.
diff --git a/.classpath b/.classpath index 85d43a0..8ca6ab7 100644 --- a/.classpath +++ b/.classpath @@ -188,6 +188,7 @@ <classpathentry kind="src" path="modules/enterprise/server/server-metrics/src/main/java"/> <classpathentry kind="src" path="modules/common/cassandra-common-itests/src/main/java"/> <classpathentry kind="src" path="modules/enterprise/server/server-metrics/src/test/java"/> + <classpathentry kind="src" path="modules/common/cassandra-schema/src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.SP1/jboss-profileservice-spi-5.1.0.SP1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.1.GA/jboss-managed-2.1.1.GA.jar"/> diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java index 3772933..631539d 100644 --- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java +++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java @@ -26,7 +26,6 @@ package org.rhq.server.metrics;
import static org.rhq.core.domain.util.PageOrdering.DESC; -import static org.rhq.server.metrics.DateTimeService.TWO_WEEKS;
import java.math.BigDecimal; import java.math.MathContext; @@ -42,7 +41,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.DateTime; import org.joda.time.DateTimeComparator; -import org.joda.time.Days; import org.joda.time.Hours; import org.joda.time.Minutes;
@@ -56,8 +54,6 @@ public class MetricsServer {
private static final int DEFAULT_PAGE_SIZE = 200;
- public static int RAW_TTL = Days.days(7).toStandardSeconds().getSeconds(); - private final Log log = LogFactory.getLog(MetricsServer.class);
private DateTimeService dateTimeService = new DateTimeService(); @@ -192,7 +188,7 @@ public class MetricsServer { }
public void addNumericData(Set<MeasurementDataNumeric> dataSet) { - Set<MeasurementDataNumeric> updates = dao.insertRawMetrics(dataSet, RAW_TTL); + Set<MeasurementDataNumeric> updates = dao.insertRawMetrics(dataSet, MetricsTable.RAW.getTTL()); updateMetricsIndex(updates); }
@@ -227,15 +223,14 @@ public class MetricsServer { updateMetricsIndex(MetricsTable.SIX_HOUR, updatedSchedules, Minutes.minutes(60 * 6)); }
- updatedSchedules = calculateAggregates(MetricsTable.ONE_HOUR, MetricsTable.SIX_HOUR, Minutes.minutes(60 * 6), - DateTimeService.ONE_MONTH); + updatedSchedules = calculateAggregates(MetricsTable.ONE_HOUR, MetricsTable.SIX_HOUR, Minutes.minutes(60 * 6)); if (!updatedSchedules.isEmpty()) { dao.deleteMetricsIndexEntries(MetricsTable.SIX_HOUR); updateMetricsIndex(MetricsTable.TWENTY_FOUR_HOUR, updatedSchedules, Hours.hours(24).toStandardMinutes()); }
- updatedSchedules = calculateAggregates(MetricsTable.SIX_HOUR, MetricsTable.TWENTY_FOUR_HOUR, - Hours.hours(24).toStandardMinutes(), DateTimeService.ONE_YEAR); + updatedSchedules = calculateAggregates(MetricsTable.SIX_HOUR, MetricsTable.TWENTY_FOUR_HOUR, Hours.hours(24) + .toStandardMinutes()); if (!updatedSchedules.isEmpty()) { dao.deleteMetricsIndexEntries(MetricsTable.TWENTY_FOUR_HOUR); } @@ -264,8 +259,8 @@ public class MetricsServer { oneHourMetrics.add(aggregatedRaw); }
- List<AggregatedNumericMetric> updatedSchedules = dao.insertAggregates(MetricsTable.ONE_HOUR, - oneHourMetrics, TWO_WEEKS); + List<AggregatedNumericMetric> updatedSchedules = dao.insertAggregates(MetricsTable.ONE_HOUR, oneHourMetrics, + MetricsTable.ONE_HOUR.getTTL()); return updatedSchedules; }
@@ -298,7 +293,7 @@ public class MetricsServer { }
private List<AggregatedNumericMetric> calculateAggregates(MetricsTable fromColumnFamily, - MetricsTable toColumnFamily, Minutes nextInterval, int ttl) { + MetricsTable toColumnFamily, Minutes nextInterval) {
List<MetricsIndexEntry> indexEntries = dao.findMetricsIndexEntries(toColumnFamily); List<AggregatedNumericMetric> toMetrics = new ArrayList<AggregatedNumericMetric>(); @@ -321,7 +316,8 @@ public class MetricsServer { toMetrics.add(aggregatedMetric); }
- List<AggregatedNumericMetric> updatedSchedules = dao.insertAggregates(toColumnFamily, toMetrics, ttl); + List<AggregatedNumericMetric> updatedSchedules = dao.insertAggregates(toColumnFamily, toMetrics, + toColumnFamily.getTTL()); return updatedSchedules; }
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsTable.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsTable.java index abcd196..6bf01ae 100644 --- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsTable.java +++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsTable.java @@ -2,16 +2,26 @@ package org.rhq.server.metrics;
public enum MetricsTable {
- INDEX("metrics_index"), - RAW("raw_metrics"), - ONE_HOUR("one_hour_metrics"), - SIX_HOUR("six_hour_metrics"), - TWENTY_FOUR_HOUR("twenty_four_hour_metrics"); + INDEX("metrics_index", -1), + RAW("raw_metrics", DateTimeService.SEVEN_DAYS), + ONE_HOUR("one_hour_metrics", DateTimeService.TWO_WEEKS), + SIX_HOUR("six_hour_metrics", DateTimeService.ONE_MONTH), + TWENTY_FOUR_HOUR("twenty_four_hour_metrics", DateTimeService.ONE_YEAR);
private final String tableName; + private final int ttl;
- private MetricsTable(String tableName) { + private MetricsTable(String tableName, int ttl) { this.tableName = tableName; + this.ttl = ttl; + } + + public String getTableName() { + return this.tableName; + } + + public int getTTL() { + return this.ttl; }
@Override diff --git a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java index 0c478eb..c3f8eca 100644 --- a/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java +++ b/modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java @@ -27,7 +27,6 @@ package org.rhq.server.metrics;
import static java.util.Arrays.asList; import static org.joda.time.DateTime.now; -import static org.rhq.server.metrics.MetricsServer.RAW_TTL; import static org.rhq.server.metrics.MetricsServer.divide; import static org.rhq.test.AssertUtils.assertCollectionMatchesNoOrder; import static org.rhq.test.AssertUtils.assertPropertiesMatch; @@ -127,7 +126,8 @@ public class MetricsServerTest extends CassandraIntegrationTest { );
assertEquals(actual, expected, "Failed to retrieve raw metric data"); - assertColumnMetadataEquals(scheduleId, hour0.plusHours(4), hour0.plusHours(5), RAW_TTL, timestamp); + assertColumnMetadataEquals(scheduleId, hour0.plusHours(4), hour0.plusHours(5), MetricsTable.RAW.getTTL(), + timestamp);
List<MetricsIndexEntry> expectedIndex = asList(new MetricsIndexEntry(MetricsTable.ONE_HOUR, hour0.plusHours(4), scheduleId)); @@ -189,7 +189,7 @@ public class MetricsServerTest extends CassandraIntegrationTest { rawMetrics.add(new MeasurementDataNumeric(secondMetricTime.getMillis(), scheduleId, secondValue)); rawMetrics.add(new MeasurementDataNumeric(thirdMetricTime.getMillis(), scheduleId, thirdValue));
- Set<MeasurementDataNumeric> insertedRawMetrics = dao.insertRawMetrics(rawMetrics, RAW_TTL); + Set<MeasurementDataNumeric> insertedRawMetrics = dao.insertRawMetrics(rawMetrics, MetricsTable.RAW.getTTL()); metricsServer.updateMetricsIndex(insertedRawMetrics);
metricsServer.setCurrentHour(hour9); @@ -243,7 +243,7 @@ public class MetricsServerTest extends CassandraIntegrationTest { new AggregatedNumericMetric(scheduleId, avg1, min1, max1, hour7.getMillis()), new AggregatedNumericMetric(scheduleId, avg2, min2, max2, hour8.getMillis()) ); - dao.insertAggregates(MetricsTable.ONE_HOUR, oneHourMetrics, DateTimeService.TWO_WEEKS); + dao.insertAggregates(MetricsTable.ONE_HOUR, oneHourMetrics, MetricsTable.ONE_HOUR.getTTL());
// update the 6 hour queue Map<Integer, DateTime> indexUpdates = new HashMap<Integer, DateTime>(); @@ -425,7 +425,7 @@ public class MetricsServerTest extends CassandraIntegrationTest { new AggregatedNumericMetric(scheduleId, 5.0, 4.0, 6.0, bucket59Time.plusHours(1).getMillis()), new AggregatedNumericMetric(scheduleId, 3.0, 3.0, 3.0, bucket59Time.plusHours(2).getMillis()) ); - dao.insertAggregates(MetricsTable.ONE_HOUR, metrics, DateTimeService.TWO_WEEKS); + dao.insertAggregates(MetricsTable.ONE_HOUR, metrics, MetricsTable.ONE_HOUR.getTTL());
AggregatedNumericMetric actual = metricsServer.getSummaryAggregate(scheduleId, beginTime.getMillis(), endTime.getMillis()); @@ -454,7 +454,7 @@ public class MetricsServerTest extends CassandraIntegrationTest { new AggregatedNumericMetric(scheduleId1, 5.1, 5.1, 5.1, bucket59Time.getMillis()), new AggregatedNumericMetric(scheduleId2, 5.2, 5.2, 5.2, bucket59Time.getMillis()) ); - dao.insertAggregates(MetricsTable.ONE_HOUR, metrics, DateTimeService.TWO_WEEKS); + dao.insertAggregates(MetricsTable.ONE_HOUR, metrics, MetricsTable.ONE_HOUR.getTTL());
AggregatedNumericMetric actual = metricsServer.getSummaryAggregate(asList(scheduleId1, scheduleId2), beginTime.getMillis(), endTime.getMillis()); @@ -585,7 +585,7 @@ public class MetricsServerTest extends CassandraIntegrationTest { new AggregatedNumericMetric(scheduleId, 5.0, 4.0, 6.0, bucket59Time.plusHours(1).getMillis()), new AggregatedNumericMetric(scheduleId, 3.0, 3.0, 3.0, bucket59Time.plusHours(2).getMillis()) ); - dao.insertAggregates(MetricsTable.ONE_HOUR, metrics, DateTimeService.TWO_WEEKS); + dao.insertAggregates(MetricsTable.ONE_HOUR, metrics, MetricsTable.ONE_HOUR.getTTL());
List<MeasurementDataNumericHighLowComposite> actualData = metricsServer.findDataForResource(scheduleId, beginTime.getMillis(), endTime.getMillis()); @@ -629,7 +629,7 @@ public class MetricsServerTest extends CassandraIntegrationTest { new AggregatedNumericMetric(scheduleId1, 4.1, 4.1, 4.1, bucket59Time.getMillis()), new AggregatedNumericMetric(scheduleId2, 4.2, 4.2, 4.2, bucket59Time.getMillis()) ); - dao.insertAggregates(MetricsTable.ONE_HOUR, metrics, DateTimeService.TWO_WEEKS); + dao.insertAggregates(MetricsTable.ONE_HOUR, metrics, MetricsTable.ONE_HOUR.getTTL());
List<MeasurementDataNumericHighLowComposite> actual = metricsServer.findDataForGroup( asList(scheduleId1, scheduleId2), beginTime.getMillis(), endTime.getMillis());
rhq-commits@lists.fedorahosted.org