nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #9019 from annando/performance

Browse source 
Some performance tweaks
This commit is contained in:
Hypolite Petovan 2020-08-16 10:07:35 -04:00 committed by GitHub
commit a7f8604d42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Model/Item.php
View file

@ -2722,8 +2722,6 @@ class Item
'owner-id' => $owner_id, 'private' => $private, 'psid' => $psid]; 'owner-id' => $owner_id, 'private' => $private, 'psid' => $psid];
self::update($fields, ['id' => $item_id]); self::update($fields, ['id' => $item_id]);
self::updateThread($item_id);
Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'Notifier', Delivery::POST, $item_id); Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], 'Notifier', Delivery::POST, $item_id);
/// @todo This code should be activated by the end of the year 2020 /// @todo This code should be activated by the end of the year 2020
@ -3285,9 +3283,8 @@ class Item
$fields = ['uid', 'guid', 'created', 'edited', 'commented', 'received', 'changed', 'post-type', $fields = ['uid', 'guid', 'created', 'edited', 'commented', 'received', 'changed', 'post-type',
'wall', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'contact-id', 'uri-id', 'wall', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'contact-id', 'uri-id',
'deleted', 'origin', 'forum_mode', 'network', 'author-id', 'owner-id']; 'deleted', 'origin', 'forum_mode', 'network', 'author-id', 'owner-id'];
$condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid];
$item = self::selectFirst($fields, $condition); $item = self::selectFirst($fields, ['id' => $itemid, 'gravity' => GRAVITY_PARENT]);
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
return; return;
} }

2
src/Model/Profile.php
View file

@ -166,7 +166,7 @@ class Profile
} }
} }
$profile = self::getByNickname($nickname, $user['uid']); $profile = User::getOwnerDataById($user['uid'], false);
if (empty($profile) && empty($profiledata)) { if (empty($profile) && empty($profiledata)) {
Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG); Logger::log('profile error: ' . DI::args()->getQueryString(), Logger::DEBUG);

9
src/Model/User.php
View file

@ -97,6 +97,8 @@ class User
* @} * @}
*/ */
private static $owner;
/** /**
* Returns true if a user record exists with the provided id * Returns true if a user record exists with the provided id
* *
@ -211,8 +213,12 @@ class User
* @return boolean|array * @return boolean|array
* @throws Exception * @throws Exception
*/ */
public static function getOwnerDataById($uid, $check_valid = true) public static function getOwnerDataById(int $uid, bool $check_valid = true)
{ {
if (!empty(self::$owner[$uid])) {
return self::$owner[$uid];
}
$owner = DBA::selectFirst('owner-view', [], ['uid' => $uid]); $owner = DBA::selectFirst('owner-view', [], ['uid' => $uid]);
if (!DBA::isResult($owner)) { if (!DBA::isResult($owner)) {
if (!DBA::exists('user', ['uid' => $uid]) || !$check_valid) { if (!DBA::exists('user', ['uid' => $uid]) || !$check_valid) {
@ -256,6 +262,7 @@ class User
$owner = self::getOwnerDataById($uid, false); $owner = self::getOwnerDataById($uid, false);
} }
self::$owner[$uid] = $owner;
return $owner; return $owner;
} }

3
static/dbstructure.config.php
View file

@ -202,7 +202,7 @@ return [
"dfrn-id" => ["dfrn-id(64)"], "dfrn-id" => ["dfrn-id(64)"],
"issued-id" => ["issued-id(64)"], "issued-id" => ["issued-id(64)"],
"network_uid_lastupdate" => ["network", "uid", "last-update"], "network_uid_lastupdate" => ["network", "uid", "last-update"],
"uid_lastitem" => ["uid", "last-item"], "uid_lastitem" => ["uid", "last-item"],
"gsid" => ["gsid"] "gsid" => ["gsid"]
] ]
], ],
@ -729,6 +729,7 @@ return [
"resource-id" => ["resource-id"], "resource-id" => ["resource-id"],
"deleted_changed" => ["deleted", "changed"], "deleted_changed" => ["deleted", "changed"],
"uid_wall_changed" => ["uid", "wall", "changed"], "uid_wall_changed" => ["uid", "wall", "changed"],
"uid_unseen_wall" => ["uid", "unseen", "wall"],
"mention_uid_id" => ["mention", "uid", "id"], "mention_uid_id" => ["mention", "uid", "id"],
"uid_eventid" => ["uid", "event-id"], "uid_eventid" => ["uid", "event-id"],
"icid" => ["icid"], "icid" => ["icid"],

2
static/dbview.config.php
View file

@ -230,7 +230,7 @@ return [
"account_removed" => ["user", "account_removed"], "account_removed" => ["user", "account_removed"],
"account_expired" => ["user", "account_expired"], "account_expired" => ["user", "account_expired"],
"account_expires_on" => ["user", "account_expires_on"], "account_expires_on" => ["user", "account_expires_on"],
"expire_notification_sent" => ["user", "expire_notification_sent"], "expire_notification_sent" => ["user", "expire_notification_sent"],
"def_gid" => ["user", "def_gid"], "def_gid" => ["user", "def_gid"],
"allow_cid" => ["user", "allow_cid"], "allow_cid" => ["user", "allow_cid"],
"allow_gid" => ["user", "allow_gid"], "allow_gid" => ["user", "allow_gid"],