Repository: calcite Updated Branches: refs/heads/master 68ba411e2 -> a7e8fb84c
[CALCITE-2364] Fix timezone issue (in test) between Mongo DB and local JVM (Andrei Sereda) Mongo expects date-time fields to be in millis UTC. That value can be different if JVM and mongo timezones are not identical Close apache/calcite#734 Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/a7e8fb84 Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/a7e8fb84 Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/a7e8fb84 Branch: refs/heads/master Commit: a7e8fb84cfc5483752a6a5350497971a105462b2 Parents: 68ba411 Author: Andrei Sereda <[email protected]> Authored: Wed Jun 27 18:44:34 2018 -0400 Committer: Volodymyr Vysotskyi <[email protected]> Committed: Thu Jun 28 21:30:40 2018 +0300 ---------------------------------------------------------------------- .../adapter/mongodb/MongoAdapterTest.java | 25 +++++--------------- 1 file changed, 6 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/a7e8fb84/mongodb/src/test/java/org/apache/calcite/adapter/mongodb/MongoAdapterTest.java ---------------------------------------------------------------------- diff --git a/mongodb/src/test/java/org/apache/calcite/adapter/mongodb/MongoAdapterTest.java b/mongodb/src/test/java/org/apache/calcite/adapter/mongodb/MongoAdapterTest.java index d6a45d9..4001a8d 100644 --- a/mongodb/src/test/java/org/apache/calcite/adapter/mongodb/MongoAdapterTest.java +++ b/mongodb/src/test/java/org/apache/calcite/adapter/mongodb/MongoAdapterTest.java @@ -54,8 +54,9 @@ import java.net.URL; import java.nio.charset.StandardCharsets; import java.sql.ResultSet; import java.sql.SQLException; -import java.text.SimpleDateFormat; -import java.util.Date; +import java.time.Instant; +import java.time.LocalDate; +import java.time.ZoneOffset; import java.util.List; import java.util.Locale; import java.util.Map; @@ -95,9 +96,10 @@ public class MongoAdapterTest implements SchemaFactory { if (datatypes.count() > 0) { datatypes.deleteMany(new BsonDocument()); } + BsonDocument doc = new BsonDocument(); - Date date = new SimpleDateFormat("yyyy-MM-dd", Locale.ROOT).parse("2012-09-05"); - doc.put("date", new BsonDateTime(date.getTime())); + Instant instant = LocalDate.of(2012, 9, 5).atStartOfDay(ZoneOffset.UTC).toInstant(); + doc.put("date", new BsonDateTime(instant.toEpochMilli())); doc.put("value", new BsonInt32(1231)); doc.put("ownerId", new BsonString("531e7789e4b0853ddb861313")); datatypes.insertOne(doc); @@ -697,21 +699,6 @@ public class MongoAdapterTest implements SchemaFactory { * <a href="https://issues.apache.org/jira/browse/CALCITE-286";>[CALCITE-286] * Error casting MongoDB date</a>. */ @Test public void testDate() { - // Assumes that you have created the following collection before running - // this test: - // - // $ mongo - // > use test - // switched to db test - // > db.createCollection("datatypes") - // { "ok" : 1 } - // > db.datatypes.insert( { - // "_id" : ObjectId("53655599e4b0c980df0a8c27"), - // "_class" : "com.ericblue.Test", - // "date" : ISODate("2012-09-05T07:00:00Z"), - // "value" : 1231, - // "ownerId" : "531e7789e4b0853ddb861313" - // } ) assertModel("{\n" + " version: '1.0',\n" + " defaultSchema: 'test',\n"
