clang-tidy, part 19

dbms/src/Common/tests/auto_array.cpp

@@ -17,8 +17,8 @@ int main(int argc, char ** argv)
         using T = std::string;
         DB::AutoArray<T> arr(n);
 
-        for (auto & elem : arr)
-            elem = "Hello, world! " + DB::toString(i);
+        for (size_t i = 0; i < arr.size(); ++i)
+            arr[i] = "Hello, world! " + DB::toString(i);
 
         for (auto & elem : arr)
             std::cerr << elem << std::endl;
@@ -33,8 +33,8 @@ int main(int argc, char ** argv)
         Arr arr;
 
         arr.resize(n);
-        for (auto & elem : arr)
-            elem = "Hello, world! " + DB::toString(i);
+        for (size_t i = 0; i < arr.size(); ++i)
+            arr[i] = "Hello, world! " + DB::toString(i);
 
         for (auto & elem : arr)
             std::cerr << elem << std::endl;

dbms/src/IO/tests/valid_utf8.cpp

@@ -11,8 +11,8 @@ int main(int, char **)
 {
     try
     {
-        std::string test1 = "kjhsgdfkjhg2378rtzgvxkz877%^&^*%&^*&*";
-        std::string test2 = "{\"asd\" = \"qw1\",\"qwe24\" = \"3asd\"}";
+        std::string test1 = R"(kjhsgdfkjhg2378rtzgvxkz877%^&^*%&^*&*)";
+        std::string test2 = R"({"asd" = "qw1","qwe24" = "3asd"})";
         test2[test2.find('1')] = char(127 + 64);
         test2[test2.find('2')] = char(127 + 64 + 32);
         test2[test2.find('3')] = char(127 + 64 + 32 + 16);

dbms/src/Storages/MergeTree/MergeTreePartInfo.cpp

@@ -12,18 +12,18 @@ namespace ErrorCodes
 }
 
 
-MergeTreePartInfo MergeTreePartInfo::fromPartName(const String & dir_name, MergeTreeDataFormatVersion format_version)
+MergeTreePartInfo MergeTreePartInfo::fromPartName(const String & part_name, MergeTreeDataFormatVersion format_version)
 {
     MergeTreePartInfo part_info;
-    if (!tryParsePartName(dir_name, &part_info, format_version))
-        throw Exception("Unexpected part name: " + dir_name, ErrorCodes::BAD_DATA_PART_NAME);
+    if (!tryParsePartName(part_name, &part_info, format_version))
+        throw Exception("Unexpected part name: " + part_name, ErrorCodes::BAD_DATA_PART_NAME);
     return part_info;
 }
 
 
-bool MergeTreePartInfo::tryParsePartName(const String & dir_name, MergeTreePartInfo * part_info, MergeTreeDataFormatVersion format_version)
+bool MergeTreePartInfo::tryParsePartName(const String & part_name, MergeTreePartInfo * part_info, MergeTreeDataFormatVersion format_version)
 {
-    ReadBufferFromString in(dir_name);
+    ReadBufferFromString in(part_name);
 
     String partition_id;
     if (format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
@@ -101,18 +101,18 @@ bool MergeTreePartInfo::tryParsePartName(const String & dir_name, MergeTreePartI
 }
 
 
-void MergeTreePartInfo::parseMinMaxDatesFromPartName(const String & dir_name, DayNum & min_date, DayNum & max_date)
+void MergeTreePartInfo::parseMinMaxDatesFromPartName(const String & part_name, DayNum & min_date, DayNum & max_date)
 {
     UInt32 min_yyyymmdd = 0;
     UInt32 max_yyyymmdd = 0;
 
-    ReadBufferFromString in(dir_name);
+    ReadBufferFromString in(part_name);
 
     if (!tryReadIntText(min_yyyymmdd, in)
         || !checkChar('_', in)
         || !tryReadIntText(max_yyyymmdd, in))
     {
-        throw Exception("Unexpected part name: " + dir_name, ErrorCodes::BAD_DATA_PART_NAME);
+        throw Exception("Unexpected part name: " + part_name, ErrorCodes::BAD_DATA_PART_NAME);
     }
 
     const auto & date_lut = DateLUT::instance();
@@ -124,7 +124,7 @@ void MergeTreePartInfo::parseMinMaxDatesFromPartName(const String & dir_name, Da
     DayNum max_month = date_lut.toFirstDayNumOfMonth(max_date);
 
     if (min_month != max_month)
-        throw Exception("Part name " + dir_name + " contains different months", ErrorCodes::BAD_DATA_PART_NAME);
+        throw Exception("Part name " + part_name + " contains different months", ErrorCodes::BAD_DATA_PART_NAME);
 }
 
 

dbms/src/Storages/MergeTree/MergeTreePartInfo.h

@@ -78,7 +78,7 @@ struct MergeTreePartInfo
 
     static MergeTreePartInfo fromPartName(const String & part_name, MergeTreeDataFormatVersion format_version);
 
-    static bool tryParsePartName(const String & dir_name, MergeTreePartInfo * part_info, MergeTreeDataFormatVersion format_version);
+    static bool tryParsePartName(const String & part_name, MergeTreePartInfo * part_info, MergeTreeDataFormatVersion format_version);
 
     static void parseMinMaxDatesFromPartName(const String & part_name, DayNum & min_date, DayNum & max_date);
 

dbms/src/TableFunctions/ITableFunctionXDBC.cpp

@@ -41,8 +41,8 @@ StoragePtr ITableFunctionXDBC::executeImpl(const ASTPtr & ast_function, const Co
                 + "('DSN', schema, table)",
             ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-    for (auto i = 0u; i < args.size(); ++i)
-        args[i] = evaluateConstantExpressionOrIdentifierAsLiteral(args[i], context);
+    for (auto & arg : args)
+        arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
 
     std::string connection_string;
     std::string schema_name;

dbms/src/TableFunctions/TableFunctionS3.cpp

@@ -36,8 +36,8 @@ StoragePtr TableFunctionS3::executeImpl(const ASTPtr & ast_function, const Conte
         throw Exception("Table function '" + getName() + "' requires 3 to 6 arguments: url, [access_key_id, secret_access_key,] format, structure and [compression_method].",
             ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH);
 
-    for (size_t i = 0; i < args.size(); ++i)
-        args[i] = evaluateConstantExpressionOrIdentifierAsLiteral(args[i], context);
+    for (auto & arg : args)
+        arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
 
     String filename = args[0]->as<ASTLiteral &>().value.safeGet<String>();
     String format;