Merge pull request #4040 from dmitry-ganyushin/campaign-update

Fixed campaign python script.
ornladios · Feb 20, 2024 · 43b393c · 43b393c
2 parents 27e5be1 + 069367b
commit 43b393c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/source/adios2/engine/campaign/CampaignManager.cpp b/source/adios2/engine/campaign/CampaignManager.cpp
@@ -54,12 +54,10 @@ int CMapToSqlite(const CampaignRecordMap &cmap, const int rank, std::string name
         sqlite3_free(zErrMsg);
     }
 
-    size_t rowid = 1000;
     for (auto &r : cmap)
     {
         sqlcmd = "INSERT INTO bpfiles (name)\n";
         sqlcmd += "VALUES('" + r.first + "');";
-        rowid++;
         rc = sqlite3_exec(db, sqlcmd.c_str(), 0, 0, &zErrMsg);
         if (rc != SQLITE_OK)
         {

diff --git a/source/utils/adios_campaign_manager/adios2_campaign_manager.py b/source/utils/adios_campaign_manager/adios2_campaign_manager.py
@@ -2,7 +2,6 @@
 
 import argparse
 import glob
-import json
 import sqlite3
 import zlib
 from datetime import datetime
@@ -145,7 +144,7 @@ def AddDatasetToArchive(args: dict, dataset: str, cur: sqlite3.Cursor, hostID: i
         print(f"WARNING: Dataset {dataset} is not an ADIOS dataset. Skip")
 
 
-def ProcessJsonFile(args: dict, jsonlist: list, cur: sqlite3.Cursor, hostID: int, dirID: int):
+def ProcessDBFile(args: dict, jsonlist: list, cur: sqlite3.Cursor, hostID: int, dirID: int):
     for entry in jsonlist:
         # print(f"Process entry {entry}:")
         if isinstance(entry, dict):
@@ -217,15 +216,15 @@ def Update(args: dict, cur: sqlite3.Cursor):
     #                      (shortHostName, longHostName))
     # hostID = curHost.lastrowid
 
-    curDir = cur.execute('insert into directory values (?, ?)',
+    curDir = cur.execute('insert or replace into directory values (?, ?)',
                          (hostID, rootdir))
     dirID = curDir.lastrowid
     con.commit()
 
     db_list = MergeDBFiles(dbFileList)
 
     # print(f"Merged json = {jsonlist}")
-    ProcessJsonFile(args, db_list, cur, hostID, dirID)
+    ProcessDBFile(args, db_list, cur, hostID, dirID)
 
     con.commit()