modules/core/dbutils/pom.xml | 12 -
modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml | 10
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 110 +++++-----
3 files changed, 74 insertions(+), 58 deletions(-)
New commits:
commit ec2e38d1704d1eafd6b3349acfe66f10aff322d7
Merge: 1d53a6b... 533337f...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Jun 29 20:24:15 2010 +0200
Merge branch 'release-3.0.0' of
ssh://git.fedorahosted.org/git/rhq/rhq into
release-3.0.0
commit 1d53a6b65e5d51456c57728c9d07bb36093df7b0
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Tue Jun 29 20:23:00 2010 +0200
BZ 560803 add index on measurement_def.numeric_type
BZ 535686 add index on call time value.end_time to speed up purges
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 92ae1d2..d536ce6 100644
--- a/modules/core/dbutils/pom.xml
+++ b/modules/core/dbutils/pom.xml
@@ -22,7 +22,7 @@
<properties>
<scm.module.path>modules/core/dbutils/</scm.module.path>
- <db.schema.version>2.87</db.schema.version>
+ <db.schema.version>2.88</db.schema.version>
</properties>
<dependencies>
@@ -95,9 +95,9 @@
db = project.properties.db
if (db == 'dev') {
- database = project.properties['rhq.dev.ds.db-name']
- }
- // This is a bit of a temporary hack to work around
+ database = project.properties['rhq.dev.ds.db-name']
+ }
+ // This is a bit of a temporary hack to work around
//
https://cvs.codehaus.org/browse/GMAVEN-46 which results in
// groovy scripts not being able to get the correct values of
// build properties that are overridden on the command line.
@@ -105,7 +105,7 @@
// trying to use a database named rhqupgrade.
else if (project.properties['upgrade.db']) {
database = 'rhqupgrade'
- }
+ }
else {
database = project.properties['rhq.test.ds.db-name']
}
@@ -275,7 +275,7 @@
<goal>run</goal>
</goals>
</execution>
-
+
<execution>
<!--
This execution will abort the build if the database schema is not up to
date.
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml
b/modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml
index 38c759c..8108cb9 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup/measurement-schema.xml
@@ -34,6 +34,9 @@
<field ref="NAME"/>
<field ref="RAW_NUMERIC_TYPE"/>
</index>
+ <index name="RHQ_METRIC_DEF_NT_IDX">
+ <field ref="NUMERIC_TYPE"/>
+ </index>
</table>
@@ -86,7 +89,7 @@
<field ref="TIME_STAMP"/>
</primaryKey>
</constraint>
-
+
<index name="RHQ_MEAS_DATA_1H_TIME_IDX">
<field ref="TIME_STAMP"/>
</index>
@@ -108,7 +111,7 @@
<field ref="TIME_STAMP"/>
</primaryKey>
</constraint>
-
+
<index name="RHQ_MEAS_DATA_6H_TIME_IDX">
<field ref="TIME_STAMP"/>
</index>
@@ -166,6 +169,9 @@
<column name="MAXIMUM" type="DOUBLE"
required="true"/>
<column name="TOTAL" type="DOUBLE"
required="true"/>
<column name="COUNT" type="LONG"
required="true"/>
+ <index name="RHQ_CT_DA_VA_END_TIM_IDX">
+ <field ref="END_TIME"/>
+ </index>
</table>
diff --git a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
index 1d3bd04..daf68f4 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -17,13 +17,13 @@
Update Version: ${target.schema.version}
</echo>
- <dbupgrade jdbcUrl="${jdbc.url}"
- jdbcUser="${jdbc.user}"
- jdbcPassword="${jdbc.password}"
+ <dbupgrade jdbcUrl="${jdbc.url}"
+ jdbcUser="${jdbc.user}"
+ jdbcPassword="${jdbc.password}"
valueColumn="PROPERTY_VALUE"
- table="RHQ_SYSTEM_CONFIG"
- keyColumn="PROPERTY_KEY"
- keyMatch="DB_SCHEMA_VERSION"
+ table="RHQ_SYSTEM_CONFIG"
+ keyColumn="PROPERTY_KEY"
+ keyMatch="DB_SCHEMA_VERSION"
targetSchemaVersion="${target.schema.version}">
<schemaSpec version="2.0">
@@ -31,7 +31,7 @@
</schemaSpec>
<schemaSpec version="2.1">
- <!-- Keep the columnType VARCHAR2, but increase size;
+ <!-- Keep the columnType VARCHAR2, but increase size;
(see note for RHQ_ALERT_CONDITION table in alert-schema.xml for more
ifo) -->
<schema-alterColumn table="RHQ_ALERT_CONDITION"
column="OPTION_STATUS" columnType="VARCHAR2" precision="256"
/>
</schemaSpec>
@@ -1805,7 +1805,7 @@
</schemaSpec>
<schemaSpec version="2.61">
- <schema-createSequence name="RHQ_DISTRIBUTION_TYPE_ID_SEQ"
initial="10001" />
+ <schema-createSequence name="RHQ_DISTRIBUTION_TYPE_ID_SEQ"
initial="10001" />
<schema-directSQL>
<statement>
CREATE TABLE RHQ_DISTRIBUTION_TYPE ( ID INTEGER PRIMARY KEY )
@@ -1829,12 +1829,12 @@
</schema-directSQL>
<schema-createSequence name="RHQ_DISTRIBUTION_ID_SEQ"
initial="10001" />
- <schema-directSQL>
+ <schema-directSQL>
<statement desc="Creating table RHQ_DISTRIBUTION">
CREATE TABLE RHQ_DISTRIBUTION ( ID INTEGER PRIMARY KEY )
</statement>
</schema-directSQL>
- <schema-alterColumn table="RHQ_DISTRIBUTION"
column="ID" nullable="false" />
+ <schema-alterColumn table="RHQ_DISTRIBUTION"
column="ID" nullable="false" />
<schema-addColumn table="RHQ_DISTRIBUTION"
column="DISTRIBUTION_TYPE_ID" columnType="INTEGER" />
<schema-alterColumn table="RHQ_DISTRIBUTION"
column="DISTRIBUTION_TYPE_ID" nullable="false" />
<schema-addColumn table="RHQ_DISTRIBUTION"
column="LABEL" precision="64" columnType="VARCHAR2" />
@@ -1897,7 +1897,7 @@
</schemaSpec>
<schemaSpec version="2.63">
- <schema-addColumn table="RHQ_REPO"
column="IS_CANDIDATE" columnType="BOOLEAN" />
+ <schema-addColumn table="RHQ_REPO"
column="IS_CANDIDATE" columnType="BOOLEAN" />
<schema-directSQL>
<statement targetDBVendor="postgresql">
@@ -1907,7 +1907,7 @@
UPDATE RHQ_REPO SET IS_CANDIDATE = 0
</statement>
</schema-directSQL>
- <schema-alterColumn table="RHQ_REPO"
column="IS_CANDIDATE" nullable="false" />
+ <schema-alterColumn table="RHQ_REPO"
column="IS_CANDIDATE" nullable="false" />
</schemaSpec>
<!-- Generic tagging support -->
@@ -1932,7 +1932,7 @@
CREATE TABLE RHQ_DISTRIBUTION_FILE (ID INTEGER PRIMARY KEY)
</statement>
</schema-directSQL>
- <schema-alterColumn table="RHQ_DISTRIBUTION_FILE"
column="ID" nullable="false" />
+ <schema-alterColumn table="RHQ_DISTRIBUTION_FILE"
column="ID" nullable="false" />
<schema-addColumn table="RHQ_DISTRIBUTION_FILE"
column="DISTRIBUTION_ID" columnType="INTEGER" />
<schema-alterColumn table="RHQ_DISTRIBUTION_FILE"
column="DISTRIBUTION_ID" nullable="false" />
<schema-addColumn table="RHQ_DISTRIBUTION_FILE"
column="RELATIVE_FILENAME" precision="256"
columnType="VARCHAR2" />
@@ -2358,8 +2358,8 @@
</statement>
<statement desc="Creating RHQ_BUNDLE_TYPE unique
constraint">
CREATE UNIQUE INDEX RHQ_BUNDLE_TYPE_UNIQUE ON RHQ_BUNDLE_TYPE
(name)
- </statement>
- </schema-directSQL>
+ </statement>
+ </schema-directSQL>
<!-- RHQ_BUNDLE -->
<schema-createSequence name="RHQ_BUNDLE_ID_SEQ"
initial="10001" />
@@ -2396,12 +2396,12 @@
ADD CONSTRAINT RHQ_B_PACKAGE_TYPE_ID_FK
FOREIGN KEY (PACKAGE_TYPE_ID)
REFERENCES RHQ_PACKAGE_TYPE (ID)
- </statement>
+ </statement>
<statement desc="Creating RHQ_BUNDLE unique
constraint">
CREATE UNIQUE INDEX RHQ_BUNDLE_UNIQUE ON RHQ_BUNDLE
(bundle_type_id, name)
- </statement>
+ </statement>
</schema-directSQL>
-
+
<!-- RHQ_BUNDLE_VERSION -->
<schema-createSequence name="RHQ_BUNDLE_VERSION_ID_SEQ"
initial="10001" />
<schema-directSQL>
@@ -2439,7 +2439,7 @@
CREATE UNIQUE INDEX RHQ_BUNDLE_VERSION_UNIQUE ON
RHQ_BUNDLE_VERSION (bundle_id, name, version)
</statement>
</schema-directSQL>
-
+
<!-- RHQ_BUNDLE_VERSION_REPO -->
<schema-directSQL>
<statement desc="Creating table
RHQ_BUNDLE_VERSION_REPO">
@@ -2466,7 +2466,7 @@
REFERENCES RHQ_REPO (ID)
</statement>
</schema-directSQL>
-
+
<!-- RHQ_BUNDLE_FILE -->
<schema-createSequence name="RHQ_BUNDLE_FILE_ID_SEQ"
initial="10001" />
<schema-directSQL>
@@ -2479,7 +2479,7 @@
<schema-alterColumn table="RHQ_BUNDLE_FILE"
column="BUNDLE_VERSION_ID" nullable="FALSE" />
<schema-addColumn table="RHQ_BUNDLE_FILE"
column="PACKAGE_VERSION_ID" columnType="INTEGER" />
<schema-alterColumn table="RHQ_BUNDLE_FILE"
column="PACKAGE_VERSION_ID" nullable="FALSE" />
-
+
<schema-directSQL>
<statement desc="Creating RHQ_BUNDLE_FILE foreign key
relation to RHQ_BUNDLE_VERSION">
ALTER TABLE RHQ_BUNDLE_FILE
@@ -2494,7 +2494,7 @@
REFERENCES RHQ_PACKAGE_VERSION (ID)
</statement>
</schema-directSQL>
-
+
<!-- RHQ_BUNDLE_DESTINATION -->
<schema-createSequence name="RHQ_BUNDLE_DESTINATION_ID_SEQ"
initial="10001" />
<schema-directSQL>
@@ -2513,9 +2513,9 @@
<schema-addColumn table="RHQ_BUNDLE_DESTINATION"
column="BUNDLE_ID" columnType="INTEGER" />
<schema-alterColumn table="RHQ_BUNDLE_DESTINATION"
column="BUNDLE_ID" nullable="FALSE" />
<schema-addColumn table="RHQ_BUNDLE_DESTINATION"
column="GROUP_ID" columnType="INTEGER" />
- <schema-alterColumn table="RHQ_BUNDLE_DESTINATION"
column="GROUP_ID" nullable="FALSE" />
+ <schema-alterColumn table="RHQ_BUNDLE_DESTINATION"
column="GROUP_ID" nullable="FALSE" />
<schema-addColumn table="RHQ_BUNDLE_DESTINATION"
column="DEPLOY_DIR" columnType="VARCHAR2" precision="256"
/>
- <schema-alterColumn table="RHQ_BUNDLE_DESTINATION"
column="DEPLOY_DIR" nullable="FALSE" />
+ <schema-alterColumn table="RHQ_BUNDLE_DESTINATION"
column="DEPLOY_DIR" nullable="FALSE" />
<schema-directSQL>
<statement desc="Creating RHQ_BUNDLE_DESTINATION foreign key
relation to RHQ_BUNDLE">
@@ -2535,7 +2535,7 @@
ON RHQ_BUNDLE_DESTINATION (bundle_id, group_id, deploy_dir)
</statement>
</schema-directSQL>
-
+
<!-- RHQ_BUNDLE_DEPLOYMENT -->
<schema-createSequence name="RHQ_BUNDLE_DEPLOYMENT_ID_SEQ"
initial="10001" />
<schema-directSQL>
@@ -2561,8 +2561,8 @@
<schema-addColumn table="RHQ_BUNDLE_DEPLOYMENT"
column="ERROR_MESSAGE" columnType="LONGVARCHAR" />
<schema-addColumn table="RHQ_BUNDLE_DEPLOYMENT"
column="SUBJECT_NAME" columnType="VARCHAR2" precision="255"
/>
<schema-addColumn table="RHQ_BUNDLE_DEPLOYMENT"
column="IS_LIVE" columnType="BOOLEAN" />
- <schema-alterColumn table="RHQ_BUNDLE_DEPLOYMENT"
column="IS_LIVE" nullable="FALSE" />
- <schema-addColumn table="RHQ_BUNDLE_DEPLOYMENT"
column="REPLACED_BUNDLE_DEPLOYMENT_ID" columnType="INTEGER" />
+ <schema-alterColumn table="RHQ_BUNDLE_DEPLOYMENT"
column="IS_LIVE" nullable="FALSE" />
+ <schema-addColumn table="RHQ_BUNDLE_DEPLOYMENT"
column="REPLACED_BUNDLE_DEPLOYMENT_ID" columnType="INTEGER" />
<schema-directSQL>
<statement desc="Creating RHQ_BUNDLE_DEPLOYMENT foreign key
relation to RHQ_BUNDLE_VERSION">
@@ -2576,7 +2576,7 @@
ADD CONSTRAINT RHQ_BD_B_DESTINATION_ID_FK
FOREIGN KEY (BUNDLE_DESTINATION_ID)
REFERENCES RHQ_BUNDLE_DESTINATION (ID)
- </statement>
+ </statement>
<statement desc="Creating RHQ_BUNDLE_DEPLOYMENT foreign key
relation to RHQ_CONFIG">
ALTER TABLE RHQ_BUNDLE_DEPLOYMENT
ADD CONSTRAINT RHQ_BD_CONFIG_ID_FK
@@ -2588,9 +2588,9 @@
ADD CONSTRAINT RHQ_BD_B_DEPLOYMENT_ID_FK
FOREIGN KEY (REPLACED_BUNDLE_DEPLOYMENT_ID)
REFERENCES RHQ_BUNDLE_DEPLOYMENT (ID)
- </statement>
- </schema-directSQL>
-
+ </statement>
+ </schema-directSQL>
+
<!-- RHQ_BUNDLE_RES_DEPLOY -->
<schema-createSequence name="RHQ_BUNDLE_RES_DEPLOY_ID_SEQ"
initial="10001" />
<schema-directSQL>
@@ -2622,11 +2622,11 @@
REFERENCES RHQ_RESOURCE (ID)
</statement>
<statement desc="Creating RHQ_BUNDLE_RES_DEPLOY unique
constraint on def-resource mapping">
- CREATE UNIQUE INDEX RHQ_BUNDLE_RES_DEPLOY_MAP_IX
+ CREATE UNIQUE INDEX RHQ_BUNDLE_RES_DEPLOY_MAP_IX
ON RHQ_BUNDLE_RES_DEPLOY (BUNDLE_DEPLOYMENT_ID, RESOURCE_ID)
</statement>
</schema-directSQL>
-
+
<!-- RHQ_BUNDLE_RES_DEP_HIST -->
<schema-createSequence name="RHQ_BUNDLE_RES_DEP_HIST_ID_SEQ"
initial="10001" />
<schema-directSQL>
@@ -2644,7 +2644,7 @@
<schema-alterColumn table="RHQ_BUNDLE_RES_DEP_HIST"
column="ACTION" nullable="FALSE" />
<schema-addColumn table="RHQ_BUNDLE_RES_DEP_HIST"
column="INFO" columnType="VARCHAR2" precision="512" />
<schema-alterColumn table="RHQ_BUNDLE_RES_DEP_HIST"
column="INFO" nullable="FALSE" />
- <schema-addColumn table="RHQ_BUNDLE_RES_DEP_HIST"
column="CATEGORY" columnType="VARCHAR2" precision="32" />
+ <schema-addColumn table="RHQ_BUNDLE_RES_DEP_HIST"
column="CATEGORY" columnType="VARCHAR2" precision="32"
/>
<schema-addColumn table="RHQ_BUNDLE_RES_DEP_HIST"
column="STATUS" columnType="VARCHAR2" precision="16" />
<schema-alterColumn table="RHQ_BUNDLE_RES_DEP_HIST"
column="STATUS" nullable="FALSE" />
<schema-addColumn table="RHQ_BUNDLE_RES_DEP_HIST"
column="MESSAGE" columnType="LONGVARCHAR" />
@@ -2656,7 +2656,7 @@
FOREIGN KEY (BUNDLE_RES_DEPLOY_ID)
REFERENCES RHQ_BUNDLE_RES_DEPLOY (ID)
</statement>
- </schema-directSQL>
+ </schema-directSQL>
</schemaSpec>
<schemaSpec version="2.79">
@@ -2683,11 +2683,11 @@
ALTER TABLE RHQ_PACKAGE_BITS DROP COLUMN BITS
</statement>
<statement desc="Change bytea column to oid in
postgres.">
- ALTER TABLE RHQ_PACKAGE_BITS RENAME COLUMN NEWOID TO BITS
+ ALTER TABLE RHQ_PACKAGE_BITS RENAME COLUMN NEWOID TO BITS
</statement>
</schema-directSQL>
</schemaSpec>
-
+
<schemaSpec version="2.82">
<schema-directSQL>
<statement desc="Creating table RHQ_SAVED_SEARCH">
@@ -2744,8 +2744,8 @@
CREATE TABLE RHQ_SUBJECT_ROLE_LDAP_MAP ( SUBJECT_ID INTEGER,
ROLE_ID INTEGER )
</statement>
<statement desc="Creating composite PK for
RHQ_SUBJECT_ROLE_LDAP_MAP">
- ALTER TABLE RHQ_SUBJECT_ROLE_LDAP_MAP
- ADD CONSTRAINT RHQ_SUBJECT_ROLE_LDAP_MAP_PK
+ ALTER TABLE RHQ_SUBJECT_ROLE_LDAP_MAP
+ ADD CONSTRAINT RHQ_SUBJECT_ROLE_LDAP_MAP_PK
PRIMARY KEY ( SUBJECT_ID, ROLE_ID )
</statement>
<statement desc="Creating FK relation to RHQ_SUBJECT table
for SUBJECT_ID column">
@@ -2763,7 +2763,7 @@
</schema-directSQL>
<schema-alterColumn table="RHQ_SUBJECT_ROLE_LDAP_MAP"
column="SUBJECT_ID" nullable="FALSE" />
<schema-alterColumn table="RHQ_SUBJECT_ROLE_LDAP_MAP"
column="ROLE_ID" nullable="FALSE" />
-
+
<!-- Fixing ldap group authz by adding remaining mapping elements left
out(RHQ_ROLE_LDAP_GROUP) -->
<!-- RHQ_ROLE_LDAP_GROUP -->
<schema-createSequence name="RHQ_ROLE_LDAP_GROUP_ID_SEQ"
initial="10001" />
@@ -2771,11 +2771,11 @@
<statement desc="Creating table RHQ_ROLE_LDAP_GROUP">
CREATE TABLE RHQ_ROLE_LDAP_GROUP ( ID INTEGER PRIMARY KEY, ROLE_ID
INTEGER )
</statement>
- </schema-directSQL>
+ </schema-directSQL>
<schema-alterColumn table="RHQ_ROLE_LDAP_GROUP"
column="ID" nullable="FALSE" />
<schema-alterColumn table="RHQ_ROLE_LDAP_GROUP"
column="ROLE_ID" nullable="FALSE" />
<schema-addColumn table="RHQ_ROLE_LDAP_GROUP"
column="LDAP_GROUP_NAME" columnType="VARCHAR2"
precision="128" />
-
+
<schema-directSQL>
<statement>
ALTER TABLE RHQ_ROLE_LDAP_GROUP
@@ -2787,7 +2787,7 @@
CREATE UNIQUE INDEX RHQ_ROLE_LDAP_GROUP_IDX
ON RHQ_ROLE_LDAP_GROUP ( LDAP_GROUP_NAME, ROLE_ID )
</statement>
- </schema-directSQL>
+ </schema-directSQL>
</schemaSpec>
<!-- Remove the old tagging system -->
@@ -2949,7 +2949,7 @@
REFERENCES RHQ_TAGGING ( ID )
</statement>
</schema-directSQL>
-
+
<schema-directSQL>
<statement>
CREATE TABLE RHQ_TAGGING_BUNDLE_DEST_MAP ( BUNDLE_DESTINATION_ID
INTEGER )
@@ -2976,9 +2976,9 @@
FOREIGN KEY ( TAG_ID )
REFERENCES RHQ_TAGGING ( ID )
</statement>
- </schema-directSQL>
+ </schema-directSQL>
</schemaSpec>
-
+
<schemaSpec version="2.86">
<schema-directSQL>
<statement desc="Adding MANAGE_BUNDLE permission to
overlord">
@@ -2989,18 +2989,28 @@
</statement>
</schema-directSQL>
</schemaSpec>
-
+
<schemaSpec version="2.87">
<schema-directSQL>
<statement desc="Drop non-unique RHQ_RES_TYPE_IDX_PLG_NAME
index">
DROP INDEX RHQ_RES_TYPE_IDX_PLG_NAME
- </statement>
- <statement desc="Recreate RHQ_RES_TYPE_IDX_PLG_NAME index as
unique">
+ </statement>
+ <statement desc="Recreate RHQ_RES_TYPE_IDX_PLG_NAME index as
unique">
CREATE UNIQUE INDEX RHQ_RES_TYPE_IDX_PLG_NAME ON
RHQ_RESOURCE_TYPE (name, plugin)
</statement>
</schema-directSQL>
</schemaSpec>
-
+
+ <schemaSpec version="2.88">
+ <schema-directSQL>
+ <statement desc="Add end time index on call time data to
speed up purges">
+ CREATE INDEX RHQ_CT_DA_VA_END_TIM_IDX ON RHQ_CALLTIME_DATA_VALUE
(end_time)
+ </statement>
+ <statement desc="Add index on measurement definition numeric
type">
+ CREATE INDEX RHQ_METRIC_DEF_NT_IDX ON RHQ_MEASUREMENT_DEF
(numeric_type)
+ </statement>
+ </schema-directSQL>
+ </schemaSpec>
</dbupgrade>
</target>
</project>