You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2014/04/30 02:25:54 UTC
[1/3] git commit: re-add parameter columns to tracing session
Repository: cassandra
Updated Branches:
refs/heads/trunk de860026c -> 10373762e
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/trunk
Commit: 90d086a152643b19b9a80f2446c6e8b1747722f9
Parents: 6f91936
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue Apr 29 20:15:31 2014 -0400
Committer: Dave Brosius <db...@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));
}
});
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by db...@apache.org.
Merge branch 'cassandra-2.0' 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/bcd14110
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcd14110
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcd14110
Branch: refs/heads/trunk
Commit: bcd14110bcf2ae9b1fbe4b3307eca154fa654614
Parents: 04884eb 90d086a
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue Apr 29 20:24:00 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Apr 29 20:24:00 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tracing/Tracing.java | 7 +++++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcd14110/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 73e39cc,428f8fc..b60feb8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -111,14 -80,7 +111,15 @@@ Merged from 2.0
(CASSANDRA-6906)
* Fix SSTable not released if stream session fails (CASSANDRA-6818)
* Avoid build failure due to ANTLR timeout (CASSANDRA-6991)
+ * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
+ * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
+ * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
+ * Ensure that batchlog and hint timeouts do not produce hints (CASSANDRA-7058)
+ * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
+ * 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)
* Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816)
* add extra SSL cipher suites (CASSANDRA-6613)
* fix nodetool getsstables for blob PK (CASSANDRA-6803)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcd14110/src/java/org/apache/cassandra/tracing/Tracing.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tracing/Tracing.java
index 6c68b29,88239be..31cc1ab
--- a/src/java/org/apache/cassandra/tracing/Tracing.java
+++ b/src/java/org/apache/cassandra/tracing/Tracing.java
@@@ -203,12 -206,13 +203,19 @@@ public class Tracin
public void run()
{
CFMetaData cfMeta = CFMetaData.TraceSessionsCf;
- ColumnFamily cf = TreeMapBackedSortedColumns.factory.create(cfMeta);
- addColumn(cf, buildName(cfMeta, bytes("coordinator")), FBUtilities.getBroadcastAddress());
+ ColumnFamily cf = ArrayBackedSortedColumns.factory.create(cfMeta);
+ addColumn(cf, buildName(cfMeta, "coordinator"), FBUtilities.getBroadcastAddress());
addParameterColumns(cf, parameters);
++<<<<<<< HEAD
+ addColumn(cf, buildName(cfMeta, "request"), request);
+ addColumn(cf, buildName(cfMeta, "started_at"), started_at);
+ mutateWithCatch(new Mutation(TRACE_KS, sessionIdBytes, cf));
++=======
+ 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));
++>>>>>>> cassandra-2.0
}
});
}
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@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/10373762
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10373762
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10373762
Branch: refs/heads/trunk
Commit: 10373762efac23d7e35dc0b41409f019514f6dc0
Parents: de86002 bcd1411
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue Apr 29 20:25:00 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Apr 29 20:25:00 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/tracing/Tracing.java | 7 +++++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/10373762/CHANGES.txt
----------------------------------------------------------------------