address pr comments

ahmadov · ahmadov · commit eb7d6bed4c3c · 2025-04-15T20:49:29.000+02:00
diff --git a/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexBloomFilter.cpp
@@ -212,7 +212,7 @@ bool MergeTreeIndexConditionBloomFilter::alwaysUnknownOrTrue() const
 {
     return rpnEvaluatesAlwaysUnknownOrTrue(
         rpn,
-        [&](RPNElement::Function function)
+        [](RPNElement::Function function)
         {
             return (
                 function == RPNElement::FUNCTION_EQUALS || function == RPNElement::FUNCTION_NOT_EQUALS
diff --git a/src/Storages/MergeTree/MergeTreeIndexBloomFilterText.cpp b/src/Storages/MergeTree/MergeTreeIndexBloomFilterText.cpp
@@ -178,7 +178,7 @@ bool MergeTreeConditionBloomFilterText::alwaysUnknownOrTrue() const
 {
     return rpnEvaluatesAlwaysUnknownOrTrue(
         rpn,
-        [&](RPNElement::Function function)
+        [](RPNElement::Function function)
         {
             return (
                 function == RPNElement::FUNCTION_EQUALS || function == RPNElement::FUNCTION_NOT_EQUALS
diff --git a/src/Storages/MergeTree/MergeTreeIndexGin.cpp b/src/Storages/MergeTree/MergeTreeIndexGin.cpp
@@ -223,7 +223,7 @@ bool MergeTreeIndexConditionGin::alwaysUnknownOrTrue() const
 {
     return rpnEvaluatesAlwaysUnknownOrTrue(
         rpn,
-        [&](RPNElement::Function function)
+        [](RPNElement::Function function)
         {
             return (
                 function == RPNElement::FUNCTION_EQUALS || function == RPNElement::FUNCTION_NOT_EQUALS
diff --git a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
@@ -179,7 +179,7 @@ bool MergeTreeIndexConditionMinMax::alwaysUnknownOrTrue() const
 {
     return rpnEvaluatesAlwaysUnknownOrTrue(
         condition.getRPN(),
-        [&](KeyCondition::RPNElement::Function function)
+        [](KeyCondition::RPNElement::Function function)
         {
             return (
                 function == KeyCondition::RPNElement::FUNCTION_NOT_IN_RANGE || function == KeyCondition::RPNElement::FUNCTION_IN_RANGE
diff --git a/src/Storages/MergeTree/MergeTreeIndices.h b/src/Storages/MergeTree/MergeTreeIndices.h
@@ -188,8 +188,9 @@ class IMergeTreeIndexCondition
         throw Exception(ErrorCodes::LOGICAL_ERROR, "calculateApproximateNearestNeighbors is not implemented for non-vector-similarity indexes");
     }
 
-    template <typename RPNElement, typename FUNC>
-    bool rpnEvaluatesAlwaysUnknownOrTrue(const std::vector<RPNElement> & rpn, FUNC && isMatchingRPNFunction) const
+    template <typename RPNElement>
+    bool rpnEvaluatesAlwaysUnknownOrTrue(
+        const std::vector<RPNElement> & rpn, std::function<bool(typename RPNElement::Function)> isMatchingRPNFunction) const
     {
         std::vector<Internal::RPNEvaluationIndexUsefulnessState> rpn_stack;
         rpn_stack.reserve(rpn.size() - 1);

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ bool MergeTreeIndexConditionBloomFilter::alwaysUnknownOrTrue() const`
`212`	`212`	`{`
`213`	`213`	`return rpnEvaluatesAlwaysUnknownOrTrue(`
`214`	`214`	`rpn,`
`215`		`- [&](RPNElement::Function function)`
	`215`	`+ [](RPNElement::Function function)`
`216`	`216`	`{`
`217`	`217`	`return (`
`218`	`218`	`function == RPNElement::FUNCTION_EQUALS \|\| function == RPNElement::FUNCTION_NOT_EQUALS`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ bool MergeTreeConditionBloomFilterText::alwaysUnknownOrTrue() const`
`178`	`178`	`{`
`179`	`179`	`return rpnEvaluatesAlwaysUnknownOrTrue(`
`180`	`180`	`rpn,`
`181`		`- [&](RPNElement::Function function)`
	`181`	`+ [](RPNElement::Function function)`
`182`	`182`	`{`
`183`	`183`	`return (`
`184`	`184`	`function == RPNElement::FUNCTION_EQUALS \|\| function == RPNElement::FUNCTION_NOT_EQUALS`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ bool MergeTreeIndexConditionGin::alwaysUnknownOrTrue() const`
`223`	`223`	`{`
`224`	`224`	`return rpnEvaluatesAlwaysUnknownOrTrue(`
`225`	`225`	`rpn,`
`226`		`- [&](RPNElement::Function function)`
	`226`	`+ [](RPNElement::Function function)`
`227`	`227`	`{`
`228`	`228`	`return (`
`229`	`229`	`function == RPNElement::FUNCTION_EQUALS \|\| function == RPNElement::FUNCTION_NOT_EQUALS`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ bool MergeTreeIndexConditionMinMax::alwaysUnknownOrTrue() const`
`179`	`179`	`{`
`180`	`180`	`return rpnEvaluatesAlwaysUnknownOrTrue(`
`181`	`181`	`condition.getRPN(),`
`182`		`- [&](KeyCondition::RPNElement::Function function)`
	`182`	`+ [](KeyCondition::RPNElement::Function function)`
`183`	`183`	`{`
`184`	`184`	`return (`
`185`	`185`	`function == KeyCondition::RPNElement::FUNCTION_NOT_IN_RANGE \|\| function == KeyCondition::RPNElement::FUNCTION_IN_RANGE`
Original file line number	Diff line number	Diff line change
`@@ -188,8 +188,9 @@ class IMergeTreeIndexCondition`
`188`	`188`	`throw Exception(ErrorCodes::LOGICAL_ERROR, "calculateApproximateNearestNeighbors is not implemented for non-vector-similarity indexes");`
`189`	`189`	`}`
`190`	`190`
`191`		`- template <typename RPNElement, typename FUNC>`
`192`		`- bool rpnEvaluatesAlwaysUnknownOrTrue(const std::vector<RPNElement> & rpn, FUNC && isMatchingRPNFunction) const`
	`191`	`+ template <typename RPNElement>`
	`192`	`+ bool rpnEvaluatesAlwaysUnknownOrTrue(`
	`193`	`+ const std::vector<RPNElement> & rpn, std::function<bool(typename RPNElement::Function)> isMatchingRPNFunction) const`
`193`	`194`	`{`
`194`	`195`	`std::vector<Internal::RPNEvaluationIndexUsefulnessState> rpn_stack;`
`195`	`196`	`rpn_stack.reserve(rpn.size() - 1);`