You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/05/14 04:19:02 UTC
[1/2] git commit: Fix ColumnFamilyStoreTest, NativeCellTest,
SSTableMetadataTest unit tests on 2.1
Repository: cassandra
Updated Branches:
refs/heads/trunk 442f3025e -> 3cb736101
Fix ColumnFamilyStoreTest, NativeCellTest, SSTableMetadataTest unit tests on 2.1
Patch by Benedict Elliott Smith; reviewed by Michael Shuler for CASSANDRA-7201
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/50c18fd4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50c18fd4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50c18fd4
Branch: refs/heads/trunk
Commit: 50c18fd4038bdd2f52ec6769db0aaa65dd1deda6
Parents: fc59801
Author: Jake Luciani <ja...@apache.org>
Authored: Tue May 13 22:15:25 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Tue May 13 22:15:25 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/NativeCounterCell.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/50c18fd4/src/java/org/apache/cassandra/db/NativeCounterCell.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/NativeCounterCell.java b/src/java/org/apache/cassandra/db/NativeCounterCell.java
index 2828e13..5eba27c 100644
--- a/src/java/org/apache/cassandra/db/NativeCounterCell.java
+++ b/src/java/org/apache/cassandra/db/NativeCounterCell.java
@@ -17,6 +17,8 @@
*/
package org.apache.cassandra.db;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
import java.security.MessageDigest;
import org.apache.cassandra.config.CFMetaData;
@@ -66,6 +68,11 @@ public class NativeCounterCell extends NativeCell implements CounterCell
return getLong(internalSize() - 8);
}
+ public ByteBuffer value()
+ {
+ return super.value().order(ByteOrder.BIG_ENDIAN);
+ }
+
@Override
public long total()
{
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ja...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3cb73610
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3cb73610
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3cb73610
Branch: refs/heads/trunk
Commit: 3cb736101bc69fb64b7911f0ebbb73d3a08b9cc5
Parents: 442f302 50c18fd
Author: Jake Luciani <ja...@apache.org>
Authored: Tue May 13 22:18:48 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Tue May 13 22:18:48 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/NativeCounterCell.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------