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 2014/10/01 19:42:45 UTC
[1/7] git commit: Merge remote-tracking branch 'origin/cassandra-2.1'
into cassandra-2.1
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 eed50a92e -> 96c045f85
refs/heads/cassandra-2.1 56e524a22 -> e961ac927
refs/heads/trunk 8d2924689 -> d375de2dd
Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56e524a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56e524a2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56e524a2
Branch: refs/heads/trunk
Commit: 56e524a22514c4e1614befb8ee2a16547a98e9aa
Parents: 629c9a5 5926723
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 1 12:37:10 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 1 12:37:10 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
lib/cassandra-driver-internal-only-2.1.0.post.zip | Bin 129435 -> 0 bytes
lib/cassandra-driver-internal-only-2.1.1.post.zip | Bin 0 -> 130016 bytes
3 files changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56e524a2/CHANGES.txt
----------------------------------------------------------------------
[3/7] git commit: Fix possible overflow while sorting CL segments for
replay patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-7992
Posted by jb...@apache.org.
Fix possible overflow while sorting CL segments for replay
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-7992
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/96c045f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96c045f8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96c045f8
Branch: refs/heads/trunk
Commit: 96c045f8576ab35359f33ac81e7bb8c37342aadf
Parents: eed50a9
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 1 12:42:10 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 1 12:42:10 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/96c045f8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3f71162..efa0806 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.12:
+ * Fix possible overflow while sorting CL segments for replay (CASSANDRA-7992)
* Increase nodetool Xmx (CASSANDRA-7956)
* Archive any commitlog segments present at startup (CASSANDRA-6904)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/96c045f8/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
index 5b8bcfa..45cc77d 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
@@ -424,7 +424,7 @@ public class CommitLogSegment
{
CommitLogDescriptor desc = CommitLogDescriptor.fromFileName(f.getName());
CommitLogDescriptor desc2 = CommitLogDescriptor.fromFileName(f2.getName());
- return (int) (desc.id - desc2.id);
+ return Long.compare(desc.id, desc2.id);
}
}
}
[6/7] git commit: merge from 2.0
Posted by jb...@apache.org.
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e961ac92
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e961ac92
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e961ac92
Branch: refs/heads/cassandra-2.1
Commit: e961ac9270425d364aa5f4b4cbbc33f4eb6413fe
Parents: 56e524a 96c045f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 1 12:42:35 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 1 12:42:35 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e961ac92/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7e4962d,efa0806..5d628d1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,58 -1,11 +1,59 @@@
-2.0.12:
+2.1.1
+ * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
+ * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
+ * Make sstablerepairedset take a list of files (CASSANDRA-7995)
+ * (cqlsh) Tab completeion for indexes on map keys (CASSANDRA-7972)
+ * (cqlsh) Fix UDT field selection in select clause (CASSANDRA-7891)
+ * Fix resource leak in event of corrupt sstable
+ * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131)
+ * Provide visibility into prepared statements churn (CASSANDRA-7921, CASSANDRA-7930)
+ * Invalidate prepared statements when their keyspace or table is
+ dropped (CASSANDRA-7566)
+ * cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945)
+ * Fix saving caches when a table is dropped (CASSANDRA-7784)
+ * Add better error checking of new stress profile (CASSANDRA-7716)
+ * Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom (CASSANDRA-7934)
+ * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
+ * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
+ * GCInspector more closely tracks GC; cassandra-stress and nodetool report it (CASSANDRA-7916)
+ * nodetool won't output bogus ownership info without a keyspace (CASSANDRA-7173)
+ * Add human readable option to nodetool commands (CASSANDRA-5433)
+ * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
+ * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
+ * (cqlsh) tab-completion for triggers (CASSANDRA-7824)
+ * (cqlsh) Support for query paging (CASSANDRA-7514)
+ * (cqlsh) Show progress of COPY operations (CASSANDRA-7789)
+ * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
+ * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
+ * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
+ * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
+ * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
+ * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
+ output (CASSANDRA-7659)
+ * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
+ * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
+ * Support list index operations with conditions (CASSANDRA-7499)
+ * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
+ * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
+ * (cqlsh) Error when tracing query (CASSANDRA-7613)
+ * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
+ * SSTableExport uses correct validator to create string representation of partition
+ keys (CASSANDRA-7498)
+ * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689)
+ * Add support for custom 2i validation (CASSANDRA-7575)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+ * Make repair -pr work with -local (CASSANDRA-7450)
+ * Fix error in sstableloader with -cph > 1 (CASSANDRA-8007)
+Merged from 2.0:
+ * Fix possible overflow while sorting CL segments for replay (CASSANDRA-7992)
* Increase nodetool Xmx (CASSANDRA-7956)
* Archive any commitlog segments present at startup (CASSANDRA-6904)
-
-
-2.0.11:
- * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
* CrcCheckChance should adjust based on live CFMetadata not
sstable metadata (CASSANDRA-7978)
* token() should only accept columns in the partitioning
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e961ac92/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
index 6f756f7,45cc77d..a70327b
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
@@@ -569,64 -424,7 +569,64 @@@ public class CommitLogSegmen
{
CommitLogDescriptor desc = CommitLogDescriptor.fromFileName(f.getName());
CommitLogDescriptor desc2 = CommitLogDescriptor.fromFileName(f2.getName());
- return (int) (desc.id - desc2.id);
+ return Long.compare(desc.id, desc2.id);
}
}
+
+ /**
+ * A simple class for tracking information about the portion of a segment that has been allocated to a log write.
+ * The constructor leaves the fields uninitialized for population by CommitlogManager, so that it can be
+ * stack-allocated by escape analysis in CommitLog.add.
+ */
+ static class Allocation
+ {
+
+ private final CommitLogSegment segment;
+ private final OpOrder.Group appendOp;
+ private final int position;
+ private final ByteBuffer buffer;
+
+ Allocation(CommitLogSegment segment, OpOrder.Group appendOp, int position, ByteBuffer buffer)
+ {
+ this.segment = segment;
+ this.appendOp = appendOp;
+ this.position = position;
+ this.buffer = buffer;
+ }
+
+ CommitLogSegment getSegment()
+ {
+ return segment;
+ }
+
+ ByteBuffer getBuffer()
+ {
+ return buffer;
+ }
+
+ // markWritten() MUST be called once we are done with the segment or the CL will never flush
+ // but must not be called more than once
+ void markWritten()
+ {
+ appendOp.close();
+ }
+
+ void awaitDiskSync()
+ {
+ while (segment.lastSyncedOffset < position)
+ {
+ WaitQueue.Signal signal = segment.syncComplete.register(CommitLog.instance.metrics.waitingOnCommit.time());
+ if (segment.lastSyncedOffset < position)
+ signal.awaitUninterruptibly();
+ else
+ signal.cancel();
+ }
+ }
+
+ public ReplayPosition getReplayPosition()
+ {
+ return new ReplayPosition(segment.id, buffer.limit());
+ }
+
+ }
}
[4/7] git commit: Fix possible overflow while sorting CL segments for
replay patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-7992
Posted by jb...@apache.org.
Fix possible overflow while sorting CL segments for replay
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-7992
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/96c045f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96c045f8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96c045f8
Branch: refs/heads/cassandra-2.1
Commit: 96c045f8576ab35359f33ac81e7bb8c37342aadf
Parents: eed50a9
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 1 12:42:10 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 1 12:42:10 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/96c045f8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3f71162..efa0806 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.12:
+ * Fix possible overflow while sorting CL segments for replay (CASSANDRA-7992)
* Increase nodetool Xmx (CASSANDRA-7956)
* Archive any commitlog segments present at startup (CASSANDRA-6904)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/96c045f8/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
index 5b8bcfa..45cc77d 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
@@ -424,7 +424,7 @@ public class CommitLogSegment
{
CommitLogDescriptor desc = CommitLogDescriptor.fromFileName(f.getName());
CommitLogDescriptor desc2 = CommitLogDescriptor.fromFileName(f2.getName());
- return (int) (desc.id - desc2.id);
+ return Long.compare(desc.id, desc2.id);
}
}
}
[5/7] git commit: merge from 2.0
Posted by jb...@apache.org.
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e961ac92
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e961ac92
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e961ac92
Branch: refs/heads/trunk
Commit: e961ac9270425d364aa5f4b4cbbc33f4eb6413fe
Parents: 56e524a 96c045f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 1 12:42:35 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 1 12:42:35 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e961ac92/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7e4962d,efa0806..5d628d1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,58 -1,11 +1,59 @@@
-2.0.12:
+2.1.1
+ * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
+ * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
+ * Make sstablerepairedset take a list of files (CASSANDRA-7995)
+ * (cqlsh) Tab completeion for indexes on map keys (CASSANDRA-7972)
+ * (cqlsh) Fix UDT field selection in select clause (CASSANDRA-7891)
+ * Fix resource leak in event of corrupt sstable
+ * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131)
+ * Provide visibility into prepared statements churn (CASSANDRA-7921, CASSANDRA-7930)
+ * Invalidate prepared statements when their keyspace or table is
+ dropped (CASSANDRA-7566)
+ * cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945)
+ * Fix saving caches when a table is dropped (CASSANDRA-7784)
+ * Add better error checking of new stress profile (CASSANDRA-7716)
+ * Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom (CASSANDRA-7934)
+ * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
+ * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
+ * GCInspector more closely tracks GC; cassandra-stress and nodetool report it (CASSANDRA-7916)
+ * nodetool won't output bogus ownership info without a keyspace (CASSANDRA-7173)
+ * Add human readable option to nodetool commands (CASSANDRA-5433)
+ * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
+ * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
+ * (cqlsh) tab-completion for triggers (CASSANDRA-7824)
+ * (cqlsh) Support for query paging (CASSANDRA-7514)
+ * (cqlsh) Show progress of COPY operations (CASSANDRA-7789)
+ * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
+ * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
+ * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
+ * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
+ * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
+ * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
+ output (CASSANDRA-7659)
+ * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
+ * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
+ * Support list index operations with conditions (CASSANDRA-7499)
+ * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
+ * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
+ * (cqlsh) Error when tracing query (CASSANDRA-7613)
+ * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
+ * SSTableExport uses correct validator to create string representation of partition
+ keys (CASSANDRA-7498)
+ * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689)
+ * Add support for custom 2i validation (CASSANDRA-7575)
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+ * Make repair -pr work with -local (CASSANDRA-7450)
+ * Fix error in sstableloader with -cph > 1 (CASSANDRA-8007)
+Merged from 2.0:
+ * Fix possible overflow while sorting CL segments for replay (CASSANDRA-7992)
* Increase nodetool Xmx (CASSANDRA-7956)
* Archive any commitlog segments present at startup (CASSANDRA-6904)
-
-
-2.0.11:
- * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
* CrcCheckChance should adjust based on live CFMetadata not
sstable metadata (CASSANDRA-7978)
* token() should only accept columns in the partitioning
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e961ac92/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
index 6f756f7,45cc77d..a70327b
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
@@@ -569,64 -424,7 +569,64 @@@ public class CommitLogSegmen
{
CommitLogDescriptor desc = CommitLogDescriptor.fromFileName(f.getName());
CommitLogDescriptor desc2 = CommitLogDescriptor.fromFileName(f2.getName());
- return (int) (desc.id - desc2.id);
+ return Long.compare(desc.id, desc2.id);
}
}
+
+ /**
+ * A simple class for tracking information about the portion of a segment that has been allocated to a log write.
+ * The constructor leaves the fields uninitialized for population by CommitlogManager, so that it can be
+ * stack-allocated by escape analysis in CommitLog.add.
+ */
+ static class Allocation
+ {
+
+ private final CommitLogSegment segment;
+ private final OpOrder.Group appendOp;
+ private final int position;
+ private final ByteBuffer buffer;
+
+ Allocation(CommitLogSegment segment, OpOrder.Group appendOp, int position, ByteBuffer buffer)
+ {
+ this.segment = segment;
+ this.appendOp = appendOp;
+ this.position = position;
+ this.buffer = buffer;
+ }
+
+ CommitLogSegment getSegment()
+ {
+ return segment;
+ }
+
+ ByteBuffer getBuffer()
+ {
+ return buffer;
+ }
+
+ // markWritten() MUST be called once we are done with the segment or the CL will never flush
+ // but must not be called more than once
+ void markWritten()
+ {
+ appendOp.close();
+ }
+
+ void awaitDiskSync()
+ {
+ while (segment.lastSyncedOffset < position)
+ {
+ WaitQueue.Signal signal = segment.syncComplete.register(CommitLog.instance.metrics.waitingOnCommit.time());
+ if (segment.lastSyncedOffset < position)
+ signal.awaitUninterruptibly();
+ else
+ signal.cancel();
+ }
+ }
+
+ public ReplayPosition getReplayPosition()
+ {
+ return new ReplayPosition(segment.id, buffer.limit());
+ }
+
+ }
}
[2/7] git commit: Fix possible overflow while sorting CL segments for
replay patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-7992
Posted by jb...@apache.org.
Fix possible overflow while sorting CL segments for replay
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-7992
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/96c045f8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96c045f8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96c045f8
Branch: refs/heads/cassandra-2.0
Commit: 96c045f8576ab35359f33ac81e7bb8c37342aadf
Parents: eed50a9
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 1 12:42:10 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 1 12:42:10 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/96c045f8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3f71162..efa0806 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.12:
+ * Fix possible overflow while sorting CL segments for replay (CASSANDRA-7992)
* Increase nodetool Xmx (CASSANDRA-7956)
* Archive any commitlog segments present at startup (CASSANDRA-6904)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/96c045f8/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
index 5b8bcfa..45cc77d 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
@@ -424,7 +424,7 @@ public class CommitLogSegment
{
CommitLogDescriptor desc = CommitLogDescriptor.fromFileName(f.getName());
CommitLogDescriptor desc2 = CommitLogDescriptor.fromFileName(f2.getName());
- return (int) (desc.id - desc2.id);
+ return Long.compare(desc.id, desc2.id);
}
}
}
[7/7] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by jb...@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/d375de2d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d375de2d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d375de2d
Branch: refs/heads/trunk
Commit: d375de2dde45d9e9c173d9a04aa354179942c039
Parents: 8d29246 e961ac9
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Oct 1 12:42:39 2014 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Oct 1 12:42:39 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d375de2d/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d375de2d/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
----------------------------------------------------------------------