Author: [email protected]
Date: Tue Dec 20 17:07:09 2011
New Revision: 1870
Log:
[AMDATUCASSANDRA-137] Resolved unnecessary registration of CF available
services for the system keyspace
Modified:
trunk/amdatu-cassandra/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/service/CassandraUpdateListenerImpl.java
Modified:
trunk/amdatu-cassandra/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/service/CassandraUpdateListenerImpl.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/service/CassandraUpdateListenerImpl.java
(original)
+++
trunk/amdatu-cassandra/cassandra-listener/src/main/java/org/amdatu/cassandra/listener/service/CassandraUpdateListenerImpl.java
Tue Dec 20 17:07:09 2011
@@ -161,8 +161,11 @@
// Creates and returns a snapshot of the currently available keyspaces
and column families
private Map<String, List<String>> getSnapshot() throws TException,
InvalidRequestException, NotFoundException {
Map<String, List<String>> map = new HashMap<String,
List<String>>();
- for (String keyspace : m_daemonService.getKeyspaces()) {
- map.put(keyspace, m_daemonService.getColumnFamilies(keyspace));
+ for (String keyspace : m_daemonService.getKeyspaces()) {
+ // Ignore the system keyspace
+ if (!Table.SYSTEM_TABLE.equals(keyspace)) {
+ map.put(keyspace,
m_daemonService.getColumnFamilies(keyspace));
+ }
}
return map;
}
@@ -201,19 +204,17 @@
Set<String> keyspaces = m_snapshot.keySet();
if (keyspaces != null) {
for (String keyspace : keyspaces) {
- if (!Table.SYSTEM_TABLE.equals(keyspace)) {
- // Verify that the ColumnFamily for this
keyspace global provider is available
- // in this keyspace
- for (ColumnFamilyDefinition cfDef :
provider.getColumnFamilies()) {
- String cfName = cfDef.getName();
- if
(!m_snapshot.get(keyspace).contains(cfName)) {
-
m_logService.log(LogService.LOG_DEBUG,
- "Adding ColumnFamily '" +
cfDef.getName() + "' to keyspace '"
- + keyspace + "' for the
keyspace-global ColumnFamilyProvider '"
- +
provider.getClass().getName() + "'");
-
m_daemonService.addColumnFamily(keyspace, cfDef.getCfDef());
-
}
- }
+ // Verify that the ColumnFamily for this
keyspace global provider is available
+ // in this keyspace
+ for (ColumnFamilyDefinition cfDef :
provider.getColumnFamilies()) {
+ String cfName = cfDef.getName();
+ if
(!m_snapshot.get(keyspace).contains(cfName)) {
+ m_logService.log(LogService.LOG_DEBUG,
+ "Adding ColumnFamily '" +
cfDef.getName() + "' to keyspace '"
+ + keyspace + "' for the
keyspace-global ColumnFamilyProvider '"
+ +
provider.getClass().getName() + "'");
+
m_daemonService.addColumnFamily(keyspace, cfDef.getCfDef());
+ }
}
}
}
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
