fixed/adjed to comply with -Wextra by clang-10

kashirin-alex · kashirin-alex · commit 80a3f2798d51 · 2020-07-07T19:55:39.000+03:00
diff --git a/src/c/lib/swcdb/pam/pam_swcdb_max_retries.c b/src/c/lib/swcdb/pam/pam_swcdb_max_retries.c
@@ -181,7 +181,7 @@ bool swcdb_pam_confirm_state(swc_pam_cfg* cfg, const char* pam_rhost) {
   bool adj = tries < 0;
   allowed = tries == 0 || !adj || tries <= cfg->maxtries;
 
-  gchar* update;
+  gchar* update = NULL;
   len = g_snprintf(update, 1024,
     "update cell(INSERT,'%s', %s, '', '%s%d')", 
     cfg->column, 
@@ -190,7 +190,7 @@ bool swcdb_pam_confirm_state(swc_pam_cfg* cfg, const char* pam_rhost) {
     adj ? cfg->maxtries : 1
   );
   g_free(key);
-  if(!len) {
+  if(!len || !update) {
     swcdb_pam_disconnect(&client, cfg);
     return allowed;
   }
@@ -234,10 +234,10 @@ void swcdb_pam_reduce_attempt(swc_pam_cfg* cfg, const char* pam_rhost) {
     return;
   }
 
-  gchar* update;
+  gchar* update = NULL;
   len = g_snprintf(update, 1024,
     "update cell(INSERT,'%s', %s, '', '=0'", cfg->column, key);
-  if(!len) {
+  if(!len || !update) {
     g_free(key);
     swcdb_pam_disconnect(&client, cfg);
     return;
diff --git a/src/cc/include/swcdb/core/config/Properties.h b/src/cc/include/swcdb/core/config/Properties.h
@@ -20,7 +20,6 @@ namespace SWC {
 class Properties {
 
   typedef std::map<std::string, Property::Value::Ptr>   Map;
-  typedef std::pair<std::string, Property::Value::Ptr>  MapPair;
   typedef std::map<std::string, std::string>  AliasMap;
   typedef std::pair<Map::iterator, bool>      InsRet;
   
diff --git a/src/cc/include/swcdb/core/config/PropertiesParser.h b/src/cc/include/swcdb/core/config/PropertiesParser.h
@@ -70,7 +70,6 @@ class ParserConfig final {
   };
 
   typedef std::map<std::string, ParserOpt>          Map;
-  typedef std::pair<std::string, ParserOpt>         MapPair;
   typedef std::vector<std::pair<int, std::string>>  Positions;
 
   public:
diff --git a/src/cc/include/swcdb/thrift/broker/AppContext.h b/src/cc/include/swcdb/thrift/broker/AppContext.h
@@ -52,7 +52,7 @@ class AppContext final : virtual public BrokerIfFactory {
     m_cv.wait(lock_wait, [this]{return !m_run;});
   }
 
-  BrokerIf* getHandler(const thrift::TConnectionInfo&) { //connInfo
+  BrokerIf* getHandler(const thrift::TConnectionInfo&) override { //connInfo
     return new AppHandler;
   }
 
diff --git a/src/cc/lib/swcdb/core/config/PropertiesParser.cc b/src/cc/lib/swcdb/core/config/PropertiesParser.cc
@@ -212,7 +212,7 @@ std::string ParserConfig::position_name(int n) {
 }
 
 bool ParserConfig::has(const std::string& name) const {
-  for(const MapPair& info : options) {
+  for(const auto& info : options) {
     if(name.compare(info.first) == 0)
       return true;
     for(const std::string& alias : info.second.aliases)
@@ -223,7 +223,7 @@ bool ParserConfig::has(const std::string& name) const {
 }
 
 bool ParserConfig::has(const std::string& name, std::string& alias_to) const {
-  for(const MapPair& info : options) {
+  for(const auto& info : options) {
     if(name.compare(info.first) == 0)
       return true;
     for(const std::string& alias : info.second.aliases)
@@ -236,7 +236,7 @@ bool ParserConfig::has(const std::string& name, std::string& alias_to) const {
 }
 
 Property::Value::Ptr ParserConfig::get_default(const std::string& name){
-  for(const MapPair& info : options) {
+  for(const auto& info : options) {
     if(name.compare(info.first) == 0)
       return info.second.value;
     for(const std::string& alias : info.second.aliases)
diff --git a/src/cc/lib/swcdb/db/Cells/Mutable.cc b/src/cc/lib/swcdb/db/Cells/Mutable.cc
@@ -516,7 +516,7 @@ void Mutable::scan_test_use(const Specs::Interval& specs,
       cell.write(result);
       if(++count == specs.flags.limit) 
         // specs.flags.limit_by && specs.flags.max_versions
-          break;
+        break;
     } else 
       ++skips;
   }
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -16,6 +16,7 @@ include_directories(
 
 set(TEST_DIFF ${CMAKE_CURRENT_SOURCE_DIR}/testutils/testdiff)
 
+get_property(SWC_VERSION_SRC GLOBAL PROPERTY SWC_VERSION_SRC)
 get_property(SWC_LIB_CORE_SHARED GLOBAL PROPERTY SWC_LIB_CORE_SHARED)
 get_property(SWC_LIB_CORE_STATIC GLOBAL PROPERTY SWC_LIB_CORE_STATIC)
 
diff --git a/tests/libswcdb/CMakeLists.txt b/tests/libswcdb/CMakeLists.txt
@@ -42,6 +42,7 @@ ADD_TEST_TARGET(
 ADD_TEST_TARGET(
   NAME      key_comparator_impl_src
   SRCS      test_key_comparator.cc
+            ${SWC_VERSION_SRC}
   SHARED    ${SWC_LIB_CORE_SHARED}
   STATIC    ${SWC_LIB_CORE_STATIC}
   FLAGS     "-DSWC_IMPL_SOURCE"
diff --git a/tests/libswcdb/test_cell_key.cc b/tests/libswcdb/test_cell_key.cc
@@ -213,7 +213,7 @@ void load_check_key(int chks, int num_fractions, int chk_count) {
 
     auto ts = std::chrono::system_clock::now();
     for(auto b=0;b<num_fractions;++b)
-      key.add(std::to_string(b+(2^60)));
+      key.add(std::to_string(b+(1LL << 60)));
     took_add += std::chrono::duration_cast<std::chrono::nanoseconds>(
                     std::chrono::system_clock::now() - ts).count();
 
@@ -231,7 +231,7 @@ void load_check_key(int chks, int num_fractions, int chk_count) {
 
     ts = std::chrono::system_clock::now();
     for(auto b=0;b<num_fractions;++b)
-      key.insert(0, std::to_string(b+(2^60)));
+      key.insert(0, std::to_string(b+(1LL << 60)));
     took_insert += std::chrono::duration_cast<std::chrono::nanoseconds>(
                     std::chrono::system_clock::now() - ts).count();
   }
@@ -240,7 +240,7 @@ void load_check_key(int chks, int num_fractions, int chk_count) {
   
   DB::Cell::Key key;
   for(auto b=0; b<num_fractions; ++b)
-    key.add(std::to_string(b+(2^60)));
+    key.add(std::to_string(b+(1LL << 60)));
     
   size_t sz = sizeof(key)+key.size;
 
@@ -270,7 +270,7 @@ void load_check_key_vec(int chks, int num_fractions, int chk_count) {
 
     auto ts = std::chrono::system_clock::now();
     for(auto b=0;b<num_fractions;++b)
-      key.add(std::to_string(b+(2^60)));
+      key.add(std::to_string(b+(1LL << 60)));
     took_add += std::chrono::duration_cast<std::chrono::nanoseconds>(
                     std::chrono::system_clock::now() - ts).count();
 
@@ -288,7 +288,7 @@ void load_check_key_vec(int chks, int num_fractions, int chk_count) {
 
     ts = std::chrono::system_clock::now();
     for(auto b=0;b<num_fractions;++b)
-      key.insert(0, std::to_string(b+(2^60)));
+      key.insert(0, std::to_string(b+(1LL << 60)));
     took_insert += std::chrono::duration_cast<std::chrono::nanoseconds>(
                     std::chrono::system_clock::now() - ts).count();
   }
@@ -298,7 +298,7 @@ void load_check_key_vec(int chks, int num_fractions, int chk_count) {
   DB::Cell::KeyVec key;
   size_t sz = sizeof(key);
   for(auto b=0; b<num_fractions; ++b) {
-    key.add(std::to_string(b+(2^60)));
+    key.add(std::to_string(b+(1LL << 60)));
     sz += sizeof(key.back()) + key.back().length();
   }
 
@@ -327,7 +327,7 @@ void load_check_vec(int chks, int num_fractions, int chk_count) {
 
     auto ts = std::chrono::system_clock::now();
     for(auto b=0;b<num_fractions;++b)
-      key.push_back(std::to_string(b+(2^60)));
+      key.push_back(std::to_string(b+(1LL << 60)));
     took_add += std::chrono::duration_cast<std::chrono::nanoseconds>(
                     std::chrono::system_clock::now() - ts).count();
 
@@ -346,7 +346,7 @@ void load_check_vec(int chks, int num_fractions, int chk_count) {
     
     ts = std::chrono::system_clock::now();
     for(auto b=0;b<num_fractions;++b)
-      key.insert(key.begin(), std::to_string(b+(2^60)));
+      key.insert(key.begin(), std::to_string(b+(1LL << 60)));
     took_insert += std::chrono::duration_cast<std::chrono::nanoseconds>(
                     std::chrono::system_clock::now() - ts).count();
   }
@@ -355,7 +355,7 @@ void load_check_vec(int chks, int num_fractions, int chk_count) {
   std::vector<std::string> key;
   size_t sz = 0;
   for(auto b=0; b<num_fractions; ++b) {
-    key.push_back(std::to_string(b+(2^60)));
+    key.push_back(std::to_string(b+(1LL << 60)));
     sz += sizeof(key.back()) + key.back().length();
   }
   sz += sizeof(key);
diff --git a/tests/libswcdb_core/sertest.cc b/tests/libswcdb_core/sertest.cc
@@ -65,7 +65,8 @@ void test_i16() {
       SWC_ASSERT(len == 0));
   }
   ns = Time::now_ns() - ns;
-  std::cout << "i16 took=" << ns << " avg=" << (double)ns / UINT16_MAX << "\n";
+  std::cout << "i16 took=" << ns 
+            << " avg=" << (double)ns / UINT16_MAX << "\n";
 }
 
 void test_i24() {
@@ -90,7 +91,8 @@ void test_i24() {
       SWC_ASSERT(len == 0));
   }
   ns = Time::now_ns() - ns;
-  std::cout << "i24 took=" << ns << " avg=" << (double)ns / UINT24_MAX << "\n";
+  std::cout << "i24 took=" << ns 
+            << " avg=" << (double)ns / UINT24_MAX << "\n";
 }
 
 void test_i32() {
@@ -115,7 +117,8 @@ void test_i32() {
       SWC_ASSERT(len == 0));
   }
   ns = Time::now_ns() - ns;
-  std::cout << "i32 took=" << ns << " avg=" << (double)ns / UINT32_MAX << "\n";
+  std::cout << "i32 took=" << ns 
+            << " avg=" << (double)ns / UINT32_MAX << "\n";
 }
 
 void test_i64() {
@@ -140,7 +143,8 @@ void test_i64() {
       SWC_ASSERT(len == 0));
   }
   ns = Time::now_ns() - ns;
-  std::cout << "i64 took=" << ns << " avg=" << (double)ns / UINT64_MAX << "\n";
+  std::cout << "i64 took=" << ns .
+            << " avg=" << double(ns) / double(UINT64_MAX) << "\n";
 }
 
 void chk_vi24(uint24_t n) {
@@ -175,7 +179,8 @@ void test_vi24() {
     ++c;
   }
   ns = Time::now_ns() - ns;
-  std::cout << "vi24       took=" << ns << " avg=" << (double)ns / c << " c=" << c << "\n";
+  std::cout << "vi24       took=" << ns 
+            << " avg=" << (double)ns / c << " c=" << c << "\n";
 }
 
 void chk_vi32(uint32_t n) {
@@ -209,7 +214,8 @@ void test_vi32() {
     ++c;
   }
   ns = Time::now_ns() - ns;
-  std::cout << "vi32 lower took=" << ns << " avg=" << (double)ns / c << " c=" << c << "\n";
+  std::cout << "vi32 lower took=" << ns 
+            << " avg=" << (double)ns / c << " c=" << c << "\n";
   c = 0;
   ns = Time::now_ns();
   for(uint32_t p=0; p<PROBES;++p)
@@ -220,7 +226,8 @@ void test_vi32() {
       break;
   }
   ns = Time::now_ns() - ns;
-  std::cout << "vi32 upper took=" << ns << " avg=" << (double)ns / c << " c=" << c << "\n";
+  std::cout << "vi32 upper took=" << ns 
+            << " avg=" << (double)ns / c << " c=" << c << "\n";
 }
 
 void chk_vi64(uint64_t n) {
@@ -254,7 +261,8 @@ void test_vi64() {
     ++c;
   }
   ns = Time::now_ns() - ns;
-  std::cout << "vi64 lower took=" << ns << " avg=" << (double)ns / c << " c=" << c << "\n";
+  std::cout << "vi64 lower took=" << ns 
+            << " avg=" << (double)ns / c << " c=" << c << "\n";
   c = 0;
   ns = Time::now_ns();
   for(uint32_t p=0; p<PROBES;++p)
@@ -265,7 +273,8 @@ void test_vi64() {
       break;
   }
   ns = Time::now_ns() - ns;
-  std::cout << "vi64 upper took=" << ns << " avg=" << (double)ns / c << " c=" << c << "\n";
+  std::cout << "vi64 upper took=" << ns 
+            << " avg=" << (double)ns / c << " c=" << c << "\n";
 }
 
 void test_str16() {

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class AppContext final : virtual public BrokerIfFactory {`
`52`	`52`	`m_cv.wait(lock_wait, [this]{return !m_run;});`
`53`	`53`	`}`
`54`	`54`
`55`		`- BrokerIf* getHandler(const thrift::TConnectionInfo&) { //connInfo`
	`55`	`+ BrokerIf* getHandler(const thrift::TConnectionInfo&) override { //connInfo`
`56`	`56`	`return new AppHandler;`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -516,7 +516,7 @@ void Mutable::scan_test_use(const Specs::Interval& specs,`
`516`	`516`	`cell.write(result);`
`517`	`517`	`if(++count == specs.flags.limit)`
`518`	`518`	`// specs.flags.limit_by && specs.flags.max_versions`
`519`		`- break;`
	`519`	`+ break;`
`520`	`520`	`} else`
`521`	`521`	`++skips;`
`522`	`522`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,8 @@ void test_i16() {`
`65`	`65`	`SWC_ASSERT(len == 0));`
`66`	`66`	`}`
`67`	`67`	`ns = Time::now_ns() - ns;`
`68`		`- std::cout << "i16 took=" << ns << " avg=" << (double)ns / UINT16_MAX << "\n";`
	`68`	`+ std::cout << "i16 took=" << ns`
	`69`	`+ << " avg=" << (double)ns / UINT16_MAX << "\n";`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`void test_i24() {`
`@@ -90,7 +91,8 @@ void test_i24() {`
`90`	`91`	`SWC_ASSERT(len == 0));`
`91`	`92`	`}`
`92`	`93`	`ns = Time::now_ns() - ns;`
`93`		`- std::cout << "i24 took=" << ns << " avg=" << (double)ns / UINT24_MAX << "\n";`
	`94`	`+ std::cout << "i24 took=" << ns`
	`95`	`+ << " avg=" << (double)ns / UINT24_MAX << "\n";`
`94`	`96`	`}`
`95`	`97`
`96`	`98`	`void test_i32() {`
`@@ -115,7 +117,8 @@ void test_i32() {`
`115`	`117`	`SWC_ASSERT(len == 0));`
`116`	`118`	`}`
`117`	`119`	`ns = Time::now_ns() - ns;`
`118`		`- std::cout << "i32 took=" << ns << " avg=" << (double)ns / UINT32_MAX << "\n";`
	`120`	`+ std::cout << "i32 took=" << ns`
	`121`	`+ << " avg=" << (double)ns / UINT32_MAX << "\n";`
`119`	`122`	`}`
`120`	`123`
`121`	`124`	`void test_i64() {`
`@@ -140,7 +143,8 @@ void test_i64() {`
`140`	`143`	`SWC_ASSERT(len == 0));`
`141`	`144`	`}`
`142`	`145`	`ns = Time::now_ns() - ns;`
`143`		`- std::cout << "i64 took=" << ns << " avg=" << (double)ns / UINT64_MAX << "\n";`
	`146`	`+ std::cout << "i64 took=" << ns .`
	`147`	`+ << " avg=" << double(ns) / double(UINT64_MAX) << "\n";`
`144`	`148`	`}`
`145`	`149`
`146`	`150`	`void chk_vi24(uint24_t n) {`
`@@ -175,7 +179,8 @@ void test_vi24() {`
`175`	`179`	`++c;`
`176`	`180`	`}`
`177`	`181`	`ns = Time::now_ns() - ns;`
`178`		`- std::cout << "vi24 took=" << ns << " avg=" << (double)ns / c << " c=" << c << "\n";`
	`182`	`+ std::cout << "vi24 took=" << ns`
	`183`	`+ << " avg=" << (double)ns / c << " c=" << c << "\n";`
`179`	`184`	`}`
`180`	`185`
`181`	`186`	`void chk_vi32(uint32_t n) {`
`@@ -209,7 +214,8 @@ void test_vi32() {`
`209`	`214`	`++c;`
`210`	`215`	`}`
`211`	`216`	`ns = Time::now_ns() - ns;`
`212`		`- std::cout << "vi32 lower took=" << ns << " avg=" << (double)ns / c << " c=" << c << "\n";`
	`217`	`+ std::cout << "vi32 lower took=" << ns`
	`218`	`+ << " avg=" << (double)ns / c << " c=" << c << "\n";`
`213`	`219`	`c = 0;`
`214`	`220`	`ns = Time::now_ns();`
`215`	`221`	`for(uint32_t p=0; p<PROBES;++p)`
`@@ -220,7 +226,8 @@ void test_vi32() {`
`220`	`226`	`break;`
`221`	`227`	`}`
`222`	`228`	`ns = Time::now_ns() - ns;`
`223`		`- std::cout << "vi32 upper took=" << ns << " avg=" << (double)ns / c << " c=" << c << "\n";`
	`229`	`+ std::cout << "vi32 upper took=" << ns`
	`230`	`+ << " avg=" << (double)ns / c << " c=" << c << "\n";`
`224`	`231`	`}`
`225`	`232`
`226`	`233`	`void chk_vi64(uint64_t n) {`
`@@ -254,7 +261,8 @@ void test_vi64() {`
`254`	`261`	`++c;`
`255`	`262`	`}`
`256`	`263`	`ns = Time::now_ns() - ns;`
`257`		`- std::cout << "vi64 lower took=" << ns << " avg=" << (double)ns / c << " c=" << c << "\n";`
	`264`	`+ std::cout << "vi64 lower took=" << ns`
	`265`	`+ << " avg=" << (double)ns / c << " c=" << c << "\n";`
`258`	`266`	`c = 0;`
`259`	`267`	`ns = Time::now_ns();`
`260`	`268`	`for(uint32_t p=0; p<PROBES;++p)`
`@@ -265,7 +273,8 @@ void test_vi64() {`
`265`	`273`	`break;`
`266`	`274`	`}`
`267`	`275`	`ns = Time::now_ns() - ns;`
`268`		`- std::cout << "vi64 upper took=" << ns << " avg=" << (double)ns / c << " c=" << c << "\n";`
	`276`	`+ std::cout << "vi64 upper took=" << ns`
	`277`	`+ << " avg=" << (double)ns / c << " c=" << c << "\n";`
`269`	`278`	`}`
`270`	`279`
`271`	`280`	`void test_str16() {`