Merge branch 'master' of github.com:yandex/ClickHouse

This commit is contained in:
alesapin 2019-09-16 14:13:35 +03:00
commit 7a93e7faba

View File

@ -31,10 +31,11 @@ void StopConditionsSet::loadFromConfig(const ConfigurationPtr & stop_conditions_
else if (key == "average_speed_not_changing_for_ms") else if (key == "average_speed_not_changing_for_ms")
average_speed_not_changing_for_ms.value = stop_conditions_view->getUInt64(key); average_speed_not_changing_for_ms.value = stop_conditions_view->getUInt64(key);
else else
throw Exception("Met unkown stop condition: " + key, ErrorCodes::LOGICAL_ERROR); throw Exception("Met unknown stop condition: " + key, ErrorCodes::LOGICAL_ERROR);
}
++initialized_count; ++initialized_count;
} }
}
void StopConditionsSet::reset() void StopConditionsSet::reset()
{ {