Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ORC-581:[C++] Verify fieldNames size for STRUCT types #465

Merged
merged 1 commit into from
Jan 3, 2020
Merged

ORC-581:[C++] Verify fieldNames size for STRUCT types #465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions c++/src/Reader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,17 +1008,24 @@ namespace orc {
}

/**
* Check that indices in the type tree are valid, so we won't crash
* when we convert the proto::Types to TypeImpls.
* Check that proto Types are valid. Indices in the type tree should be valid,
* so we won't crash when we convert the proto::Types to TypeImpls (ORC-317).
* For STRUCT types, fieldName size should match subTypes size (ORC-581).
*/
void checkProtoTypeIds(const proto::Footer &footer) {
void checkProtoTypes(const proto::Footer &footer) {
std::stringstream msg;
int maxId = footer.types_size();
if (maxId <= 0) {
throw ParseError("Footer is corrupt: no types found");
}
for (int i = 0; i < maxId; ++i) {
const proto::Type& type = footer.types(i);
if (type.kind() == proto::Type_Kind_STRUCT
&& type.subtypes_size() != type.fieldnames_size()) {
msg << "Footer is corrupt: STRUCT type " << i << " has " << type.subtypes_size()
<< " subTypes, but has " << type.fieldnames_size() << " fieldNames";
throw ParseError(msg.str());
}
for (int j = 0; j < type.subtypes_size(); ++j) {
int subTypeId = static_cast<int>(type.subtypes(j));
if (subTypeId <= i) {
Expand Down Expand Up @@ -1070,7 +1077,7 @@ namespace orc {
stream->getName());
}

checkProtoTypeIds(*footer);
checkProtoTypes(*footer);
return REDUNDANT_MOVE(footer);
}

Expand Down
29 changes: 27 additions & 2 deletions c++/test/TestType.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ namespace orc {

void expectParseError(const proto::Footer &footer, const char* errMsg) {
try {
checkProtoTypeIds(footer);
checkProtoTypes(footer);
FAIL() << "Should throw ParseError for ill ids";
} catch (ParseError& e) {
EXPECT_EQ(e.what(), std::string(errMsg));
Expand All @@ -352,35 +352,41 @@ namespace orc {
}
}

TEST(TestType, testCheckProtoTypeIds) {
TEST(TestType, testCheckProtoTypes) {
proto::Footer footer;
proto::Type rootType;
expectParseError(footer, "Footer is corrupt: no types found");

rootType.set_kind(proto::Type_Kind_STRUCT);
rootType.add_subtypes(1); // add a non existent type id
rootType.add_fieldnames("f1");
*(footer.add_types()) = rootType;
expectParseError(footer, "Footer is corrupt: types(1) not exists");

footer.clear_types();
rootType.clear_subtypes();
rootType.clear_fieldnames();
proto::Type structType;
structType.set_kind(proto::Type_Kind_STRUCT);
structType.add_subtypes(0); // construct a loop back to root
structType.add_fieldnames("root");
rootType.add_subtypes(1);
rootType.add_fieldnames("f1");
*(footer.add_types()) = rootType;
*(footer.add_types()) = structType;
expectParseError(footer,
"Footer is corrupt: malformed link from type 1 to 0");

footer.clear_types();
rootType.clear_subtypes();
rootType.clear_fieldnames();
proto::Type listType;
listType.set_kind(proto::Type_Kind_LIST);
proto::Type mapType;
mapType.set_kind(proto::Type_Kind_MAP);
proto::Type unionType;
unionType.set_kind(proto::Type_Kind_UNION);
rootType.add_fieldnames("f1");
rootType.add_subtypes(1); // 0 -> 1
listType.add_subtypes(2); // 1 -> 2
mapType.add_subtypes(3); // 2 -> 3
Expand All @@ -394,16 +400,35 @@ namespace orc {

footer.clear_types();
rootType.clear_subtypes();
rootType.clear_fieldnames();
proto::Type intType;
intType.set_kind(proto::Type_Kind_INT);
proto::Type strType;
strType.set_kind(proto::Type_Kind_STRING);
rootType.add_subtypes(2);
rootType.add_fieldnames("f2");
rootType.add_subtypes(1);
rootType.add_fieldnames("f1");
*(footer.add_types()) = rootType;
*(footer.add_types()) = intType;
*(footer.add_types()) = strType;
expectParseError(footer,
"Footer is corrupt: subType(0) >= subType(1) in types(0). (2 >= 1)");

footer.clear_types();
rootType.clear_subtypes();
rootType.clear_fieldnames();
rootType.set_kind(proto::Type_Kind_STRUCT);
rootType.add_subtypes(1);
*(footer.add_types()) = rootType;
*(footer.add_types()) = intType;
expectParseError(footer,
"Footer is corrupt: STRUCT type 0 has 1 subTypes, but has 0 fieldNames");
// Should pass the check after adding the field name
footer.clear_types();
rootType.add_fieldnames("f1");
*(footer.add_types()) = rootType;
*(footer.add_types()) = intType;
checkProtoTypes(footer);
}
}