ARROW-10012: [C++] Make MockFileSystem thread-safe#8193

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
pitrou wants to merge 1 commit into from
Closed

ARROW-10012: [C++] Make MockFileSystem thread-safe #8193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 41 additions & 1 deletion cpp/src/arrow/filesystem/mockfs.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include <algorithm>
#include <iterator>
#include <map>
#include <mutex>
#include <sstream>
#include <string>
#include <utility>
Expand DownExpand Up@@ -224,10 +225,15 @@ class MockFileSystem::Impl {
TimePoint current_time;
// The root directory
Entry root;
std::mutex mutex;

explicit Impl(TimePoint current_time)
: current_time(current_time), root(Directory("", current_time)) {}

std::unique_lock<std::mutex> lock_guard() {
return std::unique_lock<std::mutex>(mutex);
}

Directory& RootDir() { return root.as_dir(); }

template <typename It>
Expand DownExpand Up@@ -376,12 +382,14 @@ Status MockFileSystem::CreateDir(const std::string& path, bool recursive) {
auto parts = SplitAbstractPath(path);
RETURN_NOT_OK(ValidateAbstractPathParts(parts));

auto guard = impl_->lock_guard();

size_t consumed;
Entry* entry = impl_->FindEntry(parts, &consumed);
if (!entry->is_dir()) {
auto file_path = JoinAbstractPath(parts.begin(), parts.begin() + consumed);
return Status::IOError("Cannot create directory '", path, "': ", "ancestor '",
file_path, "' is a regular file");
file_path, "' is not a directory");
}
if (!recursive && (parts.size() - consumed) > 1) {
return Status::IOError("Cannot create directory '", path,
Expand All@@ -392,6 +400,7 @@ Status MockFileSystem::CreateDir(const std::string& path, bool recursive) {
std::unique_ptr<Entry> child(new Entry(Directory(name, impl_->current_time)));
Entry* child_ptr = child.get();
bool inserted = entry->as_dir().CreateEntry(name, std::move(child));
// No race condition on insertion is possible, as all operations are locked
DCHECK(inserted);
entry = child_ptr;
}
Expand All@@ -402,6 +411,8 @@ Status MockFileSystem::DeleteDir(const std::string& path) {
auto parts = SplitAbstractPath(path);
RETURN_NOT_OK(ValidateAbstractPathParts(parts));

auto guard = impl_->lock_guard();

Entry* parent = impl_->FindParent(parts);
if (parent == nullptr || !parent->is_dir()) {
return PathNotFound(path);
Expand All@@ -424,6 +435,8 @@ Status MockFileSystem::DeleteDirContents(const std::string& path) {
auto parts = SplitAbstractPath(path);
RETURN_NOT_OK(ValidateAbstractPathParts(parts));

auto guard = impl_->lock_guard();

if (parts.empty()) {
// Wipe filesystem
return internal::InvalidDeleteDirContents(path);
Expand All@@ -441,6 +454,8 @@ Status MockFileSystem::DeleteDirContents(const std::string& path) {
}

Status MockFileSystem::DeleteRootDirContents() {
auto guard = impl_->lock_guard();

impl_->RootDir().entries.clear();
return Status::OK();
}
Expand All@@ -449,6 +464,8 @@ Status MockFileSystem::DeleteFile(const std::string& path) {
auto parts = SplitAbstractPath(path);
RETURN_NOT_OK(ValidateAbstractPathParts(parts));

auto guard = impl_->lock_guard();

Entry* parent = impl_->FindParent(parts);
if (parent == nullptr || !parent->is_dir()) {
return PathNotFound(path);
Expand All@@ -470,6 +487,8 @@ Result<FileInfo> MockFileSystem::GetFileInfo(const std::string& path) {
auto parts = SplitAbstractPath(path);
RETURN_NOT_OK(ValidateAbstractPathParts(parts));

auto guard = impl_->lock_guard();

FileInfo info;
Entry* entry = impl_->FindEntry(parts);
if (entry == nullptr) {
Expand All@@ -485,6 +504,8 @@ Result<std::vector<FileInfo>> MockFileSystem::GetFileInfo(const FileSelector& se
auto parts = SplitAbstractPath(selector.base_dir);
RETURN_NOT_OK(ValidateAbstractPathParts(parts));

auto guard = impl_->lock_guard();

std::vector<FileInfo> results;

Entry* base_dir = impl_->FindEntry(parts);
Expand All@@ -504,6 +525,8 @@ Result<std::vector<FileInfo>> MockFileSystem::GetFileInfo(const FileSelector& se
return results;
}

namespace {

// Helper for binary operations (move, copy)
struct BinaryOp {
std::vector<std::string> src_parts;
Expand All@@ -523,6 +546,8 @@ struct BinaryOp {
RETURN_NOT_OK(ValidateAbstractPathParts(src_parts));
RETURN_NOT_OK(ValidateAbstractPathParts(dest_parts));

auto guard = impl->lock_guard();

// Both source and destination must have valid parents
Entry* src_parent = impl->FindParent(src_parts);
if (src_parent == nullptr || !src_parent->is_dir()) {
Expand DownExpand Up@@ -552,6 +577,8 @@ struct BinaryOp {
}
};

} // namespace

Status MockFileSystem::Move(const std::string& src, const std::string& dest) {
return BinaryOp::Run(impl_.get(), src, dest, [&](const BinaryOp& op) -> Status {
if (op.src_entry == nullptr) {
Expand DownExpand Up@@ -609,31 +636,43 @@ Status MockFileSystem::CopyFile(const std::string& src, const std::string& dest)

Result<std::shared_ptr<io::InputStream>> MockFileSystem::OpenInputStream(
const std::string& path) {
auto guard = impl_->lock_guard();

return impl_->OpenInputReader(path);
}

Result<std::shared_ptr<io::RandomAccessFile>> MockFileSystem::OpenInputFile(
const std::string& path) {
auto guard = impl_->lock_guard();

return impl_->OpenInputReader(path);
}

Result<std::shared_ptr<io::OutputStream>> MockFileSystem::OpenOutputStream(
const std::string& path) {
auto guard = impl_->lock_guard();

return impl_->OpenOutputStream(path, false /* append */);
}

Result<std::shared_ptr<io::OutputStream>> MockFileSystem::OpenAppendStream(
const std::string& path) {
auto guard = impl_->lock_guard();

return impl_->OpenOutputStream(path, true /* append */);
}

std::vector<MockDirInfo> MockFileSystem::AllDirs() {
auto guard = impl_->lock_guard();

std::vector<MockDirInfo> result;
impl_->DumpDirs("", impl_->RootDir(), &result);
return result;
}

std::vector<MockFileInfo> MockFileSystem::AllFiles() {
auto guard = impl_->lock_guard();

std::vector<MockFileInfo> result;
impl_->DumpFiles("", impl_->RootDir(), &result);
return result;
Expand All@@ -642,6 +681,7 @@ std::vector<MockFileInfo> MockFileSystem::AllFiles() {
Status MockFileSystem::CreateFile(const std::string& path, const std::string& contents,
bool recursive) {
auto parent = fs::internal::GetAbstractPathParent(path).first;

if (parent != "") {
RETURN_NOT_OK(CreateDir(parent, recursive));
}
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-10012: [C++] Make MockFileSystem thread-safe#8193

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

pitrou
wants to merge
1
commit into

from

 Closed


ARROW-10012: [C++] Make MockFileSystem thread-safe
#8193
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


42 changes: 41 additions & 1 deletion
cpp/src/arrow/filesystem/mockfs.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include <algorithm>
#include <iterator>
#include <map>
#include <mutex>
#include <sstream>
#include <string>
#include <utility>
Expand DownExpand Up@@ -224,10 +225,15 @@ class MockFileSystem::Impl {
 TimePoint current_time;
 // The root directory
 Entry root;
 std::mutex mutex;

 explicit Impl(TimePoint current_time)
 : current_time(current_time), root(Directory("", current_time)) {}

 std::unique_lock<std::mutex> lock_guard() {
 return std::unique_lock<std::mutex>(mutex);
 }

 Directory& RootDir() { return root.as_dir(); }

 template <typename It>
Expand DownExpand Up@@ -376,12 +382,14 @@ Status MockFileSystem::CreateDir(const std::string& path, bool recursive) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 size_t consumed;
 Entry* entry = impl_->FindEntry(parts, &consumed);
 if (!entry->is_dir()) {
 auto file_path = JoinAbstractPath(parts.begin(), parts.begin() + consumed);
 return Status::IOError("Cannot create directory '", path, "': ", "ancestor '",
 file_path, "' is a regular file");
 file_path, "' is not a directory");
 }
 if (!recursive && (parts.size() - consumed) > 1) {
 return Status::IOError("Cannot create directory '", path,
Expand All@@ -392,6 +400,7 @@ Status MockFileSystem::CreateDir(const std::string& path, bool recursive) {
 std::unique_ptr<Entry> child(new Entry(Directory(name, impl_->current_time)));
 Entry* child_ptr = child.get();
 bool inserted = entry->as_dir().CreateEntry(name, std::move(child));
 // No race condition on insertion is possible, as all operations are locked
 DCHECK(inserted);
 entry = child_ptr;
 }
Expand All@@ -402,6 +411,8 @@ Status MockFileSystem::DeleteDir(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 Entry* parent = impl_->FindParent(parts);
 if (parent == nullptr || !parent->is_dir()) {
 return PathNotFound(path);
Expand All@@ -424,6 +435,8 @@ Status MockFileSystem::DeleteDirContents(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 if (parts.empty()) {
 // Wipe filesystem
 return internal::InvalidDeleteDirContents(path);
Expand All@@ -441,6 +454,8 @@ Status MockFileSystem::DeleteDirContents(const std::string& path) {
}

Status MockFileSystem::DeleteRootDirContents() {
 auto guard = impl_->lock_guard();

 impl_->RootDir().entries.clear();
 return Status::OK();
}
Expand All@@ -449,6 +464,8 @@ Status MockFileSystem::DeleteFile(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 Entry* parent = impl_->FindParent(parts);
 if (parent == nullptr || !parent->is_dir()) {
 return PathNotFound(path);
Expand All@@ -470,6 +487,8 @@ Result<FileInfo> MockFileSystem::GetFileInfo(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 FileInfo info;
 Entry* entry = impl_->FindEntry(parts);
 if (entry == nullptr) {
Expand All@@ -485,6 +504,8 @@ Result<std::vector<FileInfo>> MockFileSystem::GetFileInfo(const FileSelector& se
 auto parts = SplitAbstractPath(selector.base_dir);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 std::vector<FileInfo> results;

 Entry* base_dir = impl_->FindEntry(parts);
Expand All@@ -504,6 +525,8 @@ Result<std::vector<FileInfo>> MockFileSystem::GetFileInfo(const FileSelector& se
 return results;
}

namespace {

// Helper for binary operations (move, copy)
struct BinaryOp {
 std::vector<std::string> src_parts;
Expand All@@ -523,6 +546,8 @@ struct BinaryOp {
 RETURN_NOT_OK(ValidateAbstractPathParts(src_parts));
 RETURN_NOT_OK(ValidateAbstractPathParts(dest_parts));

 auto guard = impl->lock_guard();

 // Both source and destination must have valid parents
 Entry* src_parent = impl->FindParent(src_parts);
 if (src_parent == nullptr || !src_parent->is_dir()) {
Expand DownExpand Up@@ -552,6 +577,8 @@ struct BinaryOp {
 }
};

} // namespace

Status MockFileSystem::Move(const std::string& src, const std::string& dest) {
 return BinaryOp::Run(impl_.get(), src, dest, [&](const BinaryOp& op) -> Status {
 if (op.src_entry == nullptr) {
Expand DownExpand Up@@ -609,31 +636,43 @@ Status MockFileSystem::CopyFile(const std::string& src, const std::string& dest)

Result<std::shared_ptr<io::InputStream>> MockFileSystem::OpenInputStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenInputReader(path);
}

Result<std::shared_ptr<io::RandomAccessFile>> MockFileSystem::OpenInputFile(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenInputReader(path);
}

Result<std::shared_ptr<io::OutputStream>> MockFileSystem::OpenOutputStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenOutputStream(path, false /* append */);
}

Result<std::shared_ptr<io::OutputStream>> MockFileSystem::OpenAppendStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenOutputStream(path, true /* append */);
}

std::vector<MockDirInfo> MockFileSystem::AllDirs() {
 auto guard = impl_->lock_guard();

 std::vector<MockDirInfo> result;
 impl_->DumpDirs("", impl_->RootDir(), &result);
 return result;
}

std::vector<MockFileInfo> MockFileSystem::AllFiles() {
 auto guard = impl_->lock_guard();

 std::vector<MockFileInfo> result;
 impl_->DumpFiles("", impl_->RootDir(), &result);
 return result;
Expand All@@ -642,6 +681,7 @@ std::vector<MockFileInfo> MockFileSystem::AllFiles() {
Status MockFileSystem::CreateFile(const std::string& path, const std::string& contents,
 bool recursive) {
 auto parent = fs::internal::GetAbstractPathParent(path).first;

 if (parent != "") {
 RETURN_NOT_OK(CreateDir(parent, recursive));
 }
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-10012: [C++] Make MockFileSystem thread-safe#8193

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

pitrou
wants to merge
1
commit into

from

 Closed


ARROW-10012: [C++] Make MockFileSystem thread-safe
#8193
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


42 changes: 41 additions & 1 deletion
cpp/src/arrow/filesystem/mockfs.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include <algorithm>
#include <iterator>
#include <map>
#include <mutex>
#include <sstream>
#include <string>
#include <utility>
Expand DownExpand Up@@ -224,10 +225,15 @@ class MockFileSystem::Impl {
 TimePoint current_time;
 // The root directory
 Entry root;
 std::mutex mutex;

 explicit Impl(TimePoint current_time)
 : current_time(current_time), root(Directory("", current_time)) {}

 std::unique_lock<std::mutex> lock_guard() {
 return std::unique_lock<std::mutex>(mutex);
 }

 Directory& RootDir() { return root.as_dir(); }

 template <typename It>
Expand DownExpand Up@@ -376,12 +382,14 @@ Status MockFileSystem::CreateDir(const std::string& path, bool recursive) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 size_t consumed;
 Entry* entry = impl_->FindEntry(parts, &consumed);
 if (!entry->is_dir()) {
 auto file_path = JoinAbstractPath(parts.begin(), parts.begin() + consumed);
 return Status::IOError("Cannot create directory '", path, "': ", "ancestor '",
 file_path, "' is a regular file");
 file_path, "' is not a directory");
 }
 if (!recursive && (parts.size() - consumed) > 1) {
 return Status::IOError("Cannot create directory '", path,
Expand All@@ -392,6 +400,7 @@ Status MockFileSystem::CreateDir(const std::string& path, bool recursive) {
 std::unique_ptr<Entry> child(new Entry(Directory(name, impl_->current_time)));
 Entry* child_ptr = child.get();
 bool inserted = entry->as_dir().CreateEntry(name, std::move(child));
 // No race condition on insertion is possible, as all operations are locked
 DCHECK(inserted);
 entry = child_ptr;
 }
Expand All@@ -402,6 +411,8 @@ Status MockFileSystem::DeleteDir(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 Entry* parent = impl_->FindParent(parts);
 if (parent == nullptr || !parent->is_dir()) {
 return PathNotFound(path);
Expand All@@ -424,6 +435,8 @@ Status MockFileSystem::DeleteDirContents(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 if (parts.empty()) {
 // Wipe filesystem
 return internal::InvalidDeleteDirContents(path);
Expand All@@ -441,6 +454,8 @@ Status MockFileSystem::DeleteDirContents(const std::string& path) {
}

Status MockFileSystem::DeleteRootDirContents() {
 auto guard = impl_->lock_guard();

 impl_->RootDir().entries.clear();
 return Status::OK();
}
Expand All@@ -449,6 +464,8 @@ Status MockFileSystem::DeleteFile(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 Entry* parent = impl_->FindParent(parts);
 if (parent == nullptr || !parent->is_dir()) {
 return PathNotFound(path);
Expand All@@ -470,6 +487,8 @@ Result<FileInfo> MockFileSystem::GetFileInfo(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 FileInfo info;
 Entry* entry = impl_->FindEntry(parts);
 if (entry == nullptr) {
Expand All@@ -485,6 +504,8 @@ Result<std::vector<FileInfo>> MockFileSystem::GetFileInfo(const FileSelector& se
 auto parts = SplitAbstractPath(selector.base_dir);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 std::vector<FileInfo> results;

 Entry* base_dir = impl_->FindEntry(parts);
Expand All@@ -504,6 +525,8 @@ Result<std::vector<FileInfo>> MockFileSystem::GetFileInfo(const FileSelector& se
 return results;
}

namespace {

// Helper for binary operations (move, copy)
struct BinaryOp {
 std::vector<std::string> src_parts;
Expand All@@ -523,6 +546,8 @@ struct BinaryOp {
 RETURN_NOT_OK(ValidateAbstractPathParts(src_parts));
 RETURN_NOT_OK(ValidateAbstractPathParts(dest_parts));

 auto guard = impl->lock_guard();

 // Both source and destination must have valid parents
 Entry* src_parent = impl->FindParent(src_parts);
 if (src_parent == nullptr || !src_parent->is_dir()) {
Expand DownExpand Up@@ -552,6 +577,8 @@ struct BinaryOp {
 }
};

} // namespace

Status MockFileSystem::Move(const std::string& src, const std::string& dest) {
 return BinaryOp::Run(impl_.get(), src, dest, [&](const BinaryOp& op) -> Status {
 if (op.src_entry == nullptr) {
Expand DownExpand Up@@ -609,31 +636,43 @@ Status MockFileSystem::CopyFile(const std::string& src, const std::string& dest)

Result<std::shared_ptr<io::InputStream>> MockFileSystem::OpenInputStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenInputReader(path);
}

Result<std::shared_ptr<io::RandomAccessFile>> MockFileSystem::OpenInputFile(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenInputReader(path);
}

Result<std::shared_ptr<io::OutputStream>> MockFileSystem::OpenOutputStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenOutputStream(path, false /* append */);
}

Result<std::shared_ptr<io::OutputStream>> MockFileSystem::OpenAppendStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenOutputStream(path, true /* append */);
}

std::vector<MockDirInfo> MockFileSystem::AllDirs() {
 auto guard = impl_->lock_guard();

 std::vector<MockDirInfo> result;
 impl_->DumpDirs("", impl_->RootDir(), &result);
 return result;
}

std::vector<MockFileInfo> MockFileSystem::AllFiles() {
 auto guard = impl_->lock_guard();

 std::vector<MockFileInfo> result;
 impl_->DumpFiles("", impl_->RootDir(), &result);
 return result;
Expand All@@ -642,6 +681,7 @@ std::vector<MockFileInfo> MockFileSystem::AllFiles() {
Status MockFileSystem::CreateFile(const std::string& path, const std::string& contents,
 bool recursive) {
 auto parent = fs::internal::GetAbstractPathParent(path).first;

 if (parent != "") {
 RETURN_NOT_OK(CreateDir(parent, recursive));
 }
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-10012: [C++] Make MockFileSystem thread-safe#8193

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

pitrou
wants to merge
1
commit into

from

 Closed


ARROW-10012: [C++] Make MockFileSystem thread-safe
#8193
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


42 changes: 41 additions & 1 deletion
cpp/src/arrow/filesystem/mockfs.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include <algorithm>
#include <iterator>
#include <map>
#include <mutex>
#include <sstream>
#include <string>
#include <utility>
Expand DownExpand Up@@ -224,10 +225,15 @@ class MockFileSystem::Impl {
 TimePoint current_time;
 // The root directory
 Entry root;
 std::mutex mutex;

 explicit Impl(TimePoint current_time)
 : current_time(current_time), root(Directory("", current_time)) {}

 std::unique_lock<std::mutex> lock_guard() {
 return std::unique_lock<std::mutex>(mutex);
 }

 Directory& RootDir() { return root.as_dir(); }

 template <typename It>
Expand DownExpand Up@@ -376,12 +382,14 @@ Status MockFileSystem::CreateDir(const std::string& path, bool recursive) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 size_t consumed;
 Entry* entry = impl_->FindEntry(parts, &consumed);
 if (!entry->is_dir()) {
 auto file_path = JoinAbstractPath(parts.begin(), parts.begin() + consumed);
 return Status::IOError("Cannot create directory '", path, "': ", "ancestor '",
 file_path, "' is a regular file");
 file_path, "' is not a directory");
 }
 if (!recursive && (parts.size() - consumed) > 1) {
 return Status::IOError("Cannot create directory '", path,
Expand All@@ -392,6 +400,7 @@ Status MockFileSystem::CreateDir(const std::string& path, bool recursive) {
 std::unique_ptr<Entry> child(new Entry(Directory(name, impl_->current_time)));
 Entry* child_ptr = child.get();
 bool inserted = entry->as_dir().CreateEntry(name, std::move(child));
 // No race condition on insertion is possible, as all operations are locked
 DCHECK(inserted);
 entry = child_ptr;
 }
Expand All@@ -402,6 +411,8 @@ Status MockFileSystem::DeleteDir(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 Entry* parent = impl_->FindParent(parts);
 if (parent == nullptr || !parent->is_dir()) {
 return PathNotFound(path);
Expand All@@ -424,6 +435,8 @@ Status MockFileSystem::DeleteDirContents(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 if (parts.empty()) {
 // Wipe filesystem
 return internal::InvalidDeleteDirContents(path);
Expand All@@ -441,6 +454,8 @@ Status MockFileSystem::DeleteDirContents(const std::string& path) {
}

Status MockFileSystem::DeleteRootDirContents() {
 auto guard = impl_->lock_guard();

 impl_->RootDir().entries.clear();
 return Status::OK();
}
Expand All@@ -449,6 +464,8 @@ Status MockFileSystem::DeleteFile(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 Entry* parent = impl_->FindParent(parts);
 if (parent == nullptr || !parent->is_dir()) {
 return PathNotFound(path);
Expand All@@ -470,6 +487,8 @@ Result<FileInfo> MockFileSystem::GetFileInfo(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 FileInfo info;
 Entry* entry = impl_->FindEntry(parts);
 if (entry == nullptr) {
Expand All@@ -485,6 +504,8 @@ Result<std::vector<FileInfo>> MockFileSystem::GetFileInfo(const FileSelector& se
 auto parts = SplitAbstractPath(selector.base_dir);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 std::vector<FileInfo> results;

 Entry* base_dir = impl_->FindEntry(parts);
Expand All@@ -504,6 +525,8 @@ Result<std::vector<FileInfo>> MockFileSystem::GetFileInfo(const FileSelector& se
 return results;
}

namespace {

// Helper for binary operations (move, copy)
struct BinaryOp {
 std::vector<std::string> src_parts;
Expand All@@ -523,6 +546,8 @@ struct BinaryOp {
 RETURN_NOT_OK(ValidateAbstractPathParts(src_parts));
 RETURN_NOT_OK(ValidateAbstractPathParts(dest_parts));

 auto guard = impl->lock_guard();

 // Both source and destination must have valid parents
 Entry* src_parent = impl->FindParent(src_parts);
 if (src_parent == nullptr || !src_parent->is_dir()) {
Expand DownExpand Up@@ -552,6 +577,8 @@ struct BinaryOp {
 }
};

} // namespace

Status MockFileSystem::Move(const std::string& src, const std::string& dest) {
 return BinaryOp::Run(impl_.get(), src, dest, [&](const BinaryOp& op) -> Status {
 if (op.src_entry == nullptr) {
Expand DownExpand Up@@ -609,31 +636,43 @@ Status MockFileSystem::CopyFile(const std::string& src, const std::string& dest)

Result<std::shared_ptr<io::InputStream>> MockFileSystem::OpenInputStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenInputReader(path);
}

Result<std::shared_ptr<io::RandomAccessFile>> MockFileSystem::OpenInputFile(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenInputReader(path);
}

Result<std::shared_ptr<io::OutputStream>> MockFileSystem::OpenOutputStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenOutputStream(path, false /* append */);
}

Result<std::shared_ptr<io::OutputStream>> MockFileSystem::OpenAppendStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenOutputStream(path, true /* append */);
}

std::vector<MockDirInfo> MockFileSystem::AllDirs() {
 auto guard = impl_->lock_guard();

 std::vector<MockDirInfo> result;
 impl_->DumpDirs("", impl_->RootDir(), &result);
 return result;
}

std::vector<MockFileInfo> MockFileSystem::AllFiles() {
 auto guard = impl_->lock_guard();

 std::vector<MockFileInfo> result;
 impl_->DumpFiles("", impl_->RootDir(), &result);
 return result;
Expand All@@ -642,6 +681,7 @@ std::vector<MockFileInfo> MockFileSystem::AllFiles() {
Status MockFileSystem::CreateFile(const std::string& path, const std::string& contents,
 bool recursive) {
 auto parent = fs::internal::GetAbstractPathParent(path).first;

 if (parent != "") {
 RETURN_NOT_OK(CreateDir(parent, recursive));
 }
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-10012: [C++] Make MockFileSystem thread-safe#8193

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

pitrou
wants to merge
1
commit into

from

 Closed


ARROW-10012: [C++] Make MockFileSystem thread-safe
#8193
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


42 changes: 41 additions & 1 deletion
cpp/src/arrow/filesystem/mockfs.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include <algorithm>
#include <iterator>
#include <map>
#include <mutex>
#include <sstream>
#include <string>
#include <utility>
Expand DownExpand Up@@ -224,10 +225,15 @@ class MockFileSystem::Impl {
 TimePoint current_time;
 // The root directory
 Entry root;
 std::mutex mutex;

 explicit Impl(TimePoint current_time)
 : current_time(current_time), root(Directory("", current_time)) {}

 std::unique_lock<std::mutex> lock_guard() {
 return std::unique_lock<std::mutex>(mutex);
 }

 Directory& RootDir() { return root.as_dir(); }

 template <typename It>
Expand DownExpand Up@@ -376,12 +382,14 @@ Status MockFileSystem::CreateDir(const std::string& path, bool recursive) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 size_t consumed;
 Entry* entry = impl_->FindEntry(parts, &consumed);
 if (!entry->is_dir()) {
 auto file_path = JoinAbstractPath(parts.begin(), parts.begin() + consumed);
 return Status::IOError("Cannot create directory '", path, "': ", "ancestor '",
 file_path, "' is a regular file");
 file_path, "' is not a directory");
 }
 if (!recursive && (parts.size() - consumed) > 1) {
 return Status::IOError("Cannot create directory '", path,
Expand All@@ -392,6 +400,7 @@ Status MockFileSystem::CreateDir(const std::string& path, bool recursive) {
 std::unique_ptr<Entry> child(new Entry(Directory(name, impl_->current_time)));
 Entry* child_ptr = child.get();
 bool inserted = entry->as_dir().CreateEntry(name, std::move(child));
 // No race condition on insertion is possible, as all operations are locked
 DCHECK(inserted);
 entry = child_ptr;
 }
Expand All@@ -402,6 +411,8 @@ Status MockFileSystem::DeleteDir(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 Entry* parent = impl_->FindParent(parts);
 if (parent == nullptr || !parent->is_dir()) {
 return PathNotFound(path);
Expand All@@ -424,6 +435,8 @@ Status MockFileSystem::DeleteDirContents(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 if (parts.empty()) {
 // Wipe filesystem
 return internal::InvalidDeleteDirContents(path);
Expand All@@ -441,6 +454,8 @@ Status MockFileSystem::DeleteDirContents(const std::string& path) {
}

Status MockFileSystem::DeleteRootDirContents() {
 auto guard = impl_->lock_guard();

 impl_->RootDir().entries.clear();
 return Status::OK();
}
Expand All@@ -449,6 +464,8 @@ Status MockFileSystem::DeleteFile(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 Entry* parent = impl_->FindParent(parts);
 if (parent == nullptr || !parent->is_dir()) {
 return PathNotFound(path);
Expand All@@ -470,6 +487,8 @@ Result<FileInfo> MockFileSystem::GetFileInfo(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 FileInfo info;
 Entry* entry = impl_->FindEntry(parts);
 if (entry == nullptr) {
Expand All@@ -485,6 +504,8 @@ Result<std::vector<FileInfo>> MockFileSystem::GetFileInfo(const FileSelector& se
 auto parts = SplitAbstractPath(selector.base_dir);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 std::vector<FileInfo> results;

 Entry* base_dir = impl_->FindEntry(parts);
Expand All@@ -504,6 +525,8 @@ Result<std::vector<FileInfo>> MockFileSystem::GetFileInfo(const FileSelector& se
 return results;
}

namespace {

// Helper for binary operations (move, copy)
struct BinaryOp {
 std::vector<std::string> src_parts;
Expand All@@ -523,6 +546,8 @@ struct BinaryOp {
 RETURN_NOT_OK(ValidateAbstractPathParts(src_parts));
 RETURN_NOT_OK(ValidateAbstractPathParts(dest_parts));

 auto guard = impl->lock_guard();

 // Both source and destination must have valid parents
 Entry* src_parent = impl->FindParent(src_parts);
 if (src_parent == nullptr || !src_parent->is_dir()) {
Expand DownExpand Up@@ -552,6 +577,8 @@ struct BinaryOp {
 }
};

} // namespace

Status MockFileSystem::Move(const std::string& src, const std::string& dest) {
 return BinaryOp::Run(impl_.get(), src, dest, [&](const BinaryOp& op) -> Status {
 if (op.src_entry == nullptr) {
Expand DownExpand Up@@ -609,31 +636,43 @@ Status MockFileSystem::CopyFile(const std::string& src, const std::string& dest)

Result<std::shared_ptr<io::InputStream>> MockFileSystem::OpenInputStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenInputReader(path);
}

Result<std::shared_ptr<io::RandomAccessFile>> MockFileSystem::OpenInputFile(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenInputReader(path);
}

Result<std::shared_ptr<io::OutputStream>> MockFileSystem::OpenOutputStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenOutputStream(path, false /* append */);
}

Result<std::shared_ptr<io::OutputStream>> MockFileSystem::OpenAppendStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenOutputStream(path, true /* append */);
}

std::vector<MockDirInfo> MockFileSystem::AllDirs() {
 auto guard = impl_->lock_guard();

 std::vector<MockDirInfo> result;
 impl_->DumpDirs("", impl_->RootDir(), &result);
 return result;
}

std::vector<MockFileInfo> MockFileSystem::AllFiles() {
 auto guard = impl_->lock_guard();

 std::vector<MockFileInfo> result;
 impl_->DumpFiles("", impl_->RootDir(), &result);
 return result;
Expand All@@ -642,6 +681,7 @@ std::vector<MockFileInfo> MockFileSystem::AllFiles() {
Status MockFileSystem::CreateFile(const std::string& path, const std::string& contents,
 bool recursive) {
 auto parent = fs::internal::GetAbstractPathParent(path).first;

 if (parent != "") {
 RETURN_NOT_OK(CreateDir(parent, recursive));
 }
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-10012: [C++] Make MockFileSystem thread-safe#8193

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

pitrou
wants to merge
1
commit into

from

 Closed


ARROW-10012: [C++] Make MockFileSystem thread-safe
#8193
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


42 changes: 41 additions & 1 deletion
cpp/src/arrow/filesystem/mockfs.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include <algorithm>
#include <iterator>
#include <map>
#include <mutex>
#include <sstream>
#include <string>
#include <utility>
Expand DownExpand Up@@ -224,10 +225,15 @@ class MockFileSystem::Impl {
 TimePoint current_time;
 // The root directory
 Entry root;
 std::mutex mutex;

 explicit Impl(TimePoint current_time)
 : current_time(current_time), root(Directory("", current_time)) {}

 std::unique_lock<std::mutex> lock_guard() {
 return std::unique_lock<std::mutex>(mutex);
 }

 Directory& RootDir() { return root.as_dir(); }

 template <typename It>
Expand DownExpand Up@@ -376,12 +382,14 @@ Status MockFileSystem::CreateDir(const std::string& path, bool recursive) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 size_t consumed;
 Entry* entry = impl_->FindEntry(parts, &consumed);
 if (!entry->is_dir()) {
 auto file_path = JoinAbstractPath(parts.begin(), parts.begin() + consumed);
 return Status::IOError("Cannot create directory '", path, "': ", "ancestor '",
 file_path, "' is a regular file");
 file_path, "' is not a directory");
 }
 if (!recursive && (parts.size() - consumed) > 1) {
 return Status::IOError("Cannot create directory '", path,
Expand All@@ -392,6 +400,7 @@ Status MockFileSystem::CreateDir(const std::string& path, bool recursive) {
 std::unique_ptr<Entry> child(new Entry(Directory(name, impl_->current_time)));
 Entry* child_ptr = child.get();
 bool inserted = entry->as_dir().CreateEntry(name, std::move(child));
 // No race condition on insertion is possible, as all operations are locked
 DCHECK(inserted);
 entry = child_ptr;
 }
Expand All@@ -402,6 +411,8 @@ Status MockFileSystem::DeleteDir(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 Entry* parent = impl_->FindParent(parts);
 if (parent == nullptr || !parent->is_dir()) {
 return PathNotFound(path);
Expand All@@ -424,6 +435,8 @@ Status MockFileSystem::DeleteDirContents(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 if (parts.empty()) {
 // Wipe filesystem
 return internal::InvalidDeleteDirContents(path);
Expand All@@ -441,6 +454,8 @@ Status MockFileSystem::DeleteDirContents(const std::string& path) {
}

Status MockFileSystem::DeleteRootDirContents() {
 auto guard = impl_->lock_guard();

 impl_->RootDir().entries.clear();
 return Status::OK();
}
Expand All@@ -449,6 +464,8 @@ Status MockFileSystem::DeleteFile(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 Entry* parent = impl_->FindParent(parts);
 if (parent == nullptr || !parent->is_dir()) {
 return PathNotFound(path);
Expand All@@ -470,6 +487,8 @@ Result<FileInfo> MockFileSystem::GetFileInfo(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 FileInfo info;
 Entry* entry = impl_->FindEntry(parts);
 if (entry == nullptr) {
Expand All@@ -485,6 +504,8 @@ Result<std::vector<FileInfo>> MockFileSystem::GetFileInfo(const FileSelector& se
 auto parts = SplitAbstractPath(selector.base_dir);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 std::vector<FileInfo> results;

 Entry* base_dir = impl_->FindEntry(parts);
Expand All@@ -504,6 +525,8 @@ Result<std::vector<FileInfo>> MockFileSystem::GetFileInfo(const FileSelector& se
 return results;
}

namespace {

// Helper for binary operations (move, copy)
struct BinaryOp {
 std::vector<std::string> src_parts;
Expand All@@ -523,6 +546,8 @@ struct BinaryOp {
 RETURN_NOT_OK(ValidateAbstractPathParts(src_parts));
 RETURN_NOT_OK(ValidateAbstractPathParts(dest_parts));

 auto guard = impl->lock_guard();

 // Both source and destination must have valid parents
 Entry* src_parent = impl->FindParent(src_parts);
 if (src_parent == nullptr || !src_parent->is_dir()) {
Expand DownExpand Up@@ -552,6 +577,8 @@ struct BinaryOp {
 }
};

} // namespace

Status MockFileSystem::Move(const std::string& src, const std::string& dest) {
 return BinaryOp::Run(impl_.get(), src, dest, [&](const BinaryOp& op) -> Status {
 if (op.src_entry == nullptr) {
Expand DownExpand Up@@ -609,31 +636,43 @@ Status MockFileSystem::CopyFile(const std::string& src, const std::string& dest)

Result<std::shared_ptr<io::InputStream>> MockFileSystem::OpenInputStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenInputReader(path);
}

Result<std::shared_ptr<io::RandomAccessFile>> MockFileSystem::OpenInputFile(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenInputReader(path);
}

Result<std::shared_ptr<io::OutputStream>> MockFileSystem::OpenOutputStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenOutputStream(path, false /* append */);
}

Result<std::shared_ptr<io::OutputStream>> MockFileSystem::OpenAppendStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenOutputStream(path, true /* append */);
}

std::vector<MockDirInfo> MockFileSystem::AllDirs() {
 auto guard = impl_->lock_guard();

 std::vector<MockDirInfo> result;
 impl_->DumpDirs("", impl_->RootDir(), &result);
 return result;
}

std::vector<MockFileInfo> MockFileSystem::AllFiles() {
 auto guard = impl_->lock_guard();

 std::vector<MockFileInfo> result;
 impl_->DumpFiles("", impl_->RootDir(), &result);
 return result;
Expand All@@ -642,6 +681,7 @@ std::vector<MockFileInfo> MockFileSystem::AllFiles() {
Status MockFileSystem::CreateFile(const std::string& path, const std::string& contents,
 bool recursive) {
 auto parent = fs::internal::GetAbstractPathParent(path).first;

 if (parent != "") {
 RETURN_NOT_OK(CreateDir(parent, recursive));
 }
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-10012: [C++] Make MockFileSystem thread-safe#8193

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

pitrou
wants to merge
1
commit into

from

 Closed


ARROW-10012: [C++] Make MockFileSystem thread-safe
#8193
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


42 changes: 41 additions & 1 deletion
cpp/src/arrow/filesystem/mockfs.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include <algorithm>
#include <iterator>
#include <map>
#include <mutex>
#include <sstream>
#include <string>
#include <utility>
Expand DownExpand Up@@ -224,10 +225,15 @@ class MockFileSystem::Impl {
 TimePoint current_time;
 // The root directory
 Entry root;
 std::mutex mutex;

 explicit Impl(TimePoint current_time)
 : current_time(current_time), root(Directory("", current_time)) {}

 std::unique_lock<std::mutex> lock_guard() {
 return std::unique_lock<std::mutex>(mutex);
 }

 Directory& RootDir() { return root.as_dir(); }

 template <typename It>
Expand DownExpand Up@@ -376,12 +382,14 @@ Status MockFileSystem::CreateDir(const std::string& path, bool recursive) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 size_t consumed;
 Entry* entry = impl_->FindEntry(parts, &consumed);
 if (!entry->is_dir()) {
 auto file_path = JoinAbstractPath(parts.begin(), parts.begin() + consumed);
 return Status::IOError("Cannot create directory '", path, "': ", "ancestor '",
 file_path, "' is a regular file");
 file_path, "' is not a directory");
 }
 if (!recursive && (parts.size() - consumed) > 1) {
 return Status::IOError("Cannot create directory '", path,
Expand All@@ -392,6 +400,7 @@ Status MockFileSystem::CreateDir(const std::string& path, bool recursive) {
 std::unique_ptr<Entry> child(new Entry(Directory(name, impl_->current_time)));
 Entry* child_ptr = child.get();
 bool inserted = entry->as_dir().CreateEntry(name, std::move(child));
 // No race condition on insertion is possible, as all operations are locked
 DCHECK(inserted);
 entry = child_ptr;
 }
Expand All@@ -402,6 +411,8 @@ Status MockFileSystem::DeleteDir(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 Entry* parent = impl_->FindParent(parts);
 if (parent == nullptr || !parent->is_dir()) {
 return PathNotFound(path);
Expand All@@ -424,6 +435,8 @@ Status MockFileSystem::DeleteDirContents(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 if (parts.empty()) {
 // Wipe filesystem
 return internal::InvalidDeleteDirContents(path);
Expand All@@ -441,6 +454,8 @@ Status MockFileSystem::DeleteDirContents(const std::string& path) {
}

Status MockFileSystem::DeleteRootDirContents() {
 auto guard = impl_->lock_guard();

 impl_->RootDir().entries.clear();
 return Status::OK();
}
Expand All@@ -449,6 +464,8 @@ Status MockFileSystem::DeleteFile(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 Entry* parent = impl_->FindParent(parts);
 if (parent == nullptr || !parent->is_dir()) {
 return PathNotFound(path);
Expand All@@ -470,6 +487,8 @@ Result<FileInfo> MockFileSystem::GetFileInfo(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 FileInfo info;
 Entry* entry = impl_->FindEntry(parts);
 if (entry == nullptr) {
Expand All@@ -485,6 +504,8 @@ Result<std::vector<FileInfo>> MockFileSystem::GetFileInfo(const FileSelector& se
 auto parts = SplitAbstractPath(selector.base_dir);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 std::vector<FileInfo> results;

 Entry* base_dir = impl_->FindEntry(parts);
Expand All@@ -504,6 +525,8 @@ Result<std::vector<FileInfo>> MockFileSystem::GetFileInfo(const FileSelector& se
 return results;
}

namespace {

// Helper for binary operations (move, copy)
struct BinaryOp {
 std::vector<std::string> src_parts;
Expand All@@ -523,6 +546,8 @@ struct BinaryOp {
 RETURN_NOT_OK(ValidateAbstractPathParts(src_parts));
 RETURN_NOT_OK(ValidateAbstractPathParts(dest_parts));

 auto guard = impl->lock_guard();

 // Both source and destination must have valid parents
 Entry* src_parent = impl->FindParent(src_parts);
 if (src_parent == nullptr || !src_parent->is_dir()) {
Expand DownExpand Up@@ -552,6 +577,8 @@ struct BinaryOp {
 }
};

} // namespace

Status MockFileSystem::Move(const std::string& src, const std::string& dest) {
 return BinaryOp::Run(impl_.get(), src, dest, [&](const BinaryOp& op) -> Status {
 if (op.src_entry == nullptr) {
Expand DownExpand Up@@ -609,31 +636,43 @@ Status MockFileSystem::CopyFile(const std::string& src, const std::string& dest)

Result<std::shared_ptr<io::InputStream>> MockFileSystem::OpenInputStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenInputReader(path);
}

Result<std::shared_ptr<io::RandomAccessFile>> MockFileSystem::OpenInputFile(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenInputReader(path);
}

Result<std::shared_ptr<io::OutputStream>> MockFileSystem::OpenOutputStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenOutputStream(path, false /* append */);
}

Result<std::shared_ptr<io::OutputStream>> MockFileSystem::OpenAppendStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenOutputStream(path, true /* append */);
}

std::vector<MockDirInfo> MockFileSystem::AllDirs() {
 auto guard = impl_->lock_guard();

 std::vector<MockDirInfo> result;
 impl_->DumpDirs("", impl_->RootDir(), &result);
 return result;
}

std::vector<MockFileInfo> MockFileSystem::AllFiles() {
 auto guard = impl_->lock_guard();

 std::vector<MockFileInfo> result;
 impl_->DumpFiles("", impl_->RootDir(), &result);
 return result;
Expand All@@ -642,6 +681,7 @@ std::vector<MockFileInfo> MockFileSystem::AllFiles() {
Status MockFileSystem::CreateFile(const std::string& path, const std::string& contents,
 bool recursive) {
 auto parent = fs::internal::GetAbstractPathParent(path).first;

 if (parent != "") {
 RETURN_NOT_OK(CreateDir(parent, recursive));
 }
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-10012: [C++] Make MockFileSystem thread-safe#8193

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

pitrou
wants to merge
1
commit into

from

 Closed


ARROW-10012: [C++] Make MockFileSystem thread-safe
#8193
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


42 changes: 41 additions & 1 deletion
cpp/src/arrow/filesystem/mockfs.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,6 +18,7 @@
#include <algorithm>
#include <iterator>
#include <map>
#include <mutex>
#include <sstream>
#include <string>
#include <utility>
Expand DownExpand Up@@ -224,10 +225,15 @@ class MockFileSystem::Impl {
 TimePoint current_time;
 // The root directory
 Entry root;
 std::mutex mutex;

 explicit Impl(TimePoint current_time)
 : current_time(current_time), root(Directory("", current_time)) {}

 std::unique_lock<std::mutex> lock_guard() {
 return std::unique_lock<std::mutex>(mutex);
 }

 Directory& RootDir() { return root.as_dir(); }

 template <typename It>
Expand DownExpand Up@@ -376,12 +382,14 @@ Status MockFileSystem::CreateDir(const std::string& path, bool recursive) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 size_t consumed;
 Entry* entry = impl_->FindEntry(parts, &consumed);
 if (!entry->is_dir()) {
 auto file_path = JoinAbstractPath(parts.begin(), parts.begin() + consumed);
 return Status::IOError("Cannot create directory '", path, "': ", "ancestor '",
 file_path, "' is a regular file");
 file_path, "' is not a directory");
 }
 if (!recursive && (parts.size() - consumed) > 1) {
 return Status::IOError("Cannot create directory '", path,
Expand All@@ -392,6 +400,7 @@ Status MockFileSystem::CreateDir(const std::string& path, bool recursive) {
 std::unique_ptr<Entry> child(new Entry(Directory(name, impl_->current_time)));
 Entry* child_ptr = child.get();
 bool inserted = entry->as_dir().CreateEntry(name, std::move(child));
 // No race condition on insertion is possible, as all operations are locked
 DCHECK(inserted);
 entry = child_ptr;
 }
Expand All@@ -402,6 +411,8 @@ Status MockFileSystem::DeleteDir(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 Entry* parent = impl_->FindParent(parts);
 if (parent == nullptr || !parent->is_dir()) {
 return PathNotFound(path);
Expand All@@ -424,6 +435,8 @@ Status MockFileSystem::DeleteDirContents(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 if (parts.empty()) {
 // Wipe filesystem
 return internal::InvalidDeleteDirContents(path);
Expand All@@ -441,6 +454,8 @@ Status MockFileSystem::DeleteDirContents(const std::string& path) {
}

Status MockFileSystem::DeleteRootDirContents() {
 auto guard = impl_->lock_guard();

 impl_->RootDir().entries.clear();
 return Status::OK();
}
Expand All@@ -449,6 +464,8 @@ Status MockFileSystem::DeleteFile(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 Entry* parent = impl_->FindParent(parts);
 if (parent == nullptr || !parent->is_dir()) {
 return PathNotFound(path);
Expand All@@ -470,6 +487,8 @@ Result<FileInfo> MockFileSystem::GetFileInfo(const std::string& path) {
 auto parts = SplitAbstractPath(path);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 FileInfo info;
 Entry* entry = impl_->FindEntry(parts);
 if (entry == nullptr) {
Expand All@@ -485,6 +504,8 @@ Result<std::vector<FileInfo>> MockFileSystem::GetFileInfo(const FileSelector& se
 auto parts = SplitAbstractPath(selector.base_dir);
 RETURN_NOT_OK(ValidateAbstractPathParts(parts));

 auto guard = impl_->lock_guard();

 std::vector<FileInfo> results;

 Entry* base_dir = impl_->FindEntry(parts);
Expand All@@ -504,6 +525,8 @@ Result<std::vector<FileInfo>> MockFileSystem::GetFileInfo(const FileSelector& se
 return results;
}

namespace {

// Helper for binary operations (move, copy)
struct BinaryOp {
 std::vector<std::string> src_parts;
Expand All@@ -523,6 +546,8 @@ struct BinaryOp {
 RETURN_NOT_OK(ValidateAbstractPathParts(src_parts));
 RETURN_NOT_OK(ValidateAbstractPathParts(dest_parts));

 auto guard = impl->lock_guard();

 // Both source and destination must have valid parents
 Entry* src_parent = impl->FindParent(src_parts);
 if (src_parent == nullptr || !src_parent->is_dir()) {
Expand DownExpand Up@@ -552,6 +577,8 @@ struct BinaryOp {
 }
};

} // namespace

Status MockFileSystem::Move(const std::string& src, const std::string& dest) {
 return BinaryOp::Run(impl_.get(), src, dest, [&](const BinaryOp& op) -> Status {
 if (op.src_entry == nullptr) {
Expand DownExpand Up@@ -609,31 +636,43 @@ Status MockFileSystem::CopyFile(const std::string& src, const std::string& dest)

Result<std::shared_ptr<io::InputStream>> MockFileSystem::OpenInputStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenInputReader(path);
}

Result<std::shared_ptr<io::RandomAccessFile>> MockFileSystem::OpenInputFile(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenInputReader(path);
}

Result<std::shared_ptr<io::OutputStream>> MockFileSystem::OpenOutputStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenOutputStream(path, false /* append */);
}

Result<std::shared_ptr<io::OutputStream>> MockFileSystem::OpenAppendStream(
 const std::string& path) {
 auto guard = impl_->lock_guard();

 return impl_->OpenOutputStream(path, true /* append */);
}

std::vector<MockDirInfo> MockFileSystem::AllDirs() {
 auto guard = impl_->lock_guard();

 std::vector<MockDirInfo> result;
 impl_->DumpDirs("", impl_->RootDir(), &result);
 return result;
}

std::vector<MockFileInfo> MockFileSystem::AllFiles() {
 auto guard = impl_->lock_guard();

 std::vector<MockFileInfo> result;
 impl_->DumpFiles("", impl_->RootDir(), &result);
 return result;
Expand All@@ -642,6 +681,7 @@ std::vector<MockFileInfo> MockFileSystem::AllFiles() {
Status MockFileSystem::CreateFile(const std::string& path, const std::string& contents,
 bool recursive) {
 auto parent = fs::internal::GetAbstractPathParent(path).first;

 if (parent != "") {
 RETURN_NOT_OK(CreateDir(parent, recursive));
 }
Expand Down