modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/migrator/DataMigrator.java
| 8 ++++----
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java
| 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit 506370969183623685a3e7cccb002d4e685bc922
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: Fri May 3 11:10:08 2013 -0500
[BZ 958898] One more update to the queries to use exactly primary indexes created.
Also increase query timeout considerably to avoid timeouts due to longer initial queries.
diff --git
a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/migrator/DataMigrator.java
b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/migrator/DataMigrator.java
index e1f2e9a..efb91b3 100644
---
a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/migrator/DataMigrator.java
+++
b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/migrator/DataMigrator.java
@@ -66,9 +66,9 @@ public class DataMigrator {
private enum MigrationQuery {
- SELECT_1H_DATA("SELECT schedule_id, time_stamp, value, minvalue, maxvalue
FROM RHQ_MEASUREMENT_DATA_NUM_1H ORDER BY schedule_id"),
- SELECT_6H_DATA("SELECT schedule_id, time_stamp, value, minvalue, maxvalue
FROM RHQ_MEASUREMENT_DATA_NUM_6H ORDER BY schedule_id"),
- SELECT_1D_DATA("SELECT schedule_id, time_stamp, value, minvalue, maxvalue
FROM RHQ_MEASUREMENT_DATA_NUM_1D ORDER BY schedule_id"),
+ SELECT_1H_DATA("SELECT schedule_id, time_stamp, value, minvalue, maxvalue
FROM RHQ_MEASUREMENT_DATA_NUM_1H ORDER BY schedule_id, time_stamp"),
+ SELECT_6H_DATA("SELECT schedule_id, time_stamp, value, minvalue, maxvalue
FROM RHQ_MEASUREMENT_DATA_NUM_6H ORDER BY schedule_id, time_stamp"),
+ SELECT_1D_DATA("SELECT schedule_id, time_stamp, value, minvalue, maxvalue
FROM RHQ_MEASUREMENT_DATA_NUM_1D ORDER BY schedule_id, time_stamp"),
DELETE_1H_DATA("DELETE FROM RHQ_MEASUREMENT_DATA_NUM_1H"),
DELETE_6H_DATA("DELETE FROM RHQ_MEASUREMENT_DATA_NUM_6H"),
@@ -80,7 +80,7 @@ public class DataMigrator {
COUNT_1D_DATA("SELECT COUNT(*) FROM RHQ_MEASUREMENT_DATA_NUM_1D"),
COUNT_RAW("SELECT COUNT(*) FROM %s"),
- SELECT_RAW_DATA("SELECT schedule_id, time_stamp, value FROM %s ORDER BY
schedule_id"),
+ SELECT_RAW_DATA("SELECT schedule_id, time_stamp, value FROM %s ORDER BY
schedule_id, time_stamp"),
DELETE_RAW_ALL_DATA("DELETE FROM %s"),
DELETE_RAW_ENTRY("DELETE FROM %s WHERE schedule_id = ?");
diff --git
a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java
b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java
index adcd1c0..db2732d 100644
---
a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java
+++
b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/migrator/DataMigratorRunner.java
@@ -574,6 +574,7 @@ public class DataMigratorRunner {
private EntityManager createEntityManager() throws Exception {
Properties properties = new Properties();
properties.put("javax.persistence.provider",
"org.hibernate.ejb.HibernatePersistence");
+ properties.put("javax.persistence.query.timeout", 400000);
properties.put("hibernate.connection.username", (String)
configuration.get(sqlUserOption));
properties.put("hibernate.connection.password", (String)
configuration.get(sqlPasswordOption));