cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/3] git commit: Fix potential AssertionError during tracing
Date Tue, 17 Sep 2013 13:33:48 GMT
Updated Branches:
  refs/heads/trunk 0cba309cd -> 62cedd3fe


Fix potential AssertionError during tracing

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6041


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/765d1e97
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/765d1e97
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/765d1e97

Branch: refs/heads/trunk
Commit: 765d1e97ff7dbe50ce13297993720147ddb6eca0
Parents: 36f2178
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Sep 17 15:29:18 2013 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Sep 17 15:30:15 2013 +0200

----------------------------------------------------------------------
 CHANGES.txt                                        | 1 +
 src/java/org/apache/cassandra/tracing/Tracing.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/765d1e97/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9f2b786..a9a658e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,6 +17,7 @@
    (CASSANDRA-6005)
  * Fix paxos bugs (CASSANDRA-6012, 6013, 6023)
  * Fix paged ranges with multiple replicas (CASSANDRA-6004)
+ * Fix potential AssertionError during tracing (CASSANDRA-6041)
 Merged from 1.2:
 1.2.10
  * Fix possible divide-by-zero in HHOM (CASSANDRA-5990)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/765d1e97/src/java/org/apache/cassandra/tracing/Tracing.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tracing/Tracing.java b/src/java/org/apache/cassandra/tracing/Tracing.java
index 22b0244..f355c19 100644
--- a/src/java/org/apache/cassandra/tracing/Tracing.java
+++ b/src/java/org/apache/cassandra/tracing/Tracing.java
@@ -205,7 +205,7 @@ public class Tracing
             public void runMayThrow() throws Exception
             {
                 CFMetaData cfMeta = CFMetaData.TraceSessionsCf;
-                ColumnFamily cf = ArrayBackedSortedColumns.factory.create(cfMeta);
+                ColumnFamily cf = TreeMapBackedSortedColumns.factory.create(cfMeta);
                 addColumn(cf, buildName(cfMeta, bytes("coordinator")), FBUtilities.getBroadcastAddress());
                 addParameterColumns(cf, parameters);
                 addColumn(cf, buildName(cfMeta, bytes("request")), request);


Mime
View raw message