Merge branch 'cassandra-1.2' 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/4d9fc03e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d9fc03e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d9fc03e Branch: refs/heads/cassandra-2.0 Commit: 4d9fc03edaad60913dc1586e062cc3bd80621398 Parents: ecee395 5d5925a Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Oct 9 11:31:41 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Oct 9 11:31:41 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tracing/TraceState.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d9fc03e/src/java/org/apache/cassandra/tracing/TraceState.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tracing/TraceState.java index b7d67a4,f6f95a5..1f7f17a --- a/src/java/org/apache/cassandra/tracing/TraceState.java +++ b/src/java/org/apache/cassandra/tracing/TraceState.java @@@ -97,12 -94,12 +97,12 @@@ public class TraceStat public void runMayThrow() { CFMetaData cfMeta = CFMetaData.TraceEventsCf; - ColumnFamily cf = ColumnFamily.create(cfMeta); + ColumnFamily cf = ArrayBackedSortedColumns.factory.create(cfMeta); + Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId, ByteBufferUtil.bytes("activity")), message); Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId, ByteBufferUtil.bytes("source")), FBUtilities.getBroadcastAddress()); - Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId, ByteBufferUtil.bytes("thread")), threadName); if (elapsed >= 0) Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId, ByteBufferUtil.bytes("source_elapsed")), elapsed); - Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId, ByteBufferUtil.bytes("thread")), threadName); + Tracing.addColumn(cf, Tracing.buildName(cfMeta, eventId, ByteBufferUtil.bytes("activity")), message); Tracing.mutateWithCatch(new RowMutation(Tracing.TRACE_KS, sessionIdBytes, cf)); } });
