modules/core/dbutils/pom.xml | 2 -
modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml | 2 +
modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml | 15
++++++++++
modules/core/domain/src/main/java/org/rhq/core/domain/drift/Snapshot.java | 11
+++++++
modules/core/domain/src/test/java/org/rhq/core/domain/drift/SnapshotTest.java | 6
++--
5 files changed, 33 insertions(+), 3 deletions(-)
New commits:
commit dc146dae82bdea0afed27985ed572ba7bfd50787
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed May 25 22:55:25 2011 -0400
Adding dbupgrade script for Snapshot and adding a basedir field/property
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml
index 063f2ce..4bcb8f1 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.107</db.schema.version>
+ <db.schema.version>2.108</db.schema.version>
</properties>
<dependencies>
diff --git a/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml
b/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml
index 94fe4c3..851e797 100644
--- a/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml
+++ b/modules/core/dbutils/src/main/scripts/dbsetup/content-schema.xml
@@ -650,8 +650,10 @@
<column name="ID" default="sequence-only"
initial="10001" primarykey="true" required="true"
type="INTEGER"/>
<column name="DATA" type="LARGEOBJECT"
required="false"/>
<column name="DATA_SIZE" type="LONG"/>
+ <column name="BASEDIR" type="VARCHAR2"
size="512" required="true"/>
<column name="CTIME" type="LONG"
required="true"/>
</table>
+
</dbsetup>
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 1e7fffe..bb2c716 100644
--- a/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
+++ b/modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml
@@ -3389,6 +3389,21 @@
<schemaSpec version="2.107">
<schema-createSequence name="RHQ_OPERATION_SCHEDULE_ID_SEQ"
initial="10001"/>
</schemaSpec>
+
+ <schemaSpec version="2.108">
+ <schema-createSequence name="RHQ_SNAPSHOT_ID_SEQ"
initial="10001" />
+ <schema-directSQL>
+ <statement desc="Creating table RHQ_SNAPSHOT">
+ CREATE TABLE RHQ_SNAPSHOT (ID INTEGER PRIMARY KEY)
+ </statement>
+ </schema-directSQL>
+ <schema-alterColumn table="RHQ_SNAPSHOT"
column="ID" columnType="INTEGER" nullable="FALSE" />
+ <schema-addColumn table="RHQ_SNAPSHOT"
column="BASEDIR" columnType="VARCHAR2" />
+ <schema-alterColumn table="RHQ_SNAPSHOT"
column="BASEDIR" nullable="false" precision="512"/>
+ <schema-addColumn table="RHQ_SNAPSHOT"
column="DATA" columnType="LARGEOBJECT"/>
+ <schema-addColumn table="RHQ_SNAPSHOT"
column="DATA_SIZE" columnType="LONG"/>
+ <schema-addColumn table="RHQ_SNAPSHOT"
column="CTIME" columnType="LONG" />
+ </schemaSpec>
</dbupgrade>
</target>
</project>
diff --git a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/Snapshot.java
b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/Snapshot.java
index 48c64f1..bef88b6 100644
--- a/modules/core/domain/src/main/java/org/rhq/core/domain/drift/Snapshot.java
+++ b/modules/core/domain/src/main/java/org/rhq/core/domain/drift/Snapshot.java
@@ -31,6 +31,9 @@ public class Snapshot implements Serializable {
//private SnapshotMetadata metadata = new SnapshotMetadata();
+ @Column(name = "BASEDIR", nullable = false, length = 512)
+ private String basedir;
+
@Lob
@Column(name = "DATA")
private Blob data;
@@ -77,6 +80,14 @@ public class Snapshot implements Serializable {
dataSize = size;
}
+ public String getBasedir() {
+ return basedir;
+ }
+
+ public void setBasedir(String dir) {
+ basedir = dir;
+ }
+
public long getCtime() {
return ctime;
}
diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/drift/SnapshotTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/drift/SnapshotTest.java
index 4c476ff..a3cf9c2 100644
--- a/modules/core/domain/src/test/java/org/rhq/core/domain/drift/SnapshotTest.java
+++ b/modules/core/domain/src/test/java/org/rhq/core/domain/drift/SnapshotTest.java
@@ -47,6 +47,7 @@ public class SnapshotTest extends AbstractEJB3Test {
final Snapshot s1 = new Snapshot();
s1.setDataSize(content.length());
s1.setData(Hibernate.createBlob(toInputStream(content), content.length()));
+ s1.setBasedir("snapshot/test/s1");
executeInTransaction(new TransactionCallback() {
@Override
@@ -89,13 +90,14 @@ public class SnapshotTest extends AbstractEJB3Test {
// running and should be moved to an integration test suite.
@Test(groups = {"integration.ejb3", "snapshot"})
public void loadMultipleSnapshotsWithoutLoadingData() throws Exception {
- File dataFile = createDataFile("test_data.txt", 100);
- int numSnapshots = 25;
+ File dataFile = createDataFile("test_data.txt", 10);
+ int numSnapshots = 10;
final List<Integer> snapshotIds = new ArrayList<Integer>();
for (int i = 0; i <numSnapshots; ++i) {
final Snapshot snapshot = new Snapshot();
snapshot.setDataSize(dataFile.length());
+ snapshot.setBasedir("snapshot/" + i);
snapshot.setData(Hibernate.createBlob(new BufferedInputStream(new
FileInputStream(dataFile))));
executeInTransaction(new TransactionCallback() {
Show replies by date