You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/06/23 08:46:54 UTC
[1/6] cassandra git commit: Fix CompressorTest on non-x86 environment
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 b3dd05e21 -> 8d5b7b628
refs/heads/cassandra-3.0 969f7974f -> d354ddcfb
refs/heads/trunk 0ebc0e4c8 -> 233c03066
Fix CompressorTest on non-x86 environment
patch by ReiOdaira; reviewed by blambov for CASSANDRA-11913
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d5b7b62
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d5b7b62
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d5b7b62
Branch: refs/heads/cassandra-2.2
Commit: 8d5b7b6288a4f558e0847165d0d98332481ca4ce
Parents: b3dd05e
Author: Rei Odaira <Re...@gmail.com>
Authored: Thu Jun 23 10:29:22 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 23 10:29:22 2016 +0200
----------------------------------------------------------------------
test/unit/org/apache/cassandra/io/compress/CompressorTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d5b7b62/test/unit/org/apache/cassandra/io/compress/CompressorTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/compress/CompressorTest.java b/test/unit/org/apache/cassandra/io/compress/CompressorTest.java
index 6018cc7..1d285ea4 100644
--- a/test/unit/org/apache/cassandra/io/compress/CompressorTest.java
+++ b/test/unit/org/apache/cassandra/io/compress/CompressorTest.java
@@ -80,7 +80,7 @@ public class CompressorTest
// need byte[] representation which direct buffers don't have
byte[] compressedBytes = new byte[compressed.capacity()];
- ByteBufferUtil.arrayCopy(compressed, outOffset, compressedBytes, outOffset, compressed.capacity() - outOffset);
+ ByteBufferUtil.arrayCopy(compressed, outOffset, compressedBytes, outOffset, compressed.limit() - outOffset);
final int decompressedLength = compressor.uncompress(compressedBytes, outOffset, compressed.remaining(), restored, restoreOffset);
[5/6] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sl...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
* cassandra-2.2:
Fix CompressorTest on non-x86 environment
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d354ddcf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d354ddcf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d354ddcf
Branch: refs/heads/cassandra-3.0
Commit: d354ddcfbedca0e0ed4175689260e1145ad62bae
Parents: 969f797 8d5b7b6
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jun 23 10:46:31 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 23 10:46:31 2016 +0200
----------------------------------------------------------------------
test/unit/org/apache/cassandra/io/compress/CompressorTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d354ddcf/test/unit/org/apache/cassandra/io/compress/CompressorTest.java
----------------------------------------------------------------------
[6/6] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into trunk
* cassandra-3.0:
Fix CompressorTest on non-x86 environment
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/233c0306
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/233c0306
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/233c0306
Branch: refs/heads/trunk
Commit: 233c030662e365441434dba7144684ffd5925908
Parents: 0ebc0e4 d354ddc
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jun 23 10:46:39 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 23 10:46:39 2016 +0200
----------------------------------------------------------------------
test/unit/org/apache/cassandra/io/compress/CompressorTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[3/6] cassandra git commit: Fix CompressorTest on non-x86 environment
Posted by sl...@apache.org.
Fix CompressorTest on non-x86 environment
patch by ReiOdaira; reviewed by blambov for CASSANDRA-11913
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d5b7b62
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d5b7b62
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d5b7b62
Branch: refs/heads/trunk
Commit: 8d5b7b6288a4f558e0847165d0d98332481ca4ce
Parents: b3dd05e
Author: Rei Odaira <Re...@gmail.com>
Authored: Thu Jun 23 10:29:22 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 23 10:29:22 2016 +0200
----------------------------------------------------------------------
test/unit/org/apache/cassandra/io/compress/CompressorTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d5b7b62/test/unit/org/apache/cassandra/io/compress/CompressorTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/compress/CompressorTest.java b/test/unit/org/apache/cassandra/io/compress/CompressorTest.java
index 6018cc7..1d285ea4 100644
--- a/test/unit/org/apache/cassandra/io/compress/CompressorTest.java
+++ b/test/unit/org/apache/cassandra/io/compress/CompressorTest.java
@@ -80,7 +80,7 @@ public class CompressorTest
// need byte[] representation which direct buffers don't have
byte[] compressedBytes = new byte[compressed.capacity()];
- ByteBufferUtil.arrayCopy(compressed, outOffset, compressedBytes, outOffset, compressed.capacity() - outOffset);
+ ByteBufferUtil.arrayCopy(compressed, outOffset, compressedBytes, outOffset, compressed.limit() - outOffset);
final int decompressedLength = compressor.uncompress(compressedBytes, outOffset, compressed.remaining(), restored, restoreOffset);
[4/6] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sl...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
* cassandra-2.2:
Fix CompressorTest on non-x86 environment
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d354ddcf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d354ddcf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d354ddcf
Branch: refs/heads/trunk
Commit: d354ddcfbedca0e0ed4175689260e1145ad62bae
Parents: 969f797 8d5b7b6
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jun 23 10:46:31 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 23 10:46:31 2016 +0200
----------------------------------------------------------------------
test/unit/org/apache/cassandra/io/compress/CompressorTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d354ddcf/test/unit/org/apache/cassandra/io/compress/CompressorTest.java
----------------------------------------------------------------------
[2/6] cassandra git commit: Fix CompressorTest on non-x86 environment
Posted by sl...@apache.org.
Fix CompressorTest on non-x86 environment
patch by ReiOdaira; reviewed by blambov for CASSANDRA-11913
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8d5b7b62
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d5b7b62
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8d5b7b62
Branch: refs/heads/cassandra-3.0
Commit: 8d5b7b6288a4f558e0847165d0d98332481ca4ce
Parents: b3dd05e
Author: Rei Odaira <Re...@gmail.com>
Authored: Thu Jun 23 10:29:22 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jun 23 10:29:22 2016 +0200
----------------------------------------------------------------------
test/unit/org/apache/cassandra/io/compress/CompressorTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8d5b7b62/test/unit/org/apache/cassandra/io/compress/CompressorTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/compress/CompressorTest.java b/test/unit/org/apache/cassandra/io/compress/CompressorTest.java
index 6018cc7..1d285ea4 100644
--- a/test/unit/org/apache/cassandra/io/compress/CompressorTest.java
+++ b/test/unit/org/apache/cassandra/io/compress/CompressorTest.java
@@ -80,7 +80,7 @@ public class CompressorTest
// need byte[] representation which direct buffers don't have
byte[] compressedBytes = new byte[compressed.capacity()];
- ByteBufferUtil.arrayCopy(compressed, outOffset, compressedBytes, outOffset, compressed.capacity() - outOffset);
+ ByteBufferUtil.arrayCopy(compressed, outOffset, compressedBytes, outOffset, compressed.limit() - outOffset);
final int decompressedLength = compressor.uncompress(compressedBytes, outOffset, compressed.remaining(), restored, restoreOffset);