modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java
| 27 ----------
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerLocal.java
| 12 ----
2 files changed, 39 deletions(-)
New commits:
commit edfe3bb4565b58800a7c02c0ef6a240bdb7ffeaf
Author: John Sanda <jsanda(a)redhat.com>
Date: Fri May 31 13:53:28 2013 -0400
removing unused method that has been replaced with more granular transaction
demarcation
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java
index c18ff97..6140c4d 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerBean.java
@@ -277,33 +277,6 @@ public class MeasurementBaselineManagerBean implements
MeasurementBaselineManage
}
}
- @SuppressWarnings("unchecked")
- @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
- public int _calculateAutoBaselinesINSERT(long amountOfData) throws Exception {
- long endTime = System.currentTimeMillis();
- long startTime = endTime - amountOfData;
-
- //1. Find dynamic schedule ids that do not have baseline calculated
- Query query = this.entityManager
-
.createNamedQuery(MeasurementBaseline.QUERY_FIND_MEASUREMENT_SCHEDULES_WITHOUT_AUTOBASELINES);
- query.setMaxResults(BASELINE_PROCESSING_LIMIT);
- List<MeasurementSchedule> scheduleIdsWithoutBaselines =
query.getResultList();
-
- //2. calculate the baselines based metrics data
- MetricsBaselineCalculator baselineCalculator = new
MetricsBaselineCalculator(sessionManager.getMetricsDAO());
- List<MeasurementBaseline> results =
baselineCalculator.calculateBaselines(scheduleIdsWithoutBaselines,
- startTime, endTime);
-
- //3. persist all calculated baselines to SQL db
- for (Object result : results) {
- entityManager.persist(result);
- }
- entityManager.flush();
-
- //4. return the number of schedule ids initially retrieved for calculation
- return scheduleIdsWithoutBaselines.size();
- }
-
/**
* If the measurement baselines for the corresponding resources are the same, that
value will be returned;
* otherwise null will be returned
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerLocal.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerLocal.java
index 8781fc5..af6145a 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerLocal.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementBaselineManagerLocal.java
@@ -66,18 +66,6 @@ public interface MeasurementBaselineManagerLocal {
int _calculateAutoBaselinesDELETE(long olderThanTime) throws Exception;
/**
- * Inserts baselines "as appropriate" for measurements that have at least
amountOfData
- * @param amountOfData will use amountOfData to compute new min/max/mean for
baselines as appropriate
- * @return number of rows inserted
- * @deprecated This method is pending removal after peer review. Because 1hr data is
- * now stored in Cassandra, transaction boundaries needed to change. This method has
- * been replaced by {@link #getSchedulesWithoutBaselines()}, {@link
#calculateBaselines(java.util.List, long)},
- * and {@link #saveNewBaselines(java.util.List)}.
- * @throws Exception
- */
- int _calculateAutoBaselinesINSERT(long amountOfData) throws Exception;
-
- /**
* <strong>Note</strong> This method exists only for transaction
demarcation.
*
* @return A list of schedules that do not have baselines. This list is not assumed
Show replies by date