Fokko commented on code in PR #112: URL: https://github.com/apache/iceberg-cpp/pull/112#discussion_r2182149699
########## src/iceberg/table_scan.cc: ########## @@ -0,0 +1,294 @@ +/* + * 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/table_scan.h" + +#include <algorithm> +#include <ranges> + +#include "iceberg/manifest_entry.h" +#include "iceberg/manifest_list.h" +#include "iceberg/manifest_reader.h" +#include "iceberg/schema.h" +#include "iceberg/schema_field.h" +#include "iceberg/snapshot.h" +#include "iceberg/table_metadata.h" +#include "iceberg/util/macros.h" + +namespace iceberg { + +namespace { +/// \brief Use indexed data structures for efficient lookups +class DeleteFileIndex { + public: + /// \brief Build the index from a list of manifest entries. + explicit DeleteFileIndex(const std::vector<std::unique_ptr<ManifestEntry>>& entries) { + for (const auto& entry : entries) { + const int64_t seq_num = + entry->sequence_number.value_or(TableMetadata::kInitialSequenceNumber); + sequence_index.emplace(seq_num, entry.get()); + } + } + + /// \brief Find delete files that match the sequence number of a data entry. + std::vector<ManifestEntry*> FindRelevantEntries(const ManifestEntry& data_entry) const { + std::vector<ManifestEntry*> relevant_deletes; + + // Use lower_bound for efficient range search + auto data_sequence_number = + data_entry.sequence_number.value_or(TableMetadata::kInitialSequenceNumber); + for (auto it = sequence_index.lower_bound(data_sequence_number); + it != sequence_index.end(); ++it) { + // Additional filtering logic here + relevant_deletes.push_back(it->second); + } + + return relevant_deletes; + } + + private: + /// \brief Index by sequence number for quick filtering + std::multimap<int64_t, ManifestEntry*> sequence_index; +}; + +/// \brief Get matched delete files for a given data entry. +std::vector<std::shared_ptr<DataFile>> GetMatchedDeletes( + const ManifestEntry& data_entry, const DeleteFileIndex& delete_file_index) { + const auto relevant_entries = delete_file_index.FindRelevantEntries(data_entry); + std::vector<std::shared_ptr<DataFile>> matched_deletes; + if (relevant_entries.empty()) { + return matched_deletes; + } + + matched_deletes.reserve(relevant_entries.size()); + for (const auto& delete_entry : relevant_entries) { + // TODO(gty404): check if the delete entry contains the data entry's file path + matched_deletes.emplace_back(delete_entry->data_file); + } + return matched_deletes; +} +} // namespace + +// implement FileScanTask +FileScanTask::FileScanTask(std::shared_ptr<DataFile> file, + std::vector<std::shared_ptr<DataFile>> delete_files, + int64_t start, int64_t length, + std::shared_ptr<Expression> residual) + : data_file_(std::move(file)), + delete_files_(std::move(delete_files)), + start_(start), + length_(length), + residual_(std::move(residual)) {} Review Comment: It looks like this `FileScanTask` is inspired by PyIceberg, while I think it might be better to follow Java: https://github.com/apache/iceberg/blob/main/api/src/main/java/org/apache/iceberg/FileScanTask.java The name `FileScanTask` implies to me, that it will read a full file, and then the `start` and `end` do not make sense. This is in the case you want to split up the work by row-group, rather than file. -- 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: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
