Mercurial > hg > audiodb
view tests/0015/run-test.sh @ 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 | 6066d75a6d39 |
children |
line wrap: on
line source
#! /bin/bash . ../test-utils.sh if [ -f testdb ]; then rm -f testdb; fi start_server ${AUDIODB} 10015 ${AUDIODB} -d testdb -N ${AUDIODB} -c localhost:10015 -d testdb -S > test1 ${AUDIODB} -S -c localhost:10015 -d testdb > test2 ${AUDIODB} -S -d testdb -c localhost:10015 > test3 cat > testoutput <<EOF numFiles = 0 dim = 0 length = 0 dudCount = 0 nullCount = 0 flags = 0 EOF cmp test1 test2 cmp test2 test3 cmp test3 testoutput check_server $! expect_client_failure ${AUDIODB} -c localhost:10015 -S -d /dev/null expect_client_failure ${AUDIODB} -c localhost:10015 -S -d /tmp/foo-does-not-exist check_server $! stop_server $! exit 104