svn commit: r1140585 - in /cassandra/branches/cassandra-0.8: CHANGES.txt NEWS.txt build.xml src/java/org/apache/cassandra/config/CFMetaData.java

[sl...@apache.org]

Author: slebresne
Date: Tue Jun 28 13:14:55 2011
New Revision: 1140585

URL: http://svn.apache.org/viewvc?rev=1140585&view=rev
Log:
Fix incorrect default setting for replicate_on_write
patch by slebresne; reviewed by jbellis for CASSANDRA-2835

Modified:
    cassandra/branches/cassandra-0.8/CHANGES.txt
    cassandra/branches/cassandra-0.8/NEWS.txt
    cassandra/branches/cassandra-0.8/build.xml
    cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1140585&r1=1140584&r2=1140585&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Tue Jun 28 13:14:55 2011
@@ -10,6 +10,7 @@
  * fix potential NPE while scheduling read repair for range slice
    (CASSANDRA-2823)
  * Fix race in SystemTable.getCurrentLocalNodeId (CASSANDRA-2824)
+ * Correctly set default for replicate_on_write (CASSANDRA-2835)
 
 
 0.8.1

Modified: cassandra/branches/cassandra-0.8/NEWS.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/NEWS.txt?rev=1140585&r1=1140584&r2=1140585&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/NEWS.txt (original)
+++ cassandra/branches/cassandra-0.8/NEWS.txt Tue Jun 28 13:14:55 2011
@@ -1,3 +1,17 @@
+0.8.2
+=====
+
+Upgrading
+---------
+    - 0.8.0 and 0.8.1 shipped with a bug that was setting the
+      replicate_on_write option for counter column families to false (this
+      option has no effect on non-counter column family). This is an unsafe
+      default and 0.8.2 correct this, the default for replicate_on_write is
+      now true. It is advised to update your counter column family definitions
+      if replicate_on_write was uncorrectly set to false (before or after
+      upgrade).
+
+
 0.8.1
 =====
 

Modified: cassandra/branches/cassandra-0.8/build.xml
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/build.xml?rev=1140585&r1=1140584&r2=1140585&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/build.xml (original)
+++ cassandra/branches/cassandra-0.8/build.xml Tue Jun 28 13:14:55 2011
@@ -25,7 +25,7 @@
     <property name="debuglevel" value="source,lines,vars"/>
 
     <!-- default version and SCM information (we need the default SCM info as people may checkout with git-svn) -->
-    <property name="base.version" value="0.8.1"/>
+    <property name="base.version" value="0.8.2-dev"/>
     <property name="scm.default.path" value="cassandra/branches/cassandra-0.8"/>
     <property name="scm.default.connection" value="scm:svn:http://svn.apache.org/repos/asf/${scm.default.path}"/>
     <property name="scm.default.developerConnection" value="scm:svn:https://svn.apache.org/repos/asf/${scm.default.path}"/>

Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java?rev=1140585&r1=1140584&r2=1140585&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java Tue Jun 28 13:14:55 2011
@@ -614,6 +614,8 @@ public final class CFMetaData
     {
         if (!cf_def.isSetComment())
             cf_def.setComment("");
+        if (!cf_def.isSetReplicate_on_write())
+            cf_def.setReplicate_on_write(CFMetaData.DEFAULT_REPLICATE_ON_WRITE);
         if (!cf_def.isSetMin_compaction_threshold())
             cf_def.setMin_compaction_threshold(CFMetaData.DEFAULT_MIN_COMPACTION_THRESHOLD);
         if (!cf_def.isSetMax_compaction_threshold())