view tests/0034/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).

#! /bin/bash

. ../test-utils.sh

if [ -f testdb ]; then rm -f testdb; fi

${AUDIODB} -d testdb -N

intstring 2 > testfeature
floatstring 1 1 >> testfeature
intstring 2 > testfeature01
floatstring 0 1 >> testfeature01
intstring 2 > testfeature10
floatstring 1 0 >> testfeature10

${AUDIODB} -d testdb -I -f testfeature
${AUDIODB} -d testdb -S | grep "num files:1"
${AUDIODB} -d testdb -I -f testfeature
${AUDIODB} -d testdb -S | grep "num files:1"
${AUDIODB} -d testdb -I -f testfeature01
${AUDIODB} -d testdb -S | grep "num files:2"
${AUDIODB} -d testdb -I -f testfeature10
${AUDIODB} -d testdb -S | grep "num files:3"

rm -f testdb

${AUDIODB} -d testdb -N

${AUDIODB} -d testdb -I -f testfeature01
${AUDIODB} -d testdb -S | grep "num files:1"
${AUDIODB} -d testdb -I -f testfeature01
${AUDIODB} -d testdb -S | grep "num files:1"
${AUDIODB} -d testdb -I -f testfeature10
${AUDIODB} -d testdb -S | grep "num files:2"
${AUDIODB} -d testdb -I -f testfeature
${AUDIODB} -d testdb -S | grep "num files:3"

rm -f testdb

${AUDIODB} -d testdb -N

echo testfeature > testfeaturelist.txt
echo testfeature01 >> testfeaturelist.txt
echo testfeature10 >> testfeaturelist.txt

${AUDIODB} -B -F testfeaturelist.txt -d testdb

${AUDIODB} -d testdb -S | grep "num files:3"

rm -f testdb

${AUDIODB} -d testdb -N

echo testfeature01 > testfeaturelist.txt
echo testfeature10 >> testfeaturelist.txt
echo testfeature >> testfeaturelist.txt

${AUDIODB} -B -F testfeaturelist.txt -d testdb

${AUDIODB} -d testdb -S | grep "num files:3"

exit 104