Enabling -Wshadow [#CLICKHOUSE-2]

dbms/src/Common/tests/AvalancheTest.h

@@ -210,13 +210,13 @@ void BicTest3(pfHash hash, const int reps, bool verbose = true)
             for (int keybit = 0; keybit < keybits; keybit++)
             {
                 int * page = &bins[keybit * pagesize];
-                int * bins = &page[(out1 * hashbits + out2) * 4];
+                int * bins_in_page = &page[(out1 * hashbits + out2) * 4];
 
                 double bias = 0;
 
                 for (int b = 0; b < 4; b++)
                 {
-                    double b2 = static_cast<double>(bins[b]) / static_cast<double>(reps / 2);
+                    double b2 = static_cast<double>(bins_in_page[b]) / static_cast<double>(reps / 2);
                     b2 = fabs(b2 * 2 - 1);
 
                     if (b2 > bias)

dbms/src/Common/tests/auto_array.cpp

@@ -133,13 +133,14 @@ int main(int argc, char ** argv)
         }
     }
 
+    if (argc == 2 && !strcmp(argv[1], "1"))
+    {
         size_t n = 5;
         size_t map_size = 1000000;
+
         using T = DB::Field;
         T field = std::string("Hello, world");
 
-    if (argc == 2 && !strcmp(argv[1], "1"))
-    {
         using Arr = std::vector<T>;
         using Map = HashMap<UInt64, Arr>;
 

dbms/src/Common/tests/int_hashes_perf.cpp

@@ -274,14 +274,11 @@ static inline void test(size_t n, const UInt64 * data, const char * name)
 
 int main(int argc, char ** argv)
 {
-    const size_t BUF_SIZE = 1024;
-
     size_t n = (atoi(argv[1]) + (BUF_SIZE - 1)) / BUF_SIZE * BUF_SIZE;
     size_t method = argc <= 2 ? 0 : atoi(argv[2]);
 
     std::cerr << std::fixed << std::setprecision(2);
 
-    using Source = std::vector<UInt64>;
     Source data(BUF_SIZE);
 
     {