You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

65 rivejä
2.0 KiB

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
5 vuotta sitten
  1. // Copyright (c) 2018 The LevelDB Authors. All rights reserved.
  2. // Use of this source code is governed by a BSD-style license that can be
  3. // found in the LICENSE file. See the AUTHORS file for names of contributors.
  4. #include "gtest/gtest.h"
  5. #include "leveldb/env.h"
  6. #include "port/port.h"
  7. #include "util/env_windows_test_helper.h"
  8. #include "util/testutil.h"
  9. namespace leveldb {
  10. static const int kMMapLimit = 4;
  11. class EnvWindowsTest : public testing::Test {
  12. public:
  13. static void SetFileLimits(int mmap_limit) {
  14. EnvWindowsTestHelper::SetReadOnlyMMapLimit(mmap_limit);
  15. }
  16. EnvWindowsTest() : env_(Env::Default()) {}
  17. Env* env_;
  18. };
  19. TEST_F(EnvWindowsTest, TestOpenOnRead) {
  20. // Write some test data to a single file that will be opened |n| times.
  21. std::string test_dir;
  22. ASSERT_LEVELDB_OK(env_->GetTestDirectory(&test_dir));
  23. std::string test_file = test_dir + "/open_on_read.txt";
  24. FILE* f = std::fopen(test_file.c_str(), "w");
  25. ASSERT_TRUE(f != nullptr);
  26. const char kFileData[] = "abcdefghijklmnopqrstuvwxyz";
  27. fputs(kFileData, f);
  28. std::fclose(f);
  29. // Open test file some number above the sum of the two limits to force
  30. // leveldb::WindowsEnv to switch from mapping the file into memory
  31. // to basic file reading.
  32. const int kNumFiles = kMMapLimit + 5;
  33. leveldb::RandomAccessFile* files[kNumFiles] = {0};
  34. for (int i = 0; i < kNumFiles; i++) {
  35. ASSERT_LEVELDB_OK(env_->NewRandomAccessFile(test_file, &files[i]));
  36. }
  37. char scratch;
  38. Slice read_result;
  39. for (int i = 0; i < kNumFiles; i++) {
  40. ASSERT_LEVELDB_OK(files[i]->Read(i, 1, &read_result, &scratch));
  41. ASSERT_EQ(kFileData[i], read_result[0]);
  42. }
  43. for (int i = 0; i < kNumFiles; i++) {
  44. delete files[i];
  45. }
  46. ASSERT_LEVELDB_OK(env_->RemoveFile(test_file));
  47. }
  48. } // namespace leveldb
  49. int main(int argc, char** argv) {
  50. // All tests currently run with the same read-only file limits.
  51. leveldb::EnvWindowsTest::SetFileLimits(leveldb::kMMapLimit);
  52. testing::InitGoogleTest(&argc, argv);
  53. return RUN_ALL_TESTS();
  54. }