view tests/0039/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 > testfeature01
floatstring 0 1 >> testfeature01
floatstring 1 0 >> testfeature01
intstring 2 > testfeature10
floatstring 1 0 >> testfeature10
floatstring 0 1 >> testfeature10

cat > testfeaturefiles <<EOF
testfeature01
testfeature10
EOF

cat > testfeaturekeys <<EOF
testkey01
testkey02
EOF

${AUDIODB} -d testdb -B -F testfeaturefiles
${AUDIODB} -d testdb -S | grep "num files:2"

expect_clean_error_exit ${AUDIODB} -d testdb --LISZT --lisztOffset -1
expect_clean_error_exit ${AUDIODB} -d testdb --LISZT --lisztOffset 3
expect_clean_error_exit ${AUDIODB} -d testdb --LISZT --lisztLength -1

${AUDIODB} -d testdb --LISZT > testoutput
echo "[0] testfeature01 (2)" > test-expected-output
echo "[1] testfeature10 (2)" >> test-expected-output
cmp testoutput test-expected-output

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

${AUDIODB} -d testdb -N
${AUDIODB} -d testdb -B -F testfeaturefiles -K testfeaturekeys
${AUDIODB} -d testdb -S | grep "num files:2"

${AUDIODB} -d testdb --LISZT > testoutput
echo "[0] testkey01 (2)" > test-expected-output
echo "[1] testkey02 (2)" >> test-expected-output
cmp testoutput test-expected-output

WSPORT=10020
start_server ${AUDIODB} ${WSPORT}

expect_clean_error_exit ${AUDIODB} -d testdb -c localhost:${WSPORT} --LISZT --lisztOffset -1
#expect_clean_error_exit ${AUDIODB} -d testdb -c localhost:${WSPORT} --LISZT --lisztOffset 3 #NOT EXITING CLEANLY
expect_clean_error_exit ${AUDIODB} -d testdb -c localhost:${WSPORT} --LISZT --lisztLength -1

check_server $!

${AUDIODB} -c localhost:${WSPORT} -d testdb --LISZT > testoutput
cmp testoutput test-expected-output

stop_server $!

exit 104