Skip to content

Commit 535157c

Browse files
timofey-stepanovcopybara-github
authored andcommitted
Add missing AssembleErrorMessage
PiperOrigin-RevId: 721827952 Change-Id: Icb2b07f558b661cad0e7bd9a428e3cb988970d35
1 parent 687ee3c commit 535157c

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

koladata/data_slice.cc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1184,14 +1184,18 @@ absl::StatusOr<DataSlice::AttrNamesSet> DataSlice::GetAttrNames(
11841184
// For entities, just process the schema of the DataSlice.
11851185
return GetAttrsFromSchemaItem(GetSchemaImpl(), db_impl, fallbacks);
11861186
}
1187-
return VisitImpl(absl::Overload(
1187+
auto result = VisitImpl(absl::Overload(
11881188
[&](const internal::DataItem& item) {
11891189
return GetAttrsFromDataItem(item, GetSchemaImpl(), db_impl, fallbacks);
11901190
},
11911191
[&](const internal::DataSliceImpl& slice) {
11921192
return GetAttrsFromDataSlice(slice, GetSchemaImpl(), db_impl, fallbacks,
11931193
union_object_attrs);
11941194
}));
1195+
if (!result.ok()) {
1196+
return AssembleErrorMessage(result.status(), {.ds = *this});
1197+
}
1198+
return result;
11951199
}
11961200

11971201
absl::StatusOr<DataSlice> DataSlice::GetAttr(

py/koladata/types/data_slice_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -997,7 +997,7 @@ def test_get_attr_names_object(self):
997997
):
998998
x.no_bag().get_attr_names(intersection=True)
999999
with self.assertRaisesRegex(
1000-
ValueError, 'object.*is missing __schema__ attribute'
1000+
ValueError, 'object schema is missing for the DataItem'
10011001
):
10021002
db.new(a=1, b='abc').with_schema(schema_constants.OBJECT).get_attr_names(
10031003
intersection=True

0 commit comments

Comments
 (0)