natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.9' into trunk

This commit is contained in:
T Jake Luciani 2016-07-08 10:45:46 -04:00
parent de86ccf3a3 c1dcc9ce46
commit ab2f744042
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -4,6 +4,7 @@
* Remove pre-startup check for open JMX port (CASSANDRA-12074)
3.9
* Fix hdr logging for single operation workloads (CASSANDRA-12145)
* Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)
* Increase size of flushExecutor thread pool (CASSANDRA-12071)
Merged from 3.0:

13
tools/stress/src/org/apache/cassandra/stress/StressMetrics.java
View File

@ -191,15 +191,18 @@ public class StressMetrics
rowRateUncertainty.update(current.adjustedRowRate());
if (current.operationCount() != 0)
{
if (result.intervals.intervals().size() > 1)
// if there's a single operation we only print the total
final boolean logPerOpSummaryLine = result.intervals.intervals().size() > 1;
for (Map.Entry<String, TimingInterval> type : result.intervals.intervals().entrySet())
{
for (Map.Entry<String, TimingInterval> type : result.intervals.intervals().entrySet())
final String opName = type.getKey();
final TimingInterval opInterval = type.getValue();
if (logPerOpSummaryLine)
{
final String opName = type.getKey();
final TimingInterval opInterval = type.getValue();
printRow("", opName, opInterval, timing.getHistory().get(type.getKey()), result.extra, rowRateUncertainty, output);
logHistograms(opName, opInterval);
}
logHistograms(opName, opInterval);
}
printRow("", "total", current, history, result.extra, rowRateUncertainty, output);