Skip to content

fix time zone bug in different region #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 19, 2019
Merged

fix time zone bug in different region #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 6 additions & 28 deletions iotdb/src/test/java/org/apache/iotdb/db/sql/DatetimeUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,33 +35,15 @@ public class DatetimeUtilsTest {

private ZoneOffset zoneOffset;
private ZoneId zoneId;

public static void main(String[] args) throws LogicalOperatorException {
// ZoneId id = ZoneId.of("+08:00");
// Instant instant = Instant.now();
// ZoneOffset zoneOffset = id.getRules().getOffset(instant);
// System.out.println(currentOffsetForMyZone);

// DatetimeUtils.convertDatetimeStrToMillisecond("2019.01.02T15:13:27.689[Asia/Shanghai]", zoneOffset);
// for(String string : ZoneId.getAvailableZoneIds()) {
// ZoneId id = ZoneId.of(string);
// Instant instant = Instant.now();
// ZoneOffset currentOffsetForMyZone = id.getRules().getOffset(instant);
// System.out.println(string+"--"+currentOffsetForMyZone);
// }
// long timestamp = System.currentTimeMillis();
// System.out.println(timestamp);
// LocalDateTime dateTime = LocalDateTime.ofInstant(Instant.ofEpochMilli(1546499858912L),
// ZoneId.systemDefault());
// System.out.println(dateTime);
System.out.println(
DatetimeUtils.convertDatetimeStrToMillisecond("2018-1-1T13:00:07", ZoneId.systemDefault()));
}
// 1546413207689
// 2019-01-02T15:13:27.689+08:00
private long delta;

@Before
public void setUp() throws Exception {
zoneOffset = ZonedDateTime.now().getOffset();
zoneId = ZoneId.systemDefault();
delta = (8 - Long.parseLong(zoneOffset.toString().split(":")[0])) * 3600000;
}

@After
Expand All @@ -70,15 +52,13 @@ public void tearDown() throws Exception {

@Test
public void testConvertDatetimeStrToLongWithoutMS() throws LogicalOperatorException {
// 1546413207689
// 2019-01-02T15:13:27.689+08:00
String[] timeFormatWithoutMs = new String[]{"2019-01-02 15:13:27", "2019/01/02 15:13:27",
"2019.01.02 15:13:27", "2019-01-02T15:13:27", "2019/01/02T15:13:27", "2019.01.02T15:13:27",
"2019-01-02 15:13:27" + zoneOffset, "2019/01/02 15:13:27" + zoneOffset,
"2019.01.02 15:13:27" + zoneOffset, "2019-01-02T15:13:27" + zoneOffset,
"2019/01/02T15:13:27" + zoneOffset, "2019.01.02T15:13:27" + zoneOffset,};

long res = 1546413207000L;
long res = 1546413207000L + delta;
for (String str : timeFormatWithoutMs) {
Assert.assertEquals(res, DatetimeUtils.convertDatetimeStrToMillisecond(str, zoneOffset));
}
Expand All @@ -91,8 +71,6 @@ public void testConvertDatetimeStrToLongWithoutMS() throws LogicalOperatorExcept

@Test
public void testConvertDatetimeStrToLongWithMS() throws LogicalOperatorException {
// 1546413207689
// 2019-01-02T15:13:27.689+08:00
String[] timeFormatWithoutMs = new String[]{"2019-01-02 15:13:27.689",
"2019/01/02 15:13:27.689",
"2019.01.02 15:13:27.689", "2019-01-02T15:13:27.689", "2019/01/02T15:13:27.689",
Expand All @@ -101,7 +79,7 @@ public void testConvertDatetimeStrToLongWithMS() throws LogicalOperatorException
"2019-01-02T15:13:27.689" + zoneOffset, "2019/01/02T15:13:27.689" + zoneOffset,
"2019.01.02T15:13:27.689" + zoneOffset,};

long res = 1546413207689L;
long res = 1546413207689L + delta;
for (String str : timeFormatWithoutMs) {
assertEquals(res, DatetimeUtils.convertDatetimeStrToMillisecond(str, zoneOffset));
}
Expand Down