Skip to content

Commit

Permalink
Add sql_loop and sql_test scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
andrii-suse committed Jan 30, 2023
1 parent 86009a4 commit 40dc470
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 5 deletions.
11 changes: 11 additions & 0 deletions product/ma/local/sql_loop.sh.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
query=${1:-"select version(); do sleep(1);"}
sleep=${2}

mkdir -p __workdir/jobs

echo $1 $2 >> __workdir/jobs/$$.log

while : ; do
__workdir/sql "$query" >>__workdir/jobs/$$.log 2>&1 || :
[ -z "$sleep" ] || sleep $sleep
done
5 changes: 5 additions & 0 deletions product/ma/local/sql_test.sh.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
set -e
last=${@:$#} # last parameter
other=${*%${!#}} # all parameters except the last
res=$(__workdir/sql "$last")
test $other $res || ( echo FAILED: $other $res ; exit 1 )
2 changes: 1 addition & 1 deletion product/ma/local/start.sh.m4
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ set -e
[ -d __workdir/dt ] || mkdir __workdir/dt
[ -f __datadir/ibdata1 ] || __workdir/init_datadir

/usr/sbin/mariadbd --datadir=__datadir --user=$USER --socket=__workdir/.sock --skip-networking --log-error=__workdir/.cerr --pid-file=__workdir/.pid &
/usr/sbin/mariadbd --datadir=__datadir --user=$USER --socket=__workdir/.sock --skip-networking --log-error=__workdir/.cerr --pid-file=__workdir/.pid "$@" &

sleep 1
__workdir/status >& /dev/null || sleep 1
Expand Down
7 changes: 7 additions & 0 deletions product/ma/t/01-smoke-00.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ $ma/sql_tst "create table t1 as select 'x1'"
test x1 == $($ma/sql --batch -Ne "select * from t1" tst)
test x1 == $($ma/sql_tst "select * from t1")

$ma/sql_test x1 == "select * from t1"
$ma/sql_test x2 != "select * from t1"

rc=0
$ma/sql_test x2 == "select * from t1" || rc=$?
test $rc -gt 0

$ma/stop

rc=0
Expand Down
11 changes: 11 additions & 0 deletions product/pg/local/sql_loop.sh.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
query=${1:-"select version(); do sleep(1);"}
sleep=${2}

mkdir -p __workdir/jobs

echo $1 $2 >> __workdir/jobs/$$.log

while : ; do
__workdir/sql "$query" >>__workdir/jobs/$$.log 2>&1 || :
[ -z "$sleep" ] || sleep $sleep
done
5 changes: 5 additions & 0 deletions product/pg/local/sql_test.sh.m4
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
set -e
last=${@:$#} # last parameter
other=${*%${!#}} # all parameters except the last
res=$(__workdir/sql "$last")
test $other $res || ( echo FAILED: $other $res ; exit 1 )
15 changes: 11 additions & 4 deletions product/pg/t/01-smoke-00.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,18 @@ pg=$(environ pg)
$pg/start
$pg/status

$pg/create_db test
$pg/sql_test "create table t1 as select 'x1'"
$pg/create_db tst
$pg/sql_tst "create table t1 as select 'x1'"

test x1 == $($pg/sql -t -c "select * from t1" test)
test x1 == $($pg/sql_test "select * from t1")
test x1 == $($pg/sql -t -c "select * from t1" tst)
test x1 == $($pg/sql_tst "select * from t1")

$pg/sql_test x1 == "select * from t1"
$pg/sql_test x2 != "select * from t1"

rc=0
$pg/sql_test x2 == "select * from t1" || rc=$?
test $rc -gt 0

$pg/stop

Expand Down

0 comments on commit 40dc470

Please sign in to comment.