thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-25 17:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

small logging improvements. [#METR-10202]

Browse Source
This commit is contained in:
Michael Kolupaev 2014-06-27 17:47:00 +04:00
parent 1f45a832d9
commit 4baf5626cd
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
View File

@ -35,6 +35,7 @@ public:
UInt64 part_number = block_number_lock.getNumber();
LOG_DEBUG(log, "Writing block " << part_number << " with ID " << block_id);
MergeTreeData::MutableDataPartPtr part = storage.writer.writeTempPart(current_block, part_number);
/// Если в запросе не указан ID, возьмем в качестве ID хеш от данных. То есть, не вставляем одинаковые данные дважды.

2
dbms/src/Storages/MergeTree/MergeTreeData.cpp
View File

@ -596,7 +596,7 @@ void MergeTreeData::renameTempPartAndAdd(MutableDataPartPtr part, Increment * in
MergeTreeData::DataPartsVector MergeTreeData::renameTempPartAndReplace(MutableDataPartPtr part, Increment * increment)
{
LOG_TRACE(log, "Renaming.");
LOG_TRACE(log, "Renaming " << part->name << ".");
Poco::ScopedLock<Poco::FastMutex> lock(data_parts_mutex);
Poco::ScopedLock<Poco::FastMutex> lock_all(all_data_parts_mutex);

3
libs/libzkutil/include/zkutil/KeeperException.h
View File

@ -16,10 +16,11 @@ public:
: DB::Exception(zerror(code_)), code(code_) {}
KeeperException(int32_t code_, const std::string & path_)
: DB::Exception(std::string(zerror(code_)) + " path: " + path_), code(code_) {}
KeeperException(const KeeperException & exc) : DB::Exception(exc), code(exc.code) {}
const char * name() const throw() { return "zkutil::KeeperException"; }
const char * className() const throw() { return "zkutil::KeeperException"; }
KeeperException * clone() const { return new KeeperException(message(), code); }
KeeperException * clone() const { return new KeeperException(*this); }
int32_t code;
};

2
libs/libzkutil/src/ZooKeeper.cpp
View File

@ -351,7 +351,7 @@ int32_t ZooKeeper::multiImpl(const Ops & ops_, OpResultsPtr * out_results_)
size_t count = ops_.size();
OpResultsPtr out_results(new OpResults(count));
/// копируем структуру содержащую указатели дефолтным конструктором копирования
/// копируем структуру, содержащую указатели, дефолтным конструктором копирования
/// это безопасно, т.к. у нее нет деструктора
std::vector<zoo_op_t> ops;
for (const Op & op : ops_)