comparison query.cpp @ 448:ac9bf14f7071 api-inversion

audiodb_set_up_dbpointers() is a better name than audiodb_set_up_db().

   }
 
   return 0;
 }
 
-// FIXME: this is not the right name; we're not actually setting up
-// the database, but copying various bits of it out of mmap()ed tables
-// in order to reduce seeks.
-static int audiodb_set_up_db(adb_t *adb, adb_query_spec_t *spec, adb_qpointers_internal_t *dbpointers) {
+static int audiodb_set_up_dbpointers(adb_t *adb, adb_query_spec_t *spec, adb_qpointers_internal_t *dbpointers) {
   uint32_t nvectors = adb->header->length / (adb->header->dim * sizeof(double));
   uint32_t sequence_length = spec->qid.sequence_length;
 
   bool using_power = spec->refine.flags & (ADB_REFINE_ABSOLUTE_THRESHOLD|ADB_REFINE_RELATIVE_THRESHOLD);
   bool using_times = spec->refine.flags & ADB_REFINE_DURATION_RATIO;

 
   // Compute database info
   // FIXME: we more than likely don't need very much of the database
   // so make a new method to build these values per-track or, even better, per-point
   if( !( dbH->flags & O2_FLAG_LARGE_ADB) )
-    if(audiodb_set_up_db(adb, spec, &dbpointers)) {
+    if(audiodb_set_up_dbpointers(adb, spec, &dbpointers)) {
       error("failed to set up db");
     }
 
   // We are guaranteed that the order of points is sorted by:
   // trackID, spos, qpos

 
   if(audiodb_query_spec_qpointers(adb, spec, &query_data, &query, &qpointers)) {
     error("failed to set up qpointers");
   }
 
-  if(audiodb_set_up_db(adb, spec, &dbpointers)) {
+  if(audiodb_set_up_dbpointers(adb, spec, &dbpointers)) {
     error("failed to set up db");
   }
 
   unsigned j,k,track,trackOffset=0, HOP_SIZE=sequenceHop;
   unsigned wL = spec->qid.sequence_length;