Skip to content

Commit 59224c8

Browse files
committed
chore: keep has_matching_value in flow
1 parent 370eabd commit 59224c8

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

google/cloud/bigtable/value.cc

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -405,11 +405,14 @@ bool Value::TypeAndValuesMatch(google::bigtable::v2::Type const& type,
405405
bool has_matching_value;
406406
switch (type.kind_case()) {
407407
case Type::kArrayType:
408-
return TypeAndArrayValuesMatch(type, value);
408+
has_matching_value = TypeAndArrayValuesMatch(type, value);
409+
break;
409410
case Type::kMapType:
410-
return TypeAndMapValuesMatch(type, value);
411+
has_matching_value = TypeAndMapValuesMatch(type, value);
412+
break;
411413
case Type::kStructType:
412-
return TypeAndStructValuesMatch(type, value);
414+
has_matching_value = TypeAndStructValuesMatch(type, value);
415+
break;
413416
case Type::kBoolType:
414417
has_matching_value = value.has_bool_value();
415418
break;
@@ -440,7 +443,7 @@ bool Value::TypeAndValuesMatch(google::bigtable::v2::Type const& type,
440443
break;
441444
}
442445
// Nulls are allowed;
443-
return has_matching_value || bigtable::Value::IsNullValue(value);
446+
return has_matching_value || IsNullValue(value);
444447
}
445448

446449
//

0 commit comments

Comments
 (0)