Author: gdusbabek
Date: Wed Jul 21 19:24:20 2010
New Revision: 966373
URL: http://svn.apache.org/viewvc?rev=966373&view=rev
Log:
allow querying system keyspace in CLI. patch by Ching-Shen Chen, reviewed by
Gary Dusbabek. CASSANDRA-1307
Modified:
cassandra/branches/cassandra-0.6/CHANGES.txt
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=966373&r1=966372&r2=966373&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Wed Jul 21 19:24:20 2010
@@ -15,6 +15,7 @@
* fix duplicate rows being read during mapreduce (CASSANDRA-1142)
* failure detection wasn't closing command sockets (CASSANDRA-1221)
* cassandra-cli.bat works on windows (CASSANDRA-1236)
+ * enable querying system keyspace through CLI (CASSANDRA-1307)
0.6.3
Modified:
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=966373&r1=966372&r2=966373&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
(original)
+++
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Wed Jul 21 19:24:20 2010
@@ -29,6 +29,7 @@ import org.apache.cassandra.dht.IPartiti
import org.apache.cassandra.locator.IEndPointSnitch;
import org.apache.cassandra.locator.AbstractReplicationStrategy;
import org.apache.cassandra.io.util.FileUtils;
+import org.apache.cassandra.locator.RackUnawareStrategy;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.XMLUtils;
import org.apache.log4j.Logger;
@@ -500,7 +501,7 @@ public class DatabaseDescriptor
throw new ConfigurationException("No keyspaces configured");
// Hardcoded system tables
- KSMetaData systemMeta = new KSMetaData(Table.SYSTEM_TABLE, null,
-1, null);
+ KSMetaData systemMeta = new KSMetaData(Table.SYSTEM_TABLE,
RackUnawareStrategy.class, 1, null);
tables.put(Table.SYSTEM_TABLE, systemMeta);
systemMeta.cfMetaData.put(SystemTable.STATUS_CF, new
CFMetaData(Table.SYSTEM_TABLE,
SystemTable.STATUS_CF,
Modified:
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java?rev=966373&r1=966372&r2=966373&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
(original)
+++
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
Wed Jul 21 19:24:20 2010
@@ -228,7 +228,7 @@ public class StorageService implements I
MessagingService.instance.registerVerbHandlers(Verb.GOSSIP_DIGEST_ACK2, new
GossipDigestAck2VerbHandler());
replicationStrategies = new HashMap<String,
AbstractReplicationStrategy>();
- for (String table : DatabaseDescriptor.getNonSystemTables())
+ for (String table : DatabaseDescriptor.getTables())
{
AbstractReplicationStrategy strat =
getReplicationStrategy(tokenMetadata_, table);
replicationStrategies.put(table, strat);
