svn commit: r992014 - in /cassandra/trunk/src/java/org/apache/cassandra/avro: AvroRecordFactory.java CassandraServer.java

[gdusbabek]

Author: gdusbabek
Date: Thu Sep  2 16:42:22 2010
New Revision: 992014

URL: http://svn.apache.org/viewvc?rev=992014&view=rev
Log:
avronateSubcolumns was assuming avro array

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/avro/AvroRecordFactory.java
    cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/avro/AvroRecordFactory.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/avro/AvroRecordFactory.java?rev=992014&r1=992013&r2=992014&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/avro/AvroRecordFactory.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/avro/AvroRecordFactory.java 
Thu Sep  2 16:42:22 2010
@@ -51,7 +51,7 @@ public class AvroRecordFactory
         return newColumn(ByteBuffer.wrap(name), ByteBuffer.wrap(value), clock);
     }
     
-    public static SuperColumn newSuperColumn(ByteBuffer name, 
GenericArray<Column> columns)
+    public static SuperColumn newSuperColumn(ByteBuffer name, List<Column> 
columns)
     {
         SuperColumn column = new SuperColumn();
         column.name = name;
@@ -59,7 +59,7 @@ public class AvroRecordFactory
         return column;
     }
     
-    public static SuperColumn newSuperColumn(byte[] name, GenericArray<Column> 
columns)
+    public static SuperColumn newSuperColumn(byte[] name, List<Column> columns)
     {
         return newSuperColumn(ByteBuffer.wrap(name), columns);
     }

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java?rev=992014&r1=992013&r2=992014&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java Thu 
Sep  2 16:42:22 2010
@@ -200,12 +200,12 @@ public class CassandraServer implements 
     }
     
     // Don't playa hate, avronate.
-    private GenericArray<Column> avronateSubColumns(Collection<IColumn> 
columns)
+    private List<Column> avronateSubColumns(Collection<IColumn> columns)
     {
         if (columns == null || columns.isEmpty())
             return EMPTY_SUBCOLUMNS;
         
-        GenericData.Array<Column> avroColumns = new 
GenericData.Array<Column>(columns.size(), Column.SCHEMA$);
+        List<Column> avroColumns = new ArrayList<Column>(columns.size());
 
         for (IColumn column : columns)
         {
@@ -256,7 +256,7 @@ public class CassandraServer implements 
         ArrayList<ColumnOrSuperColumn> avroSuperColumns = new 
ArrayList<ColumnOrSuperColumn>(columns.size());
         for (IColumn column: columns)
         {
-            GenericArray<Column> subColumns = 
avronateSubColumns(column.getSubColumns());
+            List<Column> subColumns = 
avronateSubColumns(column.getSubColumns());
             if (subColumns.size() == 0)
                 continue;
             SuperColumn superColumn = newSuperColumn(column.name(), 
subColumns);