Skip to content

Update ArrayRecord Reader to allow reading from GCS directly since Reglieli #172

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.

Sign up for GitHub

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
copybara-service merged 1 commit into from
Aug 20, 2025
Merged

Update ArrayRecord Reader to allow reading from GCS directly since Reglieli #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,17 @@ module(
repo_name = "com_google_array_record",
)

bazel_dep(name = "rules_proto", version = "7.0.2")
bazel_dep(name = "rules_python", version = "1.0.0")
bazel_dep(name = "rules_proto", version = "7.1.0")
bazel_dep(name = "rules_python", version = "1.4.1")
bazel_dep(name = "platforms", version = "0.0.11")
bazel_dep(name = "protobuf", version = "31.1")
bazel_dep(name = "googletest", version = "1.15.2")
bazel_dep(name = "abseil-cpp", version = "20250127.0")
bazel_dep(name = "abseil-cpp", version = "20250127.1")
bazel_dep(name = "abseil-py", version = "2.1.0")
bazel_dep(name = "eigen", version = "3.4.0.bcr.3")
bazel_dep(name = "riegeli", version = "0.0.0-20241218-3385e3c")
bazel_dep(name = "riegeli", version = "0.0.0-20250717-5b2e77e")
bazel_dep(name = "pybind11_bazel", version = "2.12.0")
bazel_dep(name = "google_cloud_cpp", version = "3.0.0-rc0")

SUPPORTED_PYTHON_VERSIONS = [
"3.10",
Expand Down
2 changes: 2 additions & 0 deletions python/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ pybind_extension(
"@riegeli//riegeli/base:initializer",
"@riegeli//riegeli/bytes:fd_reader",
"@riegeli//riegeli/bytes:fd_writer",
"@riegeli//riegeli/gcs:gcs_object",
"@riegeli//riegeli/gcs:gcs_reader",
],
)

Expand Down
29 changes: 23 additions & 6 deletions python/array_record_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ limitations under the License.
#include <vector>

#include "absl/status/status.h"
#include "absl/strings/match.h"
#include "absl/strings/str_format.h"
#include "absl/strings/string_view.h"
#include "cpp/array_record_reader.h"
Expand All @@ -34,6 +35,8 @@ limitations under the License.
#include "riegeli/base/maker.h"
#include "riegeli/bytes/fd_reader.h"
#include "riegeli/bytes/fd_writer.h"
#include "riegeli/gcs/gcs_object.h"
#include "riegeli/gcs/gcs_reader.h"

namespace py = pybind11;

Expand All @@ -50,10 +53,13 @@ PYBIND11_MODULE(array_record_module, m) {
throw py::value_error(
std::string(status_or_option.status().message()));
}
riegeli::FdWriterBase::Options file_writer_options;
file_writer_options.set_buffer_size(size_t{16} << 20);
// Release the GIL because IO is time consuming.
py::gil_scoped_release scoped_release;
return new array_record::ArrayRecordWriter(
riegeli::Maker<riegeli::FdWriter>(path),
riegeli::Maker<riegeli::FdWriter>(
path, std::move(file_writer_options)),
status_or_option.value());
}),
py::arg("path"), py::arg("options") = "")
Expand Down Expand Up @@ -84,18 +90,29 @@ PYBIND11_MODULE(array_record_module, m) {
std::string(status_or_option.status().message()));
}
riegeli::FdReaderBase::Options file_reader_options;
riegeli::GcsReader::Options gcs_reader_options;
if (kwargs.contains("file_reader_buffer_size")) {
auto file_reader_buffer_size =
kwargs["file_reader_buffer_size"].cast<int64_t>();
file_reader_options.set_buffer_size(file_reader_buffer_size);
gcs_reader_options.set_buffer_size(file_reader_buffer_size);
}
// Release the GIL because IO is time consuming.
py::gil_scoped_release scoped_release;
return new array_record::ArrayRecordReader(
riegeli::Maker<riegeli::FdReader>(
path, std::move(file_reader_options)),
status_or_option.value(),
array_record::ArrayRecordGlobalPool());
if (absl::StartsWith(path, "gs://")) {
return new array_record::ArrayRecordReader(
riegeli::Maker<riegeli::GcsReader>(
google::cloud::storage::Client(),
riegeli::GcsObject(path), std::move(gcs_reader_options)),
status_or_option.value(),
array_record::ArrayRecordGlobalPool());
} else {
return new array_record::ArrayRecordReader(
riegeli::Maker<riegeli::FdReader>(
path, std::move(file_reader_options)),
status_or_option.value(),
array_record::ArrayRecordGlobalPool());
}
}),
py::arg("path"), py::arg("options") = "", R"(
ArrayRecordReader for fast sequential or random access.
Expand Down