ARROW-9868: [C++][R] Provide CopyFiles for copying files between FileSystems#8101

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
bkietz wants to merge 4 commits into from
Closed

ARROW-9868: [C++][R] Provide CopyFiles for copying files between FileSystems #8101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78fc5fe
ARROW-9868: [C++][R] Provide CopyFiles for copying files between file…
bkietz Sep 2, 2020
3ea59a7
Update r/src/filesystem.cpp
bkietz Sep 3, 2020
d21f9eb
option_use_threads()
bkietz Sep 3, 2020
a0c14f5
add struct FileLocation
bkietz Sep 8, 2020
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
30 changes: 30 additions & 0 deletions cpp/src/arrow/filesystem/filesystem.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"
#include "arrow/util/parallel.h"
#include "arrow/util/uri.h"
#include "arrow/util/windows_fixup.h"

Expand DownExpand Up@@ -439,6 +440,35 @@ Result<std::shared_ptr<io::OutputStream>> SlowFileSystem::OpenAppendStream(
return base_fs_->OpenAppendStream(path);
}

Status CopyFiles(const std::vector<FileLocator>& sources,
const std::vector<FileLocator>& destinations, int64_t chunk_size,
bool use_threads) {
if (sources.size() != destinations.size()) {
return Status::Invalid("Trying to copy ", sources.size(), " files into ",
destinations.size(), " paths.");
}

return ::arrow::internal::OptionalParallelFor(
use_threads, static_cast<int>(sources.size()), [&](int i) {
if (sources[i].filesystem->Equals(destinations[i].filesystem)) {
return sources[i].filesystem->CopyFile(sources[i].path, destinations[i].path);
}

ARROW_ASSIGN_OR_RAISE(auto source,
sources[i].filesystem->OpenInputStream(sources[i].path));

auto dest_dir = internal::GetAbstractPathParent(destinations[i].path).first;
if (!dest_dir.empty()) {
RETURN_NOT_OK(destinations[i].filesystem->CreateDir(dest_dir));
}

ARROW_ASSIGN_OR_RAISE(
auto destination,
destinations[i].filesystem->OpenOutputStream(destinations[i].path));
return internal::CopyStream(source, destination, chunk_size);
});
}

namespace {

Result<Uri> ParseFileSystemUri(const std::string& uri_string) {
Expand Down
12 changes: 12 additions & 0 deletions cpp/src/arrow/filesystem/filesystem.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,12 @@ struct ARROW_EXPORT FileSelector {
FileSelector() {}
};

/// \brief FileSystem, path pair
struct ARROW_EXPORT FileLocator {
std::shared_ptr<FileSystem> filesystem;
std::string path;
};

/// \brief Abstract file system API
class ARROW_EXPORT FileSystem : public std::enable_shared_from_this<FileSystem> {
public:
Expand DownExpand Up@@ -387,6 +393,12 @@ Result<std::shared_ptr<FileSystem>> FileSystemFromUriOrPath(

/// @}

/// \brief Copy files from one FileSystem to another
ARROW_EXPORT
Status CopyFiles(const std::vector<FileLocator>& sources,
const std::vector<FileLocator>& destinations,
int64_t chunk_size = 1024 * 1024, bool use_threads = true);

struct FileSystemGlobalOptions {
/// Path to a single PEM file holding all TLS CA certificates
///
Expand Down
22 changes: 22 additions & 0 deletions cpp/src/arrow/filesystem/filesystem_test.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,6 +595,28 @@ TEST_F(TestSubTreeFileSystem, CopyFile) {
{"sub/tree/cd", time_, "data"}});
}

TEST_F(TestSubTreeFileSystem, CopyFiles) {
CreateFile("ab", "ab");
CreateFile("cd", "cd");
CreateFile("ef", "ef");

ASSERT_OK(fs_->CreateDir("sub/copy"));
auto dest_fs = std::make_shared<SubTreeFileSystem>("sub/copy", fs_);

ASSERT_OK(
CopyFiles({{subfs_, "ab"}, {subfs_, "cd"}, {subfs_, "ef"}},
{{dest_fs, "AB/ab"}, {dest_fs, "CD/CD/cd"}, {dest_fs, "EF/EF/EF/ef"}}));

CheckFiles({
{"sub/copy/AB/ab", time_, "ab"},
{"sub/copy/CD/CD/cd", time_, "cd"},
{"sub/copy/EF/EF/EF/ef", time_, "ef"},
{"sub/tree/ab", time_, "ab"},
{"sub/tree/cd", time_, "cd"},
{"sub/tree/ef", time_, "ef"},
});
}

TEST_F(TestSubTreeFileSystem, OpenInputStream) {
std::shared_ptr<io::InputStream> stream;
CreateFile("ab", "data");
Expand Down
5 changes: 1 addition & 4 deletions cpp/src/arrow/filesystem/test_util.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -106,10 +106,7 @@ void CreateFile(FileSystem* fs, const std::string& path, const std::string& data
}

void SortInfos(std::vector<FileInfo>* infos) {
std::sort(infos->begin(), infos->end(),
[](const FileInfo& left, const FileInfo& right) -> bool {
return left.path() < right.path();
});
std::sort(infos->begin(), infos->end(), FileInfo::ByPath{});
}

void AssertFileInfo(const FileInfo& info, const std::string& path, FileType type) {
Expand Down
4 changes: 4 additions & 0 deletions r/R/arrowExports.R
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions r/R/filesystem.R
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -280,6 +280,21 @@ SubTreeFileSystem$create <- function(base_path, base_fs) {
shared_ptr(SubTreeFileSystem, xp)
}

#' Copy files between FileSystems
#'
#' @param src_fs The FileSystem from which files will be copied.
#' @param src_paths The paths of files to be copied.
#' @param dest_fs The FileSystem into which files will be copied.
#' @param dest_paths Where the copied files should be placed.
#' @param chunk_size The maximum size of block to read before flushing
#' to the destination file. A larger chunk_size will use more memory while
#' copying but may help accommodate high latency FileSystems.
copy_files <- function(src_fs, src_paths, dest_fs, dest_paths,
chunk_size = 1024L * 1024L) {
fs___CopyFiles(src_fs, src_paths, dest_fs, dest_paths,
chunk_size, option_use_threads())
}

clean_path_abs <- function(path) {
# Make sure we have a valid, absolute, forward-slashed path for passing to Arrow
normalizePath(path, winslash = "/", mustWork = FALSE)
Expand Down
22 changes: 22 additions & 0 deletions r/src/arrowExports.cpp
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions r/src/filesystem.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -230,6 +230,22 @@ cpp11::writable::list fs___FileSystemFromUri(const std::string& path) {
return cpp11::writable::list({"fs"_nm = file_system, "path"_nm = out_path});
}

// [[arrow::export]]
void fs___CopyFiles(const std::shared_ptr<fs::FileSystem>& src_fs,
const std::vector<std::string>& src_paths,
const std::shared_ptr<fs::FileSystem>& dest_fs,
const std::vector<std::string>& dest_paths, int64_t chunk_size,
bool use_threads) {
std::vector<fs::FileLocator> sources(src_paths.size()), destinations(dest_paths.size());

for (size_t i = 0; i < src_paths.size(); ++i) {
sources[i] = {src_fs, src_paths[i]};
destinations[i] = {dest_fs, dest_paths[i]};
}

StopIfNotOk(fs::CopyFiles(sources, destinations, chunk_size, use_threads));
}

#endif

#if defined(ARROW_R_WITH_S3)
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-9868: [C++][R] Provide CopyFiles for copying files between FileSystems#8101

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

bkietz
wants to merge
4
commits into

from

 Closed


ARROW-9868: [C++][R] Provide CopyFiles for copying files between FileSystems
#8101
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
78fc5fe

ARROW-9868: [C++][R] Provide CopyFiles for copying files between file…


bkietz Sep 2, 2020
3ea59a7

Update r/src/filesystem.cpp


bkietz Sep 3, 2020
d21f9eb

option_use_threads()


bkietz Sep 3, 2020
a0c14f5

add struct FileLocation


bkietz Sep 8, 2020

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


30 changes: 30 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"
#include "arrow/util/parallel.h"
#include "arrow/util/uri.h"
#include "arrow/util/windows_fixup.h"

Expand DownExpand Up@@ -439,6 +440,35 @@ Result<std::shared_ptr<io::OutputStream>> SlowFileSystem::OpenAppendStream(
 return base_fs_->OpenAppendStream(path);
}

Status CopyFiles(const std::vector<FileLocator>& sources,
 const std::vector<FileLocator>& destinations, int64_t chunk_size,
 bool use_threads) {
 if (sources.size() != destinations.size()) {
 return Status::Invalid("Trying to copy ", sources.size(), " files into ",
 destinations.size(), " paths.");
 }

 return ::arrow::internal::OptionalParallelFor(
 use_threads, static_cast<int>(sources.size()), [&](int i) {
 if (sources[i].filesystem->Equals(destinations[i].filesystem)) {
 return sources[i].filesystem->CopyFile(sources[i].path, destinations[i].path);
 }

 ARROW_ASSIGN_OR_RAISE(auto source,
 sources[i].filesystem->OpenInputStream(sources[i].path));

 auto dest_dir = internal::GetAbstractPathParent(destinations[i].path).first;
 if (!dest_dir.empty()) {
 RETURN_NOT_OK(destinations[i].filesystem->CreateDir(dest_dir));
 }

 ARROW_ASSIGN_OR_RAISE(
 auto destination,
 destinations[i].filesystem->OpenOutputStream(destinations[i].path));
 return internal::CopyStream(source, destination, chunk_size);
 });
}

namespace {

Result<Uri> ParseFileSystemUri(const std::string& uri_string) {
Expand Down

12 changes: 12 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,12 @@ struct ARROW_EXPORT FileSelector {
 FileSelector() {}
};

/// \brief FileSystem, path pair
struct ARROW_EXPORT FileLocator {
 std::shared_ptr<FileSystem> filesystem;
 std::string path;
};

/// \brief Abstract file system API
class ARROW_EXPORT FileSystem : public std::enable_shared_from_this<FileSystem> {
 public:
Expand DownExpand Up@@ -387,6 +393,12 @@ Result<std::shared_ptr<FileSystem>> FileSystemFromUriOrPath(

/// @}

/// \brief Copy files from one FileSystem to another
ARROW_EXPORT
Status CopyFiles(const std::vector<FileLocator>& sources,
 const std::vector<FileLocator>& destinations,
 int64_t chunk_size = 1024 * 1024, bool use_threads = true);

struct FileSystemGlobalOptions {
 /// Path to a single PEM file holding all TLS CA certificates
 ///
Expand Down

22 changes: 22 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -595,6 +595,28 @@ TEST_F(TestSubTreeFileSystem, CopyFile) {
 {"sub/tree/cd", time_, "data"}});
}

TEST_F(TestSubTreeFileSystem, CopyFiles) {
 CreateFile("ab", "ab");
 CreateFile("cd", "cd");
 CreateFile("ef", "ef");

 ASSERT_OK(fs_->CreateDir("sub/copy"));
 auto dest_fs = std::make_shared<SubTreeFileSystem>("sub/copy", fs_);

 ASSERT_OK(
 CopyFiles({{subfs_, "ab"}, {subfs_, "cd"}, {subfs_, "ef"}},
 {{dest_fs, "AB/ab"}, {dest_fs, "CD/CD/cd"}, {dest_fs, "EF/EF/EF/ef"}}));

 CheckFiles({
 {"sub/copy/AB/ab", time_, "ab"},
 {"sub/copy/CD/CD/cd", time_, "cd"},
 {"sub/copy/EF/EF/EF/ef", time_, "ef"},
 {"sub/tree/ab", time_, "ab"},
 {"sub/tree/cd", time_, "cd"},
 {"sub/tree/ef", time_, "ef"},
 });
}

TEST_F(TestSubTreeFileSystem, OpenInputStream) {
 std::shared_ptr<io::InputStream> stream;
 CreateFile("ab", "data");
Expand Down

5 changes: 1 addition & 4 deletions
cpp/src/arrow/filesystem/test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,10 +106,7 @@ void CreateFile(FileSystem* fs, const std::string& path, const std::string& data
}

void SortInfos(std::vector<FileInfo>* infos) {
 std::sort(infos->begin(), infos->end(),
 [](const FileInfo& left, const FileInfo& right) -> bool {
 return left.path() < right.path();
 });
 std::sort(infos->begin(), infos->end(), FileInfo::ByPath{});
}

void AssertFileInfo(const FileInfo& info, const std::string& path, FileType type) {
Expand Down

4 changes: 4 additions & 0 deletions
r/R/arrowExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


15 changes: 15 additions & 0 deletions
r/R/filesystem.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,6 +280,21 @@ SubTreeFileSystem$create <- function(base_path, base_fs) {
 shared_ptr(SubTreeFileSystem, xp)
}

#' Copy files between FileSystems
#'
#' @param src_fs The FileSystem from which files will be copied.
#' @param src_paths The paths of files to be copied.
#' @param dest_fs The FileSystem into which files will be copied.
#' @param dest_paths Where the copied files should be placed.
#' @param chunk_size The maximum size of block to read before flushing
#' to the destination file. A larger chunk_size will use more memory while
#' copying but may help accommodate high latency FileSystems.
copy_files <- function(src_fs, src_paths, dest_fs, dest_paths,
 chunk_size = 1024L * 1024L) {
 fs___CopyFiles(src_fs, src_paths, dest_fs, dest_paths,
 chunk_size, option_use_threads())
}

clean_path_abs <- function(path) {
 # Make sure we have a valid, absolute, forward-slashed path for passing to Arrow
 normalizePath(path, winslash = "/", mustWork = FALSE)
Expand Down

22 changes: 22 additions & 0 deletions
r/src/arrowExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 16 additions & 0 deletions
r/src/filesystem.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -230,6 +230,22 @@ cpp11::writable::list fs___FileSystemFromUri(const std::string& path) {
 return cpp11::writable::list({"fs"_nm = file_system, "path"_nm = out_path});
}

// [[arrow::export]]
void fs___CopyFiles(const std::shared_ptr<fs::FileSystem>& src_fs,
 const std::vector<std::string>& src_paths,
 const std::shared_ptr<fs::FileSystem>& dest_fs,
 const std::vector<std::string>& dest_paths, int64_t chunk_size,
 bool use_threads) {
 std::vector<fs::FileLocator> sources(src_paths.size()), destinations(dest_paths.size());

 for (size_t i = 0; i < src_paths.size(); ++i) {
 sources[i] = {src_fs, src_paths[i]};
 destinations[i] = {dest_fs, dest_paths[i]};
 }

 StopIfNotOk(fs::CopyFiles(sources, destinations, chunk_size, use_threads));
}

#endif

#if defined(ARROW_R_WITH_S3)
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-9868: [C++][R] Provide CopyFiles for copying files between FileSystems#8101

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

bkietz
wants to merge
4
commits into

from

 Closed


ARROW-9868: [C++][R] Provide CopyFiles for copying files between FileSystems
#8101
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
78fc5fe

ARROW-9868: [C++][R] Provide CopyFiles for copying files between file…


bkietz Sep 2, 2020
3ea59a7

Update r/src/filesystem.cpp


bkietz Sep 3, 2020
d21f9eb

option_use_threads()


bkietz Sep 3, 2020
a0c14f5

add struct FileLocation


bkietz Sep 8, 2020

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


30 changes: 30 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"
#include "arrow/util/parallel.h"
#include "arrow/util/uri.h"
#include "arrow/util/windows_fixup.h"

Expand DownExpand Up@@ -439,6 +440,35 @@ Result<std::shared_ptr<io::OutputStream>> SlowFileSystem::OpenAppendStream(
 return base_fs_->OpenAppendStream(path);
}

Status CopyFiles(const std::vector<FileLocator>& sources,
 const std::vector<FileLocator>& destinations, int64_t chunk_size,
 bool use_threads) {
 if (sources.size() != destinations.size()) {
 return Status::Invalid("Trying to copy ", sources.size(), " files into ",
 destinations.size(), " paths.");
 }

 return ::arrow::internal::OptionalParallelFor(
 use_threads, static_cast<int>(sources.size()), [&](int i) {
 if (sources[i].filesystem->Equals(destinations[i].filesystem)) {
 return sources[i].filesystem->CopyFile(sources[i].path, destinations[i].path);
 }

 ARROW_ASSIGN_OR_RAISE(auto source,
 sources[i].filesystem->OpenInputStream(sources[i].path));

 auto dest_dir = internal::GetAbstractPathParent(destinations[i].path).first;
 if (!dest_dir.empty()) {
 RETURN_NOT_OK(destinations[i].filesystem->CreateDir(dest_dir));
 }

 ARROW_ASSIGN_OR_RAISE(
 auto destination,
 destinations[i].filesystem->OpenOutputStream(destinations[i].path));
 return internal::CopyStream(source, destination, chunk_size);
 });
}

namespace {

Result<Uri> ParseFileSystemUri(const std::string& uri_string) {
Expand Down

12 changes: 12 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,12 @@ struct ARROW_EXPORT FileSelector {
 FileSelector() {}
};

/// \brief FileSystem, path pair
struct ARROW_EXPORT FileLocator {
 std::shared_ptr<FileSystem> filesystem;
 std::string path;
};

/// \brief Abstract file system API
class ARROW_EXPORT FileSystem : public std::enable_shared_from_this<FileSystem> {
 public:
Expand DownExpand Up@@ -387,6 +393,12 @@ Result<std::shared_ptr<FileSystem>> FileSystemFromUriOrPath(

/// @}

/// \brief Copy files from one FileSystem to another
ARROW_EXPORT
Status CopyFiles(const std::vector<FileLocator>& sources,
 const std::vector<FileLocator>& destinations,
 int64_t chunk_size = 1024 * 1024, bool use_threads = true);

struct FileSystemGlobalOptions {
 /// Path to a single PEM file holding all TLS CA certificates
 ///
Expand Down

22 changes: 22 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -595,6 +595,28 @@ TEST_F(TestSubTreeFileSystem, CopyFile) {
 {"sub/tree/cd", time_, "data"}});
}

TEST_F(TestSubTreeFileSystem, CopyFiles) {
 CreateFile("ab", "ab");
 CreateFile("cd", "cd");
 CreateFile("ef", "ef");

 ASSERT_OK(fs_->CreateDir("sub/copy"));
 auto dest_fs = std::make_shared<SubTreeFileSystem>("sub/copy", fs_);

 ASSERT_OK(
 CopyFiles({{subfs_, "ab"}, {subfs_, "cd"}, {subfs_, "ef"}},
 {{dest_fs, "AB/ab"}, {dest_fs, "CD/CD/cd"}, {dest_fs, "EF/EF/EF/ef"}}));

 CheckFiles({
 {"sub/copy/AB/ab", time_, "ab"},
 {"sub/copy/CD/CD/cd", time_, "cd"},
 {"sub/copy/EF/EF/EF/ef", time_, "ef"},
 {"sub/tree/ab", time_, "ab"},
 {"sub/tree/cd", time_, "cd"},
 {"sub/tree/ef", time_, "ef"},
 });
}

TEST_F(TestSubTreeFileSystem, OpenInputStream) {
 std::shared_ptr<io::InputStream> stream;
 CreateFile("ab", "data");
Expand Down

5 changes: 1 addition & 4 deletions
cpp/src/arrow/filesystem/test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,10 +106,7 @@ void CreateFile(FileSystem* fs, const std::string& path, const std::string& data
}

void SortInfos(std::vector<FileInfo>* infos) {
 std::sort(infos->begin(), infos->end(),
 [](const FileInfo& left, const FileInfo& right) -> bool {
 return left.path() < right.path();
 });
 std::sort(infos->begin(), infos->end(), FileInfo::ByPath{});
}

void AssertFileInfo(const FileInfo& info, const std::string& path, FileType type) {
Expand Down

4 changes: 4 additions & 0 deletions
r/R/arrowExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


15 changes: 15 additions & 0 deletions
r/R/filesystem.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,6 +280,21 @@ SubTreeFileSystem$create <- function(base_path, base_fs) {
 shared_ptr(SubTreeFileSystem, xp)
}

#' Copy files between FileSystems
#'
#' @param src_fs The FileSystem from which files will be copied.
#' @param src_paths The paths of files to be copied.
#' @param dest_fs The FileSystem into which files will be copied.
#' @param dest_paths Where the copied files should be placed.
#' @param chunk_size The maximum size of block to read before flushing
#' to the destination file. A larger chunk_size will use more memory while
#' copying but may help accommodate high latency FileSystems.
copy_files <- function(src_fs, src_paths, dest_fs, dest_paths,
 chunk_size = 1024L * 1024L) {
 fs___CopyFiles(src_fs, src_paths, dest_fs, dest_paths,
 chunk_size, option_use_threads())
}

clean_path_abs <- function(path) {
 # Make sure we have a valid, absolute, forward-slashed path for passing to Arrow
 normalizePath(path, winslash = "/", mustWork = FALSE)
Expand Down

22 changes: 22 additions & 0 deletions
r/src/arrowExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 16 additions & 0 deletions
r/src/filesystem.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -230,6 +230,22 @@ cpp11::writable::list fs___FileSystemFromUri(const std::string& path) {
 return cpp11::writable::list({"fs"_nm = file_system, "path"_nm = out_path});
}

// [[arrow::export]]
void fs___CopyFiles(const std::shared_ptr<fs::FileSystem>& src_fs,
 const std::vector<std::string>& src_paths,
 const std::shared_ptr<fs::FileSystem>& dest_fs,
 const std::vector<std::string>& dest_paths, int64_t chunk_size,
 bool use_threads) {
 std::vector<fs::FileLocator> sources(src_paths.size()), destinations(dest_paths.size());

 for (size_t i = 0; i < src_paths.size(); ++i) {
 sources[i] = {src_fs, src_paths[i]};
 destinations[i] = {dest_fs, dest_paths[i]};
 }

 StopIfNotOk(fs::CopyFiles(sources, destinations, chunk_size, use_threads));
}

#endif

#if defined(ARROW_R_WITH_S3)
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-9868: [C++][R] Provide CopyFiles for copying files between FileSystems#8101

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

bkietz
wants to merge
4
commits into

from

 Closed


ARROW-9868: [C++][R] Provide CopyFiles for copying files between FileSystems
#8101
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
78fc5fe

ARROW-9868: [C++][R] Provide CopyFiles for copying files between file…


bkietz Sep 2, 2020
3ea59a7

Update r/src/filesystem.cpp


bkietz Sep 3, 2020
d21f9eb

option_use_threads()


bkietz Sep 3, 2020
a0c14f5

add struct FileLocation


bkietz Sep 8, 2020

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


30 changes: 30 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"
#include "arrow/util/parallel.h"
#include "arrow/util/uri.h"
#include "arrow/util/windows_fixup.h"

Expand DownExpand Up@@ -439,6 +440,35 @@ Result<std::shared_ptr<io::OutputStream>> SlowFileSystem::OpenAppendStream(
 return base_fs_->OpenAppendStream(path);
}

Status CopyFiles(const std::vector<FileLocator>& sources,
 const std::vector<FileLocator>& destinations, int64_t chunk_size,
 bool use_threads) {
 if (sources.size() != destinations.size()) {
 return Status::Invalid("Trying to copy ", sources.size(), " files into ",
 destinations.size(), " paths.");
 }

 return ::arrow::internal::OptionalParallelFor(
 use_threads, static_cast<int>(sources.size()), [&](int i) {
 if (sources[i].filesystem->Equals(destinations[i].filesystem)) {
 return sources[i].filesystem->CopyFile(sources[i].path, destinations[i].path);
 }

 ARROW_ASSIGN_OR_RAISE(auto source,
 sources[i].filesystem->OpenInputStream(sources[i].path));

 auto dest_dir = internal::GetAbstractPathParent(destinations[i].path).first;
 if (!dest_dir.empty()) {
 RETURN_NOT_OK(destinations[i].filesystem->CreateDir(dest_dir));
 }

 ARROW_ASSIGN_OR_RAISE(
 auto destination,
 destinations[i].filesystem->OpenOutputStream(destinations[i].path));
 return internal::CopyStream(source, destination, chunk_size);
 });
}

namespace {

Result<Uri> ParseFileSystemUri(const std::string& uri_string) {
Expand Down

12 changes: 12 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,12 @@ struct ARROW_EXPORT FileSelector {
 FileSelector() {}
};

/// \brief FileSystem, path pair
struct ARROW_EXPORT FileLocator {
 std::shared_ptr<FileSystem> filesystem;
 std::string path;
};

/// \brief Abstract file system API
class ARROW_EXPORT FileSystem : public std::enable_shared_from_this<FileSystem> {
 public:
Expand DownExpand Up@@ -387,6 +393,12 @@ Result<std::shared_ptr<FileSystem>> FileSystemFromUriOrPath(

/// @}

/// \brief Copy files from one FileSystem to another
ARROW_EXPORT
Status CopyFiles(const std::vector<FileLocator>& sources,
 const std::vector<FileLocator>& destinations,
 int64_t chunk_size = 1024 * 1024, bool use_threads = true);

struct FileSystemGlobalOptions {
 /// Path to a single PEM file holding all TLS CA certificates
 ///
Expand Down

22 changes: 22 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -595,6 +595,28 @@ TEST_F(TestSubTreeFileSystem, CopyFile) {
 {"sub/tree/cd", time_, "data"}});
}

TEST_F(TestSubTreeFileSystem, CopyFiles) {
 CreateFile("ab", "ab");
 CreateFile("cd", "cd");
 CreateFile("ef", "ef");

 ASSERT_OK(fs_->CreateDir("sub/copy"));
 auto dest_fs = std::make_shared<SubTreeFileSystem>("sub/copy", fs_);

 ASSERT_OK(
 CopyFiles({{subfs_, "ab"}, {subfs_, "cd"}, {subfs_, "ef"}},
 {{dest_fs, "AB/ab"}, {dest_fs, "CD/CD/cd"}, {dest_fs, "EF/EF/EF/ef"}}));

 CheckFiles({
 {"sub/copy/AB/ab", time_, "ab"},
 {"sub/copy/CD/CD/cd", time_, "cd"},
 {"sub/copy/EF/EF/EF/ef", time_, "ef"},
 {"sub/tree/ab", time_, "ab"},
 {"sub/tree/cd", time_, "cd"},
 {"sub/tree/ef", time_, "ef"},
 });
}

TEST_F(TestSubTreeFileSystem, OpenInputStream) {
 std::shared_ptr<io::InputStream> stream;
 CreateFile("ab", "data");
Expand Down

5 changes: 1 addition & 4 deletions
cpp/src/arrow/filesystem/test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,10 +106,7 @@ void CreateFile(FileSystem* fs, const std::string& path, const std::string& data
}

void SortInfos(std::vector<FileInfo>* infos) {
 std::sort(infos->begin(), infos->end(),
 [](const FileInfo& left, const FileInfo& right) -> bool {
 return left.path() < right.path();
 });
 std::sort(infos->begin(), infos->end(), FileInfo::ByPath{});
}

void AssertFileInfo(const FileInfo& info, const std::string& path, FileType type) {
Expand Down

4 changes: 4 additions & 0 deletions
r/R/arrowExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


15 changes: 15 additions & 0 deletions
r/R/filesystem.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,6 +280,21 @@ SubTreeFileSystem$create <- function(base_path, base_fs) {
 shared_ptr(SubTreeFileSystem, xp)
}

#' Copy files between FileSystems
#'
#' @param src_fs The FileSystem from which files will be copied.
#' @param src_paths The paths of files to be copied.
#' @param dest_fs The FileSystem into which files will be copied.
#' @param dest_paths Where the copied files should be placed.
#' @param chunk_size The maximum size of block to read before flushing
#' to the destination file. A larger chunk_size will use more memory while
#' copying but may help accommodate high latency FileSystems.
copy_files <- function(src_fs, src_paths, dest_fs, dest_paths,
 chunk_size = 1024L * 1024L) {
 fs___CopyFiles(src_fs, src_paths, dest_fs, dest_paths,
 chunk_size, option_use_threads())
}

clean_path_abs <- function(path) {
 # Make sure we have a valid, absolute, forward-slashed path for passing to Arrow
 normalizePath(path, winslash = "/", mustWork = FALSE)
Expand Down

22 changes: 22 additions & 0 deletions
r/src/arrowExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 16 additions & 0 deletions
r/src/filesystem.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -230,6 +230,22 @@ cpp11::writable::list fs___FileSystemFromUri(const std::string& path) {
 return cpp11::writable::list({"fs"_nm = file_system, "path"_nm = out_path});
}

// [[arrow::export]]
void fs___CopyFiles(const std::shared_ptr<fs::FileSystem>& src_fs,
 const std::vector<std::string>& src_paths,
 const std::shared_ptr<fs::FileSystem>& dest_fs,
 const std::vector<std::string>& dest_paths, int64_t chunk_size,
 bool use_threads) {
 std::vector<fs::FileLocator> sources(src_paths.size()), destinations(dest_paths.size());

 for (size_t i = 0; i < src_paths.size(); ++i) {
 sources[i] = {src_fs, src_paths[i]};
 destinations[i] = {dest_fs, dest_paths[i]};
 }

 StopIfNotOk(fs::CopyFiles(sources, destinations, chunk_size, use_threads));
}

#endif

#if defined(ARROW_R_WITH_S3)
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-9868: [C++][R] Provide CopyFiles for copying files between FileSystems#8101

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

bkietz
wants to merge
4
commits into

from

 Closed


ARROW-9868: [C++][R] Provide CopyFiles for copying files between FileSystems
#8101
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
78fc5fe

ARROW-9868: [C++][R] Provide CopyFiles for copying files between file…


bkietz Sep 2, 2020
3ea59a7

Update r/src/filesystem.cpp


bkietz Sep 3, 2020
d21f9eb

option_use_threads()


bkietz Sep 3, 2020
a0c14f5

add struct FileLocation


bkietz Sep 8, 2020

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


30 changes: 30 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"
#include "arrow/util/parallel.h"
#include "arrow/util/uri.h"
#include "arrow/util/windows_fixup.h"

Expand DownExpand Up@@ -439,6 +440,35 @@ Result<std::shared_ptr<io::OutputStream>> SlowFileSystem::OpenAppendStream(
 return base_fs_->OpenAppendStream(path);
}

Status CopyFiles(const std::vector<FileLocator>& sources,
 const std::vector<FileLocator>& destinations, int64_t chunk_size,
 bool use_threads) {
 if (sources.size() != destinations.size()) {
 return Status::Invalid("Trying to copy ", sources.size(), " files into ",
 destinations.size(), " paths.");
 }

 return ::arrow::internal::OptionalParallelFor(
 use_threads, static_cast<int>(sources.size()), [&](int i) {
 if (sources[i].filesystem->Equals(destinations[i].filesystem)) {
 return sources[i].filesystem->CopyFile(sources[i].path, destinations[i].path);
 }

 ARROW_ASSIGN_OR_RAISE(auto source,
 sources[i].filesystem->OpenInputStream(sources[i].path));

 auto dest_dir = internal::GetAbstractPathParent(destinations[i].path).first;
 if (!dest_dir.empty()) {
 RETURN_NOT_OK(destinations[i].filesystem->CreateDir(dest_dir));
 }

 ARROW_ASSIGN_OR_RAISE(
 auto destination,
 destinations[i].filesystem->OpenOutputStream(destinations[i].path));
 return internal::CopyStream(source, destination, chunk_size);
 });
}

namespace {

Result<Uri> ParseFileSystemUri(const std::string& uri_string) {
Expand Down

12 changes: 12 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,12 @@ struct ARROW_EXPORT FileSelector {
 FileSelector() {}
};

/// \brief FileSystem, path pair
struct ARROW_EXPORT FileLocator {
 std::shared_ptr<FileSystem> filesystem;
 std::string path;
};

/// \brief Abstract file system API
class ARROW_EXPORT FileSystem : public std::enable_shared_from_this<FileSystem> {
 public:
Expand DownExpand Up@@ -387,6 +393,12 @@ Result<std::shared_ptr<FileSystem>> FileSystemFromUriOrPath(

/// @}

/// \brief Copy files from one FileSystem to another
ARROW_EXPORT
Status CopyFiles(const std::vector<FileLocator>& sources,
 const std::vector<FileLocator>& destinations,
 int64_t chunk_size = 1024 * 1024, bool use_threads = true);

struct FileSystemGlobalOptions {
 /// Path to a single PEM file holding all TLS CA certificates
 ///
Expand Down

22 changes: 22 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -595,6 +595,28 @@ TEST_F(TestSubTreeFileSystem, CopyFile) {
 {"sub/tree/cd", time_, "data"}});
}

TEST_F(TestSubTreeFileSystem, CopyFiles) {
 CreateFile("ab", "ab");
 CreateFile("cd", "cd");
 CreateFile("ef", "ef");

 ASSERT_OK(fs_->CreateDir("sub/copy"));
 auto dest_fs = std::make_shared<SubTreeFileSystem>("sub/copy", fs_);

 ASSERT_OK(
 CopyFiles({{subfs_, "ab"}, {subfs_, "cd"}, {subfs_, "ef"}},
 {{dest_fs, "AB/ab"}, {dest_fs, "CD/CD/cd"}, {dest_fs, "EF/EF/EF/ef"}}));

 CheckFiles({
 {"sub/copy/AB/ab", time_, "ab"},
 {"sub/copy/CD/CD/cd", time_, "cd"},
 {"sub/copy/EF/EF/EF/ef", time_, "ef"},
 {"sub/tree/ab", time_, "ab"},
 {"sub/tree/cd", time_, "cd"},
 {"sub/tree/ef", time_, "ef"},
 });
}

TEST_F(TestSubTreeFileSystem, OpenInputStream) {
 std::shared_ptr<io::InputStream> stream;
 CreateFile("ab", "data");
Expand Down

5 changes: 1 addition & 4 deletions
cpp/src/arrow/filesystem/test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,10 +106,7 @@ void CreateFile(FileSystem* fs, const std::string& path, const std::string& data
}

void SortInfos(std::vector<FileInfo>* infos) {
 std::sort(infos->begin(), infos->end(),
 [](const FileInfo& left, const FileInfo& right) -> bool {
 return left.path() < right.path();
 });
 std::sort(infos->begin(), infos->end(), FileInfo::ByPath{});
}

void AssertFileInfo(const FileInfo& info, const std::string& path, FileType type) {
Expand Down

4 changes: 4 additions & 0 deletions
r/R/arrowExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


15 changes: 15 additions & 0 deletions
r/R/filesystem.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,6 +280,21 @@ SubTreeFileSystem$create <- function(base_path, base_fs) {
 shared_ptr(SubTreeFileSystem, xp)
}

#' Copy files between FileSystems
#'
#' @param src_fs The FileSystem from which files will be copied.
#' @param src_paths The paths of files to be copied.
#' @param dest_fs The FileSystem into which files will be copied.
#' @param dest_paths Where the copied files should be placed.
#' @param chunk_size The maximum size of block to read before flushing
#' to the destination file. A larger chunk_size will use more memory while
#' copying but may help accommodate high latency FileSystems.
copy_files <- function(src_fs, src_paths, dest_fs, dest_paths,
 chunk_size = 1024L * 1024L) {
 fs___CopyFiles(src_fs, src_paths, dest_fs, dest_paths,
 chunk_size, option_use_threads())
}

clean_path_abs <- function(path) {
 # Make sure we have a valid, absolute, forward-slashed path for passing to Arrow
 normalizePath(path, winslash = "/", mustWork = FALSE)
Expand Down

22 changes: 22 additions & 0 deletions
r/src/arrowExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 16 additions & 0 deletions
r/src/filesystem.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -230,6 +230,22 @@ cpp11::writable::list fs___FileSystemFromUri(const std::string& path) {
 return cpp11::writable::list({"fs"_nm = file_system, "path"_nm = out_path});
}

// [[arrow::export]]
void fs___CopyFiles(const std::shared_ptr<fs::FileSystem>& src_fs,
 const std::vector<std::string>& src_paths,
 const std::shared_ptr<fs::FileSystem>& dest_fs,
 const std::vector<std::string>& dest_paths, int64_t chunk_size,
 bool use_threads) {
 std::vector<fs::FileLocator> sources(src_paths.size()), destinations(dest_paths.size());

 for (size_t i = 0; i < src_paths.size(); ++i) {
 sources[i] = {src_fs, src_paths[i]};
 destinations[i] = {dest_fs, dest_paths[i]};
 }

 StopIfNotOk(fs::CopyFiles(sources, destinations, chunk_size, use_threads));
}

#endif

#if defined(ARROW_R_WITH_S3)
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-9868: [C++][R] Provide CopyFiles for copying files between FileSystems#8101

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

bkietz
wants to merge
4
commits into

from

 Closed


ARROW-9868: [C++][R] Provide CopyFiles for copying files between FileSystems
#8101
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
78fc5fe

ARROW-9868: [C++][R] Provide CopyFiles for copying files between file…


bkietz Sep 2, 2020
3ea59a7

Update r/src/filesystem.cpp


bkietz Sep 3, 2020
d21f9eb

option_use_threads()


bkietz Sep 3, 2020
a0c14f5

add struct FileLocation


bkietz Sep 8, 2020

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


30 changes: 30 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"
#include "arrow/util/parallel.h"
#include "arrow/util/uri.h"
#include "arrow/util/windows_fixup.h"

Expand DownExpand Up@@ -439,6 +440,35 @@ Result<std::shared_ptr<io::OutputStream>> SlowFileSystem::OpenAppendStream(
 return base_fs_->OpenAppendStream(path);
}

Status CopyFiles(const std::vector<FileLocator>& sources,
 const std::vector<FileLocator>& destinations, int64_t chunk_size,
 bool use_threads) {
 if (sources.size() != destinations.size()) {
 return Status::Invalid("Trying to copy ", sources.size(), " files into ",
 destinations.size(), " paths.");
 }

 return ::arrow::internal::OptionalParallelFor(
 use_threads, static_cast<int>(sources.size()), [&](int i) {
 if (sources[i].filesystem->Equals(destinations[i].filesystem)) {
 return sources[i].filesystem->CopyFile(sources[i].path, destinations[i].path);
 }

 ARROW_ASSIGN_OR_RAISE(auto source,
 sources[i].filesystem->OpenInputStream(sources[i].path));

 auto dest_dir = internal::GetAbstractPathParent(destinations[i].path).first;
 if (!dest_dir.empty()) {
 RETURN_NOT_OK(destinations[i].filesystem->CreateDir(dest_dir));
 }

 ARROW_ASSIGN_OR_RAISE(
 auto destination,
 destinations[i].filesystem->OpenOutputStream(destinations[i].path));
 return internal::CopyStream(source, destination, chunk_size);
 });
}

namespace {

Result<Uri> ParseFileSystemUri(const std::string& uri_string) {
Expand Down

12 changes: 12 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,12 @@ struct ARROW_EXPORT FileSelector {
 FileSelector() {}
};

/// \brief FileSystem, path pair
struct ARROW_EXPORT FileLocator {
 std::shared_ptr<FileSystem> filesystem;
 std::string path;
};

/// \brief Abstract file system API
class ARROW_EXPORT FileSystem : public std::enable_shared_from_this<FileSystem> {
 public:
Expand DownExpand Up@@ -387,6 +393,12 @@ Result<std::shared_ptr<FileSystem>> FileSystemFromUriOrPath(

/// @}

/// \brief Copy files from one FileSystem to another
ARROW_EXPORT
Status CopyFiles(const std::vector<FileLocator>& sources,
 const std::vector<FileLocator>& destinations,
 int64_t chunk_size = 1024 * 1024, bool use_threads = true);

struct FileSystemGlobalOptions {
 /// Path to a single PEM file holding all TLS CA certificates
 ///
Expand Down

22 changes: 22 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -595,6 +595,28 @@ TEST_F(TestSubTreeFileSystem, CopyFile) {
 {"sub/tree/cd", time_, "data"}});
}

TEST_F(TestSubTreeFileSystem, CopyFiles) {
 CreateFile("ab", "ab");
 CreateFile("cd", "cd");
 CreateFile("ef", "ef");

 ASSERT_OK(fs_->CreateDir("sub/copy"));
 auto dest_fs = std::make_shared<SubTreeFileSystem>("sub/copy", fs_);

 ASSERT_OK(
 CopyFiles({{subfs_, "ab"}, {subfs_, "cd"}, {subfs_, "ef"}},
 {{dest_fs, "AB/ab"}, {dest_fs, "CD/CD/cd"}, {dest_fs, "EF/EF/EF/ef"}}));

 CheckFiles({
 {"sub/copy/AB/ab", time_, "ab"},
 {"sub/copy/CD/CD/cd", time_, "cd"},
 {"sub/copy/EF/EF/EF/ef", time_, "ef"},
 {"sub/tree/ab", time_, "ab"},
 {"sub/tree/cd", time_, "cd"},
 {"sub/tree/ef", time_, "ef"},
 });
}

TEST_F(TestSubTreeFileSystem, OpenInputStream) {
 std::shared_ptr<io::InputStream> stream;
 CreateFile("ab", "data");
Expand Down

5 changes: 1 addition & 4 deletions
cpp/src/arrow/filesystem/test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,10 +106,7 @@ void CreateFile(FileSystem* fs, const std::string& path, const std::string& data
}

void SortInfos(std::vector<FileInfo>* infos) {
 std::sort(infos->begin(), infos->end(),
 [](const FileInfo& left, const FileInfo& right) -> bool {
 return left.path() < right.path();
 });
 std::sort(infos->begin(), infos->end(), FileInfo::ByPath{});
}

void AssertFileInfo(const FileInfo& info, const std::string& path, FileType type) {
Expand Down

4 changes: 4 additions & 0 deletions
r/R/arrowExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


15 changes: 15 additions & 0 deletions
r/R/filesystem.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,6 +280,21 @@ SubTreeFileSystem$create <- function(base_path, base_fs) {
 shared_ptr(SubTreeFileSystem, xp)
}

#' Copy files between FileSystems
#'
#' @param src_fs The FileSystem from which files will be copied.
#' @param src_paths The paths of files to be copied.
#' @param dest_fs The FileSystem into which files will be copied.
#' @param dest_paths Where the copied files should be placed.
#' @param chunk_size The maximum size of block to read before flushing
#' to the destination file. A larger chunk_size will use more memory while
#' copying but may help accommodate high latency FileSystems.
copy_files <- function(src_fs, src_paths, dest_fs, dest_paths,
 chunk_size = 1024L * 1024L) {
 fs___CopyFiles(src_fs, src_paths, dest_fs, dest_paths,
 chunk_size, option_use_threads())
}

clean_path_abs <- function(path) {
 # Make sure we have a valid, absolute, forward-slashed path for passing to Arrow
 normalizePath(path, winslash = "/", mustWork = FALSE)
Expand Down

22 changes: 22 additions & 0 deletions
r/src/arrowExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 16 additions & 0 deletions
r/src/filesystem.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -230,6 +230,22 @@ cpp11::writable::list fs___FileSystemFromUri(const std::string& path) {
 return cpp11::writable::list({"fs"_nm = file_system, "path"_nm = out_path});
}

// [[arrow::export]]
void fs___CopyFiles(const std::shared_ptr<fs::FileSystem>& src_fs,
 const std::vector<std::string>& src_paths,
 const std::shared_ptr<fs::FileSystem>& dest_fs,
 const std::vector<std::string>& dest_paths, int64_t chunk_size,
 bool use_threads) {
 std::vector<fs::FileLocator> sources(src_paths.size()), destinations(dest_paths.size());

 for (size_t i = 0; i < src_paths.size(); ++i) {
 sources[i] = {src_fs, src_paths[i]};
 destinations[i] = {dest_fs, dest_paths[i]};
 }

 StopIfNotOk(fs::CopyFiles(sources, destinations, chunk_size, use_threads));
}

#endif

#if defined(ARROW_R_WITH_S3)
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-9868: [C++][R] Provide CopyFiles for copying files between FileSystems#8101

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

bkietz
wants to merge
4
commits into

from

 Closed


ARROW-9868: [C++][R] Provide CopyFiles for copying files between FileSystems
#8101
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
78fc5fe

ARROW-9868: [C++][R] Provide CopyFiles for copying files between file…


bkietz Sep 2, 2020
3ea59a7

Update r/src/filesystem.cpp


bkietz Sep 3, 2020
d21f9eb

option_use_threads()


bkietz Sep 3, 2020
a0c14f5

add struct FileLocation


bkietz Sep 8, 2020

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


30 changes: 30 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"
#include "arrow/util/parallel.h"
#include "arrow/util/uri.h"
#include "arrow/util/windows_fixup.h"

Expand DownExpand Up@@ -439,6 +440,35 @@ Result<std::shared_ptr<io::OutputStream>> SlowFileSystem::OpenAppendStream(
 return base_fs_->OpenAppendStream(path);
}

Status CopyFiles(const std::vector<FileLocator>& sources,
 const std::vector<FileLocator>& destinations, int64_t chunk_size,
 bool use_threads) {
 if (sources.size() != destinations.size()) {
 return Status::Invalid("Trying to copy ", sources.size(), " files into ",
 destinations.size(), " paths.");
 }

 return ::arrow::internal::OptionalParallelFor(
 use_threads, static_cast<int>(sources.size()), [&](int i) {
 if (sources[i].filesystem->Equals(destinations[i].filesystem)) {
 return sources[i].filesystem->CopyFile(sources[i].path, destinations[i].path);
 }

 ARROW_ASSIGN_OR_RAISE(auto source,
 sources[i].filesystem->OpenInputStream(sources[i].path));

 auto dest_dir = internal::GetAbstractPathParent(destinations[i].path).first;
 if (!dest_dir.empty()) {
 RETURN_NOT_OK(destinations[i].filesystem->CreateDir(dest_dir));
 }

 ARROW_ASSIGN_OR_RAISE(
 auto destination,
 destinations[i].filesystem->OpenOutputStream(destinations[i].path));
 return internal::CopyStream(source, destination, chunk_size);
 });
}

namespace {

Result<Uri> ParseFileSystemUri(const std::string& uri_string) {
Expand Down

12 changes: 12 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,12 @@ struct ARROW_EXPORT FileSelector {
 FileSelector() {}
};

/// \brief FileSystem, path pair
struct ARROW_EXPORT FileLocator {
 std::shared_ptr<FileSystem> filesystem;
 std::string path;
};

/// \brief Abstract file system API
class ARROW_EXPORT FileSystem : public std::enable_shared_from_this<FileSystem> {
 public:
Expand DownExpand Up@@ -387,6 +393,12 @@ Result<std::shared_ptr<FileSystem>> FileSystemFromUriOrPath(

/// @}

/// \brief Copy files from one FileSystem to another
ARROW_EXPORT
Status CopyFiles(const std::vector<FileLocator>& sources,
 const std::vector<FileLocator>& destinations,
 int64_t chunk_size = 1024 * 1024, bool use_threads = true);

struct FileSystemGlobalOptions {
 /// Path to a single PEM file holding all TLS CA certificates
 ///
Expand Down

22 changes: 22 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -595,6 +595,28 @@ TEST_F(TestSubTreeFileSystem, CopyFile) {
 {"sub/tree/cd", time_, "data"}});
}

TEST_F(TestSubTreeFileSystem, CopyFiles) {
 CreateFile("ab", "ab");
 CreateFile("cd", "cd");
 CreateFile("ef", "ef");

 ASSERT_OK(fs_->CreateDir("sub/copy"));
 auto dest_fs = std::make_shared<SubTreeFileSystem>("sub/copy", fs_);

 ASSERT_OK(
 CopyFiles({{subfs_, "ab"}, {subfs_, "cd"}, {subfs_, "ef"}},
 {{dest_fs, "AB/ab"}, {dest_fs, "CD/CD/cd"}, {dest_fs, "EF/EF/EF/ef"}}));

 CheckFiles({
 {"sub/copy/AB/ab", time_, "ab"},
 {"sub/copy/CD/CD/cd", time_, "cd"},
 {"sub/copy/EF/EF/EF/ef", time_, "ef"},
 {"sub/tree/ab", time_, "ab"},
 {"sub/tree/cd", time_, "cd"},
 {"sub/tree/ef", time_, "ef"},
 });
}

TEST_F(TestSubTreeFileSystem, OpenInputStream) {
 std::shared_ptr<io::InputStream> stream;
 CreateFile("ab", "data");
Expand Down

5 changes: 1 addition & 4 deletions
cpp/src/arrow/filesystem/test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,10 +106,7 @@ void CreateFile(FileSystem* fs, const std::string& path, const std::string& data
}

void SortInfos(std::vector<FileInfo>* infos) {
 std::sort(infos->begin(), infos->end(),
 [](const FileInfo& left, const FileInfo& right) -> bool {
 return left.path() < right.path();
 });
 std::sort(infos->begin(), infos->end(), FileInfo::ByPath{});
}

void AssertFileInfo(const FileInfo& info, const std::string& path, FileType type) {
Expand Down

4 changes: 4 additions & 0 deletions
r/R/arrowExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


15 changes: 15 additions & 0 deletions
r/R/filesystem.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,6 +280,21 @@ SubTreeFileSystem$create <- function(base_path, base_fs) {
 shared_ptr(SubTreeFileSystem, xp)
}

#' Copy files between FileSystems
#'
#' @param src_fs The FileSystem from which files will be copied.
#' @param src_paths The paths of files to be copied.
#' @param dest_fs The FileSystem into which files will be copied.
#' @param dest_paths Where the copied files should be placed.
#' @param chunk_size The maximum size of block to read before flushing
#' to the destination file. A larger chunk_size will use more memory while
#' copying but may help accommodate high latency FileSystems.
copy_files <- function(src_fs, src_paths, dest_fs, dest_paths,
 chunk_size = 1024L * 1024L) {
 fs___CopyFiles(src_fs, src_paths, dest_fs, dest_paths,
 chunk_size, option_use_threads())
}

clean_path_abs <- function(path) {
 # Make sure we have a valid, absolute, forward-slashed path for passing to Arrow
 normalizePath(path, winslash = "/", mustWork = FALSE)
Expand Down

22 changes: 22 additions & 0 deletions
r/src/arrowExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 16 additions & 0 deletions
r/src/filesystem.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -230,6 +230,22 @@ cpp11::writable::list fs___FileSystemFromUri(const std::string& path) {
 return cpp11::writable::list({"fs"_nm = file_system, "path"_nm = out_path});
}

// [[arrow::export]]
void fs___CopyFiles(const std::shared_ptr<fs::FileSystem>& src_fs,
 const std::vector<std::string>& src_paths,
 const std::shared_ptr<fs::FileSystem>& dest_fs,
 const std::vector<std::string>& dest_paths, int64_t chunk_size,
 bool use_threads) {
 std::vector<fs::FileLocator> sources(src_paths.size()), destinations(dest_paths.size());

 for (size_t i = 0; i < src_paths.size(); ++i) {
 sources[i] = {src_fs, src_paths[i]};
 destinations[i] = {dest_fs, dest_paths[i]};
 }

 StopIfNotOk(fs::CopyFiles(sources, destinations, chunk_size, use_threads));
}

#endif

#if defined(ARROW_R_WITH_S3)
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-9868: [C++][R] Provide CopyFiles for copying files between FileSystems#8101

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

bkietz
wants to merge
4
commits into

from

 Closed


ARROW-9868: [C++][R] Provide CopyFiles for copying files between FileSystems
#8101
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
78fc5fe

ARROW-9868: [C++][R] Provide CopyFiles for copying files between file…


bkietz Sep 2, 2020
3ea59a7

Update r/src/filesystem.cpp


bkietz Sep 3, 2020
d21f9eb

option_use_threads()


bkietz Sep 3, 2020
a0c14f5

add struct FileLocation


bkietz Sep 8, 2020

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


30 changes: 30 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
#include "arrow/util/checked_cast.h"
#include "arrow/util/logging.h"
#include "arrow/util/macros.h"
#include "arrow/util/parallel.h"
#include "arrow/util/uri.h"
#include "arrow/util/windows_fixup.h"

Expand DownExpand Up@@ -439,6 +440,35 @@ Result<std::shared_ptr<io::OutputStream>> SlowFileSystem::OpenAppendStream(
 return base_fs_->OpenAppendStream(path);
}

Status CopyFiles(const std::vector<FileLocator>& sources,
 const std::vector<FileLocator>& destinations, int64_t chunk_size,
 bool use_threads) {
 if (sources.size() != destinations.size()) {
 return Status::Invalid("Trying to copy ", sources.size(), " files into ",
 destinations.size(), " paths.");
 }

 return ::arrow::internal::OptionalParallelFor(
 use_threads, static_cast<int>(sources.size()), [&](int i) {
 if (sources[i].filesystem->Equals(destinations[i].filesystem)) {
 return sources[i].filesystem->CopyFile(sources[i].path, destinations[i].path);
 }

 ARROW_ASSIGN_OR_RAISE(auto source,
 sources[i].filesystem->OpenInputStream(sources[i].path));

 auto dest_dir = internal::GetAbstractPathParent(destinations[i].path).first;
 if (!dest_dir.empty()) {
 RETURN_NOT_OK(destinations[i].filesystem->CreateDir(dest_dir));
 }

 ARROW_ASSIGN_OR_RAISE(
 auto destination,
 destinations[i].filesystem->OpenOutputStream(destinations[i].path));
 return internal::CopyStream(source, destination, chunk_size);
 });
}

namespace {

Result<Uri> ParseFileSystemUri(const std::string& uri_string) {
Expand Down

12 changes: 12 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem.h

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -134,6 +134,12 @@ struct ARROW_EXPORT FileSelector {
 FileSelector() {}
};

/// \brief FileSystem, path pair
struct ARROW_EXPORT FileLocator {
 std::shared_ptr<FileSystem> filesystem;
 std::string path;
};

/// \brief Abstract file system API
class ARROW_EXPORT FileSystem : public std::enable_shared_from_this<FileSystem> {
 public:
Expand DownExpand Up@@ -387,6 +393,12 @@ Result<std::shared_ptr<FileSystem>> FileSystemFromUriOrPath(

/// @}

/// \brief Copy files from one FileSystem to another
ARROW_EXPORT
Status CopyFiles(const std::vector<FileLocator>& sources,
 const std::vector<FileLocator>& destinations,
 int64_t chunk_size = 1024 * 1024, bool use_threads = true);

struct FileSystemGlobalOptions {
 /// Path to a single PEM file holding all TLS CA certificates
 ///
Expand Down

22 changes: 22 additions & 0 deletions
cpp/src/arrow/filesystem/filesystem_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -595,6 +595,28 @@ TEST_F(TestSubTreeFileSystem, CopyFile) {
 {"sub/tree/cd", time_, "data"}});
}

TEST_F(TestSubTreeFileSystem, CopyFiles) {
 CreateFile("ab", "ab");
 CreateFile("cd", "cd");
 CreateFile("ef", "ef");

 ASSERT_OK(fs_->CreateDir("sub/copy"));
 auto dest_fs = std::make_shared<SubTreeFileSystem>("sub/copy", fs_);

 ASSERT_OK(
 CopyFiles({{subfs_, "ab"}, {subfs_, "cd"}, {subfs_, "ef"}},
 {{dest_fs, "AB/ab"}, {dest_fs, "CD/CD/cd"}, {dest_fs, "EF/EF/EF/ef"}}));

 CheckFiles({
 {"sub/copy/AB/ab", time_, "ab"},
 {"sub/copy/CD/CD/cd", time_, "cd"},
 {"sub/copy/EF/EF/EF/ef", time_, "ef"},
 {"sub/tree/ab", time_, "ab"},
 {"sub/tree/cd", time_, "cd"},
 {"sub/tree/ef", time_, "ef"},
 });
}

TEST_F(TestSubTreeFileSystem, OpenInputStream) {
 std::shared_ptr<io::InputStream> stream;
 CreateFile("ab", "data");
Expand Down

5 changes: 1 addition & 4 deletions
cpp/src/arrow/filesystem/test_util.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -106,10 +106,7 @@ void CreateFile(FileSystem* fs, const std::string& path, const std::string& data
}

void SortInfos(std::vector<FileInfo>* infos) {
 std::sort(infos->begin(), infos->end(),
 [](const FileInfo& left, const FileInfo& right) -> bool {
 return left.path() < right.path();
 });
 std::sort(infos->begin(), infos->end(), FileInfo::ByPath{});
}

void AssertFileInfo(const FileInfo& info, const std::string& path, FileType type) {
Expand Down

4 changes: 4 additions & 0 deletions
r/R/arrowExports.R

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


15 changes: 15 additions & 0 deletions
r/R/filesystem.R

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -280,6 +280,21 @@ SubTreeFileSystem$create <- function(base_path, base_fs) {
 shared_ptr(SubTreeFileSystem, xp)
}

#' Copy files between FileSystems
#'
#' @param src_fs The FileSystem from which files will be copied.
#' @param src_paths The paths of files to be copied.
#' @param dest_fs The FileSystem into which files will be copied.
#' @param dest_paths Where the copied files should be placed.
#' @param chunk_size The maximum size of block to read before flushing
#' to the destination file. A larger chunk_size will use more memory while
#' copying but may help accommodate high latency FileSystems.
copy_files <- function(src_fs, src_paths, dest_fs, dest_paths,
 chunk_size = 1024L * 1024L) {
 fs___CopyFiles(src_fs, src_paths, dest_fs, dest_paths,
 chunk_size, option_use_threads())
}

clean_path_abs <- function(path) {
 # Make sure we have a valid, absolute, forward-slashed path for passing to Arrow
 normalizePath(path, winslash = "/", mustWork = FALSE)
Expand Down

22 changes: 22 additions & 0 deletions
r/src/arrowExports.cpp

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


16 changes: 16 additions & 0 deletions
r/src/filesystem.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -230,6 +230,22 @@ cpp11::writable::list fs___FileSystemFromUri(const std::string& path) {
 return cpp11::writable::list({"fs"_nm = file_system, "path"_nm = out_path});
}

// [[arrow::export]]
void fs___CopyFiles(const std::shared_ptr<fs::FileSystem>& src_fs,
 const std::vector<std::string>& src_paths,
 const std::shared_ptr<fs::FileSystem>& dest_fs,
 const std::vector<std::string>& dest_paths, int64_t chunk_size,
 bool use_threads) {
 std::vector<fs::FileLocator> sources(src_paths.size()), destinations(dest_paths.size());

 for (size_t i = 0; i < src_paths.size(); ++i) {
 sources[i] = {src_fs, src_paths[i]};
 destinations[i] = {dest_fs, dest_paths[i]};
 }

 StopIfNotOk(fs::CopyFiles(sources, destinations, chunk_size, use_threads));
}

#endif

#if defined(ARROW_R_WITH_S3)
Expand Down