Revert "Bug#32100213: X PLUGIN SOURCE DEFINES NGS LIBRARY, STILL IT IS NOT EXTRACTABLE PLUGIN PART"

The push broke compilation on several Linux platforms (required too high cmake version).

Approved by Shipra Jain <shipra.x.jain@oracle.com>

Author: dahlerlend

plugin/x/CMakeLists.txt

@@ -43,8 +43,7 @@ ENDIF()
 
 ADD_DEFINITIONS(-DLOG_COMPONENT_TAG="mysqlx")
 
-INCLUDE(src/source_files.cmake)
-LIST(TRANSFORM XPL_SRC PREPEND "src/")
+INCLUDE(source_files.cmake)
 
 SET(XPLUGIN_LOG_PROTOBUF 1 CACHE STRING "Enable logging of protobuf messages")
 
@@ -89,21 +88,21 @@ INCLUDE_DIRECTORIES(
 MY_INCLUDE_SYSTEM_DIRECTORIES(LIBEVENT)
 MY_INCLUDE_SYSTEM_DIRECTORIES(ICU)
 
-ADD_COMPILE_FLAGS(${XPL_SRC}
+ADD_COMPILE_FLAGS(${xplugin_SRC}
   COMPILE_FLAGS "${MYSQLX_PROTOCOL_FLAGS}"
 )
 
 # assertion failed in function assert_with_dumps() @ ssa.c:621 when using -xO3
 IF(MY_COMPILER_IS_SUNPRO)
-  ADD_COMPILE_FLAGS(${MYSQLX_PROJECT_DIR}/src/ngs/client.cc
+  ADD_COMPILE_FLAGS(${MYSQLX_PROJECT_DIR}/ngs/src/client.cc
     COMPILE_FLAGS "-xO2"
   )
 ENDIF()
 
 # MYSQL_ADD_PLUGIN may have disabled the plugin.
 IF(WITH_MYSQLX)
   MYSQL_ADD_PLUGIN(${MYSQLX_PLUGIN_NAME}
-    ${XPL_SRC}
+    ${xplugin_SRC}
     DEFAULT
     DEPENDENCIES xprotocol_tags
     LINK_LIBRARIES
@@ -136,3 +135,10 @@ IF(WIN32)
   ADD_DEFINITIONS(-DU_STATIC_IMPLEMENTATION)
 ENDIF()
 
+IF(WITH_MYSQLX)
+  MYSQL_ADD_COMPONENT("${MYSQLX_PLUGIN_NAME}_global_reset"
+    ${xplugin_global_reset_SRC}
+    MODULE_ONLY
+    TEST_ONLY
+    )
+ENDIF()

plugin/x/client/CMakeLists.txt

@@ -23,8 +23,20 @@
 SET(CLIENT_FULL_LIB_NAME mysqlxclient)
 SET(CLIENT_LITE_LIB_NAME mysqlxclient_lite)
 
-INCLUDE(source_files.cmake)
-LIST(APPEND CLIENT_SRC "${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc")
+SET(CLIENT_SRC
+  authentication/mysql41_hash.cc
+  authentication/password_hasher.cc
+  authentication/sha256_scramble_generator.cc
+  xprotocol_impl.cc
+  xrow_impl.cc
+  xquery_result_impl.cc
+  xsession_impl.cc
+  xconnection_impl.cc
+  xcompression_negotiator.cc
+  xcompression_impl.cc
+  xrow.cc
+  ${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc
+)
 
 INCLUDE_DIRECTORIES(
   ${MYSQLX_GENERATE_DIR}

plugin/x/client/source_files.cmake

@@ -22,26 +22,26 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-#ifndef PLUGIN_X_SRC_NGS_CLIENT_H_
-#define PLUGIN_X_SRC_NGS_CLIENT_H_
+#ifndef PLUGIN_X_NGS_INCLUDE_NGS_CLIENT_H_
+#define PLUGIN_X_NGS_INCLUDE_NGS_CLIENT_H_
 
 #include <atomic>
 #include <cstdint>
 #include <limits>
 #include <memory>
 #include <string>
 
+#include "plugin/x/ngs/include/ngs/memory.h"
+#include "plugin/x/ngs/include/ngs/protocol/message.h"
+#include "plugin/x/ngs/include/ngs/protocol_decoder.h"
+#include "plugin/x/ngs/include/ngs/protocol_encoder_compression.h"
 #include "plugin/x/src/capabilities/configurator.h"
 #include "plugin/x/src/helper/chrono.h"
 #include "plugin/x/src/helper/multithread/mutex.h"
 #include "plugin/x/src/interface/client.h"
 #include "plugin/x/src/interface/protocol_encoder.h"
 #include "plugin/x/src/interface/server.h"
 #include "plugin/x/src/interface/vio.h"
-#include "plugin/x/src/ngs/memory.h"
-#include "plugin/x/src/ngs/protocol/message.h"
-#include "plugin/x/src/ngs/protocol_decoder.h"
-#include "plugin/x/src/ngs/protocol_encoder_compression.h"
 
 #ifndef WIN32
 #include <netinet/in.h>
@@ -236,4 +236,4 @@ class Client : public xpl::iface::Client {
 
 }  // namespace ngs
 
-#endif  // PLUGIN_X_SRC_NGS_CLIENT_H_
+#endif  // PLUGIN_X_NGS_INCLUDE_NGS_CLIENT_H_

plugin/x/src/ngs/client.h renamed to plugin/x/ngs/include/ngs/client.h

@@ -22,18 +22,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-#ifndef PLUGIN_X_SRC_NGS_CLIENT_LIST_H_
-#define PLUGIN_X_SRC_NGS_CLIENT_LIST_H_
+#ifndef PLUGIN_X_NGS_INCLUDE_NGS_CLIENT_LIST_H_
+#define PLUGIN_X_NGS_INCLUDE_NGS_CLIENT_LIST_H_
 
 #include <algorithm>
 #include <list>
 #include <memory>
 #include <vector>
 
+#include "plugin/x/ngs/include/ngs/thread.h"
 #include "plugin/x/src/helper/multithread/lock_container.h"
 #include "plugin/x/src/helper/multithread/rw_lock.h"
 #include "plugin/x/src/interface/client.h"
-#include "plugin/x/src/ngs/thread.h"
 
 namespace ngs {
 
@@ -106,4 +106,4 @@ void Client_list::enumerate(const Functor &matcher) {
 
 }  // namespace ngs
 
-#endif  // PLUGIN_X_SRC_NGS_CLIENT_LIST_H_
+#endif  // PLUGIN_X_NGS_INCLUDE_NGS_CLIENT_LIST_H_

plugin/x/src/ngs/client_list.h renamed to plugin/x/ngs/include/ngs/client_list.h

@@ -22,17 +22,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-#ifndef PLUGIN_X_SRC_NGS_CLIENT_SESSION_H_
-#define PLUGIN_X_SRC_NGS_CLIENT_SESSION_H_
+#ifndef PLUGIN_X_NGS_INCLUDE_NGS_CLIENT_SESSION_H_
+#define PLUGIN_X_NGS_INCLUDE_NGS_CLIENT_SESSION_H_
 
 #include <cassert>
 #include <cstdint>
 #include <memory>
 
+#include "plugin/x/ngs/include/ngs/thread.h"
 #include "plugin/x/src/interface/authentication.h"
 #include "plugin/x/src/interface/protocol_encoder.h"
 #include "plugin/x/src/interface/session.h"
-#include "plugin/x/src/ngs/thread.h"
 
 namespace ngs {
 class Client;
@@ -106,4 +106,4 @@ class Session : public xpl::iface::Session {
 
 }  // namespace ngs
 
-#endif  // PLUGIN_X_SRC_NGS_CLIENT_SESSION_H_
+#endif  // PLUGIN_X_NGS_INCLUDE_NGS_CLIENT_SESSION_H_

plugin/x/src/ngs/client_session.h renamed to plugin/x/ngs/include/ngs/client_session.h

@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-#ifndef PLUGIN_X_SRC_NGS_COMMAND_DELEGATE_H_
-#define PLUGIN_X_SRC_NGS_COMMAND_DELEGATE_H_
+#ifndef PLUGIN_X_NGS_INCLUDE_NGS_COMMAND_DELEGATE_H_
+#define PLUGIN_X_NGS_INCLUDE_NGS_COMMAND_DELEGATE_H_
 
 #include <string>
 #include <vector>
@@ -33,7 +33,7 @@
 #include "my_compiler.h"  // NOLINT(build/include_subdir)
 #include "mysql/service_command.h"
 
-#include "plugin/x/src/ngs/error_code.h"
+#include "plugin/x/ngs/include/ngs/error_code.h"
 
 namespace ngs {
 class Command_delegate {
@@ -538,4 +538,4 @@ class Command_delegate {
 };
 }  // namespace ngs
 
-#endif  // PLUGIN_X_SRC_NGS_COMMAND_DELEGATE_H_
+#endif  // PLUGIN_X_NGS_INCLUDE_NGS_COMMAND_DELEGATE_H_

plugin/x/src/ngs/command_delegate.h renamed to plugin/x/ngs/include/ngs/command_delegate.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * 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,
@@ -22,13 +22,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-#ifndef PLUGIN_X_SRC_NGS_COMMON_STATUS_VARIABLES_H_
-#define PLUGIN_X_SRC_NGS_COMMON_STATUS_VARIABLES_H_
-
-#include <my_inttypes.h>  // NOLINT(build/include_subdir)
+#ifndef PLUGIN_X_NGS_INCLUDE_NGS_COMMON_STATUS_VARIABLES_H_
+#define PLUGIN_X_NGS_INCLUDE_NGS_COMMON_STATUS_VARIABLES_H_
 
 #include <atomic>
 
+#include <my_inttypes.h>
+
 namespace ngs {
 
 class Common_status_variables {
@@ -101,4 +101,4 @@ class Common_status_variables {
 
 }  // namespace ngs
 
-#endif  // PLUGIN_X_SRC_NGS_COMMON_STATUS_VARIABLES_H_
+#endif  // PLUGIN_X_NGS_INCLUDE_NGS_COMMON_STATUS_VARIABLES_H_

plugin/x/src/ngs/common_status_variables.h renamed to plugin/x/ngs/include/ngs/common_status_variables.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * 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,
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-#ifndef PLUGIN_X_SRC_NGS_COMPRESSION_TYPES_H_
-#define PLUGIN_X_SRC_NGS_COMPRESSION_TYPES_H_
+#ifndef PLUGIN_X_NGS_INCLUDE_NGS_COMPRESSION_TYPES_H_
+#define PLUGIN_X_NGS_INCLUDE_NGS_COMPRESSION_TYPES_H_
 
 namespace ngs {
 
@@ -32,4 +32,4 @@ enum class Compression_style { k_none, k_single, k_multiple, k_group };
 
 }  // namespace ngs
 
-#endif  // PLUGIN_X_SRC_NGS_COMPRESSION_TYPES_H_
+#endif  // PLUGIN_X_NGS_INCLUDE_NGS_COMPRESSION_TYPES_H_

plugin/x/src/ngs/compression_types.h renamed to plugin/x/ngs/include/ngs/compression_types.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * 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,
@@ -22,14 +22,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-#ifndef PLUGIN_X_SRC_NGS_DOCUMENT_ID_GENERATOR_H_
-#define PLUGIN_X_SRC_NGS_DOCUMENT_ID_GENERATOR_H_
+#ifndef PLUGIN_X_NGS_INCLUDE_NGS_DOCUMENT_ID_GENERATOR_H_
+#define PLUGIN_X_NGS_INCLUDE_NGS_DOCUMENT_ID_GENERATOR_H_
 
 #include <string>
 
+#include "plugin/x/ngs/include/ngs/thread.h"
 #include "plugin/x/src/helper/multithread/mutex.h"
 #include "plugin/x/src/interface/document_id_generator.h"
-#include "plugin/x/src/ngs/thread.h"
 
 namespace ngs {
 
@@ -48,4 +48,4 @@ class Document_id_generator : public xpl::iface::Document_id_generator {
 
 }  // namespace ngs
 
-#endif  // PLUGIN_X_SRC_NGS_DOCUMENT_ID_GENERATOR_H_
+#endif  // PLUGIN_X_NGS_INCLUDE_NGS_DOCUMENT_ID_GENERATOR_H_

plugin/x/src/ngs/document_id_generator.h renamed to plugin/x/ngs/include/ngs/document_id_generator.h

@@ -22,17 +22,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-#ifndef PLUGIN_X_SRC_NGS_ERROR_CODE_H_
-#define PLUGIN_X_SRC_NGS_ERROR_CODE_H_
+#ifndef PLUGIN_X_NGS_INCLUDE_NGS_ERROR_CODE_H_
+#define PLUGIN_X_NGS_INCLUDE_NGS_ERROR_CODE_H_
 
 #include <stdio.h>
 #include <cstdarg>
 #include <string>
 
-#include "my_compiler.h"   // NOLINT(build/include_subdir)
-#include "my_dbug.h"       // NOLINT(build/include_subdir)
-#include "my_sys.h"        // NOLINT(build/include_subdir)
-#include "mysqld_error.h"  // NOLINT(build/include_subdir)
+#include "my_compiler.h"
+#include "my_dbug.h"
+#include "my_sys.h"
+#include "mysqld_error.h"
 
 namespace ngs {
 
@@ -145,4 +145,4 @@ inline Error_code Fatal(const Error_code &err) {
 }
 }  // namespace ngs
 
-#endif  // PLUGIN_X_SRC_NGS_ERROR_CODE_H_
+#endif  // PLUGIN_X_NGS_INCLUDE_NGS_ERROR_CODE_H_

plugin/x/src/ngs/error_code.h renamed to plugin/x/ngs/include/ngs/error_code.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
  *
  * 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,
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-#ifndef PLUGIN_X_SRC_NGS_LOG_H_
-#define PLUGIN_X_SRC_NGS_LOG_H_
+#ifndef PLUGIN_X_NGS_INCLUDE_NGS_LOG_H_
+#define PLUGIN_X_NGS_INCLUDE_NGS_LOG_H_
 
 #ifndef NGS_DISABLE_LOGGING
 
@@ -46,4 +46,4 @@
 
 #endif  // NGS_DISABLE_LOGGING
 
-#endif  // PLUGIN_X_SRC_NGS_LOG_H_
+#endif  // PLUGIN_X_NGS_INCLUDE_NGS_LOG_H_

plugin/x/src/ngs/log.h renamed to plugin/x/ngs/include/ngs/log.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
  *
  * 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,
@@ -22,16 +22,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
-#ifndef PLUGIN_X_SRC_NGS_MEMORY_H_
-#define PLUGIN_X_SRC_NGS_MEMORY_H_
+#ifndef PLUGIN_X_NGS_INCLUDE_NGS_MEMORY_H_
+#define PLUGIN_X_NGS_INCLUDE_NGS_MEMORY_H_
 
 #include <mysql/plugin.h>
-
 #include <memory>
-#include <string>
-#include <utility>
 
-#include "my_compiler.h"  // NOLINT(build/include_subdir)
+#include "my_compiler.h"
 #include "plugin/x/src/config/config.h"
 #include "plugin/x/src/xpl_performance_schema.h"
 
@@ -129,4 +126,4 @@ typedef std::basic_string<char, std::char_traits<char>,
 
 }  // namespace ngs
 
-#endif  // PLUGIN_X_SRC_NGS_MEMORY_H_
+#endif  // PLUGIN_X_NGS_INCLUDE_NGS_MEMORY_H_