ARROW-14918: [C++] Implement GcsFileSystem::GetFileInfo(FileSelector)#11943

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

Closed
coryan wants to merge 3 commits into from
Closed

ARROW-14918: [C++] Implement GcsFileSystem::GetFileInfo(FileSelector) #11943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0676127
ARROW-14918: [C++] GcsFileSystem and listing files
coryan Dec 9, 2021
29de506
Address review comments
coryan Dec 14, 2021
5ab652b
Address review comments
coryan Dec 14, 2021
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
41 changes: 40 additions & 1 deletion cpp/src/arrow/filesystem/gcsfs.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,45 @@ class GcsFileSystem::Impl {
path.object.back() == '/' ? FileType::Directory : FileType::File);
}

Result<FileInfoVector> GetFileInfo(const FileSelector& select) {
ARROW_ASSIGN_OR_RAISE(auto p, GcsPath::FromString(select.base_dir));
auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
auto delimiter = select.recursive ? gcs::Delimiter() : gcs::Delimiter("/");
bool found_directory = false;
FileInfoVector result;
for (auto const& o : client_.ListObjects(p.bucket, prefix, delimiter)) {
if (!o.ok()) {
if (select.allow_not_found &&
o.status().code() == google::cloud::StatusCode::kNotFound) {
continue;
}
return internal::ToArrowStatus(o.status());
}
found_directory = true;
// Skip the directory itself from the results
if (o->name() == p.object) {
continue;
}
auto path = internal::ConcatAbstractPath(o->bucket(), o->name());
if (o->name().back() == '/') {
result.push_back(
FileInfo(internal::EnsureTrailingSlash(path), FileType::Directory));
continue;
}
auto info = FileInfo(path, FileType::File);
info.set_size(static_cast<int64_t>(o->size()));
Comment thread
pitrou marked this conversation as resolved.
// An object has multiple "time" attributes, including the time when its data was
// created, and the time when its metadata was last updated. We use the object
// creation time because the data for an object cannot be changed once created.
info.set_mtime(o->time_created());
result.push_back(std::move(info));
}
if (!found_directory && !select.allow_not_found) {
return Status::IOError("No such file or directory '", select.base_dir, "'");
}
return result;
}

// GCS does not have directories or folders. But folders can be emulated (with some
// limitations) using marker objects. That and listing with prefixes creates the
// illusion of folders.
Expand DownExpand Up@@ -478,7 +517,7 @@ Result<FileInfo> GcsFileSystem::GetFileInfo(const std::string& path) {
}

Result<FileInfoVector> GcsFileSystem::GetFileInfo(const FileSelector& select) {
return Status::NotImplemented("The GCS FileSystem is not fully implemented");
return impl_->GetFileInfo(select);
}

Status GcsFileSystem::CreateDir(const std::string& path, bool recursive) {
Expand Down
88 changes: 87 additions & 1 deletion cpp/src/arrow/filesystem/gcsfs_test.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,11 @@

namespace arrow {
namespace fs {
/// Custom comparison for FileInfo, we need this to use complex googletest matchers.
Comment thread
pitrou marked this conversation as resolved.
inline bool operator==(const FileInfo& a, const FileInfo& b) {
return a.path() == b.path() && a.type() == b.type();
}

namespace {

namespace bp = boost::process;
Expand All@@ -51,6 +56,7 @@ using ::testing::Not;
using ::testing::NotNull;
using ::testing::Pair;
using ::testing::UnorderedElementsAre;
using ::testing::UnorderedElementsAreArray;

auto const* kLoremIpsum = R"""(
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
Expand DownExpand Up@@ -93,7 +99,7 @@ class GcsTestbench : public ::testing::Environment {
error_ = std::move(error);
}

~GcsTestbench() {
~GcsTestbench() override {
// Brutal shutdown, kill the full process group because the GCS testbench may launch
// additional children.
group_.terminate();
Expand DownExpand Up@@ -187,6 +193,29 @@ class GcsIntegrationTest : public ::testing::Test {

std::string RandomFolderName() { return RandomChars(32) + "/"; }

struct Hierarchy {
std::string base_dir;
std::vector<FileInfo> contents;
};

Result<Hierarchy> CreateHierarchy(std::shared_ptr<arrow::fs::FileSystem> fs) {
const char* const kTestFolders[] = {
"a/", "a/0/", "a/0/0/", "a/1/", "a/2/",
};
auto result = Hierarchy{PreexistingBucketPath() + "a/", {}};
for (auto const* f : kTestFolders) {
const auto folder = PreexistingBucketPath() + f;
RETURN_NOT_OK(fs->CreateDir(folder, true));
result.contents.push_back(arrow::fs::Dir(folder));
for (int i = 0; i != 64; ++i) {
const auto filename = folder + "test-file-" + std::to_string(i);
CreateFile(fs.get(), filename, filename);
result.contents.push_back(arrow::fs::File(filename));
}
}
return result;
}

private:
std::string RandomChars(std::size_t count) {
auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
Expand DownExpand Up@@ -399,6 +428,63 @@ TEST_F(GcsIntegrationTest, GetFileInfoObject) {
arrow::fs::AssertFileInfo(fs.get(), PreexistingObjectPath(), FileType::File);
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorRecursive) {
auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
ASSERT_OK_AND_ASSIGN(auto hierarchy, CreateHierarchy(fs));
std::vector<arrow::fs::FileInfo> expected;
std::copy_if(
hierarchy.contents.begin(), hierarchy.contents.end(), std::back_inserter(expected),
[&](const arrow::fs::FileInfo& info) { return hierarchy.base_dir != info.path(); });

auto selector = FileSelector();
selector.base_dir = hierarchy.base_dir;
selector.allow_not_found = false;
selector.recursive = true;
ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
EXPECT_THAT(results, UnorderedElementsAreArray(expected.begin(), expected.end()));
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNonRecursive) {
auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
ASSERT_OK_AND_ASSIGN(auto hierarchy, CreateHierarchy(fs));
std::vector<arrow::fs::FileInfo> expected;
std::copy_if(hierarchy.contents.begin(), hierarchy.contents.end(),
std::back_inserter(expected), [&](const arrow::fs::FileInfo& info) {
if (info.path() == hierarchy.base_dir) return false;
return internal::EnsureTrailingSlash(
internal::GetAbstractPathParent(info.path()).first) ==
hierarchy.base_dir;
});

auto selector = FileSelector();
selector.base_dir = hierarchy.base_dir;
selector.allow_not_found = false;
selector.recursive = false;
ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
EXPECT_THAT(results, UnorderedElementsAreArray(expected.begin(), expected.end()));
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNotFoundTrue) {
auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());

auto selector = FileSelector();
selector.base_dir = NotFoundObjectPath() + "/";
selector.allow_not_found = true;
selector.recursive = true;
ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
EXPECT_THAT(results, IsEmpty());
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNotFoundFalse) {
auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());

auto selector = FileSelector();
selector.base_dir = NotFoundObjectPath() + "/";
selector.allow_not_found = false;
selector.recursive = false;
ASSERT_RAISES(IOError, fs->GetFileInfo(selector));
}

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketOnly) {
auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
auto bucket_name = RandomBucketName();
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ARROW-14918: [C++] Implement GcsFileSystem::GetFileInfo(FileSelector)#11943

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

 Closed

coryan
wants to merge
3
commits into

from

 Closed


ARROW-14918: [C++] Implement GcsFileSystem::GetFileInfo(FileSelector)
#11943
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0676127

ARROW-14918: [C++] GcsFileSystem and listing files


coryan Dec 9, 2021
29de506

Address review comments


coryan Dec 14, 2021
5ab652b

Address review comments


coryan Dec 14, 2021

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


41 changes: 40 additions & 1 deletion
cpp/src/arrow/filesystem/gcsfs.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,45 @@ class GcsFileSystem::Impl {
 path.object.back() == '/' ? FileType::Directory : FileType::File);
 }

 Result<FileInfoVector> GetFileInfo(const FileSelector& select) {
 ARROW_ASSIGN_OR_RAISE(auto p, GcsPath::FromString(select.base_dir));
 auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
 auto delimiter = select.recursive ? gcs::Delimiter() : gcs::Delimiter("/");
 bool found_directory = false;
 FileInfoVector result;
 for (auto const& o : client_.ListObjects(p.bucket, prefix, delimiter)) {
 if (!o.ok()) {
 if (select.allow_not_found &&
 o.status().code() == google::cloud::StatusCode::kNotFound) {
 continue;
 }
 return internal::ToArrowStatus(o.status());
 }
 found_directory = true;
 // Skip the directory itself from the results
 if (o->name() == p.object) {
 continue;
 }
 auto path = internal::ConcatAbstractPath(o->bucket(), o->name());
 if (o->name().back() == '/') {
 result.push_back(
 FileInfo(internal::EnsureTrailingSlash(path), FileType::Directory));
 continue;
 }
 auto info = FileInfo(path, FileType::File);
 info.set_size(static_cast<int64_t>(o->size()));
Comment thread
pitrou marked this conversation as resolved.

 // An object has multiple "time" attributes, including the time when its data was
 // created, and the time when its metadata was last updated. We use the object
 // creation time because the data for an object cannot be changed once created.
 info.set_mtime(o->time_created());
 result.push_back(std::move(info));
 }
 if (!found_directory && !select.allow_not_found) {
 return Status::IOError("No such file or directory '", select.base_dir, "'");
 }
 return result;
 }

 // GCS does not have directories or folders. But folders can be emulated (with some
 // limitations) using marker objects. That and listing with prefixes creates the
 // illusion of folders.
Expand DownExpand Up@@ -478,7 +517,7 @@ Result<FileInfo> GcsFileSystem::GetFileInfo(const std::string& path) {
}

Result<FileInfoVector> GcsFileSystem::GetFileInfo(const FileSelector& select) {
 return Status::NotImplemented("The GCS FileSystem is not fully implemented");
 return impl_->GetFileInfo(select);
}

Status GcsFileSystem::CreateDir(const std::string& path, bool recursive) {
Expand Down

88 changes: 87 additions & 1 deletion
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,11 @@

namespace arrow {
namespace fs {
/// Custom comparison for FileInfo, we need this to use complex googletest matchers.
Comment thread
pitrou marked this conversation as resolved.

inline bool operator==(const FileInfo& a, const FileInfo& b) {
 return a.path() == b.path() && a.type() == b.type();
}

namespace {

namespace bp = boost::process;
Expand All@@ -51,6 +56,7 @@ using ::testing::Not;
using ::testing::NotNull;
using ::testing::Pair;
using ::testing::UnorderedElementsAre;
using ::testing::UnorderedElementsAreArray;

auto const* kLoremIpsum = R"""(
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
Expand DownExpand Up@@ -93,7 +99,7 @@ class GcsTestbench : public ::testing::Environment {
 error_ = std::move(error);
 }

 ~GcsTestbench() {
 ~GcsTestbench() override {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
Expand DownExpand Up@@ -187,6 +193,29 @@ class GcsIntegrationTest : public ::testing::Test {

 std::string RandomFolderName() { return RandomChars(32) + "/"; }

 struct Hierarchy {
 std::string base_dir;
 std::vector<FileInfo> contents;
 };

 Result<Hierarchy> CreateHierarchy(std::shared_ptr<arrow::fs::FileSystem> fs) {
 const char* const kTestFolders[] = {
 "a/", "a/0/", "a/0/0/", "a/1/", "a/2/",
 };
 auto result = Hierarchy{PreexistingBucketPath() + "a/", {}};
 for (auto const* f : kTestFolders) {
 const auto folder = PreexistingBucketPath() + f;
 RETURN_NOT_OK(fs->CreateDir(folder, true));
 result.contents.push_back(arrow::fs::Dir(folder));
 for (int i = 0; i != 64; ++i) {
 const auto filename = folder + "test-file-" + std::to_string(i);
 CreateFile(fs.get(), filename, filename);
 result.contents.push_back(arrow::fs::File(filename));
 }
 }
 return result;
 }

 private:
 std::string RandomChars(std::size_t count) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
Expand DownExpand Up@@ -399,6 +428,63 @@ TEST_F(GcsIntegrationTest, GetFileInfoObject) {
 arrow::fs::AssertFileInfo(fs.get(), PreexistingObjectPath(), FileType::File);
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorRecursive) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK_AND_ASSIGN(auto hierarchy, CreateHierarchy(fs));
 std::vector<arrow::fs::FileInfo> expected;
 std::copy_if(
 hierarchy.contents.begin(), hierarchy.contents.end(), std::back_inserter(expected),
 [&](const arrow::fs::FileInfo& info) { return hierarchy.base_dir != info.path(); });

 auto selector = FileSelector();
 selector.base_dir = hierarchy.base_dir;
 selector.allow_not_found = false;
 selector.recursive = true;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, UnorderedElementsAreArray(expected.begin(), expected.end()));
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNonRecursive) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK_AND_ASSIGN(auto hierarchy, CreateHierarchy(fs));
 std::vector<arrow::fs::FileInfo> expected;
 std::copy_if(hierarchy.contents.begin(), hierarchy.contents.end(),
 std::back_inserter(expected), [&](const arrow::fs::FileInfo& info) {
 if (info.path() == hierarchy.base_dir) return false;
 return internal::EnsureTrailingSlash(
 internal::GetAbstractPathParent(info.path()).first) ==
 hierarchy.base_dir;
 });

 auto selector = FileSelector();
 selector.base_dir = hierarchy.base_dir;
 selector.allow_not_found = false;
 selector.recursive = false;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, UnorderedElementsAreArray(expected.begin(), expected.end()));
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNotFoundTrue) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());

 auto selector = FileSelector();
 selector.base_dir = NotFoundObjectPath() + "/";
 selector.allow_not_found = true;
 selector.recursive = true;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, IsEmpty());
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNotFoundFalse) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());

 auto selector = FileSelector();
 selector.base_dir = NotFoundObjectPath() + "/";
 selector.allow_not_found = false;
 selector.recursive = false;
 ASSERT_RAISES(IOError, fs->GetFileInfo(selector));
}

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 auto bucket_name = RandomBucketName();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-14918: [C++] Implement GcsFileSystem::GetFileInfo(FileSelector)#11943

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

 Closed

coryan
wants to merge
3
commits into

from

 Closed


ARROW-14918: [C++] Implement GcsFileSystem::GetFileInfo(FileSelector)
#11943
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0676127

ARROW-14918: [C++] GcsFileSystem and listing files


coryan Dec 9, 2021
29de506

Address review comments


coryan Dec 14, 2021
5ab652b

Address review comments


coryan Dec 14, 2021

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


41 changes: 40 additions & 1 deletion
cpp/src/arrow/filesystem/gcsfs.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,45 @@ class GcsFileSystem::Impl {
 path.object.back() == '/' ? FileType::Directory : FileType::File);
 }

 Result<FileInfoVector> GetFileInfo(const FileSelector& select) {
 ARROW_ASSIGN_OR_RAISE(auto p, GcsPath::FromString(select.base_dir));
 auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
 auto delimiter = select.recursive ? gcs::Delimiter() : gcs::Delimiter("/");
 bool found_directory = false;
 FileInfoVector result;
 for (auto const& o : client_.ListObjects(p.bucket, prefix, delimiter)) {
 if (!o.ok()) {
 if (select.allow_not_found &&
 o.status().code() == google::cloud::StatusCode::kNotFound) {
 continue;
 }
 return internal::ToArrowStatus(o.status());
 }
 found_directory = true;
 // Skip the directory itself from the results
 if (o->name() == p.object) {
 continue;
 }
 auto path = internal::ConcatAbstractPath(o->bucket(), o->name());
 if (o->name().back() == '/') {
 result.push_back(
 FileInfo(internal::EnsureTrailingSlash(path), FileType::Directory));
 continue;
 }
 auto info = FileInfo(path, FileType::File);
 info.set_size(static_cast<int64_t>(o->size()));
Comment thread
pitrou marked this conversation as resolved.

 // An object has multiple "time" attributes, including the time when its data was
 // created, and the time when its metadata was last updated. We use the object
 // creation time because the data for an object cannot be changed once created.
 info.set_mtime(o->time_created());
 result.push_back(std::move(info));
 }
 if (!found_directory && !select.allow_not_found) {
 return Status::IOError("No such file or directory '", select.base_dir, "'");
 }
 return result;
 }

 // GCS does not have directories or folders. But folders can be emulated (with some
 // limitations) using marker objects. That and listing with prefixes creates the
 // illusion of folders.
Expand DownExpand Up@@ -478,7 +517,7 @@ Result<FileInfo> GcsFileSystem::GetFileInfo(const std::string& path) {
}

Result<FileInfoVector> GcsFileSystem::GetFileInfo(const FileSelector& select) {
 return Status::NotImplemented("The GCS FileSystem is not fully implemented");
 return impl_->GetFileInfo(select);
}

Status GcsFileSystem::CreateDir(const std::string& path, bool recursive) {
Expand Down

88 changes: 87 additions & 1 deletion
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,11 @@

namespace arrow {
namespace fs {
/// Custom comparison for FileInfo, we need this to use complex googletest matchers.
Comment thread
pitrou marked this conversation as resolved.

inline bool operator==(const FileInfo& a, const FileInfo& b) {
 return a.path() == b.path() && a.type() == b.type();
}

namespace {

namespace bp = boost::process;
Expand All@@ -51,6 +56,7 @@ using ::testing::Not;
using ::testing::NotNull;
using ::testing::Pair;
using ::testing::UnorderedElementsAre;
using ::testing::UnorderedElementsAreArray;

auto const* kLoremIpsum = R"""(
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
Expand DownExpand Up@@ -93,7 +99,7 @@ class GcsTestbench : public ::testing::Environment {
 error_ = std::move(error);
 }

 ~GcsTestbench() {
 ~GcsTestbench() override {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
Expand DownExpand Up@@ -187,6 +193,29 @@ class GcsIntegrationTest : public ::testing::Test {

 std::string RandomFolderName() { return RandomChars(32) + "/"; }

 struct Hierarchy {
 std::string base_dir;
 std::vector<FileInfo> contents;
 };

 Result<Hierarchy> CreateHierarchy(std::shared_ptr<arrow::fs::FileSystem> fs) {
 const char* const kTestFolders[] = {
 "a/", "a/0/", "a/0/0/", "a/1/", "a/2/",
 };
 auto result = Hierarchy{PreexistingBucketPath() + "a/", {}};
 for (auto const* f : kTestFolders) {
 const auto folder = PreexistingBucketPath() + f;
 RETURN_NOT_OK(fs->CreateDir(folder, true));
 result.contents.push_back(arrow::fs::Dir(folder));
 for (int i = 0; i != 64; ++i) {
 const auto filename = folder + "test-file-" + std::to_string(i);
 CreateFile(fs.get(), filename, filename);
 result.contents.push_back(arrow::fs::File(filename));
 }
 }
 return result;
 }

 private:
 std::string RandomChars(std::size_t count) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
Expand DownExpand Up@@ -399,6 +428,63 @@ TEST_F(GcsIntegrationTest, GetFileInfoObject) {
 arrow::fs::AssertFileInfo(fs.get(), PreexistingObjectPath(), FileType::File);
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorRecursive) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK_AND_ASSIGN(auto hierarchy, CreateHierarchy(fs));
 std::vector<arrow::fs::FileInfo> expected;
 std::copy_if(
 hierarchy.contents.begin(), hierarchy.contents.end(), std::back_inserter(expected),
 [&](const arrow::fs::FileInfo& info) { return hierarchy.base_dir != info.path(); });

 auto selector = FileSelector();
 selector.base_dir = hierarchy.base_dir;
 selector.allow_not_found = false;
 selector.recursive = true;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, UnorderedElementsAreArray(expected.begin(), expected.end()));
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNonRecursive) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK_AND_ASSIGN(auto hierarchy, CreateHierarchy(fs));
 std::vector<arrow::fs::FileInfo> expected;
 std::copy_if(hierarchy.contents.begin(), hierarchy.contents.end(),
 std::back_inserter(expected), [&](const arrow::fs::FileInfo& info) {
 if (info.path() == hierarchy.base_dir) return false;
 return internal::EnsureTrailingSlash(
 internal::GetAbstractPathParent(info.path()).first) ==
 hierarchy.base_dir;
 });

 auto selector = FileSelector();
 selector.base_dir = hierarchy.base_dir;
 selector.allow_not_found = false;
 selector.recursive = false;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, UnorderedElementsAreArray(expected.begin(), expected.end()));
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNotFoundTrue) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());

 auto selector = FileSelector();
 selector.base_dir = NotFoundObjectPath() + "/";
 selector.allow_not_found = true;
 selector.recursive = true;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, IsEmpty());
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNotFoundFalse) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());

 auto selector = FileSelector();
 selector.base_dir = NotFoundObjectPath() + "/";
 selector.allow_not_found = false;
 selector.recursive = false;
 ASSERT_RAISES(IOError, fs->GetFileInfo(selector));
}

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 auto bucket_name = RandomBucketName();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-14918: [C++] Implement GcsFileSystem::GetFileInfo(FileSelector)#11943

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

 Closed

coryan
wants to merge
3
commits into

from

 Closed


ARROW-14918: [C++] Implement GcsFileSystem::GetFileInfo(FileSelector)
#11943
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0676127

ARROW-14918: [C++] GcsFileSystem and listing files


coryan Dec 9, 2021
29de506

Address review comments


coryan Dec 14, 2021
5ab652b

Address review comments


coryan Dec 14, 2021

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


41 changes: 40 additions & 1 deletion
cpp/src/arrow/filesystem/gcsfs.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,45 @@ class GcsFileSystem::Impl {
 path.object.back() == '/' ? FileType::Directory : FileType::File);
 }

 Result<FileInfoVector> GetFileInfo(const FileSelector& select) {
 ARROW_ASSIGN_OR_RAISE(auto p, GcsPath::FromString(select.base_dir));
 auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
 auto delimiter = select.recursive ? gcs::Delimiter() : gcs::Delimiter("/");
 bool found_directory = false;
 FileInfoVector result;
 for (auto const& o : client_.ListObjects(p.bucket, prefix, delimiter)) {
 if (!o.ok()) {
 if (select.allow_not_found &&
 o.status().code() == google::cloud::StatusCode::kNotFound) {
 continue;
 }
 return internal::ToArrowStatus(o.status());
 }
 found_directory = true;
 // Skip the directory itself from the results
 if (o->name() == p.object) {
 continue;
 }
 auto path = internal::ConcatAbstractPath(o->bucket(), o->name());
 if (o->name().back() == '/') {
 result.push_back(
 FileInfo(internal::EnsureTrailingSlash(path), FileType::Directory));
 continue;
 }
 auto info = FileInfo(path, FileType::File);
 info.set_size(static_cast<int64_t>(o->size()));
Comment thread
pitrou marked this conversation as resolved.

 // An object has multiple "time" attributes, including the time when its data was
 // created, and the time when its metadata was last updated. We use the object
 // creation time because the data for an object cannot be changed once created.
 info.set_mtime(o->time_created());
 result.push_back(std::move(info));
 }
 if (!found_directory && !select.allow_not_found) {
 return Status::IOError("No such file or directory '", select.base_dir, "'");
 }
 return result;
 }

 // GCS does not have directories or folders. But folders can be emulated (with some
 // limitations) using marker objects. That and listing with prefixes creates the
 // illusion of folders.
Expand DownExpand Up@@ -478,7 +517,7 @@ Result<FileInfo> GcsFileSystem::GetFileInfo(const std::string& path) {
}

Result<FileInfoVector> GcsFileSystem::GetFileInfo(const FileSelector& select) {
 return Status::NotImplemented("The GCS FileSystem is not fully implemented");
 return impl_->GetFileInfo(select);
}

Status GcsFileSystem::CreateDir(const std::string& path, bool recursive) {
Expand Down

88 changes: 87 additions & 1 deletion
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,11 @@

namespace arrow {
namespace fs {
/// Custom comparison for FileInfo, we need this to use complex googletest matchers.
Comment thread
pitrou marked this conversation as resolved.

inline bool operator==(const FileInfo& a, const FileInfo& b) {
 return a.path() == b.path() && a.type() == b.type();
}

namespace {

namespace bp = boost::process;
Expand All@@ -51,6 +56,7 @@ using ::testing::Not;
using ::testing::NotNull;
using ::testing::Pair;
using ::testing::UnorderedElementsAre;
using ::testing::UnorderedElementsAreArray;

auto const* kLoremIpsum = R"""(
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
Expand DownExpand Up@@ -93,7 +99,7 @@ class GcsTestbench : public ::testing::Environment {
 error_ = std::move(error);
 }

 ~GcsTestbench() {
 ~GcsTestbench() override {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
Expand DownExpand Up@@ -187,6 +193,29 @@ class GcsIntegrationTest : public ::testing::Test {

 std::string RandomFolderName() { return RandomChars(32) + "/"; }

 struct Hierarchy {
 std::string base_dir;
 std::vector<FileInfo> contents;
 };

 Result<Hierarchy> CreateHierarchy(std::shared_ptr<arrow::fs::FileSystem> fs) {
 const char* const kTestFolders[] = {
 "a/", "a/0/", "a/0/0/", "a/1/", "a/2/",
 };
 auto result = Hierarchy{PreexistingBucketPath() + "a/", {}};
 for (auto const* f : kTestFolders) {
 const auto folder = PreexistingBucketPath() + f;
 RETURN_NOT_OK(fs->CreateDir(folder, true));
 result.contents.push_back(arrow::fs::Dir(folder));
 for (int i = 0; i != 64; ++i) {
 const auto filename = folder + "test-file-" + std::to_string(i);
 CreateFile(fs.get(), filename, filename);
 result.contents.push_back(arrow::fs::File(filename));
 }
 }
 return result;
 }

 private:
 std::string RandomChars(std::size_t count) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
Expand DownExpand Up@@ -399,6 +428,63 @@ TEST_F(GcsIntegrationTest, GetFileInfoObject) {
 arrow::fs::AssertFileInfo(fs.get(), PreexistingObjectPath(), FileType::File);
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorRecursive) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK_AND_ASSIGN(auto hierarchy, CreateHierarchy(fs));
 std::vector<arrow::fs::FileInfo> expected;
 std::copy_if(
 hierarchy.contents.begin(), hierarchy.contents.end(), std::back_inserter(expected),
 [&](const arrow::fs::FileInfo& info) { return hierarchy.base_dir != info.path(); });

 auto selector = FileSelector();
 selector.base_dir = hierarchy.base_dir;
 selector.allow_not_found = false;
 selector.recursive = true;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, UnorderedElementsAreArray(expected.begin(), expected.end()));
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNonRecursive) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK_AND_ASSIGN(auto hierarchy, CreateHierarchy(fs));
 std::vector<arrow::fs::FileInfo> expected;
 std::copy_if(hierarchy.contents.begin(), hierarchy.contents.end(),
 std::back_inserter(expected), [&](const arrow::fs::FileInfo& info) {
 if (info.path() == hierarchy.base_dir) return false;
 return internal::EnsureTrailingSlash(
 internal::GetAbstractPathParent(info.path()).first) ==
 hierarchy.base_dir;
 });

 auto selector = FileSelector();
 selector.base_dir = hierarchy.base_dir;
 selector.allow_not_found = false;
 selector.recursive = false;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, UnorderedElementsAreArray(expected.begin(), expected.end()));
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNotFoundTrue) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());

 auto selector = FileSelector();
 selector.base_dir = NotFoundObjectPath() + "/";
 selector.allow_not_found = true;
 selector.recursive = true;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, IsEmpty());
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNotFoundFalse) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());

 auto selector = FileSelector();
 selector.base_dir = NotFoundObjectPath() + "/";
 selector.allow_not_found = false;
 selector.recursive = false;
 ASSERT_RAISES(IOError, fs->GetFileInfo(selector));
}

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 auto bucket_name = RandomBucketName();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ARROW-14918: [C++] Implement GcsFileSystem::GetFileInfo(FileSelector)#11943

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

 Closed

coryan
wants to merge
3
commits into

from

 Closed


ARROW-14918: [C++] Implement GcsFileSystem::GetFileInfo(FileSelector)
#11943
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0676127

ARROW-14918: [C++] GcsFileSystem and listing files


coryan Dec 9, 2021
29de506

Address review comments


coryan Dec 14, 2021
5ab652b

Address review comments


coryan Dec 14, 2021

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


41 changes: 40 additions & 1 deletion
cpp/src/arrow/filesystem/gcsfs.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,45 @@ class GcsFileSystem::Impl {
 path.object.back() == '/' ? FileType::Directory : FileType::File);
 }

 Result<FileInfoVector> GetFileInfo(const FileSelector& select) {
 ARROW_ASSIGN_OR_RAISE(auto p, GcsPath::FromString(select.base_dir));
 auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
 auto delimiter = select.recursive ? gcs::Delimiter() : gcs::Delimiter("/");
 bool found_directory = false;
 FileInfoVector result;
 for (auto const& o : client_.ListObjects(p.bucket, prefix, delimiter)) {
 if (!o.ok()) {
 if (select.allow_not_found &&
 o.status().code() == google::cloud::StatusCode::kNotFound) {
 continue;
 }
 return internal::ToArrowStatus(o.status());
 }
 found_directory = true;
 // Skip the directory itself from the results
 if (o->name() == p.object) {
 continue;
 }
 auto path = internal::ConcatAbstractPath(o->bucket(), o->name());
 if (o->name().back() == '/') {
 result.push_back(
 FileInfo(internal::EnsureTrailingSlash(path), FileType::Directory));
 continue;
 }
 auto info = FileInfo(path, FileType::File);
 info.set_size(static_cast<int64_t>(o->size()));
Comment thread
pitrou marked this conversation as resolved.

 // An object has multiple "time" attributes, including the time when its data was
 // created, and the time when its metadata was last updated. We use the object
 // creation time because the data for an object cannot be changed once created.
 info.set_mtime(o->time_created());
 result.push_back(std::move(info));
 }
 if (!found_directory && !select.allow_not_found) {
 return Status::IOError("No such file or directory '", select.base_dir, "'");
 }
 return result;
 }

 // GCS does not have directories or folders. But folders can be emulated (with some
 // limitations) using marker objects. That and listing with prefixes creates the
 // illusion of folders.
Expand DownExpand Up@@ -478,7 +517,7 @@ Result<FileInfo> GcsFileSystem::GetFileInfo(const std::string& path) {
}

Result<FileInfoVector> GcsFileSystem::GetFileInfo(const FileSelector& select) {
 return Status::NotImplemented("The GCS FileSystem is not fully implemented");
 return impl_->GetFileInfo(select);
}

Status GcsFileSystem::CreateDir(const std::string& path, bool recursive) {
Expand Down

88 changes: 87 additions & 1 deletion
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,11 @@

namespace arrow {
namespace fs {
/// Custom comparison for FileInfo, we need this to use complex googletest matchers.
Comment thread
pitrou marked this conversation as resolved.

inline bool operator==(const FileInfo& a, const FileInfo& b) {
 return a.path() == b.path() && a.type() == b.type();
}

namespace {

namespace bp = boost::process;
Expand All@@ -51,6 +56,7 @@ using ::testing::Not;
using ::testing::NotNull;
using ::testing::Pair;
using ::testing::UnorderedElementsAre;
using ::testing::UnorderedElementsAreArray;

auto const* kLoremIpsum = R"""(
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
Expand DownExpand Up@@ -93,7 +99,7 @@ class GcsTestbench : public ::testing::Environment {
 error_ = std::move(error);
 }

 ~GcsTestbench() {
 ~GcsTestbench() override {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
Expand DownExpand Up@@ -187,6 +193,29 @@ class GcsIntegrationTest : public ::testing::Test {

 std::string RandomFolderName() { return RandomChars(32) + "/"; }

 struct Hierarchy {
 std::string base_dir;
 std::vector<FileInfo> contents;
 };

 Result<Hierarchy> CreateHierarchy(std::shared_ptr<arrow::fs::FileSystem> fs) {
 const char* const kTestFolders[] = {
 "a/", "a/0/", "a/0/0/", "a/1/", "a/2/",
 };
 auto result = Hierarchy{PreexistingBucketPath() + "a/", {}};
 for (auto const* f : kTestFolders) {
 const auto folder = PreexistingBucketPath() + f;
 RETURN_NOT_OK(fs->CreateDir(folder, true));
 result.contents.push_back(arrow::fs::Dir(folder));
 for (int i = 0; i != 64; ++i) {
 const auto filename = folder + "test-file-" + std::to_string(i);
 CreateFile(fs.get(), filename, filename);
 result.contents.push_back(arrow::fs::File(filename));
 }
 }
 return result;
 }

 private:
 std::string RandomChars(std::size_t count) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
Expand DownExpand Up@@ -399,6 +428,63 @@ TEST_F(GcsIntegrationTest, GetFileInfoObject) {
 arrow::fs::AssertFileInfo(fs.get(), PreexistingObjectPath(), FileType::File);
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorRecursive) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK_AND_ASSIGN(auto hierarchy, CreateHierarchy(fs));
 std::vector<arrow::fs::FileInfo> expected;
 std::copy_if(
 hierarchy.contents.begin(), hierarchy.contents.end(), std::back_inserter(expected),
 [&](const arrow::fs::FileInfo& info) { return hierarchy.base_dir != info.path(); });

 auto selector = FileSelector();
 selector.base_dir = hierarchy.base_dir;
 selector.allow_not_found = false;
 selector.recursive = true;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, UnorderedElementsAreArray(expected.begin(), expected.end()));
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNonRecursive) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK_AND_ASSIGN(auto hierarchy, CreateHierarchy(fs));
 std::vector<arrow::fs::FileInfo> expected;
 std::copy_if(hierarchy.contents.begin(), hierarchy.contents.end(),
 std::back_inserter(expected), [&](const arrow::fs::FileInfo& info) {
 if (info.path() == hierarchy.base_dir) return false;
 return internal::EnsureTrailingSlash(
 internal::GetAbstractPathParent(info.path()).first) ==
 hierarchy.base_dir;
 });

 auto selector = FileSelector();
 selector.base_dir = hierarchy.base_dir;
 selector.allow_not_found = false;
 selector.recursive = false;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, UnorderedElementsAreArray(expected.begin(), expected.end()));
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNotFoundTrue) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());

 auto selector = FileSelector();
 selector.base_dir = NotFoundObjectPath() + "/";
 selector.allow_not_found = true;
 selector.recursive = true;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, IsEmpty());
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNotFoundFalse) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());

 auto selector = FileSelector();
 selector.base_dir = NotFoundObjectPath() + "/";
 selector.allow_not_found = false;
 selector.recursive = false;
 ASSERT_RAISES(IOError, fs->GetFileInfo(selector));
}

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 auto bucket_name = RandomBucketName();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-14918: [C++] Implement GcsFileSystem::GetFileInfo(FileSelector)#11943

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

 Closed

coryan
wants to merge
3
commits into

from

 Closed


ARROW-14918: [C++] Implement GcsFileSystem::GetFileInfo(FileSelector)
#11943
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0676127

ARROW-14918: [C++] GcsFileSystem and listing files


coryan Dec 9, 2021
29de506

Address review comments


coryan Dec 14, 2021
5ab652b

Address review comments


coryan Dec 14, 2021

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


41 changes: 40 additions & 1 deletion
cpp/src/arrow/filesystem/gcsfs.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,45 @@ class GcsFileSystem::Impl {
 path.object.back() == '/' ? FileType::Directory : FileType::File);
 }

 Result<FileInfoVector> GetFileInfo(const FileSelector& select) {
 ARROW_ASSIGN_OR_RAISE(auto p, GcsPath::FromString(select.base_dir));
 auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
 auto delimiter = select.recursive ? gcs::Delimiter() : gcs::Delimiter("/");
 bool found_directory = false;
 FileInfoVector result;
 for (auto const& o : client_.ListObjects(p.bucket, prefix, delimiter)) {
 if (!o.ok()) {
 if (select.allow_not_found &&
 o.status().code() == google::cloud::StatusCode::kNotFound) {
 continue;
 }
 return internal::ToArrowStatus(o.status());
 }
 found_directory = true;
 // Skip the directory itself from the results
 if (o->name() == p.object) {
 continue;
 }
 auto path = internal::ConcatAbstractPath(o->bucket(), o->name());
 if (o->name().back() == '/') {
 result.push_back(
 FileInfo(internal::EnsureTrailingSlash(path), FileType::Directory));
 continue;
 }
 auto info = FileInfo(path, FileType::File);
 info.set_size(static_cast<int64_t>(o->size()));
Comment thread
pitrou marked this conversation as resolved.

 // An object has multiple "time" attributes, including the time when its data was
 // created, and the time when its metadata was last updated. We use the object
 // creation time because the data for an object cannot be changed once created.
 info.set_mtime(o->time_created());
 result.push_back(std::move(info));
 }
 if (!found_directory && !select.allow_not_found) {
 return Status::IOError("No such file or directory '", select.base_dir, "'");
 }
 return result;
 }

 // GCS does not have directories or folders. But folders can be emulated (with some
 // limitations) using marker objects. That and listing with prefixes creates the
 // illusion of folders.
Expand DownExpand Up@@ -478,7 +517,7 @@ Result<FileInfo> GcsFileSystem::GetFileInfo(const std::string& path) {
}

Result<FileInfoVector> GcsFileSystem::GetFileInfo(const FileSelector& select) {
 return Status::NotImplemented("The GCS FileSystem is not fully implemented");
 return impl_->GetFileInfo(select);
}

Status GcsFileSystem::CreateDir(const std::string& path, bool recursive) {
Expand Down

88 changes: 87 additions & 1 deletion
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,11 @@

namespace arrow {
namespace fs {
/// Custom comparison for FileInfo, we need this to use complex googletest matchers.
Comment thread
pitrou marked this conversation as resolved.

inline bool operator==(const FileInfo& a, const FileInfo& b) {
 return a.path() == b.path() && a.type() == b.type();
}

namespace {

namespace bp = boost::process;
Expand All@@ -51,6 +56,7 @@ using ::testing::Not;
using ::testing::NotNull;
using ::testing::Pair;
using ::testing::UnorderedElementsAre;
using ::testing::UnorderedElementsAreArray;

auto const* kLoremIpsum = R"""(
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
Expand DownExpand Up@@ -93,7 +99,7 @@ class GcsTestbench : public ::testing::Environment {
 error_ = std::move(error);
 }

 ~GcsTestbench() {
 ~GcsTestbench() override {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
Expand DownExpand Up@@ -187,6 +193,29 @@ class GcsIntegrationTest : public ::testing::Test {

 std::string RandomFolderName() { return RandomChars(32) + "/"; }

 struct Hierarchy {
 std::string base_dir;
 std::vector<FileInfo> contents;
 };

 Result<Hierarchy> CreateHierarchy(std::shared_ptr<arrow::fs::FileSystem> fs) {
 const char* const kTestFolders[] = {
 "a/", "a/0/", "a/0/0/", "a/1/", "a/2/",
 };
 auto result = Hierarchy{PreexistingBucketPath() + "a/", {}};
 for (auto const* f : kTestFolders) {
 const auto folder = PreexistingBucketPath() + f;
 RETURN_NOT_OK(fs->CreateDir(folder, true));
 result.contents.push_back(arrow::fs::Dir(folder));
 for (int i = 0; i != 64; ++i) {
 const auto filename = folder + "test-file-" + std::to_string(i);
 CreateFile(fs.get(), filename, filename);
 result.contents.push_back(arrow::fs::File(filename));
 }
 }
 return result;
 }

 private:
 std::string RandomChars(std::size_t count) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
Expand DownExpand Up@@ -399,6 +428,63 @@ TEST_F(GcsIntegrationTest, GetFileInfoObject) {
 arrow::fs::AssertFileInfo(fs.get(), PreexistingObjectPath(), FileType::File);
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorRecursive) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK_AND_ASSIGN(auto hierarchy, CreateHierarchy(fs));
 std::vector<arrow::fs::FileInfo> expected;
 std::copy_if(
 hierarchy.contents.begin(), hierarchy.contents.end(), std::back_inserter(expected),
 [&](const arrow::fs::FileInfo& info) { return hierarchy.base_dir != info.path(); });

 auto selector = FileSelector();
 selector.base_dir = hierarchy.base_dir;
 selector.allow_not_found = false;
 selector.recursive = true;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, UnorderedElementsAreArray(expected.begin(), expected.end()));
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNonRecursive) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK_AND_ASSIGN(auto hierarchy, CreateHierarchy(fs));
 std::vector<arrow::fs::FileInfo> expected;
 std::copy_if(hierarchy.contents.begin(), hierarchy.contents.end(),
 std::back_inserter(expected), [&](const arrow::fs::FileInfo& info) {
 if (info.path() == hierarchy.base_dir) return false;
 return internal::EnsureTrailingSlash(
 internal::GetAbstractPathParent(info.path()).first) ==
 hierarchy.base_dir;
 });

 auto selector = FileSelector();
 selector.base_dir = hierarchy.base_dir;
 selector.allow_not_found = false;
 selector.recursive = false;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, UnorderedElementsAreArray(expected.begin(), expected.end()));
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNotFoundTrue) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());

 auto selector = FileSelector();
 selector.base_dir = NotFoundObjectPath() + "/";
 selector.allow_not_found = true;
 selector.recursive = true;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, IsEmpty());
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNotFoundFalse) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());

 auto selector = FileSelector();
 selector.base_dir = NotFoundObjectPath() + "/";
 selector.allow_not_found = false;
 selector.recursive = false;
 ASSERT_RAISES(IOError, fs->GetFileInfo(selector));
}

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 auto bucket_name = RandomBucketName();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-14918: [C++] Implement GcsFileSystem::GetFileInfo(FileSelector)#11943

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

 Closed

coryan
wants to merge
3
commits into

from

 Closed


ARROW-14918: [C++] Implement GcsFileSystem::GetFileInfo(FileSelector)
#11943
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0676127

ARROW-14918: [C++] GcsFileSystem and listing files


coryan Dec 9, 2021
29de506

Address review comments


coryan Dec 14, 2021
5ab652b

Address review comments


coryan Dec 14, 2021

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


41 changes: 40 additions & 1 deletion
cpp/src/arrow/filesystem/gcsfs.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,45 @@ class GcsFileSystem::Impl {
 path.object.back() == '/' ? FileType::Directory : FileType::File);
 }

 Result<FileInfoVector> GetFileInfo(const FileSelector& select) {
 ARROW_ASSIGN_OR_RAISE(auto p, GcsPath::FromString(select.base_dir));
 auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
 auto delimiter = select.recursive ? gcs::Delimiter() : gcs::Delimiter("/");
 bool found_directory = false;
 FileInfoVector result;
 for (auto const& o : client_.ListObjects(p.bucket, prefix, delimiter)) {
 if (!o.ok()) {
 if (select.allow_not_found &&
 o.status().code() == google::cloud::StatusCode::kNotFound) {
 continue;
 }
 return internal::ToArrowStatus(o.status());
 }
 found_directory = true;
 // Skip the directory itself from the results
 if (o->name() == p.object) {
 continue;
 }
 auto path = internal::ConcatAbstractPath(o->bucket(), o->name());
 if (o->name().back() == '/') {
 result.push_back(
 FileInfo(internal::EnsureTrailingSlash(path), FileType::Directory));
 continue;
 }
 auto info = FileInfo(path, FileType::File);
 info.set_size(static_cast<int64_t>(o->size()));
Comment thread
pitrou marked this conversation as resolved.

 // An object has multiple "time" attributes, including the time when its data was
 // created, and the time when its metadata was last updated. We use the object
 // creation time because the data for an object cannot be changed once created.
 info.set_mtime(o->time_created());
 result.push_back(std::move(info));
 }
 if (!found_directory && !select.allow_not_found) {
 return Status::IOError("No such file or directory '", select.base_dir, "'");
 }
 return result;
 }

 // GCS does not have directories or folders. But folders can be emulated (with some
 // limitations) using marker objects. That and listing with prefixes creates the
 // illusion of folders.
Expand DownExpand Up@@ -478,7 +517,7 @@ Result<FileInfo> GcsFileSystem::GetFileInfo(const std::string& path) {
}

Result<FileInfoVector> GcsFileSystem::GetFileInfo(const FileSelector& select) {
 return Status::NotImplemented("The GCS FileSystem is not fully implemented");
 return impl_->GetFileInfo(select);
}

Status GcsFileSystem::CreateDir(const std::string& path, bool recursive) {
Expand Down

88 changes: 87 additions & 1 deletion
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,11 @@

namespace arrow {
namespace fs {
/// Custom comparison for FileInfo, we need this to use complex googletest matchers.
Comment thread
pitrou marked this conversation as resolved.

inline bool operator==(const FileInfo& a, const FileInfo& b) {
 return a.path() == b.path() && a.type() == b.type();
}

namespace {

namespace bp = boost::process;
Expand All@@ -51,6 +56,7 @@ using ::testing::Not;
using ::testing::NotNull;
using ::testing::Pair;
using ::testing::UnorderedElementsAre;
using ::testing::UnorderedElementsAreArray;

auto const* kLoremIpsum = R"""(
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
Expand DownExpand Up@@ -93,7 +99,7 @@ class GcsTestbench : public ::testing::Environment {
 error_ = std::move(error);
 }

 ~GcsTestbench() {
 ~GcsTestbench() override {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
Expand DownExpand Up@@ -187,6 +193,29 @@ class GcsIntegrationTest : public ::testing::Test {

 std::string RandomFolderName() { return RandomChars(32) + "/"; }

 struct Hierarchy {
 std::string base_dir;
 std::vector<FileInfo> contents;
 };

 Result<Hierarchy> CreateHierarchy(std::shared_ptr<arrow::fs::FileSystem> fs) {
 const char* const kTestFolders[] = {
 "a/", "a/0/", "a/0/0/", "a/1/", "a/2/",
 };
 auto result = Hierarchy{PreexistingBucketPath() + "a/", {}};
 for (auto const* f : kTestFolders) {
 const auto folder = PreexistingBucketPath() + f;
 RETURN_NOT_OK(fs->CreateDir(folder, true));
 result.contents.push_back(arrow::fs::Dir(folder));
 for (int i = 0; i != 64; ++i) {
 const auto filename = folder + "test-file-" + std::to_string(i);
 CreateFile(fs.get(), filename, filename);
 result.contents.push_back(arrow::fs::File(filename));
 }
 }
 return result;
 }

 private:
 std::string RandomChars(std::size_t count) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
Expand DownExpand Up@@ -399,6 +428,63 @@ TEST_F(GcsIntegrationTest, GetFileInfoObject) {
 arrow::fs::AssertFileInfo(fs.get(), PreexistingObjectPath(), FileType::File);
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorRecursive) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK_AND_ASSIGN(auto hierarchy, CreateHierarchy(fs));
 std::vector<arrow::fs::FileInfo> expected;
 std::copy_if(
 hierarchy.contents.begin(), hierarchy.contents.end(), std::back_inserter(expected),
 [&](const arrow::fs::FileInfo& info) { return hierarchy.base_dir != info.path(); });

 auto selector = FileSelector();
 selector.base_dir = hierarchy.base_dir;
 selector.allow_not_found = false;
 selector.recursive = true;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, UnorderedElementsAreArray(expected.begin(), expected.end()));
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNonRecursive) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK_AND_ASSIGN(auto hierarchy, CreateHierarchy(fs));
 std::vector<arrow::fs::FileInfo> expected;
 std::copy_if(hierarchy.contents.begin(), hierarchy.contents.end(),
 std::back_inserter(expected), [&](const arrow::fs::FileInfo& info) {
 if (info.path() == hierarchy.base_dir) return false;
 return internal::EnsureTrailingSlash(
 internal::GetAbstractPathParent(info.path()).first) ==
 hierarchy.base_dir;
 });

 auto selector = FileSelector();
 selector.base_dir = hierarchy.base_dir;
 selector.allow_not_found = false;
 selector.recursive = false;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, UnorderedElementsAreArray(expected.begin(), expected.end()));
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNotFoundTrue) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());

 auto selector = FileSelector();
 selector.base_dir = NotFoundObjectPath() + "/";
 selector.allow_not_found = true;
 selector.recursive = true;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, IsEmpty());
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNotFoundFalse) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());

 auto selector = FileSelector();
 selector.base_dir = NotFoundObjectPath() + "/";
 selector.allow_not_found = false;
 selector.recursive = false;
 ASSERT_RAISES(IOError, fs->GetFileInfo(selector));
}

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 auto bucket_name = RandomBucketName();
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ARROW-14918: [C++] Implement GcsFileSystem::GetFileInfo(FileSelector)#11943

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

 Closed

coryan
wants to merge
3
commits into

from

 Closed


ARROW-14918: [C++] Implement GcsFileSystem::GetFileInfo(FileSelector)
#11943
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0676127

ARROW-14918: [C++] GcsFileSystem and listing files


coryan Dec 9, 2021
29de506

Address review comments


coryan Dec 14, 2021
5ab652b

Address review comments


coryan Dec 14, 2021

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


41 changes: 40 additions & 1 deletion
cpp/src/arrow/filesystem/gcsfs.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -285,6 +285,45 @@ class GcsFileSystem::Impl {
 path.object.back() == '/' ? FileType::Directory : FileType::File);
 }

 Result<FileInfoVector> GetFileInfo(const FileSelector& select) {
 ARROW_ASSIGN_OR_RAISE(auto p, GcsPath::FromString(select.base_dir));
 auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
 auto delimiter = select.recursive ? gcs::Delimiter() : gcs::Delimiter("/");
 bool found_directory = false;
 FileInfoVector result;
 for (auto const& o : client_.ListObjects(p.bucket, prefix, delimiter)) {
 if (!o.ok()) {
 if (select.allow_not_found &&
 o.status().code() == google::cloud::StatusCode::kNotFound) {
 continue;
 }
 return internal::ToArrowStatus(o.status());
 }
 found_directory = true;
 // Skip the directory itself from the results
 if (o->name() == p.object) {
 continue;
 }
 auto path = internal::ConcatAbstractPath(o->bucket(), o->name());
 if (o->name().back() == '/') {
 result.push_back(
 FileInfo(internal::EnsureTrailingSlash(path), FileType::Directory));
 continue;
 }
 auto info = FileInfo(path, FileType::File);
 info.set_size(static_cast<int64_t>(o->size()));
Comment thread
pitrou marked this conversation as resolved.

 // An object has multiple "time" attributes, including the time when its data was
 // created, and the time when its metadata was last updated. We use the object
 // creation time because the data for an object cannot be changed once created.
 info.set_mtime(o->time_created());
 result.push_back(std::move(info));
 }
 if (!found_directory && !select.allow_not_found) {
 return Status::IOError("No such file or directory '", select.base_dir, "'");
 }
 return result;
 }

 // GCS does not have directories or folders. But folders can be emulated (with some
 // limitations) using marker objects. That and listing with prefixes creates the
 // illusion of folders.
Expand DownExpand Up@@ -478,7 +517,7 @@ Result<FileInfo> GcsFileSystem::GetFileInfo(const std::string& path) {
}

Result<FileInfoVector> GcsFileSystem::GetFileInfo(const FileSelector& select) {
 return Status::NotImplemented("The GCS FileSystem is not fully implemented");
 return impl_->GetFileInfo(select);
}

Status GcsFileSystem::CreateDir(const std::string& path, bool recursive) {
Expand Down

88 changes: 87 additions & 1 deletion
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,11 @@

namespace arrow {
namespace fs {
/// Custom comparison for FileInfo, we need this to use complex googletest matchers.
Comment thread
pitrou marked this conversation as resolved.

inline bool operator==(const FileInfo& a, const FileInfo& b) {
 return a.path() == b.path() && a.type() == b.type();
}

namespace {

namespace bp = boost::process;
Expand All@@ -51,6 +56,7 @@ using ::testing::Not;
using ::testing::NotNull;
using ::testing::Pair;
using ::testing::UnorderedElementsAre;
using ::testing::UnorderedElementsAreArray;

auto const* kLoremIpsum = R"""(
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
Expand DownExpand Up@@ -93,7 +99,7 @@ class GcsTestbench : public ::testing::Environment {
 error_ = std::move(error);
 }

 ~GcsTestbench() {
 ~GcsTestbench() override {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
Expand DownExpand Up@@ -187,6 +193,29 @@ class GcsIntegrationTest : public ::testing::Test {

 std::string RandomFolderName() { return RandomChars(32) + "/"; }

 struct Hierarchy {
 std::string base_dir;
 std::vector<FileInfo> contents;
 };

 Result<Hierarchy> CreateHierarchy(std::shared_ptr<arrow::fs::FileSystem> fs) {
 const char* const kTestFolders[] = {
 "a/", "a/0/", "a/0/0/", "a/1/", "a/2/",
 };
 auto result = Hierarchy{PreexistingBucketPath() + "a/", {}};
 for (auto const* f : kTestFolders) {
 const auto folder = PreexistingBucketPath() + f;
 RETURN_NOT_OK(fs->CreateDir(folder, true));
 result.contents.push_back(arrow::fs::Dir(folder));
 for (int i = 0; i != 64; ++i) {
 const auto filename = folder + "test-file-" + std::to_string(i);
 CreateFile(fs.get(), filename, filename);
 result.contents.push_back(arrow::fs::File(filename));
 }
 }
 return result;
 }

 private:
 std::string RandomChars(std::size_t count) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
Expand DownExpand Up@@ -399,6 +428,63 @@ TEST_F(GcsIntegrationTest, GetFileInfoObject) {
 arrow::fs::AssertFileInfo(fs.get(), PreexistingObjectPath(), FileType::File);
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorRecursive) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK_AND_ASSIGN(auto hierarchy, CreateHierarchy(fs));
 std::vector<arrow::fs::FileInfo> expected;
 std::copy_if(
 hierarchy.contents.begin(), hierarchy.contents.end(), std::back_inserter(expected),
 [&](const arrow::fs::FileInfo& info) { return hierarchy.base_dir != info.path(); });

 auto selector = FileSelector();
 selector.base_dir = hierarchy.base_dir;
 selector.allow_not_found = false;
 selector.recursive = true;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, UnorderedElementsAreArray(expected.begin(), expected.end()));
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNonRecursive) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK_AND_ASSIGN(auto hierarchy, CreateHierarchy(fs));
 std::vector<arrow::fs::FileInfo> expected;
 std::copy_if(hierarchy.contents.begin(), hierarchy.contents.end(),
 std::back_inserter(expected), [&](const arrow::fs::FileInfo& info) {
 if (info.path() == hierarchy.base_dir) return false;
 return internal::EnsureTrailingSlash(
 internal::GetAbstractPathParent(info.path()).first) ==
 hierarchy.base_dir;
 });

 auto selector = FileSelector();
 selector.base_dir = hierarchy.base_dir;
 selector.allow_not_found = false;
 selector.recursive = false;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, UnorderedElementsAreArray(expected.begin(), expected.end()));
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNotFoundTrue) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());

 auto selector = FileSelector();
 selector.base_dir = NotFoundObjectPath() + "/";
 selector.allow_not_found = true;
 selector.recursive = true;
 ASSERT_OK_AND_ASSIGN(auto results, fs->GetFileInfo(selector));
 EXPECT_THAT(results, IsEmpty());
}

TEST_F(GcsIntegrationTest, GetFileInfoSelectorNotFoundFalse) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());

 auto selector = FileSelector();
 selector.base_dir = NotFoundObjectPath() + "/";
 selector.allow_not_found = false;
 selector.recursive = false;
 ASSERT_RAISES(IOError, fs->GetFileInfo(selector));
}

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 auto bucket_name = RandomBucketName();
Expand Down