db/db_impl.cc: fix object handling, remove double lines

dalgaaf · dalgaaf · commit 33580fa39a0a · 2014-09-30T23:30:32.000+02:00
Fix for:

[db/db_impl.cc:4039]: (error) Instance of 'StopWatch' object is
 destroyed immediately.
[db/db_impl.cc:4042]: (error) Instance of 'StopWatch' object is
 destroyed immediately.

Signed-off-by: Danny Al-Gaaf &lt;danny.al-gaaf@bisect.de&gt;
diff --git a/db/db_impl.cc b/db/db_impl.cc
@@ -4037,11 +4037,10 @@ Status DBImpl::Write(const WriteOptions& options, WriteBatch* my_batch) {
         RecordTick(stats_, WAL_FILE_BYTES, log_size);
         if (status.ok() && options.sync) {
           RecordTick(stats_, WAL_FILE_SYNCED);
+          StopWatch sw(env_, stats_, WAL_FILE_SYNC_MICROS);
           if (db_options_.use_fsync) {
-            StopWatch(env_, stats_, WAL_FILE_SYNC_MICROS);
             status = log_->file()->Fsync();
           } else {
-            StopWatch(env_, stats_, WAL_FILE_SYNC_MICROS);
             status = log_->file()->Sync();
           }
         }

Original file line number	Diff line number	Diff line change
`@@ -4037,11 +4037,10 @@ Status DBImpl::Write(const WriteOptions& options, WriteBatch* my_batch) {`
`4037`	`4037`	`RecordTick(stats_, WAL_FILE_BYTES, log_size);`
`4038`	`4038`	`if (status.ok() && options.sync) {`
`4039`	`4039`	`RecordTick(stats_, WAL_FILE_SYNCED);`
	`4040`	`+ StopWatch sw(env_, stats_, WAL_FILE_SYNC_MICROS);`
`4040`	`4041`	`if (db_options_.use_fsync) {`
`4041`		`- StopWatch(env_, stats_, WAL_FILE_SYNC_MICROS);`
`4042`	`4042`	`status = log_->file()->Fsync();`
`4043`	`4043`	`} else {`
`4044`		`- StopWatch(env_, stats_, WAL_FILE_SYNC_MICROS);`
`4045`	`4044`	`status = log_->file()->Sync();`
`4046`	`4045`	`}`
`4047`	`4046`	`}`