Skip to content

Commit ddef684

Browse files
igorcanadiigorcanadi
committed
Renamed InfoLogLevel::DEBUG to InfoLogLevel::DEBUG_LEVEL
Summary: XCode for some reason injects `#define DEBUG 1` into our code, which makes compile fail because we use `DEBUG` keyword for other stuff. This diff fixes the issue by renaming `DEBUG` to `DEBUG_LEVEL`. Test Plan: compiles Reviewers: dhruba, haobo, sdong, yhchiang, ljin Reviewed By: yhchiang CC: leveldb Differential Revision: https://reviews.facebook.net/D17709
1 parent 75b59d5 commit ddef684

9 files changed

+41
-36
lines changed

‎HISTORY.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# Rocksdb Change Log
22

33
## Unreleased (will be released in 3.0)
4+
5+
### Public API changes
6+
* Added _LEVEL to all InfoLogLevel enums
7+
8+
### New Features
49
* Column family support
510

611
### Public API changes

‎db/db_impl.cc

+3-3
Original file line numberDiff line numberDiff line change
@@ -1963,7 +1963,7 @@ void DBImpl::BackgroundCallFlush() {
19631963
DeletionState deletion_state(true);
19641964
assert(bg_flush_scheduled_);
19651965

1966-
LogBuffer log_buffer(INFO, options_.info_log.get());
1966+
LogBuffer log_buffer(InfoLogLevel::INFO_LEVEL, options_.info_log.get());
19671967
{
19681968
MutexLock l(&mutex_);
19691969

@@ -2040,7 +2040,7 @@ void DBImpl::BackgroundCallCompaction() {
20402040
DeletionState deletion_state(true);
20412041

20422042
MaybeDumpStats();
2043-
LogBuffer log_buffer(INFO, options_.info_log.get());
2043+
LogBuffer log_buffer(InfoLogLevel::INFO_LEVEL, options_.info_log.get());
20442044
{
20452045
MutexLock l(&mutex_);
20462046
// Log(options_.info_log, "XXX BG Thread %llx process new work item",
@@ -2230,7 +2230,7 @@ Status DBImpl::BackgroundCompaction(bool* madeProgress,
22302230
} else if (shutting_down_.Acquire_Load()) {
22312231
// Ignore compaction errors found during shutting down
22322232
} else {
2233-
Log(WARN, options_.info_log, "Compaction error: %s",
2233+
Log(InfoLogLevel::WARN_LEVEL, options_.info_log, "Compaction error: %s",
22342234
status.ToString().c_str());
22352235
if (options_.paranoid_checks && bg_error_.ok()) {
22362236
bg_error_ = status;

‎include/rocksdb/env.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -535,19 +535,19 @@ class Directory {
535535
};
536536

537537
enum InfoLogLevel : unsigned char {
538-
DEBUG = 0,
539-
INFO,
540-
WARN,
541-
ERROR,
542-
FATAL,
538+
DEBUG_LEVEL = 0,
539+
INFO_LEVEL,
540+
WARN_LEVEL,
541+
ERROR_LEVEL,
542+
FATAL_LEVEL,
543543
NUM_INFO_LOG_LEVELS,
544544
};
545545

546546
// An interface for writing log messages.
547547
class Logger {
548548
public:
549549
enum { DO_NOT_SUPPORT_GET_LOG_FILE_SIZE = -1 };
550-
explicit Logger(const InfoLogLevel log_level = InfoLogLevel::INFO)
550+
explicit Logger(const InfoLogLevel log_level = InfoLogLevel::INFO_LEVEL)
551551
: log_level_(log_level) {}
552552
virtual ~Logger();
553553

@@ -565,7 +565,7 @@ class Logger {
565565
return;
566566
}
567567

568-
if (log_level == INFO) {
568+
if (log_level == InfoLogLevel::INFO_LEVEL) {
569569
// Doesn't print log level if it is INFO level.
570570
// This is to avoid unexpected performance regression after we add
571571
// the feature of log level. All the logs before we add the feature

‎util/auto_roll_logger.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class AutoRollLogger : public Logger {
1919
AutoRollLogger(Env* env, const std::string& dbname,
2020
const std::string& db_log_dir, size_t log_max_size,
2121
size_t log_file_time_to_roll,
22-
const InfoLogLevel log_level = InfoLogLevel::INFO)
22+
const InfoLogLevel log_level = InfoLogLevel::INFO_LEVEL)
2323
: Logger(log_level),
2424
dbname_(dbname),
2525
db_log_dir_(db_log_dir),

‎util/auto_roll_logger_test.cc

+9-9
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void GetFileCreateTime(const std::string& fname, uint64_t* file_ctime) {
7474
void AutoRollLoggerTest::RollLogFileBySizeTest(AutoRollLogger* logger,
7575
size_t log_max_size,
7676
const string& log_message) {
77-
logger->SetInfoLogLevel(InfoLogLevel::INFO);
77+
logger->SetInfoLogLevel(InfoLogLevel::INFO_LEVEL);
7878
// measure the size of each message, which is supposed
7979
// to be equal or greater than log_message.size()
8080
LogMessage(logger, log_message.c_str());
@@ -254,19 +254,19 @@ TEST(AutoRollLoggerTest, InfoLogLevel) {
254254
// becomes out of scope.
255255
{
256256
AutoRollLogger logger(Env::Default(), kTestDir, "", log_size, 0);
257-
for (int log_level = InfoLogLevel::FATAL; log_level >= InfoLogLevel::DEBUG;
258-
log_level--) {
257+
for (int log_level = InfoLogLevel::FATAL_LEVEL;
258+
log_level >= InfoLogLevel::DEBUG_LEVEL; log_level--) {
259259
logger.SetInfoLogLevel((InfoLogLevel)log_level);
260-
for (int log_type = InfoLogLevel::DEBUG; log_type <= InfoLogLevel::FATAL;
261-
log_type++) {
260+
for (int log_type = InfoLogLevel::DEBUG_LEVEL;
261+
log_type <= InfoLogLevel::FATAL_LEVEL; log_type++) {
262262
// log messages with log level smaller than log_level will not be
263263
// logged.
264264
LogMessage((InfoLogLevel)log_type, &logger, kSampleMessage.c_str());
265265
}
266-
log_lines += InfoLogLevel::FATAL - log_level + 1;
266+
log_lines += InfoLogLevel::FATAL_LEVEL - log_level + 1;
267267
}
268-
for (int log_level = InfoLogLevel::FATAL; log_level >= InfoLogLevel::DEBUG;
269-
log_level--) {
268+
for (int log_level = InfoLogLevel::FATAL_LEVEL;
269+
log_level >= InfoLogLevel::DEBUG_LEVEL; log_level--) {
270270
logger.SetInfoLogLevel((InfoLogLevel)log_level);
271271

272272
// again, messages with level smaller than log_level will not be logged.
@@ -275,7 +275,7 @@ TEST(AutoRollLoggerTest, InfoLogLevel) {
275275
Warn(&logger, "%s", kSampleMessage.c_str());
276276
Error(&logger, "%s", kSampleMessage.c_str());
277277
Fatal(&logger, "%s", kSampleMessage.c_str());
278-
log_lines += InfoLogLevel::FATAL - log_level + 1;
278+
log_lines += InfoLogLevel::FATAL_LEVEL - log_level + 1;
279279
}
280280
}
281281
std::ifstream inFile(AutoRollLoggerTest::kLogFile.c_str());

‎util/env.cc

+12-12
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void Log(Logger* info_log, const char* format, ...) {
4444
if (info_log) {
4545
va_list ap;
4646
va_start(ap, format);
47-
info_log->Logv(InfoLogLevel::INFO, format, ap);
47+
info_log->Logv(InfoLogLevel::INFO_LEVEL, format, ap);
4848
va_end(ap);
4949
}
5050
}
@@ -63,7 +63,7 @@ void Debug(Logger* info_log, const char* format, ...) {
6363
if (info_log) {
6464
va_list ap;
6565
va_start(ap, format);
66-
info_log->Logv(InfoLogLevel::DEBUG, format, ap);
66+
info_log->Logv(InfoLogLevel::DEBUG_LEVEL, format, ap);
6767
va_end(ap);
6868
}
6969
}
@@ -72,7 +72,7 @@ void Info(Logger* info_log, const char* format, ...) {
7272
if (info_log) {
7373
va_list ap;
7474
va_start(ap, format);
75-
info_log->Logv(InfoLogLevel::INFO, format, ap);
75+
info_log->Logv(InfoLogLevel::INFO_LEVEL, format, ap);
7676
va_end(ap);
7777
}
7878
}
@@ -81,23 +81,23 @@ void Warn(Logger* info_log, const char* format, ...) {
8181
if (info_log) {
8282
va_list ap;
8383
va_start(ap, format);
84-
info_log->Logv(InfoLogLevel::WARN, format, ap);
84+
info_log->Logv(InfoLogLevel::WARN_LEVEL, format, ap);
8585
va_end(ap);
8686
}
8787
}
8888
void Error(Logger* info_log, const char* format, ...) {
8989
if (info_log) {
9090
va_list ap;
9191
va_start(ap, format);
92-
info_log->Logv(InfoLogLevel::ERROR, format, ap);
92+
info_log->Logv(InfoLogLevel::ERROR_LEVEL, format, ap);
9393
va_end(ap);
9494
}
9595
}
9696
void Fatal(Logger* info_log, const char* format, ...) {
9797
if (info_log) {
9898
va_list ap;
9999
va_start(ap, format);
100-
info_log->Logv(InfoLogLevel::FATAL, format, ap);
100+
info_log->Logv(InfoLogLevel::FATAL_LEVEL, format, ap);
101101
va_end(ap);
102102
}
103103
}
@@ -122,7 +122,7 @@ void Debug(const shared_ptr<Logger>& info_log, const char* format, ...) {
122122
if (info_log) {
123123
va_list ap;
124124
va_start(ap, format);
125-
info_log->Logv(InfoLogLevel::DEBUG, format, ap);
125+
info_log->Logv(InfoLogLevel::DEBUG_LEVEL, format, ap);
126126
va_end(ap);
127127
}
128128
}
@@ -131,7 +131,7 @@ void Info(const shared_ptr<Logger>& info_log, const char* format, ...) {
131131
if (info_log) {
132132
va_list ap;
133133
va_start(ap, format);
134-
info_log->Logv(InfoLogLevel::INFO, format, ap);
134+
info_log->Logv(InfoLogLevel::INFO_LEVEL, format, ap);
135135
va_end(ap);
136136
}
137137
}
@@ -140,7 +140,7 @@ void Warn(const shared_ptr<Logger>& info_log, const char* format, ...) {
140140
if (info_log) {
141141
va_list ap;
142142
va_start(ap, format);
143-
info_log->Logv(InfoLogLevel::WARN, format, ap);
143+
info_log->Logv(InfoLogLevel::WARN_LEVEL, format, ap);
144144
va_end(ap);
145145
}
146146
}
@@ -149,7 +149,7 @@ void Error(const shared_ptr<Logger>& info_log, const char* format, ...) {
149149
if (info_log) {
150150
va_list ap;
151151
va_start(ap, format);
152-
info_log->Logv(InfoLogLevel::ERROR, format, ap);
152+
info_log->Logv(InfoLogLevel::ERROR_LEVEL, format, ap);
153153
va_end(ap);
154154
}
155155
}
@@ -158,7 +158,7 @@ void Fatal(const shared_ptr<Logger>& info_log, const char* format, ...) {
158158
if (info_log) {
159159
va_list ap;
160160
va_start(ap, format);
161-
info_log->Logv(InfoLogLevel::FATAL, format, ap);
161+
info_log->Logv(InfoLogLevel::FATAL_LEVEL, format, ap);
162162
va_end(ap);
163163
}
164164
}
@@ -167,7 +167,7 @@ void Log(const shared_ptr<Logger>& info_log, const char* format, ...) {
167167
if (info_log) {
168168
va_list ap;
169169
va_start(ap, format);
170-
info_log->Logv(InfoLogLevel::INFO, format, ap);
170+
info_log->Logv(InfoLogLevel::INFO_LEVEL, format, ap);
171171
va_end(ap);
172172
}
173173
}

‎util/env_test.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ TEST(EnvPosixTest, LogBufferTest) {
510510
test_logger.char_x_count = 0;
511511
test_logger.char_0_count = 0;
512512
LogBuffer log_buffer(INFO, &test_logger);
513-
LogBuffer log_buffer_debug(DEBUG, &test_logger);
513+
LogBuffer log_buffer_debug(DEBUG_LEVEL, &test_logger);
514514

515515
char bytes200[200];
516516
std::fill_n(bytes200, sizeof(bytes200), '1');
@@ -529,7 +529,7 @@ TEST(EnvPosixTest, LogBufferTest) {
529529
LogToBuffer(&log_buffer, "x%sx%sx", bytes600, bytes9000);
530530

531531
LogToBuffer(&log_buffer_debug, "x%sx", bytes200);
532-
test_logger.SetInfoLogLevel(DEBUG);
532+
test_logger.SetInfoLogLevel(DEBUG_LEVEL);
533533
LogToBuffer(&log_buffer_debug, "x%sx%sx%sx", bytes600, bytes9000, bytes200);
534534

535535
ASSERT_EQ(0, test_logger.log_count);

‎util/options.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ DBOptions::DBOptions()
156156
paranoid_checks(true),
157157
env(Env::Default()),
158158
info_log(nullptr),
159-
info_log_level(INFO),
159+
info_log_level(INFO_LEVEL),
160160
max_open_files(5000),
161161
statistics(nullptr),
162162
disableDataSync(false),

‎util/posix_logger.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class PosixLogger : public Logger {
3939
bool flush_pending_;
4040
public:
4141
PosixLogger(FILE* f, uint64_t (*gettid)(), Env* env,
42-
const InfoLogLevel log_level = InfoLogLevel::ERROR)
42+
const InfoLogLevel log_level = InfoLogLevel::ERROR_LEVEL)
4343
: Logger(log_level),
4444
file_(f),
4545
gettid_(gettid),

0 commit comments

Comments
 (0)