Branch: refs/heads/jsanda/metrics-schema
Home:
https://github.com/rhq-project/rhq
Commit: 087b3ec83a72726726bb067c1192bba38346fa54
https://github.com/rhq-project/rhq/commit/087b3ec83a72726726bb067c1192bba...
Author: John Sanda <jsanda(a)redhat.com>
Date: 2014-03-26 (Wed, 26 Mar 2014)
Changed paths:
M modules/common/cassandra-schema/src/main/resources/schema/update/0002.xml
M
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DateTimeService.java
M
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java
M
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsServer.java
M
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/AggregationManager.java
M
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/Aggregator.java
A
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/PastDataAggregator.java
M
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/aggregation/ProcessBatch.java
M
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/CacheIndexEntryMapper.java
M
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/domain/NumericMetric.java
M
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/AggregationTests.java
M
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/InMemoryMetricsDB.java
M
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsDAOTest.java
M
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsServerTest.java
M
modules/enterprise/server/server-metrics/src/test/java/org/rhq/server/metrics/MetricsTest.java
Log Message:
-----------
adding initial support for aggregating late/past data
There are two main changes in this commit. The first is the initial suppport
for aggregating late data. That is, raw data that is stored after its time
slice has already passed.
The schema for metrics_cache_index is changed slightly as well. We now order by
the time column before the start_schedule_id column. And we are always storing
the day, i.e., hour zero in the time_slice column. This reduces the number of
queries that need to be performed when looking to see if there is past data to
aggregate.
There is still work to do for handling late data along with a bunch of clean
up and refactoring. I am trying to consolidate the logic as much as possible
for aggregating past data and for current data so as to avoid a lot of the code
duplication that is going on right now.