-
Notifications
You must be signed in to change notification settings - Fork 70
feat: support avro writer #173
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 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| /* | ||
| * 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/avro/avro_writer.h" | ||
|
|
||
| #include <memory> | ||
|
|
||
| #include <arrow/array/builder_base.h> | ||
| #include <arrow/c/bridge.h> | ||
| #include <arrow/record_batch.h> | ||
| #include <arrow/result.h> | ||
| #include <avro/DataFile.hh> | ||
| #include <avro/GenericDatum.hh> | ||
|
|
||
| #include "iceberg/arrow/arrow_error_transform_internal.h" | ||
| #include "iceberg/arrow/arrow_fs_file_io_internal.h" | ||
| #include "iceberg/avro/avro_schema_util_internal.h" | ||
| #include "iceberg/avro/avro_stream_internal.h" | ||
| #include "iceberg/schema.h" | ||
| #include "iceberg/util/checked_cast.h" | ||
| #include "iceberg/util/macros.h" | ||
|
|
||
| namespace iceberg::avro { | ||
|
|
||
| namespace { | ||
|
|
||
| Result<std::unique_ptr<AvroOutputStream>> CreateOutputStream(const WriterOptions& options, | ||
| int64_t buffer_size) { | ||
| auto io = internal::checked_pointer_cast<arrow::ArrowFileSystemFileIO>(options.io); | ||
| ICEBERG_ARROW_ASSIGN_OR_RETURN(auto output, io->fs()->OpenOutputStream(options.path)); | ||
| return std::make_unique<AvroOutputStream>(output, buffer_size); | ||
| } | ||
|
|
||
| } // namespace | ||
|
|
||
| // A stateful context to keep track of the writing progress. | ||
| struct WriteContext {}; | ||
|
|
||
| class AvroWriter::Impl { | ||
| public: | ||
| Status Open(const WriterOptions& options) { | ||
| write_schema_ = options.schema; | ||
|
|
||
| ::avro::NodePtr root; | ||
| ICEBERG_RETURN_UNEXPECTED(ToAvroNodeVisitor{}.Visit(*write_schema_, &root)); | ||
|
|
||
| avro_schema_ = std::make_shared<::avro::ValidSchema>(root); | ||
|
|
||
| // Open the output stream and adapt to the avro interface. | ||
| constexpr int64_t kDefaultBufferSize = 1024 * 1024; | ||
| ICEBERG_ASSIGN_OR_RAISE(auto output_stream, | ||
| CreateOutputStream(options, kDefaultBufferSize)); | ||
|
|
||
| writer_ = std::make_unique<::avro::DataFileWriter<::avro::GenericDatum>>( | ||
| std::move(output_stream), *avro_schema_); | ||
| return {}; | ||
| } | ||
|
|
||
| Status Write(ArrowArray /*data*/) { | ||
| // TODO(xiao.dong) convert data and write to avro | ||
| // total_bytes_+= written_bytes; | ||
| return {}; | ||
| } | ||
|
|
||
| Status Close() { | ||
| if (writer_ != nullptr) { | ||
| writer_->close(); | ||
| writer_.reset(); | ||
| } | ||
| return {}; | ||
| } | ||
|
|
||
| bool Closed() const { return writer_ == nullptr; } | ||
|
|
||
| int64_t length() { return total_bytes_; } | ||
|
|
||
| private: | ||
| int64_t total_bytes_ = 0; | ||
| // The schema to write. | ||
| std::shared_ptr<::iceberg::Schema> write_schema_; | ||
| // The avro schema to write. | ||
| std::shared_ptr<::avro::ValidSchema> avro_schema_; | ||
| // The avro writer to write the data into a datum. | ||
| std::unique_ptr<::avro::DataFileWriter<::avro::GenericDatum>> writer_; | ||
| }; | ||
|
|
||
| AvroWriter::~AvroWriter() = default; | ||
|
|
||
| Status AvroWriter::Write(ArrowArray data) { return impl_->Write(data); } | ||
|
|
||
| Status AvroWriter::Open(const WriterOptions& options) { | ||
| impl_ = std::make_unique<Impl>(); | ||
| return impl_->Open(options); | ||
| } | ||
|
|
||
| Status AvroWriter::Close() { | ||
| if (!impl_->Closed()) { | ||
| return impl_->Close(); | ||
| } | ||
| return {}; | ||
| } | ||
|
|
||
| std::optional<Metrics> AvroWriter::metrics() { | ||
| if (impl_->Closed()) { | ||
| // TODO(xiao.dong) implement metrics | ||
| return {}; | ||
| } | ||
| return std::nullopt; | ||
| } | ||
|
|
||
| std::optional<int64_t> AvroWriter::length() { | ||
| if (impl_->Closed()) { | ||
| return impl_->length(); | ||
| } | ||
| return std::nullopt; | ||
| } | ||
|
|
||
| std::vector<int64_t> AvroWriter::split_offsets() { return {}; } | ||
|
|
||
| void AvroWriter::Register() { | ||
| static WriterFactoryRegistry avro_writer_register( | ||
| FileFormatType::kAvro, | ||
| []() -> Result<std::unique_ptr<Writer>> { return std::make_unique<AvroWriter>(); }); | ||
| } | ||
|
|
||
| } // namespace iceberg::avro |
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,54 @@ | ||
| /* | ||
| * 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 | ||
|
|
||
| #include "iceberg/file_writer.h" | ||
| #include "iceberg/iceberg_bundle_export.h" | ||
|
|
||
| namespace iceberg::avro { | ||
|
|
||
| /// \brief A writer ArrowArray to Avro files. | ||
| class ICEBERG_BUNDLE_EXPORT AvroWriter : public Writer { | ||
| public: | ||
| AvroWriter() = default; | ||
|
|
||
| ~AvroWriter() override; | ||
|
|
||
| Status Open(const WriterOptions& options) final; | ||
|
|
||
| Status Close() final; | ||
|
|
||
| Status Write(ArrowArray data) final; | ||
|
|
||
| std::optional<Metrics> metrics() final; | ||
|
|
||
| std::optional<int64_t> length() final; | ||
|
|
||
| std::vector<int64_t> split_offsets() final; | ||
|
|
||
| /// \brief Register this Avro writer implementation. | ||
| static void Register(); | ||
|
|
||
| private: | ||
| class Impl; | ||
| std::unique_ptr<Impl> impl_; | ||
| }; | ||
|
|
||
| } // namespace iceberg::avro | ||
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,62 @@ | ||
| /* | ||
| * 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/file_writer.h" | ||
|
|
||
| #include <unordered_map> | ||
|
|
||
| #include "iceberg/result.h" | ||
| #include "iceberg/util/formatter.h" | ||
| #include "iceberg/util/macros.h" | ||
|
|
||
| namespace iceberg { | ||
|
|
||
| namespace { | ||
|
|
||
| WriterFactory GetNotImplementedFactory(FileFormatType format_type) { | ||
| return [format_type]() -> Result<std::unique_ptr<Writer>> { | ||
| return NotImplemented("Missing writer factory for file format: {}", format_type); | ||
| }; | ||
| } | ||
|
|
||
| } // namespace | ||
|
|
||
| WriterFactory& WriterFactoryRegistry::GetFactory(FileFormatType format_type) { | ||
| static std::unordered_map<FileFormatType, WriterFactory> factories = { | ||
| {FileFormatType::kAvro, GetNotImplementedFactory(FileFormatType::kAvro)}, | ||
| {FileFormatType::kParquet, GetNotImplementedFactory(FileFormatType::kParquet)}, | ||
| {FileFormatType::kOrc, GetNotImplementedFactory(FileFormatType::kOrc)}, | ||
| {FileFormatType::kPuffin, GetNotImplementedFactory(FileFormatType::kPuffin)}, | ||
| }; | ||
| return factories.at(format_type); | ||
| } | ||
|
|
||
| WriterFactoryRegistry::WriterFactoryRegistry(FileFormatType format_type, | ||
| WriterFactory factory) { | ||
| GetFactory(format_type) = std::move(factory); | ||
| } | ||
|
|
||
| Result<std::unique_ptr<Writer>> WriterFactoryRegistry::Open( | ||
| FileFormatType format_type, const WriterOptions& options) { | ||
| ICEBERG_ASSIGN_OR_RAISE(auto writer, GetFactory(format_type)()); | ||
| ICEBERG_RETURN_UNEXPECTED(writer->Open(options)); | ||
| return writer; | ||
| } | ||
|
|
||
| } // namespace iceberg |
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,43 @@ | ||
| /* | ||
| * 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/metrics.h | ||
| /// Iceberg file format metrics | ||
|
|
||
| #include <unordered_map> | ||
|
|
||
| #include "iceberg/expression/literal.h" | ||
| #include "iceberg/iceberg_export.h" | ||
|
|
||
| namespace iceberg { | ||
|
|
||
| /// \brief Iceberg file format metrics | ||
| struct ICEBERG_EXPORT Metrics { | ||
| int64_t row_count = 0; | ||
| std::unordered_map<int64_t, int64_t> column_sizes; | ||
| std::unordered_map<int64_t, int64_t> value_counts; | ||
| std::unordered_map<int64_t, int64_t> null_value_counts; | ||
| std::unordered_map<int64_t, int64_t> nan_value_counts; | ||
| std::unordered_map<int64_t, Literal> lower_bounds; | ||
| std::unordered_map<int64_t, Literal> upper_bounds; | ||
| }; | ||
|
|
||
| } // namespace iceberg |
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.
Uh oh!
There was an error while loading. Please reload this page.