Add SqliteConnectionSafe.cpp.

GitOrigin-RevId: 6e56f276c9467383c1eaa462ee7eb3530fafca55
paul-mais · Oct 3, 2019 · c63144f · c63144f
1 parent 0167d9c
commit c63144f
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 34 deletions.
diff --git a/tddb/CMakeLists.txt b/tddb/CMakeLists.txt
@@ -8,17 +8,18 @@ set(TDDB_SOURCE
   td/db/binlog/detail/BinlogEventsBuffer.cpp
   td/db/binlog/detail/BinlogEventsProcessor.cpp
 
+  td/db/SqliteConnectionSafe.cpp
   td/db/SqliteDb.cpp
-  td/db/SqliteStatement.cpp
   td/db/SqliteKeyValue.cpp
   td/db/SqliteKeyValueAsync.cpp
+  td/db/SqliteStatement.cpp
 
   td/db/detail/RawSqliteDb.cpp
 
   td/db/binlog/Binlog.h
-  td/db/binlog/BinlogInterface.h
   td/db/binlog/BinlogEvent.h
   td/db/binlog/BinlogHelper.h
+  td/db/binlog/BinlogInterface.h
   td/db/binlog/ConcurrentBinlog.h
   td/db/binlog/detail/BinlogEventsBuffer.h
   td/db/binlog/detail/BinlogEventsProcessor.h

diff --git a/tddb/td/db/SqliteConnectionSafe.cpp b/tddb/td/db/SqliteConnectionSafe.cpp
@@ -0,0 +1,45 @@
+//
+// Copyright Aliaksei Levin ([email protected]), Arseny Smirnov ([email protected]) 2014-2019
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+#include "td/db/SqliteConnectionSafe.h"
+
+#include "td/utils/common.h"
+#include "td/utils/format.h"
+#include "td/utils/logging.h"
+
+namespace td {
+
+SqliteConnectionSafe::SqliteConnectionSafe(string name, DbKey key)
+    : name_(std::move(name)), lsls_connection_([name = name_, key = std::move(key)] {
+      auto r_db = SqliteDb::open_with_key(name, key);
+      if (r_db.is_error()) {
+        LOG(FATAL) << "Can't open database " << name << ": " << r_db.error();
+      }
+      auto db = r_db.move_as_ok();
+      db.exec("PRAGMA synchronous=NORMAL").ensure();
+      db.exec("PRAGMA temp_store=MEMORY").ensure();
+      db.exec("PRAGMA secure_delete=1").ensure();
+      db.exec("PRAGMA recursive_triggers=1").ensure();
+      return db;
+    }) {
+}
+
+SqliteDb &SqliteConnectionSafe::get() {
+  return lsls_connection_.get();
+}
+
+void SqliteConnectionSafe::close() {
+  LOG(INFO) << "Close SQLite database " << tag("path", name_);
+  lsls_connection_.clear_values();
+}
+
+void SqliteConnectionSafe::close_and_destroy() {
+  close();
+  LOG(INFO) << "Destroy SQLite database " << tag("path", name_);
+  SqliteDb::destroy(name_).ignore();
+}
+
+}  // namespace td
diff --git a/tddb/td/db/SqliteConnectionSafe.h b/tddb/td/db/SqliteConnectionSafe.h
@@ -8,50 +8,27 @@
 
 #include "td/actor/SchedulerLocalStorage.h"
 
+#include "td/db/DbKey.h"
 #include "td/db/SqliteDb.h"
 
 #include "td/utils/common.h"
-#include "td/utils/format.h"
-#include "td/utils/logging.h"
 
 namespace td {
 
 class SqliteConnectionSafe {
  public:
   SqliteConnectionSafe() = default;
-  explicit SqliteConnectionSafe(string name, DbKey key = DbKey::empty())
-      : lsls_connection_([name = name, key = std::move(key)] {
-        auto r_db = SqliteDb::open_with_key(name, key);
-        if (r_db.is_error()) {
-          LOG(FATAL) << "Can't open database " << name << ": " << r_db.error();
-        }
-        auto db = r_db.move_as_ok();
-        db.exec("PRAGMA synchronous=NORMAL").ensure();
-        db.exec("PRAGMA temp_store=MEMORY").ensure();
-        db.exec("PRAGMA secure_delete=1").ensure();
-        db.exec("PRAGMA recursive_triggers=1").ensure();
-        return db;
-      })
-      , name_(std::move(name)) {
-  }
-
-  SqliteDb &get() {
-    return lsls_connection_.get();
-  }
-
-  void close() {
-    LOG(INFO) << "Close SQLite database " << tag("path", name_);
-    lsls_connection_.clear_values();
-  }
-  void close_and_destroy() {
-    close();
-    LOG(INFO) << "Destroy SQLite database " << tag("path", name_);
-    SqliteDb::destroy(name_).ignore();
-  }
+  explicit SqliteConnectionSafe(string name, DbKey key = DbKey::empty());
+
+  SqliteDb &get();
+
+  void close();
+
+  void close_and_destroy();
 
  private:
-  LazySchedulerLocalStorage<SqliteDb> lsls_connection_;
   string name_;
+  LazySchedulerLocalStorage<SqliteDb> lsls_connection_;
 };
 
 }  // namespace td