dongxiao1198 commented on code in PR #216: URL: https://github.com/apache/iceberg-cpp/pull/216#discussion_r2343304834
########## src/iceberg/manifest_adapter.cc: ########## @@ -0,0 +1,720 @@ +/* + * 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 "iceberg/manifest_adapter.h" + +#include "iceberg/manifest_entry.h" +#include "iceberg/manifest_list.h" +#include "iceberg/schema.h" +#include "iceberg/schema_internal.h" +#include "iceberg/util/macros.h" +#include "nanoarrow/nanoarrow.h" + +namespace { +static constexpr int64_t kBlockSizeInBytes = 64 * 1024 * 1024L; +} + +namespace iceberg { + +Status ManifestAdapter::StartAppending() { + if (size_ > 0) { + return InvalidArgument("Adapter buffer not empty, cannot start appending."); + } + array_ = {}; + size_ = 0; + ArrowError error; + auto status = ArrowArrayInitFromSchema(&array_, &schema_, &error); + NANOARROW_RETURN_IF_NOT_OK(status, error); + status = ArrowArrayStartAppending(&array_); + NANOARROW_RETURN_IF_NOT_OK(status, error); + return {}; +} + +Result<ArrowArray> ManifestAdapter::FinishAppending() { + ArrowError error; + auto status = ArrowArrayFinishBuildingDefault(&array_, &error); + NANOARROW_RETURN_IF_NOT_OK(status, error); + return array_; +} + +Status ManifestAdapter::AppendField(ArrowArray* arrowArray, int64_t value) { + auto status = ArrowArrayAppendInt(arrowArray, value); + NANOARROW_RETURN_IF_FAILED(status); + return {}; +} + +Status ManifestAdapter::AppendField(ArrowArray* arrowArray, uint64_t value) { + auto status = ArrowArrayAppendUInt(arrowArray, value); + NANOARROW_RETURN_IF_FAILED(status); + return {}; +} + +Status ManifestAdapter::AppendField(ArrowArray* arrowArray, double value) { + auto status = ArrowArrayAppendDouble(arrowArray, value); + NANOARROW_RETURN_IF_FAILED(status); + return {}; +} + +Status ManifestAdapter::AppendField(ArrowArray* arrowArray, std::string_view value) { + ArrowStringView view(value.data(), value.size()); + auto status = ArrowArrayAppendString(arrowArray, view); + NANOARROW_RETURN_IF_FAILED(status); + return {}; +} + +Status ManifestAdapter::AppendField(ArrowArray* arrowArray, + const std::vector<uint8_t>& value) { + ArrowBufferViewData data; + data.as_char = reinterpret_cast<const char*>(value.data()); + ArrowBufferView view(data, value.size()); + auto status = ArrowArrayAppendBytes(arrowArray, view); + NANOARROW_RETURN_IF_FAILED(status); + return {}; +} + +Status ManifestAdapter::AppendField(ArrowArray* arrowArray, + const std::array<uint8_t, 16>& value) { + ArrowBufferViewData data; + data.as_char = reinterpret_cast<const char*>(value.data()); + ArrowBufferView view(data, value.size()); + auto status = ArrowArrayAppendBytes(arrowArray, view); + NANOARROW_RETURN_IF_FAILED(status); + return {}; +} + +ManifestEntryAdapter::~ManifestEntryAdapter() { + if (is_initialized_) { + // arrow::ImportedArrayData::Release() bridge.cc:1478 will release the + // internal array, so we have no need to release it here. + // ArrowArrayRelease(&array_); + ArrowSchemaRelease(&schema_); + } +} + +std::shared_ptr<StructType> ManifestEntryAdapter::GetManifestEntryStructType() { + return ManifestEntry::TypeFromPartitionType(std::move(partition_schema_)); +} + +Status ManifestEntryAdapter::AppendPartitions( + ArrowArray* arrow_array, const std::shared_ptr<StructType>& partition_type, + const std::vector<Literal>& partitions) { + if (arrow_array->n_children != partition_type->fields().size()) { + return InvalidManifest("Partition arrow not match partition type."); + } + auto fields = partition_type->fields(); + + for (const auto& partition : partitions) { + for (int32_t i = 0; i < fields.size(); i++) { + const auto& field = fields[i]; + auto array = arrow_array->children[i]; + if (partition.IsNull()) { + auto status = ArrowArrayAppendNull(array, 1); + NANOARROW_RETURN_IF_FAILED(status); + continue; + } + switch (field.type()->type_id()) { + case TypeId::kBoolean: + ICEBERG_RETURN_UNEXPECTED(AppendField( + array, static_cast<uint64_t>( + std::get<bool>(partition.value()) == true ? 1L : 0L))); + break; + case TypeId::kInt: + ICEBERG_RETURN_UNEXPECTED(AppendField( + array, static_cast<int64_t>(std::get<int32_t>(partition.value())))); + break; + case TypeId::kLong: + ICEBERG_RETURN_UNEXPECTED( + AppendField(array, std::get<int64_t>(partition.value()))); + break; + case TypeId::kFloat: + ICEBERG_RETURN_UNEXPECTED(AppendField( + array, static_cast<double>(std::get<float>(partition.value())))); + break; + case TypeId::kDouble: + ICEBERG_RETURN_UNEXPECTED( + AppendField(array, std::get<double>(partition.value()))); + break; + case TypeId::kString: + ICEBERG_RETURN_UNEXPECTED( + AppendField(array, std::get<std::string>(partition.value()))); + break; + case TypeId::kFixed: + case TypeId::kBinary: + ICEBERG_RETURN_UNEXPECTED( + AppendField(array, std::get<std::vector<uint8_t>>(partition.value()))); + break; + case TypeId::kDate: + ICEBERG_RETURN_UNEXPECTED(AppendField( + array, static_cast<int64_t>(std::get<int32_t>(partition.value())))); + break; + case TypeId::kTime: + case TypeId::kTimestamp: + case TypeId::kTimestampTz: + ICEBERG_RETURN_UNEXPECTED( + AppendField(array, std::get<int64_t>(partition.value()))); + break; + case TypeId::kDecimal: + ICEBERG_RETURN_UNEXPECTED( + AppendField(array, std::get<std::array<uint8_t, 16>>(partition.value()))); + break; + case TypeId::kUuid: + case TypeId::kStruct: + case TypeId::kList: + case TypeId::kMap: + // TODO(xiao.dong) currently literal does not support those types + default: + return InvalidManifest("Unsupported partition type: {}", field.ToString()); + } + } + } + auto status = ArrowArrayFinishElement(arrow_array); + NANOARROW_RETURN_IF_FAILED(status); + return {}; +} + +Status ManifestEntryAdapter::AppendList(ArrowArray* arrow_array, + const std::vector<int32_t>& list_value) { + auto list_array = arrow_array->children[0]; + for (const auto& value : list_value) { + auto status = ArrowArrayAppendInt(list_array, static_cast<int64_t>(value)); + NANOARROW_RETURN_IF_FAILED(status); + } + auto status = ArrowArrayFinishElement(arrow_array); + NANOARROW_RETURN_IF_FAILED(status); + return {}; +} + +Status ManifestEntryAdapter::AppendList(ArrowArray* arrow_array, + const std::vector<int64_t>& list_value) { + auto list_array = arrow_array->children[0]; + for (const auto& value : list_value) { + auto status = ArrowArrayAppendInt(list_array, value); + NANOARROW_RETURN_IF_FAILED(status); + } + auto status = ArrowArrayFinishElement(arrow_array); + NANOARROW_RETURN_IF_FAILED(status); + return {}; +} + +Status ManifestEntryAdapter::AppendMap(ArrowArray* arrow_array, + const std::map<int32_t, int64_t>& map_value) { + auto map_array = arrow_array->children[0]; + if (map_array->n_children != 2) { + return InvalidManifest("Invalid map array."); + } + for (const auto& [key, value] : map_value) { + auto key_array = map_array->children[0]; + auto value_array = map_array->children[1]; + ICEBERG_RETURN_UNEXPECTED(AppendField(key_array, static_cast<int64_t>(key))); + ICEBERG_RETURN_UNEXPECTED(AppendField(value_array, value)); + } + auto status = ArrowArrayFinishElement(arrow_array); + NANOARROW_RETURN_IF_FAILED(status); + return {}; +} + +Status ManifestEntryAdapter::AppendMap( + ArrowArray* arrow_array, const std::map<int32_t, std::vector<uint8_t>>& map_value) { + auto map_array = arrow_array->children[0]; + if (map_array->n_children != 2) { + return InvalidManifest("Invalid map array."); + } + for (const auto& [key, value] : map_value) { + auto key_array = map_array->children[0]; + auto value_array = map_array->children[1]; + ICEBERG_RETURN_UNEXPECTED(AppendField(key_array, static_cast<int64_t>(key))); + ICEBERG_RETURN_UNEXPECTED(AppendField(value_array, value)); + } + auto status = ArrowArrayFinishElement(arrow_array); + NANOARROW_RETURN_IF_FAILED(status); + return {}; +} + +Status ManifestEntryAdapter::AppendDataFile( + ArrowArray* arrow_array, const std::shared_ptr<StructType>& data_file_type, + const std::shared_ptr<DataFile>& file) { + auto fields = data_file_type->fields(); + for (int32_t i = 0; i < fields.size(); i++) { + const auto& field = fields[i]; + auto array = arrow_array->children[i]; + + switch (field.field_id()) { + case 134: // content (optional int32) + ICEBERG_RETURN_UNEXPECTED( + AppendField(array, static_cast<int64_t>(file->content))); + break; + case 100: // file_path (required string) + ICEBERG_RETURN_UNEXPECTED(AppendField(array, file->file_path)); + break; + case 101: // file_format (required string) + ICEBERG_RETURN_UNEXPECTED(AppendField(array, ToString(file->file_format))); + break; + case 102: // partition (required struct) + { + auto partition_type = std::dynamic_pointer_cast<StructType>(field.type()); + ICEBERG_RETURN_UNEXPECTED( + AppendPartitions(array, partition_type, file->partition)); + } break; + case 103: // record_count (required int64) + ICEBERG_RETURN_UNEXPECTED(AppendField(array, file->record_count)); + break; + case 104: // file_size_in_bytes (required int64) + ICEBERG_RETURN_UNEXPECTED(AppendField(array, file->file_size_in_bytes)); + break; + case 105: // block_size_in_bytes (compatible in v1) + // always 64MB for v1 + ICEBERG_RETURN_UNEXPECTED(AppendField(array, kBlockSizeInBytes)); + break; + case 108: // column_sizes (optional map) + ICEBERG_RETURN_UNEXPECTED(AppendMap(array, file->column_sizes)); + break; + case 109: // value_counts (optional map) + ICEBERG_RETURN_UNEXPECTED(AppendMap(array, file->value_counts)); + break; + case 110: // null_value_counts (optional map) + ICEBERG_RETURN_UNEXPECTED(AppendMap(array, file->null_value_counts)); + break; + case 137: // nan_value_counts (optional map) + ICEBERG_RETURN_UNEXPECTED(AppendMap(array, file->nan_value_counts)); + break; + case 125: // lower_bounds (optional map) + ICEBERG_RETURN_UNEXPECTED(AppendMap(array, file->lower_bounds)); + break; + case 128: // upper_bounds (optional map) + ICEBERG_RETURN_UNEXPECTED(AppendMap(array, file->upper_bounds)); + break; + case 131: // key_metadata (optional binary) + if (!file->key_metadata.empty()) { + ICEBERG_RETURN_UNEXPECTED(AppendField(array, file->key_metadata)); + } else { + auto status = ArrowArrayAppendNull(array, 1); + NANOARROW_RETURN_IF_FAILED(status); + } + break; + case 132: // split_offsets (optional list) + ICEBERG_RETURN_UNEXPECTED(AppendList(array, file->split_offsets)); + break; + case 135: // equality_ids (optional list) + ICEBERG_RETURN_UNEXPECTED(AppendList(array, file->equality_ids)); + break; + case 140: // sort_order_id (optional int32) + if (file->sort_order_id.has_value()) { + ICEBERG_RETURN_UNEXPECTED( + AppendField(array, static_cast<int64_t>(file->sort_order_id.value()))); + } else { + auto status = ArrowArrayAppendNull(array, 1); + NANOARROW_RETURN_IF_FAILED(status); + } + break; + case 142: // first_row_id (optional int64) + if (file->first_row_id.has_value()) { + ICEBERG_RETURN_UNEXPECTED(AppendField(array, file->first_row_id.value())); + } else { + auto status = ArrowArrayAppendNull(array, 1); + NANOARROW_RETURN_IF_FAILED(status); + } + break; + case 143: // referenced_data_file (optional string) + { + ICEBERG_ASSIGN_OR_RAISE(auto referenced_data_file, + GetWrappedReferenceDataFile(file)); + if (referenced_data_file.has_value()) { + ICEBERG_RETURN_UNEXPECTED(AppendField(array, referenced_data_file.value())); + } else { + auto status = ArrowArrayAppendNull(array, 1); + NANOARROW_RETURN_IF_FAILED(status); + } + break; + } + case 144: // content_offset (optional int64) + if (file->content_offset.has_value()) { + ICEBERG_RETURN_UNEXPECTED(AppendField(array, file->content_offset.value())); + } else { + auto status = ArrowArrayAppendNull(array, 1); + NANOARROW_RETURN_IF_FAILED(status); + } + break; + case 145: // content_size_in_bytes (optional int64) + if (file->content_size_in_bytes.has_value()) { + ICEBERG_RETURN_UNEXPECTED( + AppendField(array, file->content_size_in_bytes.value())); + } else { + auto status = ArrowArrayAppendNull(array, 1); + NANOARROW_RETURN_IF_FAILED(status); + } + break; + default: + return InvalidManifest("Unknown data file field id: {} ", field.field_id()); + } + } + auto status = ArrowArrayFinishElement(arrow_array); + NANOARROW_RETURN_IF_FAILED(status); + return {}; +} + +Result<std::optional<int64_t>> ManifestEntryAdapter::GetWrappedSequenceNumber( + const iceberg::ManifestEntry& entry) { + return entry.sequence_number; +} + +Result<std::optional<std::string>> ManifestEntryAdapter::GetWrappedReferenceDataFile( + const std::shared_ptr<DataFile>& file) { + return file->referenced_data_file; +} + +Result<std::optional<int64_t>> ManifestEntryAdapter::GetWrappedFirstRowId( + const std::shared_ptr<DataFile>& file) { + return file->first_row_id; +} + +Result<std::optional<int64_t>> ManifestEntryAdapter::GetWrappedContentOffset( + const std::shared_ptr<DataFile>& file) { + return file->content_offset; +} + +Result<std::optional<int64_t>> ManifestEntryAdapter::GetWrappedContentSizeInBytes( + const std::shared_ptr<DataFile>& file) { + return file->content_size_in_bytes; +} + +Status ManifestEntryAdapter::AppendInternal(const iceberg::ManifestEntry& entry) { + const auto& fields = manifest_schema_->fields(); + for (int32_t i = 0; i < fields.size(); i++) { + const auto& field = fields[i]; + auto array = array_.children[i]; + + switch (field.field_id()) { + case 0: // status (required int32) + ICEBERG_RETURN_UNEXPECTED( + AppendField(array, static_cast<int64_t>(static_cast<int32_t>(entry.status)))); + break; + case 1: // snapshot_id (optional int64) + if (entry.snapshot_id.has_value()) { + ICEBERG_RETURN_UNEXPECTED(AppendField(array, entry.snapshot_id.value())); + } else { + auto status = ArrowArrayAppendNull(array, 1); + NANOARROW_RETURN_IF_FAILED(status); + } + break; + case 2: // data_file (required struct) + if (entry.data_file) { + // Get the data file type from the field + auto data_file_type = std::dynamic_pointer_cast<StructType>(field.type()); + ICEBERG_RETURN_UNEXPECTED( + AppendDataFile(array, data_file_type, entry.data_file)); + } else { + auto status = ArrowArrayAppendNull(array, 1); + NANOARROW_RETURN_IF_FAILED(status); + } + break; + case 3: // sequence_number (optional int64) + { + ICEBERG_ASSIGN_OR_RAISE(auto sequence_num, GetWrappedSequenceNumber(entry)); + if (sequence_num.has_value()) { + ICEBERG_RETURN_UNEXPECTED(AppendField(array, sequence_num.value())); + } else { + auto status = ArrowArrayAppendNull(array, 1); + NANOARROW_RETURN_IF_FAILED(status); + } + break; + } + case 4: // file_sequence_number (optional int64) + if (entry.file_sequence_number.has_value()) { + ICEBERG_RETURN_UNEXPECTED( + AppendField(array, entry.file_sequence_number.value())); + } else { + auto status = ArrowArrayAppendNull(array, 1); + NANOARROW_RETURN_IF_FAILED(status); + } + break; + default: + return InvalidManifest("Unknown manifest entry field id: {}", field.field_id()); + } + } + + auto status = ArrowArrayFinishElement(&array_); + NANOARROW_RETURN_IF_FAILED(status); + size_++; + return {}; +} + +Status ManifestEntryAdapter::InitSchema(const std::unordered_set<int32_t>& fields_ids) { + auto manifest_entry_schema = GetManifestEntryStructType(); + auto fields_span = manifest_entry_schema->fields(); + std::vector<SchemaField> fields; + // TODO(xiao.dong) make this a common function to recursive handle + // all nested fields in schema + for (const auto& field : fields_span) { + if (field.field_id() == 2) { + // handle data_file field + auto data_file_struct = std::dynamic_pointer_cast<StructType>(field.type()); + std::vector<SchemaField> data_file_fields; + for (const auto& data_file_field : data_file_struct->fields()) { + if (fields_ids.contains(data_file_field.field_id())) { + data_file_fields.emplace_back(data_file_field); + } + } + auto type = std::make_shared<StructType>(data_file_fields); + auto data_file_field = SchemaField::MakeRequired( + field.field_id(), std::string(field.name()), std::move(type)); + fields.emplace_back(std::move(data_file_field)); + } else { + if (fields_ids.contains(field.field_id())) { + fields.emplace_back(field); + } + } + } + manifest_schema_ = std::make_shared<Schema>(fields); + ICEBERG_RETURN_UNEXPECTED(ToArrowSchema(*manifest_schema_, &schema_)); + is_initialized_ = true; + return {}; +} + +ManifestFileAdapter::~ManifestFileAdapter() { + if (is_initialized_) { + // arrow::ImportedArrayData::Release() bridge.cc:1478 will release the Review Comment: is_initialized_ was removed since after refactor of those code we can do it like: if (array_ != nullptr && array_->release != nullptr) { ArrowArrayRelease(array_.get()); } if (schema_.release != nullptr) { ArrowSchemaRelease(&schema_); } -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
