Merge branch 'nc/fix_timestamp_multiplatform' of github.com:realm/rea…

…lm-core into nc/fix_timestamp_multiplatform

src/realm/obj.cpp

@@ -922,7 +922,7 @@ void out_mixed_json(std::ostream& out, const Mixed& val)
         }
         case type_Timestamp:
             out << "\"";
-            out << val.get<Timestamp>();
+            out << util::serializer::print_value<Timestamp>(val.get_timestamp());
             out << "\"";
             break;
         case type_Decimal:
@@ -991,7 +991,9 @@ void out_mixed_xjson(std::ostream& out, const Mixed& val)
         }
         case type_Timestamp: {
             out << "{\"$date\": {\"$numberLong\": \"";
-            out << util::serializer::print_value(val.get<Timestamp>());
+            auto ts = val.get<Timestamp>();
+            int64_t timeMillis = ts.get_seconds() * 1000 + ts.get_nanoseconds() / 1000000;
+            out << timeMillis;
             out << "\"}}";
             break;
         }

test/expect_json.json

@@ -1 +1 @@
-[{"_key":0,"int":0,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+02,"double":9.8765432099999998e+03,"string":"string0","string_long":"string0 very long string.........","string_big_blobs":"string0 very long string......... big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs","string_enum":"enum1","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[],"strings":[],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":1,"int":-1,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+02,"double":-9.8765432099999998e+03,"string":"string1","string_long":"string1 very long string.........","string_big_blobs":"","string_enum":"enum2","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123],"strings":["sub_-123"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":2,"int":2,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+02,"double":9.8765432099999998e+03,"string":"string2","string_long":"string2 very long string.........","string_big_blobs":"string2 very long string......... big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs","string_enum":"enum3","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123,2345],"strings":["sub_-123","sub_2345"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":3,"int":-3,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+02,"double":-9.8765432099999998e+03,"string":"string3","string_long":"string3 very long string.........","string_big_blobs":"","string_enum":"enum1","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123,-3825,-7527],"strings":["sub_-123","sub_-3825","sub_-7527"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":4,"int":4,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+02,"double":9.8765432099999998e+03,"string":"string4","string_long":"string4 very long string.........","string_big_blobs":"string4 very long string......... big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs","string_enum":"enum2","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123,4813,9749,14685],"strings":["sub_-123","sub_4813","sub_9749","sub_14685"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":5,"int":-5,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+02,"double":-9.8765432099999998e+03,"string":"string5","string_long":"string5 very long string.........","string_big_blobs":"","string_enum":"enum3","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[],"strings":[],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":6,"int":6,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+02,"double":9.8765432099999998e+03,"string":"string6","string_long":"string6 very long string.........","string_big_blobs":"string6 very long string......... big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs","string_enum":"enum1","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123],"strings":["sub_-123"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":7,"int":-7,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+02,"double":-9.8765432099999998e+03,"string":"string7","string_long":"string7 very long string.........","string_big_blobs":"","string_enum":"enum2","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123,-8761],"strings":["sub_-123","sub_-8761"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":8,"int":8,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+02,"double":9.8765432099999998e+03,"string":"string8","string_long":"string8 very long string.........","string_big_blobs":"string8 very long string......... big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs","string_enum":"enum3","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123,9749,19621],"strings":["sub_-123","sub_9749","sub_19621"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":9,"int":-9,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+02,"double":-9.8765432099999998e+03,"string":"string9","string_long":"string9 very long string.........","string_big_blobs":"","string_enum":"enum1","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123,-11229,-22335,-33441],"strings":["sub_-123","sub_-11229","sub_-22335","sub_-33441"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":10,"int":10,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+02,"double":9.8765432099999998e+03,"string":"string10","string_long":"string10 very long string.........","string_big_blobs":"string10 very long string......... big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs","string_enum":"enum2","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[],"strings":[],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":11,"int":-11,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+02,"double":-9.8765432099999998e+03,"string":"string11","string_long":"string11 very long string.........","string_big_blobs":"","string_enum":"enum3","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123],"strings":["sub_-123"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":12,"int":12,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+02,"double":9.8765432099999998e+03,"string":"string12","string_long":"string12 very long string.........","string_big_blobs":"string12 very long string......... big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs","string_enum":"enum1","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123,14685],"strings":["sub_-123","sub_14685"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":13,"int":-13,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+02,"double":-9.8765432099999998e+03,"string":"string13","string_long":"string13 very long string.........","string_big_blobs":"","string_enum":"enum2","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123,-16165,-32207],"strings":["sub_-123","sub_-16165","sub_-32207"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":14,"int":14,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+02,"double":9.8765432099999998e+03,"string":"string14","string_long":"string14 very long string.........","string_big_blobs":"string14 very long string......... big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs","string_enum":"enum3","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123,17153,34429,51705],"strings":["sub_-123","sub_17153","sub_34429","sub_51705"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"}]
+[{"_key":0,"int":0,"bool":false,"date":"T12345:0","float":1.2345600e+02,"double":9.8765432099999998e+03,"string":"string0","string_long":"string0 very long string.........","string_big_blobs":"string0 very long string......... big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs","string_enum":"enum1","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[],"strings":[],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":1,"int":-1,"bool":true,"date":"T12345:0","float":-1.2345600e+02,"double":-9.8765432099999998e+03,"string":"string1","string_long":"string1 very long string.........","string_big_blobs":"","string_enum":"enum2","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123],"strings":["sub_-123"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":2,"int":2,"bool":false,"date":"T12345:0","float":1.2345600e+02,"double":9.8765432099999998e+03,"string":"string2","string_long":"string2 very long string.........","string_big_blobs":"string2 very long string......... big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs","string_enum":"enum3","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123,2345],"strings":["sub_-123","sub_2345"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":3,"int":-3,"bool":true,"date":"T12345:0","float":-1.2345600e+02,"double":-9.8765432099999998e+03,"string":"string3","string_long":"string3 very long string.........","string_big_blobs":"","string_enum":"enum1","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123,-3825,-7527],"strings":["sub_-123","sub_-3825","sub_-7527"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":4,"int":4,"bool":false,"date":"T12345:0","float":1.2345600e+02,"double":9.8765432099999998e+03,"string":"string4","string_long":"string4 very long string.........","string_big_blobs":"string4 very long string......... big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs","string_enum":"enum2","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123,4813,9749,14685],"strings":["sub_-123","sub_4813","sub_9749","sub_14685"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":5,"int":-5,"bool":true,"date":"T12345:0","float":-1.2345600e+02,"double":-9.8765432099999998e+03,"string":"string5","string_long":"string5 very long string.........","string_big_blobs":"","string_enum":"enum3","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[],"strings":[],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":6,"int":6,"bool":false,"date":"T12345:0","float":1.2345600e+02,"double":9.8765432099999998e+03,"string":"string6","string_long":"string6 very long string.........","string_big_blobs":"string6 very long string......... big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs","string_enum":"enum1","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123],"strings":["sub_-123"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":7,"int":-7,"bool":true,"date":"T12345:0","float":-1.2345600e+02,"double":-9.8765432099999998e+03,"string":"string7","string_long":"string7 very long string.........","string_big_blobs":"","string_enum":"enum2","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123,-8761],"strings":["sub_-123","sub_-8761"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":8,"int":8,"bool":false,"date":"T12345:0","float":1.2345600e+02,"double":9.8765432099999998e+03,"string":"string8","string_long":"string8 very long string.........","string_big_blobs":"string8 very long string......... big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs","string_enum":"enum3","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123,9749,19621],"strings":["sub_-123","sub_9749","sub_19621"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":9,"int":-9,"bool":true,"date":"T12345:0","float":-1.2345600e+02,"double":-9.8765432099999998e+03,"string":"string9","string_long":"string9 very long string.........","string_big_blobs":"","string_enum":"enum1","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123,-11229,-22335,-33441],"strings":["sub_-123","sub_-11229","sub_-22335","sub_-33441"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":10,"int":10,"bool":false,"date":"T12345:0","float":1.2345600e+02,"double":9.8765432099999998e+03,"string":"string10","string_long":"string10 very long string.........","string_big_blobs":"string10 very long string......... big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs","string_enum":"enum2","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[],"strings":[],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":11,"int":-11,"bool":true,"date":"T12345:0","float":-1.2345600e+02,"double":-9.8765432099999998e+03,"string":"string11","string_long":"string11 very long string.........","string_big_blobs":"","string_enum":"enum3","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123],"strings":["sub_-123"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":12,"int":12,"bool":false,"date":"T12345:0","float":1.2345600e+02,"double":9.8765432099999998e+03,"string":"string12","string_long":"string12 very long string.........","string_big_blobs":"string12 very long string......... big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs","string_enum":"enum1","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123,14685],"strings":["sub_-123","sub_14685"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":13,"int":-13,"bool":true,"date":"T12345:0","float":-1.2345600e+02,"double":-9.8765432099999998e+03,"string":"string13","string_long":"string13 very long string.........","string_big_blobs":"","string_enum":"enum2","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123,-16165,-32207],"strings":["sub_-123","sub_-16165","sub_-32207"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"},{"_key":14,"int":14,"bool":false,"date":"T12345:0","float":1.2345600e+02,"double":9.8765432099999998e+03,"string":"string14","string_long":"string14 very long string.........","string_big_blobs":"string14 very long string......... big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs big blobs","string_enum":"enum3","binary":"YmluYXJ5AA==","oid":"000000000000000000000000","decimal":"1.2345","integers":[-123,17153,34429,51705],"strings":["sub_-123","sub_17153","sub_34429","sub_51705"],"dictionary":{"a":2},"set":[123],"uuid":"00000000-0000-0000-0000-000000000000"}]