Merge branch 'api-cleanup' into wl9953-unix-sockets

# Conflicts:
#	cdk/foundation/socket_detail.cc
#	devapi/session.cc
#	include/mysql_devapi.h
#	testing/test.h
#	xapi/tests/test.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/include/mysql/cdk/api/document.h

@@ -170,7 +170,7 @@ class Doc_base : public Expr_base< Doc_processor<PRC> >
   with Doc_path_processor to describe one element of the path.
 */
 
-class Doc_path_processor
+class Doc_path_element_processor
 {
 public:
 
@@ -198,7 +198,20 @@ class Doc_path_processor
   virtual void any_path() =0;
 };
 
-typedef Expr_list< Expr_base<Doc_path_processor> > Doc_path;
+
+class Doc_path_processor
+  : public List_processor< Doc_path_element_processor >
+{
+public:
+
+  typedef Element_prc::string  string;
+  typedef Element_prc::index_t index_t;
+
+  // The "$" path which denotes the whole document.
+  virtual void whole_document() = 0;
+};
+
+typedef Expr_base<Doc_path_processor>  Doc_path;
 
 
 }}  // cdk::api
@@ -209,7 +222,7 @@ namespace cdk {
 class Doc_path_storage
   : public api::Doc_path
   , public api::Doc_path::Processor
-  , api::Doc_path_processor
+  , api::Doc_path_element_processor
 {
 public:
 
@@ -221,6 +234,9 @@ class Doc_path_storage
     DOUBLE_ASTERISK
   };
 
+  using api::Doc_path_element_processor::string;
+  using api::Doc_path_element_processor::index_t;
+
 protected:
 
   struct Path_el
@@ -243,7 +259,12 @@ class Doc_path_storage
 
   bool is_empty() const
   {
-    return 0 == length();
+    return m_whole_document ? false : 0 == length();
+  }
+
+  bool is_whole_document() const
+  {
+    return m_whole_document;
   }
 
   const Path_el& get_el(size_t pos) const
@@ -260,11 +281,17 @@ class Doc_path_storage
 
   void process(Processor &prc) const
   {
+    if (m_whole_document)
+    {
+      prc.whole_document();
+      return;
+    }
+
     prc.list_begin();
 
     for (size_t pos = 0; pos < m_path.size(); ++pos)
     {
-      api::Doc_path_processor *eprc = prc.list_el();
+      api::Doc_path_element_processor *eprc = prc.list_el();
       if (eprc)
       {
         const Path_el &el = m_path[pos];
@@ -285,10 +312,12 @@ class Doc_path_storage
 
   // List_processor
 
-  Path_el *m_el;
+  bool  m_whole_document = false;
+  Path_el *m_el = NULL;
 
   Element_prc* list_el()
   {
+    assert(!m_whole_document);
     m_path.push_back(Path_el());
     m_el = &m_path.back();
     return this;
@@ -298,6 +327,11 @@ class Doc_path_storage
 
   // Doc_path_processor
 
+  void whole_document()
+  {
+    m_whole_document = true;
+  }
+
   void member(const string &name)
   {
     assert(m_el);
@@ -398,10 +432,10 @@ struct Safe_prc< cdk::api::Doc_processor<PRC> >
 
 
 template<>
-struct Safe_prc<api::Doc_path_processor>
-  : Safe_prc_base<api::Doc_path_processor>
+struct Safe_prc<api::Doc_path_element_processor>
+  : Safe_prc_base<api::Doc_path_element_processor>
 {
-  typedef Safe_prc_base<api::Doc_path_processor> Base;
+  typedef Safe_prc_base<api::Doc_path_element_processor> Base;
   using Base::Processor;
   typedef Processor::string  string;
   typedef Processor::index_t index_t;
@@ -430,6 +464,42 @@ struct Safe_prc<api::Doc_path_processor>
   { return m_prc ? m_prc->any_path() : (void)NULL; }
 };
 
+template<>
+struct Safe_prc<api::Doc_path_processor>
+  : Safe_prc_base<api::Doc_path_processor>
+{
+
+  typedef Safe_prc_base<api::Doc_path_processor> Base;
+  using Base::Processor;
+  typedef Processor::string  string;
+  typedef Processor::index_t index_t;
+
+  Safe_prc(Processor *prc) : Base(prc)
+  {}
+
+  Safe_prc(Processor &prc) : Base(&prc)
+  {}
+
+  void list_begin()
+  {
+    if (m_prc)
+      m_prc->list_begin();
+  }
+
+  void list_end()
+  {
+    if (m_prc)
+      m_prc->list_end();
+  }
+
+  api::Doc_path_processor::Element_prc* list_el()
+  { return m_prc ? m_prc->list_el() : NULL; }
+
+  void whole_document()
+  { return m_prc ? m_prc->whole_document() : (void)NULL; }
+
+};
+
 }
 
 #endif

cdk/include/mysql/cdk/protocol/mysqlx.h

@@ -146,9 +146,9 @@ enum ServerMessages_Type {
                CrudUpdate, CRUD_UPDATE) \
     MSG_CLIENT(X, Mysqlx::Crud::Delete, \
                CrudDelete, CRUD_DELETE) \
-    MSG_CLIENT(X, Mysqlx::Crud::Delete, \
+    MSG_CLIENT(X, Mysqlx::Expect::Open, \
                ExpectOpen, EXPECT_OPEN) \
-    MSG_CLIENT(X, Mysqlx::Crud::Delete, \
+    MSG_CLIENT(X, Mysqlx::Expect::Close, \
                ExpectClose, EXPECT_CLOSE) \
     MSG_CLIENT(X, Mysqlx::Crud::CreateView, CreateView, CRUD_CREATE_VIEW) \
     MSG_CLIENT(X, Mysqlx::Crud::ModifyView, ModifyView, CRUD_MODIFY_VIEW) \
@@ -416,6 +416,23 @@ typedef cdk::api::Columns Columns;
 
 typedef cdk::api::View_options  View_options;
 
+
+struct Expectation_processor
+{
+  virtual void set(uint32_t key) = 0;
+  virtual void set(uint32_t key, bytes) = 0;
+  virtual void unset(uint32_t key) = 0;
+};
+
+#undef NO_ERROR
+
+struct Expectations:
+  cdk::api::Expr_list< cdk::api::Expr_base<Expectation_processor> >
+{
+  /* Only these two options are defined in mysqlx_expect.proto */
+  enum { NO_ERROR = 1, FIELD_EXISTS = 2 };
+};
+
 }  // api namespace
 
 
@@ -597,6 +614,8 @@ class Protocol
                      const api::Args_map *args = NULL);
   Op& snd_DropView(const api::Db_obj &obj, bool if_exists);
 
+  Op& snd_Expect_Open(api::Expectations &exp, bool reset = false);
+  Op& snd_Expect_Close();
 
   Op& rcv_AuthenticateReply(Auth_processor &);
   Op& rcv_Reply(Reply_processor &);

cdk/include/mysql/cdk/protocol/mysqlx/expr.h

@@ -235,11 +235,14 @@ class Doc_path
     MEMBER_ASTERISK = 2,
     ARRAY_INDEX = 3,
     ARRAY_INDEX_ASTERISK = 4,
-    DOUBLE_ASTERISK = 5
+    DOUBLE_ASTERISK = 5,
   };
 
   virtual ~Doc_path() {}
 
+  // The "$" path which denotes the whole document.
+  virtual bool is_whole_document() const = 0;
+
   virtual unsigned length() const =0;
   virtual Type     get_type(unsigned pos) const =0;
   virtual const string* get_name(unsigned pos) const =0;

cdk/mysqlx/converters.h

@@ -170,6 +170,11 @@ struct Doc_path_storage
 
   // Proto_path interface
 
+  bool is_whole_document() const
+  {
+    return cdk::Doc_path_storage::is_whole_document();
+  }
+
   unsigned length() const
   {
     size_t len = cdk::Doc_path_storage::length();