Merge pull request #1551 from Expensify/cole_use_pool

Use a handle from the existing pool instead of a new one

sqlitecluster/SQLiteNode.cpp

@@ -129,11 +129,7 @@ SQLiteNode::SQLiteNode(SQLiteServer& server, shared_ptr<SQLitePool> dbPool, cons
 {
     SASSERT(_originalPriority >= 0);
     onPrepareHandlerEnabled = false;
-
-    // We create a copy of the database handle here so that the sync node can operate on its handle and the plugin gets
-    // its own handle to operate on. This avoids conflicts where the sync thread and the plugin are trying to both run
-    // queries at the same time. This also avoids the need to create any share locking between the two.
-    pluginDB = new SQLite(_db);
+
     SINFO("[NOTIFY] setting commit count to: " << _db.getCommitCount());
     _localCommitNotifier.notifyThrough(_db.getCommitCount());
 
@@ -154,10 +150,6 @@ SQLiteNode::~SQLiteNode() {
     for (SQLitePeer* peer : _peerList) {
         delete peer;
     }
-
-    if (pluginDB != nullptr) {
-        delete pluginDB;
-    }
 }
 
 void SQLiteNode::_replicate(SQLitePeer* peer, SData command, size_t sqlitePoolIndex, uint64_t threadAttemptStartTimestamp) {
@@ -1823,8 +1815,16 @@ void SQLiteNode::_changeState(SQLiteNodeState newState) {
     _localCommitNotifier.notifyThrough(_db.getCommitCount());
 
     if (newState != _state) {
-        // First, we notify all plugins about the state change
-        _server.notifyStateChangeToPlugins(*pluginDB, newState);
+        {
+            // We get a new handle here so that the sync node can operate on its handle and the plugin gets
+            // its own handle to operate on. This avoids conflicts where the sync thread and the plugin are trying to
+            // both run queries at the same time. This also avoids the need to create any share locking between the two.
+            SQLiteScopedHandle dbScope(*_dbPool, _dbPool->getIndex());
+            SQLite& pluginDB = dbScope.db();
+
+            // First, we notify all plugins about the state change
+            _server.notifyStateChangeToPlugins(pluginDB, newState);
+        }
 
         // If we were following, and now we're not, we give up an any replications.
         if (_state == SQLiteNodeState::FOLLOWING) {