comparison audioDB.cpp @ 538:02e0a9ecfd0f multiprobeLSH

Added back single-query point I/O behaviour from pre API-inversion. Thus only those query vectors required are loaded when using query-from-file. Tests 0006 and 0007 fail silently with this change.

     if(audiodb_insert(adb, &insert)) {
       error("insertion failure", thisFile);
     }
   } while(!filesIn->eof());
 
-  VERB_LOG(0, "%s %s %u vectors %ju bytes.\n", COM_BATCHINSERT, dbName, totalVectors, (intmax_t) (totalVectors * dbH->dim * sizeof(double)));
+  VERB_LOG(0, "%s %s %u vectors %ju bytes.\n", COM_BATCHINSERT, dbName, totalVectors, (intmax_t) (totalVectors * adb->header->dim * sizeof(double)));
 
   delete [] thisPowerFileName;
   if(key && (key != inFile)) {
     delete [] thisKey;
   }

     if(fd < 0) {
       error("failed to open feature file", inFile);
     }
     fstat(fd, &st);
     read(fd, &datum.dim, sizeof(uint32_t));
-    datum.nvectors = (st.st_size - sizeof(uint32_t)) / (datum.dim * sizeof(double));
-    datum.data = (double *) malloc(st.st_size - sizeof(uint32_t));
-    read(fd, datum.data, st.st_size - sizeof(uint32_t));
-    close(fd);
+    if(usingQueryPoint){
+      datum.nvectors = sequenceLength;
+      datum.data = (double *) malloc(datum.nvectors*datum.dim*sizeof(double));
+      lseek(fd, queryPoint*sizeof(double)*datum.dim, SEEK_CUR);
+      read(fd, datum.data, datum.nvectors*datum.dim*sizeof(double));
+      close(fd);
+    }
+    else{
+      datum.nvectors = (st.st_size - sizeof(uint32_t)) / (datum.dim * sizeof(double));
+      datum.data = (double *) malloc(st.st_size - sizeof(uint32_t));
+      read(fd, datum.data, st.st_size - sizeof(uint32_t));
+      close(fd);
+    }
     if(usingPower) {
       uint32_t one;
       fd = open(powerFileName, O_RDONLY);
       if(fd < 0) {
         error("failed to open power file", powerFileName);

       read(fd, &one, sizeof(uint32_t));
       if(one != 1) {
         error("malformed power file dimensionality", powerFileName);
       }
       datum.power = (double *) malloc(datum.nvectors * sizeof(double));
+      if(usingQueryPoint)
+	lseek(fd, queryPoint*sizeof(double), SEEK_CUR);
       if(read(fd, datum.power, datum.nvectors * sizeof(double)) != (ssize_t) (datum.nvectors * sizeof(double))) {
-        error("malformed power file", powerFileName);
+	error("malformed power file", powerFileName);
       }
       close(fd);
     }
     if(usingTimes) {
       datum.times = (double *) malloc(2 * datum.nvectors * sizeof(double));

   qspec.qid.datum = &datum;
   qspec.qid.sequence_length = sequenceLength;
   qspec.qid.flags = 0;
   qspec.qid.flags |= usingQueryPoint ? 0 : ADB_QID_FLAG_EXHAUSTIVE;
   qspec.qid.flags |= lsh_exact ? 0 : ADB_QID_FLAG_ALLOW_FALSE_POSITIVES;
-  qspec.qid.sequence_start = queryPoint;
+  if(usingQueryPoint)
+    qspec.qid.sequence_start = 0;
+  else
+    qspec.qid.sequence_start = queryPoint;
 
   switch(queryType) {
   case O2_POINT_QUERY:
     qspec.qid.sequence_length = 1;
     qspec.params.accumulation = ADB_ACCUMULATION_DB;

     qspec.params.npoints = 0;
     qspec.params.ntracks = 0;
     if(!(qspec.refine.flags & ADB_REFINE_RADIUS)) {
       error("query-type not yet supported");
     } else {
-      reporter = new trackSequenceQueryRadNNReporterOneToOne(pointNN,trackNN, dbH->numFiles);
+      reporter = new trackSequenceQueryRadNNReporterOneToOne(pointNN,trackNN, adb->header->numFiles);
     }
     break;
   default:
     error("unrecognized queryType");
   }