Author: jbellis
Date: Wed Oct 7 19:41:36 2009
New Revision: 822875
URL: http://svn.apache.org/viewvc?rev=822875&view=rev
Log:
rename LOCATION_CF -> STATUS_CF. cleanup.
patch by jbellis; reviewed by Eric Evans for CASSANDRA-438
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java?rev=822875&r1=822874&r2=822875&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Wed Oct 7 19:41:36 2009
@@ -544,7 +544,7 @@
CFMetaData data = new CFMetaData();
data.columnType = "Standard";
data.comparator = new UTF8Type();
- systemMetadata.put(SystemTable.LOCATION_CF, data);
+ systemMetadata.put(SystemTable.STATUS_CF, data);
data = new CFMetaData();
data.columnType = "Super";
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java?rev=822875&r1=822874&r2=822875&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/SystemTable.java
Wed Oct 7 19:41:36 2009
@@ -30,14 +30,14 @@
import org.apache.cassandra.db.filter.IdentityQueryFilter;
import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.db.filter.QueryFilter;
-import org.apache.cassandra.db.filter.NamesQueryFilter;
import org.apache.cassandra.net.EndPoint;
public class SystemTable
{
private static Logger logger = Logger.getLogger(SystemTable.class);
- public static final String LOCATION_CF = "LocationInfo";
- private static final String LOCATION_KEY = "L"; // only one row in
Location CF
+ public static final String STATUS_CF = "LocationInfo"; // keep the old CF
string for backwards-compatibility
+ private static final String LOCATION_KEY = "L";
+ private static final String BOOTSTRAP_KEY = "Bootstrap";
private static final byte[] TOKEN = utf8("Token");
private static final byte[] GENERATION = utf8("Generation");
private static StorageMetadata metadata;
@@ -60,7 +60,7 @@
public static synchronized void updateToken(EndPoint ep, Token token)
throws IOException
{
IPartitioner p = StorageService.getPartitioner();
- ColumnFamily cf = ColumnFamily.create(Table.SYSTEM_TABLE, LOCATION_CF);
+ ColumnFamily cf = ColumnFamily.create(Table.SYSTEM_TABLE, STATUS_CF);
cf.addColumn(new Column(ep.getHost().getBytes("UTF-8"),
p.getTokenFactory().toByteArray(token), System.currentTimeMillis()));
RowMutation rm = new RowMutation(Table.SYSTEM_TABLE, LOCATION_KEY);
rm.add(cf);
@@ -73,10 +73,8 @@
public static synchronized void updateToken(Token token) throws IOException
{
assert metadata != null;
- if (logger.isDebugEnabled())
- logger.debug("Setting token to " + token);
IPartitioner p = StorageService.getPartitioner();
- ColumnFamily cf = ColumnFamily.create(Table.SYSTEM_TABLE, LOCATION_CF);
+ ColumnFamily cf = ColumnFamily.create(Table.SYSTEM_TABLE, STATUS_CF);
cf.addColumn(new Column(SystemTable.TOKEN,
p.getTokenFactory().toByteArray(token), System.currentTimeMillis()));
RowMutation rm = new RowMutation(Table.SYSTEM_TABLE, LOCATION_KEY);
rm.add(cf);
@@ -99,8 +97,8 @@
/* Read the system table to retrieve the storage ID and the generation
*/
Table table = Table.open(Table.SYSTEM_TABLE);
- QueryFilter filter = new IdentityQueryFilter(LOCATION_KEY, new
QueryPath(LOCATION_CF));
- ColumnFamily cf =
table.getColumnFamilyStore(LOCATION_CF).getColumnFamily(filter);
+ QueryFilter filter = new IdentityQueryFilter(LOCATION_KEY, new
QueryPath(STATUS_CF));
+ ColumnFamily cf =
table.getColumnFamilyStore(STATUS_CF).getColumnFamily(filter);
IPartitioner p = StorageService.getPartitioner();
if (cf == null)
@@ -110,7 +108,7 @@
int generation = 1;
RowMutation rm = new RowMutation(Table.SYSTEM_TABLE, LOCATION_KEY);
- cf = ColumnFamily.create(Table.SYSTEM_TABLE,
SystemTable.LOCATION_CF);
+ cf = ColumnFamily.create(Table.SYSTEM_TABLE,
SystemTable.STATUS_CF);
cf.addColumn(new Column(TOKEN,
p.getTokenFactory().toByteArray(token)));
cf.addColumn(new Column(GENERATION,
BasicUtilities.intToByteArray(generation)) );
rm.add(cf);
@@ -128,7 +126,7 @@
int gen = BasicUtilities.byteArrayToInt(generation.value()) + 1;
RowMutation rm = new RowMutation(Table.SYSTEM_TABLE, LOCATION_KEY);
- cf = ColumnFamily.create(Table.SYSTEM_TABLE, SystemTable.LOCATION_CF);
+ cf = ColumnFamily.create(Table.SYSTEM_TABLE, SystemTable.STATUS_CF);
Column generation2 = new Column(GENERATION,
BasicUtilities.intToByteArray(gen), generation.timestamp() + 1);
cf.addColumn(generation2);
rm.add(cf);
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=822875&r1=822874&r2=822875&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
Wed Oct 7 19:41:36 2009
@@ -610,10 +610,11 @@
*/
public void updateToken(Token token) throws IOException
{
+ if (logger_.isDebugEnabled())
+ logger_.debug("Setting token to " + token);
/* update the token on disk */
SystemTable.updateToken(token);
/* Update the token maps */
- /* Get the old token. This needs to be removed. */
tokenMetadata_.update(token, StorageService.tcpAddr_);
/* Gossip this new token for the local storage instance */
ApplicationState state = new
ApplicationState(StorageService.getPartitioner().getTokenFactory().toString(token));
