Bug#30898701 UPGRADE THE RAPIDJSON LIBRARY [2/2, negative zero]

Backport the changes from bug#19504183, so that we do not change
how negative zero is handled by rapidjson.

Change-Id: I6bf56d2c0750baee4bad35b7173b0cbae0f1aef4

Author: Erik Froseth

extra/RAPIDJSON-README

@@ -26,5 +26,10 @@ The rapidjson library included in this directory is based on
 https://github.com/Tencent/rapidjson/,
 commit 418331e99f859f00bdc8306f69eba67e8693c55e
 
+There is one change made to the library:
+
+1) Rapidjson-specific changes in commit 91153f3385c4917a215aa4c7818b3f6265608286
+   have been applied, so that negative zero is handled properly (bug#19504183).
+
 We only include the contents of the folder "include/" so that we don't include
 any code licensed under the JSON License.

extra/rapidjson/include/rapidjson/document.h

@@ -2470,7 +2470,7 @@ class GenericDocument : public GenericValue<Encoding, Allocator> {
     bool Uint(unsigned i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
     bool Int64(int64_t i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
     bool Uint64(uint64_t i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
-    bool Double(double d) { new (stack_.template Push<ValueType>()) ValueType(d); return true; }
+    bool Double(double d, bool is_int = false) { new (stack_.template Push<ValueType>()) ValueType(d); return true; }
 
     bool RawNumber(const Ch* str, SizeType length, bool copy) { 
         if (copy) 

extra/rapidjson/include/rapidjson/prettywriter.h

@@ -98,7 +98,7 @@ class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding,
     bool Uint(unsigned u)       { PrettyPrefix(kNumberType); return Base::EndValue(Base::WriteUint(u)); }
     bool Int64(int64_t i64)     { PrettyPrefix(kNumberType); return Base::EndValue(Base::WriteInt64(i64)); }
     bool Uint64(uint64_t u64)   { PrettyPrefix(kNumberType); return Base::EndValue(Base::WriteUint64(u64));  }
-    bool Double(double d)       { PrettyPrefix(kNumberType); return Base::EndValue(Base::WriteDouble(d)); }
+    bool Double(double d, bool is_int = false)       { PrettyPrefix(kNumberType); return Base::EndValue(Base::WriteDouble(d)); }
 
     bool RawNumber(const Ch* str, SizeType length, bool copy = false) {
         RAPIDJSON_ASSERT(str != 0);

extra/rapidjson/include/rapidjson/reader.h

@@ -206,7 +206,7 @@ struct BaseReaderHandler {
     bool Uint(unsigned) { return static_cast<Override&>(*this).Default(); }
     bool Int64(int64_t) { return static_cast<Override&>(*this).Default(); }
     bool Uint64(uint64_t) { return static_cast<Override&>(*this).Default(); }
-    bool Double(double) { return static_cast<Override&>(*this).Default(); }
+    bool Double(double, bool is_int = false) { return static_cast<Override&>(*this).Default(); }
     /// enabled via kParseNumbersAsStringsFlag, string is not null-terminated (use length)
     bool RawNumber(const Ch* str, SizeType len, bool copy) { return static_cast<Override&>(*this).String(str, len, copy); }
     bool String(const Ch*, SizeType, bool) { return static_cast<Override&>(*this).Default(); }
@@ -1722,7 +1722,10 @@ class GenericReader {
                }
                else {
                    if (minus)
-                       cont = handler.Int(static_cast<int32_t>(~i + 1));
+                        if (i == 0)
+                            cont = handler.Double(-static_cast<double>(i), true);
+                        else
+                            cont = handler.Int(static_cast<int32_t>(~i + 1));
                    else
                        cont = handler.Uint(i);
                }

extra/rapidjson/include/rapidjson/writer.h

@@ -191,7 +191,7 @@ class Writer {
         \param d The value to be written.
         \return Whether it is succeed.
     */
-    bool Double(double d)       { Prefix(kNumberType); return EndValue(WriteDouble(d)); }
+    bool Double(double d, bool is_int = false)       { Prefix(kNumberType); return EndValue(WriteDouble(d)); }
 
     bool RawNumber(const Ch* str, SizeType length, bool copy = false) {
         RAPIDJSON_ASSERT(str != 0);

mysql-test/r/gis.result

@@ -1620,7 +1620,7 @@ GeoJSON	WKB
 DROP TABLE t1;
 SELECT HEX(ST_GeomFromGeoJSON('{"type":"Point","coordinates":[-0,-0.0]}')) AS g;
 g
-E6100000010100000000000000000000000000000000000080
+E6100000010100000000000000000000800000000000000080
 SELECT HEX(
 ST_GeomFromGeoJSON('{"type":"Point","coordinates":[-0.0,-0.0]}')) AS g;
 g