You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by gd...@apache.org on 2010/07/21 23:56:33 UTC
svn commit: r966437 - in /cassandra/trunk/src/java/org/apache/cassandra:
config/DatabaseDescriptor.java service/StorageService.java
Author: gdusbabek
Date: Wed Jul 21 21:56:33 2010
New Revision: 966437
URL: http://svn.apache.org/viewvc?rev=966437&view=rev
Log:
revert 966363. CASSANDRA-1307
Modified:
cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
Modified: cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=966437&r1=966436&r2=966437&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java Wed Jul 21 21:56:33 2010
@@ -47,7 +47,6 @@ import org.apache.cassandra.db.migration
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.locator.AbstractReplicationStrategy;
-import org.apache.cassandra.locator.RackUnawareStrategy;
import org.apache.cassandra.locator.IEndpointSnitch;
import org.apache.cassandra.scheduler.IRequestScheduler;
import org.apache.cassandra.scheduler.NoScheduler;
@@ -345,7 +344,7 @@ public class DatabaseDescriptor
CommitLog.setSegmentSize(conf.commitlog_rotation_threshold_in_mb * 1024 * 1024);
// Hardcoded system tables
- KSMetaData systemMeta = new KSMetaData(Table.SYSTEM_TABLE, RackUnawareStrategy.class, 1, new CFMetaData[]{CFMetaData.StatusCf,
+ KSMetaData systemMeta = new KSMetaData(Table.SYSTEM_TABLE, null, -1, new CFMetaData[]{CFMetaData.StatusCf,
CFMetaData.HintsCf,
CFMetaData.MigrationsCf,
CFMetaData.SchemaCf
@@ -894,7 +893,7 @@ public class DatabaseDescriptor
{
return tables.keySet();
}
-
+
public static List<String> getNonSystemTables()
{
List<String> tableslist = new ArrayList<String>(tables.keySet());
Modified: cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=966437&r1=966436&r2=966437&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java Wed Jul 21 21:56:33 2010
@@ -245,7 +245,7 @@ public class StorageService implements I
MessagingService.instance.registerVerbHandlers(Verb.SCHEMA_CHECK, new SchemaCheckVerbHandler());
replicationStrategies = new HashMap<String, AbstractReplicationStrategy>();
- for (String table : DatabaseDescriptor.getTables())
+ for (String table : DatabaseDescriptor.getNonSystemTables())
initReplicationStrategy(table);
// spin up the streaming serivice so it is available for jmx tools.