From 5506a44d0a1e04a3d471b43dcf00b21608edd50f Mon Sep 17 00:00:00 2001 From: Avinash Lakshman Date: Sun, 22 Mar 2009 18:46:02 +0000 Subject: [PATCH] Applied the patch for returning a valid Column Sort type. git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@757232 13f79535-47bb-0310-9956-ffa450edef68 --- src/org/apache/cassandra/db/ColumnFamily.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/org/apache/cassandra/db/ColumnFamily.java b/src/org/apache/cassandra/db/ColumnFamily.java index 51c2c3281a..591ebd6d50 100644 --- a/src/org/apache/cassandra/db/ColumnFamily.java +++ b/src/org/apache/cassandra/db/ColumnFamily.java @@ -42,7 +42,8 @@ import org.apache.cassandra.io.*; public final class ColumnFamily implements Serializable { private static ICompactSerializer2 serializer_; - public static final short utfPrefix_ = 2; + public static final short utfPrefix_ = 2; + public static final String defaultColumnSortProperty_ = "Time"; /* The column serializer for this Column Family. Create based on config. */ private static Logger logger_ = Logger.getLogger( ColumnFamily.class ); @@ -85,7 +86,8 @@ public final class ColumnFamily implements Serializable { if ( columnIndexProperty == null ) return indexTypes_.get("Time"); - return indexTypes_.get(columnIndexProperty); + String columnSortType = indexTypes_.get(columnIndexProperty); + return (columnSortType == null) ? ColumnFamily.defaultColumnSortProperty_ : columnSortType; } private transient AbstractColumnFactory columnFactory_; @@ -493,12 +495,11 @@ class ColumnFamilySerializer implements ICompactSerializer2 /* write if this cf is marked for delete */ dos.writeBoolean(columnFamily.isMarkedForDelete()); /* write the size is the number of columns */ - dos.writeInt(columns.size()); - + dos.writeInt(columns.size()); /* write the column data */ for ( IColumn column : columns ) { - columnFamily.getColumnSerializer().serialize(column, dos); + columnFamily.getColumnSerializer().serialize(column, dos); } }