-
Notifications
You must be signed in to change notification settings - Fork 63
feat(parquet): add HasFieldIds check #158
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.
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
Merged
+89
−8
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| #include <gtest/gtest.h> | ||
| #include <parquet/schema.h> | ||
| #include <parquet/types.h> | ||
|
|
||
| #include "iceberg/parquet/parquet_schema_util_internal.h" | ||
|
|
||
| namespace iceberg::parquet { | ||
|
|
||
| namespace { | ||
|
|
||
| ::parquet::schema::NodePtr MakeInt32Node(const std::string& name, int field_id = -1) { | ||
| return ::parquet::schema::PrimitiveNode::Make( | ||
| name, ::parquet::Repetition::REQUIRED, ::parquet::LogicalType::None(), | ||
| ::parquet::Type::INT32, /*primitive_length=*/-1, field_id); | ||
| } | ||
|
|
||
| ::parquet::schema::NodePtr MakeGroupNode(const std::string& name, | ||
| const ::parquet::schema::NodeVector& fields, | ||
| int field_id = -1) { | ||
| return ::parquet::schema::GroupNode::Make(name, ::parquet::Repetition::REQUIRED, fields, | ||
| /*logical_type=*/nullptr, field_id); | ||
| } | ||
|
|
||
| } // namespace | ||
|
|
||
| TEST(HasFieldIds, PrimitiveNode) { | ||
| EXPECT_FALSE(HasFieldIds(MakeInt32Node("test_field"))); | ||
| EXPECT_TRUE(HasFieldIds(MakeInt32Node("test_field", /*field_id=*/1))); | ||
| } | ||
|
|
||
| TEST(HasFieldIds, GroupNode) { | ||
| auto group_node_without_field_id = | ||
| MakeGroupNode("test_group", {MakeInt32Node("c1"), MakeInt32Node("c2")}); | ||
| EXPECT_FALSE(HasFieldIds(group_node_without_field_id)); | ||
|
|
||
| auto group_node_with_full_field_id = MakeGroupNode( | ||
| "test_group", | ||
| {MakeInt32Node("c1", /*field_id=*/2), MakeInt32Node("c2", /*field_id=*/3)}, | ||
| /*field_id=*/1); | ||
| EXPECT_TRUE(HasFieldIds(group_node_with_full_field_id)); | ||
|
|
||
| auto group_node_with_partial_field_id = MakeGroupNode( | ||
| "test_group", {MakeInt32Node("c1", /*field_id=*/1), MakeInt32Node("c2")}); | ||
| EXPECT_TRUE(HasFieldIds(group_node_with_partial_field_id)); | ||
| } | ||
|
|
||
| } // namespace iceberg::parquet |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What does this means? Any leaf has field-id?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just simply check if any field (whether leaf or non-leaf) has field-id. This is in sync with the Java impl.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we cannot blindly check if all fields have ids because it is valid to have some fields that do not have ids, especially when variant type is supported.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I knew that for 3-levels complex type, fieldId might not exists, but here I don't fully understand the purpose, so any leaf has field-id means writer is field-id aware?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think Iceberg only supports three-level list encoding per the spec: https://iceberg.apache.org/spec/#parquet