Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
13 changes: 12 additions & 1 deletion src/iceberg/arrow/arrow_fs_file_io.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@
* under the License.
*/

#include "iceberg/arrow/arrow_fs_file_io.h"
#include <chrono>

#include <arrow/filesystem/localfs.h>
#include <arrow/filesystem/mockfs.h>

#include "iceberg/arrow/arrow_error_transform_internal.h"
#include "iceberg/arrow/arrow_fs_file_io_internal.h"

namespace iceberg::arrow {

Expand Down Expand Up @@ -67,4 +69,13 @@ Status ArrowFileSystemFileIO::DeleteFile(const std::string& file_location) {
return {};
}

std::unique_ptr<::arrow::fs::FileSystem> ArrowFileSystemFileIO::MakeMockFileIO() {
return std::make_unique<::arrow::fs::internal::MockFileSystem>(
std::chrono::system_clock::now());
}

std::unique_ptr<::arrow::fs::FileSystem> ArrowFileSystemFileIO::MakeLocalFileIO() {
return std::make_unique<::arrow::fs::LocalFileSystem>();
}

} // namespace iceberg::arrow
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ class ICEBERG_BUNDLE_EXPORT ArrowFileSystemFileIO : public FileIO {
explicit ArrowFileSystemFileIO(std::shared_ptr<::arrow::fs::FileSystem> arrow_fs)
: arrow_fs_(std::move(arrow_fs)) {}

/// \brief Make an in-memory FileIO backed by arrow::fs::internal::MockFileSystem.
static std::unique_ptr<::arrow::fs::FileSystem> MakeMockFileIO();

/// \brief Make a local FileIO backed by arrow::fs::LocalFileSystem.
static std::unique_ptr<::arrow::fs::FileSystem> MakeLocalFileIO();

~ArrowFileSystemFileIO() override = default;

/// \brief Read the content of the file at the given location.
Expand Down
2 changes: 1 addition & 1 deletion src/iceberg/avro/avro_reader.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#include <avro/Generic.hh>
#include <avro/GenericDatum.hh>

#include "iceberg/arrow/arrow_fs_file_io.h"
#include "iceberg/arrow/arrow_fs_file_io_internal.h"
#include "iceberg/avro/avro_data_util_internal.h"
#include "iceberg/avro/avro_schema_util_internal.h"
#include "iceberg/avro/avro_stream_internal.h"
Expand Down
3 changes: 1 addition & 2 deletions test/arrow_fs_file_io_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,10 @@
* under the License.
*/

#include "iceberg/arrow/arrow_fs_file_io.h"

#include <arrow/filesystem/localfs.h>
#include <gtest/gtest.h>

#include "iceberg/arrow/arrow_fs_file_io_internal.h"
#include "matchers.h"
#include "temp_file_test_base.h"

Expand Down
2 changes: 1 addition & 1 deletion test/avro_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <avro/GenericDatum.hh>
#include <gtest/gtest.h>

#include "iceberg/arrow/arrow_fs_file_io.h"
#include "iceberg/arrow/arrow_fs_file_io_internal.h"
#include "iceberg/avro/avro_reader.h"
#include "iceberg/schema.h"
#include "iceberg/type.h"
Expand Down
2 changes: 1 addition & 1 deletion test/gzip_decompress_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <arrow/util/compression.h>
#include <gtest/gtest.h>

#include "iceberg/arrow/arrow_fs_file_io.h"
#include "iceberg/arrow/arrow_fs_file_io_internal.h"
#include "iceberg/file_io.h"
#include "iceberg/util/gzip_internal.h"
#include "matchers.h"
Expand Down
2 changes: 1 addition & 1 deletion test/manifest_list_reader_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <avro/GenericDatum.hh>
#include <gtest/gtest.h>

#include "iceberg/arrow/arrow_fs_file_io.h"
#include "iceberg/arrow/arrow_fs_file_io_internal.h"
#include "iceberg/avro/avro_reader.h"
#include "iceberg/manifest_list.h"
#include "iceberg/manifest_reader.h"
Expand Down
2 changes: 1 addition & 1 deletion test/metadata_io_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <gtest/gtest.h>
#include <nlohmann/json.hpp>

#include "iceberg/arrow/arrow_fs_file_io.h"
#include "iceberg/arrow/arrow_fs_file_io_internal.h"
#include "iceberg/file_io.h"
#include "iceberg/json_internal.h"
#include "iceberg/schema.h"
Expand Down
Loading