Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 6f919368c -> 90d086a15
re-add parameter columns to tracing session patch by dbrosius reviewed by jbellis for cassandra-6942 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90d086a1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90d086a1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90d086a1 Branch: refs/heads/cassandra-2.0 Commit: 90d086a152643b19b9a80f2446c6e8b1747722f9 Parents: 6f91936 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Tue Apr 29 20:15:31 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Tue Apr 29 20:16:12 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tracing/Tracing.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/90d086a1/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 81eb566..428f8fc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,7 @@ * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047) * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074) * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073) + * Re-add parameter columns to tracing session (CASSANDRA-6942) Merged from 1.2: * Fix nodetool display with vnodes (CASSANDRA-7082) * Fix schema concurrency exceptions (CASSANDRA-6841) http://git-wip-us.apache.org/repos/asf/cassandra/blob/90d086a1/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 c000af9..88239be 100644 --- a/src/java/org/apache/cassandra/tracing/Tracing.java +++ b/src/java/org/apache/cassandra/tracing/Tracing.java @@ -211,6 +211,7 @@ public class Tracing addParameterColumns(cf, parameters); addColumn(cf, buildName(cfMeta, bytes("request")), request); addColumn(cf, buildName(cfMeta, bytes("started_at")), started_at); + addParameterColumns(cf, parameters); mutateWithCatch(new RowMutation(TRACE_KS, sessionIdBytes, cf)); } });
