You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by gd...@apache.org on 2011/03/16 15:18:21 UTC
svn commit: r1082155 - in /cassandra/trunk: CHANGES.txt
src/java/org/apache/cassandra/db/marshal/AbstractCommutativeType.java
Author: gdusbabek
Date: Wed Mar 16 14:18:21 2011
New Revision: 1082155
URL: http://svn.apache.org/viewvc?rev=1082155&view=rev
Log:
fix merge problem with CHANGES.txt, use right call in AbstractCommutativeType.compose()
Modified:
cassandra/trunk/CHANGES.txt
cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AbstractCommutativeType.java
Modified: cassandra/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1082155&r1=1082154&r2=1082155&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Wed Mar 16 14:18:21 2011
@@ -1,4 +1,3 @@
-<<<<<<< .working
0.8-dev
* avoid double RowMutation serialization on write path (CASSANDRA-1800)
* adds support for columns that act as incr/decr counters
@@ -12,7 +11,6 @@
* Fix for Cli to support updating replicate_on_write (CASSANDRA-2236)
-=======
0.7.5
* Avoid seeking when sstable2json exports the entire file (CASSANDRA-2318)
* fix tombstone handling in repair and sstable2json (CASSANDRA-2279)
@@ -24,7 +22,6 @@
* shut down server for OOM on a Thrift thread (CASSANDRA-2269)
->>>>>>> .merge-right.r1081840
0.7.4
* add nodetool join command (CASSANDRA-2160)
* fix secondary indexes on pre-existing or streamed data (CASSANDRA-2244)
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AbstractCommutativeType.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AbstractCommutativeType.java?rev=1082155&r1=1082154&r2=1082155&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AbstractCommutativeType.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/marshal/AbstractCommutativeType.java Wed Mar 16 14:18:21 2011
@@ -20,12 +20,10 @@
*/
package org.apache.cassandra.db.marshal;
-import java.net.InetAddress;
import java.nio.ByteBuffer;
import org.apache.cassandra.db.Column;
-import org.apache.cassandra.db.IColumnContainer;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.db.context.CounterContext;
public abstract class AbstractCommutativeType extends AbstractType<Long>
{
@@ -36,7 +34,7 @@ public abstract class AbstractCommutativ
public Long compose(ByteBuffer bytes)
{
- return ByteBufferUtil.toLong(bytes);
+ return CounterContext.instance().total(bytes);
}
/**