-
Notifications
You must be signed in to change notification settings - Fork 79
feat: add support to read metadata columns #478
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * 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 <arrow/array.h> | ||
| #include <arrow/array/builder_binary.h> | ||
| #include <arrow/array/builder_primitive.h> | ||
| #include <arrow/memory_pool.h> | ||
|
|
||
| #include "iceberg/arrow/arrow_status_internal.h" | ||
| #include "iceberg/arrow/metadata_column_util_internal.h" | ||
|
|
||
| namespace iceberg::arrow { | ||
|
|
||
| Result<std::shared_ptr<::arrow::Array>> MakeFilePathArray(const std::string& file_path, | ||
| int64_t num_rows, | ||
| ::arrow::MemoryPool* pool) { | ||
| ::arrow::StringBuilder builder(pool); | ||
| ICEBERG_ARROW_RETURN_NOT_OK(builder.Reserve(num_rows)); | ||
| for (int64_t i = 0; i < num_rows; ++i) { | ||
| ICEBERG_ARROW_RETURN_NOT_OK(builder.Append(file_path)); | ||
| } | ||
| std::shared_ptr<::arrow::Array> array; | ||
| ICEBERG_ARROW_RETURN_NOT_OK(builder.Finish(&array)); | ||
| return array; | ||
| } | ||
|
|
||
| Result<std::shared_ptr<::arrow::Array>> MakeRowPositionArray(int64_t start_position, | ||
| int64_t num_rows, | ||
| ::arrow::MemoryPool* pool) { | ||
| ::arrow::Int64Builder builder(pool); | ||
| ICEBERG_ARROW_RETURN_NOT_OK(builder.Reserve(num_rows)); | ||
| for (int64_t i = 0; i < num_rows; ++i) { | ||
| ICEBERG_ARROW_RETURN_NOT_OK(builder.Append(start_position + i)); | ||
| } | ||
| std::shared_ptr<::arrow::Array> array; | ||
| ICEBERG_ARROW_RETURN_NOT_OK(builder.Finish(&array)); | ||
| return array; | ||
| } | ||
|
|
||
| } // namespace iceberg::arrow |
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,65 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| /// \file iceberg/arrow/metadata_column_util_internal.h | ||
| /// Utility functions for populating metadata columns (_file and _pos) in readers. | ||
|
|
||
| #include <cstdint> | ||
| #include <memory> | ||
| #include <string> | ||
|
|
||
| #include <arrow/type_fwd.h> | ||
|
|
||
| #include "iceberg/result.h" | ||
|
|
||
| namespace iceberg::arrow { | ||
|
|
||
| /// \brief Context for populating metadata columns during reading. | ||
| struct MetadataColumnContext { | ||
| std::string file_path; // The file path to populate _file column. | ||
| int64_t next_file_pos = 0; // The next row position for populating _pos column. | ||
| }; | ||
|
|
||
| /// \brief Create a constant string array for _file column. | ||
| /// | ||
| /// Creates an Arrow StringArray where all values are the same file path string. | ||
| /// | ||
| /// \param file_path The file path value. | ||
| /// \param num_rows Number of rows in the batch. | ||
| /// \param pool Arrow memory pool. | ||
| /// \return Arrow StringArray with constant file_path value. | ||
| Result<std::shared_ptr<::arrow::Array>> MakeFilePathArray(const std::string& file_path, | ||
| int64_t num_rows, | ||
| ::arrow::MemoryPool* pool); | ||
|
|
||
| /// \brief Create a sequential int64 array for _pos column. | ||
| /// | ||
| /// Creates an Arrow Int64Array with sequential values starting from start_position. | ||
| /// | ||
| /// \param start_position Starting row position (inclusive). | ||
| /// \param num_rows Number of rows in the batch. | ||
| /// \param pool Arrow memory pool. | ||
| /// \return Arrow Int64Array with values [start_position, start_position + num_rows). | ||
| Result<std::shared_ptr<::arrow::Array>> MakeRowPositionArray(int64_t start_position, | ||
| int64_t num_rows, | ||
| ::arrow::MemoryPool* pool); | ||
|
|
||
| } // namespace iceberg::arrow | ||
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
Oops, something went wrong.
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.
Does it make sense to move this structure to metadata_columns.h?
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've thought about this but finally decided not to do this. The reason is that there are more metadata columns in that file and we just need only two of them.
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.
Make sense, thanks for the explanation.