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

Add diagnostic messages

Browse Source
This commit is contained in:
Tagir Kuskarov 2020-06-05 02:10:22 +04:00
parent 83ba86c5f6
commit d916d0849d
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
base/common/ReplxxLineReader.cpp
View File

@ -26,8 +26,25 @@ ReplxxLineReader::ReplxxLineReader(
if (!history_file_path.empty())
{
rx.history_load(history_file_path);
errno = 0;
history_file_fd = open(history_file_path.c_str(), O_RDWR);
if (history_file_fd < 0)
{
rx.print("Open of history file failed: %s\n", strerror(errno));
}
errno = 0;
if (flock(history_file_fd, LOCK_SH))
{
rx.print("Shared lock of history file failed: %s\n", strerror(errno));
}
rx.history_load(history_file_path);
errno = 0;
if (flock(history_file_fd, LOCK_UN))
{
rx.print("Unlock of history file failed: %s\n", strerror(errno));
}
}
auto callback = [&suggest] (const String & context, size_t context_size)
@ -53,8 +70,6 @@ ReplxxLineReader::ReplxxLineReader(
ReplxxLineReader::~ReplxxLineReader()
{
if (!history_file_path.empty())
rx.history_save(history_file_path);
}
LineReader::InputStatus ReplxxLineReader::readOneLine(const String & prompt)
@ -73,14 +88,22 @@ LineReader::InputStatus ReplxxLineReader::readOneLine(const String & prompt)
void ReplxxLineReader::addToHistory(const String & line)
{
// locking history file to prevent from inconsistent concurrent changes
flock(history_file_fd, LOCK_EX);
errno = 0;
if (flock(history_file_fd, LOCK_EX))
{
rx.print("Lock of history file failed: %s\n", strerror(errno));
}
rx.history_add(line);
// flush changes to the disk
rx.history_save(history_file_path);
flock(history_file_fd, LOCK_UN);
errno = 0;
if (flock(history_file_fd, LOCK_UN))
{
rx.print("Unlock of history file failed: %s\n", strerror(errno));
}
}
void ReplxxLineReader::enableBracketedPaste()