Merge branch 'api-cleanup' into wl10718-extended-auth

# Conflicts:
#	cdk/include/mysql/cdk/data_source.h
#	devapi/session.cc
#	include/mysql_devapi.h

Author: rsomla1

CMakeLists.txt

@@ -204,15 +204,14 @@ else()
   add_definitions(-DCONCPP_BUILD_SHARED)
   set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
+  # Hide all symbols that are not explicitly exported.
   # Note: setting target property CXX_VISIBILITY did not work for
   # object libraries that we use to build the connector.
 
-  if(CMAKE_COMPILER_IS_GNUCXX)
-    if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-      add_compile_options(-fvisibility-ms-compat)
-    elseif()
-      add_compile_options(-fvisibility=hidden)
-    endif()
+  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    add_compile_options(-fvisibility-ms-compat)
+  elseif(CMAKE_COMPILER_IS_GNUCXX)
+    add_compile_options(-fvisibility=hidden)
   endif()
 
 endif()
@@ -518,6 +517,8 @@ SET_INTERFACE_OPTIONS(try devapi)
 # TODO: Do it also for the shared library
 #
 
+if(NOT WIN32)
+
 find_program(LDD ldd)
 if(NOT LDD)
   find_program(LDD otool)
@@ -533,6 +534,8 @@ if(LDD)
   )
 endif()
 
+endif()
+
 #
 # Linking test
 #
@@ -591,11 +594,11 @@ if(NOT CMAKE_INSTALL_PREFIX)
     else()
       set(install_prefix "C:/Program Files (x86)")
     endif()
-    set(CMAKE_INSTALL_PREFIX "${install_prefix}/MySQL/MySQL Connector C++ 2.0")
+    set(CMAKE_INSTALL_PREFIX "${install_prefix}/MySQL/MySQL Connector C++ ${CONCPP_PACKAGE_BASE_VERSION}")
 
   else()
 
-    set(CMAKE_INSTALL_PREFIX "/usr/local/mysql/connector-c++-2.0")
+    set(CMAKE_INSTALL_PREFIX "/usr/local/mysql/connector-c++-${CONCPP_PACKAGE_BASE_VERSION}")
 
   endif()
 

README.txt

@@ -1,4 +1,4 @@
-MySQL Connector/C++ 2.0
+MySQL Connector/C++ 8.0
 
 This is a release of MySQL Connector/C++, Oracle's
 dual-license C++ API for connecting client applications
@@ -46,6 +46,9 @@ DOCUMENTATION LOCATION
 You can find the documentation on the MySQL website at
 <http://dev.mysql.com/doc/dev/connector-cpp/>
 
+For the new features/bugfix history, see release notes at
+<https://dev.mysql.com/doc/relnotes/connector-cpp/en/news-8-0-5.html>.
+Note that the initial releases used major version 2.0.
 
 CONTACT
 =======

cdk/cmake/headers.cmake

@@ -59,6 +59,29 @@ SET(headers_dir "${headers_dir}/headers")
 #MESSAGE("headers.cmake: ${headers_dir}")
 
 
+#
+# Check if given list of headers includes all headers that can be found in
+# the current directory.
+#
+
+function(check_headers)
+
+  file(GLOB all_headers RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
+
+  foreach(header IN LISTS ARGV)
+    #message("- checking header: ${header}\n")
+    list(REMOVE_ITEM all_headers ${header})
+  endforeach()
+
+  list(LENGTH all_headers remains)
+
+  if(remains GREATER 0)
+    message(WARNING "Extra headers found in ${CMAKE_CURRENT_SOURCE_DIR}: ${all_headers}")
+  endif()
+
+endfunction()
+
+
 #
 # Set-up header declarations with given folder as a base location for all
 # public headers.

cdk/core/session.cc

@@ -40,6 +40,7 @@ struct Session_builder
 {
   using TLS   = cdk::connection::TLS;
   using TCPIP = cdk::connection::TCPIP;
+  using Socket_base = foundation::connection::Socket_base;
 
   cdk::api::Connection *m_conn = NULL;
   mysqlx::Session      *m_sess = NULL;
@@ -67,27 +68,26 @@ struct Session_builder
     3. If a bail-out error was detected, throws that error.
   */
 
+  Socket_base* connect(Socket_base*);
+
   bool operator() (const ds::TCPIP &ds, const ds::TCPIP::Options &options);
+#ifndef WIN32
+  bool operator() (const ds::Unix_socket&ds, const ds::Unix_socket::Options &options);
+#endif
   bool operator() (const ds::TCPIP_old &ds, const ds::TCPIP_old::Options &options);
 
 #ifdef WITH_SSL
-  TLS* tls_connect(TCPIP &conn, const TLS::Options &opt);
+  TLS* tls_connect(Socket_base &conn, const TLS::Options &opt);
 #endif
 };
 
 
-bool
-Session_builder::operator() (
-  const ds::TCPIP &ds,
-  const ds::TCPIP::Options &options
-  )
+Session_builder::Socket_base*
+Session_builder::connect(Session_builder::Socket_base* connection)
 {
-  using foundation::connection::TCPIP;
-  using foundation::connection::TCPIP_base;
-
   m_attempts++;
 
-  TCPIP* connection = new TCPIP(ds.host(), ds.port());
+  assert(connection);
 
   try
   {
@@ -115,8 +115,25 @@ Session_builder::operator() (
       m_error.reset(err.clone());
     }
 
-    return false;  // continue to next host if available
+    return NULL;
   }
+  return connection;
+}
+
+
+bool
+Session_builder::operator() (
+  const ds::TCPIP &ds,
+  const ds::TCPIP::Options &options
+  )
+{
+  using foundation::connection::TCPIP;
+  using foundation::connection::Socket_base;
+
+  Socket_base* connection = connect(new TCPIP(ds.host(), ds.port()));
+
+  if (!connection)
+    return false;  // continue to next host if available
 
 #ifdef WITH_SSL
   TLS *tls_conn = tls_connect(*connection, options.get_tls());
@@ -137,6 +154,31 @@ Session_builder::operator() (
   return true;
 }
 
+#ifndef WIN32
+bool
+Session_builder::operator() (
+  const ds::Unix_socket &ds,
+  const ds::Unix_socket::Options &options
+  )
+{
+  using foundation::connection::Unix_socket;
+  using foundation::connection::Socket_base;
+
+  Socket_base* connection = connect(new Unix_socket(ds.path()));
+
+  if (!connection)
+    return false;  // continue to next host if available
+
+  m_conn = connection;
+  m_sess = new mysqlx::Session(*connection, options);
+
+  m_database = options.database();
+
+  return true;
+}
+
+#endif //#ifndef WIN32
+
 
 bool
 Session_builder::operator() (
@@ -152,7 +194,7 @@ Session_builder::operator() (
 #ifdef WITH_SSL
 
 Session_builder::TLS*
-Session_builder::tls_connect(TCPIP &connection, const TLS::Options &options)
+Session_builder::tls_connect(Socket_base &connection, const TLS::Options &options)
 {
   if (!options.get_ca().empty() &&
       options.ssl_mode() < TLS::Options::SSL_MODE::VERIFY_CA)
@@ -278,6 +320,24 @@ Session::Session(ds::Multi_source &ds)
 }
 
 
+#ifndef WIN32
+Session::Session(ds::Unix_socket &ds, const ds::Unix_socket::Options &options)
+  : m_session(NULL)
+  , m_connection(NULL)
+  , m_trans(false)
+{
+  Session_builder sb(true);  // throw errors if detected
+
+  sb(ds, options);
+
+  assert(sb.m_sess);
+
+  m_session = sb.m_sess;
+  m_connection = sb.m_conn;
+}
+#endif //#ifndef WIN32
+
+
 Session::~Session()
 {
   if (m_trans)

cdk/core/tests/session-t.cc

@@ -1243,6 +1243,23 @@ TEST_F(Session_core, failover)
     ms.add(ds_correct, options_db2, highest_priority - 1);
     ms.add(ds_correct, options_db3, highest_priority - 1);
 
+#ifndef _WIN32
+    ds::Unix_socket ds_correct_unix("/tmp/varxpl/tmp/mysqlx.1.sock");
+    ds::Unix_socket::Options options_unix_db1("root");
+    options_db1.set_database("failover_test_unix_1");
+
+    ds::Unix_socket::Options options_unix_db2("root");
+    options_db2.set_database("failover_test_unix_2");
+
+    ds::Unix_socket::Options options_unix_db3("root");
+    options_db3.set_database("failover_test_unix_3");
+
+    ms.add(ds_correct_unix, options_unix_db1, highest_priority - 1);
+    ms.add(ds_correct_unix, options_unix_db2, highest_priority - 1);
+    ms.add(ds_correct_unix, options_unix_db3, highest_priority - 1);
+
+#endif
+
     struct : cdk::Row_processor
     {
       // Row_processor callbacks