andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Correct pragma once problem with Bazel on Windows (#6321)

Browse Source 
Summary:
This is a simple edit to have two #include file paths be consistent within range_del_aggregator.{h,cc} with everywhere else.

The impact of this inconsistency is that it actual breaks a Bazel based build on the Windows platform. The same pragma once failure occurs with both Windows Visual C++ 2019 and clang for Windows 9.0. Bazel's "sandboxing" of the builds causes both compilers to not properly recognize "rocksdb/types.h" and "include/rocksdb/types.h" to be the same file (also comparator.h). My guess is that the backslash versus forward slash mixing within path names is the underlying issue.

But, everything builds fine once the include paths in these two source files are consistent with the rest of the repository.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/6321

Differential Revision: D19506585

Pulled By: ltamasi

fbshipit-source-id: 294c346607edc433ab99eaabc9c880ee7426817a
This commit is contained in:
matthewvon 2020-01-21 16:11:08 -08:00 committed by Facebook Github Bot
parent d305f13e21
commit e6e8b9e871
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/range_del_aggregator.cc
View File

@ -11,8 +11,8 @@
#include "db/range_del_aggregator.h"
#include "db/range_tombstone_fragmenter.h"
#include "db/version_edit.h"
#include "include/rocksdb/comparator.h"
#include "include/rocksdb/types.h"
#include "rocksdb/comparator.h"
#include "rocksdb/types.h"
#include "table/internal_iterator.h"
#include "table/scoped_arena_iterator.h"
#include "table/table_builder.h"

4
db/range_del_aggregator.h
View File

@ -19,8 +19,8 @@
#include "db/range_del_aggregator.h"
#include "db/range_tombstone_fragmenter.h"
#include "db/version_edit.h"
#include "include/rocksdb/comparator.h"
#include "include/rocksdb/types.h"
#include "rocksdb/comparator.h"
#include "rocksdb/types.h"
#include "table/internal_iterator.h"
#include "table/scoped_arena_iterator.h"
#include "table/table_builder.h"

2
utilities/persistent_cache/block_cache_tier_file_buffer.h
View File

@ -8,7 +8,7 @@
#include <memory>
#include <string>
#include "include/rocksdb/comparator.h"
#include "rocksdb/comparator.h"
#include "memory/arena.h"
#include "util/mutexlock.h"

2
utilities/persistent_cache/hash_table.h
View File

@ -15,7 +15,7 @@
#include <sys/mman.h>
#endif
#include "include/rocksdb/env.h"
#include "rocksdb/env.h"
#include "util/mutexlock.h"
namespace rocksdb {