mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-10-04 23:50:50 +00:00
Fix conflict code
This commit is contained in:
parent
feaab260d8
commit
824c04f873
@ -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(); }
|
||||||
|
|
||||||
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user