stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8074003: java.time.zone.ZoneRules.getOffset(java.time.Instant) can be optimized

Browse Source 
Make epochSecond part of ZoneOffsetTransition so it doesn't have to be recomputed frequently

Reviewed-by: scolebourne, rriggs
This commit is contained in:
Peter Levart 2015-05-04 10:13:19 +02:00
parent c565cf62f8
commit b308a894cf
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jdk/src/java.base/share/classes/java/time/zone/ZoneOffsetTransition.java
View File

@ -103,6 +103,10 @@ public final class ZoneOffsetTransition
* Serialization version. * Serialization version.
*/ */
private static final long serialVersionUID = -6946044323557704546L; private static final long serialVersionUID = -6946044323557704546L;
/**
* The transition epoch-second.
*/
private final long epochSecond;
/** /**
* The local transition date-time at the transition. * The local transition date-time at the transition.
*/ */
@ -152,6 +156,7 @@ public final class ZoneOffsetTransition
* @param offsetAfter the offset at and after the transition, not null * @param offsetAfter the offset at and after the transition, not null
*/ */
ZoneOffsetTransition(LocalDateTime transition, ZoneOffset offsetBefore, ZoneOffset offsetAfter) { ZoneOffsetTransition(LocalDateTime transition, ZoneOffset offsetBefore, ZoneOffset offsetAfter) {
this.epochSecond = transition.toEpochSecond(offsetBefore);
this.transition = transition; this.transition = transition;
this.offsetBefore = offsetBefore; this.offsetBefore = offsetBefore;
this.offsetAfter = offsetAfter; this.offsetAfter = offsetAfter;
@ -165,6 +170,7 @@ public final class ZoneOffsetTransition
* @param offsetAfter the offset at and after the transition, not null * @param offsetAfter the offset at and after the transition, not null
*/ */
ZoneOffsetTransition(long epochSecond, ZoneOffset offsetBefore, ZoneOffset offsetAfter) { ZoneOffsetTransition(long epochSecond, ZoneOffset offsetBefore, ZoneOffset offsetAfter) {
this.epochSecond = epochSecond;
this.transition = LocalDateTime.ofEpochSecond(epochSecond, 0, offsetBefore); this.transition = LocalDateTime.ofEpochSecond(epochSecond, 0, offsetBefore);
this.offsetBefore = offsetBefore; this.offsetBefore = offsetBefore;
this.offsetAfter = offsetAfter; this.offsetAfter = offsetAfter;
@ -209,7 +215,7 @@ public final class ZoneOffsetTransition
* @throws IOException if an error occurs * @throws IOException if an error occurs
*/ */
void writeExternal(DataOutput out) throws IOException { void writeExternal(DataOutput out) throws IOException {
Ser.writeEpochSec(toEpochSecond(), out); Ser.writeEpochSec(epochSecond, out);
Ser.writeOffset(offsetBefore, out); Ser.writeOffset(offsetBefore, out);
Ser.writeOffset(offsetAfter, out); Ser.writeOffset(offsetAfter, out);
} }
@ -253,7 +259,7 @@ public final class ZoneOffsetTransition
* @return the transition epoch second * @return the transition epoch second
*/ */
public long toEpochSecond() { public long toEpochSecond() {
return transition.toEpochSecond(offsetBefore); return epochSecond;
} }
//------------------------------------------------------------------------- //-------------------------------------------------------------------------
@ -397,8 +403,14 @@ public final class ZoneOffsetTransition
*/ */
@Override @Override
public int compareTo(ZoneOffsetTransition transition) { public int compareTo(ZoneOffsetTransition transition) {
if (epochSecond < transition.epochSecond) {
return -1;
} else if (epochSecond > transition.epochSecond) {
return 1;
} else {
return this.getInstant().compareTo(transition.getInstant()); return this.getInstant().compareTo(transition.getInstant());
} }
}
//----------------------------------------------------------------------- //-----------------------------------------------------------------------
/** /**
@ -416,7 +428,8 @@ public final class ZoneOffsetTransition
} }
if (other instanceof ZoneOffsetTransition) { if (other instanceof ZoneOffsetTransition) {
ZoneOffsetTransition d = (ZoneOffsetTransition) other; ZoneOffsetTransition d = (ZoneOffsetTransition) other;
return transition.equals(d.transition) && return epochSecond == d.epochSecond &&
transition.equals(d.transition) &&
offsetBefore.equals(d.offsetBefore) && offsetAfter.equals(d.offsetAfter); offsetBefore.equals(d.offsetBefore) && offsetAfter.equals(d.offsetAfter);
} }
return false; return false;