WL15065 Fix code to build cleanly with clang

Enable warnings on all connector

Change-Id: I9ca932cac013d7602e6867e3063cd94583a403ca

Author: silvakid

cdk/CMakeLists.txt

@@ -187,7 +187,7 @@ IF(MSVC)
   # Note: 4520 only present on Visual Studio 12
 
   if (MSVC_VERSION LESS 1800)
-    add_compile_options(
+    add_flags(
       /wd4127 # conditional expression is constant (needed for do {...} while(false))
       /wd4512 # assignment operator could not be generated
       /wd4100 # unreferenced formal parameter
@@ -208,9 +208,10 @@ ELSE()
 
   if(SUNPRO)
     # TODO: Enable -Wall after fixing warnings
-    add_compile_options(-errtags=yes -erroff=hidevf)
+    add_flags(-errtags=yes -erroff=hidevf)
   else()
     add_compile_options(-Wall)
+    add_flags(CXX -Wall)
   endif()
 
 ENDIF()

cdk/cmake/bootstrap.cmake

@@ -81,6 +81,16 @@ function(bootstrap)
     list(APPEND cmake_opts "-D" "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}")
   endif()
 
+  if(CMAKE_C_COMPILER)
+    message("-- C compiler: ${CMAKE_C_COMPILER}")
+    list(APPEND cmake_opts "-D" "CMAKE_C_COMPILER=${CMAKE_C_COMPILER}")
+  endif()
+
+  if(CMAKE_CXX_COMPILER)
+    message("-- C++ compiler: ${CMAKE_CXX_COMPILER}")
+    list(APPEND cmake_opts "-D" "CMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}")
+  endif()
+
   message("-- ----")
 
   execute_process(

cdk/cmake/testing.cmake

@@ -182,8 +182,10 @@ IF(WITH_TESTS)
 
   elseif((CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
 
+  #TODO: Remove -Wno-delete-non-abstract-non-virtual-dtor when bumping ABI and
+  #      adding virtual destructor for DbDoc, Value and Column_detail
     target_compile_options(${TEST} PRIVATE
-      -Wno-unused-value
+      -Wno-unused-value -Wno-delete-non-abstract-non-virtual-dtor
     )
 
   else()
@@ -318,10 +320,9 @@ IF(WITH_TESTS)
     )
 
   elseif((CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
-
-    target_compile_options(${target_run_unit_tests} PRIVATE
-      -Wno-unused-value
-    )
+      target_compile_options(${target_run_unit_tests} PRIVATE
+        -Wno-unused-value -Wno-delete-non-abstract-non-virtual-dtor
+      )
 
   else()
     #target_compile_options(${target_run_unit_tests} PRIVATE -Wno-unused-result)

cdk/parser/tests/parser-t.cc

@@ -1419,7 +1419,7 @@ TEST(Parser, doc_path)
     Doc_field_parser doc_path(test);
     doc_path.process(path);
 
-    EXPECT_EQ(3, path.length());
+    EXPECT_EQ(3U, path.length());
     EXPECT_EQ(path.DOUBLE_ASTERISK, path.get_el(0).m_type);
     EXPECT_EQ(path.MEMBER, path.get_el(1).m_type);
     EXPECT_EQ(cdk::string("date"), path.get_el(1).m_name);
@@ -1435,7 +1435,7 @@ TEST(Parser, doc_path)
     Doc_field_parser doc_path(test);
     doc_path.process(path);
 
-    EXPECT_EQ(3, path.length());
+    EXPECT_EQ(3U, path.length());
     EXPECT_EQ(path.DOUBLE_ASTERISK, path.get_el(0).m_type);
     EXPECT_EQ(path.MEMBER, path.get_el(1).m_type);
     EXPECT_EQ(cdk::string("date"), path.get_el(1).m_name);
@@ -1451,7 +1451,7 @@ TEST(Parser, doc_path)
     Doc_field_parser doc_path(test);
     doc_path.process(path);
 
-    EXPECT_EQ(3, path.length());
+    EXPECT_EQ(3U, path.length());
     EXPECT_EQ(path.MEMBER, path.get_el(0).m_type);
     EXPECT_EQ(cdk::string("date"), path.get_el(0).m_name);
     EXPECT_EQ(path.MEMBER, path.get_el(1).m_type);

cmake/libutils/save_linker_opts.cc

@@ -53,7 +53,7 @@ int main(int argc, char* argv[])
 
   // Note: argv[2] is the compiler/linker command
 
-  for(unsigned pos=3; pos < argc; pos++)
+  for(int pos=3; pos < argc; pos++)
   {
     if(string(argv[pos]) == "-o")
     {

common/CMakeLists.txt

@@ -35,6 +35,14 @@ add_library(common STATIC
 
 target_link_libraries(common cdk)
 
+#TODO: Remove -Wno-delete-non-abstract-non-virtual-dtor when bumping ABI and
+  #      adding virtual destructor for DbDoc, Value and Column_detail
+if(CLANG)
+  target_compile_options(common PRIVATE
+    -Wno-delete-non-abstract-non-virtual-dtor
+  )
+endif()
+
 #
 #  Generate version info
 #

common/op_impl.h

@@ -844,7 +844,7 @@ class Op_sort
     return m_order.empty() ? nullptr : this;
   }
 
-private:
+protected:
 
   // cdk::Order_by interface
 
@@ -881,8 +881,10 @@ class Op_sort
 
     prc.list_end();
   }
-};
 
+  using Base::process;
+
+};
 
 /*
   This template adds to the given Base class implementations of Having_if
@@ -931,7 +933,7 @@ class Op_having
     return m_having.empty() ? nullptr : this;
   }
 
-private:
+protected:
 
   // cdk::Expression processor
 
@@ -940,6 +942,8 @@ class Op_having
     parser::Expression_parser expr_parser(PM, m_having);
     expr_parser.process(prc);
   }
+
+  using Base::process;
 };
 
 
@@ -987,7 +991,7 @@ class Op_group_by
     return m_group_by.empty() ? nullptr : this;
   }
 
-private:
+protected:
 
   // Expr_list
 
@@ -1003,8 +1007,9 @@ class Op_group_by
 
     prc.list_end();
   }
-};
 
+  using Base::process;
+};
 
 /*
   This template adds to the given Base class implementations of Proj_if
@@ -1133,6 +1138,8 @@ class Op_projection
 
   }
 
+  using Base::process;
+
   // cdk::Projection
 
   void process(cdk::Projection::Processor& prc) const override
@@ -2413,6 +2420,12 @@ class Op_collection_modify
 {
   using string = std::string;
   using Impl = common::Collection_modify_if;
+  using Base = Op_select<doc_mode,
+               Op_sort<doc_mode,
+               Op_limit<
+               Op_bind<
+               Op_base<
+                 common::Collection_modify_if>>>>>;
 
   Object_ref m_coll;
 
@@ -2574,6 +2587,7 @@ class Op_collection_modify
     }
   }
 
+  using Base::process;
 };
 
 
@@ -2998,6 +3012,7 @@ class Op_table_update
       );
   }
 
+  using Base::process;
 
   //  cdk::api::Column_ref
 

common/session.cc

@@ -505,9 +505,6 @@ void Settings_impl::get_data_source(cdk::ds::Multi_source &src)
     If DNS+SRV is not used, get list of hosts from the settings.
   */
 
-  // if priorities were not set explicitly, assign decreasing starting from 100
-  int prio = m_data.m_user_priorities ? -1 : 100;
-
   /*
     Look for a priority after host/socket setting. If explicit priorities
     are used, then we expect the priority setting to be present and we throw
@@ -603,7 +600,7 @@ void Settings_impl::get_data_source(cdk::ds::Multi_source &src)
     throw_error("Unix socket connections not supported on Windows platform.");
   };
 #else
-  auto add_socket = [this, &src, &opts, check_prio](iterator &it, int prio) {
+  auto add_socket = [&src, &opts, check_prio](iterator &it, int prio) {
 
     assert(Session_option_impl::SOCKET == it->first);
 
@@ -956,8 +953,6 @@ Session_pool::get_session(Session_cleanup *cleanup)
 {
   lock_guard guard(m_pool_mutex);
 
-  bool use_blocklist = true;
-
   if (!m_pool_enable)
   {
     return std::shared_ptr<cdk::Session>(new cdk::Session(m_ds));

devapi/CMakeLists.txt

@@ -44,5 +44,13 @@ target_link_libraries(devapi PUBLIC common)
 
 add_coverage(devapi)
 
+#TODO: Remove -Wno-delete-non-abstract-non-virtual-dtor when bumping ABI and
+  #      adding virtual destructor for DbDoc, Value and Column_detail
+if((CMAKE_C_COMPILER_ID MATCHES "Clang") OR(CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+  target_compile_options(devapi PRIVATE
+    -Wno-delete-non-abstract-non-virtual-dtor
+  )
+endif()
+
 
 add_subdirectory(tests)

devapi/document.cc

@@ -428,7 +428,7 @@ Value Value::Access::mk_from_json(const std::string &json)
 
   parser.process(builder);
 
-  return std::move(val);
+  return val;
 }
 
 
@@ -461,7 +461,7 @@ DbDoc::Iterator DbDoc::begin()
     m_impl->reset();
     it.m_impl = m_impl;
     it.m_end = false;
-    return std::move(it);
+    return it;
   }
   CATCH_AND_WRAP
 }
@@ -475,7 +475,7 @@ DbDoc::Iterator DbDoc::end()
     */
     Iterator it;
     it.m_end = true;
-    return std::move(it);
+    return it;
   }
   CATCH_AND_WRAP
 }

devapi/result.cc

@@ -316,7 +316,7 @@ struct CollationInfo::Access
     ci.m_id = _id;
     ci.m_case = CollationInfo::coll_case(_case);
     ci.m_name = _name;
-    return std::move(ci);
+    return ci;
   }
 };
 

devapi/session.cc

@@ -46,8 +46,6 @@ POP_SYS_WARNINGS
 
 
 
-const unsigned max_priority = 100;
-
 using namespace ::mysqlx::impl::common;
 using namespace ::mysqlx::internal;
 using namespace ::mysqlx;

devapi/tests/batch-t.cc

@@ -83,7 +83,7 @@ TEST_F(Batch, crud)
   {
     RowResult res = sql("select count(*) from test.c1");
     unsigned  cnt = res.fetchOne()[0];
-    EXPECT_EQ(0, cnt);
+    EXPECT_EQ(0U, cnt);
   }
 
   cout << "Inserting documents..." << endl;
@@ -112,7 +112,7 @@ TEST_F(Batch, crud)
   {
     RowResult res = sql("select count(*) from test.c1");
     unsigned  cnt = res.fetchOne()[0];
-    EXPECT_EQ(5, cnt);
+    EXPECT_EQ(5U, cnt);
     cout << "Documents added" << endl;
   }
 
@@ -149,7 +149,7 @@ TEST_F(Batch, crud)
     EXPECT_FALSE(find.fetchOne());
     RowResult res = sql("select count(*) from test.c1");
     unsigned  cnt = res.fetchOne()[0];
-    EXPECT_EQ(5, cnt);
+    EXPECT_EQ(5U, cnt);
   }
 
   cout << "Modifying documents..." << endl;
@@ -178,7 +178,7 @@ TEST_F(Batch, crud)
       EXPECT_NO_THROW(doc["food"]);
       EXPECT_THROW(doc["date"], std::out_of_range);
     }
-    EXPECT_EQ(5, pos);
+    EXPECT_EQ(5U, pos);
   }
 
   cout << "Done!" << endl;
@@ -203,13 +203,13 @@ TEST_F(Batch, multi_add)
 
   coll.remove("true").execute();
   coll.add(docs).execute();
-  EXPECT_EQ(5, show_docs(coll));
+  EXPECT_EQ(5U, show_docs(coll));
 
   cout << endl << "2. Add range of documents from 1 to 3" << endl;
 
   coll.remove("true").execute();
   coll.add(docs.begin(), docs.begin() + 3).execute();
-  EXPECT_EQ(3, show_docs(coll));
+  EXPECT_EQ(3U, show_docs(coll));
 
   cout << endl << "3. Mixed inserts" << endl;
 
@@ -219,7 +219,7 @@ TEST_F(Batch, multi_add)
     .add(docs.begin(), docs.begin() + 3)
     .add(docs[4])
     .add(docs).execute();
-  EXPECT_EQ(15, show_docs(coll));
+  EXPECT_EQ(15U, show_docs(coll));
 
   cout << endl << "4. Add documents in a loop" << endl;
 
@@ -231,7 +231,7 @@ TEST_F(Batch, multi_add)
       add_op.add(json);
     }
     add_op.execute();
-    EXPECT_EQ(5, show_docs(coll));
+    EXPECT_EQ(5U, show_docs(coll));
   }
 
   cout << endl << "5. Using custom iterator" << endl;
@@ -269,7 +269,7 @@ TEST_F(Batch, multi_add)
 
   coll.remove("true").execute();
   coll.add(It(5), It()).execute();
-  EXPECT_EQ(5, show_docs(coll));
+  EXPECT_EQ(5U, show_docs(coll));
 
 }
 
@@ -310,7 +310,7 @@ TEST_F(Batch, table_insert)
       cout << "row#" << count << ": " << row[0] << ", " << row[1] << endl;
     }
 
-    EXPECT_EQ(8, count);
+    EXPECT_EQ(8U, count);
   }
 
   tbl.insert().rows(rows.begin(), rows.end()).values(6, "new").execute();
@@ -328,7 +328,7 @@ TEST_F(Batch, table_insert)
       cout << "row#" << count << ": " << row[0] << ", " << row[1] << endl;
     }
 
-    EXPECT_EQ(14, count);
+    EXPECT_EQ(14U, count);
   }
 }