comparison query.cpp @ 509:cc2b97d020b1

Code rearrangements to tease apart library code from C++ audioDB code.

There should be precisely no functional changes in this commit.
Instead, the only thing that has happened is that all the abstraction
violation and other horribleness is concentrated in one place: the
include of "audioDB-internals.h" in audioDB.h -- the separation will be
complete once that include can be removed.

This include is necessary because the command-line binary / SOAP server
still does some things directly rather than through an API: not least of
which the operations that have not yet been integrated into the API yet,
but also some messing around with constants, flags and nominally
internal functions.  The intent is to remove as many of these as
possible and think quite hard about the rest.

In the meantime, the library is now much more self-contained: the only
things it uses are in the audioDB_API.h and audioDB-internals.h headers;
thus there are fewer nasty surprises lurking for readers of the code.

The Makefile has been adjusted to take advantage of this rearrangement
in the dependencies.

-#include "audioDB.h"
+extern "C" {
+#include "audioDB_API.h"
+}
 #include "audioDB-internals.h"
 #include "accumulators.h"
 
 bool audiodb_powers_acceptable(const adb_query_refine_t *r, double p1, double p2) {
   if (r->flags & ADB_REFINE_ABSOLUTE_THRESHOLD) {

   return 1;
 }
 
 int audiodb_track_id_datum(adb_t *adb, uint32_t track_id, adb_datum_t *d) {
   off_t track_offset = (*adb->track_offsets)[track_id];
-  if(adb->header->flags & O2_FLAG_LARGE_ADB) {
+  if(adb->header->flags & ADB_HEADER_FLAG_REFERENCES) {
     /* create a reference/insert, then use adb_insert_create_datum() */
     adb_reference_t reference = {0};
-    char features[MAXSTR], power[MAXSTR], times[MAXSTR];
-    lseek(adb->fd, adb->header->dataOffset + track_id * O2_FILETABLE_ENTRY_SIZE, SEEK_SET);
-    read_or_goto_error(adb->fd, features, MAXSTR);
+    char features[ADB_MAXSTR], power[ADB_MAXSTR], times[ADB_MAXSTR];
+    lseek(adb->fd, adb->header->dataOffset + track_id * ADB_FILETABLE_ENTRY_SIZE, SEEK_SET);
+    read_or_goto_error(adb->fd, features, ADB_MAXSTR);
     reference.features = features;
-    if(adb->header->flags & O2_FLAG_POWER) {
-      lseek(adb->fd, adb->header->powerTableOffset + track_id * O2_FILETABLE_ENTRY_SIZE, SEEK_SET);
-      read_or_goto_error(adb->fd, power, MAXSTR);
+    if(adb->header->flags & ADB_HEADER_FLAG_POWER) {
+      lseek(adb->fd, adb->header->powerTableOffset + track_id * ADB_FILETABLE_ENTRY_SIZE, SEEK_SET);
+      read_or_goto_error(adb->fd, power, ADB_MAXSTR);
       reference.power = power;
     }
-    if(adb->header->flags & O2_FLAG_TIMES) {
-      lseek(adb->fd, adb->header->timesTableOffset + track_id * O2_FILETABLE_ENTRY_SIZE, SEEK_SET);
-      read_or_goto_error(adb->fd, times, MAXSTR);
+    if(adb->header->flags & ADB_HEADER_FLAG_TIMES) {
+      lseek(adb->fd, adb->header->timesTableOffset + track_id * ADB_FILETABLE_ENTRY_SIZE, SEEK_SET);
+      read_or_goto_error(adb->fd, times, ADB_MAXSTR);
       reference.times = times;
     }
     return audiodb_insert_create_datum(&reference, d);
   } else {
     /* initialize from sources of data that we already have */

     d->key = (*adb->keys)[track_id].c_str();
     /* read out stuff from the database tables */
     d->data = (double *) malloc(d->nvectors * d->dim * sizeof(double));
     lseek(adb->fd, adb->header->dataOffset + track_offset, SEEK_SET);
     read_or_goto_error(adb->fd, d->data, d->nvectors * d->dim * sizeof(double));
-    if(adb->header->flags & O2_FLAG_POWER) {
+    if(adb->header->flags & ADB_HEADER_FLAG_POWER) {
       d->power = (double *) malloc(d->nvectors * sizeof(double));
       lseek(adb->fd, adb->header->powerTableOffset + track_offset / d->dim, SEEK_SET);
       read_or_goto_error(adb->fd, d->power, d->nvectors * sizeof(double));
     }
-    if(adb->header->flags & O2_FLAG_TIMES) {
+    if(adb->header->flags & ADB_HEADER_FLAG_TIMES) {
       d->times = (double *) malloc(2 * d->nvectors * sizeof(double));
       lseek(adb->fd, adb->header->timesTableOffset + track_offset / d->dim, SEEK_SET);
       read_or_goto_error(adb->fd, d->times, 2 * d->nvectors * sizeof(double));
     }
     return 0;

   double *snpp = dbpointers->l2norm_data, *sppp = 0;
   lseek(adb->fd, adb->header->l2normTableOffset, SEEK_SET);
   read_or_goto_error(adb->fd, dbpointers->l2norm_data, nvectors * sizeof(double));
 
   if (using_power) {
-    if (!(adb->header->flags & O2_FLAG_POWER)) {
+    if (!(adb->header->flags & ADB_HEADER_FLAG_POWER)) {
       goto error;
     }
     dbpointers->power_data = new double[nvectors];
     sppp = dbpointers->power_data;
     lseek(adb->fd, adb->header->powerTableOffset, SEEK_SET);

       sppp += track_length;
     }
   }
 
   if (using_times) {
-    if(!(adb->header->flags & O2_FLAG_TIMES)) {
+    if(!(adb->header->flags & ADB_HEADER_FLAG_TIMES)) {
       goto error;
     }
 
     dbpointers->mean_duration = new double[adb->header->numFiles];
 

   Uns32T currentTrack = 0x80000000; // KLUDGE: Initialize with a value outside of track index range
   Uns32T npairs = qstate->exact_evaluation_queue->size();
   while(npairs--) {
     PointPair pp = qstate->exact_evaluation_queue->top();
     if(currentTrack != pp.trackID) {
-      SAFE_DELETE_ARRAY(dbdata);
-      SAFE_DELETE_ARRAY(dbpointers.l2norm_data);
-      SAFE_DELETE_ARRAY(dbpointers.power_data);
-      SAFE_DELETE_ARRAY(dbpointers.mean_duration);
+      maybe_delete_array(dbdata);
+      maybe_delete_array(dbpointers.l2norm_data);
+      maybe_delete_array(dbpointers.power_data);
+      maybe_delete_array(dbpointers.mean_duration);
       currentTrack = pp.trackID;
       adb_datum_t d = {0};
       if(audiodb_track_id_datum(adb, pp.trackID, &d)) {
         delete qstate->exact_evaluation_queue;
         return 1;

       case ADB_DISTANCE_EUCLIDEAN:
         dist = qn*qn + sn*sn - 2*dist;
         break;
       }
       if((!(spec->refine.flags & ADB_REFINE_RADIUS)) || 
-         dist <= (spec->refine.radius+O2_DISTANCE_TOLERANCE)) {
+         dist <= (spec->refine.radius + ADB_DISTANCE_TOLERANCE)) {
         adb_result_t r;
         r.key = (*adb->keys)[pp.trackID].c_str();
         r.dist = dist;
         r.qpos = pp.qpos;
         r.ipos = pp.spos;

       }
     }
     qstate->exact_evaluation_queue->pop();
   }
 
-  
   // Cleanup
-  SAFE_DELETE_ARRAY(dbdata);
-  SAFE_DELETE_ARRAY(dbpointers.l2norm_data);
-  SAFE_DELETE_ARRAY(dbpointers.power_data);
-  SAFE_DELETE_ARRAY(dbpointers.mean_duration);
+  maybe_delete_array(dbdata);
+  maybe_delete_array(dbpointers.l2norm_data);
+  maybe_delete_array(dbpointers.power_data);
+  maybe_delete_array(dbpointers.mean_duration);
   delete qstate->exact_evaluation_queue;
   return 0;
 }
 
 int audiodb_query_loop(adb_t *adb, const adb_query_spec_t *spec, adb_qstate_internal_t *qstate) {

   double *query, *query_data;
   adb_qpointers_internal_t qpointers = {0}, dbpointers = {0};
 
   bool power_refine = spec->refine.flags & (ADB_REFINE_ABSOLUTE_THRESHOLD|ADB_REFINE_RELATIVE_THRESHOLD);
 
-  if(adb->header->flags & O2_FLAG_LARGE_ADB) {
+  if(adb->header->flags & ADB_HEADER_FLAG_REFERENCES) {
     /* FIXME: actually it would be nice to support this mode of
      * operation, but for now... */
     return 1;
   }
 

             }
 	    // Power test
 	    if ((!power_refine) || audiodb_powers_acceptable(&spec->refine, qpointers.power[j], dbpointers.power[trackIndexOffset + k])) {
               // radius test
               if((!(spec->refine.flags & ADB_REFINE_RADIUS)) || 
-                 thisDist <= (spec->refine.radius+O2_DISTANCE_TOLERANCE)) {
+                 thisDist <= (spec->refine.radius + ADB_DISTANCE_TOLERANCE)) {
                 adb_result_t r;
                 r.key = (*adb->keys)[track].c_str();
                 r.dist = thisDist;
                 if(spec->qid.flags & ADB_QID_FLAG_EXHAUSTIVE) {
                   r.qpos = j;