view tests/0014/run-test.sh @ 453:16a903968d18 api-inversion

Almost finish with audioDB::query_loop. This patch is a little bit noisy, because we rename adb->keys to adb->keymap, introduce a new vector adb->keys (essentially to replace fileTable), and introduce new functionality (both include and exclude keylists in adb_query_refine_t) as well as modifying the query_loop function itself to take advantage of all of these goodies. Oh, and we also fix an embarrassing state bug in adb->track_offsets for insert -- what was I thinking? (Thank you, regression test suites). Since we are on a private branch at the moment, we can take the luxury of renumbering the ADB_REFINE_ flags to include the exclude list at the logical place; once we have an ABI to support, that won't be possible. Now audioDB::query builds up include and exclude lists as appropriate; query_loop does an [O(NlogN) probably] buildup of the keys to consider, and then iterates over tracks sequentially, seeking only if one or more tracks have been excluded. No more trackFile, yay! The only remaining thing to deal with is the accumulator. It's easy enough to pass it around, but I want to read the indexed version before doing so to see how that all fits together.
author mas01cr
date Wed, 24 Dec 2008 10:57:14 +0000
parents fe4dc39b2dd7
children
line wrap: on
line source
#! /bin/bash

. ../test-utils.sh

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

${AUDIODB} -d testdb -N

${AUDIODB} -d testdb -L

intstring 2 > testfeature
floatstring 0 1 >> testfeature
floatstring 1 0 >> testfeature

${AUDIODB} -d testdb -I -f testfeature

echo "query point (0.0,0.5)"
intstring 2 > testquery
floatstring 0 0.5 >> testquery

start_server ${AUDIODB} 10014

${AUDIODB} -c localhost:10014 -d testdb -Q point -f testquery > testoutput
echo testfeature 0.5 0 0 > test-expected-output
echo testfeature 0 0 1 >> test-expected-output
cmp testoutput test-expected-output
${AUDIODB} -c localhost:10014 -d testdb -Q point -f testquery -n 1 > testoutput
echo testfeature 0.5 0 0 > test-expected-output
cmp testoutput test-expected-output

check_server $!

echo "query point (0.5,0.0)"
intstring 2 > testquery
floatstring 0.5 0 >> testquery

${AUDIODB} -c localhost:10014 -d testdb -Q point -f testquery > testoutput
echo testfeature 0.5 0 1 > test-expected-output
echo testfeature 0 0 0 >> test-expected-output
cmp testoutput test-expected-output
${AUDIODB} -c localhost:10014 -d testdb -Q point -f testquery -n 1 > testoutput
echo testfeature 0.5 0 1 > test-expected-output
cmp testoutput test-expected-output

stop_server $!

exit 104