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

Fix parsing of list and map schemas from metadata JSON file #87

Merged
merged 1 commit into from
Dec 13, 2024
Merged

Fix parsing of list and map schemas from metadata JSON file #87

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
17 changes: 10 additions & 7 deletions src/common/schema.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace duckdb {
// https://iceberg.apache.org/spec/#schemas

// forward declaration
static LogicalType ParseType(yyjson_val *type);
static LogicalType ParseTypeValue(yyjson_val *type);

static LogicalType ParseStruct(yyjson_val *struct_type) {
D_ASSERT(yyjson_get_type(struct_type) == YYJSON_TYPE_OBJ);
Expand All @@ -21,7 +21,7 @@ static LogicalType ParseStruct(yyjson_val *struct_type) {
// NOTE: 'id', 'required', 'doc', 'initial_default', 'write_default' are ignored for now
auto name = IcebergUtils::TryGetStrFromObject(field, "name");
auto type_item = yyjson_obj_get(field, "type");
auto type = ParseType(type_item);
auto type = ParseTypeValue(type_item);
children.push_back(std::make_pair(name, type));
}
return LogicalType::STRUCT(std::move(children));
Expand All @@ -33,7 +33,7 @@ static LogicalType ParseList(yyjson_val *list_type) {

// NOTE: 'element-id', 'element-required' are ignored for now
auto element = yyjson_obj_get(list_type, "element");
auto child_type = ParseType(element);
auto child_type = ParseTypeValue(element);
return LogicalType::LIST(child_type);
}

Expand All @@ -45,8 +45,8 @@ static LogicalType ParseMap(yyjson_val *map_type) {
auto key = yyjson_obj_get(map_type, "key");
auto value = yyjson_obj_get(map_type, "value");

auto key_type = ParseType(key);
auto value_type = ParseType(value);
auto key_type = ParseTypeValue(key);
auto value_type = ParseTypeValue(value);
return LogicalType::MAP(key_type, value_type);
}

Expand All @@ -67,18 +67,21 @@ static LogicalType ParseComplexType(yyjson_val *type) {
}

static LogicalType ParseType(yyjson_val *type) {
auto type_str = IcebergUtils::TryGetStrFromObject(type, "type");

auto val = yyjson_obj_get(type, "type");
if (!val) {
throw IOException("Invalid field found while parsing field: type");
}
return ParseTypeValue(val);
}

static LogicalType ParseTypeValue(yyjson_val *val) {
if (yyjson_get_type(val) == YYJSON_TYPE_OBJ) {
return ParseComplexType(val);
}
if (yyjson_get_type(val) != YYJSON_TYPE_STR) {
throw IOException("Invalid field found while parsing field: type");
}
string type_str = yyjson_get_str(val);

if (type_str == "boolean") {
return LogicalType::BOOLEAN;
Expand Down
Loading