thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-29 05:00:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Trying again to fix style checks. Now running ./utils/check-style/check-style reports no errors.

Browse Source
This commit is contained in:
Vitaliy Zakaznikov 2019-06-11 06:30:57 -04:00
parent a467e7c105
commit b6efd8599f
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dbms/src/DataStreams/LiveViewEventsBlockInputStream.h
View File

@ -64,13 +64,10 @@ public:
condition.broadcast();
}
Block getHeader() const override
Block getHeader() const override
{
return
{
ColumnWithTypeAndName(ColumnUInt64::create(), std::make_shared<DataTypeUInt64>(), "version"),
ColumnWithTypeAndName(ColumnString::create(), std::make_shared<DataTypeString>(), "hash")
};
Block header(ColumnWithTypeAndName(ColumnUInt64::create(), std::make_shared<DataTypeUInt64>(), "version"), ColumnWithTypeAndName(ColumnString::create(), std::make_shared<DataTypeString>(), "hash"));
return header;
}
void refresh()
@ -88,7 +85,7 @@ public:
{
active = active_ptr.lock();
{
if (!blocks || (blocks.get() != (*blocks_ptr).get()))
if (!blocks || blocks.get() != (*blocks_ptr).get())
{
blocks = (*blocks_ptr);
blocks_metadata = (*blocks_metadata_ptr);

2
dbms/src/Storages/StorageLiveView.h
View File

@ -29,7 +29,7 @@ namespace DB
class IAST;
struct BlocksMetadata
struct BlocksMetadata
{
String hash;
UInt64 version;