Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 682C2105D6 for ; Wed, 23 Oct 2013 16:00:08 +0000 (UTC) Received: (qmail 83617 invoked by uid 500); 23 Oct 2013 16:00:08 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 83496 invoked by uid 500); 23 Oct 2013 16:00:07 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 83470 invoked by uid 99); 23 Oct 2013 16:00:06 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Oct 2013 16:00:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4C8D7319956; Wed, 23 Oct 2013 16:00:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: Replace fragile-ish ABSC w/ TMBSC in TraceState Date: Wed, 23 Oct 2013 16:00:06 +0000 (UTC) Updated Branches: refs/heads/cassandra-2.0 4adfd5c5a -> 721c4a5ec Replace fragile-ish ABSC w/ TMBSC in TraceState Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/721c4a5e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/721c4a5e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/721c4a5e Branch: refs/heads/cassandra-2.0 Commit: 721c4a5ecccd45b2d9ca046d86c350e2fa6a76e1 Parents: 4adfd5c Author: Aleksey Yeschenko Authored: Wed Oct 23 23:59:50 2013 +0800 Committer: Aleksey Yeschenko Committed: Wed Oct 23 23:59:50 2013 +0800 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tracing/TraceState.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/721c4a5e/src/java/org/apache/cassandra/tracing/TraceState.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tracing/TraceState.java b/src/java/org/apache/cassandra/tracing/TraceState.java index b7d67a4..5fec633 100644 --- a/src/java/org/apache/cassandra/tracing/TraceState.java +++ b/src/java/org/apache/cassandra/tracing/TraceState.java @@ -28,11 +28,9 @@ import org.slf4j.helpers.MessageFormatter; import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.concurrent.StageManager; import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.db.ArrayBackedSortedColumns; import org.apache.cassandra.db.ColumnFamily; -import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.RowMutation; -import org.apache.cassandra.service.StorageProxy; +import org.apache.cassandra.db.TreeMapBackedSortedColumns; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.UUIDGen; @@ -97,7 +95,7 @@ public class TraceState public void runMayThrow() { CFMetaData cfMeta = CFMetaData.TraceEventsCf; - ColumnFamily cf = ArrayBackedSortedColumns.factory.create(cfMeta); + ColumnFamily cf = TreeMapBackedSortedColumns.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()); if (elapsed >= 0)