You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2015/12/12 09:09:18 UTC
svn commit: r1719634 -
/jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java
Author: pmouawad
Date: Sat Dec 12 08:09:18 2015
New Revision: 1719634
URL: http://svn.apache.org/viewvc?rev=1719634&view=rev
Log:
Tab police, sir yes sir !
Modified:
jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java?rev=1719634&r1=1719633&r2=1719634&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/ExternalSampleSorter.java Sat Dec 12 08:09:18 2015
@@ -108,6 +108,9 @@ public class ExternalSampleSorter extend
private SampleMetadata sampleMetadata;
private boolean revertedSort;
+
+ private AtomicInteger sequence = new AtomicInteger();
+
public ExternalSampleSorter() {
chunkSize = DEFAULT_CHUNK_SIZE;
@@ -501,9 +504,9 @@ public class ExternalSampleSorter extend
File f = chunks.get(0);
try (CsvSampleReader reader = new CsvSampleReader(f, metadata)) {
Sample s = null;
- while ((s = reader.readSample()) != null) {
- out.produce(s, 0);
- }
+ while ((s = reader.readSample()) != null) {
+ out.produce(s, 0);
+ }
}
}
}
@@ -532,9 +535,9 @@ public class ExternalSampleSorter extend
if (out == null) {
out = getChunkFile();
}
-
+
try (CsvSampleWriter csvWriter = new CsvSampleWriter(out, metadata);
- CsvSampleReader l = new CsvSampleReader(left, metadata);
+ CsvSampleReader l = new CsvSampleReader(left, metadata);
CsvSampleReader r = new CsvSampleReader(right, metadata)) {
if (writeHeader) {
csvWriter.writeHeader();
@@ -565,7 +568,7 @@ public class ExternalSampleSorter extend
private void mergeFiles(SampleMetadata metadata, File left, File right,
SampleProducer out) {
try (CsvSampleReader l = new CsvSampleReader(left, metadata);
- CsvSampleReader r = new CsvSampleReader(right, metadata)){
+ CsvSampleReader r = new CsvSampleReader(right, metadata)) {
while (l.hasNext() || r.hasNext()) {
if (l.hasNext() && r.hasNext()) {
Sample firstLeft = l.peek();
@@ -589,8 +592,6 @@ public class ExternalSampleSorter extend
}
}
- private AtomicInteger sequence = new AtomicInteger();
-
private File getChunkFile() {
DecimalFormat df = new DecimalFormat("00000");
File out = new File(getWorkingDirectory(), "chunk-"