view libtests/0001/prog1.c @ 405:ef4792df8f93 api-inversion

invert audioDB::insert / audiodb_insert(). Start off by removing audioDB::insertDatum, and essentially reusing it as audiodb_insert. We now ignore the fact that the command-line parsing code has "helpfully" opened a std::ifstream for the times file and an fd for the power file, and simply go ahead and do our own dirty work. We can delete audioDB::insertDatum entirely, but unfortunately we can't delete audioDB::insertPowerData and audioDB::insertTimestamps, because the index and query code respectively use them. Instead, move the two methods closer to their single uses. audiodb_insert() is perhaps not as short and simple as it might have been hoped given the existence of audiodb_insert_datum(); some of that is C and its terribly way of making you pay every time you use dynamic memory; some of it is the fact that the three different files (feature, times, power) each requires slightly different treatment. Hey ho. We can implement audiodb_batchinsert() in terms of audiodb_insert(); the function is pleasingly small. We can't quite use it for audioDB::batchinsert yet, as we have to deal with the O2_FLAG_LARGE_ADB case (which codepath is untested in libtests/). This means that we can delete whole swathes of hideous code from audioDB.cpp, including not just the versions of audiodb_insert() and audiodb_batchinsert() but also an entire audioDB constructor. Yay. (audioDB::unitNormAndInsertL2 has also died a deserved death).
author mas01cr
date Fri, 05 Dec 2008 22:32:49 +0000
parents 78fed0d4c108
children e072aa1611f5
line wrap: on
line source
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sysexits.h>
#include <fcntl.h>
#include <dirent.h>
#include <unistd.h>
#include <sys/stat.h>
#include <errno.h>
/*
 *  * #define NDEBUG
 *   * */
#include <assert.h>

#include "../../audioDB_API.h"
#include "../test_utils_lib.h"


int main(int argc, char **argv){

    int returnval=0;
    adb_ptr mydbp={0};
    adb_ptr mydbp2={0};
    struct stat statbuf;
    int statval=0;

    char * databasename="testdb";

    //if [ -f testdb ]; then rm -f testdb; fi
    /* remove old directory */
    clean_remove_db(databasename);

    /* create new db */
    //# creation
    //${AUDIODB} -N -d testdb
    mydbp=audiodb_open(databasename,O_RDWR);


    /* open should fail (return NULL), so create a new db */
    if (!mydbp){
        mydbp=audiodb_create(databasename,0,0,0);
    }



    if (!mydbp){
        printf("fail\n");
        returnval=-1;
    }
    

    /* stat testdb - let's make sure that it is there */
    //stat testdb
    statval=stat(databasename, &statbuf);

    if (statval){
       returnval=-1;
    }
    
    audiodb_close(mydbp);

    /* try to create should fail, because db exists now */
    mydbp2=audiodb_create(databasename,0,0,0);

    if (mydbp2){
        returnval=-1;
    }


/* should pass now - db exists */ 
//expect_clean_error_exit ${AUDIODB} -N -d testdb
    mydbp2=audiodb_open(databasename, O_RDONLY);
    if (!mydbp2){
       returnval=-1;
    }

//this test would fail at compile time because of the API interface
//# should fail (no db given)
//expect_clean_error_exit ${AUDIODB} -N


    audiodb_close(mydbp2);

//    printf("returnval:%d\n",returnval);

    return(returnval);
}