comparison audioDB.h @ 277:abfb26e08d9c audiodb-debian

Merge trunk changes -r326:386 into audiodb-debian branch.

Plus new debian/changelog version.  (Should have used an epoch really,
but couldn't be bothered; TODO: work out a sane version numbering
policy).

 #define O2_FORMAT_VERSION (4U)
 
 #define O2_DEFAULT_POINTNN (10U)
 #define O2_DEFAULT_TRACKNN  (10U)
 
+//#define O2_DEFAULTDBSIZE (4000000000) // 4GB table size
 #define O2_DEFAULTDBSIZE (2000000000) // 2GB table size
+
+#define O2_DEFAULT_DATASIZE (1355U) // in MB
+#define O2_DEFAULT_NTRACKS (20000U)
+#define O2_DEFAULT_DATADIM (9U)
 
 #define O2_MAXFILES (20000U)
 #define O2_MAXFILESTR (256U)
-#define O2_FILETABLESIZE (O2_MAXFILESTR)
-#define O2_TRACKTABLESIZE (sizeof(unsigned))
+#define O2_FILETABLE_ENTRY_SIZE (O2_MAXFILESTR)
+#define O2_TRACKTABLE_ENTRY_SIZE (sizeof(unsigned))
 #define O2_HEADERSIZE (sizeof(dbTableHeaderT))
 #define O2_MEANNUMVECTORS (1000U)
 #define O2_MAXDIM (1000U)
-#define O2_MAXNN (10000U)
+#define O2_MAXNN (1000000U)
 
 // Flags
 #define O2_FLAG_L2NORM (0x1U)
 #define O2_FLAG_MINMAX (0x2U)
 #define O2_FLAG_POWER (0x4U)

 
 // Query types
 #define O2_POINT_QUERY (0x4U)
 #define O2_SEQUENCE_QUERY (0x8U)
 #define O2_TRACK_QUERY (0x10U)
+#define O2_N_SEQUENCE_QUERY (0x20U)
+#define O2_ONE_TO_ONE_N_SEQUENCE_QUERY (0x40U)
+
 
 // Error Codes
 #define O2_ERR_KEYNOTFOUND (0xFFFFFF00)
 
 // Macros

   size_t powerTableLength;
   size_t l2normTableLength;
 
   // Flags and parameters
   unsigned verbosity;   // how much do we want to know?
-  off_t size; // given size (for creation)
+
+  //off_t size; // given size (for creation)
+  unsigned datasize; // size in MB
+  unsigned ntracks;
+  unsigned datadim;
+
   unsigned queryType; // point queries default
   unsigned pointNN;   // how many point NNs ?
   unsigned trackNN;   // how many track NNs ?
   unsigned sequenceLength;
   unsigned sequenceHop;

   int processArgs(const unsigned argc, char* const argv[]);
   void get_lock(int fd, bool exclusive);
   void release_lock(int fd);
   void create(const char* dbName);
   void drop();
+  bool enough_per_file_space_free();
   bool enough_data_space_free(off_t size);
   void insert_data_vectors(off_t offset, void *buffer, size_t size);
   void insert(const char* dbName, const char* inFile);
   void batchinsert(const char* dbName, const char* inFile);
   void query(const char* dbName, const char* inFile, adb__queryResponse *adbQueryResponse=0);

   dataBufLength(0), \
   timesTableLength(0), \
   powerTableLength(0), \
   l2normTableLength(0), \
   verbosity(1), \
-  size(O2_DEFAULTDBSIZE), \
+  datasize(O2_DEFAULT_DATASIZE), \
+  ntracks(O2_DEFAULT_NTRACKS), \
+  datadim(O2_DEFAULT_DATADIM), \
   queryType(O2_POINT_QUERY), \
   pointNN(O2_DEFAULT_POINTNN), \
   trackNN(O2_DEFAULT_TRACKNN), \
   sequenceLength(16), \
   sequenceHop(1), \