UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-09-20 16:28:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4378 from pixelfed/staging

Browse source 
Update CommentPipeline, replace expensive query and mark for refactor
This commit is contained in:
daniel 2023-05-13 17:38:33 -06:00 committed by GitHub
commit e3bf01c5a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Jobs/CommentPipeline/CommentPipeline.php
View file

@ -60,10 +60,12 @@ class CommentPipeline implements ShouldQueue
$actor = $comment->profile; $actor = $comment->profile;
if(config('database.default') === 'mysql') { if(config('database.default') === 'mysql') {
$exp = DB::raw("select id, in_reply_to_id from statuses, (select @pv := :kid) initialisation where id > @pv and find_in_set(in_reply_to_id, @pv) > 0 and @pv := concat(@pv, ',', id)"); // todo: refactor
$expQuery = $exp->getValue(DB::connection()->getQueryGrammar()); // $exp = DB::raw("select id, in_reply_to_id from statuses, (select @pv := :kid) initialisation where id > @pv and find_in_set(in_reply_to_id, @pv) > 0 and @pv := concat(@pv, ',', id)");
$count = DB::select($expQuery, [ 'kid' => $status->id ]); // $expQuery = $exp->getValue(DB::connection()->getQueryGrammar());
$status->reply_count = count($count); // $count = DB::select($expQuery, [ 'kid' => $status->id ]);
// $status->reply_count = count($count);
$status->reply_count = $status->reply_count + 1;
$status->save(); $status->save();
} else { } else {
$status->reply_count = $status->reply_count + 1; $status->reply_count = $status->reply_count + 1;

10
app/Jobs/StatusPipeline/StatusReplyPipeline.php
View file

@ -70,10 +70,12 @@ class StatusReplyPipeline implements ShouldQueue
} }
if(config('database.default') === 'mysql') { if(config('database.default') === 'mysql') {
$exp = DB::raw("select id, in_reply_to_id from statuses, (select @pv := :kid) initialisation where id > @pv and find_in_set(in_reply_to_id, @pv) > 0 and @pv := concat(@pv, ',', id)"); // todo: refactor
$expQuery = $exp->getValue(DB::connection()->getQueryGrammar()); // $exp = DB::raw("select id, in_reply_to_id from statuses, (select @pv := :kid) initialisation where id > @pv and find_in_set(in_reply_to_id, @pv) > 0 and @pv := concat(@pv, ',', id)");
$count = DB::select($expQuery, [ 'kid' => $reply->id ]); // $expQuery = $exp->getValue(DB::connection()->getQueryGrammar());
$reply->reply_count = count($count); // $count = DB::select($expQuery, [ 'kid' => $reply->id ]);
// $reply->reply_count = count($count);
$reply->reply_count = $reply->reply_count + 1;
$reply->save(); $reply->save();
} else { } else {
$reply->reply_count = $reply->reply_count + 1; $reply->reply_count = $reply->reply_count + 1;