Skip to content

Commit

Permalink
GH-32206: Aligning R's GcsFileSystem::Make call with new definition.
Browse files Browse the repository at this point in the history
  • Loading branch information
trifleneurotic committed Oct 25, 2024
1 parent 3d2ad22 commit 415e517
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
4 changes: 0 additions & 4 deletions cpp/src/arrow/filesystem/gcsfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,6 @@ class ARROW_EXPORT GcsFileSystem : public FileSystem {
const std::string& path,
const std::shared_ptr<const KeyValueMetadata>& metadata) override;

ARROW_DEPRECATED("Deprecated in 19.0.0. Use the Result version instead.")
static std::shared_ptr<GcsFileSystem> Make(
const GcsOptions& options, const io::IOContext& = io::default_io_context());

/// Create a GcsFileSystem instance from the given options.
static Result<std::shared_ptr<GcsFileSystem>> Make(
const GcsOptions& options, const io::IOContext& = io::default_io_context());
Expand Down
6 changes: 3 additions & 3 deletions r/src/filesystem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,8 @@ void FinalizeS3() {
std::shared_ptr<arrow::KeyValueMetadata> strings_to_kvm(cpp11::strings metadata);

// [[gcs::export]]
std::shared_ptr<fs::GcsFileSystem> fs___GcsFileSystem__Make(bool anonymous,
cpp11::list options) {
Result<std::shared_ptr<GcsFileSystem>> fs___GcsFileSystem__Make(bool anonymous,
cpp11::list options) {
fs::GcsOptions gcs_opts;

// Handle auth (anonymous, credentials, default)
Expand Down Expand Up @@ -429,7 +429,7 @@ std::shared_ptr<fs::GcsFileSystem> fs___GcsFileSystem__Make(bool anonymous,
}

auto io_context = MainRThread::GetInstance().CancellableIOContext();
// TODO(ARROW-16884): update when this returns Result

return fs::GcsFileSystem::Make(gcs_opts, io_context);
}

Expand Down

0 comments on commit 415e517

Please sign in to comment.