Skip to content

ARROW-15056: [C++] Speed up GcsFileSystem tests#11933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
coryan wants to merge 1 commit into from
Closed

ARROW-15056: [C++] Speed up GcsFileSystem tests #11933

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 73 additions & 41 deletions cpp/src/arrow/filesystem/gcsfs_test.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,21 +61,9 @@ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
culpa qui officia deserunt mollit anim id est laborum.
)""";

class GcsIntegrationTest : public ::testing::Test {
class GcsTestbench : public ::testing::Environment {
public:
~GcsIntegrationTest() override {
// Brutal shutdown, kill the full process group because the GCS testbench may launch
// additional children.
group_.terminate();
if (server_process_.valid()) {
server_process_.wait();
}
}

protected:
void SetUp() override {
// Initialize a PRNG with a small amount of entropy.
generator_ = std::mt19937_64(std::random_device()());
GcsTestbench() {
port_ = std::to_string(GetListenPort());
std::vector<std::string> names{"python3", "python"};
// If the build script or application developer provides a value in the PYTHON
Expand All@@ -101,14 +89,51 @@ class GcsIntegrationTest : public ::testing::Test {
server_process_.terminate();
server_process_.wait();
}
ASSERT_TRUE(server_process_.valid()) << error;
ASSERT_TRUE(server_process_.running()) << error;
if (server_process_.valid() && server_process_.valid()) return;
error_ = std::move(error);
}

~GcsTestbench() {
// Brutal shutdown, kill the full process group because the GCS testbench may launch
// additional children.
group_.terminate();
if (server_process_.valid()) {
server_process_.wait();
}
}

const std::string& port() const { return port_; }
const std::string& error() const { return error_; }

private:
std::string port_;
bp::child server_process_;
bp::group group_;
std::string error_;
};

static GcsTestbench* Testbench() {
static auto* const environment = [] { return new GcsTestbench; }();
return environment;
}

auto* testbench_env = ::testing::AddGlobalTestEnvironment(Testbench());

class GcsIntegrationTest : public ::testing::Test {
protected:
void SetUp() override {
ASSERT_THAT(Testbench(), NotNull());
ASSERT_THAT(Testbench()->error(), IsEmpty());

// Initialize a PRNG with a small amount of entropy.
generator_ = std::mt19937_64(std::random_device()());
bucket_name_ = RandomChars(32);

// Create a bucket and a small file in the testbench. This makes it easier to
// bootstrap GcsFileSystem and its tests.
auto client = gcs::Client(
google::cloud::Options{}
.set<gcs::RestEndpointOption>("http://127.0.0.1:" + port_)
.set<gcs::RestEndpointOption>("http://127.0.0.1:" + Testbench()->port())
.set<gc::UnifiedCredentialsOption>(gc::MakeInsecureCredentials()));
google::cloud::StatusOr<gcs::BucketMetadata> bucket = client.CreateBucketForProject(
PreexistingBucketName(), "ignored-by-testbench", gcs::BucketMetadata{});
Expand All@@ -121,41 +146,35 @@ class GcsIntegrationTest : public ::testing::Test {
<< ">, status=" << object.status();
}

static std::string PreexistingBucketName() { return "test-bucket-name"; }
std::string PreexistingBucketName() const { return bucket_name_; }

static std::string PreexistingBucketPath() { return PreexistingBucketName() + '/'; }
std::string PreexistingBucketPath() const { return PreexistingBucketName() + '/'; }

static std::string PreexistingObjectName() { return "test-object-name"; }

static std::string PreexistingObjectPath() {
std::string PreexistingObjectPath() const {
return PreexistingBucketPath() + PreexistingObjectName();
}

static std::string NotFoundObjectPath() {
return PreexistingBucketPath() + "not-found";
}
std::string NotFoundObjectPath() { return PreexistingBucketPath() + "not-found"; }

GcsOptions TestGcsOptions() {
GcsOptions options;
options.endpoint_override = "127.0.0.1:" + port_;
options.endpoint_override = "127.0.0.1:" + Testbench()->port();
options.scheme = "http";
return options;
}

gcs::Client GcsClient() {
return gcs::Client(
google::cloud::Options{}
.set<gcs::RestEndpointOption>("http://127.0.0.1:" + port_)
.set<gcs::RestEndpointOption>("http://127.0.0.1:" + Testbench()->port())
.set<gc::UnifiedCredentialsOption>(gc::MakeInsecureCredentials()));
}

std::string RandomLine(int lineno, std::size_t width) {
auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
std::uniform_int_distribution<std::size_t> d(0, fillers.size() - 1);

auto line = std::to_string(lineno) + ": ";
std::generate_n(std::back_inserter(line), width - line.size() - 1,
[&] { return fillers[d(generator_)]; });
line += RandomChars(width - line.size() - 1);
line += '\n';
return line;
}
Expand All@@ -164,11 +183,21 @@ class GcsIntegrationTest : public ::testing::Test {
return std::uniform_int_distribution<std::size_t>(0, end - 1)(generator_);
}

std::string RandomBucketName() { return RandomChars(32); }

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

private:
std::string RandomChars(std::size_t count) {
auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
std::uniform_int_distribution<std::size_t> d(0, fillers.size() - 1);
std::string s;
std::generate_n(std::back_inserter(s), count, [&] { return fillers[d(generator_)]; });
return s;
}

std::mt19937_64 generator_;
std::string port_;
bp::child server_process_;
bp::group group_;
std::string bucket_name_;
};

TEST(GcsFileSystem, OptionsCompare) {
Expand DownExpand Up@@ -372,13 +401,14 @@ TEST_F(GcsIntegrationTest, GetFileInfoObject) {

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketOnly) {
auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
ASSERT_OK(fs->CreateDir("new-bucket", false));
arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
auto bucket_name = RandomBucketName();
ASSERT_OK(fs->CreateDir(bucket_name, false));
arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketAndFolder) {
auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
const auto path = PreexistingBucketPath() + "new-folder/";
const auto path = PreexistingBucketPath() + RandomFolderName();
ASSERT_OK(fs->CreateDir(path, false));
arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
}
Expand All@@ -391,13 +421,14 @@ TEST_F(GcsIntegrationTest, CreateDirFailureFolderWithMissingBucket) {

TEST_F(GcsIntegrationTest, CreateDirRecursiveBucketOnly) {
auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
ASSERT_OK(fs->CreateDir("new-bucket", true));
arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
auto bucket_name = RandomBucketName();
ASSERT_OK(fs->CreateDir(bucket_name, true));
arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, CreateDirRecursiveFolderOnly) {
auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
const auto parent = PreexistingBucketPath() + "new-folder/";
const auto parent = PreexistingBucketPath() + RandomFolderName();
const auto path = parent + "new-sub/";
ASSERT_OK(fs->CreateDir(path, true));
arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
Expand All@@ -406,12 +437,13 @@ TEST_F(GcsIntegrationTest, CreateDirRecursiveFolderOnly) {

TEST_F(GcsIntegrationTest, CreateDirRecursiveBucketAndFolder) {
auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
const auto parent = std::string("new-bucket/new-folder/");
auto bucket_name = RandomBucketName();
const auto parent = bucket_name + "/" + RandomFolderName();
const auto path = parent + "new-sub/";
ASSERT_OK(fs->CreateDir(path, true));
arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
arrow::fs::AssertFileInfo(fs.get(), parent, FileType::Directory);
arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, DeleteDirSuccess) {
Expand Down
, '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-15056: [C++] Speed up GcsFileSystem tests by coryan · Pull Request #11933 · apache/arrow · GitHub
Skip to content
ARROW-15056: [C++] Speed up GcsFileSystem tests#11933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

coryan
wants to merge
1
commit into

from

 Closed


ARROW-15056: [C++] Speed up GcsFileSystem tests
#11933
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


114 changes: 73 additions & 41 deletions
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,21 +61,9 @@ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
culpa qui officia deserunt mollit anim id est laborum.
)""";

class GcsIntegrationTest : public ::testing::Test {
class GcsTestbench : public ::testing::Environment {
 public:
 ~GcsIntegrationTest() override {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
 if (server_process_.valid()) {
 server_process_.wait();
 }
 }

 protected:
 void SetUp() override {
 // Initialize a PRNG with a small amount of entropy.
 generator_ = std::mt19937_64(std::random_device()());
 GcsTestbench() {
 port_ = std::to_string(GetListenPort());
 std::vector<std::string> names{"python3", "python"};
 // If the build script or application developer provides a value in the PYTHON
Expand All@@ -101,14 +89,51 @@ class GcsIntegrationTest : public ::testing::Test {
 server_process_.terminate();
 server_process_.wait();
 }
 ASSERT_TRUE(server_process_.valid()) << error;
 ASSERT_TRUE(server_process_.running()) << error;
 if (server_process_.valid() && server_process_.valid()) return;
 error_ = std::move(error);
 }

 ~GcsTestbench() {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
 if (server_process_.valid()) {
 server_process_.wait();
 }
 }

 const std::string& port() const { return port_; }
 const std::string& error() const { return error_; }

 private:
 std::string port_;
 bp::child server_process_;
 bp::group group_;
 std::string error_;
};

static GcsTestbench* Testbench() {
 static auto* const environment = [] { return new GcsTestbench; }();
 return environment;
}

auto* testbench_env = ::testing::AddGlobalTestEnvironment(Testbench());

class GcsIntegrationTest : public ::testing::Test {
 protected:
 void SetUp() override {
 ASSERT_THAT(Testbench(), NotNull());
 ASSERT_THAT(Testbench()->error(), IsEmpty());

 // Initialize a PRNG with a small amount of entropy.
 generator_ = std::mt19937_64(std::random_device()());
 bucket_name_ = RandomChars(32);

 // Create a bucket and a small file in the testbench. This makes it easier to
 // bootstrap GcsFileSystem and its tests.
 auto client = gcs::Client(
 google::cloud::Options{}
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + port_)
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + Testbench()->port())
 .set<gc::UnifiedCredentialsOption>(gc::MakeInsecureCredentials()));
 google::cloud::StatusOr<gcs::BucketMetadata> bucket = client.CreateBucketForProject(
 PreexistingBucketName(), "ignored-by-testbench", gcs::BucketMetadata{});
Expand All@@ -121,41 +146,35 @@ class GcsIntegrationTest : public ::testing::Test {
 << ">, status=" << object.status();
 }

static std::string PreexistingBucketName() { return "test-bucket-name"; }
 std::string PreexistingBucketName() const { return bucket_name_; }

static std::string PreexistingBucketPath() { return PreexistingBucketName() + '/'; }
 std::string PreexistingBucketPath() const { return PreexistingBucketName() + '/'; }

 static std::string PreexistingObjectName() { return "test-object-name"; }

static std::string PreexistingObjectPath() {
 std::string PreexistingObjectPath() const {
 return PreexistingBucketPath() + PreexistingObjectName();
 }

 static std::string NotFoundObjectPath() {
 return PreexistingBucketPath() + "not-found";
 }
 std::string NotFoundObjectPath() { return PreexistingBucketPath() + "not-found"; }

 GcsOptions TestGcsOptions() {
 GcsOptions options;
 options.endpoint_override = "127.0.0.1:" + port_;
 options.endpoint_override = "127.0.0.1:" + Testbench()->port();
 options.scheme = "http";
 return options;
 }

 gcs::Client GcsClient() {
 return gcs::Client(
 google::cloud::Options{}
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + port_)
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + Testbench()->port())
 .set<gc::UnifiedCredentialsOption>(gc::MakeInsecureCredentials()));
 }

 std::string RandomLine(int lineno, std::size_t width) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
 std::uniform_int_distribution<std::size_t> d(0, fillers.size() - 1);

 auto line = std::to_string(lineno) + ": ";
 std::generate_n(std::back_inserter(line), width - line.size() - 1,
 [&] { return fillers[d(generator_)]; });
 line += RandomChars(width - line.size() - 1);
 line += '\n';
 return line;
 }
Expand All@@ -164,11 +183,21 @@ class GcsIntegrationTest : public ::testing::Test {
 return std::uniform_int_distribution<std::size_t>(0, end - 1)(generator_);
 }

 std::string RandomBucketName() { return RandomChars(32); }

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

 private:
 std::string RandomChars(std::size_t count) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
 std::uniform_int_distribution<std::size_t> d(0, fillers.size() - 1);
 std::string s;
 std::generate_n(std::back_inserter(s), count, [&] { return fillers[d(generator_)]; });
 return s;
 }

 std::mt19937_64 generator_;
 std::string port_;
 bp::child server_process_;
 bp::group group_;
 std::string bucket_name_;
};

TEST(GcsFileSystem, OptionsCompare) {
Expand DownExpand Up@@ -372,13 +401,14 @@ TEST_F(GcsIntegrationTest, GetFileInfoObject) {

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK(fs->CreateDir("new-bucket", false));
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 auto bucket_name = RandomBucketName();
 ASSERT_OK(fs->CreateDir(bucket_name, false));
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketAndFolder) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto path = PreexistingBucketPath() + "new-folder/";
 const auto path = PreexistingBucketPath() + RandomFolderName();
 ASSERT_OK(fs->CreateDir(path, false));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
}
Expand All@@ -391,13 +421,14 @@ TEST_F(GcsIntegrationTest, CreateDirFailureFolderWithMissingBucket) {

TEST_F(GcsIntegrationTest, CreateDirRecursiveBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK(fs->CreateDir("new-bucket", true));
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 auto bucket_name = RandomBucketName();
 ASSERT_OK(fs->CreateDir(bucket_name, true));
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, CreateDirRecursiveFolderOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto parent = PreexistingBucketPath() + "new-folder/";
 const auto parent = PreexistingBucketPath() + RandomFolderName();
 const auto path = parent + "new-sub/";
 ASSERT_OK(fs->CreateDir(path, true));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
Expand All@@ -406,12 +437,13 @@ TEST_F(GcsIntegrationTest, CreateDirRecursiveFolderOnly) {

TEST_F(GcsIntegrationTest, CreateDirRecursiveBucketAndFolder) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto parent = std::string("new-bucket/new-folder/");
 auto bucket_name = RandomBucketName();
 const auto parent = bucket_name + "/" + RandomFolderName();
 const auto path = parent + "new-sub/";
 ASSERT_OK(fs->CreateDir(path, true));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), parent, FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, DeleteDirSuccess) {
Expand Down

, '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-15056: [C++] Speed up GcsFileSystem tests by coryan · Pull Request #11933 · apache/arrow · GitHub
Skip to content
ARROW-15056: [C++] Speed up GcsFileSystem tests#11933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

coryan
wants to merge
1
commit into

from

 Closed


ARROW-15056: [C++] Speed up GcsFileSystem tests
#11933
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


114 changes: 73 additions & 41 deletions
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,21 +61,9 @@ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
culpa qui officia deserunt mollit anim id est laborum.
)""";

class GcsIntegrationTest : public ::testing::Test {
class GcsTestbench : public ::testing::Environment {
 public:
 ~GcsIntegrationTest() override {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
 if (server_process_.valid()) {
 server_process_.wait();
 }
 }

 protected:
 void SetUp() override {
 // Initialize a PRNG with a small amount of entropy.
 generator_ = std::mt19937_64(std::random_device()());
 GcsTestbench() {
 port_ = std::to_string(GetListenPort());
 std::vector<std::string> names{"python3", "python"};
 // If the build script or application developer provides a value in the PYTHON
Expand All@@ -101,14 +89,51 @@ class GcsIntegrationTest : public ::testing::Test {
 server_process_.terminate();
 server_process_.wait();
 }
 ASSERT_TRUE(server_process_.valid()) << error;
 ASSERT_TRUE(server_process_.running()) << error;
 if (server_process_.valid() && server_process_.valid()) return;
 error_ = std::move(error);
 }

 ~GcsTestbench() {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
 if (server_process_.valid()) {
 server_process_.wait();
 }
 }

 const std::string& port() const { return port_; }
 const std::string& error() const { return error_; }

 private:
 std::string port_;
 bp::child server_process_;
 bp::group group_;
 std::string error_;
};

static GcsTestbench* Testbench() {
 static auto* const environment = [] { return new GcsTestbench; }();
 return environment;
}

auto* testbench_env = ::testing::AddGlobalTestEnvironment(Testbench());

class GcsIntegrationTest : public ::testing::Test {
 protected:
 void SetUp() override {
 ASSERT_THAT(Testbench(), NotNull());
 ASSERT_THAT(Testbench()->error(), IsEmpty());

 // Initialize a PRNG with a small amount of entropy.
 generator_ = std::mt19937_64(std::random_device()());
 bucket_name_ = RandomChars(32);

 // Create a bucket and a small file in the testbench. This makes it easier to
 // bootstrap GcsFileSystem and its tests.
 auto client = gcs::Client(
 google::cloud::Options{}
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + port_)
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + Testbench()->port())
 .set<gc::UnifiedCredentialsOption>(gc::MakeInsecureCredentials()));
 google::cloud::StatusOr<gcs::BucketMetadata> bucket = client.CreateBucketForProject(
 PreexistingBucketName(), "ignored-by-testbench", gcs::BucketMetadata{});
Expand All@@ -121,41 +146,35 @@ class GcsIntegrationTest : public ::testing::Test {
 << ">, status=" << object.status();
 }

static std::string PreexistingBucketName() { return "test-bucket-name"; }
 std::string PreexistingBucketName() const { return bucket_name_; }

static std::string PreexistingBucketPath() { return PreexistingBucketName() + '/'; }
 std::string PreexistingBucketPath() const { return PreexistingBucketName() + '/'; }

 static std::string PreexistingObjectName() { return "test-object-name"; }

static std::string PreexistingObjectPath() {
 std::string PreexistingObjectPath() const {
 return PreexistingBucketPath() + PreexistingObjectName();
 }

 static std::string NotFoundObjectPath() {
 return PreexistingBucketPath() + "not-found";
 }
 std::string NotFoundObjectPath() { return PreexistingBucketPath() + "not-found"; }

 GcsOptions TestGcsOptions() {
 GcsOptions options;
 options.endpoint_override = "127.0.0.1:" + port_;
 options.endpoint_override = "127.0.0.1:" + Testbench()->port();
 options.scheme = "http";
 return options;
 }

 gcs::Client GcsClient() {
 return gcs::Client(
 google::cloud::Options{}
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + port_)
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + Testbench()->port())
 .set<gc::UnifiedCredentialsOption>(gc::MakeInsecureCredentials()));
 }

 std::string RandomLine(int lineno, std::size_t width) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
 std::uniform_int_distribution<std::size_t> d(0, fillers.size() - 1);

 auto line = std::to_string(lineno) + ": ";
 std::generate_n(std::back_inserter(line), width - line.size() - 1,
 [&] { return fillers[d(generator_)]; });
 line += RandomChars(width - line.size() - 1);
 line += '\n';
 return line;
 }
Expand All@@ -164,11 +183,21 @@ class GcsIntegrationTest : public ::testing::Test {
 return std::uniform_int_distribution<std::size_t>(0, end - 1)(generator_);
 }

 std::string RandomBucketName() { return RandomChars(32); }

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

 private:
 std::string RandomChars(std::size_t count) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
 std::uniform_int_distribution<std::size_t> d(0, fillers.size() - 1);
 std::string s;
 std::generate_n(std::back_inserter(s), count, [&] { return fillers[d(generator_)]; });
 return s;
 }

 std::mt19937_64 generator_;
 std::string port_;
 bp::child server_process_;
 bp::group group_;
 std::string bucket_name_;
};

TEST(GcsFileSystem, OptionsCompare) {
Expand DownExpand Up@@ -372,13 +401,14 @@ TEST_F(GcsIntegrationTest, GetFileInfoObject) {

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK(fs->CreateDir("new-bucket", false));
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 auto bucket_name = RandomBucketName();
 ASSERT_OK(fs->CreateDir(bucket_name, false));
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketAndFolder) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto path = PreexistingBucketPath() + "new-folder/";
 const auto path = PreexistingBucketPath() + RandomFolderName();
 ASSERT_OK(fs->CreateDir(path, false));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
}
Expand All@@ -391,13 +421,14 @@ TEST_F(GcsIntegrationTest, CreateDirFailureFolderWithMissingBucket) {

TEST_F(GcsIntegrationTest, CreateDirRecursiveBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK(fs->CreateDir("new-bucket", true));
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 auto bucket_name = RandomBucketName();
 ASSERT_OK(fs->CreateDir(bucket_name, true));
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, CreateDirRecursiveFolderOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto parent = PreexistingBucketPath() + "new-folder/";
 const auto parent = PreexistingBucketPath() + RandomFolderName();
 const auto path = parent + "new-sub/";
 ASSERT_OK(fs->CreateDir(path, true));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
Expand All@@ -406,12 +437,13 @@ TEST_F(GcsIntegrationTest, CreateDirRecursiveFolderOnly) {

TEST_F(GcsIntegrationTest, CreateDirRecursiveBucketAndFolder) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto parent = std::string("new-bucket/new-folder/");
 auto bucket_name = RandomBucketName();
 const auto parent = bucket_name + "/" + RandomFolderName();
 const auto path = parent + "new-sub/";
 ASSERT_OK(fs->CreateDir(path, true));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), parent, FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, DeleteDirSuccess) {
Expand Down

, '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-15056: [C++] Speed up GcsFileSystem tests by coryan · Pull Request #11933 · apache/arrow · GitHub
Skip to content
ARROW-15056: [C++] Speed up GcsFileSystem tests#11933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

coryan
wants to merge
1
commit into

from

 Closed


ARROW-15056: [C++] Speed up GcsFileSystem tests
#11933
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


114 changes: 73 additions & 41 deletions
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,21 +61,9 @@ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
culpa qui officia deserunt mollit anim id est laborum.
)""";

class GcsIntegrationTest : public ::testing::Test {
class GcsTestbench : public ::testing::Environment {
 public:
 ~GcsIntegrationTest() override {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
 if (server_process_.valid()) {
 server_process_.wait();
 }
 }

 protected:
 void SetUp() override {
 // Initialize a PRNG with a small amount of entropy.
 generator_ = std::mt19937_64(std::random_device()());
 GcsTestbench() {
 port_ = std::to_string(GetListenPort());
 std::vector<std::string> names{"python3", "python"};
 // If the build script or application developer provides a value in the PYTHON
Expand All@@ -101,14 +89,51 @@ class GcsIntegrationTest : public ::testing::Test {
 server_process_.terminate();
 server_process_.wait();
 }
 ASSERT_TRUE(server_process_.valid()) << error;
 ASSERT_TRUE(server_process_.running()) << error;
 if (server_process_.valid() && server_process_.valid()) return;
 error_ = std::move(error);
 }

 ~GcsTestbench() {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
 if (server_process_.valid()) {
 server_process_.wait();
 }
 }

 const std::string& port() const { return port_; }
 const std::string& error() const { return error_; }

 private:
 std::string port_;
 bp::child server_process_;
 bp::group group_;
 std::string error_;
};

static GcsTestbench* Testbench() {
 static auto* const environment = [] { return new GcsTestbench; }();
 return environment;
}

auto* testbench_env = ::testing::AddGlobalTestEnvironment(Testbench());

class GcsIntegrationTest : public ::testing::Test {
 protected:
 void SetUp() override {
 ASSERT_THAT(Testbench(), NotNull());
 ASSERT_THAT(Testbench()->error(), IsEmpty());

 // Initialize a PRNG with a small amount of entropy.
 generator_ = std::mt19937_64(std::random_device()());
 bucket_name_ = RandomChars(32);

 // Create a bucket and a small file in the testbench. This makes it easier to
 // bootstrap GcsFileSystem and its tests.
 auto client = gcs::Client(
 google::cloud::Options{}
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + port_)
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + Testbench()->port())
 .set<gc::UnifiedCredentialsOption>(gc::MakeInsecureCredentials()));
 google::cloud::StatusOr<gcs::BucketMetadata> bucket = client.CreateBucketForProject(
 PreexistingBucketName(), "ignored-by-testbench", gcs::BucketMetadata{});
Expand All@@ -121,41 +146,35 @@ class GcsIntegrationTest : public ::testing::Test {
 << ">, status=" << object.status();
 }

static std::string PreexistingBucketName() { return "test-bucket-name"; }
 std::string PreexistingBucketName() const { return bucket_name_; }

static std::string PreexistingBucketPath() { return PreexistingBucketName() + '/'; }
 std::string PreexistingBucketPath() const { return PreexistingBucketName() + '/'; }

 static std::string PreexistingObjectName() { return "test-object-name"; }

static std::string PreexistingObjectPath() {
 std::string PreexistingObjectPath() const {
 return PreexistingBucketPath() + PreexistingObjectName();
 }

 static std::string NotFoundObjectPath() {
 return PreexistingBucketPath() + "not-found";
 }
 std::string NotFoundObjectPath() { return PreexistingBucketPath() + "not-found"; }

 GcsOptions TestGcsOptions() {
 GcsOptions options;
 options.endpoint_override = "127.0.0.1:" + port_;
 options.endpoint_override = "127.0.0.1:" + Testbench()->port();
 options.scheme = "http";
 return options;
 }

 gcs::Client GcsClient() {
 return gcs::Client(
 google::cloud::Options{}
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + port_)
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + Testbench()->port())
 .set<gc::UnifiedCredentialsOption>(gc::MakeInsecureCredentials()));
 }

 std::string RandomLine(int lineno, std::size_t width) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
 std::uniform_int_distribution<std::size_t> d(0, fillers.size() - 1);

 auto line = std::to_string(lineno) + ": ";
 std::generate_n(std::back_inserter(line), width - line.size() - 1,
 [&] { return fillers[d(generator_)]; });
 line += RandomChars(width - line.size() - 1);
 line += '\n';
 return line;
 }
Expand All@@ -164,11 +183,21 @@ class GcsIntegrationTest : public ::testing::Test {
 return std::uniform_int_distribution<std::size_t>(0, end - 1)(generator_);
 }

 std::string RandomBucketName() { return RandomChars(32); }

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

 private:
 std::string RandomChars(std::size_t count) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
 std::uniform_int_distribution<std::size_t> d(0, fillers.size() - 1);
 std::string s;
 std::generate_n(std::back_inserter(s), count, [&] { return fillers[d(generator_)]; });
 return s;
 }

 std::mt19937_64 generator_;
 std::string port_;
 bp::child server_process_;
 bp::group group_;
 std::string bucket_name_;
};

TEST(GcsFileSystem, OptionsCompare) {
Expand DownExpand Up@@ -372,13 +401,14 @@ TEST_F(GcsIntegrationTest, GetFileInfoObject) {

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK(fs->CreateDir("new-bucket", false));
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 auto bucket_name = RandomBucketName();
 ASSERT_OK(fs->CreateDir(bucket_name, false));
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketAndFolder) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto path = PreexistingBucketPath() + "new-folder/";
 const auto path = PreexistingBucketPath() + RandomFolderName();
 ASSERT_OK(fs->CreateDir(path, false));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
}
Expand All@@ -391,13 +421,14 @@ TEST_F(GcsIntegrationTest, CreateDirFailureFolderWithMissingBucket) {

TEST_F(GcsIntegrationTest, CreateDirRecursiveBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK(fs->CreateDir("new-bucket", true));
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 auto bucket_name = RandomBucketName();
 ASSERT_OK(fs->CreateDir(bucket_name, true));
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, CreateDirRecursiveFolderOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto parent = PreexistingBucketPath() + "new-folder/";
 const auto parent = PreexistingBucketPath() + RandomFolderName();
 const auto path = parent + "new-sub/";
 ASSERT_OK(fs->CreateDir(path, true));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
Expand All@@ -406,12 +437,13 @@ TEST_F(GcsIntegrationTest, CreateDirRecursiveFolderOnly) {

TEST_F(GcsIntegrationTest, CreateDirRecursiveBucketAndFolder) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto parent = std::string("new-bucket/new-folder/");
 auto bucket_name = RandomBucketName();
 const auto parent = bucket_name + "/" + RandomFolderName();
 const auto path = parent + "new-sub/";
 ASSERT_OK(fs->CreateDir(path, true));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), parent, FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, DeleteDirSuccess) {
Expand Down

, '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-15056: [C++] Speed up GcsFileSystem tests by coryan · Pull Request #11933 · apache/arrow · GitHub
Skip to content
ARROW-15056: [C++] Speed up GcsFileSystem tests#11933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

coryan
wants to merge
1
commit into

from

 Closed


ARROW-15056: [C++] Speed up GcsFileSystem tests
#11933
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


114 changes: 73 additions & 41 deletions
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,21 +61,9 @@ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
culpa qui officia deserunt mollit anim id est laborum.
)""";

class GcsIntegrationTest : public ::testing::Test {
class GcsTestbench : public ::testing::Environment {
 public:
 ~GcsIntegrationTest() override {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
 if (server_process_.valid()) {
 server_process_.wait();
 }
 }

 protected:
 void SetUp() override {
 // Initialize a PRNG with a small amount of entropy.
 generator_ = std::mt19937_64(std::random_device()());
 GcsTestbench() {
 port_ = std::to_string(GetListenPort());
 std::vector<std::string> names{"python3", "python"};
 // If the build script or application developer provides a value in the PYTHON
Expand All@@ -101,14 +89,51 @@ class GcsIntegrationTest : public ::testing::Test {
 server_process_.terminate();
 server_process_.wait();
 }
 ASSERT_TRUE(server_process_.valid()) << error;
 ASSERT_TRUE(server_process_.running()) << error;
 if (server_process_.valid() && server_process_.valid()) return;
 error_ = std::move(error);
 }

 ~GcsTestbench() {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
 if (server_process_.valid()) {
 server_process_.wait();
 }
 }

 const std::string& port() const { return port_; }
 const std::string& error() const { return error_; }

 private:
 std::string port_;
 bp::child server_process_;
 bp::group group_;
 std::string error_;
};

static GcsTestbench* Testbench() {
 static auto* const environment = [] { return new GcsTestbench; }();
 return environment;
}

auto* testbench_env = ::testing::AddGlobalTestEnvironment(Testbench());

class GcsIntegrationTest : public ::testing::Test {
 protected:
 void SetUp() override {
 ASSERT_THAT(Testbench(), NotNull());
 ASSERT_THAT(Testbench()->error(), IsEmpty());

 // Initialize a PRNG with a small amount of entropy.
 generator_ = std::mt19937_64(std::random_device()());
 bucket_name_ = RandomChars(32);

 // Create a bucket and a small file in the testbench. This makes it easier to
 // bootstrap GcsFileSystem and its tests.
 auto client = gcs::Client(
 google::cloud::Options{}
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + port_)
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + Testbench()->port())
 .set<gc::UnifiedCredentialsOption>(gc::MakeInsecureCredentials()));
 google::cloud::StatusOr<gcs::BucketMetadata> bucket = client.CreateBucketForProject(
 PreexistingBucketName(), "ignored-by-testbench", gcs::BucketMetadata{});
Expand All@@ -121,41 +146,35 @@ class GcsIntegrationTest : public ::testing::Test {
 << ">, status=" << object.status();
 }

static std::string PreexistingBucketName() { return "test-bucket-name"; }
 std::string PreexistingBucketName() const { return bucket_name_; }

static std::string PreexistingBucketPath() { return PreexistingBucketName() + '/'; }
 std::string PreexistingBucketPath() const { return PreexistingBucketName() + '/'; }

 static std::string PreexistingObjectName() { return "test-object-name"; }

static std::string PreexistingObjectPath() {
 std::string PreexistingObjectPath() const {
 return PreexistingBucketPath() + PreexistingObjectName();
 }

 static std::string NotFoundObjectPath() {
 return PreexistingBucketPath() + "not-found";
 }
 std::string NotFoundObjectPath() { return PreexistingBucketPath() + "not-found"; }

 GcsOptions TestGcsOptions() {
 GcsOptions options;
 options.endpoint_override = "127.0.0.1:" + port_;
 options.endpoint_override = "127.0.0.1:" + Testbench()->port();
 options.scheme = "http";
 return options;
 }

 gcs::Client GcsClient() {
 return gcs::Client(
 google::cloud::Options{}
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + port_)
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + Testbench()->port())
 .set<gc::UnifiedCredentialsOption>(gc::MakeInsecureCredentials()));
 }

 std::string RandomLine(int lineno, std::size_t width) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
 std::uniform_int_distribution<std::size_t> d(0, fillers.size() - 1);

 auto line = std::to_string(lineno) + ": ";
 std::generate_n(std::back_inserter(line), width - line.size() - 1,
 [&] { return fillers[d(generator_)]; });
 line += RandomChars(width - line.size() - 1);
 line += '\n';
 return line;
 }
Expand All@@ -164,11 +183,21 @@ class GcsIntegrationTest : public ::testing::Test {
 return std::uniform_int_distribution<std::size_t>(0, end - 1)(generator_);
 }

 std::string RandomBucketName() { return RandomChars(32); }

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

 private:
 std::string RandomChars(std::size_t count) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
 std::uniform_int_distribution<std::size_t> d(0, fillers.size() - 1);
 std::string s;
 std::generate_n(std::back_inserter(s), count, [&] { return fillers[d(generator_)]; });
 return s;
 }

 std::mt19937_64 generator_;
 std::string port_;
 bp::child server_process_;
 bp::group group_;
 std::string bucket_name_;
};

TEST(GcsFileSystem, OptionsCompare) {
Expand DownExpand Up@@ -372,13 +401,14 @@ TEST_F(GcsIntegrationTest, GetFileInfoObject) {

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK(fs->CreateDir("new-bucket", false));
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 auto bucket_name = RandomBucketName();
 ASSERT_OK(fs->CreateDir(bucket_name, false));
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketAndFolder) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto path = PreexistingBucketPath() + "new-folder/";
 const auto path = PreexistingBucketPath() + RandomFolderName();
 ASSERT_OK(fs->CreateDir(path, false));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
}
Expand All@@ -391,13 +421,14 @@ TEST_F(GcsIntegrationTest, CreateDirFailureFolderWithMissingBucket) {

TEST_F(GcsIntegrationTest, CreateDirRecursiveBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK(fs->CreateDir("new-bucket", true));
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 auto bucket_name = RandomBucketName();
 ASSERT_OK(fs->CreateDir(bucket_name, true));
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, CreateDirRecursiveFolderOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto parent = PreexistingBucketPath() + "new-folder/";
 const auto parent = PreexistingBucketPath() + RandomFolderName();
 const auto path = parent + "new-sub/";
 ASSERT_OK(fs->CreateDir(path, true));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
Expand All@@ -406,12 +437,13 @@ TEST_F(GcsIntegrationTest, CreateDirRecursiveFolderOnly) {

TEST_F(GcsIntegrationTest, CreateDirRecursiveBucketAndFolder) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto parent = std::string("new-bucket/new-folder/");
 auto bucket_name = RandomBucketName();
 const auto parent = bucket_name + "/" + RandomFolderName();
 const auto path = parent + "new-sub/";
 ASSERT_OK(fs->CreateDir(path, true));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), parent, FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, DeleteDirSuccess) {
Expand Down

, '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-15056: [C++] Speed up GcsFileSystem tests by coryan · Pull Request #11933 · apache/arrow · GitHub
Skip to content
ARROW-15056: [C++] Speed up GcsFileSystem tests#11933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

coryan
wants to merge
1
commit into

from

 Closed


ARROW-15056: [C++] Speed up GcsFileSystem tests
#11933
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


114 changes: 73 additions & 41 deletions
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,21 +61,9 @@ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
culpa qui officia deserunt mollit anim id est laborum.
)""";

class GcsIntegrationTest : public ::testing::Test {
class GcsTestbench : public ::testing::Environment {
 public:
 ~GcsIntegrationTest() override {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
 if (server_process_.valid()) {
 server_process_.wait();
 }
 }

 protected:
 void SetUp() override {
 // Initialize a PRNG with a small amount of entropy.
 generator_ = std::mt19937_64(std::random_device()());
 GcsTestbench() {
 port_ = std::to_string(GetListenPort());
 std::vector<std::string> names{"python3", "python"};
 // If the build script or application developer provides a value in the PYTHON
Expand All@@ -101,14 +89,51 @@ class GcsIntegrationTest : public ::testing::Test {
 server_process_.terminate();
 server_process_.wait();
 }
 ASSERT_TRUE(server_process_.valid()) << error;
 ASSERT_TRUE(server_process_.running()) << error;
 if (server_process_.valid() && server_process_.valid()) return;
 error_ = std::move(error);
 }

 ~GcsTestbench() {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
 if (server_process_.valid()) {
 server_process_.wait();
 }
 }

 const std::string& port() const { return port_; }
 const std::string& error() const { return error_; }

 private:
 std::string port_;
 bp::child server_process_;
 bp::group group_;
 std::string error_;
};

static GcsTestbench* Testbench() {
 static auto* const environment = [] { return new GcsTestbench; }();
 return environment;
}

auto* testbench_env = ::testing::AddGlobalTestEnvironment(Testbench());

class GcsIntegrationTest : public ::testing::Test {
 protected:
 void SetUp() override {
 ASSERT_THAT(Testbench(), NotNull());
 ASSERT_THAT(Testbench()->error(), IsEmpty());

 // Initialize a PRNG with a small amount of entropy.
 generator_ = std::mt19937_64(std::random_device()());
 bucket_name_ = RandomChars(32);

 // Create a bucket and a small file in the testbench. This makes it easier to
 // bootstrap GcsFileSystem and its tests.
 auto client = gcs::Client(
 google::cloud::Options{}
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + port_)
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + Testbench()->port())
 .set<gc::UnifiedCredentialsOption>(gc::MakeInsecureCredentials()));
 google::cloud::StatusOr<gcs::BucketMetadata> bucket = client.CreateBucketForProject(
 PreexistingBucketName(), "ignored-by-testbench", gcs::BucketMetadata{});
Expand All@@ -121,41 +146,35 @@ class GcsIntegrationTest : public ::testing::Test {
 << ">, status=" << object.status();
 }

static std::string PreexistingBucketName() { return "test-bucket-name"; }
 std::string PreexistingBucketName() const { return bucket_name_; }

static std::string PreexistingBucketPath() { return PreexistingBucketName() + '/'; }
 std::string PreexistingBucketPath() const { return PreexistingBucketName() + '/'; }

 static std::string PreexistingObjectName() { return "test-object-name"; }

static std::string PreexistingObjectPath() {
 std::string PreexistingObjectPath() const {
 return PreexistingBucketPath() + PreexistingObjectName();
 }

 static std::string NotFoundObjectPath() {
 return PreexistingBucketPath() + "not-found";
 }
 std::string NotFoundObjectPath() { return PreexistingBucketPath() + "not-found"; }

 GcsOptions TestGcsOptions() {
 GcsOptions options;
 options.endpoint_override = "127.0.0.1:" + port_;
 options.endpoint_override = "127.0.0.1:" + Testbench()->port();
 options.scheme = "http";
 return options;
 }

 gcs::Client GcsClient() {
 return gcs::Client(
 google::cloud::Options{}
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + port_)
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + Testbench()->port())
 .set<gc::UnifiedCredentialsOption>(gc::MakeInsecureCredentials()));
 }

 std::string RandomLine(int lineno, std::size_t width) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
 std::uniform_int_distribution<std::size_t> d(0, fillers.size() - 1);

 auto line = std::to_string(lineno) + ": ";
 std::generate_n(std::back_inserter(line), width - line.size() - 1,
 [&] { return fillers[d(generator_)]; });
 line += RandomChars(width - line.size() - 1);
 line += '\n';
 return line;
 }
Expand All@@ -164,11 +183,21 @@ class GcsIntegrationTest : public ::testing::Test {
 return std::uniform_int_distribution<std::size_t>(0, end - 1)(generator_);
 }

 std::string RandomBucketName() { return RandomChars(32); }

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

 private:
 std::string RandomChars(std::size_t count) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
 std::uniform_int_distribution<std::size_t> d(0, fillers.size() - 1);
 std::string s;
 std::generate_n(std::back_inserter(s), count, [&] { return fillers[d(generator_)]; });
 return s;
 }

 std::mt19937_64 generator_;
 std::string port_;
 bp::child server_process_;
 bp::group group_;
 std::string bucket_name_;
};

TEST(GcsFileSystem, OptionsCompare) {
Expand DownExpand Up@@ -372,13 +401,14 @@ TEST_F(GcsIntegrationTest, GetFileInfoObject) {

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK(fs->CreateDir("new-bucket", false));
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 auto bucket_name = RandomBucketName();
 ASSERT_OK(fs->CreateDir(bucket_name, false));
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketAndFolder) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto path = PreexistingBucketPath() + "new-folder/";
 const auto path = PreexistingBucketPath() + RandomFolderName();
 ASSERT_OK(fs->CreateDir(path, false));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
}
Expand All@@ -391,13 +421,14 @@ TEST_F(GcsIntegrationTest, CreateDirFailureFolderWithMissingBucket) {

TEST_F(GcsIntegrationTest, CreateDirRecursiveBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK(fs->CreateDir("new-bucket", true));
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 auto bucket_name = RandomBucketName();
 ASSERT_OK(fs->CreateDir(bucket_name, true));
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, CreateDirRecursiveFolderOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto parent = PreexistingBucketPath() + "new-folder/";
 const auto parent = PreexistingBucketPath() + RandomFolderName();
 const auto path = parent + "new-sub/";
 ASSERT_OK(fs->CreateDir(path, true));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
Expand All@@ -406,12 +437,13 @@ TEST_F(GcsIntegrationTest, CreateDirRecursiveFolderOnly) {

TEST_F(GcsIntegrationTest, CreateDirRecursiveBucketAndFolder) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto parent = std::string("new-bucket/new-folder/");
 auto bucket_name = RandomBucketName();
 const auto parent = bucket_name + "/" + RandomFolderName();
 const auto path = parent + "new-sub/";
 ASSERT_OK(fs->CreateDir(path, true));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), parent, FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, DeleteDirSuccess) {
Expand Down

, '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); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
ARROW-15056: [C++] Speed up GcsFileSystem tests by coryan · Pull Request #11933 · apache/arrow · GitHub
Skip to content
ARROW-15056: [C++] Speed up GcsFileSystem tests#11933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

coryan
wants to merge
1
commit into

from

 Closed


ARROW-15056: [C++] Speed up GcsFileSystem tests
#11933
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


114 changes: 73 additions & 41 deletions
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,21 +61,9 @@ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
culpa qui officia deserunt mollit anim id est laborum.
)""";

class GcsIntegrationTest : public ::testing::Test {
class GcsTestbench : public ::testing::Environment {
 public:
 ~GcsIntegrationTest() override {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
 if (server_process_.valid()) {
 server_process_.wait();
 }
 }

 protected:
 void SetUp() override {
 // Initialize a PRNG with a small amount of entropy.
 generator_ = std::mt19937_64(std::random_device()());
 GcsTestbench() {
 port_ = std::to_string(GetListenPort());
 std::vector<std::string> names{"python3", "python"};
 // If the build script or application developer provides a value in the PYTHON
Expand All@@ -101,14 +89,51 @@ class GcsIntegrationTest : public ::testing::Test {
 server_process_.terminate();
 server_process_.wait();
 }
 ASSERT_TRUE(server_process_.valid()) << error;
 ASSERT_TRUE(server_process_.running()) << error;
 if (server_process_.valid() && server_process_.valid()) return;
 error_ = std::move(error);
 }

 ~GcsTestbench() {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
 if (server_process_.valid()) {
 server_process_.wait();
 }
 }

 const std::string& port() const { return port_; }
 const std::string& error() const { return error_; }

 private:
 std::string port_;
 bp::child server_process_;
 bp::group group_;
 std::string error_;
};

static GcsTestbench* Testbench() {
 static auto* const environment = [] { return new GcsTestbench; }();
 return environment;
}

auto* testbench_env = ::testing::AddGlobalTestEnvironment(Testbench());

class GcsIntegrationTest : public ::testing::Test {
 protected:
 void SetUp() override {
 ASSERT_THAT(Testbench(), NotNull());
 ASSERT_THAT(Testbench()->error(), IsEmpty());

 // Initialize a PRNG with a small amount of entropy.
 generator_ = std::mt19937_64(std::random_device()());
 bucket_name_ = RandomChars(32);

 // Create a bucket and a small file in the testbench. This makes it easier to
 // bootstrap GcsFileSystem and its tests.
 auto client = gcs::Client(
 google::cloud::Options{}
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + port_)
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + Testbench()->port())
 .set<gc::UnifiedCredentialsOption>(gc::MakeInsecureCredentials()));
 google::cloud::StatusOr<gcs::BucketMetadata> bucket = client.CreateBucketForProject(
 PreexistingBucketName(), "ignored-by-testbench", gcs::BucketMetadata{});
Expand All@@ -121,41 +146,35 @@ class GcsIntegrationTest : public ::testing::Test {
 << ">, status=" << object.status();
 }

static std::string PreexistingBucketName() { return "test-bucket-name"; }
 std::string PreexistingBucketName() const { return bucket_name_; }

static std::string PreexistingBucketPath() { return PreexistingBucketName() + '/'; }
 std::string PreexistingBucketPath() const { return PreexistingBucketName() + '/'; }

 static std::string PreexistingObjectName() { return "test-object-name"; }

static std::string PreexistingObjectPath() {
 std::string PreexistingObjectPath() const {
 return PreexistingBucketPath() + PreexistingObjectName();
 }

 static std::string NotFoundObjectPath() {
 return PreexistingBucketPath() + "not-found";
 }
 std::string NotFoundObjectPath() { return PreexistingBucketPath() + "not-found"; }

 GcsOptions TestGcsOptions() {
 GcsOptions options;
 options.endpoint_override = "127.0.0.1:" + port_;
 options.endpoint_override = "127.0.0.1:" + Testbench()->port();
 options.scheme = "http";
 return options;
 }

 gcs::Client GcsClient() {
 return gcs::Client(
 google::cloud::Options{}
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + port_)
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + Testbench()->port())
 .set<gc::UnifiedCredentialsOption>(gc::MakeInsecureCredentials()));
 }

 std::string RandomLine(int lineno, std::size_t width) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
 std::uniform_int_distribution<std::size_t> d(0, fillers.size() - 1);

 auto line = std::to_string(lineno) + ": ";
 std::generate_n(std::back_inserter(line), width - line.size() - 1,
 [&] { return fillers[d(generator_)]; });
 line += RandomChars(width - line.size() - 1);
 line += '\n';
 return line;
 }
Expand All@@ -164,11 +183,21 @@ class GcsIntegrationTest : public ::testing::Test {
 return std::uniform_int_distribution<std::size_t>(0, end - 1)(generator_);
 }

 std::string RandomBucketName() { return RandomChars(32); }

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

 private:
 std::string RandomChars(std::size_t count) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
 std::uniform_int_distribution<std::size_t> d(0, fillers.size() - 1);
 std::string s;
 std::generate_n(std::back_inserter(s), count, [&] { return fillers[d(generator_)]; });
 return s;
 }

 std::mt19937_64 generator_;
 std::string port_;
 bp::child server_process_;
 bp::group group_;
 std::string bucket_name_;
};

TEST(GcsFileSystem, OptionsCompare) {
Expand DownExpand Up@@ -372,13 +401,14 @@ TEST_F(GcsIntegrationTest, GetFileInfoObject) {

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK(fs->CreateDir("new-bucket", false));
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 auto bucket_name = RandomBucketName();
 ASSERT_OK(fs->CreateDir(bucket_name, false));
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketAndFolder) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto path = PreexistingBucketPath() + "new-folder/";
 const auto path = PreexistingBucketPath() + RandomFolderName();
 ASSERT_OK(fs->CreateDir(path, false));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
}
Expand All@@ -391,13 +421,14 @@ TEST_F(GcsIntegrationTest, CreateDirFailureFolderWithMissingBucket) {

TEST_F(GcsIntegrationTest, CreateDirRecursiveBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK(fs->CreateDir("new-bucket", true));
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 auto bucket_name = RandomBucketName();
 ASSERT_OK(fs->CreateDir(bucket_name, true));
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, CreateDirRecursiveFolderOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto parent = PreexistingBucketPath() + "new-folder/";
 const auto parent = PreexistingBucketPath() + RandomFolderName();
 const auto path = parent + "new-sub/";
 ASSERT_OK(fs->CreateDir(path, true));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
Expand All@@ -406,12 +437,13 @@ TEST_F(GcsIntegrationTest, CreateDirRecursiveFolderOnly) {

TEST_F(GcsIntegrationTest, CreateDirRecursiveBucketAndFolder) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto parent = std::string("new-bucket/new-folder/");
 auto bucket_name = RandomBucketName();
 const auto parent = bucket_name + "/" + RandomFolderName();
 const auto path = parent + "new-sub/";
 ASSERT_OK(fs->CreateDir(path, true));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), parent, FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, DeleteDirSuccess) {
Expand Down

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

coryan
wants to merge
1
commit into

from

 Closed


ARROW-15056: [C++] Speed up GcsFileSystem tests
#11933
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


114 changes: 73 additions & 41 deletions
cpp/src/arrow/filesystem/gcsfs_test.cc

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,21 +61,9 @@ fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
culpa qui officia deserunt mollit anim id est laborum.
)""";

class GcsIntegrationTest : public ::testing::Test {
class GcsTestbench : public ::testing::Environment {
 public:
 ~GcsIntegrationTest() override {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
 if (server_process_.valid()) {
 server_process_.wait();
 }
 }

 protected:
 void SetUp() override {
 // Initialize a PRNG with a small amount of entropy.
 generator_ = std::mt19937_64(std::random_device()());
 GcsTestbench() {
 port_ = std::to_string(GetListenPort());
 std::vector<std::string> names{"python3", "python"};
 // If the build script or application developer provides a value in the PYTHON
Expand All@@ -101,14 +89,51 @@ class GcsIntegrationTest : public ::testing::Test {
 server_process_.terminate();
 server_process_.wait();
 }
 ASSERT_TRUE(server_process_.valid()) << error;
 ASSERT_TRUE(server_process_.running()) << error;
 if (server_process_.valid() && server_process_.valid()) return;
 error_ = std::move(error);
 }

 ~GcsTestbench() {
 // Brutal shutdown, kill the full process group because the GCS testbench may launch
 // additional children.
 group_.terminate();
 if (server_process_.valid()) {
 server_process_.wait();
 }
 }

 const std::string& port() const { return port_; }
 const std::string& error() const { return error_; }

 private:
 std::string port_;
 bp::child server_process_;
 bp::group group_;
 std::string error_;
};

static GcsTestbench* Testbench() {
 static auto* const environment = [] { return new GcsTestbench; }();
 return environment;
}

auto* testbench_env = ::testing::AddGlobalTestEnvironment(Testbench());

class GcsIntegrationTest : public ::testing::Test {
 protected:
 void SetUp() override {
 ASSERT_THAT(Testbench(), NotNull());
 ASSERT_THAT(Testbench()->error(), IsEmpty());

 // Initialize a PRNG with a small amount of entropy.
 generator_ = std::mt19937_64(std::random_device()());
 bucket_name_ = RandomChars(32);

 // Create a bucket and a small file in the testbench. This makes it easier to
 // bootstrap GcsFileSystem and its tests.
 auto client = gcs::Client(
 google::cloud::Options{}
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + port_)
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + Testbench()->port())
 .set<gc::UnifiedCredentialsOption>(gc::MakeInsecureCredentials()));
 google::cloud::StatusOr<gcs::BucketMetadata> bucket = client.CreateBucketForProject(
 PreexistingBucketName(), "ignored-by-testbench", gcs::BucketMetadata{});
Expand All@@ -121,41 +146,35 @@ class GcsIntegrationTest : public ::testing::Test {
 << ">, status=" << object.status();
 }

static std::string PreexistingBucketName() { return "test-bucket-name"; }
 std::string PreexistingBucketName() const { return bucket_name_; }

static std::string PreexistingBucketPath() { return PreexistingBucketName() + '/'; }
 std::string PreexistingBucketPath() const { return PreexistingBucketName() + '/'; }

 static std::string PreexistingObjectName() { return "test-object-name"; }

static std::string PreexistingObjectPath() {
 std::string PreexistingObjectPath() const {
 return PreexistingBucketPath() + PreexistingObjectName();
 }

 static std::string NotFoundObjectPath() {
 return PreexistingBucketPath() + "not-found";
 }
 std::string NotFoundObjectPath() { return PreexistingBucketPath() + "not-found"; }

 GcsOptions TestGcsOptions() {
 GcsOptions options;
 options.endpoint_override = "127.0.0.1:" + port_;
 options.endpoint_override = "127.0.0.1:" + Testbench()->port();
 options.scheme = "http";
 return options;
 }

 gcs::Client GcsClient() {
 return gcs::Client(
 google::cloud::Options{}
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + port_)
 .set<gcs::RestEndpointOption>("http://127.0.0.1:" + Testbench()->port())
 .set<gc::UnifiedCredentialsOption>(gc::MakeInsecureCredentials()));
 }

 std::string RandomLine(int lineno, std::size_t width) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
 std::uniform_int_distribution<std::size_t> d(0, fillers.size() - 1);

 auto line = std::to_string(lineno) + ": ";
 std::generate_n(std::back_inserter(line), width - line.size() - 1,
 [&] { return fillers[d(generator_)]; });
 line += RandomChars(width - line.size() - 1);
 line += '\n';
 return line;
 }
Expand All@@ -164,11 +183,21 @@ class GcsIntegrationTest : public ::testing::Test {
 return std::uniform_int_distribution<std::size_t>(0, end - 1)(generator_);
 }

 std::string RandomBucketName() { return RandomChars(32); }

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

 private:
 std::string RandomChars(std::size_t count) {
 auto const fillers = std::string("abcdefghijlkmnopqrstuvwxyz0123456789");
 std::uniform_int_distribution<std::size_t> d(0, fillers.size() - 1);
 std::string s;
 std::generate_n(std::back_inserter(s), count, [&] { return fillers[d(generator_)]; });
 return s;
 }

 std::mt19937_64 generator_;
 std::string port_;
 bp::child server_process_;
 bp::group group_;
 std::string bucket_name_;
};

TEST(GcsFileSystem, OptionsCompare) {
Expand DownExpand Up@@ -372,13 +401,14 @@ TEST_F(GcsIntegrationTest, GetFileInfoObject) {

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK(fs->CreateDir("new-bucket", false));
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 auto bucket_name = RandomBucketName();
 ASSERT_OK(fs->CreateDir(bucket_name, false));
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, CreateDirSuccessBucketAndFolder) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto path = PreexistingBucketPath() + "new-folder/";
 const auto path = PreexistingBucketPath() + RandomFolderName();
 ASSERT_OK(fs->CreateDir(path, false));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
}
Expand All@@ -391,13 +421,14 @@ TEST_F(GcsIntegrationTest, CreateDirFailureFolderWithMissingBucket) {

TEST_F(GcsIntegrationTest, CreateDirRecursiveBucketOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 ASSERT_OK(fs->CreateDir("new-bucket", true));
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 auto bucket_name = RandomBucketName();
 ASSERT_OK(fs->CreateDir(bucket_name, true));
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, CreateDirRecursiveFolderOnly) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto parent = PreexistingBucketPath() + "new-folder/";
 const auto parent = PreexistingBucketPath() + RandomFolderName();
 const auto path = parent + "new-sub/";
 ASSERT_OK(fs->CreateDir(path, true));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
Expand All@@ -406,12 +437,13 @@ TEST_F(GcsIntegrationTest, CreateDirRecursiveFolderOnly) {

TEST_F(GcsIntegrationTest, CreateDirRecursiveBucketAndFolder) {
 auto fs = internal::MakeGcsFileSystemForTest(TestGcsOptions());
 const auto parent = std::string("new-bucket/new-folder/");
 auto bucket_name = RandomBucketName();
 const auto parent = bucket_name + "/" + RandomFolderName();
 const auto path = parent + "new-sub/";
 ASSERT_OK(fs->CreateDir(path, true));
 arrow::fs::AssertFileInfo(fs.get(), path, FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), parent, FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), "new-bucket/", FileType::Directory);
 arrow::fs::AssertFileInfo(fs.get(), bucket_name + "/", FileType::Directory);
}

TEST_F(GcsIntegrationTest, DeleteDirSuccess) {
Expand Down