aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-08-27 10:19:10 +0200
committerMario Vavti <mario@mariovavti.com>2018-08-27 10:19:10 +0200
commit6a2bbed73dfb34975c4525c34c03f20c6945dedc (patch)
treec0a211787e665587f2d84569c7c5c9492be4c6f6
parent4c1944a08dcaacf1d638af60cb1f7679cb88c192 (diff)
downloadvolse-hubzilla-6a2bbed73dfb34975c4525c34c03f20c6945dedc.tar.gz
volse-hubzilla-6a2bbed73dfb34975c4525c34c03f20c6945dedc.tar.bz2
volse-hubzilla-6a2bbed73dfb34975c4525c34c03f20c6945dedc.zip
remove distinct from network query again until performance issue is resolved or another fix for the underlying problem is found
-rw-r--r--Zotlabs/Module/Network.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 9eedf113d..ca0ec7844 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -510,7 +510,7 @@ class Network extends \Zotlabs\Web\Controller {
if($load) {
// Fetch a page full of parent items for this page
- $r = q("SELECT DISTINCT(item.parent) AS item_id FROM item
+ $r = q("SELECT item.parent AS item_id FROM item
left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
$net_query
WHERE true $uids $item_thread_top $item_normal
@@ -524,7 +524,7 @@ class Network extends \Zotlabs\Web\Controller {
else {
// this is an update
- $r = q("SELECT DISTINCT(item.parent) AS item_id FROM item
+ $r = q("SELECT item.parent AS item_id FROM item
left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
$net_query
WHERE true $uids $item_normal_update $simple_update