Add Env::Remove{File,Dir} which obsolete Env::Delete{File,Dir}.
The "DeleteFile" method name causes pain for Windows developers, because
<windows.h> #defines a DeleteFile macro to DeleteFileW or DeleteFileA.
Current code uses workarounds, like #undefining DeleteFile everywhere an
Env is declared, implemented, or used.
This CL removes the need for workarounds by renaming Env::DeleteFile to
Env::RemoveFile. For consistency, Env::DeleteDir is also renamed to
Env::RemoveDir. A few internal methods are also renamed for consistency.
Software that supports Windows is expected to migrate any Env
implementations and usage to Remove{File,Dir}, and never use the name
Env::Delete{File,Dir} in its code.
The renaming is done in a backwards-compatible way, at the risk of
making it slightly more difficult to build a new correct Env
implementation. The backwards compatibility is achieved using the
following hacks:
1) Env::Remove{File,Dir} methods are added, with a default
implementation that calls into Env::Delete{File,Dir}. This makes old
Env implementations compatible with code that calls into the updated
API.
2) The Env::Delete{File,Dir} methods are no longer pure virtuals.
Instead, they gain a default implementation that calls into
Env::Remove{File,Dir}. This makes updated Env implementations
compatible with code that calls into the old API.
The cost of this approach is that it's possible to write an Env without
overriding either Rename{File,Dir} or Delete{File,Dir}, without getting
a compiler warning. However, attempting to run the test suite will
immediately fail with an infinite call stack ending in
{Remove,Delete}{File,Dir}, making developers aware of the problem.
PiperOrigin-RevId: 288710907
4 vuotta sitten Add Env::Remove{File,Dir} which obsolete Env::Delete{File,Dir}.
The "DeleteFile" method name causes pain for Windows developers, because
<windows.h> #defines a DeleteFile macro to DeleteFileW or DeleteFileA.
Current code uses workarounds, like #undefining DeleteFile everywhere an
Env is declared, implemented, or used.
This CL removes the need for workarounds by renaming Env::DeleteFile to
Env::RemoveFile. For consistency, Env::DeleteDir is also renamed to
Env::RemoveDir. A few internal methods are also renamed for consistency.
Software that supports Windows is expected to migrate any Env
implementations and usage to Remove{File,Dir}, and never use the name
Env::Delete{File,Dir} in its code.
The renaming is done in a backwards-compatible way, at the risk of
making it slightly more difficult to build a new correct Env
implementation. The backwards compatibility is achieved using the
following hacks:
1) Env::Remove{File,Dir} methods are added, with a default
implementation that calls into Env::Delete{File,Dir}. This makes old
Env implementations compatible with code that calls into the updated
API.
2) The Env::Delete{File,Dir} methods are no longer pure virtuals.
Instead, they gain a default implementation that calls into
Env::Remove{File,Dir}. This makes updated Env implementations
compatible with code that calls into the old API.
The cost of this approach is that it's possible to write an Env without
overriding either Rename{File,Dir} or Delete{File,Dir}, without getting
a compiler warning. However, attempting to run the test suite will
immediately fail with an infinite call stack ending in
{Remove,Delete}{File,Dir}, making developers aware of the problem.
PiperOrigin-RevId: 288710907
4 vuotta sitten Add Env::Remove{File,Dir} which obsolete Env::Delete{File,Dir}.
The "DeleteFile" method name causes pain for Windows developers, because
<windows.h> #defines a DeleteFile macro to DeleteFileW or DeleteFileA.
Current code uses workarounds, like #undefining DeleteFile everywhere an
Env is declared, implemented, or used.
This CL removes the need for workarounds by renaming Env::DeleteFile to
Env::RemoveFile. For consistency, Env::DeleteDir is also renamed to
Env::RemoveDir. A few internal methods are also renamed for consistency.
Software that supports Windows is expected to migrate any Env
implementations and usage to Remove{File,Dir}, and never use the name
Env::Delete{File,Dir} in its code.
The renaming is done in a backwards-compatible way, at the risk of
making it slightly more difficult to build a new correct Env
implementation. The backwards compatibility is achieved using the
following hacks:
1) Env::Remove{File,Dir} methods are added, with a default
implementation that calls into Env::Delete{File,Dir}. This makes old
Env implementations compatible with code that calls into the updated
API.
2) The Env::Delete{File,Dir} methods are no longer pure virtuals.
Instead, they gain a default implementation that calls into
Env::Remove{File,Dir}. This makes updated Env implementations
compatible with code that calls into the old API.
The cost of this approach is that it's possible to write an Env without
overriding either Rename{File,Dir} or Delete{File,Dir}, without getting
a compiler warning. However, attempting to run the test suite will
immediately fail with an infinite call stack ending in
{Remove,Delete}{File,Dir}, making developers aware of the problem.
PiperOrigin-RevId: 288710907
4 vuotta sitten Add Env::Remove{File,Dir} which obsolete Env::Delete{File,Dir}.
The "DeleteFile" method name causes pain for Windows developers, because
<windows.h> #defines a DeleteFile macro to DeleteFileW or DeleteFileA.
Current code uses workarounds, like #undefining DeleteFile everywhere an
Env is declared, implemented, or used.
This CL removes the need for workarounds by renaming Env::DeleteFile to
Env::RemoveFile. For consistency, Env::DeleteDir is also renamed to
Env::RemoveDir. A few internal methods are also renamed for consistency.
Software that supports Windows is expected to migrate any Env
implementations and usage to Remove{File,Dir}, and never use the name
Env::Delete{File,Dir} in its code.
The renaming is done in a backwards-compatible way, at the risk of
making it slightly more difficult to build a new correct Env
implementation. The backwards compatibility is achieved using the
following hacks:
1) Env::Remove{File,Dir} methods are added, with a default
implementation that calls into Env::Delete{File,Dir}. This makes old
Env implementations compatible with code that calls into the updated
API.
2) The Env::Delete{File,Dir} methods are no longer pure virtuals.
Instead, they gain a default implementation that calls into
Env::Remove{File,Dir}. This makes updated Env implementations
compatible with code that calls into the old API.
The cost of this approach is that it's possible to write an Env without
overriding either Rename{File,Dir} or Delete{File,Dir}, without getting
a compiler warning. However, attempting to run the test suite will
immediately fail with an infinite call stack ending in
{Remove,Delete}{File,Dir}, making developers aware of the problem.
PiperOrigin-RevId: 288710907
4 vuotta sitten |
|
- // Copyright (c) 2011 The LevelDB Authors. All rights reserved.
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file. See the AUTHORS file for names of contributors.
-
- #include "leveldb/env.h"
-
- #include <algorithm>
-
- #include "gtest/gtest.h"
- #include "port/port.h"
- #include "port/thread_annotations.h"
- #include "util/mutexlock.h"
- #include "util/testutil.h"
-
- namespace leveldb {
-
- class EnvTest : public testing::Test {
- public:
- EnvTest() : env_(Env::Default()) {}
-
- Env* env_;
- };
-
- TEST_F(EnvTest, ReadWrite) {
- Random rnd(test::RandomSeed());
-
- // Get file to use for testing.
- std::string test_dir;
- ASSERT_LEVELDB_OK(env_->GetTestDirectory(&test_dir));
- std::string test_file_name = test_dir + "/open_on_read.txt";
- WritableFile* writable_file;
- ASSERT_LEVELDB_OK(env_->NewWritableFile(test_file_name, &writable_file));
-
- // Fill a file with data generated via a sequence of randomly sized writes.
- static const size_t kDataSize = 10 * 1048576;
- std::string data;
- while (data.size() < kDataSize) {
- int len = rnd.Skewed(18); // Up to 2^18 - 1, but typically much smaller
- std::string r;
- test::RandomString(&rnd, len, &r);
- ASSERT_LEVELDB_OK(writable_file->Append(r));
- data += r;
- if (rnd.OneIn(10)) {
- ASSERT_LEVELDB_OK(writable_file->Flush());
- }
- }
- ASSERT_LEVELDB_OK(writable_file->Sync());
- ASSERT_LEVELDB_OK(writable_file->Close());
- delete writable_file;
-
- // Read all data using a sequence of randomly sized reads.
- SequentialFile* sequential_file;
- ASSERT_LEVELDB_OK(env_->NewSequentialFile(test_file_name, &sequential_file));
- std::string read_result;
- std::string scratch;
- while (read_result.size() < data.size()) {
- int len = std::min<int>(rnd.Skewed(18), data.size() - read_result.size());
- scratch.resize(std::max(len, 1)); // at least 1 so &scratch[0] is legal
- Slice read;
- ASSERT_LEVELDB_OK(sequential_file->Read(len, &read, &scratch[0]));
- if (len > 0) {
- ASSERT_GT(read.size(), 0);
- }
- ASSERT_LE(read.size(), len);
- read_result.append(read.data(), read.size());
- }
- ASSERT_EQ(read_result, data);
- delete sequential_file;
- }
-
- TEST_F(EnvTest, RunImmediately) {
- struct RunState {
- port::Mutex mu;
- port::CondVar cvar{&mu};
- bool called = false;
-
- static void Run(void* arg) {
- RunState* state = reinterpret_cast<RunState*>(arg);
- MutexLock l(&state->mu);
- ASSERT_EQ(state->called, false);
- state->called = true;
- state->cvar.Signal();
- }
- };
-
- RunState state;
- env_->Schedule(&RunState::Run, &state);
-
- MutexLock l(&state.mu);
- while (!state.called) {
- state.cvar.Wait();
- }
- }
-
- TEST_F(EnvTest, RunMany) {
- struct RunState {
- port::Mutex mu;
- port::CondVar cvar{&mu};
- int run_count = 0;
- };
-
- struct Callback {
- RunState* const state_; // Pointer to shared state.
- bool run = false;
-
- Callback(RunState* s) : state_(s) {}
-
- static void Run(void* arg) {
- Callback* callback = reinterpret_cast<Callback*>(arg);
- RunState* state = callback->state_;
-
- MutexLock l(&state->mu);
- state->run_count++;
- callback->run = true;
- state->cvar.Signal();
- }
- };
-
- RunState state;
- Callback callback1(&state);
- Callback callback2(&state);
- Callback callback3(&state);
- Callback callback4(&state);
- env_->Schedule(&Callback::Run, &callback1);
- env_->Schedule(&Callback::Run, &callback2);
- env_->Schedule(&Callback::Run, &callback3);
- env_->Schedule(&Callback::Run, &callback4);
-
- MutexLock l(&state.mu);
- while (state.run_count != 4) {
- state.cvar.Wait();
- }
-
- ASSERT_TRUE(callback1.run);
- ASSERT_TRUE(callback2.run);
- ASSERT_TRUE(callback3.run);
- ASSERT_TRUE(callback4.run);
- }
-
- struct State {
- port::Mutex mu;
- port::CondVar cvar{&mu};
-
- int val GUARDED_BY(mu);
- int num_running GUARDED_BY(mu);
-
- State(int val, int num_running) : val(val), num_running(num_running) {}
- };
-
- static void ThreadBody(void* arg) {
- State* s = reinterpret_cast<State*>(arg);
- s->mu.Lock();
- s->val += 1;
- s->num_running -= 1;
- s->cvar.Signal();
- s->mu.Unlock();
- }
-
- TEST_F(EnvTest, StartThread) {
- State state(0, 3);
- for (int i = 0; i < 3; i++) {
- env_->StartThread(&ThreadBody, &state);
- }
-
- MutexLock l(&state.mu);
- while (state.num_running != 0) {
- state.cvar.Wait();
- }
- ASSERT_EQ(state.val, 3);
- }
-
- TEST_F(EnvTest, TestOpenNonExistentFile) {
- // Write some test data to a single file that will be opened |n| times.
- std::string test_dir;
- ASSERT_LEVELDB_OK(env_->GetTestDirectory(&test_dir));
-
- std::string non_existent_file = test_dir + "/non_existent_file";
- ASSERT_TRUE(!env_->FileExists(non_existent_file));
-
- RandomAccessFile* random_access_file;
- Status status =
- env_->NewRandomAccessFile(non_existent_file, &random_access_file);
- #if defined(LEVELDB_PLATFORM_CHROMIUM)
- // TODO(crbug.com/760362): See comment in MakeIOError() from env_chromium.cc.
- ASSERT_TRUE(status.IsIOError());
- #else
- ASSERT_TRUE(status.IsNotFound());
- #endif // defined(LEVELDB_PLATFORM_CHROMIUM)
-
- SequentialFile* sequential_file;
- status = env_->NewSequentialFile(non_existent_file, &sequential_file);
- #if defined(LEVELDB_PLATFORM_CHROMIUM)
- // TODO(crbug.com/760362): See comment in MakeIOError() from env_chromium.cc.
- ASSERT_TRUE(status.IsIOError());
- #else
- ASSERT_TRUE(status.IsNotFound());
- #endif // defined(LEVELDB_PLATFORM_CHROMIUM)
- }
-
- TEST_F(EnvTest, ReopenWritableFile) {
- std::string test_dir;
- ASSERT_LEVELDB_OK(env_->GetTestDirectory(&test_dir));
- std::string test_file_name = test_dir + "/reopen_writable_file.txt";
- env_->RemoveFile(test_file_name);
-
- WritableFile* writable_file;
- ASSERT_LEVELDB_OK(env_->NewWritableFile(test_file_name, &writable_file));
- std::string data("hello world!");
- ASSERT_LEVELDB_OK(writable_file->Append(data));
- ASSERT_LEVELDB_OK(writable_file->Close());
- delete writable_file;
-
- ASSERT_LEVELDB_OK(env_->NewWritableFile(test_file_name, &writable_file));
- data = "42";
- ASSERT_LEVELDB_OK(writable_file->Append(data));
- ASSERT_LEVELDB_OK(writable_file->Close());
- delete writable_file;
-
- ASSERT_LEVELDB_OK(ReadFileToString(env_, test_file_name, &data));
- ASSERT_EQ(std::string("42"), data);
- env_->RemoveFile(test_file_name);
- }
-
- TEST_F(EnvTest, ReopenAppendableFile) {
- std::string test_dir;
- ASSERT_LEVELDB_OK(env_->GetTestDirectory(&test_dir));
- std::string test_file_name = test_dir + "/reopen_appendable_file.txt";
- env_->RemoveFile(test_file_name);
-
- WritableFile* appendable_file;
- ASSERT_LEVELDB_OK(env_->NewAppendableFile(test_file_name, &appendable_file));
- std::string data("hello world!");
- ASSERT_LEVELDB_OK(appendable_file->Append(data));
- ASSERT_LEVELDB_OK(appendable_file->Close());
- delete appendable_file;
-
- ASSERT_LEVELDB_OK(env_->NewAppendableFile(test_file_name, &appendable_file));
- data = "42";
- ASSERT_LEVELDB_OK(appendable_file->Append(data));
- ASSERT_LEVELDB_OK(appendable_file->Close());
- delete appendable_file;
-
- ASSERT_LEVELDB_OK(ReadFileToString(env_, test_file_name, &data));
- ASSERT_EQ(std::string("hello world!42"), data);
- env_->RemoveFile(test_file_name);
- }
-
- } // namespace leveldb
|