You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/10/13 10:37:29 UTC
[01/10] cassandra git commit: ninja-fix handling of unfinished
serialized boundaries (bug from CASSANDRA-10357)
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 4acc3a69d -> c3ba6c8bd
refs/heads/cassandra-2.2 35cf8a3f8 -> 7d17f66e7
refs/heads/cassandra-3.0 27304dafe -> 6e20325fe
refs/heads/trunk 824db3b4e -> 3bcdc4b22
ninja-fix handling of unfinished serialized boundaries (bug from CASSANDRA-10357)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3ba6c8b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3ba6c8b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3ba6c8b
Branch: refs/heads/cassandra-2.1
Commit: c3ba6c8bdea7f0528f947d34fec2a9dd81d6142a
Parents: 4acc3a6
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Oct 13 09:33:35 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Tue Oct 13 09:33:35 2015 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3ba6c8b/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java b/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
index 623f65a..1109d37 100644
--- a/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
+++ b/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
@@ -269,7 +269,7 @@ public class MmappedSegmentedFile extends SegmentedFile
private static long[] ensureCapacity(long[] boundaries, int fixedCount)
{
if (fixedCount + 1 >= boundaries.length)
- return Arrays.copyOf(boundaries, boundaries.length * 2);
+ return Arrays.copyOf(boundaries, Math.max(fixedCount + 2, boundaries.length * 2));
return boundaries;
}
[02/10] cassandra git commit: ninja-fix handling of unfinished
serialized boundaries (bug from CASSANDRA-10357)
Posted by be...@apache.org.
ninja-fix handling of unfinished serialized boundaries (bug from CASSANDRA-10357)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3ba6c8b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3ba6c8b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3ba6c8b
Branch: refs/heads/cassandra-2.2
Commit: c3ba6c8bdea7f0528f947d34fec2a9dd81d6142a
Parents: 4acc3a6
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Oct 13 09:33:35 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Tue Oct 13 09:33:35 2015 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3ba6c8b/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java b/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
index 623f65a..1109d37 100644
--- a/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
+++ b/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
@@ -269,7 +269,7 @@ public class MmappedSegmentedFile extends SegmentedFile
private static long[] ensureCapacity(long[] boundaries, int fixedCount)
{
if (fixedCount + 1 >= boundaries.length)
- return Arrays.copyOf(boundaries, boundaries.length * 2);
+ return Arrays.copyOf(boundaries, Math.max(fixedCount + 2, boundaries.length * 2));
return boundaries;
}
[03/10] cassandra git commit: ninja-fix handling of unfinished
serialized boundaries (bug from CASSANDRA-10357)
Posted by be...@apache.org.
ninja-fix handling of unfinished serialized boundaries (bug from CASSANDRA-10357)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3ba6c8b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3ba6c8b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3ba6c8b
Branch: refs/heads/cassandra-3.0
Commit: c3ba6c8bdea7f0528f947d34fec2a9dd81d6142a
Parents: 4acc3a6
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Oct 13 09:33:35 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Tue Oct 13 09:33:35 2015 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3ba6c8b/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java b/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
index 623f65a..1109d37 100644
--- a/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
+++ b/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
@@ -269,7 +269,7 @@ public class MmappedSegmentedFile extends SegmentedFile
private static long[] ensureCapacity(long[] boundaries, int fixedCount)
{
if (fixedCount + 1 >= boundaries.length)
- return Arrays.copyOf(boundaries, boundaries.length * 2);
+ return Arrays.copyOf(boundaries, Math.max(fixedCount + 2, boundaries.length * 2));
return boundaries;
}
[07/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by be...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d17f66e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d17f66e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d17f66e
Branch: refs/heads/trunk
Commit: 7d17f66e72b4ff47c2004a4e02c7d461de7a5cb3
Parents: 35cf8a3 c3ba6c8
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Oct 13 09:33:45 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Tue Oct 13 09:33:45 2015 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d17f66e/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
----------------------------------------------------------------------
[08/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by be...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e20325f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e20325f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e20325f
Branch: refs/heads/cassandra-3.0
Commit: 6e20325fe9b9c08208a19a3aa199ec429260df62
Parents: 27304da 7d17f66
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Oct 13 09:33:57 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Tue Oct 13 09:33:57 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by be...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e20325f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e20325f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e20325f
Branch: refs/heads/trunk
Commit: 6e20325fe9b9c08208a19a3aa199ec429260df62
Parents: 27304da 7d17f66
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Oct 13 09:33:57 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Tue Oct 13 09:33:57 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[05/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by be...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d17f66e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d17f66e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d17f66e
Branch: refs/heads/cassandra-3.0
Commit: 7d17f66e72b4ff47c2004a4e02c7d461de7a5cb3
Parents: 35cf8a3 c3ba6c8
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Oct 13 09:33:45 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Tue Oct 13 09:33:45 2015 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d17f66e/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
----------------------------------------------------------------------
[04/10] cassandra git commit: ninja-fix handling of unfinished
serialized boundaries (bug from CASSANDRA-10357)
Posted by be...@apache.org.
ninja-fix handling of unfinished serialized boundaries (bug from CASSANDRA-10357)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3ba6c8b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3ba6c8b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3ba6c8b
Branch: refs/heads/trunk
Commit: c3ba6c8bdea7f0528f947d34fec2a9dd81d6142a
Parents: 4acc3a6
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Oct 13 09:33:35 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Tue Oct 13 09:33:35 2015 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3ba6c8b/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java b/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
index 623f65a..1109d37 100644
--- a/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
+++ b/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
@@ -269,7 +269,7 @@ public class MmappedSegmentedFile extends SegmentedFile
private static long[] ensureCapacity(long[] boundaries, int fixedCount)
{
if (fixedCount + 1 >= boundaries.length)
- return Arrays.copyOf(boundaries, boundaries.length * 2);
+ return Arrays.copyOf(boundaries, Math.max(fixedCount + 2, boundaries.length * 2));
return boundaries;
}
[06/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by be...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7d17f66e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d17f66e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d17f66e
Branch: refs/heads/cassandra-2.2
Commit: 7d17f66e72b4ff47c2004a4e02c7d461de7a5cb3
Parents: 35cf8a3 c3ba6c8
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Oct 13 09:33:45 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Tue Oct 13 09:33:45 2015 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d17f66e/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java
----------------------------------------------------------------------
[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by be...@apache.org.
Merge branch 'cassandra-3.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/3bcdc4b2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3bcdc4b2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3bcdc4b2
Branch: refs/heads/trunk
Commit: 3bcdc4b22a350b43d2294e9cdf4c2e1245196af2
Parents: 824db3b 6e20325
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Tue Oct 13 09:34:05 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Tue Oct 13 09:34:05 2015 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------