Author: eevans
Date: Wed Mar 10 03:48:12 2010
New Revision: 921220
URL: http://svn.apache.org/viewvc?rev=921220&view=rev
Log:
make avro record factory methods public
Patch by eevans
Added:
incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/AvroRecordFactory.java
- copied, changed from r921126,
incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/RecordFactory.java
Removed:
incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/RecordFactory.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/AvroValidation.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
Copied:
incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/AvroRecordFactory.java
(from r921126,
incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/RecordFactory.java)
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/AvroRecordFactory.java?p2=incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/AvroRecordFactory.java&p1=incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/RecordFactory.java&r1=921126&r2=921220&rev=921220&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/RecordFactory.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/AvroRecordFactory.java
Wed Mar 10 03:48:12 2010
@@ -25,9 +25,9 @@ import java.nio.ByteBuffer;
import org.apache.avro.generic.GenericArray;
import org.apache.avro.util.Utf8;
-class RecordFactory
+public class AvroRecordFactory
{
- static Column newColumn(ByteBuffer name, ByteBuffer value, long timestamp)
+ public static Column newColumn(ByteBuffer name, ByteBuffer value, long
timestamp)
{
Column column = new Column();
column.name = name;
@@ -36,12 +36,12 @@ class RecordFactory
return column;
}
- static Column newColumn(byte[] name, byte[] value, long timestamp)
+ public static Column newColumn(byte[] name, byte[] value, long timestamp)
{
return newColumn(ByteBuffer.wrap(name), ByteBuffer.wrap(value),
timestamp);
}
- static SuperColumn newSuperColumn(ByteBuffer name, GenericArray<Column>
columns)
+ public static SuperColumn newSuperColumn(ByteBuffer name,
GenericArray<Column> columns)
{
SuperColumn column = new SuperColumn();
column.name = name;
@@ -49,26 +49,26 @@ class RecordFactory
return column;
}
- static SuperColumn newSuperColumn(byte[] name, GenericArray<Column>
columns)
+ public static SuperColumn newSuperColumn(byte[] name, GenericArray<Column>
columns)
{
return newSuperColumn(ByteBuffer.wrap(name), columns);
}
- static ColumnOrSuperColumn newColumnOrSuperColumn(Column column)
+ public static ColumnOrSuperColumn newColumnOrSuperColumn(Column column)
{
ColumnOrSuperColumn col = new ColumnOrSuperColumn();
col.column = column;
return col;
}
- static ColumnOrSuperColumn newColumnOrSuperColumn(SuperColumn superColumn)
+ public static ColumnOrSuperColumn newColumnOrSuperColumn(SuperColumn
superColumn)
{
ColumnOrSuperColumn column = new ColumnOrSuperColumn();
column.super_column = superColumn;
return column;
}
- static ColumnPath newColumnPath(String cfName, ByteBuffer superColumn,
ByteBuffer column)
+ public static ColumnPath newColumnPath(String cfName, ByteBuffer
superColumn, ByteBuffer column)
{
ColumnPath cPath = new ColumnPath();
cPath.column_family = new Utf8(cfName);
@@ -76,6 +76,13 @@ class RecordFactory
cPath.column = column;
return cPath;
}
+
+ public static ColumnPath newColumnPath(String cfName, byte[] superColumn,
byte[] column)
+ {
+ ByteBuffer wrappedSuperColumn = (superColumn != null) ?
ByteBuffer.wrap(superColumn) : null;
+ ByteBuffer wrappedColumn = (column != null) ? ByteBuffer.wrap(column)
: null;
+ return newColumnPath(cfName, wrappedSuperColumn, wrappedColumn);
+ }
}
class ErrorFactory
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/AvroValidation.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/AvroValidation.java?rev=921220&r1=921219&r2=921220&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/AvroValidation.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/AvroValidation.java
Wed Mar 10 03:48:12 2010
@@ -30,7 +30,7 @@ import org.apache.cassandra.db.marshal.A
import org.apache.cassandra.db.marshal.MarshalException;
import static
org.apache.cassandra.avro.ErrorFactory.newInvalidRequestException;
-import static org.apache.cassandra.avro.RecordFactory.newColumnPath;
+import static org.apache.cassandra.avro.AvroRecordFactory.newColumnPath;
/**
* The Avro analogue to org.apache.cassandra.service.ThriftValidation
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java?rev=921220&r1=921219&r2=921220&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
Wed Mar 10 03:48:12 2010
@@ -46,7 +46,7 @@ import org.apache.cassandra.db.filter.Qu
import org.apache.cassandra.db.marshal.MarshalException;
import org.apache.cassandra.service.StorageProxy;
import org.apache.log4j.Logger;
-import static org.apache.cassandra.avro.RecordFactory.*;
+import static org.apache.cassandra.avro.AvroRecordFactory.*;
import static org.apache.cassandra.avro.ErrorFactory.*;
public class CassandraServer implements Cassandra {
