Author: eevans
Date: Wed Sep 1 14:01:11 2010
New Revision: 991544
URL: http://svn.apache.org/viewvc?rev=991544&view=rev
Log:
upgrade to avro 1.4.0 rc3
Added:
cassandra/trunk/lib/avro-1.4.0~rc3-sources.jar
- copied, changed from r991210,
cassandra/trunk/lib/avro-1.4.0-sources~r986959.jar
cassandra/trunk/lib/avro-1.4.0~rc3.jar
- copied, changed from r991210, cassandra/trunk/lib/avro-1.4.0~r986959.jar
Removed:
cassandra/trunk/lib/avro-1.4.0-sources~r986959.jar
cassandra/trunk/lib/avro-1.4.0~r986959.jar
Modified:
cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
Copied: cassandra/trunk/lib/avro-1.4.0~rc3-sources.jar (from r991210,
cassandra/trunk/lib/avro-1.4.0-sources~r986959.jar)
URL:
http://svn.apache.org/viewvc/cassandra/trunk/lib/avro-1.4.0%7Erc3-sources.jar?p2=cassandra/trunk/lib/avro-1.4.0%7Erc3-sources.jar&p1=cassandra/trunk/lib/avro-1.4.0-sources%7Er986959.jar&r1=991210&r2=991544&rev=991544&view=diff
==============================================================================
Files cassandra/trunk/lib/avro-1.4.0-sources~r986959.jar (original) and
cassandra/trunk/lib/avro-1.4.0~rc3-sources.jar Wed Sep 1 14:01:11 2010 differ
Copied: cassandra/trunk/lib/avro-1.4.0~rc3.jar (from r991210,
cassandra/trunk/lib/avro-1.4.0~r986959.jar)
URL:
http://svn.apache.org/viewvc/cassandra/trunk/lib/avro-1.4.0%7Erc3.jar?p2=cassandra/trunk/lib/avro-1.4.0%7Erc3.jar&p1=cassandra/trunk/lib/avro-1.4.0%7Er986959.jar&r1=991210&r2=991544&rev=991544&view=diff
==============================================================================
Files cassandra/trunk/lib/avro-1.4.0~r986959.jar (original) and
cassandra/trunk/lib/avro-1.4.0~rc3.jar Wed Sep 1 14:01:11 2010 differ
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=991544&r1=991543&r2=991544&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java Wed
Sep 1 14:01:11 2010
@@ -279,7 +279,7 @@ public class CassandraServer implements
}
@Override
- public GenericArray<ColumnOrSuperColumn> get_slice(ByteBuffer key,
ColumnParent columnParent,
+ public List<ColumnOrSuperColumn> get_slice(ByteBuffer key, ColumnParent
columnParent,
SlicePredicate predicate, ConsistencyLevel consistencyLevel)
throws AvroRemoteException, InvalidRequestException, UnavailableException,
TimedOutException
{
@@ -293,7 +293,7 @@ public class CassandraServer implements
return multigetSliceInternal(clientState.getKeyspace(), keys,
columnParent, predicate, consistencyLevel).iterator().next().columns;
}
- private GenericArray<CoscsMapEntry> multigetSliceInternal(String keyspace,
GenericArray<ByteBuffer> keys,
+ private List<CoscsMapEntry> multigetSliceInternal(String keyspace,
List<ByteBuffer> keys,
ColumnParent columnParent, SlicePredicate predicate,
ConsistencyLevel consistencyLevel)
throws InvalidRequestException, UnavailableException, TimedOutException
{
@@ -331,12 +331,12 @@ public class CassandraServer implements
return getSlice(commands, consistencyLevel);
}
- private GenericArray<CoscsMapEntry> getSlice(List<ReadCommand> commands,
ConsistencyLevel consistencyLevel)
+ private List<CoscsMapEntry> getSlice(List<ReadCommand> commands,
ConsistencyLevel consistencyLevel)
throws InvalidRequestException, UnavailableException, TimedOutException
{
Map<DecoratedKey<?>, ColumnFamily> columnFamilies =
readColumnFamily(commands, consistencyLevel);
Schema sch = Schema.createArray(CoscsMapEntry.SCHEMA$);
- GenericArray<CoscsMapEntry> columnFamiliesList = new
GenericData.Array<CoscsMapEntry>(commands.size(), sch);
+ List<CoscsMapEntry> columnFamiliesList = new
GenericData.Array<CoscsMapEntry>(commands.size(), sch);
for (ReadCommand cmd : commands)
{
@@ -360,7 +360,7 @@ public class CassandraServer implements
}
@Override
- public GenericArray<CoscsMapEntry> multiget_slice(GenericArray<ByteBuffer>
keys, ColumnParent columnParent,
+ public List<CoscsMapEntry> multiget_slice(List<ByteBuffer> keys,
ColumnParent columnParent,
SlicePredicate predicate, ConsistencyLevel consistencyLevel)
throws AvroRemoteException, InvalidRequestException, UnavailableException,
TimedOutException
{
@@ -442,7 +442,7 @@ public class CassandraServer implements
}
@Override
- public Void batch_mutate(GenericArray<MutationsMapEntry> mutationMap,
ConsistencyLevel consistencyLevel)
+ public Void batch_mutate(List<MutationsMapEntry> mutationMap,
ConsistencyLevel consistencyLevel)
throws AvroRemoteException, InvalidRequestException, UnavailableException,
TimedOutException
{
if (logger.isDebugEnabled())
@@ -453,9 +453,9 @@ public class CassandraServer implements
for (MutationsMapEntry pair: mutationMap)
{
AvroValidation.validateKey(pair.key.array());
- Map<CharSequence, GenericArray<Mutation>> cfToMutations =
pair.mutations;
+ Map<CharSequence, List<Mutation>> cfToMutations = pair.mutations;
- for (Map.Entry<CharSequence, GenericArray<Mutation>> cfMutations :
cfToMutations.entrySet())
+ for (Map.Entry<CharSequence, List<Mutation>> cfMutations :
cfToMutations.entrySet())
{
String cfName = cfMutations.getKey().toString();
@@ -493,11 +493,11 @@ public class CassandraServer implements
}
// FIXME: This is copypasta from o.a.c.db.RowMutation,
(RowMutation.getRowMutation uses Thrift types directly).
- private static RowMutation getRowMutationFromMutations(String keyspace,
byte[] key, Map<CharSequence, GenericArray<Mutation>> cfMap)
+ private static RowMutation getRowMutationFromMutations(String keyspace,
byte[] key, Map<CharSequence, List<Mutation>> cfMap)
{
RowMutation rm = new RowMutation(keyspace, key);
- for (Map.Entry<CharSequence, GenericArray<Mutation>> entry :
cfMap.entrySet())
+ for (Map.Entry<CharSequence, List<Mutation>> entry : cfMap.entrySet())
{
String cfName = entry.getKey().toString();
