diff audioDB-internals.h @ 458:913a95f06998 api-inversion

Start using the query state structure.

Actually using it means moving it around in the source code a little
bit, thanks to entanglements.  It'll all be alright on the night.  Now
the accumulator, allowed_keys and exact_evaluation_queue are all part of
the query state, and can therefore be passed around with minimal effort
(and deleted in the appropriate place).

Now a whole bunch of static methods (the callbacks, basically) in
index.cpp can be rewritten as plain old C functions.  The callbacks need
both an adb_t and a query state structure to function (the adb_t to get
at things like lsh_n_point_bits and the track->key table; the qstate to
get at the accumulator and allowed_keys list).

Rearrange audioDB::query a little bit, and mark the beginning and the
end of the putative audiodb_query_spec() API function implementation.

--- a/audioDB-internals.h	Wed Dec 24 10:57:30 2008 +0000
+++ b/audioDB-internals.h	Sun Dec 28 18:44:08 2008 +0000
@@ -24,12 +24,7 @@
  * using adb->fd, but changing to use pread() might win us
  * threadsafety eventually.
  */
-typedef struct adb_qstate_internal {
-  Accumulator *accumulator;
-  adb_qpointers_internal_t *qpointers;
-  adb_qpointers_internal_t *dbpointers;
-  std::set<std::string> *allowed_keys;
-} adb_qstate_internal_t;
+// FIXME moved to audioDB.h for now
 
 struct adb {
   char *path;
@@ -207,6 +202,24 @@
   }
 }
 
+/************************* LSH point index to audioDB conversion  *****************/
+static inline uint32_t audiodb_index_to_track_id(uint32_t lshid, uint32_t n_point_bits) {
+  return (lshid >> n_point_bits);
+}
+
+static inline uint32_t audiodb_index_to_track_pos(uint32_t lshid, uint32_t n_point_bits) {
+  return (lshid & ((1 << n_point_bits) - 1));
+}
+
+static inline uint32_t audiodb_index_from_trackinfo(uint32_t track_id, uint32_t track_pos, uint32_t n_point_bits) {
+  return ((track_id << n_point_bits) | track_pos);
+}
+
+static inline uint32_t audiodb_lsh_n_point_bits(adb_t *adb) {
+  uint32_t nbits = adb->header->flags >> 28;
+  return (nbits ? nbits : O2_DEFAULT_LSH_N_POINT_BITS);
+}
+
 int audiodb_read_data(adb_t *, int, int, double **, size_t *);
 int audiodb_insert_create_datum(adb_insert_t *, adb_datum_t *);
 int audiodb_free_datum(adb_datum_t *);