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

* Updates to fix issues after the merge

Browse Source
This commit is contained in:
Vitaliy Zakaznikov 2019-07-07 19:57:58 -04:00
parent b5120931d5
commit 259a95a3da
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dbms/src/Interpreters/ExternalLoader.cpp
View File

@ -400,6 +400,10 @@ public:
return count;
}
#if !__clang__
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-variable"
#endif
bool hasCurrentlyLoadedObjects() const
{
std::lock_guard lock{mutex};
@ -408,6 +412,9 @@ public:
return true;
return false;
}
#if !__clang__
#pragma GCC diagnostic pop
#endif
/// Starts loading of a specified object.
void load(const String & name)

4
dbms/src/Storages/IStorage.h
View File

@ -84,7 +84,8 @@ public:
public: /// thread-unsafe part. lockStructure must be acquired
virtual const ColumnsDescription & getColumns() const; /// returns combined set of columns
virtual void setColumns(ColumnsDescription columns_); /// sets only real columns, possibly overwrites virtual ones.
const IndicesDescription & getIndices() const;
/// NOTE: these methods should include virtual columns,
@ -113,7 +114,6 @@ public: /// thread-unsafe part. lockStructure must be acquired
void check(const Block & block, bool need_all = false) const;
protected: /// still thread-unsafe part.
virtual void setColumns(ColumnsDescription columns_); /// sets only real columns, possibly overwrites virtual ones.
void setIndices(IndicesDescription indices_);
/// Returns whether the column is virtual - by default all columns are real.