SPARK-1446 Try to add securities to security DB even if they already have an assigned security key

src/lib/md/SecurityDB.cpp

@@ -89,7 +89,7 @@ size_t load_securities(
 
 void store_if_new(const std::vector<Security*>& securities) {
    auto dbptr = open_db();
-   auto insert = utils::prepare_query(dbptr, "insert into securities (key, symbol, venue, type, security_blob, expiration) values (?,?,?,?,?,?)");
+   auto insert = utils::prepare_query(dbptr, "insert or ignore into securities (key, symbol, venue, type, security_blob, expiration) values (?,?,?,?,?,?)");
    sqlite3_exec_nofail(dbptr, "BEGIN TRANSACTION");
    std::string buffer;
    for (const api::Security* psecurity : securities) {
@@ -100,10 +100,7 @@ void store_if_new(const std::vector<Security*>& securities) {
          SQLITE_CHK(sqlite3_bind_int(insert.get(), 4, securitytype_of(*psecurity)), dbptr);
          SQLITE_CHK(sqlite3_bind_blob(insert.get(), 5, buffer.c_str(), buffer.size(), SQLITE_STATIC), dbptr);
          SQLITE_CHK(sqlite3_bind_int(insert.get(), 6, expiration(*psecurity).to_short()), dbptr);
-         auto result = sqlite3_step(insert.get());
-         if (result != SQLITE_DONE) {
-            LOG(md, Warn, "Failed to insert security into security db. key={}", psecurity->id());
-         }
+         sqlite3_step(insert.get());
          sqlite3_reset(insert.get());
       }
    }

src/lib/md/SecurityIDRecorder.cpp

@@ -133,6 +133,8 @@ void SecurityIDRecorder::work_db() {
    // Once a security has a key it is public so record it in the security database
    std::shared_ptr<SecurityIDEntry> temp;
    vector<std::shared_ptr<SecurityIDEntry>> new_entries;
+   // SPARK-1446 Need to try to add existing securities to the db in case we deleted them by hand
+   vector<std::shared_ptr<SecurityIDEntry>> existing_securities;
    vector<std::shared_ptr<SecurityIDEntry>> defer;
    vector<string> new_descriptors;
    size_t count = 0;
@@ -150,6 +152,7 @@ void SecurityIDRecorder::work_db() {
          if (key != invalid_security_key) {
             temp->security.set_id(key);
             temp->callback(temp->security);
+            existing_securities.push_back(move(temp));
          }
          else {
             // always push in parallel
@@ -168,7 +171,7 @@ void SecurityIDRecorder::work_db() {
    }
    
 
-   if (new_entries.size() > 0) {
+   if (!new_entries.empty()) {
       sqlite3_exec_nofail(_self->db.get(), "BEGIN TRANSACTION");
 
       for (size_t x = 0; x < new_entries.size(); ++x) {
@@ -179,15 +182,22 @@ void SecurityIDRecorder::work_db() {
       }
 
       sqlite3_exec_nofail(_self->db.get(), "COMMIT TRANSACTION");
+   }
 
-      // record the securities
+   // record the securities
+   if (!new_entries.empty() || !existing_securities.empty()) {
       std::vector<Security*> save_these;
-      save_these.reserve(new_entries.size());
+      save_these.reserve(new_entries.size() + existing_securities.size());
       for (const auto& e : new_entries) {
          save_these.push_back(&e->security);
       }
+      for (const auto& e : existing_securities) {
+         save_these.push_back(&e->security);
+      }
       db::store_if_new(save_these);
+   }
 
+   if (!new_entries.empty()) {
       for (size_t x = 0; x < new_entries.size(); ++x) {
          Security& security = new_entries[x]->security;
          new_entries[x]->callback(security);

tools/git_switch_linux.cmd

@@ -0,0 +1,13 @@
+@echo off
+@setlocal
+SETLOCAL
+if "%SPARKVM_PORT%"=="" set SPARKVM_PORT=22
+if "%1" == "" goto :err
+echo.
+ssh bts@sparkvm -p %SPARKVM_PORT% -o StrictHostKeyChecking=no -t "cd /home/bts/spark && git checkout %1 && git reset --hard && git clean -fd && git pull && git submodule update"
+ENDLOCAL
+
+goto :eof
+
+:err
+echo usage git_switch_linux [branch]