Skip to content
Closed
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
2 changes: 2 additions & 0 deletions ci/docker/conda.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ COPY ci/scripts/install_conda.sh \
/arrow/ci/scripts/
RUN /arrow/ci/scripts/install_conda.sh ${arch} linux latest ${prefix}
RUN /arrow/ci/scripts/install_minio.sh ${arch} linux latest ${prefix}
COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts
RUN /arrow/ci/scripts/install_gcs_testbench.sh default

# create a conda environment
ADD ci/conda_env_unix.txt /arrow/ci/
Expand Down
6 changes: 4 additions & 2 deletions ci/docker/debian-10-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,17 @@ RUN apt-get update -y -q && \
ninja-build \
pkg-config \
protobuf-compiler \
python3-pip \
rapidjson-dev \
tzdata \
zlib1g-dev && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

COPY ci/scripts/install_minio.sh \
/arrow/ci/scripts/
COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_minio.sh ${arch} linux latest /usr/local
COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_gcs_testbench.sh default

ENV ARROW_BUILD_TESTS=ON \
ARROW_DATASET=ON \
Expand Down
6 changes: 4 additions & 2 deletions ci/docker/debian-11-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,17 @@ RUN apt-get update -y -q && \
ninja-build \
pkg-config \
protobuf-compiler-grpc \
python3-pip \
rapidjson-dev \
tzdata \
zlib1g-dev && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

COPY ci/scripts/install_minio.sh \
/arrow/ci/scripts/
COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_minio.sh ${arch} linux latest /usr/local
COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_gcs_testbench.sh default

ENV ARROW_BUILD_TESTS=ON \
ARROW_DATASET=ON \
Expand Down
6 changes: 4 additions & 2 deletions ci/docker/fedora-33-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ RUN dnf update -y && \
openssl-devel \
protobuf-devel \
python \
python-pip \
rapidjson-devel \
re2-devel \
snappy-devel \
Expand All @@ -62,9 +63,10 @@ RUN dnf update -y && \
which \
zlib-devel

COPY ci/scripts/install_minio.sh \
/arrow/ci/scripts/
COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_minio.sh ${arch} linux latest /usr/local
COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_gcs_testbench.sh default

ENV ARROW_BUILD_TESTS=ON \
ARROW_DEPENDENCY_SOURCE=SYSTEM \
Expand Down
5 changes: 3 additions & 2 deletions ci/docker/linux-apt-r.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,10 @@ COPY ci/scripts/r_deps.sh /arrow/ci/scripts/
COPY r/DESCRIPTION /arrow/r/
RUN /arrow/ci/scripts/r_deps.sh /arrow

COPY ci/scripts/install_minio.sh \
/arrow/ci/scripts/
COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_minio.sh ${arch} linux latest /usr/local
COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_gcs_testbench.sh default

# Set up Python 3 and its dependencies
RUN ln -s /usr/bin/python3 /usr/local/bin/python && \
Expand Down
1 change: 1 addition & 0 deletions ci/docker/linux-r.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ ENV PATH "${RPREFIX}/bin:${PATH}"
COPY ci/scripts/r_docker_configure.sh /arrow/ci/scripts/
COPY ci/etc/rprofile /arrow/ci/etc/
COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/r_docker_configure.sh

COPY ci/scripts/r_deps.sh /arrow/ci/scripts/
Expand Down
6 changes: 4 additions & 2 deletions ci/docker/ubuntu-20.04-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,17 @@ RUN apt-get update -y -q && \
ninja-build \
pkg-config \
protobuf-compiler \
python3-pip \
rapidjson-dev \
tzdata \
wget && \
apt-get clean && \
rm -rf /var/lib/apt/lists*

COPY ci/scripts/install_minio.sh \
/arrow/ci/scripts/
COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_minio.sh ${arch} linux latest /usr/local
COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_gcs_testbench.sh default

# Prioritize system packages and local installation
# The following dependencies will be downloaded due to missing/invalid packages
Expand Down
6 changes: 4 additions & 2 deletions ci/docker/ubuntu-20.10-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -90,15 +90,17 @@ RUN apt-get update -y -q && \
pkg-config \
protobuf-compiler \
protobuf-compiler-grpc \
python3-pip \
rapidjson-dev \
tzdata \
wget && \
apt-get clean && \
rm -rf /var/lib/apt/lists*

COPY ci/scripts/install_minio.sh \
/arrow/ci/scripts/
COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_minio.sh ${arch} linux latest /usr/local
COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_gcs_testbench.sh default

# Prioritize system packages and local installation
# The following dependencies will be downloaded due to missing/invalid packages
Expand Down
6 changes: 4 additions & 2 deletions ci/docker/ubuntu-21.04-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,17 @@ RUN apt-get update -y -q && \
pkg-config \
protobuf-compiler \
protobuf-compiler-grpc \
python3-pip \
rapidjson-dev \
tzdata \
wget && \
apt-get clean && \
rm -rf /var/lib/apt/lists*

COPY ci/scripts/install_minio.sh \
/arrow/ci/scripts/
COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_minio.sh ${arch} linux latest /usr/local
COPY ci/scripts/install_gcs_testbench.sh /arrow/ci/scripts/
RUN /arrow/ci/scripts/install_gcs_testbench.sh default

# Prioritize system packages and local installation
# The following dependencies will be downloaded due to missing/invalid packages
Expand Down
32 changes: 32 additions & 0 deletions ci/scripts/install_gcs_testbench.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/usr/bin/env bash
#
# 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.

set -e

if [ "$#" -ne 1 ]; then
echo "Usage: $0 <storage-testbench version>"
exit 1
fi

version=$1
if [[ "${version}" -eq "default" ]]; then
version="v0.7.0"
fi

pip install "https://github.com/googleapis/storage-testbench/archive/${version}.tar.gz"
4 changes: 4 additions & 0 deletions ci/scripts/r_docker_configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ if [ "$ARROW_S3" == "ON" ] || [ "$ARROW_R_DEV" == "TRUE" ]; then
if [ -f "/arrow/ci/scripts/install_minio.sh" ] && [ "`which wget`" ]; then
/arrow/ci/scripts/install_minio.sh amd64 linux latest /usr/local
fi

if [ -f "/arrow/ci/scripts/install_gcs_testbench.sh" ] && [ "`which pip`" ]; then
/arrow/ci/scripts/install_gcs_testbench.sh default
fi
fi

# Workaround for html help install failure; see https://github.com/r-lib/devtools/issues/2084#issuecomment-530912786
Expand Down
4 changes: 2 additions & 2 deletions cpp/src/arrow/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -452,8 +452,8 @@ if(ARROW_FILESYSTEM)
filesystem/util_internal.cc)

if(ARROW_GCS)
list(APPEND ARROW_SRCS filesystem/gcsfs.cc)
set_source_files_properties(filesystem/gcsfs.cc
list(APPEND ARROW_SRCS filesystem/gcsfs.cc filesystem/gcsfs_internal.cc)
set_source_files_properties(filesystem/gcsfs.cc filesystem/gcsfs_internal.cc
PROPERTIES SKIP_PRECOMPILE_HEADERS ON
SKIP_UNITY_BUILD_INCLUSION ON)
endif()
Expand Down
70 changes: 66 additions & 4 deletions cpp/src/arrow/filesystem/gcsfs.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,46 @@

#include <google/cloud/storage/client.h>

#include <sstream>

#include "arrow/filesystem/gcsfs_internal.h"
#include "arrow/filesystem/path_util.h"
#include "arrow/result.h"
#include "arrow/util/checked_cast.h"

namespace arrow {
namespace fs {
namespace {

auto constexpr kSep = '/';

struct GcsPath {
std::string full_path;
std::string bucket;
std::string object;

static Result<GcsPath> FromString(const std::string& s) {
const auto src = internal::RemoveTrailingSlash(s);
auto const first_sep = src.find_first_of(kSep);
if (first_sep == 0) {
return Status::Invalid("Path cannot start with a separator ('", s, "')");
}
if (first_sep == std::string::npos) {
return GcsPath{std::string(src), std::string(src), ""};
}
GcsPath path;
path.full_path = std::string(src);
path.bucket = std::string(src.substr(0, first_sep));
path.object = std::string(src.substr(first_sep + 1));
return path;
}

bool empty() const { return bucket.empty() && object.empty(); }

bool operator==(const GcsPath& other) const {
return bucket == other.bucket && object == other.object;
}
};

} // namespace

namespace gcs = google::cloud::storage;

Expand All @@ -35,6 +67,13 @@ google::cloud::Options AsGoogleCloudOptions(const GcsOptions& o) {
if (!o.endpoint_override.empty()) {
std::string scheme = o.scheme;
if (scheme.empty()) scheme = "https";
if (scheme == "https") {
options.set<google::cloud::UnifiedCredentialsOption>(
google::cloud::MakeGoogleDefaultCredentials());
} else {
options.set<google::cloud::UnifiedCredentialsOption>(
google::cloud::MakeInsecureCredentials());
}
options.set<gcs::RestEndpointOption>(scheme + "://" + o.endpoint_override);
}
return options;
Expand All @@ -45,9 +84,31 @@ class GcsFileSystem::Impl {
explicit Impl(GcsOptions o)
: options_(std::move(o)), client_(AsGoogleCloudOptions(options_)) {}

GcsOptions const& options() const { return options_; }
const GcsOptions& options() const { return options_; }

Result<FileInfo> GetFileInfo(const GcsPath& path) {
if (!path.object.empty()) {
auto meta = client_.GetObjectMetadata(path.bucket, path.object);
return GetFileInfoImpl(path, std::move(meta).status(), FileType::File);
}
auto meta = client_.GetBucketMetadata(path.bucket);
return GetFileInfoImpl(path, std::move(meta).status(), FileType::Directory);
}

private:
static Result<FileInfo> GetFileInfoImpl(const GcsPath& path,
const google::cloud::Status& status,
FileType type) {
if (status.ok()) {
return FileInfo(path.full_path, type);
}
using ::google::cloud::StatusCode;
if (status.code() == StatusCode::kNotFound) {
return FileInfo(path.full_path, FileType::NotFound);
}
return internal::ToArrowStatus(status);
}

GcsOptions options_;
gcs::Client client_;
};
Expand All @@ -70,7 +131,8 @@ bool GcsFileSystem::Equals(const FileSystem& other) const {
}

Result<FileInfo> GcsFileSystem::GetFileInfo(const std::string& path) {
return Status::NotImplemented("The GCS FileSystem is not fully implemented");
ARROW_ASSIGN_OR_RAISE(auto p, GcsPath::FromString(path));
return impl_->GetFileInfo(p);
}

Result<FileInfoVector> GcsFileSystem::GetFileInfo(const FileSelector& select) {
Expand Down
69 changes: 69 additions & 0 deletions cpp/src/arrow/filesystem/gcsfs_internal.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
// 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 "arrow/filesystem/gcsfs_internal.h"

#include <google/cloud/storage/client.h>

#include <sstream>

namespace arrow {
namespace fs {
namespace internal {

Status ToArrowStatus(const google::cloud::Status& s) {
std::ostringstream os;
os << "google::cloud::Status(" << s << ")";
switch (s.code()) {
case google::cloud::StatusCode::kOk:
break;
case google::cloud::StatusCode::kCancelled:
return Status::Cancelled(os.str());
case google::cloud::StatusCode::kUnknown:
return Status::UnknownError(os.str());
case google::cloud::StatusCode::kInvalidArgument:
return Status::Invalid(os.str());
case google::cloud::StatusCode::kDeadlineExceeded:
return Status::IOError(os.str());
case google::cloud::StatusCode::kNotFound:
// TODO: it is unclear if a better mapping would be possible.
Copy link
Member

Choose a reason for hiding this comment

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

I would suggest IOError for all external errors (such as kDeadlineExceeded, kPermissionDenied, kUnauthenticated...).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

return Status::UnknownError(os.str());
case google::cloud::StatusCode::kAlreadyExists:
return Status::AlreadyExists(os.str());
case google::cloud::StatusCode::kPermissionDenied:
case google::cloud::StatusCode::kUnauthenticated:
return Status::IOError(os.str());
case google::cloud::StatusCode::kResourceExhausted:
return Status::CapacityError(os.str());
case google::cloud::StatusCode::kFailedPrecondition:
case google::cloud::StatusCode::kAborted:
return Status::IOError(os.str());
case google::cloud::StatusCode::kOutOfRange:
return Status::Invalid(os.str());
case google::cloud::StatusCode::kUnimplemented:
return Status::NotImplemented(os.str());
case google::cloud::StatusCode::kInternal:
case google::cloud::StatusCode::kUnavailable:
case google::cloud::StatusCode::kDataLoss:
return Status::IOError(os.str());
}
return Status::OK();
}

} // namespace internal
} // namespace fs
} // namespace arrow
Loading