Skip to content
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
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
1 change: 1 addition & 0 deletions src/iceberg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ set(ICEBERG_SOURCES
statistics_file.cc
table.cc
table_metadata.cc
table_scan.cc
transform.cc
transform_function.cc
type.cc
Expand Down
2 changes: 1 addition & 1 deletion src/iceberg/manifest_entry.h
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ struct ICEBERG_EXPORT ManifestEntry {
std::optional<int64_t> file_sequence_number;
/// Field id: 2
/// File path, partition tuple, metrics, ...
DataFile data_file;
std::shared_ptr<DataFile> data_file;

inline static const SchemaField kStatus =
SchemaField::MakeRequired(0, "status", std::make_shared<IntType>());
Expand Down
18 changes: 18 additions & 0 deletions src/iceberg/manifest_reader.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ namespace iceberg {
/// \brief Read manifest entries from a manifest file.
class ICEBERG_EXPORT ManifestReader {
public:
virtual ~ManifestReader() = default;
virtual Result<std::span<std::unique_ptr<ManifestEntry>>> Entries() const = 0;

private:
Expand All @@ -43,10 +44,27 @@ class ICEBERG_EXPORT ManifestReader {
/// \brief Read manifest files from a manifest list file.
class ICEBERG_EXPORT ManifestListReader {
public:
virtual ~ManifestListReader() = default;
virtual Result<std::span<std::unique_ptr<ManifestFile>>> Files() const = 0;

private:
std::unique_ptr<StructLikeReader> reader_;
};

/// \brief Creates a reader for the manifest list.
/// \param file_path Path to the manifest list file.
/// \return A Result containing the reader or an error.
Result<std::unique_ptr<ManifestListReader>> CreateManifestListReader(
const std::string& file_path) {
return NotImplemented("CreateManifestListReader is not implemented yet.");
}

/// \brief Creates a reader for a manifest file.
/// \param file_path Path to the manifest file.
/// \return A Result containing the reader or an error.
Result<std::unique_ptr<ManifestReader>> CreateManifestReader(
const std::string& file_path) {
return NotImplemented("CreateManifestReader is not implemented yet.");
}

} // namespace iceberg
5 changes: 5 additions & 0 deletions src/iceberg/table.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "iceberg/schema.h"
#include "iceberg/sort_order.h"
#include "iceberg/table_metadata.h"
#include "iceberg/table_scan.h"

namespace iceberg {

Expand Down Expand Up @@ -107,4 +108,8 @@ const std::vector<SnapshotLogEntry>& Table::history() const {

const std::shared_ptr<FileIO>& Table::io() const { return io_; }

std::unique_ptr<TableScanBuilder> Table::NewScan() const {
return std::make_unique<TableScanBuilder>(metadata_, io_);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about passing in the Table instead? That has all the metadata, and also the io

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I pass "Table" to the "TableScanBuilder," I cannot pass it further to "DataTableScan," as "Table" can only be passed by reference to the "TableScanBuilder."

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Fokko There are some (outdated) comments on this: #112 (comment)

}

} // namespace iceberg
6 changes: 6 additions & 0 deletions src/iceberg/table.h
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,12 @@ class ICEBERG_EXPORT Table {
/// \return a vector of history entries
const std::vector<SnapshotLogEntry>& history() const;

/// \brief Create a new table scan builder for this table
///
/// Once a table scan builder is created, it can be refined to project columns and
/// filter data.
virtual std::unique_ptr<TableScanBuilder> NewScan() const;

/// \brief Returns a FileIO to read and write table data and metadata files
const std::shared_ptr<FileIO>& io() const;

Expand Down
294 changes: 294 additions & 0 deletions src/iceberg/table_scan.cc
Original file line number Diff line number Diff line change
@@ -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) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this incorrect? Since it find the lowerbound and traverse all the sequence numbers above data_sequence_number

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the meaning here is to find all DeleteFiles corresponding to this DataFile. Only those with a sequence number higher than the DataFile need to be read.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Higher or equal for positional deletes: https://iceberg.apache.org/spec/#scan-planning

// Additional filtering logic here
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the additional filtering logic? Did you mean to further check if the delete files can be filtered?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DataFiles only need to retain DeleteFiles with a sequence greater than their own?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This differs per equality and positional deletes. I think there is a pretty good overview here: https://iceberg.apache.org/spec/#scan-planning

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)) {}

const std::shared_ptr<DataFile>& FileScanTask::data_file() const { return data_file_; }

const std::vector<std::shared_ptr<DataFile>>& FileScanTask::delete_files() const {
return delete_files_;
}

int64_t FileScanTask::start() const { return start_; }

int64_t FileScanTask::length() const { return length_; }

int64_t FileScanTask::SizeBytes() const {
int64_t sizeInBytes = length_;
std::ranges::for_each(delete_files_, [&sizeInBytes](const auto& delete_file) {
sizeInBytes += delete_file->file_size_in_bytes;
});
return sizeInBytes;
}

int32_t FileScanTask::FilesCount() const {
return static_cast<int32_t>(delete_files_.size() + 1);
}

int64_t FileScanTask::EstimatedRowCount() const {
if (data_file_->file_size_in_bytes == 0) {
return 0;
}
const double scannedFileFraction =
static_cast<double>(length_) / data_file_->file_size_in_bytes;
return static_cast<int64_t>(scannedFileFraction * data_file_->record_count);
}

const std::shared_ptr<Expression>& FileScanTask::residual() const { return residual_; }

TableScanBuilder::TableScanBuilder(std::shared_ptr<TableMetadata> table_metadata,
std::shared_ptr<FileIO> file_io)
: file_io_(std::move(file_io)) {
context_.table_metadata = std::move(table_metadata);
}

TableScanBuilder& TableScanBuilder::WithColumnNames(
std::vector<std::string> column_names) {
column_names_.reserve(column_names.size());
column_names_ = std::move(column_names);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: make sure context_.projected_schema is not set.

return *this;
}

TableScanBuilder& TableScanBuilder::WithProjectedSchema(std::shared_ptr<Schema> schema) {
context_.projected_schema = std::move(schema);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: make sure column_names_ is not set.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In a conflict situation, it's not very convenient to throw an exception here, I want to put the check in the build.

return *this;
}

TableScanBuilder& TableScanBuilder::WithSnapshotId(int64_t snapshot_id) {
snapshot_id_ = snapshot_id;
return *this;
}

TableScanBuilder& TableScanBuilder::WithFilter(std::shared_ptr<Expression> filter) {
context_.filter = std::move(filter);
return *this;
}

TableScanBuilder& TableScanBuilder::WithCaseSensitive(bool case_sensitive) {
context_.case_sensitive = case_sensitive;
return *this;
}

TableScanBuilder& TableScanBuilder::WithOption(std::string property, std::string value) {
context_.options[std::move(property)] = std::move(value);
return *this;
}

TableScanBuilder& TableScanBuilder::WithLimit(std::optional<int64_t> limit) {
context_.limit = limit;
return *this;
}

Result<std::unique_ptr<TableScan>> TableScanBuilder::Build() {
const auto& table_metadata = context_.table_metadata;
auto snapshot_id = snapshot_id_ ? snapshot_id_ : table_metadata->current_snapshot_id;
if (!snapshot_id) {
return InvalidArgument("No snapshot ID specified for table {}",
table_metadata->table_uuid);
}
auto iter = std::ranges::find_if(table_metadata->snapshots,
[&snapshot_id](const auto& snapshot) {
return snapshot->snapshot_id == *snapshot_id;
});
if (iter == table_metadata->snapshots.end() || *iter == nullptr) {
return NotFound("Snapshot with ID {} is not found", *snapshot_id);
}
context_.snapshot = *iter;

if (!context_.projected_schema) {
const auto& snapshot = context_.snapshot;
auto schema_id =
snapshot->schema_id ? snapshot->schema_id : table_metadata->current_schema_id;
if (!schema_id) {
return InvalidArgument("No schema ID found in snapshot {} for table {}",
snapshot->snapshot_id, table_metadata->table_uuid);
}

const auto& schemas = table_metadata->schemas;
const auto it = std::ranges::find_if(schemas, [&schema_id](const auto& schema) {
return schema->schema_id() == *schema_id;
});
if (it == schemas.end()) {
return InvalidArgument("Schema {} in snapshot {} is not found",
*snapshot->schema_id, snapshot->snapshot_id);
}
auto schema = *it;

if (column_names_.empty()) {
context_.projected_schema = schema;
} else {
// TODO(gty404): collect touched columns from filter expression
std::vector<SchemaField> projected_fields;
projected_fields.reserve(column_names_.size());
for (const auto& column_name : column_names_) {
// TODO(gty404): support case-insensitive column names
auto field_opt = schema->GetFieldByName(column_name);
if (!field_opt) {
return InvalidArgument("Column {} not found in schema", column_name);
}
projected_fields.emplace_back(field_opt.value().get());
}
context_.projected_schema =
std::make_shared<Schema>(std::move(projected_fields), schema->schema_id());
}
}

return std::make_unique<DataScan>(std::move(context_), file_io_);
}

TableScan::TableScan(TableScanContext context, std::shared_ptr<FileIO> file_io)
: context_(std::move(context)), file_io_(std::move(file_io)) {}

const std::shared_ptr<Snapshot>& TableScan::snapshot() const { return context_.snapshot; }

const std::shared_ptr<Schema>& TableScan::projection() const {
return context_.projected_schema;
}

const TableScanContext& TableScan::context() const { return context_; }

const std::shared_ptr<FileIO>& TableScan::io() const { return file_io_; }

DataScan::DataScan(TableScanContext context, std::shared_ptr<FileIO> file_io)
: TableScan(std::move(context), std::move(file_io)) {}

Result<std::vector<std::shared_ptr<FileScanTask>>> DataScan::PlanFiles() const {
ICEBERG_ASSIGN_OR_RAISE(auto manifest_list_reader,
CreateManifestListReader(context_.snapshot->manifest_list));
ICEBERG_ASSIGN_OR_RAISE(auto manifest_files, manifest_list_reader->Files());

std::vector<std::unique_ptr<ManifestEntry>> data_entries;
std::vector<std::unique_ptr<ManifestEntry>> positional_delete_entries;
for (const auto& manifest_file : manifest_files) {
ICEBERG_ASSIGN_OR_RAISE(auto manifest_reader,
CreateManifestReader(manifest_file->manifest_path));
ICEBERG_ASSIGN_OR_RAISE(auto manifests, manifest_reader->Entries());

// TODO(gty404): filter manifests using partition spec and filter expression

for (auto& manifest_entry : manifests) {
const auto& data_file = manifest_entry->data_file;
switch (data_file->content) {
case DataFile::Content::kData:
data_entries.push_back(std::move(manifest_entry));
break;
case DataFile::Content::kPositionDeletes:
// TODO(gty404): check if the sequence number is greater than or equal to the
// minimum sequence number of all manifest entries
positional_delete_entries.push_back(std::move(manifest_entry));
break;
case DataFile::Content::kEqualityDeletes:
return NotSupported("Equality deletes are not supported in data scan");
}
}
}

DeleteFileIndex delete_file_index(positional_delete_entries);

// TODO(gty404): build residual expression from filter
std::shared_ptr<Expression> residual;
std::vector<std::shared_ptr<FileScanTask>> tasks;
for (const auto& data_entry : data_entries) {
auto matched_deletes = GetMatchedDeletes(*data_entry, delete_file_index);
const auto& data_file = data_entry->data_file;
tasks.emplace_back(std::make_shared<FileScanTask>(
data_file, std::move(matched_deletes), 0, data_file->file_size_in_bytes,
std::move(residual)));
}
return tasks;
}

} // namespace iceberg
Loading
Loading