chore: don't increase level in container values

Author: diegomarquezp

google/cloud/bigtable/value.cc

@@ -389,13 +389,13 @@ Status TypeAndMapValuesMatch(google::bigtable::v2::Type const& type,
     auto map_value = val.array_value().values(1);
     // NOLINTNEXTLINE(misc-no-recursion)
     auto key_match_result =
-        Value::TypeAndValuesMatch(key_type, map_key, ++depth);
+        Value::TypeAndValuesMatch(key_type, map_key, depth);
     if (!key_match_result.ok()) {
       return key_match_result;
     }
     // NOLINTNEXTLINE(misc-no-recursion)
     auto value_match_result =
-        Value::TypeAndValuesMatch(value_type, map_value, ++depth);
+        Value::TypeAndValuesMatch(value_type, map_value, depth);
     if (!value_match_result.ok()) {
       return value_match_result;
     }
@@ -425,7 +425,7 @@ Status TypeAndStructValuesMatch(google::bigtable::v2::Type const& type,
   for (int i = 0; i < fields.size(); ++i) {
     auto const& f1 = fields.Get(i);
     auto const& v = values[i];
-    auto match_result = Value::TypeAndValuesMatch(f1.type(), v, ++depth);
+    auto match_result = Value::TypeAndValuesMatch(f1.type(), v, depth);
     if (!match_result.ok()) {
       return match_result;
     }

google/cloud/bigtable/value_test.cc

@@ -2051,30 +2051,19 @@ TEST(Value, TypeAndValuesMatchDepthExceeded) {
   std::string type_text = "int64_type {}";
   std::string value_text = "int_value: 1";
 
-  // Each layer of struct nesting increases the depth count. The initial call is
-  // at depth 1. With the current implementation, each level of nesting
-  // increases the depth by 2. To exceed the limit of 10, we need 5 levels of
-  // nesting, which will result in a call with depth 11.
-  for (int i = 0; i < 5; ++i) {
-    type_text =
-        absl::Substitute("struct_type { fields { type { $0 } } }", type_text);
-    value_text = absl::Substitute("array_value { values { $0 } }", value_text);
-  }
-
-  TestTypeAndValuesMatch(
-      type_text, value_text,
-      internal::InternalError("Nested value depth exceeds 10 levels"));
-
-  // Verify that nesting up to the limit is fine. 4 levels of nesting will
-  // result in a maximum depth of 9.
-  type_text = "int64_type {}";
-  value_text = "int_value: 1";
-  for (int i = 0; i < 4; ++i) {
+  // Test that exactly 10 levels does not cause a depth exceeded error.
+  for (int level = 1; level < 12; ++level) {
+    if (level <= 10) {
+      TestTypeAndValuesMatch(type_text, value_text, Status{});
+    } else {
+      TestTypeAndValuesMatch(
+          type_text, value_text,
+          internal::InternalError("Nested value depth exceeds 10 levels"));
+    }
     type_text =
         absl::Substitute("struct_type { fields { type { $0 } } }", type_text);
     value_text = absl::Substitute("array_value { values { $0 } }", value_text);
   }
-  TestTypeAndValuesMatch(type_text, value_text, Status{});
 }
 
 }  // namespace