Fix: Correct some queries, make the default limit per batch higher

friendica-non-follower-featured-posts.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
-ca=100
+limit=1000
+ca=${limit}
 camax=0
-while [[ ${ca} -gt 0 ]]; do
+until [[ ${ca} -lt ${limit} ]]; do
 	ca=$(sudo mariadb friendica -B -N -q -e "delete from workerqueue where regexp_replace(regexp_replace(\`parameter\`, '\\\[', ''), '\\\]', '') not in (select \`id\` 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\`)) and \`command\` = \"UpdateContact\" limit ${ca}; select row_count();")
 	camax=$((camax + ca))
 	printf "\rUpdateContact\t\t%s\r" "${camax}"
@@ -9,9 +10,9 @@ done
 printf "\rUpdateContact\t\t%s\n\r" "${camax}"
 #echo "UpdateContact      $camax"
 
-cb=100
+cb=${limit}
 cbmax=0
-while [[ ${cb} -gt 0 ]]; do
+until [[ ${cb} -lt ${limit} ]]; do
 	cb=$(sudo mariadb friendica -B -N -q -e "delete from workerqueue where regexp_replace(regexp_replace(\`parameter\`, '\\\[', ''), '\\\]', '') not in (select \`id\` 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\`)) and \`command\` = \"ContactDiscovery\" limit ${cb}; select row_count();")
 	cbmax=$((cbmax + cb))
 	printf "\rContactDiscovery\t%s\r" "${cbmax}"
@@ -19,19 +20,19 @@ done
 printf "\rContactDiscovery\t%s\n\r" "${cbmax}"
 #echo "ContactDiscovery   $cbmax"
 
-cc=100
+cc=${limit}
 ccmax=0
-while [[ ${cc} -gt 0 ]]; do
+until [[ ${cc} -lt ${limit} ]]; do
 	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 "\rAddContact\t%s\r" "${ccmax}"
 done
-printf "\rAddContact\t%s\n\r" "${ccmax}"
+printf "\rAddContact   \t%s\n\r" "${ccmax}"
 #echo "AddContact $ccmax"
 
-cd=100
+cd=${limit}
 cdmax=0
-while [[ ${cd} -gt 0 ]]; do
+until [[ ${cd} -lt ${limit} ]]; do
 	cd=$(sudo mariadb friendica -B -N -q -e "create temporary table tmp_updategserver (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\` = \"UpdateGServer\" and regexp_replace(substring_index(substring_index(\`parameter\`, '\\\"', -2), '\\\"', 1), '\\\\\\\\', '') not in (select \`url\` from tmp_updategserver) limit ${cd}; select row_count();")
 	cdmax=$((cdmax + cd))
 	printf "\rUpdateGServer\t\t%s\r" "${cdmax}"
@@ -39,9 +40,9 @@ done
 printf "\rUpdateGServer\t\t%s\n\r" "${cdmax}"
 #echo "UpdateGServer      $cdmax"
 
-ce=100
+ce=${limit}
 cemax=0
-while [[ ${ce} -gt 0 ]]; do
+until [[ ${ce} -lt ${limit} ]]; do
 	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 "\rFetchFeaturedPosts\t%s\r" "${cemax}"
@@ -49,9 +50,9 @@ done
 printf "\rFetchFeaturedPosts\t%s\n\r" "${cemax}"
 #echo "FetchFeaturedPosts $cemax"
 
-cf=100
+cf=${limit}
 cfmax=0
-while [[ ${cf} -gt 0 ]]; do
+until [[ ${cf} -lt ${limit} ]]; do
 	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 "\rProcessQueue\t\t%s\r" "${cfmax}"
@@ -59,9 +60,9 @@ done
 printf "\rProcessQueue\t\t%s\n\r" "${cfmax}"
 #echo "ProcessQueue       $cfmax"
 
-cg=100
+cg=${limit}
 cgmax=0
-while [[ ${cg} -gt 0 ]]; do
+until [[ ${cg} -lt ${limit} ]]; 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}"