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/03/04 21:17:33 UTC
svn commit: r919158 - in
/incubator/cassandra/trunk/src/java/org/apache/cassandra/config:
CFMetaData.java DatabaseDescriptor.java KSMetaData.java
Author: gdusbabek
Date: Thu Mar 4 20:17:32 2010
New Revision: 919158
URL: http://svn.apache.org/viewvc?rev=919158&view=rev
Log:
variable+parameter renaming
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java?rev=919158&r1=919157&r2=919158&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java Thu Mar 4 20:17:32 2010
@@ -65,7 +65,7 @@
public final String comment; // for humans only
public final double rowCacheSize; // default 0
public final double keyCacheSize; // default 0.01
- public final transient int cfId;
+ public final int cfId;
private CFMetaData(String tableName, String cfName, String columnType, AbstractType comparator, AbstractType subcolumnComparator, String comment, double rowCacheSize, double keyCacheSize, int cfId)
{
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=919158&r1=919157&r2=919158&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 Thu Mar 4 20:17:32 2010
@@ -562,29 +562,29 @@
}
/* See which replica placement strategy to use */
- String replicaPlacementStrategyClassName = xmlUtils.getNodeValue("/Storage/Keyspaces/Keyspace[@Name='" + ksName + "']/ReplicaPlacementStrategy");
- if (replicaPlacementStrategyClassName == null)
+ value = xmlUtils.getNodeValue("/Storage/Keyspaces/Keyspace[@Name='" + ksName + "']/ReplicaPlacementStrategy");
+ if (value == null)
{
throw new ConfigurationException("Missing replicaplacementstrategy directive for " + ksName);
}
- Class<? extends AbstractReplicationStrategy> repStratClass = null;
+ Class<? extends AbstractReplicationStrategy> strategyClass = null;
try
{
- repStratClass = (Class<? extends AbstractReplicationStrategy>) Class.forName(replicaPlacementStrategyClassName);
+ strategyClass = (Class<? extends AbstractReplicationStrategy>) Class.forName(value);
}
catch (ClassNotFoundException e)
{
- throw new ConfigurationException("Invalid replicaplacementstrategy class " + replicaPlacementStrategyClassName);
+ throw new ConfigurationException("Invalid replicaplacementstrategy class " + value);
}
/* Data replication factor */
- String replicationFactor = xmlUtils.getNodeValue("/Storage/Keyspaces/Keyspace[@Name='" + ksName + "']/ReplicationFactor");
- int repFact = -1;
- if (replicationFactor == null)
+ value = xmlUtils.getNodeValue("/Storage/Keyspaces/Keyspace[@Name='" + ksName + "']/ReplicationFactor");
+ int replicationFactor = -1;
+ if (value == null)
throw new ConfigurationException("Missing replicationfactor directory for keyspace " + ksName);
else
{
- repFact = Integer.parseInt(replicationFactor);
+ replicationFactor = Integer.parseInt(value);
}
/* end point snitch */
@@ -593,11 +593,11 @@
{
throw new ConfigurationException("Missing endpointsnitch directive for keyspace " + ksName);
}
- IEndPointSnitch epSnitch = null;
+ IEndPointSnitch snitch = null;
try
{
Class cls = Class.forName(endPointSnitchClassName);
- epSnitch = (IEndPointSnitch)cls.getConstructor().newInstance();
+ snitch = (IEndPointSnitch)cls.getConstructor().newInstance();
}
catch (ClassNotFoundException e)
{
@@ -688,7 +688,7 @@
cfDefs[j] = new CFMetaData(tableName, cfName, columnType, comparator, subcolumnComparator, comment, rowCacheSize, keyCacheSize);
}
- KSMetaData meta = new KSMetaData(ksName, repStratClass, repFact, epSnitch, cfDefs);
+ KSMetaData meta = new KSMetaData(ksName, strategyClass, replicationFactor, snitch, cfDefs);
tables.put(meta.name, meta);
}
}
@@ -830,12 +830,12 @@
public static IEndPointSnitch getEndPointSnitch(String table)
{
- return tables.get(table).epSnitch;
+ return tables.get(table).snitch;
}
public static Class<? extends AbstractReplicationStrategy> getReplicaPlacementStrategyClass(String table)
{
- return tables.get(table).repStratClass;
+ return tables.get(table).strategyClass;
}
public static String getJobTrackerAddress()
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java?rev=919158&r1=919157&r2=919158&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/config/KSMetaData.java Thu Mar 4 20:17:32 2010
@@ -34,17 +34,17 @@
public final class KSMetaData
{
public final String name;
- public final Class<? extends AbstractReplicationStrategy> repStratClass;
+ public final Class<? extends AbstractReplicationStrategy> strategyClass;
public final int replicationFactor;
- public final IEndPointSnitch epSnitch;
+ public final IEndPointSnitch snitch;
private final Map<String, CFMetaData> cfMetaData;
- KSMetaData(String name, Class<? extends AbstractReplicationStrategy> repStratClass, int replicationFactor, IEndPointSnitch epSnitch, CFMetaData... cfDefs)
+ KSMetaData(String name, Class<? extends AbstractReplicationStrategy> strategyClass, int replicationFactor, IEndPointSnitch snitch, CFMetaData... cfDefs)
{
this.name = name;
- this.repStratClass = repStratClass;
+ this.strategyClass = strategyClass;
this.replicationFactor = replicationFactor;
- this.epSnitch = epSnitch;
+ this.snitch = snitch;
Map<String, CFMetaData> cfmap = new HashMap<String, CFMetaData>();
for (CFMetaData cfm : cfDefs)
cfmap.put(cfm.cfName, cfm);
@@ -59,7 +59,7 @@
return false;
KSMetaData other = (KSMetaData)obj;
return other.name.equals(name)
- && FBUtilities.equals(other.repStratClass, repStratClass)
+ && FBUtilities.equals(other.strategyClass, strategyClass)
&& other.replicationFactor == replicationFactor
&& sameEpSnitch(other, this)
&& other.cfMetaData.size() == cfMetaData.size()
@@ -69,14 +69,14 @@
// epsnitches generally have no state, so comparing class names is sufficient.
private static boolean sameEpSnitch(KSMetaData a, KSMetaData b)
{
- if (a.epSnitch == null && b.epSnitch == null)
+ if (a.snitch == null && b.snitch == null)
return true;
- else if (a.epSnitch == null && b.epSnitch != null)
+ else if (a.snitch == null && b.snitch != null)
return false;
- else if (a.epSnitch != null && b.epSnitch == null)
+ else if (a.snitch != null && b.snitch == null)
return false;
else
- return a.epSnitch.getClass().getName().equals(b.epSnitch.getClass().getName());
+ return a.snitch.getClass().getName().equals(b.snitch.getClass().getName());
}
public Map<String, CFMetaData> cfMetaData()
@@ -89,13 +89,13 @@
ByteArrayOutputStream bout = new ByteArrayOutputStream();
DataOutputStream dout = new DataOutputStream(bout);
dout.writeUTF(ksm.name);
- dout.writeBoolean(ksm.repStratClass != null);
- if (ksm.repStratClass != null)
- dout.writeUTF(ksm.repStratClass.getName());
+ dout.writeBoolean(ksm.strategyClass != null);
+ if (ksm.strategyClass != null)
+ dout.writeUTF(ksm.strategyClass.getName());
dout.writeInt(ksm.replicationFactor);
- dout.writeBoolean(ksm.epSnitch != null);
- if (ksm.epSnitch != null)
- dout.writeUTF(ksm.epSnitch.getClass().getName());
+ dout.writeBoolean(ksm.snitch != null);
+ if (ksm.snitch != null)
+ dout.writeUTF(ksm.snitch.getClass().getName());
dout.writeInt(ksm.cfMetaData.size());
for (CFMetaData cfm : ksm.cfMetaData.values())
dout.write(CFMetaData.serialize(cfm));