Make check for algorithm in Merge() backwards compatible

dibakch · copybara-github · commit 082fbaf43b1e · 2025-10-09T09:44:05.000-07:00
PiperOrigin-RevId: 817225028
diff --git a/cc/algorithms/quantile-tree.h b/cc/algorithms/quantile-tree.h
@@ -110,7 +110,8 @@ class QuantileTree {
   }
 
   absl::Status Merge(const BoundedQuantilesSummary& summary) {
-    if (summary.algorithm() != BoundedQuantilesSummary::TREE) {
+    if (summary.has_algorithm() &&
+        summary.algorithm() != BoundedQuantilesSummary::TREE) {
       return absl::InternalError("Algorithm type mismatch. Expected TREE");
     }
     if (static_cast<double>(lower_) != summary.lower() ||

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,8 @@ class QuantileTree {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`absl::Status Merge(const BoundedQuantilesSummary& summary) {`
`113`		`- if (summary.algorithm() != BoundedQuantilesSummary::TREE) {`
	`113`	`+ if (summary.has_algorithm() &&`
	`114`	`+ summary.algorithm() != BoundedQuantilesSummary::TREE) {`
`114`	`115`	`return absl::InternalError("Algorithm type mismatch. Expected TREE");`
`115`	`116`	`}`
`116`	`117`	`if (static_cast<double>(lower_) != summary.lower() \|\|`