AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-10154 Optimized time zone historical offset iteration.

Browse Source 
X-SVN-Rev: 33632
This commit is contained in:
Yoshito Umaoka 2013-05-10 16:32:04 +00:00
parent 2469052770
commit 8c9653dca9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
icu4j/main/classes/core/src/com/ibm/icu/impl/OlsonTimeZone.java
View File

@ -1,6 +1,6 @@
/* /*
******************************************************************************* *******************************************************************************
* Copyright (C) 2005-2012, International Business Machines Corporation and * * Copyright (C) 2005-2013, International Business Machines Corporation and *
* others. All Rights Reserved. * * others. All Rights Reserved. *
******************************************************************************* *******************************************************************************
*/ */
@ -669,6 +669,11 @@ public class OlsonTimeZone extends BasicTimeZone {
transitionRulesInitialized = false; transitionRulesInitialized = false;
} }
// Maximum absolute offset in seconds = 1 day.
// getHistoricalOffset uses this constant as safety margin of
// quick zone transition checking.
private static final int MAX_OFFSET_SECONDS = 86400; // 60 * 60 * 24;
private void getHistoricalOffset(long date, boolean local, private void getHistoricalOffset(long date, boolean local,
int NonExistingTimeOpt, int DuplicatedTimeOpt, int[] offsets) { int NonExistingTimeOpt, int DuplicatedTimeOpt, int[] offsets) {
if (transitionCount != 0) { if (transitionCount != 0) {
@ -683,7 +688,7 @@ public class OlsonTimeZone extends BasicTimeZone {
int transIdx; int transIdx;
for (transIdx = transitionCount - 1; transIdx >= 0; transIdx--) { for (transIdx = transitionCount - 1; transIdx >= 0; transIdx--) {
long transition = transitionTimes64[transIdx]; long transition = transitionTimes64[transIdx];
if (local) { if (local && (sec >= (transition - MAX_OFFSET_SECONDS))) {
int offsetBefore = zoneOffsetAt(transIdx - 1); int offsetBefore = zoneOffsetAt(transIdx - 1);
boolean dstBefore = dstOffsetAt(transIdx - 1) != 0; boolean dstBefore = dstOffsetAt(transIdx - 1) != 0;