Revert "MDEV-27036: re-enable my_json_writer-t unit test"

This reverts commit 2d21917.

No explainations, lots of code moved, wrong cmake changes

Author: vuvova

CMakeLists.txt

@@ -142,7 +142,6 @@ IF (NOT CPACK_GENERATOR)
   ENDIF(WIN32) 
 ENDIF(NOT CPACK_GENERATOR)
 
-INCLUDE(build_depends)
 INCLUDE(FeatureSummary)
 INCLUDE(misc)
 INCLUDE(mysql_version)
@@ -539,6 +538,8 @@ IF(UNIX)
   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme)
 ENDIF()
 
+INCLUDE(build_depends)
+
 INCLUDE(CPack)
 
 IF(WIN32 AND SIGNCODE)

cmake/ctest.cmake

@@ -22,4 +22,3 @@ MACRO(MY_ADD_TESTS)
   ENDFOREACH()
 ENDMACRO()
 
-FIND_PACKAGE(Boost COMPONENTS unit_test_framework)

include/my_dir.h

@@ -17,9 +17,6 @@
 #define MY_DIR_H
 
 #include <sys/stat.h>
-#include <stddef.h>
-
-#include "my_global.h"
 
 #ifdef	__cplusplus
 extern "C" {

sql/CMakeLists.txt

@@ -206,7 +206,7 @@ RECOMPILE_FOR_EMBEDDED)
 ADD_LIBRARY(sql STATIC ${SQL_SOURCE})
 MAYBE_DISABLE_IPO(sql)
 DTRACE_INSTRUMENT(sql)
-TARGET_LINK_LIBRARIES(sql PUBLIC
+TARGET_LINK_LIBRARIES(sql
   mysys mysys_ssl dbug strings vio pcre2-8
   tpool
   ${LIBWRAP} ${LIBCRYPT} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
@@ -220,7 +220,7 @@ ENDIF()
 FOREACH(se aria partition perfschema sql_sequence wsrep)
   # These engines are used directly in sql sources.
   IF(TARGET ${se})
-    TARGET_LINK_LIBRARIES(sql PUBLIC ${se})
+    TARGET_LINK_LIBRARIES(sql ${se})
   ENDIF()
 ENDFOREACH()
 

sql/my_json_writer.cc

@@ -13,14 +13,10 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
 
-#include "my_json_writer.h"
-
-#include "sql_class.h"
 #include "mariadb.h"
 #include "sql_priv.h"
 #include "sql_string.h"
-#include "log.h"
-
+#include "my_json_writer.h"
 
 #if !defined(NDEBUG) || defined(JSON_WRITER_UNIT_TEST)
 #include <iostream>
@@ -332,7 +328,6 @@ Json_writer_temp_disable::Json_writer_temp_disable(THD *thd_arg)
   thd= thd_arg;
   thd->opt_trace.disable_tracing_if_required();
 }
-
 Json_writer_temp_disable::~Json_writer_temp_disable()
 {
   thd->opt_trace.enable_tracing_if_required();
@@ -502,18 +497,3 @@ void Single_line_formatting_helper::disable_and_flush()
   state= INACTIVE;
 }
 
-
-Json_writer_struct::Json_writer_struct(THD *thd)
-    : Json_writer_struct(thd->opt_trace.get_current_json())
-{
-}
-
-Json_writer_object::Json_writer_object(THD *thd, const char *str)
-    : Json_writer_object(thd->opt_trace.get_current_json(), str)
-{
-}
-
-Json_writer_array::Json_writer_array(THD *thd, const char *str)
-    : Json_writer_array(thd->opt_trace.get_current_json(), str)
-{
-}

sql/my_json_writer.h

@@ -17,6 +17,7 @@
 #define JSON_WRITER_INCLUDED
 
 #include "my_base.h"
+#include "sql_select.h"
 
 #if !defined(NDEBUG) || defined(JSON_WRITER_UNIT_TEST) || defined ENABLED_JSON_WRITER_CONSISTENCY_CHECKS
 #include <set>
@@ -31,7 +32,6 @@ constexpr uint FAKE_SELECT_LEX_ID= UINT_MAX;
 // Also, mock objects are defined in my_json_writer-t.cc
 #define VALIDITY_ASSERT(x) if (!(x)) this->invalid_json= true;
 #else
-#include "sql_select.h"
 #define VALIDITY_ASSERT(x) DBUG_ASSERT(x)
 #endif
 
@@ -40,11 +40,8 @@ constexpr uint FAKE_SELECT_LEX_ID= UINT_MAX;
 class Opt_trace_stmt;
 class Opt_trace_context;
 class Json_writer;
-struct TABLE;
 struct TABLE_LIST;
 
-struct st_join_table;
-using JOIN_TAB= struct st_join_table;
 
 /*
   Single_line_formatting_helper is used by Json_writer to do better formatting
@@ -390,7 +387,10 @@ class Json_writer_struct
     named_items_expectation.push_back(expect_named_children);
 #endif
   }
-  explicit Json_writer_struct(THD *thd);
+  explicit Json_writer_struct(THD *thd)
+  : Json_writer_struct(thd->opt_trace.get_current_json())
+  {
+  }
 
 public:
 
@@ -446,7 +446,10 @@ class Json_writer_object : public Json_writer_struct
     }
   }
 
-  explicit Json_writer_object(THD* thd, const char *str= nullptr);
+  explicit Json_writer_object(THD* thd, const char *str= nullptr)
+  : Json_writer_object(thd->opt_trace.get_current_json(), str)
+  {
+  }
 
   ~Json_writer_object()
   {
@@ -616,7 +619,10 @@ class Json_writer_array : public Json_writer_struct
     }
   }
 
-  explicit Json_writer_array(THD *thd, const char *str= nullptr);
+  explicit Json_writer_array(THD *thd, const char *str= nullptr)
+    : Json_writer_array(thd->opt_trace.get_current_json(), str)
+  {
+  }
 
   ~Json_writer_array()
   {

sql/opt_range.cc

@@ -1254,14 +1254,6 @@ void SQL_SELECT::cleanup()
   close_cached_file(&file);
 }
 
-int SQL_SELECT::skip_record(THD *thd)
-{
-    int rc= MY_TEST(!cond || cond->val_int());
-    if (thd->is_error())
-        rc= -1;
-    return rc;
-}
-
 
 SQL_SELECT::~SQL_SELECT()
 {
@@ -1880,20 +1872,6 @@ QUICK_RANGE::QUICK_RANGE()
   min_keypart_map(0), max_keypart_map(0)
 {}
 
-QUICK_RANGE::QUICK_RANGE(THD *thd, const uchar *min_key_arg, uint min_length_arg, key_part_map min_keypart_map_arg, const uchar *max_key_arg, uint max_length_arg, key_part_map max_keypart_map_arg, uint flag_arg)
-: min_key((uchar*) thd->memdup(min_key_arg, min_length_arg + 1)),
-  max_key((uchar*) thd->memdup(max_key_arg, max_length_arg + 1)),
-  min_length((uint16) min_length_arg),
-  max_length((uint16) max_length_arg),
-  flag((uint16) flag_arg),
-  min_keypart_map(min_keypart_map_arg),
-  max_keypart_map(max_keypart_map_arg)
-{
-#ifdef HAVE_valgrind
-  dummy=0;
-#endif
-}
-
 SEL_ARG::SEL_ARG(SEL_ARG &arg) :Sql_alloc()
 {
   type=arg.type;
@@ -10870,31 +10848,6 @@ uint SEL_ARG::get_max_key_part() const
   return max_part;
 }
 
-SEL_ARG *SEL_ARG::clone_and(THD *thd, SEL_ARG *arg)
-{						// Get overlapping range
-  uchar *new_min,*new_max;
-  uint8 flag_min,flag_max;
-  if (cmp_min_to_min(arg) >= 0)
-  {
-    new_min=min_value; flag_min=min_flag;
-  }
-  else
-  {
-    new_min=arg->min_value; flag_min=arg->min_flag; /* purecov: deadcode */
-  }
-  if (cmp_max_to_max(arg) <= 0)
-  {
-    new_max=max_value; flag_max=max_flag;
-  }
-  else
-  {
-    new_max=arg->max_value; flag_max=arg->max_flag;
-  }
-  return new (thd->mem_root) SEL_ARG(field, part, new_min, new_max, flag_min,
-                                     flag_max,
-                                     MY_TEST(maybe_flag && arg->maybe_flag));
-}
-
 
 /*
   Remove the SEL_ARG graph elements which have part > max_part.
@@ -16615,11 +16568,3 @@ void print_keyparts_name(String *out, const KEY_PART_INFO *key_part,
   }
   out->append(STRING_WITH_LEN(")"));
 }
-
-bool RANGE_OPT_PARAM::statement_should_be_aborted() const
-{
-  return thd->killed
-      || thd->is_fatal_error
-      || thd->is_error()
-      || alloced_sel_args > SEL_ARG::MAX_SEL_ARGS;
-}

sql/opt_range.h

@@ -36,9 +36,8 @@
 #include "sql_class.h"                          // set_var.h: THD
 #include "set_var.h"                            /* Item */
 
-class Item_sum;
 class JOIN;
-class Unique;
+class Item_sum;
 
 struct KEY_PART {
   uint16           key,part;
@@ -390,7 +389,30 @@ class SEL_ARG :public Sql_alloc
   {
     return sel_cmp(field,max_value, arg->min_value, max_flag, arg->min_flag);
   }
-  SEL_ARG *clone_and(THD *thd, SEL_ARG* arg);
+  SEL_ARG *clone_and(THD *thd, SEL_ARG* arg)
+  {						// Get overlapping range
+    uchar *new_min,*new_max;
+    uint8 flag_min,flag_max;
+    if (cmp_min_to_min(arg) >= 0)
+    {
+      new_min=min_value; flag_min=min_flag;
+    }
+    else
+    {
+      new_min=arg->min_value; flag_min=arg->min_flag; /* purecov: deadcode */
+    }
+    if (cmp_max_to_max(arg) <= 0)
+    {
+      new_max=max_value; flag_max=max_flag;
+    }
+    else
+    {
+      new_max=arg->max_value; flag_max=arg->max_flag;
+    }
+    return new (thd->mem_root) SEL_ARG(field, part, new_min, new_max, flag_min,
+                                       flag_max,
+                                       MY_TEST(maybe_flag && arg->maybe_flag));
+  }
   SEL_ARG *clone_first(SEL_ARG *arg)
   {						// min <= X < arg->min
     return new SEL_ARG(field,part, min_value, arg->min_value,
@@ -711,7 +733,14 @@ class RANGE_OPT_PARAM
   bool force_default_mrr;
   KEY_PART *key[MAX_KEY]; /* First key parts of keys used in the query */
 
-  bool statement_should_be_aborted() const;
+  bool statement_should_be_aborted() const
+  {
+    return
+      thd->killed ||
+      thd->is_fatal_error ||
+      thd->is_error() ||
+      alloced_sel_args > SEL_ARG::MAX_SEL_ARGS;
+  }
 };
 
 
@@ -734,9 +763,21 @@ class QUICK_RANGE :public Sql_alloc {
   QUICK_RANGE();				/* Full range */
   QUICK_RANGE(THD *thd, const uchar *min_key_arg, uint min_length_arg,
               key_part_map min_keypart_map_arg,
-              const uchar *max_key_arg, uint max_length_arg,
+	      const uchar *max_key_arg, uint max_length_arg,
               key_part_map max_keypart_map_arg,
-              uint flag_arg);
+	      uint flag_arg)
+    : min_key((uchar*) thd->memdup(min_key_arg, min_length_arg + 1)),
+      max_key((uchar*) thd->memdup(max_key_arg, max_length_arg + 1)),
+      min_length((uint16) min_length_arg),
+      max_length((uint16) max_length_arg),
+      flag((uint16) flag_arg),
+      min_keypart_map(min_keypart_map_arg),
+      max_keypart_map(max_keypart_map_arg)
+    {
+#ifdef HAVE_valgrind
+      dummy=0;
+#endif
+    }
 
   /**
      Initalizes a key_range object for communication with storage engine. 
@@ -1683,7 +1724,13 @@ class SQL_SELECT :public Sql_alloc {
      -1   if error
       1   otherwise
   */   
-  int skip_record(THD *thd);
+  inline int skip_record(THD *thd)
+  {
+    int rc= MY_TEST(!cond || cond->val_int());
+    if (thd->is_error())
+      rc= -1;
+    return rc;
+  }
   int test_quick_select(THD *thd, key_map keys, table_map prev_tables,
 			ha_rows limit, bool force_quick_range, 
                         bool ordered_output, bool remove_false_parts_of_where,

sql/set_var.cc

@@ -241,11 +241,6 @@ const uchar *sys_var::global_value_ptr(THD *thd, const LEX_CSTRING *base) const
   return global_var_ptr();
 }
 
-uchar *sys_var::session_var_ptr(THD *thd) const
-{
-  return ((uchar*)&(thd->variables)) + offset;
-}
-
 bool sys_var::check(THD *thd, set_var *var)
 {
   if (unlikely((var->value && do_check(thd, var)) ||

sql/set_var.h

@@ -247,7 +247,8 @@ class sys_var: protected Value_source // for double_from_string_with_check
     Typically it's the same as session_value_ptr(), but it's different,
     for example, for ENUM, that is printed as a string, but stored as a number.
   */
-  uchar *session_var_ptr(THD *thd) const;
+  uchar *session_var_ptr(THD *thd) const
+  { return ((uchar*)&(thd->variables)) + offset; }
 
   uchar *global_var_ptr() const
   { return ((uchar*)&global_system_variables) + offset; }

sql/sql_explain.h

@@ -54,8 +54,6 @@ it into the slow query log.
 #ifndef SQL_EXPLAIN_INCLUDED
 #define SQL_EXPLAIN_INCLUDED
 
-class select_result_sink;
-
 class String_list: public List<char>
 {
 public: