WL#15045 Expand the json client library for HeatWave[relocate,noclose]

Moved the files used to make the json_client_library to the sql-common
folder.
Extended json_dom-t.cc with an extra benchmark test.

Change-Id: I7ff681918d479883699b60267b1037f2d0139f10

Author: Catalin Besleaga

Doxyfile-ignored

@@ -1,4 +1,4 @@
-# Copyright (c) 2015, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2015, 2022, 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,
@@ -137,6 +137,7 @@ plugin/group_replication/src/applier.cc:[0-9]+: warning:
 plugin/version_token/version_token.cc:[0-9]+: warning:
 sql-common/client.cc:[0-9]+: warning:
 sql-common/compression.cc:[0-9]+: warning:
+sql-common/json_dom.h:[0-9]+: warning:
 sql-common/net_serv.cc:[0-9]+: warning:
 sql/auth/partitioned_rwlock.h:[0-9]+: warning:
 sql/auth/sha2_password.cc:[0-9]+: warning:
@@ -151,7 +152,6 @@ sql/handler.h:[0-9]+: warning:
 sql/item.h:[0-9]+: warning:
 sql/item_func.h:[0-9]+: warning:
 sql/join_optimizer/explain_access_path.h:[0-9]+: warning:
-sql/json_dom.h:[0-9]+: warning:
 sql/key.cc:[0-9]+: warning:
 sql/log.cc:[0-9]+: warning:
 sql/log_event.h:[0-9]+: warning:

client/CMakeLists.txt

@@ -99,11 +99,7 @@ OPTION(WITH_JSON_BINLOG_LIBRARY
 IF(WITH_JSON_BINLOG_LIBRARY)
   UNSET(INSTALL_JSON_BINLOG_LIBRARY)
   INSTALL(FILES
-    ../sql/json_binary.h
-    DESTINATION ${INSTALL_INCLUDEDIR}/sql
-    COMPONENT Development
-    )
-  INSTALL(FILES
+    ../sql-common/json_binary.h
     ../sql-common/json_error_handler.h
     DESTINATION ${INSTALL_INCLUDEDIR}/sql-common
     COMPONENT Development
@@ -131,10 +127,10 @@ ENDIF()
 # Always build it, but do not *use* it for mysqlbinlog unless
 # WITH_JSON_BINLOG_LIBRARY=ON
 ADD_SHARED_LIBRARY(json_binlog
-  ${CMAKE_SOURCE_DIR}/sql/json_binary.cc
-  ${CMAKE_SOURCE_DIR}/sql/json_dom.cc
-  ${CMAKE_SOURCE_DIR}/sql/json_path.cc
-  ${CMAKE_SOURCE_DIR}/sql/json_syntax_check.cc
+  ${CMAKE_SOURCE_DIR}/sql-common/json_binary.cc
+  ${CMAKE_SOURCE_DIR}/sql-common/json_dom.cc
+  ${CMAKE_SOURCE_DIR}/sql-common/json_path.cc
+  ${CMAKE_SOURCE_DIR}/sql-common/json_syntax_check.cc
   ${CMAKE_SOURCE_DIR}/sql-common/sql_string.cc
 
   COMPILE_DEFINITIONS DISABLE_PSI_MUTEX EXPORT_JSON_FUNCTIONS
@@ -147,10 +143,10 @@ ADD_SHARED_LIBRARY(json_binlog
   )
 
 ADD_CONVENIENCE_LIBRARY(json_client_library
-  ${CMAKE_SOURCE_DIR}/sql/json_binary.cc
-  ${CMAKE_SOURCE_DIR}/sql/json_dom.cc
-  ${CMAKE_SOURCE_DIR}/sql/json_path.cc
-  ${CMAKE_SOURCE_DIR}/sql/json_syntax_check.cc
+  ${CMAKE_SOURCE_DIR}/sql-common/json_binary.cc
+  ${CMAKE_SOURCE_DIR}/sql-common/json_dom.cc
+  ${CMAKE_SOURCE_DIR}/sql-common/json_path.cc
+  ${CMAKE_SOURCE_DIR}/sql-common/json_syntax_check.cc
   ${CMAKE_SOURCE_DIR}/sql-common/sql_string.cc
 
   COMPILE_DEFINITIONS DISABLE_PSI_MUTEX

client/json_binlog_main.cc

@@ -29,7 +29,7 @@
 
 #include <string>
 
-#include "sql/json_binary.h"
+#include "sql-common/json_binary.h"
 
 int main() {
   json_binary::Value value = json_binary::parse_binary(nullptr, 0);

client/json_client_library_main.cc

@@ -28,8 +28,8 @@
 #include <iostream>
 #include <string>
 
-#include "sql/json_dom.h"
-#include "sql/json_path.h"
+#include "sql-common/json_dom.h"
+#include "sql-common/json_path.h"
 
 #include "sql_string.h"
 

sql/json_binary.cc renamed to sql-common/json_binary.cc

@@ -20,26 +20,27 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#include "sql/json_binary.h"
+#include "sql-common/json_binary.h"
 
 #include <string.h>
+
 #include <algorithm>  // std::min
 #include <cassert>
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
-
 #include "m_ctype.h"
+
 #include "my_byteorder.h"
 #include "my_sys.h"
 #include "mysqld_error.h"
 #ifdef MYSQL_SERVER
 #include "sql/check_stack.h"
 #endif
-#include "sql/field.h"     // Field_json
-#include "sql/json_dom.h"  // Json_dom
-#include "sql/json_syntax_check.h"
+#include "sql-common/json_dom.h"  // Json_dom
+#include "sql-common/json_syntax_check.h"
+#include "sql/field.h"      // Field_json
 #include "sql/sql_class.h"  // THD
 #include "sql/sql_const.h"
 #include "sql/system_variables.h"

sql/json_binary.h renamed to sql-common/json_binary.h

@@ -20,7 +20,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#include "sql/json_dom.h"
+#include "sql-common/json_dom.h"
 
 #include <errno.h>
 #include <float.h>
@@ -43,29 +43,29 @@
 
 #include "base64.h"
 #include "decimal.h"
-#include "json_binary.h"
 #include "m_ctype.h"
 #include "m_string.h"  // my_gcvt, _dig_vec_lower
-#include "malloc_allocator.h"
 #include "my_byteorder.h"
 #include "my_compare.h"
 #include "my_dbug.h"
-#include "my_decimal.h"
 #include "my_double2ulonglong.h"
 #include "my_sys.h"
 #include "my_time.h"
 #include "mysql/components/services/bits/psi_bits.h"
 #include "mysql/service_mysql_alloc.h"
 #include "mysql_com.h"
 #include "mysqld_error.h"  // ER_*
+#include "sql/malloc_allocator.h"
+#include "sql/my_decimal.h"
 #ifdef MYSQL_SERVER
 #include "sql/check_stack.h"
 #endif
+#include "sql-common/json_binary.h"
+#include "sql-common/json_path.h"
+#include "sql-common/json_syntax_check.h"
 #include "sql/current_thd.h"  // current_thd
 #include "sql/derror.h"       // ER_THD
 #include "sql/field.h"
-#include "sql/json_path.h"
-#include "sql/json_syntax_check.h"
 #include "sql/psi_memory_key.h"  // key_memory_JSON
 #include "sql/sql_class.h"       // THD
 #include "sql/sql_const.h"       // STACK_MIN_SIZE

sql/json_dom.cc renamed to sql-common/json_dom.cc

@@ -37,14 +37,15 @@
 
 #include "field_types.h"  // enum_field_types
 #include "my_compiler.h"
+
 #include "my_inttypes.h"
 #include "my_time.h"  // my_time_flags_t
 #include "mysql/mysql_lex_string.h"
-#include "mysql_time.h"            // MYSQL_TIME
-#include "prealloced_array.h"      // Prealloced_array
-#include "sql/json_binary.h"       // json_binary::Value
-#include "sql/malloc_allocator.h"  // Malloc_allocator
-#include "sql/my_decimal.h"        // my_decimal
+#include "mysql_time.h"              // MYSQL_TIME
+#include "prealloced_array.h"        // Prealloced_array
+#include "sql-common/json_binary.h"  // json_binary::Value
+#include "sql/malloc_allocator.h"    // Malloc_allocator
+#include "sql/my_decimal.h"          // my_decimal
 
 class Field_json;
 class Json_array;
@@ -65,7 +66,7 @@ using Json_array_ptr = std::unique_ptr<Json_array>;
 using Json_object_ptr = std::unique_ptr<Json_object>;
 
 /**
-  @file sql/json_dom.h
+  @file
   JSON DOM.
 
   When a JSON value is retrieved from a column, a prior it exists in

sql/json_dom.h renamed to sql-common/json_dom.h

@@ -28,7 +28,7 @@
   attached to WL#7909.
 */
 
-#include "sql/json_path.h"
+#include "sql-common/json_path.h"
 
 #include "my_rapidjson_size_t.h"  // IWYU pragma: keep
 
@@ -44,7 +44,7 @@
 #include "m_string.h"
 
 #include "my_inttypes.h"
-#include "sql/json_dom.h"
+#include "sql-common/json_dom.h"
 #include "sql/psi_memory_key.h"  // key_memory_JSON
 #include "sql/sql_const.h"       // STRING_BUFFER_USUAL_SIZE
 #include "sql_string.h"          // String

sql/json_path.cc renamed to sql-common/json_path.cc

@@ -20,7 +20,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 
-#include "sql/json_syntax_check.h"
+#include "sql-common/json_syntax_check.h"
 
 #include "my_rapidjson_size_t.h"  // IWYU pragma: keep
 

sql/json_path.h renamed to sql-common/json_path.h

@@ -433,12 +433,8 @@ SET(SQL_SHARED_SOURCES
   join_optimizer/overflow_bitset.cc
   join_optimizer/print_utils.cc
   join_optimizer/replace_item.cc
-  json_binary.cc
   json_diff.cc
-  json_dom.cc
-  json_path.cc
   json_schema.cc
-  json_syntax_check.cc
   key.cc
   key_spec.cc
   keycaches.cc
@@ -772,7 +768,11 @@ SET(SQL_SOURCE
   ../sql-common/oci/ssl.cc
   ../sql-common/sql_string.cc
   ../sql-common/bind_params.cc
+  ../sql-common/json_binary.cc
+  ../sql-common/json_dom.cc
   ../sql-common/json_error_handler.cc
+  ../sql-common/json_path.cc
+  ../sql-common/json_syntax_check.cc
   command_service.cc
   conn_handler/channel_info.cc
   conn_handler/connection_handler_per_thread.cc

sql/json_syntax_check.cc renamed to sql-common/json_syntax_check.cc

@@ -36,11 +36,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 #include <utility>
 
 #include "my_alloc.h"
+#include "sql-common/json_dom.h"
 #include "sql/auth/acl_table_base.h"
 #include "sql/auth/partial_revokes.h"
 #include "sql/auth/sql_mfa.h" /* I_multi_factor_auth */
 #include "sql/auth/user_table.h"
-#include "sql/json_dom.h"
 
 class ACL_USER;
 class RowIterator;

sql/json_syntax_check.h renamed to sql-common/json_syntax_check.h

@@ -28,11 +28,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
 #include "mysql/components/services/log_shared.h"
 #include "mysqld_error.h"
 #include "partial_revokes.h"
+#include "sql-common/json_dom.h"
 #include "sql/auth/auth_acls.h"
 #include "sql/auth/auth_common.h"
 #include "sql/auth/auth_internal.h"
 #include "sql/auth/sql_auth_cache.h"
-#include "sql/json_dom.h"
 #include "sql/mysqld.h"
 #include "sql/sql_class.h"
 #include "sql/sql_lex.h"

sql/CMakeLists.txt

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021, Oracle and/or its affiliates.
+/* Copyright (c) 2021, 2022, 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,
    as published by the Free Software Foundation.
@@ -25,8 +25,8 @@
 #include <string>
 #include <vector>
 
+#include "sql-common/json_dom.h"  // Json_array
 #include "sql/auth/user_table.h"
-#include "sql/json_dom.h"  // Json_array
 #include "sql/mem_root_allocator.h"
 #include "sql/sql_class.h"
 #include "sql/table.h"

sql/auth/acl_table_user.h

@@ -34,6 +34,7 @@
 #include "m_string.h"  // STRING_WITH_LEN
 
 #include "mysql_com.h"
+#include "sql-common/json_dom.h"  // Json_*
 #include "sql/auth/sql_security_ctx.h"
 #include "sql/current_thd.h"                       // current_thd
 #include "sql/dd/impl/dictionary_impl.h"           // Dictionary_impl
@@ -43,7 +44,6 @@
 #include "sql/dd/impl/tables/column_statistics.h"  // Column_statistics
 #include "sql/dd/impl/transaction_impl.h"          // Open_dictionary_tables_ctx
 #include "sql/histograms/histogram.h"              // histograms::Histogram
-#include "sql/json_dom.h"                          // Json_*
 #include "template_utils.h"
 
 namespace dd {

sql/auth/partial_revokes.cc

@@ -48,6 +48,8 @@
 #include "my_double2ulonglong.h"
 #include "my_sqlcommand.h"
 #include "myisampack.h"
+#include "sql-common/json_binary.h"  // json_binary::serialize
+#include "sql-common/json_dom.h"     // Json_dom, Json_wrapper
 #include "sql/create_field.h"
 #include "sql/current_thd.h"
 #include "sql/dd/cache/dictionary_client.h"
@@ -62,9 +64,7 @@
 #include "sql/item_json_func.h"  // ensure_utf8mb4
 #include "sql/item_timefunc.h"   // Item_func_now_local
 #include "sql/join_optimizer/bit_utils.h"
-#include "sql/json_binary.h"  // json_binary::serialize
-#include "sql/json_diff.h"    // Json_diff_vector
-#include "sql/json_dom.h"     // Json_dom, Json_wrapper
+#include "sql/json_diff.h"  // Json_diff_vector
 #include "sql/key.h"
 #include "sql/log_event.h"  // class Table_map_log_event
 #include "sql/my_decimal.h"

sql/auth/sql_mfa.h

@@ -71,6 +71,7 @@
 #include "mysql_com.h"
 #include "mysqld_error.h"
 #include "priority_queue.h"
+#include "sql-common/json_dom.h"  // Json_wrapper
 #include "sql/auth/sql_security_ctx.h"
 #include "sql/bounded_queue.h"
 #include "sql/cmp_varlen_keys.h"
@@ -84,7 +85,6 @@
 #include "sql/item_subselect.h"
 #include "sql/iterators/row_iterator.h"
 #include "sql/iterators/sorting_iterator.h"
-#include "sql/json_dom.h"  // Json_wrapper
 #include "sql/key_spec.h"
 #include "sql/malloc_allocator.h"
 #include "sql/merge_many_buff.h"

sql/dd/impl/types/column_statistics_impl.cc

@@ -37,9 +37,9 @@
 #include "my_dbug.h"
 #include "my_inttypes.h"
 #include "mysql_time.h"
+#include "sql-common/json_dom.h"  // Json_*
 #include "sql/histograms/equi_height_bucket.h"
 #include "sql/histograms/value_map.h"  // Value_map
-#include "sql/json_dom.h"              // Json_*
 #include "sql/mem_root_allocator.h"
 #include "sql_string.h"
 #include "template_utils.h"

sql/field.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, 2021, Oracle and/or its affiliates.
+/* Copyright (c) 2016, 2022, 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,
@@ -42,8 +42,8 @@
 #include "my_inttypes.h"
 #include "my_time.h"
 #include "mysql_time.h"
+#include "sql-common/json_dom.h"       // Json_*
 #include "sql/histograms/value_map.h"  // Histogram_comparator
-#include "sql/json_dom.h"              // Json_*
 #include "sql/my_decimal.h"            // my_decimal_cmp
 #include "sql/sql_time.h"              // calc_time_diff
 #include "template_utils.h"

sql/filesort.cc

@@ -49,7 +49,8 @@
 #include "mysql/service_mysql_alloc.h"
 #include "mysql_time.h"
 #include "mysqld_error.h"
-#include "scope_guard.h"  // create_scope_guard
+#include "scope_guard.h"          // create_scope_guard
+#include "sql-common/json_dom.h"  // Json_*
 #include "sql/auth/auth_common.h"
 #include "sql/dd/cache/dictionary_client.h"
 #include "sql/dd/dd.h"
@@ -64,7 +65,6 @@
 #include "sql/histograms/singleton.h"    // Singleton<T>
 #include "sql/histograms/value_map.h"    // Value_map
 #include "sql/item.h"
-#include "sql/json_dom.h"  // Json_*
 #include "sql/key.h"
 #include "sql/mdl.h"  // MDL_request
 #include "sql/my_decimal.h"

sql/histograms/equi_height.cc

@@ -36,8 +36,8 @@
 #include "my_dbug.h"
 #include "my_inttypes.h"
 #include "mysql_time.h"
+#include "sql-common/json_dom.h"       // Json_*
 #include "sql/histograms/value_map.h"  // Value_map
-#include "sql/json_dom.h"              // Json_*
 #include "template_utils.h"
 
 struct MEM_ROOT;