thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-10-04 23:50:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflict code

Browse Source
This commit is contained in:
hchen9 2020-10-25 18:12:17 -07:00
parent feaab260d8
commit 824c04f873
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Storages/StorageProxy.h
View File

@ -146,8 +146,8 @@ public:
void checkPartitionCanBeDropped(const ASTPtr & partition) override { getNested()->checkPartitionCanBeDropped(partition); } void checkPartitionCanBeDropped(const ASTPtr & partition) override { getNested()->checkPartitionCanBeDropped(partition); }
Strings getDataPaths() const override { return getNested()->getDataPaths(); } Strings getDataPaths() const override { return getNested()->getDataPaths(); }
StoragePolicyPtr getStoragePolicy() const override { return getNested()->getStoragePolicy(); } StoragePolicyPtr getStoragePolicy() const override { return getNested()->getStoragePolicy(); }
std::optional<UInt64> totalRows() const override { return getNested()->totalRows(); } std::optional<UInt64> totalRows(const Context& context) const override { return getNested()->totalRows(context); }
std::optional<UInt64> totalBytes() const override { return getNested()->totalBytes(); } std::optional<UInt64> totalBytes(const Context& context) const override { return getNested()->totalBytes(context); }
std::optional<UInt64> lifetimeRows() const override { return getNested()->lifetimeRows(); } std::optional<UInt64> lifetimeRows() const override { return getNested()->lifetimeRows(); }
std::optional<UInt64> lifetimeBytes() const override { return getNested()->lifetimeBytes(); } std::optional<UInt64> lifetimeBytes() const override { return getNested()->lifetimeBytes(); }

2
src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -3719,7 +3719,7 @@ std::optional<UInt64> StorageReplicatedMergeTree::totalRowsByPartitionPredicate(
} }
if (is_valid) if (is_valid)
res += part->rows_count; res += part->rows_count;
}); }, context);
return res; return res;
} }