modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java
| 11 ++++++++++
1 file changed, 11 insertions(+)
New commits:
commit 5ff96204c205dd5fd713217a7c7ba91822a46cd3
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed May 1 12:57:52 2013 -0400
temporary fix for applying shcema changes when schema already exists
diff --git
a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java
b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java
index 8b44bd2..5581782 100644
---
a/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java
+++
b/modules/common/cassandra-schema/src/main/java/org/rhq/cassandra/schema/SchemaManager.java
@@ -117,6 +117,13 @@ public class SchemaManager {
log.debug("Creating keyspace [" + RHQ_KEYSPACE + "]");
session.execute(
"CREATE KEYSPACE rhq WITH replication = {'class':
'SimpleStrategy', 'replication_factor': 1};");
+
+ // Note that once we have a schema management tool back in place, the call
+ // to createTables will be moved back to the updateSchema method as it
+ // previously was when we were using liquibase. We do NOT want to have
+ // separate install/update schema changes. Treating everything as an update
as
+ // liquibase does dramatically simplifies things.
+ createTables();
} catch (NoHostAvailableException e) {
throw new RuntimeException(e);
}
@@ -143,6 +150,10 @@ public class SchemaManager {
public void updateSchema() {
log.info("Applying schema updates");
+ //createTables();
+ }
+
+ private void createTables() {
try {
log.debug("Creating table raw_metrics");
session.execute(
Show replies by date