svn commit: r809645 - in /incubator/cassandra/trunk: CHANGES.txt conf/storage-conf.xml src/java/org/apache/cassandra/config/DatabaseDescriptor.java

[jb...@apache.org]

Author: jbellis
Date: Mon Aug 31 16:07:37 2009
New Revision: 809645

URL: http://svn.apache.org/viewvc?rev=809645&view=rev
Log:
change default comparator to BytesType
patch by jbellis; reviewed by Chris Goffinet for CASSANDRA-400

Modified:
    incubator/cassandra/trunk/CHANGES.txt
    incubator/cassandra/trunk/conf/storage-conf.xml
    incubator/cassandra/trunk/src/java/org/apache/cassandra/config/DatabaseDescriptor.java

Modified: incubator/cassandra/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/CHANGES.txt?rev=809645&r1=809644&r2=809645&view=diff
==============================================================================
--- incubator/cassandra/trunk/CHANGES.txt (original)
+++ incubator/cassandra/trunk/CHANGES.txt Mon Aug 31 16:07:37 2009
@@ -8,6 +8,8 @@
    disagree on what data was present
  * Configurable LRU cache for key lookups
  * Snapshot support via JMX
+ * BinaryMemtable support for bulk load via hadoop; see
+   https://github.com/lenn0x/Cassandra-Hadoop-BMT/tree
  * Thrift API has changed a _lot_:
     - removed time-sorted CFs; instead, user-defined comparators
       may be defined on the column names, which are now byte arrays.

Modified: incubator/cassandra/trunk/conf/storage-conf.xml
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/conf/storage-conf.xml?rev=809645&r1=809644&r2=809645&view=diff
==============================================================================
--- incubator/cassandra/trunk/conf/storage-conf.xml (original)
+++ incubator/cassandra/trunk/conf/storage-conf.xml Mon Aug 31 16:07:37 2009
@@ -55,12 +55,12 @@
       <KeysCachedFraction>0.01</KeysCachedFraction>
       <!-- 
        ~ The CompareWith attribute tells Cassandra how to sort the columns
-       ~ for slicing operations.  For backwards compatibility, the default
-       ~ is to use AsciiType, which is probably NOT what you want.  Other
-       ~ options are BytesType, UTF8Type, LexicalUUIDType, TimeUUIDType,
+       ~ for slicing operations.  The default is BytesType, which is a
+       ~ straightforward lexical comparison of the bytes in each column.
+       ~ Other options are AsciiType, UTF8Type, LexicalUUIDType, TimeUUIDType,
        ~ and LongType.  You can also specify the fully-qualified class
-       ~ name to a class of your choice implementing 
-       ~ org.apache.cassandra.db.marshal.IType.
+       ~ name to a class of your choice extending
+       ~ org.apache.cassandra.db.marshal.AbstractType.
        ~ 
        ~ SuperColumns have a similar CompareSubcolumnsWith attribute.
        ~ 
@@ -80,7 +80,7 @@
        ~ is intended for lightly-used columnfamilies so that they do not
        ~ prevent commitlog segments from being purged. 
       -->
-      <ColumnFamily CompareWith="UTF8Type"
+      <ColumnFamily CompareWith="BytesType"
                     Name="Standard1"
                     FlushPeriodInMinutes="60"/>
       <ColumnFamily CompareWith="UTF8Type" Name="Standard2"/>

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=809645&r1=809644&r2=809645&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 Mon Aug 31 16:07:37 2009
@@ -609,7 +609,7 @@
         String compareWith = XMLUtils.getAttributeValue(columnFamily, attr);
         if (compareWith == null)
         {
-            typeClass = AsciiType.class;
+            typeClass = BytesType.class;
         }
         else
         {