WL11450: New document _id generation support

Author: silvakid

cdk/cmake/protobuf.cmake

@@ -184,7 +184,6 @@ MACRO(USE_FULL_PROTOBUF)
   set(PROTOBUF_LITE OFF CACHE BOOL "Using lite version of Protobuf library" FORCE)
 ENDMACRO()
 
-
 # Standard PROTOBUF_GENERATE_CPP modified to our usage
 
 FUNCTION(MYSQLX_PROTOBUF_GENERATE_CPP SRCS HDRS)
@@ -213,6 +212,7 @@ FUNCTION(MYSQLX_PROTOBUF_GENERATE_CPP SRCS HDRS)
       COMMAND ${PROTOBUF_PROTOC_EXECUTABLE}
       ARGS --cpp_out "${CMAKE_CURRENT_BINARY_DIR}/protobuf"
            -I ${ABS_PATH} ${ABS_FIL}
+           --proto_path=${PROJECT_SOURCE_DIR}/protobuf/protobuf-2.6.1/src
       DEPENDS ${ABS_FIL} ${PROTOBUF_PROTOC_EXECUTABLE}
       COMMENT "Running C++ protocol buffer compiler (${PROTOBUF_PROTOC_EXECUTABLE}) on ${FIL}"
       VERBATIM)

cdk/include/mysql/cdk/mysqlx/result.h

@@ -54,6 +54,7 @@ class Reply
 
   mysqlx::Session* m_session;
   Diagnostic_arena m_da;
+  std::vector<std::string> m_generated_ids;
   bool             m_error;
 
   Session& get_session()
@@ -119,6 +120,11 @@ class Reply
     return m_session->m_stmt_stats.last_insert_id;
   }
 
+  const std::vector<std::string>& generated_ids() const
+  {
+    return m_generated_ids;
+  }
+
   virtual void discard();
 
 protected:

cdk/include/mysql/cdk/mysqlx/session.h

@@ -692,6 +692,7 @@ class Session
   void row_stats(row_stats_t, row_count_t);
   void last_insert_id(insert_id_t);
   // TODO: void trx_event(trx_event_t);
+  void generated_document_id(const std::string&);
 
   /*
      Helper functions to send/receive protocol messages

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

@@ -1072,6 +1072,7 @@ class SessionState_processor
   virtual void row_stats(row_stats_t, row_count_t) {}
   virtual void last_insert_id(insert_id_t) {}
   virtual void trx_event(trx_event_t) {}
+  virtual void generated_document_id(const std::string&) {}
 };
 
 template<>

cdk/include/mysql/cdk/reply.h

@@ -71,6 +71,8 @@ class Reply
   void skip_result() { m_impl.skip_result(); }
   row_count_t affected_rows() { return m_impl.affected_rows(); }
   row_count_t last_insert_id() { return m_impl.last_insert_id(); }
+  const std::vector<std::string>& generated_ids() const
+  { return m_impl.generated_ids(); }
   void discard() { m_impl.discard(); }
 
   // Diagnostics interface

cdk/mysqlx/session.cc

@@ -904,6 +904,13 @@ void Session::row_stats(row_stats_t stats, row_count_t val)
   }
 }
 
+void Session::generated_document_id(const std::string& id)
+{
+  if (m_current_reply)
+  {
+    m_current_reply->m_generated_ids.push_back(id);
+  }
+}
 
 void Session::send_cmd()
 {

cdk/protocol/mysqlx/CMakeLists.txt

@@ -75,17 +75,33 @@ if(NOT use_full_protobuf)
 set(LITE "${CMAKE_CURRENT_BINARY_DIR}/lite")
 file(MAKE_DIRECTORY ${LITE})
 
+UNSET(proto_mysqlx_defs_lite)
+
 foreach(proto ${proto_mysqlx_defs})
   get_filename_component(name ${proto} NAME)
   #message("Generating lite version of protobuf source: ${name}")
   file(READ "${proto}" CONTENTS)
-  string(REPLACE
-    "syntax = \"proto2\""
-    "syntax = \"proto2\";\noption optimize_for = LITE_RUNTIME"
-    CONTENTS "${CONTENTS}")
-  file(WRITE "${LITE}/${name}" "${CONTENTS}")
+  unset(NEW_CONTENTS)
+  FOREACH(LINE ${CONTENTS})
+    STRING(REGEX REPLACE
+      "([\\t ]*)//[\\t ]*ifdef[\\t ]+(PROTOBUF_LITE)[\\t ]*:[\\t ]*(.*)" "\\1\\3"
+      LINE ${LINE}
+    )
+    LIST(APPEND NEW_CONTENTS "${LINE}")
+  ENDFOREACH()
+
+  STRING(REGEX REPLACE
+    "//[\\t ]+ifndef[\\t ]+PROTOBUF_LITE.*//[\\t ]+endif[\\t ]*" ""
+    NEW_CONTENTS "${NEW_CONTENTS}")
+
+  STRING(REGEX REPLACE
+    "(\r*\n)([^\r\n]*//[\\t ]+comment_out_if[\\t ]+PROTOBUF_LITE)" "\\1// \\2"
+    NEW_CONTENTS "${NEW_CONTENTS}")
+
+  file(WRITE "${LITE}/${name}" "${NEW_CONTENTS}")
   #configure_file(lite_template.in "${LITE}/${name}" @ONLY)
-  list(APPEND proto_mysqlx_defs_lite "${LITE}/${name}")
+
+   list(APPEND proto_mysqlx_defs_lite "${LITE}/${name}")
 endforeach()
 
 set(proto_mysqlx_defs ${proto_mysqlx_defs_lite})

cdk/protocol/mysqlx/pb/mysqlx.proto

@@ -1,20 +1,25 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, 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 as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * 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 for more details.
+ * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
 // tell protobuf 3.0 to use protobuf 2.x rules
@@ -23,15 +28,9 @@ syntax = "proto2";
 // ifdef PROTOBUF_LITE: option optimize_for = LITE_RUNTIME;
 
 package Mysqlx;
-option java_package = "com.mysql.cj.mysqlx.protobuf";
+option java_package = "com.mysql.cj.x.protobuf";
 
-import "mysqlx_sql.proto";
-import "mysqlx_resultset.proto";
-import "mysqlx_crud.proto";
-import "mysqlx_session.proto";
-import "mysqlx_connection.proto";
-import "mysqlx_expect.proto";
-import "mysqlx_notice.proto";
+import "google/protobuf/descriptor.proto"; // comment_out_if PROTOBUF_LITE
 
 // style-guide:
 //
@@ -110,11 +109,18 @@ message ServerMessages {
     RESULTSET_FETCH_DONE_MORE_OUT_PARAMS = 18;
   };
 }
-
+// ifndef PROTOBUF_LITE
+extend google.protobuf.MessageOptions {
+  optional ClientMessages.Type client_message_id = 100001;
+  optional ServerMessages.Type server_message_id = 100002;
+}
+// endif
 
 // generic Ok message
 message Ok {
   optional string msg = 1;
+
+  option (server_message_id) = OK; // comment_out_if PROTOBUF_LITE
 }
 
 
@@ -141,4 +147,6 @@ message Error {
     ERROR = 0;
     FATAL = 1;
   };
+
+  option (server_message_id) = ERROR; // comment_out_if PROTOBUF_LITE
 }

cdk/protocol/mysqlx/pb/mysqlx_connection.proto

@@ -1,29 +1,35 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, 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 as
- * published by the Free Software Foundation; version 2 of the
- * License.
+ * 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 for more details.
+ * 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
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 syntax = "proto2";
 
 // ifdef PROTOBUF_LITE: option optimize_for = LITE_RUNTIME;
 
 import "mysqlx_datatypes.proto";
+import "mysqlx.proto"; // comment_out_if PROTOBUF_LITE
 
 package Mysqlx.Connection;
-option java_package = "com.mysql.cj.mysqlx.protobuf";
+option java_package = "com.mysql.cj.x.protobuf";
 
 // a Capability
 //
@@ -36,13 +42,16 @@ message Capability {
 // Capabilities
 message Capabilities {
   repeated Capability capabilities = 1;
+
+  option (server_message_id) = CONN_CAPABILITIES; // comment_out_if PROTOBUF_LITE
 }
 
 // get supported connection capabilities and their current state
 //
 //   :returns: :protobuf:msg:`Mysqlx.Connection::Capabilities` or :protobuf:msg:`Mysqlx::Error`
 //
 message CapabilitiesGet {
+  option (client_message_id) = CON_CAPABILITIES_GET; // comment_out_if PROTOBUF_LITE
 };
 
 // sets connection capabilities atomically
@@ -54,6 +63,8 @@ message CapabilitiesGet {
 // :returns: :protobuf:msg:`Mysqlx::Ok` or :protobuf:msg:`Mysqlx::Error`
 message CapabilitiesSet {
   required Capabilities capabilities = 1;
+
+  option (client_message_id) = CON_CAPABILITIES_SET; // comment_out_if PROTOBUF_LITE
 };
 
 // announce to the server that the client wants to close the connection
@@ -62,5 +73,6 @@ message CapabilitiesSet {
 //
 // :Returns: :protobuf:msg:`Mysqlx::Ok`
 message Close {
+  option (client_message_id) = CON_CLOSE; // comment_out_if PROTOBUF_LITE
 };