octoleo/telegram-bot-bash
1
1
Fork 0
mirror of https://github.com/octoleo/telegram-bot-bash.git synced 2024-12-29 05:02:46 +00:00
Code Issues Projects Releases Wiki Activity

optimze countKeyDB_async

Browse Source
This commit is contained in:
Kay Marquardt (Gnadelwartz) 2020-06-14 17:00:41 +02:00
parent de811c173a
commit 2281943940
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/jsonDB.sh
View File

@ -5,7 +5,7 @@
# This file is public domain in the USA and all free countries. # This file is public domain in the USA and all free countries.
# Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying) # Elsewhere, consider it to be WTFPLv2. (wtfpl.net/txt/copying)
# #
#### $$VERSION$$ v0.98-dev-6-ge0470aa #### $$VERSION$$ v0.98-dev-12-gde811c1
# #
# source from commands.sh to use jsonDB functions # source from commands.sh to use jsonDB functions
# #
@ -143,7 +143,7 @@ if _exists flock; then
# start atomic delete here, exclusive max wait 5 # start atomic delete here, exclusive max wait 5
{ flock -e -w 5 200 { flock -e -w 5 200
Json2Array "oldARR" <"${DB}" Json2Array "oldARR" <"${DB}"
if [ "$3" != "" ]; then if [ -n "$3" ]; then
(( oldARR["$1"]+="$3" )); (( oldARR["$1"]+="$3" ));
Array2Json "oldARR" >"${DB}" Array2Json "oldARR" >"${DB}"
else else
@ -291,14 +291,19 @@ jssh_getKeyDB_async() {
jssh_countKeyDB_async() { jssh_countKeyDB_async() {
[[ "$1" =~ ^[-a-zA-Z0-9,._]+$ ]] || return 3 [[ "$1" =~ ^[-a-zA-Z0-9,._]+$ ]] || return 3
local DB COUNT="1"; DB="$(jssh_checkDB "$2")" local DB; DB="$(jssh_checkDB "$2")"
[ "$3" != "" ] && COUNT="$3"
declare -A oldARR declare -A oldARR
# start atomic delete here, exclusive max wait 10s # start atomic delete here, exclusive max wait 5
Json2Array "oldARR" <"${DB}" Json2Array "oldARR" <"${DB}"
(( oldARR["$1"]+=COUNT )); if [ -n "$3" ]; then
Array2Json "oldARR" >"${DB}" (( oldARR["$1"]+="$3" ));
} Array2Json "oldARR" >"${DB}"
else
# it's append, but last one counts, its a simple DB ...
(( oldARR["$1"]++ ));
printf '["%s"]\t"%s"\n' "${1//,/\",\"}" "${oldARR["$1"]//\"/\\\"}" >>"${DB}"
fi
}
# updatie key/value in place to jsshDB # updatie key/value in place to jsshDB
# $1 key name, can onyl contain -a-zA-Z0-9,._ # $1 key name, can onyl contain -a-zA-Z0-9,._