thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 08:32:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbms: style [#METR-10071].

Browse Source
This commit is contained in:
Alexey Milovidov 2014-03-27 23:09:23 +04:00
parent 26848b6803
commit eba3126077
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/include/DB/Functions/FunctionsStringSearch.h
View File

@ -810,7 +810,7 @@ struct ReplaceStringImpl
match = false; match = false;
if (match) if (match)
{ {
replace_cnt ++; ++replace_cnt;
res_data += replacement; res_data += replacement;
i = i + needle.size() - 1; i = i + needle.size() - 1;
} else } else

2
dbms/src/Client/Client.cpp
View File

@ -985,7 +985,7 @@ public:
{ {
external_tables.push_back(ExternalTable(external_options)); external_tables.push_back(ExternalTable(external_options));
if (external_tables.back().file == "-") if (external_tables.back().file == "-")
stdin_count ++; ++stdin_count;
if (stdin_count > 1) if (stdin_count > 1)
throw Exception("Two or more external tables has stdin (-) set as --file field", ErrorCodes::BAD_ARGUMENTS); throw Exception("Two or more external tables has stdin (-) set as --file field", ErrorCodes::BAD_ARGUMENTS);
} }

2
dbms/src/Common/VirtualColumnUtils.cpp
View File

@ -60,7 +60,7 @@ String chooseSuffixForSet(const NamesAndTypesList & columns, const std::vector<S
} }
if (done) if (done)
break; break;
id ++; ++id;
current_suffix = toString<Int32>(id); current_suffix = toString<Int32>(id);
} }
return current_suffix; return current_suffix;

2
dbms/src/Interpreters/ExpressionAnalyzer.cpp
View File

@ -1190,7 +1190,7 @@ void ExpressionAnalyzer::processGlobalOperations()
{ {
String external_table_name = "_data"; String external_table_name = "_data";
while (context.tryGetExternalTable(external_table_name + toString(id))) while (context.tryGetExternalTable(external_table_name + toString(id)))
id ++; ++id;
addExternalStorage(dynamic_cast<ASTFunction *>(&*global_nodes[i]), id); addExternalStorage(dynamic_cast<ASTFunction *>(&*global_nodes[i]), id);
} }
} }

2
dbms/src/Storages/StorageLog.cpp
View File

@ -85,7 +85,7 @@ Block LogBlockInputStream::readImpl()
if (mark_number > 0) if (mark_number > 0)
current_row += marks[mark_number-1].rows; current_row += marks[mark_number-1].rows;
while (current_mark < marks.size() && marks[current_mark].rows <= current_row) while (current_mark < marks.size() && marks[current_mark].rows <= current_row)
current_mark ++; ++current_mark;
current_table = storage.getTableFromMark(current_mark); current_table = storage.getTableFromMark(current_mark);
current_table.second = std::min(current_table.second, marks.size() - 1); current_table.second = std::min(current_table.second, marks.size() - 1);

8
dbms/src/Storages/tests/MergeLogicTester.cpp
View File

@ -256,7 +256,7 @@ bool makeMerge(int cur_time) {
mergeScheduled --; mergeScheduled --;
std::vector<DataPtr> e; std::vector<DataPtr> e;
if (!selectPartsToMerge(e)) return 1; if (!selectPartsToMerge(e)) return 1;
int curId = uniqId ++; int curId = ++uniqId;
size_t size = 0; size_t size = 0;
for (size_t i = 0; i < e.size(); ++i) for (size_t i = 0; i < e.size(); ++i)
{ {
@ -300,11 +300,11 @@ void process(pair<int, pair<int, int> > ev)
size += (*it)->size; size += (*it)->size;
st = min(st, (*it)->time); st = min(st, (*it)->time);
DataParts::iterator nxt = it; DataParts::iterator nxt = it;
nxt ++; ++nxt;
data_parts.erase(it); data_parts.erase(it);
it = nxt; it = nxt;
} else } else
it ++; ++it;
} }
data_parts.insert(new DataPart(st, size, 0, cur_time)); data_parts.insert(new DataPart(st, size, 0, cur_time));
} else if (type == 3) /// do merge } else if (type == 3) /// do merge
@ -342,7 +342,7 @@ int main()
averageNumberOfParts += 1.0 * (cur_time - last_time) * data_parts.size(); averageNumberOfParts += 1.0 * (cur_time - last_time) * data_parts.size();
if (cur_time > total_time) break; if (cur_time > total_time) break;
updateStat(cur_time); updateStat(cur_time);
iter ++; ++iter;
if (iter % 3000 == 0) if (iter % 3000 == 0)
{ {
printf("Current time: %d\n", cur_time); printf("Current time: %d\n", cur_time);