mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-30 05:30:51 +00:00
* Updates to fix issues after the merge
This commit is contained in:
parent
b5120931d5
commit
259a95a3da
@ -400,6 +400,10 @@ public:
|
|||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if !__clang__
|
||||||
|
#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wunused-variable"
|
||||||
|
#endif
|
||||||
bool hasCurrentlyLoadedObjects() const
|
bool hasCurrentlyLoadedObjects() const
|
||||||
{
|
{
|
||||||
std::lock_guard lock{mutex};
|
std::lock_guard lock{mutex};
|
||||||
@ -408,6 +412,9 @@ public:
|
|||||||
return true;
|
return true;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
#if !__clang__
|
||||||
|
#pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
|
|
||||||
/// Starts loading of a specified object.
|
/// Starts loading of a specified object.
|
||||||
void load(const String & name)
|
void load(const String & name)
|
||||||
|
@ -84,6 +84,7 @@ public:
|
|||||||
|
|
||||||
public: /// thread-unsafe part. lockStructure must be acquired
|
public: /// thread-unsafe part. lockStructure must be acquired
|
||||||
virtual const ColumnsDescription & getColumns() const; /// returns combined set of columns
|
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;
|
const IndicesDescription & getIndices() const;
|
||||||
|
|
||||||
@ -113,7 +114,6 @@ public: /// thread-unsafe part. lockStructure must be acquired
|
|||||||
void check(const Block & block, bool need_all = false) const;
|
void check(const Block & block, bool need_all = false) const;
|
||||||
|
|
||||||
protected: /// still thread-unsafe part.
|
protected: /// still thread-unsafe part.
|
||||||
virtual void setColumns(ColumnsDescription columns_); /// sets only real columns, possibly overwrites virtual ones.
|
|
||||||
void setIndices(IndicesDescription indices_);
|
void setIndices(IndicesDescription indices_);
|
||||||
|
|
||||||
/// Returns whether the column is virtual - by default all columns are real.
|
/// Returns whether the column is virtual - by default all columns are real.
|
||||||
|
Loading…
Reference in New Issue
Block a user