Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-11 08:48:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

apply ordering and limit correctly

Browse source
This commit is contained in:
Eric House 2019-03-17 11:38:00 -07:00
parent 0b0e4af977
commit 9bde550455
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
xwords4/relay/scripts/showinplay.sh
View file

@ -6,7 +6,7 @@ FILTER_DEVS="1"
ROOMS="" ROOMS=""
CONNNAMES='' CONNNAMES=''
LIMIT=10000 LIMIT=''
usage() { usage() {
echo "usage: $0 [--limit <n>] \\" echo "usage: $0 [--limit <n>] \\"
@ -54,23 +54,28 @@ echo "; relay pid[s]: $(pidof xwrelay)"
echo -n "Row count:" $(psql -t xwgames -c "select count(*) FROM games $QUERY;") echo -n "Row count:" $(psql -t xwgames -c "select count(*) FROM games $QUERY;")
echo "; Relay sockets: $(for PID in $(pidof xwrelay); do ls /proc/$PID/fd; done | sort -un | tr '\n' ' ')" echo "; Relay sockets: $(for PID in $(pidof xwrelay); do ls /proc/$PID/fd; done | sort -un | tr '\n' ' ')"
ORDER="ORDER BY NOT dead, ctime DESC"
if [ -n "$LIMIT" ]; then
LIMIT="LIMIT $LIMIT"
fi
# Games # Games
echo "SELECT dead as d,connname,cid,room,lang as lg,clntVers as cv ,ntotal as t,nperdevice as npd,nsents as snts, seeds,devids,tokens,ack, mtimes "\ echo "SELECT dead as d,connname,cid,room,lang as lg,clntVers as cv ,ntotal as t,nperdevice as npd,nsents as snts, seeds,devids,tokens,ack, mtimes "\
"FROM games $QUERY ORDER BY NOT dead, ctime DESC LIMIT $LIMIT;" \ "FROM games $QUERY $ORDER $LIMIT;" \
| psql xwgames | psql xwgames
# Messages # Messages
echo "Unack'd msgs count:" $(psql -t xwgames -c "select count(*) FROM msgs where stime = 'epoch' AND connname IN (SELECT connname from games $QUERY);") echo "Unack'd msgs count:" $(psql -t xwgames -c "select count(*) FROM msgs where stime = 'epoch' AND connname IN (SELECT connname from games $QUERY $ORDER);")
echo "SELECT id,connName,hid as h,token,ctime,stime,devid as dest,msg64 "\ echo "SELECT id,connName,hid as h,token,ctime,stime,devid as dest,msg64 "\
"FROM msgs WHERE stime = 'epoch' AND connname IN (SELECT connname from games $QUERY) "\ "FROM msgs WHERE stime = 'epoch' AND connname IN (SELECT connname from games $QUERY $ORDER $LIMIT) "\
"ORDER BY ctime DESC, connname LIMIT $LIMIT;" \ "ORDER BY ctime DESC, connname;" \
| psql xwgames | psql xwgames
# Devices # Devices
LINE="SELECT id, model, variantCode as var, osvers, array_length(mtimes, 1) as mcnt, mtimes[1] as mtime, array_length(devTypes, 1) as dcnt, devTypes as dTyps, devids[1] as devid_1 FROM devices " LINE="SELECT id, model, variantCode as var, osvers, array_length(mtimes, 1) as mcnt, mtimes[1] as mtime, array_length(devTypes, 1) as dcnt, devTypes as dTyps, devids[1] as devid_1 FROM devices "
if [ -n "$FILTER_DEVS" ]; then if [ -n "$FILTER_DEVS" ]; then
LINE="${LINE} WHERE id IN (select UNNEST(devids) FROM games $QUERY)" LINE="${LINE} WHERE id IN (select UNNEST(devids) FROM (select devids from games $QUERY $ORDER $LIMIT) as devids)"
fi fi
LINE="$LINE ORDER BY mtimes[1] DESC LIMIT $LIMIT;" LINE="$LINE ORDER BY mtimes[1] DESC;"
echo "$LINE" | psql xwgames echo "$LINE" | psql xwgames