Changeset 35777 for trunk/Ohana

Timestamp:

Jul 5, 2013, 5:59:12 PM (13 years ago)

Author:

eugene

Message:

check that the buffer contains new detections for insertion

Location:

trunk/Ohana/src/dvopsps/src

Files:

• insert_detections_dvopsps.c (modified) (3 diffs)
• insert_detections_dvopsps_catalog.c (modified) (6 diffs)

trunk/Ohana/src/dvopsps/src/insert_detections_dvopsps.c

@@ -233 +233 @@
 
   int status = TRUE;
+  int Ninsert = 0;
 
   gettimeofday (&start, (void *) NULL);
@@ -239 +240 @@
     // XXX check return status
     insert_detections_mysql_detvalue (&buffer, &detections[i]);
+    Ninsert ++;
     if (buffer.Nbuffer > MAX_BUFFER) {
       if (!insert_detections_mysql_commit (&buffer, mysql)) {
@@ -247 +249 @@
       bzero (buffer.buffer, buffer.Nalloc);
       insert_detections_mysql_init (&buffer);
-    }
-  }
-  if (!insert_detections_mysql_commit (&buffer, mysql)) {
-    fprintf (stderr, "failure to insert detections in mysql (commit 2)\n");
-    status = FALSE;
+      Ninsert = 0;
+    }
+  }
+  if (Ninsert > 0) {
+    // insert the remaining detections loaded in the buffer
+    if (!insert_detections_mysql_commit (&buffer, mysql)) {
+      fprintf (stderr, "failure to insert detections in mysql (commit 2)\n");
+      status = FALSE;
+    }
   }
   FreeIOBuffer (&buffer);

trunk/Ohana/src/dvopsps/src/insert_detections_dvopsps_catalog.c

@@ -104 +104 @@
   insert_detections_mysql_init (&buffer);
   int Ninsert = 0;
+  int Ntotal = 0;
 
   int status = TRUE;
@@ -125 +126 @@
         status = FALSE;
       }
+      Ninsert ++;
+      Ntotal ++;
 
       if (buffer.Nbuffer > MAX_BUFFER) {
@@ -141 +144 @@
         insert_detections_mysql_init (&buffer);
       }
-
-      Ninsert ++;
       found ++;
     }
   }
-  if (!insert_detections_mysql_commit (&buffer, mysql)) {
-    fprintf (stderr, "failure to insert detections in mysql (commit)\n");
-    status = FALSE;
+  if (Ninsert > 0) {
+    // insert the remaining detections loaded in the buffer
+    if (!insert_detections_mysql_commit (&buffer, mysql)) {
+      fprintf (stderr, "failure to insert detections in mysql (commit)\n");
+      status = FALSE;
+    }
   }
   
-  if (VERBOSE) fprintf (stderr, "inserted %d rows\n", Ninsert);
+  if (VERBOSE) fprintf (stderr, "inserted %d rows\n", Ntotal);
   FreeIOBuffer (&buffer);
 
@@ -169 +173 @@
   }
 
-  PrintIOBuffer (buffer, "INSERT INTO dvoDetectionFull (imageID, ippDetectID, detectID, ippObjID, objID, photcode, flags, zp, zpErr, airMass, expTime, ra, dec_, raErr, decErr) VALUES \n");
+  // PrintIOBuffer (buffer, "INSERT INTO dvoDetectionFull (imageID, ippDetectID, detectID, ippObjID, objID, photcode, flags, zp, zpErr, airMass, expTime, ra, dec_, raErr, decErr) VALUES \n");
+  PrintIOBuffer (buffer, "INSERT INTO dvoDetectionFull (imageID, ippDetectID, detectID, ippObjID, objID, flags, zp, zpErr, airMass, expTime, ra, dec_, raErr, decErr) VALUES \n");
 
   return TRUE;
@@ -188 +193 @@
   // ((uint64_t)average->catID << 32) + (uint64_t)average->objID, // ippObjID
   PrintIOBuffer (buffer, "%lu, ", average->extID);        // objID
-  PrintIOBuffer (buffer, "%d, ", measure->photcode);      // photcode
+  // XXX PrintIOBuffer (buffer, "%d, ", measure->photcode);       // photcode
   PrintIOBuffer (buffer, "%u, ", measure->dbFlags);       // flags
 
@@ -221 +226 @@
   } else {
     fprintf (stderr, "invalid sql?\n");
+    int Nstart = MAX(0, buffer->Nbuffer - 3000);
+    fprintf (stderr, "buffer: ...%s...\n", &buffer->buffer[Nstart]);
     return FALSE;
   }