You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2013/02/06 20:42:04 UTC
svn commit: r1443162 -
/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
Author: sebb
Date: Wed Feb 6 19:42:04 2013
New Revision: 1443162
URL: http://svn.apache.org/viewvc?rev=1443162&view=rev
Log:
Rename private field to better reflect its contents
Modified:
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=1443162&r1=1443161&r2=1443162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Wed Feb 6 19:42:04 2013
@@ -173,7 +173,7 @@ public class SampleResult implements Ser
// ISO-8895-1, UTF-8
/** elapsed time */
- private long time = 0;
+ private long elapsedTime = 0;
/** time to first response */
private long latency = 0;
@@ -272,7 +272,7 @@ public class SampleResult implements Ser
// Allow test code to change the default useNanoTime and nanoThreadSleep settings
SampleResult(boolean nanoTime, long nanoThreadSleep) {
- this.time = 0;
+ this.elapsedTime = 0;
this.useNanoTime = nanoTime;
this.nanoThreadSleep = nanoThreadSleep;
this.nanoTimeOffset = initOffset();
@@ -321,7 +321,7 @@ public class SampleResult implements Ser
subResults = res.subResults; // TODO ??
success = res.success;//OK
threadName = res.threadName;//OK
- time = res.time;
+ elapsedTime = res.elapsedTime;
timeStamp = res.timeStamp;
}
@@ -420,7 +420,7 @@ public class SampleResult implements Ser
endTime = stamp;
}
timeStamp = stamp;
- time = elapsed;
+ elapsedTime = elapsed;
}
/*
@@ -717,7 +717,7 @@ public class SampleResult implements Ser
*
*/
public long getTime() {
- return time;
+ return elapsedTime;
}
public boolean isSuccessful() {
@@ -991,7 +991,7 @@ public class SampleResult implements Ser
log.error("setEndTime must be called after setStartTime", new Throwable("Invalid call sequence"));
// TODO should this throw an error?
} else {
- time = endTime - startTime - idleTime;
+ elapsedTime = endTime - startTime - idleTime;
}
}
Re: svn commit: r1443162 - /jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
Posted by Philippe Mouawad <ph...@gmail.com>.
Sorry, my mistake.
It was due to a plugin.
Regards
Philippe
On Sat, Sep 21, 2013 at 3:59 PM, sebb <se...@gmail.com> wrote:
> On 20 September 2013 20:11, sebb <se...@gmail.com> wrote:
> > On 19 September 2013 11:44, Philippe Mouawad <ph...@gmail.com>
> wrote:
> >> Hello,
> >> This commit has an impact which is the following:
> >> - You cannot read anymore with 2.10 JTL files generated by version <
> 2.10.
>
> I've been trying to see how to test the issue, and cannot find a problem.
> Are you sure the change causes a problem?
> As far as I can tell, the field is not accessed directly by the save
> service, only through getter/setter.
>
> Was this an XML file or a CSV file?
>
> Have you a sample JTL file that does not work any more?
>
> > Oops, that was not intentional.
> >
> >> Shall we keep it or rollback it ?
> >
> > I'll have a look at this shortly.
> >
> > It appears the unit tests don't catch this problem, so clearly they
> > need fixing too.
> >
> >> Regards
> >>
> >>
> >> On Wed, Feb 6, 2013 at 8:42 PM, <se...@apache.org> wrote:
> >>
> >>> Author: sebb
> >>> Date: Wed Feb 6 19:42:04 2013
> >>> New Revision: 1443162
> >>>
> >>> URL: http://svn.apache.org/viewvc?rev=1443162&view=rev
> >>> Log:
> >>> Rename private field to better reflect its contents
> >>>
> >>> Modified:
> >>> jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
> >>>
> >>> Modified:
> >>> jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
> >>> URL:
> >>>
> http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=1443162&r1=1443161&r2=1443162&view=diff
> >>>
> >>>
> ==============================================================================
> >>> --- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
> >>> (original)
> >>> +++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
> Wed
> >>> Feb 6 19:42:04 2013
> >>> @@ -173,7 +173,7 @@ public class SampleResult implements Ser
> >>> // ISO-8895-1, UTF-8
> >>>
> >>> /** elapsed time */
> >>> - private long time = 0;
> >>> + private long elapsedTime = 0;
> >>>
> >>> /** time to first response */
> >>> private long latency = 0;
> >>> @@ -272,7 +272,7 @@ public class SampleResult implements Ser
> >>>
> >>> // Allow test code to change the default useNanoTime and
> >>> nanoThreadSleep settings
> >>> SampleResult(boolean nanoTime, long nanoThreadSleep) {
> >>> - this.time = 0;
> >>> + this.elapsedTime = 0;
> >>> this.useNanoTime = nanoTime;
> >>> this.nanoThreadSleep = nanoThreadSleep;
> >>> this.nanoTimeOffset = initOffset();
> >>> @@ -321,7 +321,7 @@ public class SampleResult implements Ser
> >>> subResults = res.subResults; // TODO ??
> >>> success = res.success;//OK
> >>> threadName = res.threadName;//OK
> >>> - time = res.time;
> >>> + elapsedTime = res.elapsedTime;
> >>> timeStamp = res.timeStamp;
> >>> }
> >>>
> >>> @@ -420,7 +420,7 @@ public class SampleResult implements Ser
> >>> endTime = stamp;
> >>> }
> >>> timeStamp = stamp;
> >>> - time = elapsed;
> >>> + elapsedTime = elapsed;
> >>> }
> >>>
> >>> /*
> >>> @@ -717,7 +717,7 @@ public class SampleResult implements Ser
> >>> *
> >>> */
> >>> public long getTime() {
> >>> - return time;
> >>> + return elapsedTime;
> >>> }
> >>>
> >>> public boolean isSuccessful() {
> >>> @@ -991,7 +991,7 @@ public class SampleResult implements Ser
> >>> log.error("setEndTime must be called after setStartTime",
> new
> >>> Throwable("Invalid call sequence"));
> >>> // TODO should this throw an error?
> >>> } else {
> >>> - time = endTime - startTime - idleTime;
> >>> + elapsedTime = endTime - startTime - idleTime;
> >>> }
> >>> }
> >>>
> >>>
> >>>
> >>>
> >>
> >>
> >> --
> >> Cordialement.
> >> Philippe Mouawad.
>
--
Cordialement.
Philippe Mouawad.
Re: svn commit: r1443162 - /jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
Posted by sebb <se...@gmail.com>.
On 20 September 2013 20:11, sebb <se...@gmail.com> wrote:
> On 19 September 2013 11:44, Philippe Mouawad <ph...@gmail.com> wrote:
>> Hello,
>> This commit has an impact which is the following:
>> - You cannot read anymore with 2.10 JTL files generated by version < 2.10.
I've been trying to see how to test the issue, and cannot find a problem.
Are you sure the change causes a problem?
As far as I can tell, the field is not accessed directly by the save
service, only through getter/setter.
Was this an XML file or a CSV file?
Have you a sample JTL file that does not work any more?
> Oops, that was not intentional.
>
>> Shall we keep it or rollback it ?
>
> I'll have a look at this shortly.
>
> It appears the unit tests don't catch this problem, so clearly they
> need fixing too.
>
>> Regards
>>
>>
>> On Wed, Feb 6, 2013 at 8:42 PM, <se...@apache.org> wrote:
>>
>>> Author: sebb
>>> Date: Wed Feb 6 19:42:04 2013
>>> New Revision: 1443162
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1443162&view=rev
>>> Log:
>>> Rename private field to better reflect its contents
>>>
>>> Modified:
>>> jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
>>>
>>> Modified:
>>> jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
>>> URL:
>>> http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=1443162&r1=1443161&r2=1443162&view=diff
>>>
>>> ==============================================================================
>>> --- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
>>> (original)
>>> +++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Wed
>>> Feb 6 19:42:04 2013
>>> @@ -173,7 +173,7 @@ public class SampleResult implements Ser
>>> // ISO-8895-1, UTF-8
>>>
>>> /** elapsed time */
>>> - private long time = 0;
>>> + private long elapsedTime = 0;
>>>
>>> /** time to first response */
>>> private long latency = 0;
>>> @@ -272,7 +272,7 @@ public class SampleResult implements Ser
>>>
>>> // Allow test code to change the default useNanoTime and
>>> nanoThreadSleep settings
>>> SampleResult(boolean nanoTime, long nanoThreadSleep) {
>>> - this.time = 0;
>>> + this.elapsedTime = 0;
>>> this.useNanoTime = nanoTime;
>>> this.nanoThreadSleep = nanoThreadSleep;
>>> this.nanoTimeOffset = initOffset();
>>> @@ -321,7 +321,7 @@ public class SampleResult implements Ser
>>> subResults = res.subResults; // TODO ??
>>> success = res.success;//OK
>>> threadName = res.threadName;//OK
>>> - time = res.time;
>>> + elapsedTime = res.elapsedTime;
>>> timeStamp = res.timeStamp;
>>> }
>>>
>>> @@ -420,7 +420,7 @@ public class SampleResult implements Ser
>>> endTime = stamp;
>>> }
>>> timeStamp = stamp;
>>> - time = elapsed;
>>> + elapsedTime = elapsed;
>>> }
>>>
>>> /*
>>> @@ -717,7 +717,7 @@ public class SampleResult implements Ser
>>> *
>>> */
>>> public long getTime() {
>>> - return time;
>>> + return elapsedTime;
>>> }
>>>
>>> public boolean isSuccessful() {
>>> @@ -991,7 +991,7 @@ public class SampleResult implements Ser
>>> log.error("setEndTime must be called after setStartTime", new
>>> Throwable("Invalid call sequence"));
>>> // TODO should this throw an error?
>>> } else {
>>> - time = endTime - startTime - idleTime;
>>> + elapsedTime = endTime - startTime - idleTime;
>>> }
>>> }
>>>
>>>
>>>
>>>
>>
>>
>> --
>> Cordialement.
>> Philippe Mouawad.
Re: svn commit: r1443162 - /jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
Posted by sebb <se...@gmail.com>.
On 19 September 2013 11:44, Philippe Mouawad <ph...@gmail.com> wrote:
> Hello,
> This commit has an impact which is the following:
> - You cannot read anymore with 2.10 JTL files generated by version < 2.10.
Oops, that was not intentional.
> Shall we keep it or rollback it ?
I'll have a look at this shortly.
It appears the unit tests don't catch this problem, so clearly they
need fixing too.
> Regards
>
>
> On Wed, Feb 6, 2013 at 8:42 PM, <se...@apache.org> wrote:
>
>> Author: sebb
>> Date: Wed Feb 6 19:42:04 2013
>> New Revision: 1443162
>>
>> URL: http://svn.apache.org/viewvc?rev=1443162&view=rev
>> Log:
>> Rename private field to better reflect its contents
>>
>> Modified:
>> jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
>>
>> Modified:
>> jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
>> URL:
>> http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=1443162&r1=1443161&r2=1443162&view=diff
>>
>> ==============================================================================
>> --- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
>> (original)
>> +++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Wed
>> Feb 6 19:42:04 2013
>> @@ -173,7 +173,7 @@ public class SampleResult implements Ser
>> // ISO-8895-1, UTF-8
>>
>> /** elapsed time */
>> - private long time = 0;
>> + private long elapsedTime = 0;
>>
>> /** time to first response */
>> private long latency = 0;
>> @@ -272,7 +272,7 @@ public class SampleResult implements Ser
>>
>> // Allow test code to change the default useNanoTime and
>> nanoThreadSleep settings
>> SampleResult(boolean nanoTime, long nanoThreadSleep) {
>> - this.time = 0;
>> + this.elapsedTime = 0;
>> this.useNanoTime = nanoTime;
>> this.nanoThreadSleep = nanoThreadSleep;
>> this.nanoTimeOffset = initOffset();
>> @@ -321,7 +321,7 @@ public class SampleResult implements Ser
>> subResults = res.subResults; // TODO ??
>> success = res.success;//OK
>> threadName = res.threadName;//OK
>> - time = res.time;
>> + elapsedTime = res.elapsedTime;
>> timeStamp = res.timeStamp;
>> }
>>
>> @@ -420,7 +420,7 @@ public class SampleResult implements Ser
>> endTime = stamp;
>> }
>> timeStamp = stamp;
>> - time = elapsed;
>> + elapsedTime = elapsed;
>> }
>>
>> /*
>> @@ -717,7 +717,7 @@ public class SampleResult implements Ser
>> *
>> */
>> public long getTime() {
>> - return time;
>> + return elapsedTime;
>> }
>>
>> public boolean isSuccessful() {
>> @@ -991,7 +991,7 @@ public class SampleResult implements Ser
>> log.error("setEndTime must be called after setStartTime", new
>> Throwable("Invalid call sequence"));
>> // TODO should this throw an error?
>> } else {
>> - time = endTime - startTime - idleTime;
>> + elapsedTime = endTime - startTime - idleTime;
>> }
>> }
>>
>>
>>
>>
>
>
> --
> Cordialement.
> Philippe Mouawad.
Re: svn commit: r1443162 - /jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
Posted by Philippe Mouawad <ph...@gmail.com>.
Hello,
This commit has an impact which is the following:
- You cannot read anymore with 2.10 JTL files generated by version < 2.10.
Shall we keep it or rollback it ?
Regards
On Wed, Feb 6, 2013 at 8:42 PM, <se...@apache.org> wrote:
> Author: sebb
> Date: Wed Feb 6 19:42:04 2013
> New Revision: 1443162
>
> URL: http://svn.apache.org/viewvc?rev=1443162&view=rev
> Log:
> Rename private field to better reflect its contents
>
> Modified:
> jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
>
> Modified:
> jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
> URL:
> http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=1443162&r1=1443161&r2=1443162&view=diff
>
> ==============================================================================
> --- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
> (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Wed
> Feb 6 19:42:04 2013
> @@ -173,7 +173,7 @@ public class SampleResult implements Ser
> // ISO-8895-1, UTF-8
>
> /** elapsed time */
> - private long time = 0;
> + private long elapsedTime = 0;
>
> /** time to first response */
> private long latency = 0;
> @@ -272,7 +272,7 @@ public class SampleResult implements Ser
>
> // Allow test code to change the default useNanoTime and
> nanoThreadSleep settings
> SampleResult(boolean nanoTime, long nanoThreadSleep) {
> - this.time = 0;
> + this.elapsedTime = 0;
> this.useNanoTime = nanoTime;
> this.nanoThreadSleep = nanoThreadSleep;
> this.nanoTimeOffset = initOffset();
> @@ -321,7 +321,7 @@ public class SampleResult implements Ser
> subResults = res.subResults; // TODO ??
> success = res.success;//OK
> threadName = res.threadName;//OK
> - time = res.time;
> + elapsedTime = res.elapsedTime;
> timeStamp = res.timeStamp;
> }
>
> @@ -420,7 +420,7 @@ public class SampleResult implements Ser
> endTime = stamp;
> }
> timeStamp = stamp;
> - time = elapsed;
> + elapsedTime = elapsed;
> }
>
> /*
> @@ -717,7 +717,7 @@ public class SampleResult implements Ser
> *
> */
> public long getTime() {
> - return time;
> + return elapsedTime;
> }
>
> public boolean isSuccessful() {
> @@ -991,7 +991,7 @@ public class SampleResult implements Ser
> log.error("setEndTime must be called after setStartTime", new
> Throwable("Invalid call sequence"));
> // TODO should this throw an error?
> } else {
> - time = endTime - startTime - idleTime;
> + elapsedTime = endTime - startTime - idleTime;
> }
> }
>
>
>
>
--
Cordialement.
Philippe Mouawad.