Author: jbellis Date: Wed Oct 19 04:00:28 2011 New Revision: 1185960 URL: http://svn.apache.org/viewvc?rev=1185960&view=rev Log: rename KSM.durable_writes -> durableWrites + cleanup
Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/KSMetaData.java cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/RowMutation.java cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/migration/UpdateKeyspace.java cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/KSMetaData.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/KSMetaData.java?rev=1185960&r1=1185959&r2=1185960&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/KSMetaData.java (original) +++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/KSMetaData.java Wed Oct 19 04:00:28 2011 @@ -37,7 +37,7 @@ public final class KSMetaData public final Class<? extends AbstractReplicationStrategy> strategyClass; public final Map<String, String> strategyOptions; private final Map<String, CFMetaData> cfMetaData; - private boolean durable_writes; + public final boolean durableWrites; public KSMetaData(String name, Class<? extends AbstractReplicationStrategy> strategyClass, Map<String, String> strategyOptions, CFMetaData... cfDefs) { @@ -53,19 +53,9 @@ public final class KSMetaData for (CFMetaData cfm : cfDefs) cfmap.put(cfm.cfName, cfm); this.cfMetaData = Collections.unmodifiableMap(cfmap); - this.durable_writes = durable_writes; + this.durableWrites = durable_writes; } - - public void setDurableWrites(boolean durable_writes) - { - this.durable_writes = durable_writes; - } - - public boolean isDurableWrites() - { - return durable_writes; - } - + public static Map<String, String> forwardsCompatibleOptions(KsDef ks_def) { Map<String, String> options; @@ -98,7 +88,7 @@ public final class KSMetaData && ObjectUtils.equals(other.strategyOptions, strategyOptions) && other.cfMetaData.size() == cfMetaData.size() && other.cfMetaData.equals(cfMetaData) - && other.durable_writes == durable_writes; + && other.durableWrites == durableWrites; } public Map<String, CFMetaData> cfMetaData() @@ -123,7 +113,7 @@ public final class KSMetaData for (CFMetaData cfm : cfMetaData.values()) ks.cf_defs.add(cfm.deflate()); - ks.durable_writes = durable_writes; + ks.durable_writes = durableWrites; return ks; } @@ -138,7 +128,7 @@ public final class KSMetaData .append("{") .append(StringUtils.join(cfMetaData.values(), ", ")) .append("}") - .append(", durable_writes: ").append(durable_writes); + .append(", durable_writes: ").append(durableWrites); return sb.toString(); } @@ -214,7 +204,7 @@ public final class KSMetaData ksdef.setStrategy_options(ksm.strategyOptions); if (ksm.strategyOptions != null && ksm.strategyOptions.containsKey("replication_factor")) ksdef.setReplication_factor(Integer.parseInt(ksm.strategyOptions.get("replication_factor"))); - ksdef.setDurable_writes(ksm.durable_writes); + ksdef.setDurable_writes(ksm.durableWrites); return ksdef; } Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/RowMutation.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/RowMutation.java?rev=1185960&r1=1185959&r2=1185960&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/RowMutation.java (original) +++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/RowMutation.java Wed Oct 19 04:00:28 2011 @@ -212,7 +212,7 @@ public class RowMutation implements IMut { KSMetaData ksm = DatabaseDescriptor.getTableDefinition(getTable()); - Table.open(table_).apply(this, ksm.isDurableWrites()); + Table.open(table_).apply(this, ksm.durableWrites); } public void applyUnsafe() throws IOException Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/migration/UpdateKeyspace.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/migration/UpdateKeyspace.java?rev=1185960&r1=1185959&r2=1185960&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/migration/UpdateKeyspace.java (original) +++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/migration/UpdateKeyspace.java Wed Oct 19 04:00:28 2011 @@ -52,7 +52,7 @@ public class UpdateKeyspace extends Migr if (oldKsm == null) throw new ConfigurationException(ksm.name + " cannot be updated because it doesn't exist."); - this.newKsm = new KSMetaData(ksm.name, ksm.strategyClass, ksm.strategyOptions, ksm.isDurableWrites(), oldKsm.cfMetaData().values().toArray(new CFMetaData[]{})); + this.newKsm = new KSMetaData(ksm.name, ksm.strategyClass, ksm.strategyOptions, ksm.durableWrites, oldKsm.cfMetaData().values().toArray(new CFMetaData[]{})); rm = makeDefinitionMutation(newKsm, oldKsm, newVersion); } Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java?rev=1185960&r1=1185959&r2=1185960&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java (original) +++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java Wed Oct 19 04:00:28 2011 @@ -416,7 +416,7 @@ public class StorageService implements I for (Table table : Table.all()) { KSMetaData ksm = DatabaseDescriptor.getKSMetaData(table.name); - if (!ksm.isDurableWrites()) + if (!ksm.durableWrites) { for (ColumnFamilyStore cfs : table.getColumnFamilyStores()) {