feat: Detect MariaDB vs MySQL automatically; remove some optimizations causing locks; fix some checks
This commit is contained in:
parent
da644bf4c1
commit
b2427c2e75
1 changed files with 63 additions and 55 deletions
|
|
@ -4,7 +4,14 @@ url=friendica.example.net
|
||||||
user=friendica
|
user=friendica
|
||||||
group=www-data
|
group=www-data
|
||||||
fileperm=660
|
fileperm=660
|
||||||
dbengine=mariadb
|
dbengine=""
|
||||||
|
if [[ -n $(type mariadb) ]]; then
|
||||||
|
dbengine="mariadb"
|
||||||
|
elif [[ -n $(type mysql) ]]; then
|
||||||
|
dbengine="mysql"
|
||||||
|
else
|
||||||
|
exit
|
||||||
|
fi
|
||||||
db=friendica
|
db=friendica
|
||||||
folder=/var/www/friendica
|
folder=/var/www/friendica
|
||||||
timeout=60
|
timeout=60
|
||||||
|
|
@ -52,16 +59,17 @@ nt=0
|
||||||
#Highest possible ID known
|
#Highest possible ID known
|
||||||
maxid=$("${dbengine}" "${db}" -B -N -q -e "select max(\`id\`) from contact")
|
maxid=$("${dbengine}" "${db}" -B -N -q -e "select max(\`id\`) from contact")
|
||||||
#Limit per batch
|
#Limit per batch
|
||||||
limit=$(((maxid / 1000) + 1))
|
#limit=$(((maxid / 1000) + 1))
|
||||||
|
limit="${maxid}"
|
||||||
dbcount=0
|
dbcount=0
|
||||||
idcount=0
|
idcount=0
|
||||||
if [[ "${intensive_optimizations}" -gt 0 ]]; then
|
if [[ "${intensive_optimizations}" -gt 0 ]]; then
|
||||||
#https:// = 8 characters | /avatar/ = 8 characters
|
#https:// = 8 characters | /avatar/ = 8 characters
|
||||||
indexlength=$(("${#url}" + 16))
|
indexlength=$(("${#url}" + 16))
|
||||||
"${dbengine}" "${db}" -e "alter table contact add index if not exists photo_index (photo(${indexlength}))"
|
"${dbengine}" "${db}" -e "alter table contact add index if not exists photo_index (photo(${indexlength}))"
|
||||||
dbcount=$("${dbengine}" "${db}" -B -N -q -e "select count(\`id\`) from \`contact\` where (\`photo\` like 'https:\/\/${url}/avatar/%' or \`photo\` like '')")
|
dbcount=$("${dbengine}" "${db}" -B -N -q -e "select count(\`id\`) from \`contact\` where (\`photo\` like 'https:\/\/${url}/avatar/%' or (\`photo\` = '' and not \`avatar\` = '') or (\`avatar\` = '' and not \`photo\` = ''))")
|
||||||
else
|
else
|
||||||
dbcount=$("${dbengine}" "${db}" -B -N -q -e "select count(\`id\`) from \`contact\` where (\`photo\` like 'https:\/\/${url}/avatar/%' or \`photo\` like '') and (\`id\` in (select \`cid\` from \`user-contact\`) or \`id\` in (select \`uid\` from \`user\`) or \`id\` in (select \`contact-id\` from \`group_member\`))")
|
dbcount=$("${dbengine}" "${db}" -B -N -q -e "select count(\`id\`) from \`contact\` where (\`photo\` like 'https:\/\/${url}/avatar/%' or (\`photo\` = '' and not \`avatar\` = '') or (\`avatar\` = '' and not \`photo\` = '')) and (\`id\` in (select \`cid\` from \`user-contact\`) or \`id\` in (select \`uid\` from \`user\`) or \`id\` in (select \`contact-id\` from \`group_member\`))")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
loop() {
|
loop() {
|
||||||
|
|
@ -295,63 +303,63 @@ loop() {
|
||||||
#Go to the Friendica installation
|
#Go to the Friendica installation
|
||||||
cd "${folder}" || exit
|
cd "${folder}" || exit
|
||||||
echo "${n} ${nt}" >"${nfile}"
|
echo "${n} ${nt}" >"${nfile}"
|
||||||
until [[ "${idcount}" -ge "${dbcount}" || "${nt}" -gt "${dbcount}" || "${lastid}" -gt "${maxid}" ]]; do
|
#until [[ "${idcount}" -ge "${dbcount}" || "${nt}" -gt "${dbcount}" || "${lastid}" -gt "${maxid}" ]]; do
|
||||||
c=""
|
c=""
|
||||||
if [[ "${intensive_optimizations}" -gt 0 ]]; then
|
if [[ "${intensive_optimizations}" -gt 0 ]]; then
|
||||||
c=$("${dbengine}" "${db}" -B -N -q -e "select \`id\` from \`contact\` where \`id\` > ${lastid} and (\`photo\` like \"https:\/\/${url}/avatar/%\" or \`photo\` like \"\") order by id limit ${limit}")
|
c=$("${dbengine}" "${db}" -B -N -q -e "select \`id\` from \`contact\` where \`id\` > ${lastid} and (\`photo\` like 'https:\/\/${url}/avatar/%' or (\`photo\` = '' and not \`avatar\` = '') or (\`avatar\` = '' and not \`photo\` = '')) order by id limit ${limit}")
|
||||||
else
|
else
|
||||||
c=$("${dbengine}" "${db}" -B -N -q -e "select \`id\` from \`contact\` where \`id\` > ${lastid} and (\`photo\` like \"https:\/\/${url}/avatar/%\" or \`photo\` like \"\") and (id in (select cid from \`user-contact\`) or id in (select \`uid\` from \`user\`) or \`id\` in (select \`contact-id\` from \`group_member\`)) order by id limit ${limit}")
|
c=$("${dbengine}" "${db}" -B -N -q -e "select \`id\` from \`contact\` where \`id\` > ${lastid} and (\`photo\` like 'https:\/\/${url}/avatar/%' or (\`photo\` = '' and not \`avatar\` = '') or (\`avatar\` = '' and not \`photo\` = '')) and (id in (select cid from \`user-contact\`) or id in (select \`uid\` from \`user\`) or \`id\` in (select \`contact-id\` from \`group_member\`)) order by id limit ${limit}")
|
||||||
|
fi
|
||||||
|
while read -r id; do
|
||||||
|
if [[ -n "${id}" && $((10#${id})) -ge "${lastid}" ]]; then
|
||||||
|
lastid=$((10#${id}))
|
||||||
|
id=$((10#${id}))
|
||||||
fi
|
fi
|
||||||
while read -r id; do
|
if [[ -n "${lastid}" ]]; then
|
||||||
if [[ -n "${id}" && $((10#${id})) -ge "${lastid}" ]]; then
|
idcount=$((idcount + 1))
|
||||||
lastid=$((10#${id}))
|
loop &
|
||||||
id=$((10#${id}))
|
fi
|
||||||
fi
|
until [[ $(jobs -r -p | wc -l) -lt $(($(getconf _NPROCESSORS_ONLN) * thread_multiplier)) ]]; do
|
||||||
if [[ -n "${lastid}" ]]; then
|
wait -n
|
||||||
idcount=$((idcount + 1))
|
done
|
||||||
loop &
|
done < <(echo "${c}")
|
||||||
fi
|
wait
|
||||||
until [[ $(jobs -r -p | wc -l) -lt $(($(getconf _NPROCESSORS_ONLN) * thread_multiplier)) ]]; do
|
#Read data before next iteration
|
||||||
wait -n
|
rl=0
|
||||||
done
|
(
|
||||||
done < <(echo "${c}")
|
sleep 60s
|
||||||
wait
|
if [[ "${rl}" -eq 0 ]]; then rm -rf "${nlock}"; fi
|
||||||
#Read data before next iteration
|
) &
|
||||||
rl=0
|
while [[ "${rl}" -eq 0 ]]; do
|
||||||
(
|
if [[ ! -f "${nlock}" ]]; then
|
||||||
sleep 60s
|
touch "${nlock}"
|
||||||
if [[ "${rl}" -eq 0 ]]; then rm -rf "${nlock}"; fi
|
fi
|
||||||
) &
|
if [[ -f "${nlock}" && $(cat "${nlock}" 2>/dev/null || echo "") == "" ]]; then
|
||||||
while [[ "${rl}" -eq 0 ]]; do
|
rm -rf "${nlock}" && touch "${nlock}" && echo "${lastid}" | tee "${nlock}" &>/dev/null
|
||||||
if [[ ! -f "${nlock}" ]]; then
|
if [[ -f "${nlock}" && $(grep -e "[0-9]" "${nlock}" 2>/dev/null || echo 0) == "${lastid}" ]]; then
|
||||||
touch "${nlock}"
|
read -r n_tmp_l nt_tmp_l <"${nfile}" || break
|
||||||
fi
|
if [[ -n "${n_tmp_l}" && -n "${nt_tmp_l}" ]]; then
|
||||||
if [[ -f "${nlock}" && $(cat "${nlock}" 2>/dev/null || echo "") == "" ]]; then
|
n="${n_tmp_l}"
|
||||||
rm -rf "${nlock}" && touch "${nlock}" && echo "${lastid}" | tee "${nlock}" &>/dev/null
|
nt="${nt_tmp_l}"
|
||||||
if [[ -f "${nlock}" && $(grep -e "[0-9]" "${nlock}" 2>/dev/null || echo 0) == "${lastid}" ]]; then
|
if [[ -f "${nlock}" ]]; then
|
||||||
read -r n_tmp_l nt_tmp_l <"${nfile}" || break
|
|
||||||
if [[ -n "${n_tmp_l}" && -n "${nt_tmp_l}" ]]; then
|
|
||||||
n="${n_tmp_l}"
|
|
||||||
nt="${nt_tmp_l}"
|
|
||||||
if [[ -f "${nlock}" ]]; then
|
|
||||||
rm -rf "${nlock}" && touch "${nlock}" && echo "" >"${nlock}"
|
|
||||||
fi
|
|
||||||
rl=1
|
|
||||||
fi
|
|
||||||
elif [[ -f "${nlock}" ]]; then
|
|
||||||
nlm=$(grep -e "[0-9]" "${nlock}" 2>/dev/null || echo 0)
|
|
||||||
if [[ -n "${nlm}" ]]; then
|
|
||||||
nlmt=$((10#${nlm}))
|
|
||||||
if [[ "${nlmt}" -lt $((id + limit)) ]]; then
|
|
||||||
rm -rf "${nlock}" && touch "${nlock}" && echo "" >"${nlock}"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
rm -rf "${nlock}" && touch "${nlock}" && echo "" >"${nlock}"
|
rm -rf "${nlock}" && touch "${nlock}" && echo "" >"${nlock}"
|
||||||
fi
|
fi
|
||||||
|
rl=1
|
||||||
|
fi
|
||||||
|
elif [[ -f "${nlock}" ]]; then
|
||||||
|
nlm=$(grep -e "[0-9]" "${nlock}" 2>/dev/null || echo 0)
|
||||||
|
if [[ -n "${nlm}" ]]; then
|
||||||
|
nlmt=$((10#${nlm}))
|
||||||
|
if [[ "${nlmt}" -lt $((id + limit)) ]]; then
|
||||||
|
rm -rf "${nlock}" && touch "${nlock}" && echo "" >"${nlock}"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
rm -rf "${nlock}" && touch "${nlock}" && echo "" >"${nlock}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
fi
|
||||||
done
|
done
|
||||||
|
#done
|
||||||
if [[ -f "${nfile}" ]]; then
|
if [[ -f "${nfile}" ]]; then
|
||||||
rm -rf "${nfile}"
|
rm -rf "${nfile}"
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue