Skip to content

ARROW-14916: [C++] GcsFileSystem can delete directories - #11890

Closed
coryan wants to merge 6 commits into
apache:masterfrom
coryan:ARROW-14916-gcsfs-delete-dir
Closed

ARROW-14916: [C++] GcsFileSystem can delete directories#11890
coryan wants to merge 6 commits into
apache:masterfrom
coryan:ARROW-14916-gcsfs-delete-dir

Conversation

@coryan

Copy link
Copy Markdown
Contributor

No description provided.

@github-actions

Copy link
Copy Markdown

@coryan
coryan marked this pull request as ready for review December 8, 2021 14:31
Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated
Comment threadcpp/src/arrow/filesystem/gcsfs.h Outdated

@pitroupitrou left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for the update, just a couple more suggestions.

Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated

auto async_delete =
[&p](gcs::Client& client,
google::cloud::StatusOr<gcs::ObjectMetadata> o) -> google::cloud::Status {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Two suggestions:

  1. just capture the client as a closure parameter
  2. return an arrow Status here, such that you can use AllFinished(const std::vector<Future>&)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done. I captured this because capturing client_ is not possible in C++11.

Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated
// This iterates over all the objects, and schedules parallel deletes.
auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
for (auto& o : client_.ListObjects(p.bucket, prefix)) {
submitted.push_back(

@pitroupitrouDec 9, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

By using DeferNotOk (which turns a Result<Future<T>> into a Future<T>), you could instead append to a std::vector<Future>, which will simplify the collection code below.

For example (untested):

 std::vector<Future> submitted;
// This iterates over all the objects, and schedules parallel deletes.auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
for (auto& o : client_.ListObjects(p.bucket, prefix)) {
submitted.push_back(DeferNotOk(
io_context.executor()->Submit(async_delete, std::ref(client_), std::move(o))));
}
return AllFinished(submitted).status();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Neat, thanks.

arrow::fs::AssertFileInfo(fs.get(), filename, FileType::NotFound);
}
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Should you test that other paths in the bucket still exist?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

@pitroupitrou closed this in fdc344bDec 9, 2021
@coryan
coryan deleted the ARROW-14916-gcsfs-delete-dir branch December 9, 2021 19:09
@ursabot

ursabot commented Dec 9, 2021

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 3ef4032 and contender = fdc344b. fdc344b is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished ⬇️0.0% ⬆️0.0%] ec2-t3-xlarge-us-east-2
[Failed ⬇️0.45% ⬆️0.0%] ursa-i9-9960x
[Finished ⬇️0.18% ⬆️0.0%] ursa-thinkcentre-m75q
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python. Runs only benchmarks with cloud = True
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@coryan@ursabot@pitrou
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
ARROW-14916: [C++] GcsFileSystem can delete directories by coryan · Pull Request #11890 · apache/arrow · GitHub
Skip to content

ARROW-14916: [C++] GcsFileSystem can delete directories - #11890

Closed
coryan wants to merge 6 commits into
apache:masterfrom
coryan:ARROW-14916-gcsfs-delete-dir
Closed

ARROW-14916: [C++] GcsFileSystem can delete directories#11890
coryan wants to merge 6 commits into
apache:masterfrom
coryan:ARROW-14916-gcsfs-delete-dir

Conversation

@coryan

Copy link
Copy Markdown
Contributor

No description provided.

@github-actions

Copy link
Copy Markdown

@coryan
coryan marked this pull request as ready for review December 8, 2021 14:31
Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated
Comment threadcpp/src/arrow/filesystem/gcsfs.h Outdated

@pitroupitrou left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for the update, just a couple more suggestions.

Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated

auto async_delete =
[&p](gcs::Client& client,
google::cloud::StatusOr<gcs::ObjectMetadata> o) -> google::cloud::Status {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Two suggestions:

  1. just capture the client as a closure parameter
  2. return an arrow Status here, such that you can use AllFinished(const std::vector<Future>&)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done. I captured this because capturing client_ is not possible in C++11.

Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated
// This iterates over all the objects, and schedules parallel deletes.
auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
for (auto& o : client_.ListObjects(p.bucket, prefix)) {
submitted.push_back(

@pitroupitrouDec 9, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

By using DeferNotOk (which turns a Result<Future<T>> into a Future<T>), you could instead append to a std::vector<Future>, which will simplify the collection code below.

For example (untested):

 std::vector<Future> submitted;
// This iterates over all the objects, and schedules parallel deletes.auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
for (auto& o : client_.ListObjects(p.bucket, prefix)) {
submitted.push_back(DeferNotOk(
io_context.executor()->Submit(async_delete, std::ref(client_), std::move(o))));
}
return AllFinished(submitted).status();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Neat, thanks.

arrow::fs::AssertFileInfo(fs.get(), filename, FileType::NotFound);
}
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Should you test that other paths in the bucket still exist?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

@pitroupitrou closed this in fdc344bDec 9, 2021
@coryan
coryan deleted the ARROW-14916-gcsfs-delete-dir branch December 9, 2021 19:09
@ursabot

ursabot commented Dec 9, 2021

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 3ef4032 and contender = fdc344b. fdc344b is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished ⬇️0.0% ⬆️0.0%] ec2-t3-xlarge-us-east-2
[Failed ⬇️0.45% ⬆️0.0%] ursa-i9-9960x
[Finished ⬇️0.18% ⬆️0.0%] ursa-thinkcentre-m75q
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python. Runs only benchmarks with cloud = True
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@coryan@ursabot@pitrou
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ARROW-14916: [C++] GcsFileSystem can delete directories by coryan · Pull Request #11890 · apache/arrow · GitHub
Skip to content

ARROW-14916: [C++] GcsFileSystem can delete directories - #11890

Closed
coryan wants to merge 6 commits into
apache:masterfrom
coryan:ARROW-14916-gcsfs-delete-dir
Closed

ARROW-14916: [C++] GcsFileSystem can delete directories#11890
coryan wants to merge 6 commits into
apache:masterfrom
coryan:ARROW-14916-gcsfs-delete-dir

Conversation

@coryan

Copy link
Copy Markdown
Contributor

No description provided.

@github-actions

Copy link
Copy Markdown

@coryan
coryan marked this pull request as ready for review December 8, 2021 14:31
Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated
Comment threadcpp/src/arrow/filesystem/gcsfs.h Outdated

@pitroupitrou left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for the update, just a couple more suggestions.

Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated

auto async_delete =
[&p](gcs::Client& client,
google::cloud::StatusOr<gcs::ObjectMetadata> o) -> google::cloud::Status {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Two suggestions:

  1. just capture the client as a closure parameter
  2. return an arrow Status here, such that you can use AllFinished(const std::vector<Future>&)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done. I captured this because capturing client_ is not possible in C++11.

Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated
// This iterates over all the objects, and schedules parallel deletes.
auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
for (auto& o : client_.ListObjects(p.bucket, prefix)) {
submitted.push_back(

@pitroupitrouDec 9, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

By using DeferNotOk (which turns a Result<Future<T>> into a Future<T>), you could instead append to a std::vector<Future>, which will simplify the collection code below.

For example (untested):

 std::vector<Future> submitted;
// This iterates over all the objects, and schedules parallel deletes.auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
for (auto& o : client_.ListObjects(p.bucket, prefix)) {
submitted.push_back(DeferNotOk(
io_context.executor()->Submit(async_delete, std::ref(client_), std::move(o))));
}
return AllFinished(submitted).status();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Neat, thanks.

arrow::fs::AssertFileInfo(fs.get(), filename, FileType::NotFound);
}
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Should you test that other paths in the bucket still exist?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

@pitroupitrou closed this in fdc344bDec 9, 2021
@coryan
coryan deleted the ARROW-14916-gcsfs-delete-dir branch December 9, 2021 19:09
@ursabot

ursabot commented Dec 9, 2021

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 3ef4032 and contender = fdc344b. fdc344b is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished ⬇️0.0% ⬆️0.0%] ec2-t3-xlarge-us-east-2
[Failed ⬇️0.45% ⬆️0.0%] ursa-i9-9960x
[Finished ⬇️0.18% ⬆️0.0%] ursa-thinkcentre-m75q
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python. Runs only benchmarks with cloud = True
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

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

ARROW-14916: [C++] GcsFileSystem can delete directories - #11890

Closed
coryan wants to merge 6 commits into
apache:masterfrom
coryan:ARROW-14916-gcsfs-delete-dir
Closed

ARROW-14916: [C++] GcsFileSystem can delete directories#11890
coryan wants to merge 6 commits into
apache:masterfrom
coryan:ARROW-14916-gcsfs-delete-dir

Conversation

@coryan

Copy link
Copy Markdown
Contributor

No description provided.

@github-actions

Copy link
Copy Markdown

@coryan
coryan marked this pull request as ready for review December 8, 2021 14:31
Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated
Comment threadcpp/src/arrow/filesystem/gcsfs.h Outdated

@pitroupitrou left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for the update, just a couple more suggestions.

Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated

auto async_delete =
[&p](gcs::Client& client,
google::cloud::StatusOr<gcs::ObjectMetadata> o) -> google::cloud::Status {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Two suggestions:

  1. just capture the client as a closure parameter
  2. return an arrow Status here, such that you can use AllFinished(const std::vector<Future>&)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done. I captured this because capturing client_ is not possible in C++11.

Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated
// This iterates over all the objects, and schedules parallel deletes.
auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
for (auto& o : client_.ListObjects(p.bucket, prefix)) {
submitted.push_back(

@pitroupitrouDec 9, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

By using DeferNotOk (which turns a Result<Future<T>> into a Future<T>), you could instead append to a std::vector<Future>, which will simplify the collection code below.

For example (untested):

 std::vector<Future> submitted;
// This iterates over all the objects, and schedules parallel deletes.auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
for (auto& o : client_.ListObjects(p.bucket, prefix)) {
submitted.push_back(DeferNotOk(
io_context.executor()->Submit(async_delete, std::ref(client_), std::move(o))));
}
return AllFinished(submitted).status();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Neat, thanks.

arrow::fs::AssertFileInfo(fs.get(), filename, FileType::NotFound);
}
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Should you test that other paths in the bucket still exist?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

@pitroupitrou closed this in fdc344bDec 9, 2021
@coryan
coryan deleted the ARROW-14916-gcsfs-delete-dir branch December 9, 2021 19:09
@ursabot

ursabot commented Dec 9, 2021

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 3ef4032 and contender = fdc344b. fdc344b is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished ⬇️0.0% ⬆️0.0%] ec2-t3-xlarge-us-east-2
[Failed ⬇️0.45% ⬆️0.0%] ursa-i9-9960x
[Finished ⬇️0.18% ⬆️0.0%] ursa-thinkcentre-m75q
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python. Runs only benchmarks with cloud = True
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

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

ARROW-14916: [C++] GcsFileSystem can delete directories - #11890

Closed
coryan wants to merge 6 commits into
apache:masterfrom
coryan:ARROW-14916-gcsfs-delete-dir
Closed

ARROW-14916: [C++] GcsFileSystem can delete directories#11890
coryan wants to merge 6 commits into
apache:masterfrom
coryan:ARROW-14916-gcsfs-delete-dir

Conversation

@coryan

Copy link
Copy Markdown
Contributor

No description provided.

@github-actions

Copy link
Copy Markdown

@coryan
coryan marked this pull request as ready for review December 8, 2021 14:31
Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated
Comment threadcpp/src/arrow/filesystem/gcsfs.h Outdated

@pitroupitrou left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for the update, just a couple more suggestions.

Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated

auto async_delete =
[&p](gcs::Client& client,
google::cloud::StatusOr<gcs::ObjectMetadata> o) -> google::cloud::Status {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Two suggestions:

  1. just capture the client as a closure parameter
  2. return an arrow Status here, such that you can use AllFinished(const std::vector<Future>&)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done. I captured this because capturing client_ is not possible in C++11.

Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated
// This iterates over all the objects, and schedules parallel deletes.
auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
for (auto& o : client_.ListObjects(p.bucket, prefix)) {
submitted.push_back(

@pitroupitrouDec 9, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

By using DeferNotOk (which turns a Result<Future<T>> into a Future<T>), you could instead append to a std::vector<Future>, which will simplify the collection code below.

For example (untested):

 std::vector<Future> submitted;
// This iterates over all the objects, and schedules parallel deletes.auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
for (auto& o : client_.ListObjects(p.bucket, prefix)) {
submitted.push_back(DeferNotOk(
io_context.executor()->Submit(async_delete, std::ref(client_), std::move(o))));
}
return AllFinished(submitted).status();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Neat, thanks.

arrow::fs::AssertFileInfo(fs.get(), filename, FileType::NotFound);
}
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Should you test that other paths in the bucket still exist?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

@pitroupitrou closed this in fdc344bDec 9, 2021
@coryan
coryan deleted the ARROW-14916-gcsfs-delete-dir branch December 9, 2021 19:09
@ursabot

ursabot commented Dec 9, 2021

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 3ef4032 and contender = fdc344b. fdc344b is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished ⬇️0.0% ⬆️0.0%] ec2-t3-xlarge-us-east-2
[Failed ⬇️0.45% ⬆️0.0%] ursa-i9-9960x
[Finished ⬇️0.18% ⬆️0.0%] ursa-thinkcentre-m75q
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python. Runs only benchmarks with cloud = True
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@coryan@ursabot@pitrou
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' ARROW-14916: [C++] GcsFileSystem can delete directories by coryan · Pull Request #11890 · apache/arrow · GitHub
Skip to content

ARROW-14916: [C++] GcsFileSystem can delete directories - #11890

Closed
coryan wants to merge 6 commits into
apache:masterfrom
coryan:ARROW-14916-gcsfs-delete-dir
Closed

ARROW-14916: [C++] GcsFileSystem can delete directories#11890
coryan wants to merge 6 commits into
apache:masterfrom
coryan:ARROW-14916-gcsfs-delete-dir

Conversation

@coryan

Copy link
Copy Markdown
Contributor

No description provided.

@github-actions

Copy link
Copy Markdown

@coryan
coryan marked this pull request as ready for review December 8, 2021 14:31
Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated
Comment threadcpp/src/arrow/filesystem/gcsfs.h Outdated

@pitroupitrou left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for the update, just a couple more suggestions.

Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated

auto async_delete =
[&p](gcs::Client& client,
google::cloud::StatusOr<gcs::ObjectMetadata> o) -> google::cloud::Status {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Two suggestions:

  1. just capture the client as a closure parameter
  2. return an arrow Status here, such that you can use AllFinished(const std::vector<Future>&)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done. I captured this because capturing client_ is not possible in C++11.

Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated
// This iterates over all the objects, and schedules parallel deletes.
auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
for (auto& o : client_.ListObjects(p.bucket, prefix)) {
submitted.push_back(

@pitroupitrouDec 9, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

By using DeferNotOk (which turns a Result<Future<T>> into a Future<T>), you could instead append to a std::vector<Future>, which will simplify the collection code below.

For example (untested):

 std::vector<Future> submitted;
// This iterates over all the objects, and schedules parallel deletes.auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
for (auto& o : client_.ListObjects(p.bucket, prefix)) {
submitted.push_back(DeferNotOk(
io_context.executor()->Submit(async_delete, std::ref(client_), std::move(o))));
}
return AllFinished(submitted).status();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Neat, thanks.

arrow::fs::AssertFileInfo(fs.get(), filename, FileType::NotFound);
}
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Should you test that other paths in the bucket still exist?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

@pitroupitrou closed this in fdc344bDec 9, 2021
@coryan
coryan deleted the ARROW-14916-gcsfs-delete-dir branch December 9, 2021 19:09
@ursabot

ursabot commented Dec 9, 2021

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 3ef4032 and contender = fdc344b. fdc344b is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished ⬇️0.0% ⬆️0.0%] ec2-t3-xlarge-us-east-2
[Failed ⬇️0.45% ⬆️0.0%] ursa-i9-9960x
[Finished ⬇️0.18% ⬆️0.0%] ursa-thinkcentre-m75q
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python. Runs only benchmarks with cloud = True
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@coryan@ursabot@pitrou
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); ARROW-14916: [C++] GcsFileSystem can delete directories by coryan · Pull Request #11890 · apache/arrow · GitHub
Skip to content

ARROW-14916: [C++] GcsFileSystem can delete directories - #11890

Closed
coryan wants to merge 6 commits into
apache:masterfrom
coryan:ARROW-14916-gcsfs-delete-dir
Closed

ARROW-14916: [C++] GcsFileSystem can delete directories#11890
coryan wants to merge 6 commits into
apache:masterfrom
coryan:ARROW-14916-gcsfs-delete-dir

Conversation

@coryan

Copy link
Copy Markdown
Contributor

No description provided.

@github-actions

Copy link
Copy Markdown

@coryan
coryan marked this pull request as ready for review December 8, 2021 14:31
Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated
Comment threadcpp/src/arrow/filesystem/gcsfs.h Outdated

@pitroupitrou left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks for the update, just a couple more suggestions.

Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated

auto async_delete =
[&p](gcs::Client& client,
google::cloud::StatusOr<gcs::ObjectMetadata> o) -> google::cloud::Status {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Two suggestions:

  1. just capture the client as a closure parameter
  2. return an arrow Status here, such that you can use AllFinished(const std::vector<Future>&)

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done. I captured this because capturing client_ is not possible in C++11.

Comment threadcpp/src/arrow/filesystem/gcsfs.cc Outdated
// This iterates over all the objects, and schedules parallel deletes.
auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
for (auto& o : client_.ListObjects(p.bucket, prefix)) {
submitted.push_back(

@pitroupitrouDec 9, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

By using DeferNotOk (which turns a Result<Future<T>> into a Future<T>), you could instead append to a std::vector<Future>, which will simplify the collection code below.

For example (untested):

 std::vector<Future> submitted;
// This iterates over all the objects, and schedules parallel deletes.auto prefix = p.object.empty() ? gcs::Prefix() : gcs::Prefix(p.object);
for (auto& o : client_.ListObjects(p.bucket, prefix)) {
submitted.push_back(DeferNotOk(
io_context.executor()->Submit(async_delete, std::ref(client_), std::move(o))));
}
return AllFinished(submitted).status();

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Neat, thanks.

arrow::fs::AssertFileInfo(fs.get(), filename, FileType::NotFound);
}
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Should you test that other paths in the bucket still exist?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Done.

@pitroupitrou closed this in fdc344bDec 9, 2021
@coryan
coryan deleted the ARROW-14916-gcsfs-delete-dir branch December 9, 2021 19:09
@ursabot

ursabot commented Dec 9, 2021

Copy link
Copy Markdown

Benchmark runs are scheduled for baseline = 3ef4032 and contender = fdc344b. fdc344b is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Finished ⬇️0.0% ⬆️0.0%] ec2-t3-xlarge-us-east-2
[Failed ⬇️0.45% ⬆️0.0%] ursa-i9-9960x
[Finished ⬇️0.18% ⬆️0.0%] ursa-thinkcentre-m75q
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python. Runs only benchmarks with cloud = True
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@coryan@ursabot@pitrou