You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/08/21 19:31:57 UTC
[01/10] git commit: use long math on deserialize as well patch by
Taylan Develioglu; reviewed by jbellis for CASSANDRA-5903
Updated Branches:
refs/heads/cassandra-1.2 dd65e88a7 -> 572cddc30
refs/heads/cassandra-2.0 b362aebd3 -> 9e2961964
refs/heads/cassandra-2.0.0 c8b220ba1 -> 9dc4c16d7
refs/heads/trunk 0da21de3e -> 487e3de05
use long math on deserialize as well
patch by Taylan Develioglu; reviewed by jbellis for CASSANDRA-5903
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/572cddc3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/572cddc3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/572cddc3
Branch: refs/heads/cassandra-1.2
Commit: 572cddc3008780a1ea08ffaaa468821e42ab7100
Parents: dd65e88
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 21 12:30:08 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 21 12:30:29 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/572cddc3/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java b/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
index b7bb733..fb32043 100644
--- a/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
+++ b/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
@@ -119,9 +119,9 @@ public class OffHeapBitSet implements IBitSet
public static OffHeapBitSet deserialize(DataInput dis) throws IOException
{
- int byteCount = dis.readInt() * 8;
+ long byteCount = dis.readInt() * 8L;
Memory memory = RefCountedMemory.allocate(byteCount);
- for (int i = 0; i < byteCount;)
+ for (long i = 0; i < byteCount;)
{
long v = dis.readLong();
memory.setByte(i++, (byte) (v >>> 0));
[07/10] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9dc4c16d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9dc4c16d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9dc4c16d
Branch: refs/heads/trunk
Commit: 9dc4c16d7e535eaed36ad112986304812d6147be
Parents: c8b220b 572cddc
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 21 12:31:17 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 21 12:31:17 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9dc4c16d/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
index 2f5e5ca,fb32043..438d90f
--- a/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
+++ b/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
@@@ -117,13 -117,13 +117,13 @@@ public class OffHeapBitSet implements I
return type.sizeof((int) bytes.size()) + bytes.size();
}
- public static OffHeapBitSet deserialize(DataInput dis) throws IOException
+ public static OffHeapBitSet deserialize(DataInput in) throws IOException
{
- int byteCount = in.readInt() * 8;
- long byteCount = dis.readInt() * 8L;
++ long byteCount = in.readInt() * 8L;
Memory memory = RefCountedMemory.allocate(byteCount);
- for (int i = 0; i < byteCount;)
+ for (long i = 0; i < byteCount;)
{
- long v = dis.readLong();
+ long v = in.readLong();
memory.setByte(i++, (byte) (v >>> 0));
memory.setByte(i++, (byte) (v >>> 8));
memory.setByte(i++, (byte) (v >>> 16));
[02/10] git commit: use long math on deserialize as well patch by
Taylan Develioglu; reviewed by jbellis for CASSANDRA-5903
Posted by jb...@apache.org.
use long math on deserialize as well
patch by Taylan Develioglu; reviewed by jbellis for CASSANDRA-5903
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/572cddc3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/572cddc3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/572cddc3
Branch: refs/heads/cassandra-2.0.0
Commit: 572cddc3008780a1ea08ffaaa468821e42ab7100
Parents: dd65e88
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 21 12:30:08 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 21 12:30:29 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/572cddc3/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java b/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
index b7bb733..fb32043 100644
--- a/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
+++ b/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
@@ -119,9 +119,9 @@ public class OffHeapBitSet implements IBitSet
public static OffHeapBitSet deserialize(DataInput dis) throws IOException
{
- int byteCount = dis.readInt() * 8;
+ long byteCount = dis.readInt() * 8L;
Memory memory = RefCountedMemory.allocate(byteCount);
- for (int i = 0; i < byteCount;)
+ for (long i = 0; i < byteCount;)
{
long v = dis.readLong();
memory.setByte(i++, (byte) (v >>> 0));
[04/10] git commit: use long math on deserialize as well patch by
Taylan Develioglu; reviewed by jbellis for CASSANDRA-5903
Posted by jb...@apache.org.
use long math on deserialize as well
patch by Taylan Develioglu; reviewed by jbellis for CASSANDRA-5903
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/572cddc3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/572cddc3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/572cddc3
Branch: refs/heads/trunk
Commit: 572cddc3008780a1ea08ffaaa468821e42ab7100
Parents: dd65e88
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 21 12:30:08 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 21 12:30:29 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/572cddc3/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java b/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
index b7bb733..fb32043 100644
--- a/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
+++ b/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
@@ -119,9 +119,9 @@ public class OffHeapBitSet implements IBitSet
public static OffHeapBitSet deserialize(DataInput dis) throws IOException
{
- int byteCount = dis.readInt() * 8;
+ long byteCount = dis.readInt() * 8L;
Memory memory = RefCountedMemory.allocate(byteCount);
- for (int i = 0; i < byteCount;)
+ for (long i = 0; i < byteCount;)
{
long v = dis.readLong();
memory.setByte(i++, (byte) (v >>> 0));
[09/10] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9e296196
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e296196
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e296196
Branch: refs/heads/cassandra-2.0
Commit: 9e2961964e8b6129ff03fd066951fcad3be12742
Parents: b362aeb 9dc4c16
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 21 12:31:42 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 21 12:31:42 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[08/10] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9e296196
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e296196
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e296196
Branch: refs/heads/trunk
Commit: 9e2961964e8b6129ff03fd066951fcad3be12742
Parents: b362aeb 9dc4c16
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 21 12:31:42 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 21 12:31:42 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[03/10] git commit: use long math on deserialize as well patch by
Taylan Develioglu; reviewed by jbellis for CASSANDRA-5903
Posted by jb...@apache.org.
use long math on deserialize as well
patch by Taylan Develioglu; reviewed by jbellis for CASSANDRA-5903
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/572cddc3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/572cddc3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/572cddc3
Branch: refs/heads/cassandra-2.0
Commit: 572cddc3008780a1ea08ffaaa468821e42ab7100
Parents: dd65e88
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 21 12:30:08 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 21 12:30:29 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/572cddc3/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java b/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
index b7bb733..fb32043 100644
--- a/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
+++ b/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
@@ -119,9 +119,9 @@ public class OffHeapBitSet implements IBitSet
public static OffHeapBitSet deserialize(DataInput dis) throws IOException
{
- int byteCount = dis.readInt() * 8;
+ long byteCount = dis.readInt() * 8L;
Memory memory = RefCountedMemory.allocate(byteCount);
- for (int i = 0; i < byteCount;)
+ for (long i = 0; i < byteCount;)
{
long v = dis.readLong();
memory.setByte(i++, (byte) (v >>> 0));
[05/10] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9dc4c16d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9dc4c16d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9dc4c16d
Branch: refs/heads/cassandra-2.0
Commit: 9dc4c16d7e535eaed36ad112986304812d6147be
Parents: c8b220b 572cddc
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 21 12:31:17 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 21 12:31:17 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9dc4c16d/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
index 2f5e5ca,fb32043..438d90f
--- a/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
+++ b/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
@@@ -117,13 -117,13 +117,13 @@@ public class OffHeapBitSet implements I
return type.sizeof((int) bytes.size()) + bytes.size();
}
- public static OffHeapBitSet deserialize(DataInput dis) throws IOException
+ public static OffHeapBitSet deserialize(DataInput in) throws IOException
{
- int byteCount = in.readInt() * 8;
- long byteCount = dis.readInt() * 8L;
++ long byteCount = in.readInt() * 8L;
Memory memory = RefCountedMemory.allocate(byteCount);
- for (int i = 0; i < byteCount;)
+ for (long i = 0; i < byteCount;)
{
- long v = dis.readLong();
+ long v = in.readLong();
memory.setByte(i++, (byte) (v >>> 0));
memory.setByte(i++, (byte) (v >>> 8));
memory.setByte(i++, (byte) (v >>> 16));
[06/10] git commit: merge from 1.2
Posted by jb...@apache.org.
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9dc4c16d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9dc4c16d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9dc4c16d
Branch: refs/heads/cassandra-2.0.0
Commit: 9dc4c16d7e535eaed36ad112986304812d6147be
Parents: c8b220b 572cddc
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 21 12:31:17 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 21 12:31:17 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9dc4c16d/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
index 2f5e5ca,fb32043..438d90f
--- a/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
+++ b/src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java
@@@ -117,13 -117,13 +117,13 @@@ public class OffHeapBitSet implements I
return type.sizeof((int) bytes.size()) + bytes.size();
}
- public static OffHeapBitSet deserialize(DataInput dis) throws IOException
+ public static OffHeapBitSet deserialize(DataInput in) throws IOException
{
- int byteCount = in.readInt() * 8;
- long byteCount = dis.readInt() * 8L;
++ long byteCount = in.readInt() * 8L;
Memory memory = RefCountedMemory.allocate(byteCount);
- for (int i = 0; i < byteCount;)
+ for (long i = 0; i < byteCount;)
{
- long v = dis.readLong();
+ long v = in.readLong();
memory.setByte(i++, (byte) (v >>> 0));
memory.setByte(i++, (byte) (v >>> 8));
memory.setByte(i++, (byte) (v >>> 16));
[10/10] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/487e3de0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/487e3de0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/487e3de0
Branch: refs/heads/trunk
Commit: 487e3de0559df55d99132814e9c06aa458a23748
Parents: 0da21de 9e29619
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 21 12:31:50 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 21 12:31:50 2013 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/obs/OffHeapBitSet.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------