Improved query speed

diff --git a/boot.php b/boot.php
index 98db95227fa096256643e355099b1c086bba852e..732816d1b9354f28010bdbfa67a85f2055060809 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -39,7 +39,7 @@ define('FRIENDICA_PLATFORM',     'Friendica');
 define('FRIENDICA_CODENAME',     'Asparagus');
 define('FRIENDICA_VERSION',      '3.6-dev');
 define('DFRN_PROTOCOL_VERSION',  '2.23');
-define('DB_UPDATE_VERSION',      1247);
+define('DB_UPDATE_VERSION',      1248);
 define('NEW_UPDATE_ROUTINE_VERSION', 1170);
 
 /**

diff --git a/database.sql b/database.sql
index d6a869b56bed808b78dd983df2a84ced97fd0e40..7433213107192607eda5c10a964d2954750d3dee 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 3.6-dev (Asparagus)
--- DB_UPDATE_VERSION 1246
+-- DB_UPDATE_VERSION 1248
 -- ------------------------------------------
 
 
@@ -982,7 +982,7 @@ CREATE TABLE IF NOT EXISTS `thread` (
         INDEX `uid_created` (`uid`,`created`),
         INDEX `uid_commented` (`uid`,`commented`),
         INDEX `uid_wall_created` (`uid`,`wall`,`created`),
-        INDEX `private_wall_commented` (`private`,`wall`,`commented`)
+        INDEX `private_wall_origin_commented` (`private`,`wall`,`origin`,`commented`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
 --

diff --git a/mod/community.php b/mod/community.php
index f1b747917ce6100ff1398e6deec73e0b6e89e6e4..29fcd447944fc2020362f0099038155be2fceb67 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -183,14 +183,11 @@ function community_content(App $a, $update = 0)
 function community_getitems($start, $itemspage, $content)
 {
        if ($content == 'local') {
-               $r = dba::p("SELECT " . item_fieldlists() . " FROM `thread`
+               $r = dba::p("SELECT `item`.`uri`, `item`.`author-link` FROM `thread`
                        INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
                        INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
-                       AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
-                       AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''" .
-                       item_joins() . " AND `contact`.`self`
                        WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
-                       AND NOT `thread`.`private` AND `thread`.`wall`
+                       AND NOT `thread`.`private` AND `thread`.`wall` AND `thread`.`origin`
                        ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage)
                );
                return dba::inArray($r);

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 169d84e34d19fda3d797a9480ad0627e76e35048..6c4ceec48ede5247c9e857ee555624d52ab3893c 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -1686,7 +1686,7 @@ class DBStructure
                                                "uid_created" => ["uid","created"],
                                                "uid_commented" => ["uid","commented"],
                                                "uid_wall_created" => ["uid","wall","created"],
-                                               "private_wall_commented" => ["private","wall","commented"],
+                                               "private_wall_origin_commented" => ["private","wall","origin","commented"],
                                                ]
                                ];
                $database["tokens"] = [