Changeset 31065

Timestamp:

Mar 27, 2011, 10:57:10 AM (15 years ago)

Author:

eugene

Message:

cleanup the CHECKSORTED option a bit: define -sorted (and -verbose) as equivalent options; move CHECKSORTED to a local variable; init VERBOSE at declaration; exit immediately when unsorted files are found if CHECKSORTED is chosen; otherwise report number of unsorted files

Location:

branches/eam_branches/ipp-20110213/Ohana/src/dvomerge

Files:

• . (modified) (1 prop)
• src/dvoverify.c (modified) (7 diffs)

branches/eam_branches/ipp-20110213/Ohana/src/dvomerge/src/dvoverify.c

@@ -13 +13 @@
 # define DEBUG 0
 
-int VERBOSE;
+int VERBOSE = FALSE;
+int NNotSorted = 0;
 
 int main (int argc, char **argv) {
@@ -26 +27 @@
   // Catalog catalog;
 
-  VERBOSE = FALSE;
+  int CHECKSORTED;
+
   if ((N = get_argument (argc, argv, "-v"))) {
     VERBOSE = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "-verbose"))) {
+    VERBOSE = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "-s"))) {
+    CHECKSORTED = TRUE;
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "-sorted"))) {
+    CHECKSORTED = TRUE;
     remove_argument (N, &argc, argv);
   }
@@ -50 +64 @@
 
   if (argc != 2) {
-    fprintf (stderr, "USAGE: dvoverify (catdir) [-region Rmin Rmax Dmin Dmax]\n");
-    fprintf (stderr, "  catdir : database of interest\n");
+    fprintf (stderr, "USAGE: dvoverify (catdir) [-region Rmin Rmax Dmin Dmax] [-v] [-s]\n\n");
+    fprintf (stderr, "  -v : VERBOSE\n");
+    fprintf (stderr, "  -s : checks if sorted, return error if not\n");
+    fprintf (stderr, "  (catdir) : database of interest\n");
     exit (2);
   }
@@ -89 +105 @@
   for (i = 0; i < inlist[0].Nregions; i++) {
     if (!inlist[0].regions[i][0].table) continue;
-
     if (i % 1000 == 0) fprintf (stderr, ".");
 
@@ -109 +124 @@
     if (!CheckCatalogIndexes(catdir, inlist[0].filename[i], inlist[0].regions[i])){
       Nbad ++;
+    }
+
+    // exit immediately if any file are unsorted and we require sorted tables
+    if (CHECKSORTED && NNotSorted) {
+      fprintf (stderr, "ERROR: files are not sorted\n");
+      exit (1);
     }
   }
@@ -118 +139 @@
 
   fprintf (stderr, "SUCCESS: no files are bad\n");
+  if (NNotSorted) {
+    fprintf (stderr, "NOTE: %d files are not sorted\n", NNotSorted);
+  }
   exit (0);
 }
@@ -267 +291 @@
     dvo_catalog_unlock (&catalog);
     dvo_catalog_free (&catalog);
+    NNotSorted++;
+    if (VERBOSE) fprintf (stderr, "file is not sorted: %s\n", filename);
     return TRUE;
   }