From 0987c72c9d11b94524e1dc91150daf273c5b2537 Mon Sep 17 00:00:00 2001
From: Kevin James Matzen <kmatzen@cs.cornell.edu>
Date: Sun, 12 Oct 2014 21:39:33 -0400
Subject: [PATCH] Switched some Database logging statements from LOG to DLOG.

---
 src/caffe/leveldb_database.cpp | 23 ++++++++++-------------
 src/caffe/lmdb_database.cpp    | 12 ++++++------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/caffe/leveldb_database.cpp b/src/caffe/leveldb_database.cpp
index ad98f9e..a163abc 100644
--- a/src/caffe/leveldb_database.cpp
+++ b/src/caffe/leveldb_database.cpp
@@ -7,30 +7,30 @@
 namespace caffe {
 
 bool LeveldbDatabase::open(const string& filename, Mode mode) {
-  LOG(INFO) << "LevelDB: Open " << filename;
+  DLOG(INFO) << "LevelDB: Open " << filename;
 
   leveldb::Options options;
   switch (mode) {
   case New:
-    LOG(INFO) << " mode NEW";
+    DLOG(INFO) << " mode NEW";
     options.error_if_exists = true;
     options.create_if_missing = true;
     read_only_ = false;
     break;
   case ReadWrite:
-    LOG(INFO) << " mode RW";
+    DLOG(INFO) << " mode RW";
     options.error_if_exists = false;
     options.create_if_missing = true;
     read_only_ = false;
     break;
   case ReadOnly:
-    LOG(INFO) << " mode RO";
+    DLOG(INFO) << " mode RO";
     options.error_if_exists = false;
     options.create_if_missing = false;
     read_only_ = true;
     break;
   default:
-    LOG(FATAL) << "unknown mode " << mode;
+    DLOG(FATAL) << "unknown mode " << mode;
   }
   options.write_buffer_size = 268435456;
   options.max_open_files = 100;
@@ -53,7 +53,7 @@ bool LeveldbDatabase::open(const string& filename, Mode mode) {
 }
 
 bool LeveldbDatabase::put(const key_type& key, const value_type& value) {
-  LOG(INFO) << "LevelDB: Put";
+  DLOG(INFO) << "LevelDB: Put";
 
   if (read_only_) {
     LOG(ERROR) << "put can not be used on a database in ReadOnly mode";
@@ -71,7 +71,7 @@ bool LeveldbDatabase::put(const key_type& key, const value_type& value) {
 }
 
 bool LeveldbDatabase::get(const key_type& key, value_type* value) {
-  LOG(INFO) << "LevelDB: Get";
+  DLOG(INFO) << "LevelDB: Get";
 
   leveldb::Slice key_slice(key.data(), key.size());
 
@@ -92,7 +92,7 @@ bool LeveldbDatabase::get(const key_type& key, value_type* value) {
 }
 
 bool LeveldbDatabase::commit() {
-  LOG(INFO) << "LevelDB: Commit";
+  DLOG(INFO) << "LevelDB: Commit";
 
   if (read_only_) {
     LOG(ERROR) << "commit can not be used on a database in ReadOnly mode";
@@ -110,18 +110,17 @@ bool LeveldbDatabase::commit() {
 }
 
 void LeveldbDatabase::close() {
-  LOG(INFO) << "LevelDB: Close";
+  DLOG(INFO) << "LevelDB: Close";
 
   batch_.reset();
   db_.reset();
 }
 
 void LeveldbDatabase::keys(vector<key_type>* keys) {
-  LOG(INFO) << "LevelDB: Keys";
+  DLOG(INFO) << "LevelDB: Keys";
 
   keys->clear();
   for (Database::const_iterator iter = begin(); iter != end(); ++iter) {
-    LOG(INFO) << "KEY";
     keys->push_back(iter->key);
   }
 }
@@ -160,8 +159,6 @@ bool LeveldbDatabase::equal(shared_ptr<DatabaseState> state1,
   shared_ptr<LeveldbState> leveldb_state2 =
       boost::dynamic_pointer_cast<LeveldbState>(state2);
 
-  LOG(INFO) << leveldb_state1 << " " << leveldb_state2;
-
   // The KV store doesn't really have any sort of ordering,
   // so while we can do a sequential scan over the collection,
   // we can't really use subranges.
diff --git a/src/caffe/lmdb_database.cpp b/src/caffe/lmdb_database.cpp
index aabb733..de94391 100644
--- a/src/caffe/lmdb_database.cpp
+++ b/src/caffe/lmdb_database.cpp
@@ -9,7 +9,7 @@
 namespace caffe {
 
 bool LmdbDatabase::open(const string& filename, Mode mode) {
-  LOG(INFO) << "LMDB: Open " << filename;
+  DLOG(INFO) << "LMDB: Open " << filename;
 
   CHECK(NULL == env_);
   CHECK(NULL == txn_);
@@ -79,7 +79,7 @@ bool LmdbDatabase::open(const string& filename, Mode mode) {
 }
 
 bool LmdbDatabase::put(const key_type& key, const value_type& value) {
-  LOG(INFO) << "LMDB: Put";
+  DLOG(INFO) << "LMDB: Put";
 
   // MDB_val::mv_size is not const, so we need to make a local copy.
   key_type local_key = key;
@@ -104,7 +104,7 @@ bool LmdbDatabase::put(const key_type& key, const value_type& value) {
 }
 
 bool LmdbDatabase::get(const key_type& key, value_type* value) {
-  LOG(INFO) << "LMDB: Get";
+  DLOG(INFO) << "LMDB: Get";
 
   key_type local_key = key;
 
@@ -137,7 +137,7 @@ bool LmdbDatabase::get(const key_type& key, value_type* value) {
 }
 
 bool LmdbDatabase::commit() {
-  LOG(INFO) << "LMDB: Commit";
+  DLOG(INFO) << "LMDB: Commit";
 
   CHECK_NOTNULL(txn_);
 
@@ -158,7 +158,7 @@ bool LmdbDatabase::commit() {
 }
 
 void LmdbDatabase::close() {
-  LOG(INFO) << "LMDB: Close";
+  DLOG(INFO) << "LMDB: Close";
 
   if (env_ && dbi_) {
     mdb_close(env_, dbi_);
@@ -170,7 +170,7 @@ void LmdbDatabase::close() {
 }
 
 void LmdbDatabase::keys(vector<key_type>* keys) {
-  LOG(INFO) << "LMDB: Keys";
+  DLOG(INFO) << "LMDB: Keys";
 
   keys->clear();
   for (Database::const_iterator iter = begin(); iter != end(); ++iter) {
-- 
2.7.4