Bug#36730025 Update rapidjson library [noclose,RAPIDJSON_HAS_STDSTRING]

Georgios Psaropoulos · Tor Didriksen · commit 522e930e721b · 2024-09-26T13:54:54.000+02:00
Define RAPIDJSON_HAS_STDSTRING=1 for the rapidjson interface target.
Remove explicit definitions before including rapidjson headers.

Change-Id: I60aa0ea60e246d4f3638e5c05dec92602f1f74c4
(cherry picked from commit 9ad50ced4d2fdb6a8f5ebb3e28bf8b3ef0994824)
diff --git a/cmake/rapidjson.cmake b/cmake/rapidjson.cmake
@@ -125,7 +125,8 @@ MACRO (MYSQL_CHECK_RAPIDJSON)
   TARGET_COMPILE_DEFINITIONS(rapidjson INTERFACE
     RAPIDJSON_NO_SIZETYPEDEFINE
     RAPIDJSON_SCHEMA_USE_INTERNALREGEX=0
-    RAPIDJSON_SCHEMA_USE_STDREGEX=1)
+    RAPIDJSON_SCHEMA_USE_STDREGEX=1
+    RAPIDJSON_HAS_STDSTRING=1)
 
   IF(WITH_RAPIDJSON STREQUAL "bundled")
     TARGET_INCLUDE_DIRECTORIES(rapidjson SYSTEM BEFORE INTERFACE
diff --git a/components/keyrings/common/config/config_reader.h b/components/keyrings/common/config/config_reader.h
@@ -26,8 +26,6 @@
 
 #include <string>
 
-#define RAPIDJSON_HAS_STDSTRING 1
-
 #include "my_rapidjson_size_t.h"
 
 #include <rapidjson/document.h>
diff --git a/components/keyrings/common/json_data/json_reader.h b/components/keyrings/common/json_data/json_reader.h
@@ -28,8 +28,6 @@
 #include <string>
 #include <vector>
 
-#define RAPIDJSON_HAS_STDSTRING 1
-
 #include "my_rapidjson_size_t.h"
 
 #include <rapidjson/document.h>
diff --git a/components/keyrings/common/json_data/json_writer.h b/components/keyrings/common/json_data/json_writer.h
@@ -26,8 +26,6 @@
 
 #include <string>
 
-#define RAPIDJSON_HAS_STDSTRING 1
-
 #include "my_rapidjson_size_t.h"
 
 #include <rapidjson/document.h>
diff --git a/components/keyrings/keyring_file/config/config.cc b/components/keyrings/keyring_file/config/config.cc
@@ -23,8 +23,6 @@
 
 #include <memory>
 
-#define RAPIDJSON_HAS_STDSTRING 1
-
 #include "my_rapidjson_size_t.h"
 
 #include <rapidjson/document.h>
diff --git a/router/src/metadata_cache/src/router_cs_options.cc b/router/src/metadata_cache/src/router_cs_options.cc
@@ -23,9 +23,6 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-// enable using Rapidjson library with std::string
-#define RAPIDJSON_HAS_STDSTRING 1
-
 #include "router_cs_options.h"
 
 #include <rapidjson/writer.h>
diff --git a/router/src/mock_server/src/mock_server_rest_client.cc b/router/src/mock_server/src/mock_server_rest_client.cc
@@ -23,9 +23,6 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
-// enable using Rapidjson library with std::string
-#define RAPIDJSON_HAS_STDSTRING 1
-
 #include "my_rapidjson_size_t.h"
 
 #include "mysqlrouter/mock_server_rest_client.h"
diff --git a/router/src/router/src/CMakeLists.txt b/router/src/router/src/CMakeLists.txt
@@ -156,5 +156,5 @@ MYSQL_ADD_EXECUTABLE(mysqlrouter_keyring
   keyring_cli.cc
   keyring_frontend.cc
   COMPONENT Router
-  LINK_LIBRARIES router_lib
+  LINK_LIBRARIES router_lib extra::rapidjson
   )
diff --git a/router/src/routing/tests/CMakeLists.txt b/router/src/routing/tests/CMakeLists.txt
@@ -58,6 +58,7 @@ FOREACH(test_file ${test_files})
     LIB_DEPENDS
       routing_export_all
       test-helpers
+      extra::rapidjson
     INCLUDE_DIRS
       ${CMAKE_CURRENT_SOURCE_DIR}/../src
       ${CMAKE_CURRENT_SOURCE_DIR}/../../harness/tests  # mock_io_service.h
diff --git a/router/tests/component/test_routing_sharing.cc b/router/tests/component/test_routing_sharing.cc
@@ -29,8 +29,6 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
-#define RAPIDJSON_HAS_STDSTRING 1
-
 #include "mysql/harness/net_ts/impl/socket.h"
 #include "rest_api_testutils.h"
 #include "router/src/routing/tests/mysql_client.h"
diff --git a/router/tests/integration/test_routing_direct.cc b/router/tests/integration/test_routing_direct.cc
@@ -42,8 +42,6 @@
 #include <gtest/gtest-param-test.h>
 #include <gtest/gtest.h>
 
-#define RAPIDJSON_HAS_STDSTRING 1
-
 #include "my_rapidjson_size_t.h"
 
 #include <rapidjson/pointer.h>
diff --git a/router/tests/integration/test_routing_sharing.cc b/router/tests/integration/test_routing_sharing.cc
@@ -42,8 +42,6 @@
 #include <gtest/gtest-param-test.h>
 #include <gtest/gtest.h>
 
-#define RAPIDJSON_HAS_STDSTRING 1
-
 #include "my_rapidjson_size_t.h"
 
 #include <rapidjson/pointer.h>
diff --git a/router/tests/integration/test_routing_sharing_constrained_pools.cc b/router/tests/integration/test_routing_sharing_constrained_pools.cc
@@ -42,8 +42,6 @@
 #include <gtest/gtest-param-test.h>
 #include <gtest/gtest.h>
 
-#define RAPIDJSON_HAS_STDSTRING 1
-
 #include "my_rapidjson_size_t.h"
 
 #include <rapidjson/pointer.h>
diff --git a/router/tests/integration/test_routing_sharing_restart.cc b/router/tests/integration/test_routing_sharing_restart.cc
@@ -42,8 +42,6 @@
 #include <gtest/gtest-param-test.h>
 #include <gtest/gtest.h>
 
-#define RAPIDJSON_HAS_STDSTRING 1
-
 #include "my_rapidjson_size_t.h"
 
 #include <rapidjson/pointer.h>
diff --git a/sql/sql_component.cc b/sql/sql_component.cc
@@ -25,8 +25,6 @@
 #include <stddef.h>
 #include <vector>
 
-#define RAPIDJSON_HAS_STDSTRING 1
-
 #include "manifest.h"
 #include "my_dbug.h"
 #include "my_inttypes.h"

Original file line number	Diff line number	Diff line change
`@@ -156,5 +156,5 @@ MYSQL_ADD_EXECUTABLE(mysqlrouter_keyring`
`156`	`156`	`keyring_cli.cc`
`157`	`157`	`keyring_frontend.cc`
`158`	`158`	`COMPONENT Router`
`159`		`- LINK_LIBRARIES router_lib`
	`159`	`+ LINK_LIBRARIES router_lib extra::rapidjson`
`160`	`160`	`)`