Skip to content

Commit 42c3010

Browse files
authored
Change the para of WithAddedFilters function (#10342)
1 parent 77b891a commit 42c3010

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Firestore/core/src/core/composite_filter.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,10 @@ bool CompositeFilter::Rep::Equals(const Filter::Rep& other) const {
114114
}
115115

116116
CompositeFilter CompositeFilter::WithAddedFilters(
117-
std::vector<core::Filter>&& other_filters) {
117+
const std::vector<core::Filter>& other_filters) {
118118
std::vector<Filter> merged_filters(filters());
119-
merged_filters.insert(merged_filters.end(),
120-
std::make_move_iterator(other_filters.begin()),
121-
std::make_move_iterator(other_filters.end()));
119+
merged_filters.insert(merged_filters.end(), other_filters.begin(),
120+
other_filters.end());
122121
return CompositeFilter::Create(std::move(merged_filters), op());
123122
}
124123

Firestore/core/src/core/composite_filter.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ class CompositeFilter : public Filter {
8484
* Returns a new composite filter that contains all filter from `this`
8585
* plus all the given filters.
8686
*/
87-
CompositeFilter WithAddedFilters(std::vector<core::Filter>&& other_filters);
87+
CompositeFilter WithAddedFilters(
88+
const std::vector<core::Filter>& other_filters);
8889

8990
private:
9091
class Rep : public Filter::Rep {

Firestore/core/src/util/logic_utils.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ Filter LogicUtils::ApplyDistribution(CompositeFilter&& lhs,
195195

196196
// Case 1 is a merge.
197197
if (lhs.IsConjunction() && rhs.IsConjunction()) {
198-
return lhs.WithAddedFilters(std::vector<Filter>(rhs.filters()));
198+
return lhs.WithAddedFilters(rhs.filters());
199199
}
200200

201201
// Case 2,3,4 all have at least one side (lhs or rhs) that is a disjunction.

0 commit comments

Comments
 (0)