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 2017/10/23 19:37:03 UTC
svn commit: r1813069 - in /jmeter/trunk: bin/jmeter.properties
src/core/org/apache/jmeter/samplers/SampleSenderFactory.java
xdocs/changes.xml xdocs/usermanual/properties_reference.xml
Author: pmouawad
Date: Mon Oct 23 19:37:03 2017
New Revision: 1813069
URL: http://svn.apache.org/viewvc?rev=1813069&view=rev
Log:
Bug 61655 - SampleSender : Drop HoldSampleSender implementation
Bugzilla Id: 61655
Modified:
jmeter/trunk/bin/jmeter.properties
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/properties_reference.xml
Modified: jmeter/trunk/bin/jmeter.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1813069&r1=1813068&r2=1813069&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Mon Oct 23 19:37:03 2017
@@ -670,15 +670,11 @@ wmlParser.types=text/vnd.wap.wml
# batch mode (every 100 samples or every minute by default)
# Note also that MODE_STRIPPED_BATCH strips response data from SampleResult, so if you need it change to
# another mode
-# Hold retains samples until end of test (may need lots of memory)
# Batch returns samples in batches
# Statistical returns sample summary statistics
-# hold_samples was originally defined as a separate property,
-# but can now also be defined using mode=Hold
# mode can also be the class name of an implementation of org.apache.jmeter.samplers.SampleSender
#mode=Standard
#mode=Batch
-#mode=Hold
#mode=Statistical
#Set to true to key statistical samples on threadName rather than threadGroup
#key_on_threadname=false
@@ -697,7 +693,7 @@ wmlParser.types=text/vnd.wap.wml
# Same as Asynch but strips response data from SampleResult
#mode=StrippedAsynch
#
-# DiskStore: as for Hold mode, but serialises the samples to disk, rather than saving in memory
+# DiskStore: Serialises the samples to disk, rather than saving in memory
#mode=DiskStore
# Same as DiskStore but strips response data from SampleResult
#mode=StrippedDiskStore
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java?rev=1813069&r1=1813068&r2=1813069&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java Mon Oct 23 19:37:03 2017
@@ -30,8 +30,6 @@ public class SampleSenderFactory {
private static final String MODE_STANDARD = "Standard"; // $NON-NLS-1$
- private static final String MODE_HOLD = "Hold"; // $NON-NLS-1$
-
private static final String MODE_BATCH = "Batch"; // $NON-NLS-1$
private static final String MODE_STATISTICAL = "Statistical"; // $NON-NLS-1$
@@ -56,31 +54,17 @@ public class SampleSenderFactory {
* hold_samples until end of test or batch samples.
*/
static SampleSender getInstance(RemoteSampleListener listener) {
- // Support original property name
- final boolean holdSamples = JMeterUtils.getPropDefault("hold_samples", false); // $NON-NLS-1$
-
// Extended property name
final String type = JMeterUtils.getPropDefault("mode", MODE_STRIPPED_BATCH); // $NON-NLS-1$
- if (holdSamples || type.equalsIgnoreCase(MODE_HOLD)) {
- if(holdSamples) {
- log.warn(
- "Property hold_samples is deprecated and will be removed in upcoming version, use mode={} instead",
- MODE_HOLD);
- }
- HoldSampleSender h = new HoldSampleSender(listener);
- return h;
- } else if (type.equalsIgnoreCase(MODE_BATCH)) {
- BatchSampleSender b = new BatchSampleSender(listener);
- return b;
+ if (type.equalsIgnoreCase(MODE_BATCH)) {
+ return new BatchSampleSender(listener);
} else if(type.equalsIgnoreCase(MODE_STRIPPED_BATCH)) {
return new DataStrippingSampleSender(new BatchSampleSender(listener));
} else if (type.equalsIgnoreCase(MODE_STATISTICAL)) {
- StatisticalSampleSender s = new StatisticalSampleSender(listener);
- return s;
+ return new StatisticalSampleSender(listener);
} else if (type.equalsIgnoreCase(MODE_STANDARD)) {
- StandardSampleSender s = new StandardSampleSender(listener);
- return s;
+ return new StandardSampleSender(listener);
} else if(type.equalsIgnoreCase(MODE_STRIPPED)){
return new DataStrippingSampleSender(listener);
} else if(type.equalsIgnoreCase(MODE_ASYNCH)){
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1813069&r1=1813068&r2=1813069&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Mon Oct 23 19:37:03 2017
@@ -127,6 +127,7 @@ Summary
<li><bug>61607</bug>Add browse button in all beanshell elements to select beanshell script</li>
<li><bug>61627</bug>Don't clear LogView anymore when clicking on Warning/Errors Indicator</li>
<li><bug>61629</bug>Add Think Times to Children menu should not consider disabled elements</li>
+ <li><bug>61655</bug>SampleSender : Drop HoldSampleSender implementation</li>
</ul>
<ch_section>Non-functional changes</ch_section>
Modified: jmeter/trunk/xdocs/usermanual/properties_reference.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/properties_reference.xml?rev=1813069&r1=1813068&r2=1813069&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/properties_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/properties_reference.xml Mon Oct 23 19:37:03 2017
@@ -853,10 +853,6 @@ JMETER-SERVER</source>
<dt><code>Batch</code></dt>
<dd>Accumulates SampleResults before sending them. Configured by
properties <code>num_sample_threshold</code> and <code>time_threshold</code></dd>
- <dt><code>Hold</code></dt>
- <dd>retains samples until end of test (may need lots of memory)
- <note>The related <code>hold_samples</code> was originally defined as a separate property, but is deprecated now.</note>
- </dd>
<dt><code>Statistical</code></dt>
<dd>returns sample summary statistics. Configured by
properties <code>key_on_threadname</code> and <code>time_threshold</code></dd>