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

Expanded the json_client_library to include Json_path and its
dependencies, Json_dom::seek, Json_dom::parse and their dependencies
as well.
Got rid of THD, used as parameter in functions signatures by replacing
the two places where it was used with current_thd and wrapping
the call to be compiled only for the server usage.

In order to be used independent of the server, parse method has now
an additional parameter called JsonParseErrorHandler that is
a callback used to handle parse errors.
Added another callback to check_json_depth in order to allow different
clients to handle this case.

Removed parse_error param from parse_json and errmsg, errpos from
Json_dom::parse.

Change-Id: I629862fd4e003c0b0b1f8f2db93b1078743bf564

Author: Catalin Besleaga

client/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2021, Oracle and/or its affiliates.
+# Copyright (c) 2006, 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,
@@ -100,7 +100,12 @@ IF(WITH_JSON_BINLOG_LIBRARY)
   UNSET(INSTALL_JSON_BINLOG_LIBRARY)
   INSTALL(FILES
     ../sql/json_binary.h
-    DESTINATION ${INSTALL_INCLUDEDIR}
+    DESTINATION ${INSTALL_INCLUDEDIR}/sql
+    COMPONENT Development
+    )
+  INSTALL(FILES
+    ../sql-common/json_error_handler.h
+    DESTINATION ${INSTALL_INCLUDEDIR}/sql-common
     COMPONENT Development
     )
 ELSE()
@@ -128,6 +133,7 @@ ENDIF()
 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/sql_string.cc
 
@@ -143,6 +149,7 @@ 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/sql_string.cc
 
@@ -163,6 +170,15 @@ MERGE_CONVENIENCE_LIBRARIES(json_binlog_static
   ${INSTALL_JSON_BINLOG_LIBRARY}
   )
 
+# This is a test executable which verifies that Json_wrapper::seek,
+# Json_dom::seek and Json_dom::parse functions are visible and can be called.
+MYSQL_ADD_EXECUTABLE(json_client_library_main
+  json_client_library_main.cc
+  INCLUDE_DIRECTORIES ../sql
+  LINK_LIBRARIES json_client_library  strings
+  SKIP_INSTALL
+  )
+
 # A test executable which does nothing, except verify that symbols are visible.
 # To test standalone build:
 #   cmake -DINSTALL_MYSQLTESTDIR=0
@@ -172,7 +188,7 @@ MERGE_CONVENIENCE_LIBRARIES(json_binlog_static
 #       -ljson_binlog
 MYSQL_ADD_EXECUTABLE(json_binlog_main
   json_binlog_main.cc
-  INCLUDE_DIRECTORIES ../sql
+  INCLUDE_DIRECTORIES ../sql ../sql-common
   LINK_LIBRARIES json_binlog
   SKIP_INSTALL
   )
@@ -184,7 +200,7 @@ MYSQL_ADD_EXECUTABLE(json_binlog_main
 #       -ljson_binlog_static -lpthread
 MYSQL_ADD_EXECUTABLE(json_binlog_main_static
   json_binlog_main.cc
-  INCLUDE_DIRECTORIES ../sql
+  INCLUDE_DIRECTORIES ../sql ../sql-common
   LINK_LIBRARIES json_binlog_static
   SKIP_INSTALL
   )

client/json_binlog_main.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2020, 2021, Oracle and/or its affiliates.
+/* Copyright (c) 2020, 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,
@@ -29,7 +29,7 @@
 
 #include <string>
 
-#include "json_binary.h"
+#include "sql/json_binary.h"
 
 int main() {
   json_binary::Value value = json_binary::parse_binary(nullptr, 0);
@@ -58,7 +58,7 @@ int main() {
   json_binary::Value string_value = json_binary::Value("foo", 3);
 
   std::string string_buf;
-  string_value.to_std_string(&string_buf);
-  string_value.to_pretty_std_string(&string_buf);
+  string_value.to_std_string(&string_buf, [] { assert(false); });
+  string_value.to_pretty_std_string(&string_buf, [] { assert(false); });
   return 0;
 }

client/json_client_library_main.cc

@@ -0,0 +1,101 @@
+/* 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.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+/*
+  This is a test executable which verifies that Json_wrapper::seek,
+  Json_dom::seek and Json_dom::parse functions are visible and can be called.
+ */
+#include <cstring>
+#include <iostream>
+#include <string>
+
+#include "sql/json_dom.h"
+#include "sql/json_path.h"
+
+#include "sql_string.h"
+
+int main() {
+  Json_object o;
+  for (size_t i = 0; i < 1000; ++i) {
+    o.add_alias(std::to_string(i),
+                new (std::nothrow)
+                    Json_string(std::string("key_") + std::to_string(i)));
+  }
+
+  // Make sure Json_wrapper::seek is visible
+  Json_wrapper_vector hits(PSI_NOT_INSTRUMENTED);
+  bool need_only_one{false};
+  const char *json_path = R"($**."512")";
+  Json_path path(PSI_NOT_INSTRUMENTED);
+  size_t bad_index;
+  parse_path(std::strlen(json_path), json_path, &path, &bad_index,
+             [] { assert(false); });
+
+  Json_wrapper wr(&o);
+  wr.set_alias();
+  wr.seek(path, path.leg_count(), &hits, true, need_only_one);
+
+  for (auto &hit : hits) {
+    String buffer;
+    hit.to_string(&buffer, false, nullptr, [] { assert(false); });
+    std::cout << std::string_view{buffer.ptr(), buffer.length()} << std::endl;
+  }
+
+  // Make sure Json_dom::parse is visible and error handling works
+  {
+    std::string json{"[{\"key\":123},146]"};
+    Json_dom_ptr dom(Json_dom::parse(
+        json.c_str(), json.length(),
+        [](const char *, size_t) { assert(false); }, [] { assert(false); }));
+    if (dom != nullptr) std::cout << "1. success" << std::endl;
+  }
+
+  {
+    std::string json{
+        "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["
+        R"([[[[[[[[[[[[[[[[[[[[[[[[[[[[[[{"key":123}]]]]]]]]]]]]]]]]]]]]]]]]]])"
+        "]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]"
+        "]]]]"};
+    Json_dom_ptr dom(Json_dom::parse(
+        json.c_str(), json.length(),
+        [](const char *err_mesg, size_t err_code) {
+          std::cout << "2. parse_error [" << err_code << "]: " << err_mesg
+                    << std::endl;
+        },
+        [] { std::cout << "2. depth_error" << std::endl; }));
+    if (dom != nullptr) assert(false);
+  }
+
+  {
+    std::string json{"[&&"};
+    Json_dom_ptr dom(Json_dom::parse(
+        json.c_str(), json.length(),
+        [](const char *err_mesg, size_t err_code) {
+          std::cout << "3. parse_error [" << err_code << "]: " << err_mesg
+                    << std::endl;
+        },
+        [] { assert(false); }));
+    if (dom != nullptr) assert(false);
+  }
+
+  return 0;
+}

sql-common/json_error_handler.cc

@@ -0,0 +1,37 @@
+
+/* 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,
+   as published by the Free Software Foundation.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   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-common/json_error_handler.h"
+
+#include "my_sys.h"
+#include "mysqld_error.h"
+
+void JsonParseDefaultErrorHandler::operator()(const char *parse_err,
+                                              size_t err_offset) const {
+  my_error(ER_INVALID_JSON_TEXT_IN_PARAM, MYF(0), m_arg_idx + 1, m_func_name,
+           parse_err, err_offset, "");
+}
+
+void JsonDocumentDefaultDepthHandler() {
+  my_error(ER_JSON_DOCUMENT_TOO_DEEP, MYF(0));
+}

sql-common/json_error_handler.h

@@ -0,0 +1,50 @@
+#ifndef JSON_ERROR_HANDLER_INCLUDED
+#define JSON_ERROR_HANDLER_INCLUDED
+
+/* Copyright (c) 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.
+
+   This program is also distributed with certain software (including
+   but not limited to OpenSSL) that is licensed under separate terms,
+   as designated in a particular file or component or in included license
+   documentation.  The authors of MySQL hereby grant you an additional
+   permission to link the program and your derivative works with the
+   separately licensed software that they have included with MySQL.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License, version 2.0, for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+#include <cstdlib>
+#include <functional>
+
+using JsonParseErrorHandler =
+    std::function<void(const char *parse_err, size_t err_offset)>;
+using JsonDocumentDepthHandler = std::function<void()>;
+
+#ifdef MYSQL_SERVER
+
+class JsonParseDefaultErrorHandler {
+ public:
+  JsonParseDefaultErrorHandler(const char *func_name, int arg_idx)
+      : m_func_name(func_name), m_arg_idx(arg_idx) {}
+
+  void operator()(const char *parse_err, size_t err_offset) const;
+
+ private:
+  const char *m_func_name;
+  const int m_arg_idx;
+};
+
+void JsonDocumentDefaultDepthHandler();
+
+#endif  // MYSQL_SERVER
+#endif  // JSON_ERROR_HANDLER_INCLUDED

sql/CMakeLists.txt

@@ -772,6 +772,7 @@ SET(SQL_SOURCE
   ../sql-common/oci/ssl.cc
   ../sql-common/sql_string.cc
   ../sql-common/bind_params.cc
+  ../sql-common/json_error_handler.cc
   command_service.cc
   conn_handler/channel_info.cc
   conn_handler/connection_handler_per_thread.cc