From 337fb7c15507b5ff3b1738a964660a0d1b87ebe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Sol=C3=ADs?= Date: Wed, 12 Feb 2025 21:29:26 +0000 Subject: [PATCH] feat: Add the ability to remove spurious AddContact jobs; minor fixes --- friendica-non-follower-featured-posts.sh | 34 +++++++++++++++--------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/friendica-non-follower-featured-posts.sh b/friendica-non-follower-featured-posts.sh index ebbf79a..aaf5005 100755 --- a/friendica-non-follower-featured-posts.sh +++ b/friendica-non-follower-featured-posts.sh @@ -22,12 +22,12 @@ printf "\rContactDiscovery\t%s\n\r" "${cbmax}" cc=100 ccmax=0 while [[ ${cc} -gt 0 ]]; do - cc=$(sudo mariadb friendica -B -N -q -e "create temporary table tmp_fetchfeaturedposts (select \`url\` from \`contact\` where \`id\` in (select \`contact-id\` from \`group_member\`) or \`id\` in (select \`cid\` from \`user-contact\`) or \`id\` in (select \`uid\` from \`user\`)); delete from workerqueue where \`command\`= \"FetchFeaturedPosts\" and regexp_replace(substring_index(substring_index(\`parameter\`, '\\\"', -2), '\\\"', 1), '\\\\\\\\', '') not in (select \`url\` from tmp_fetchfeaturedposts) limit ${cc}; select row_count();") + cc=$(sudo mariadb friendica -B -N -q -e "create temporary table tmp_addcontact (select \`url\` from \`contact\` where \`id\` in (select \`contact-id\` from \`group_member\`) or \`id\` in (select \`cid\` from \`user-contact\`) or \`id\` in (select \`uid\` from \`user\`)); delete from workerqueue where \`command\`= \"AddContact\" and regexp_replace(substring_index(substring_index(\`parameter\`, '\\\"', -2), '\\\"', 1), '\\\\\\\\', '') not in (select \`url\` from tmp_addcontact) limit ${cc}; select row_count();") ccmax=$((ccmax + cc)) - printf "\rFetchFeaturedPosts\t%s\r" "${ccmax}" + printf "\rAddContact\t%s\r" "${ccmax}" done -printf "\rFetchFeaturedPosts\t%s\n\r" "${ccmax}" -#echo "FetchFeaturedPosts $ccmax" +printf "\rAddContact\t%s\n\r" "${ccmax}" +#echo "AddContact $ccmax" cd=100 cdmax=0 @@ -42,19 +42,29 @@ printf "\rUpdateGServer\t\t%s\n\r" "${cdmax}" ce=100 cemax=0 while [[ ${ce} -gt 0 ]]; do - ce=$(sudo mariadb friendica -B -N -q -e "delete from workerqueue where command=\"ProcessQueue\" and pid=0 and done=0 limit ${ce}; select row_count();") + ce=$(sudo mariadb friendica -B -N -q -e "create temporary table tmp_fetchfeaturedposts (select \`url\` from \`contact\` where \`id\` in (select \`contact-id\` from \`group_member\`) or \`id\` in (select \`cid\` from \`user-contact\`) or \`id\` in (select \`uid\` from \`user\`)); delete from workerqueue where \`command\`= \"FetchFeaturedPosts\" and regexp_replace(substring_index(substring_index(\`parameter\`, '\\\"', -2), '\\\"', 1), '\\\\\\\\', '') not in (select \`url\` from tmp_fetchfeaturedposts) limit ${ce}; select row_count();") cemax=$((cemax + ce)) - printf "\rProcessQueue\t\t%s\r" "${cemax}" + printf "\rFetchFeaturedPosts\t%s\r" "${cemax}" done -printf "\rProcessQueue\t\t%s\n\r" "${cemax}" -#echo "ProcessQueue $cemax" +printf "\rFetchFeaturedPosts\t%s\n\r" "${cemax}" +#echo "FetchFeaturedPosts $cemax" cf=100 cfmax=0 while [[ ${cf} -gt 0 ]]; do - cf=$(sudo mariadb friendica -B -N -q -e "delete from workerqueue where \`id\` in (select distinct w2.\`id\` from workerqueue w1 inner join workerqueue w2 where w1.\`id\` > w2.\`id\` and w1.\`parameter\` = w2.\`parameter\` and w1.command = \"UpdateContact\" and w1.\`pid\` = 0 and w1.\`done\` = 0) limit ${cf}; select row_count();") + cf=$(sudo mariadb friendica -B -N -q -e "delete from workerqueue where command=\"ProcessQueue\" and pid=0 and done=0 limit ${cf}; select row_count();") cfmax=$((cfmax + cf)) - printf "\rWorkerQueue\t\t%s\r" "${cfmax}" + printf "\rProcessQueue\t\t%s\r" "${cfmax}" done -printf "\rWorkerQueue\t\t%s\n\r" "${cfmax}" -#echo "WorkerQueue $cfmax" +printf "\rProcessQueue\t\t%s\n\r" "${cfmax}" +#echo "ProcessQueue $cfmax" + +cg=100 +cgmax=0 +while [[ ${cg} -gt 0 ]]; do + cg=$(sudo mariadb friendica -B -N -q -e "delete from workerqueue where \`id\` in (select distinct w2.\`id\` from workerqueue w1 inner join workerqueue w2 where w1.\`id\` > w2.\`id\` and w1.\`parameter\` = w2.\`parameter\` and w1.command = \"UpdateContact\" and w1.\`pid\` = 0 and w1.\`done\` = 0) limit ${cg}; select row_count();") + cgmax=$((cgmax + cg)) + printf "\rWorkerQueue\t\t%s\r" "${cgmax}" +done +printf "\rWorkerQueue\t\t%s\n\r" "${cgmax}" +#echo "WorkerQueue $cgmax"