提交 6b8e6173 编写于 作者: V Vitaliy Zakaznikov

* Fixing crash in LIVE VIEW

* Re-enabling all LIVE VIEW tests
上级 ffe8931c
......@@ -213,12 +213,8 @@ protected:
// move right to the end
it = end;
if (it == end)
{
end_of_blocks = false;
num_updates += 1;
}
end_of_blocks = false;
num_updates += 1;
last_event_timestamp_usec = static_cast<UInt64>(timestamp.epochMicroseconds());
......
......@@ -499,8 +499,7 @@ BlockInputStreams StorageLiveView::read(
const size_t /*max_block_size*/,
const unsigned /*num_streams*/)
{
/// add user to the blocks_ptr
std::shared_ptr<BlocksPtr> stream_blocks_ptr = blocks_ptr;
std::shared_ptr<BlocksBlockInputStream> stream;
{
std::lock_guard lock(mutex);
if (!(*blocks_ptr))
......@@ -508,8 +507,9 @@ BlockInputStreams StorageLiveView::read(
if (getNewBlocks())
condition.notify_all();
}
stream = std::make_shared<BlocksBlockInputStream>(blocks_ptr, getHeader());
}
return { std::make_shared<BlocksBlockInputStream>(stream_blocks_ptr, getHeader()) };
return { stream };
}
BlockInputStreams StorageLiveView::watch(
......
......@@ -15,7 +15,7 @@ class client(object):
def __init__(self, command=None, name='', log=None):
self.client = uexpect.spawn(['/bin/bash','--noediting'])
if command is None:
command = os.environ.get('CLICKHOUSE_BINARY', 'clickhouse') + '-client'
command = os.environ.get('CLICKHOUSE_BINARY', 'clickhouse') + ' client'
self.client.command = command
self.client.eol('\r')
self.client.logger(log, prefix=name)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册