diff options
| author | Igor Canadi <icanadi@fb.com> | 2014-10-15 10:57:43 -0700 |
|---|---|---|
| committer | Igor Canadi <icanadi@fb.com> | 2014-10-15 10:57:43 -0700 |
| commit | f92646cef2a6cf133ba4f0f70e7554227a2532a0 (patch) | |
| tree | 6bb002d254fc21fe236ccfc90b395bb8a563a46e | |
| parent | 1d525891bdf06b7dbc0d5f18e3981f2af9d686ef (diff) | |
Move logging outside of mutexrocksdb-3.6.1
| -rw-r--r-- | db/db_impl.cc | 6 | ||||
| -rw-r--r-- | include/rocksdb/version.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/db/db_impl.cc b/db/db_impl.cc index 5abfb4ac2..383e2f669 100644 --- a/db/db_impl.cc +++ b/db/db_impl.cc @@ -4232,6 +4232,9 @@ Status DBImpl::SetNewMemtableAndNewLogFile(ColumnFamilyData* cfd, new_superversion = new SuperVersion(); } } + Log(db_options_.info_log, + "[%s] New memtable created with log file: #%" PRIu64 "\n", + cfd->GetName().c_str(), new_log_number); mutex_.Lock(); if (!s.ok()) { // how do we fail if we're not creating new log? @@ -4264,9 +4267,6 @@ Status DBImpl::SetNewMemtableAndNewLogFile(ColumnFamilyData* cfd, cfd->imm()->Add(cfd->mem()); new_mem->Ref(); cfd->SetMemtable(new_mem); - Log(db_options_.info_log, - "[%s] New memtable created with log file: #%" PRIu64 "\n", - cfd->GetName().c_str(), logfile_number_); context->superversions_to_free_.push_back( cfd->InstallSuperVersion(new_superversion, &mutex_, mutable_cf_options)); return s; diff --git a/include/rocksdb/version.h b/include/rocksdb/version.h index 285278854..84ece982a 100644 --- a/include/rocksdb/version.h +++ b/include/rocksdb/version.h @@ -6,7 +6,7 @@ #define ROCKSDB_MAJOR 3 #define ROCKSDB_MINOR 6 -#define ROCKSDB_PATCH 0 +#define ROCKSDB_PATCH 1 // Do not use these. We made the mistake of declaring macros starting with // double underscore. Now we have to live with our choice. We'll deprecate these |