BUG#37008442 Change data structure from Tree map to unordered_map in

binlog_transaction_dependency [1/2]

Changed the data structure from Tree map to ankerl::unordered_dense::map of
variable m_writeset_history in sql/rpl_trx_tracking.h file which enhances
performance.

Changed CMakeFiles to support #include <ankerl/unordered_dense.h>

Change-Id: I59835525559a41d47305463d07e903b88d6a8696

Author: Arpit Goswami

cmake/plugin.cmake

@@ -305,7 +305,7 @@ MACRO(MYSQL_ADD_PLUGIN plugin_arg)
   ENDIF()
 
   # Add SYSTEM INCLUDE_DIRECTORIES
-  IF(ARG_SYSTEM_INCLUDE_DIRECTORIES)
+  IF(BUILD_PLUGIN AND ARG_SYSTEM_INCLUDE_DIRECTORIES)
     TARGET_INCLUDE_DIRECTORIES(${target} SYSTEM PRIVATE
       ${ARG_SYSTEM_INCLUDE_DIRECTORIES})
   ENDIF()

sql/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2024, Oracle and/or its affiliates.
+# Copyright (c) 2006, 2024, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -865,13 +865,6 @@ ADD_COMPILE_FLAGS(
   COMPILE_FLAGS -I${CMAKE_SOURCE_DIR}/extra/lz4 -I${BUNDLED_LZ4_PATH}
   )
 
-ADD_COMPILE_FLAGS(
-  iterators/composite_iterators.cc
-  iterators/hash_join_buffer.cc
-  COMPILE_FLAGS
-  -I${CMAKE_SOURCE_DIR}/extra/unordered_dense/unordered_dense-4.4.0/include
-  )
-
 # Fixes "C1128: number of sections exceeded object file format limit" in MSVC
 IF(WIN32)
   ADD_COMPILE_FLAGS(
@@ -964,6 +957,9 @@ MYSQL_ADD_PLUGIN(mysql_native_password
   SYSTEM_INCLUDE_DIRECTORIES "${RAPIDJSON_INCLUDE_DIR}"
   STATIC_ONLY DEFAULT)
 
+TARGET_INCLUDE_DIRECTORIES(sql_main SYSTEM PUBLIC
+  ${CMAKE_SOURCE_DIR}/extra/unordered_dense/unordered_dense-4.4.0/include)
+
 TARGET_LINK_LIBRARIES(sql_main ${MYSQLD_STATIC_PLUGIN_LIBS}
   mysql_server_component_services mysys strings vio
   mysql_binlog_event ${LIBWRAP} ${LIBDL} OpenSSL::SSL OpenSSL::Crypto

sql/rpl_trx_tracking.h

@@ -31,6 +31,7 @@
 
 #include "mysql/binlog/event/binlog_event.h"
 
+#include <ankerl/unordered_dense.h>
 #include "my_inttypes.h"
 
 class THD;
@@ -173,7 +174,7 @@ class Writeset_trx_dependency_tracker {
     Track the last transaction sequence number that changed each row
     in the database, using row hashes from the writeset as the index.
   */
-  typedef std::map<uint64, int64> Writeset_history;
+  using Writeset_history = ankerl::unordered_dense::map<uint64, int64>;
   Writeset_history m_writeset_history;
 };
 

sql/server_component/CMakeLists.txt

@@ -92,3 +92,6 @@ TARGET_COMPILE_DEFINITIONS(mysql_server_component_services
 TARGET_LINK_LIBRARIES(mysql_server_component_services PRIVATE extra::rapidjson)
 TARGET_LINK_LIBRARIES(mysql_server_component_services PRIVATE ext::zlib)
 ADD_DEPENDENCIES(mysql_server_component_services GenError)
+
+TARGET_INCLUDE_DIRECTORIES(mysql_server_component_services SYSTEM PRIVATE 
+  ${CMAKE_SOURCE_DIR}/extra/unordered_dense/unordered_dense-4.4.0/include)

storage/ndb/CMakeLists.txt

@@ -127,7 +127,9 @@ IF(NOT WITHOUT_SERVER)
   # unless it is explicitly disabled on the command line.
   MYSQL_ADD_PLUGIN(ndbcluster ${NDBCLUSTER_SOURCES} STORAGE_ENGINE
     DEFAULT STATIC_ONLY
-    LINK_LIBRARIES ndbclient_static extra::rapidjson)
+    LINK_LIBRARIES ndbclient_static extra::rapidjson
+    SYSTEM_INCLUDE_DIRECTORIES 
+    ${CMAKE_SOURCE_DIR}/extra/unordered_dense/unordered_dense-4.4.0/include)
 
   SET_PROPERTY(SOURCE plugin/ha_ndbcluster.cc
                PROPERTY COMPILE_DEFINITIONS

storage/perfschema/CMakeLists.txt

@@ -378,7 +378,9 @@ telemetry_pfs_metrics.cc
 )
 MYSQL_ADD_PLUGIN(perfschema ${PERFSCHEMA_SOURCES}
   STORAGE_ENGINE MANDATORY STATIC_ONLY
-  LINK_LIBRARIES extra::rapidjson ext::zlib mysql_gtid)
+  LINK_LIBRARIES extra::rapidjson ext::zlib mysql_gtid
+  SYSTEM_INCLUDE_DIRECTORIES 
+  ${CMAKE_SOURCE_DIR}/extra/unordered_dense/unordered_dense-4.4.0/include)
 
 IF(WITH_UNIT_TESTS)
   ADD_SUBDIRECTORY(unittest)

unittest/gunit/CMakeLists.txt

@@ -84,6 +84,8 @@ ADD_STATIC_LIBRARY(gunit_large
   thread_utils.cc
   LINK_LIBRARIES ext::icu ext::zlib
 )
+TARGET_INCLUDE_DIRECTORIES(gunit_large SYSTEM PRIVATE 
+  ${CMAKE_SOURCE_DIR}/extra/unordered_dense/unordered_dense-4.4.0/include)
 
 # Add a library for enable_win_jemalloc.cc
 # and link it with both gunit_small and gunit_large below.
@@ -368,6 +370,10 @@ IF(MY_COMPILER_IS_GNU)
   MY_TARGET_LINK_OPTIONS(merge_large_tests-t "-Wno-alloc-size-larger-than")
 ENDIF()
 
+TARGET_INCLUDE_DIRECTORIES(merge_large_tests-t SYSTEM PRIVATE
+  ${CMAKE_SOURCE_DIR}/extra/unordered_dense/unordered_dense-4.4.0/include)
+
+
 FOREACH(test ${TESTS})
   MYSQL_ADD_EXECUTABLE(${test}-t ${test}-t.cc
     COMPILE_DEFINITIONS ${DISABLE_PSI_DEFINITIONS}