Changeset 40177

Timestamp:

Oct 19, 2017, 4:54:15 PM (9 years ago)

Author:

eugene

Message:

finished testing delstar delete by detID

Location:

branches/eam_branches/ohana.20170822/src/delstar/src

Files:

• delete_measures_by_detID.c (modified) (4 diffs)
• delstar_client.c (modified) (1 diff)

branches/eam_branches/ohana.20170822/src/delstar/src/delete_measures_by_detID.c

@@ -97 +97 @@
     }
   }
-  fprintf (stderr, "found %d uniq catIDs\n", NcatID);
+  // fprintf (stderr, "found %d uniq catIDs\n", NcatID);
 
   ALLOCATE_PTR (catIDgroup, CatIDGroup, NcatID);
@@ -132 +132 @@
   for (i = 0; i < skylist[0].Nregions; i++) {
 
+    if (VERBOSE) fprintf (stderr, "checking %s : %d, %d\n", skylist[0].regions[i]->name, skylist[0].regions[i]->index, skylist[0].regions[i]->hostID);
+
     // does this host ID match the desired location for the table?
     if (!HostTableTestHost(skylist[0].regions[i], HOST_ID)) continue;
@@ -161 +163 @@
     }
 
-    int myCatID = thisCatID (catID, NcatID, skylist[0].regions[i]->index);
+    int myCatID = thisCatID (catIDuniq, NcatID, skylist[0].regions[i]->index);
     myAssert (myCatID >= 0, "error");
 
@@ -388 +390 @@
   if (SAVE_DELETES) {
     char savename[DVO_MAX_PATH];
-    snprintf (savename, DVO_MAX_PATH, "%s.save.20171019", catalog->filename);
+    snprintf (savename, DVO_MAX_PATH, "%s.save.20171019.v1", catalog->filename);
     struct stat filestat;
     int myStatus = stat (savename, &filestat);

branches/eam_branches/ohana.20170822/src/delstar/src/delstar_client.c

@@ -37 +37 @@
     case MODE_DELETE_MEASURES_BY_MATCH:
       if (!delete_measures_by_match ()) exit (1);
+      delstar_args_free ();
+      ohana_memcheck (TRUE);
+      ohana_memdump (TRUE);
+      exit (0);
+      break;
+    case MODE_DELETE_MEASURES_BY_DETID:
+      if (!delete_measures_by_detID ()) exit (1);
       delstar_args_free ();
       ohana_memcheck (TRUE);