Merge branch 'refs/heads/wl13563-vs2019' into wl12755-tls-ciphers

# Conflicts:
#	cdk/cmake/DepFindProtobuf.cmake

Author: rsomla1

CMakeLists.txt

@@ -55,6 +55,10 @@ ENDIF()
 #
 set(CMAKE_INSTALL_PREFIX "" CACHE PATH "Install location")
 
+#
+# Enable grouping targets into folders for IDE tools
+#
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 
 ##########################################################################
@@ -193,6 +197,7 @@ add_config_option(BUILD_STATIC BOOLEAN DEFAULT OFF
 )
 
 if(BUILD_STATIC)
+
   message("Building static connector library")
   set(BUILD_SHARED_LIBS OFF)
 
@@ -203,6 +208,7 @@ if(BUILD_STATIC)
   )
 
 else()
+
   message("Building shared connector library")
   set(BUILD_SHARED_LIBS ON)
 
@@ -309,6 +315,9 @@ endif()
 
 add_subdirectory(cdk)
 
+foreach(T cdk cdk_foundation cdk_mysqlx cdk_proto_mysqlx cdk_parser)
+  set_target_properties(${T} PROPERTIES FOLDER "CDK")
+endforeach()
 
 #
 # Unit tests framework
@@ -557,6 +566,7 @@ ENDIF (WITH_TESTS)
 add_executable(try EXCLUDE_FROM_ALL try.cc)
 target_link_libraries(try connector)
 
+
 if(WITH_JDBC)
 
   add_executable(try_jdbc EXCLUDE_FROM_ALL try_jdbc.cc)
@@ -649,6 +659,8 @@ add_custom_target(link_test
   VERBATIM
 )
 
+set_target_properties(link_test PROPERTIES FOLDER "Tests")
+
 add_dependencies(link_test connector)
 #if(TARGET connector-merge)
 #  add_dependencies(link_test connector-merge)

cdk/cmake/DepFindProtobuf.cmake

@@ -85,14 +85,19 @@ set(CONFIG_EXPR
   $<$<CONFIG:Static>:Release>$<$<NOT:$<CONFIG:Static>>:$<CONFIG>>
 )
 
+set(set_arch)
+if(CMAKE_GENERATOR_PLATFORM)
+  set(set_arch -A ${CMAKE_GENERATOR_PLATFORM})
+endif()
+
 set(set_toolset)
 if(CMAKE_GENERATOR_TOOLSET)
   set(set_toolset -T ${CMAKE_GENERATOR_TOOLSET})
 endif()
 
 if(NOT EXISTS "${PB_BINARY_DIR}/exports.cmake")
 
-  message("==== Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR}")
+  message("==== Configuring Protobuf build using cmake generator: ${CMAKE_GENERATOR} ${set_arch} ${set_toolset}")
 
   file(REMOVE "${PB_BINARY_DIR}/CMakeCache.txt")
   file(MAKE_DIRECTORY "${PB_BINARY_DIR}")
@@ -106,7 +111,8 @@ if(NOT EXISTS "${PB_BINARY_DIR}/exports.cmake")
   execute_process(
     COMMAND ${CMAKE_COMMAND}
       -G "${CMAKE_GENERATOR}"
-	  ${set_toolset}
+      ${set_arch}
+      ${set_toolset}
       ${set_build_type}
       -DSTATIC_MSVCRT=${STATIC_MSVCRT}
       -DCMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
@@ -256,6 +262,8 @@ add_custom_target(build_protobuf
   SOURCES "${build_stamp}"
 )
 
+set_target_properties(build_protobuf PROPERTIES FOLDER "Misc")
+
 add_dependencies(Protobuf::pb-full build_protobuf)
 add_dependencies(Protobuf::pb-lite build_protobuf)
 add_dependencies(Protobuf::protoc  build_protobuf)

cdk/cmake/DepFindSSL.cmake

@@ -118,6 +118,7 @@ function(main)
     add_library(openssl-applink STATIC "${OPENSSL_INCLUDE_DIR}/openssl/applink.c")
     target_link_libraries(SSL::ssl INTERFACE openssl-applink)
 
+    set_target_properties(openssl-applink PROPERTIES FOLDER "Misc")
     # Remove warnings from openssl applink.c
     target_compile_options(openssl-applink PRIVATE /wd4152 /wd4996)
 

cdk/cmake/headers.cmake

@@ -406,6 +406,7 @@ if(WITH_HEADER_CHECKS)
     COMMENT "Header checks"
     SOURCES ${all_headers}
   )
+  set_target_properties(Headers PROPERTIES FOLDER "Tests")
 
   #
   # Configure the sanity checks project. All CMakeLists.txt files defining the project

cdk/cmake/testing.cmake

@@ -143,6 +143,7 @@ IF(WITH_TESTS)
   set_global(test_tests ${test_tests})
 
   add_library(${TEST} OBJECT ${ARGN})
+  set_target_properties(${TEST} PROPERTIES FOLDER "Tests")
 
   target_include_directories(${TEST} PRIVATE ${test_includes})
 
@@ -152,6 +153,7 @@ IF(WITH_TESTS)
 
     target_compile_definitions(${TEST} PRIVATE
       -D_SCL_SECURE_NO_WARNINGS
+      -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
     )
 
     target_compile_options(${TEST} PRIVATE
@@ -276,6 +278,7 @@ IF(WITH_TESTS)
                  ${CMAKE_CURRENT_BINARY_DIR}/tests_main.cc
                  ${test_sources}
   )
+  set_target_properties(${target_run_unit_tests} PROPERTIES FOLDER "Tests")
 
   TARGET_LINK_LIBRARIES(${target_run_unit_tests} gtest)
 
@@ -285,6 +288,11 @@ IF(WITH_TESTS)
 
   if (MSVC)
 
+    target_compile_definitions(${target_run_unit_tests} PRIVATE
+      -D_SCL_SECURE_NO_WARNINGS
+      -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
+    )
+
     target_compile_options(${target_run_unit_tests} PRIVATE
       /wd4244
       /wd4267
@@ -345,6 +353,8 @@ IF(WITH_TESTS)
      SOURCES ${tests_dir}/test_main.in
   )
 
+  set_target_properties(${cdk_target_prefix}update_test_groups PROPERTIES FOLDER "Tests")
+
 ENDIF()
 ENDMACRO(ADD_TEST_TARGET)
 

cdk/extra/uuid/src/CMakeLists.txt

@@ -41,6 +41,7 @@ SET (UUID_SRCS uuid_gen.cc)
 ADD_LIBRARY(uuid_gen STATIC ${UUID_SRCS})
 
 SET_TARGET_PROPERTIES(uuid_gen PROPERTIES LINKER_LANGUAGE CXX)
+set_target_properties(uuid_gen PROPERTIES FOLDER "Misc")
 
 get_filename_component(INC_DIR "../include" ABSOLUTE)
 target_include_directories(uuid_gen PUBLIC ${INC_DIR})

cmake/libutils.cmake

@@ -207,6 +207,7 @@ function(merge_libraries TARGET)
 
     add_library(${TARGET}-deps SHARED EXCLUDE_FROM_ALL "${LIBUTILS_SCRIPT_DIR}/empty.cc")
     target_link_libraries(${TARGET}-deps ${ARGN})
+    set_target_properties(${TARGET}-deps PROPERTIES FOLDER "Misc")
 
     #
     # We set RULE_LAUNCH_LINK property of the -deps target to intercept the
@@ -281,6 +282,7 @@ function(merge_libraries TARGET)
     #
 
     add_library(${TARGET}-deps SHARED EXCLUDE_FROM_ALL "${LIBUTILS_SCRIPT_DIR}/empty.cc")
+    set_target_properties(${TARGET}-deps PROPERTIES FOLDER "Misc")
     target_link_libraries(${TARGET}-deps ${ARGN})
 
     add_custom_command(TARGET ${TARGET} PRE_BUILD

devapi/crud.cc

@@ -146,6 +146,15 @@ struct Upsert_cmd : public Executable<Result, Upsert_cmd>
 };
 
 
+/*
+  A helper class used by Collection_detail::add_or_replace_one().
+
+  It is a wrapper around CDK expression m_expr that describes a document.
+  The wrapper forwards this description to a processor, but at the same
+  time checks if the value of the (top-level) "_id" field equals the value
+  given in the constructor.
+*/
+
 struct Value_expr_check_id
   : cdk::Expression
     , cdk::Expression::Processor
@@ -157,6 +166,19 @@ struct Value_expr_check_id
   Processor *m_prc;
   Doc_prc *m_doc_prc;
 
+  /*
+    This class defines m_any_prc member which is used below
+    to check the value of "_id" field as reported by the
+    source expression. Before using this class, m_id_prc must be
+    set to point at the sub-processor that was given for processing
+    the value of the "_id" field (this is done by key_val() callback in
+    the main class).
+
+    Then all callbacks are forwarded to this sub-processor (or its
+    sub-processors) and in case of calling scalar str() callback that
+    gives string value of the "_id" field, the check is done first.
+  */
+
   struct Any_processor_check
       : cdk::Expression::Processor::Doc_prc::Any_prc
       , cdk::Expression::Processor::Doc_prc::Any_prc::Scalar_prc
@@ -165,9 +187,9 @@ struct Value_expr_check_id
     Any_prc *m_id_prc;
     Scalar_prc *m_scalar_prc;
     Value_prc *m_value_prc;
-    const string& m_id;
+    const std::string &m_id;
 
-    Any_processor_check(const string& id)
+    Any_processor_check(const std::string& id)
       : m_id(id)
     {}
 
@@ -231,6 +253,7 @@ struct Value_expr_check_id
     }
 
     // Value processor implementation
+
     void null() override { m_value_prc->null();}
 
     void value(cdk::Type_info type,
@@ -246,6 +269,7 @@ struct Value_expr_check_id
         throw mysqlx::Error(R"(Document "_id" and replace id are different!)");
       m_value_prc->str(val);
     }
+
     void num(int64_t  val) override { m_value_prc->num(val); }
     void num(uint64_t val) override { m_value_prc->num(val); }
     void num(float    val) override { m_value_prc->num(val); }
@@ -256,7 +280,7 @@ struct Value_expr_check_id
 
   Any_processor_check m_any_prc;
 
-  Value_expr_check_id(mysqlx::Value_expr &expr, bool is_expr, const string& id)
+  Value_expr_check_id(mysqlx::Value_expr &expr, bool is_expr, const std::string& id)
     : m_expr(expr)
     , m_is_expr(is_expr)
     , m_any_prc(id)
@@ -324,7 +348,14 @@ Collection_detail::add_or_replace_one(
   const mysqlx::string &id, mysqlx::Value &&doc, bool replace
 )
 {
+  /*
+    This is implemented by executing Replace_cmd or Upsert_command
+    which internally use Op_collection_replace or Op_collection_upsert
+    to perform relevant operation on the server.
+  */
+
   Object_ref coll(get_schema().m_name, m_name);
+  std::string id_str(id);
 
 
   if (!Value::Access::is_expr(doc) &&
@@ -333,13 +364,29 @@ Collection_detail::add_or_replace_one(
     doc = DbDoc(doc.get<string>());
   }
 
+  /*
+    expr is a CDK expression object which describes the document
+    to be added.
+  */
+
   Value_expr expr(doc, parser::Parser_mode::DOCUMENT);
 
   if (replace)
   {
-    Value_expr_check_id check_id(expr, Value::Access::is_expr(doc), id);
+    /*
+      Replace_cmd executes Op_collection_replace which picks a document
+      with the given id and replaes it with the document given as the last
+      argument.
+
+      The document expression is wrapped in Value_expr_check_id to check
+      if the "_id" field (if present) stores the correct document id
+      and throws error if it is not the case (otherwise Replace_cmd
+      would modify the "_id" field to match the given id).
+    */
+
+    Value_expr_check_id check_id(expr, Value::Access::is_expr(doc), id_str);
 
-    Replace_cmd cmd(m_sess, coll, std::string(id), check_id);
+    Replace_cmd cmd(m_sess, coll, id_str, check_id);
     return cmd.execute();
   }
   else

devapi/tests/crud-t.cc

@@ -2469,22 +2469,30 @@ TEST_F(Crud, single_document)
   Schema sch = getSchema("test");
   Collection coll = sch.createCollection("c1", true);
 
+  cout << "Adding documents..." << endl;
+
   coll.remove("true").execute();
 
-  coll.add(R"({"_id":"id1", "name":"foo", "age": 1 })" )
-      .add(R"({"_id":"id2", "name":"bar", "age": 2 })" )
-      .add(R"({"_id":"id3", "name":"baz", "age": 3 })" )
-      .execute();
+  coll.add(R"({"_id":"id1", "name":"foo", "age": 1 })")
+    .add(R"({"_id":"id2", "name":"bar", "age": 2 })")
+    .add(R"({"_id":"id3", "name":"baz", "age": 3 })")
+    .execute();
+
+  cout << "getOne()" << endl;
 
   EXPECT_EQ(string("foo"), coll.getOne("id1")["name"].get<string>());
   EXPECT_EQ(string("bar"), coll.getOne("id2")["name"].get<string>());
   EXPECT_TRUE(coll.getOne("idZ").isNull());
 
+  cout << "removeOne()" << endl;
+
   EXPECT_EQ(1, coll.removeOne("id1").getAffectedItemsCount());
   EXPECT_EQ(0, coll.removeOne("id1").getAffectedItemsCount());
 
   EXPECT_TRUE(coll.getOne("id1").isNull());
 
+  cout << "replaceOne()" << endl;
+
   // Replace existing document
   EXPECT_EQ(1, coll.replaceOne(
               "id3",
@@ -2493,6 +2501,8 @@ TEST_F(Crud, single_document)
   EXPECT_EQ(string("qux"), coll.getOne("id3")["name"].get<string>());
   EXPECT_EQ(4, coll.getOne("id3")["age"].get<int>());
 
+  cout << "replaceOne(): change id" << endl;
+
   // Setting a different _id on document should throw error
   // Document passed as string
   EXPECT_THROW(coll.replaceOne("id3", "{\"_id\": \"id4\", \"name\": \"baz\" }"),
@@ -2508,13 +2518,20 @@ TEST_F(Crud, single_document)
   // Document passed as DbDoc
   EXPECT_THROW(coll.replaceOne("id3", DbDoc("{\"_id\": \"id4\", \"name\": \"baz\" }")),
                Error);
+
+  cout << "getOne(): array" << endl;
+
   EXPECT_EQ(string("qux"), coll.getOne("id3")["name"].get<string>());
   EXPECT_EQ(string("id3"), coll.getOne("id3")["_id"].get<string>());
 
+  cout << "replaceOne(): non-existing" << endl;
+
   // should affect none
   EXPECT_EQ(0,
     coll.replaceOne("id4", expr(R"({"name": "baz" })"))
         .getAffectedItemsCount());
+
+  cout << "Done!" << endl;
 }
 
 

devapi/tests/session-t.cc

@@ -1846,7 +1846,8 @@ TEST_F(Sess, pool_opts)
 
 
   std::stringstream uri;
-  uri << "mysqlx://" << get_user()<< "@localhost:"<< get_port() <<"/test";
+  uri << "mysqlx://" << (get_user() ? get_user() : "user")
+      << "@localhost:" << get_port() <<"/test";
 
   ClientSettings working_settings(uri.str(),
                         R"( { "pooling": {

devapi/tests/types-t.cc

@@ -515,6 +515,8 @@ const CollationInfo* get_collation(unsigned id)
 
 TEST_F(Types, collations)
 {
+  SKIP_IF_NO_XPLUGIN;
+
   using col_data = std::pair<unsigned, string>;
   std::vector<col_data> unknown;