feat: improve error message on malformed struct (googleapis#2592)

jackdingilian · web-flow · commit b09c7cfbdbfb · 2025-06-03T15:27:26.000-04:00
Change-Id: I16db93c2f2bb0168487c2396b746fbb25caf6a72
diff --git a/java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/sql/ProtoRowsMergingStateMachine.java b/java-bigtable/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/sql/ProtoRowsMergingStateMachine.java
@@ -230,6 +230,12 @@ static void validateValueAndType(SqlType<?> type, Value value) {
         checkExpectedKind(value, Value.KindCase.ARRAY_VALUE, type);
         List<Value> fieldValues = value.getArrayValue().getValuesList();
         SqlType.Struct structType = (SqlType.Struct) type;
+        if (fieldValues.size() != structType.getFields().size()) {
+          throw new IllegalStateException(
+              String.format(
+                  "Unexpected malformed struct data. Expected %s fields, received: %s",
+                  structType.getFields().size(), fieldValues.size()));
+        }
         for (int i = 0; i < fieldValues.size(); i++) {
           validateValueAndType(structType.getType(i), fieldValues.get(i));
         }
