remove some more distinct in queries and observe any regressions. this is related to issue #1079 and commit d47ea20aa8
This commit is contained in:
parent
a8b78dc1f5
commit
bef5be827d
@ -210,7 +210,6 @@ class Network extends \Zotlabs\Web\Controller {
|
|||||||
|
|
||||||
$sql_nets = '';
|
$sql_nets = '';
|
||||||
|
|
||||||
$distinct = '';
|
|
||||||
$item_thread_top = ' AND item_thread_top = 1 ';
|
$item_thread_top = ' AND item_thread_top = 1 ';
|
||||||
|
|
||||||
$sql_extra = '';
|
$sql_extra = '';
|
||||||
@ -229,7 +228,6 @@ class Network extends \Zotlabs\Web\Controller {
|
|||||||
$contact_str = ' 0 ';
|
$contact_str = ' 0 ';
|
||||||
info( t('Privacy group is empty'));
|
info( t('Privacy group is empty'));
|
||||||
}
|
}
|
||||||
$distinct = ' distinct ';
|
|
||||||
$item_thread_top = '';
|
$item_thread_top = '';
|
||||||
$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str )) or allow_gid like '" . protect_sprintf('%<' . dbesc($group_hash) . '>%') . "' ) and id = parent $item_normal ) ";
|
$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND (( author_xchan IN ( $contact_str ) OR owner_xchan in ( $contact_str )) or allow_gid like '" . protect_sprintf('%<' . dbesc($group_hash) . '>%') . "' ) and id = parent $item_normal ) ";
|
||||||
|
|
||||||
@ -254,7 +252,6 @@ class Network extends \Zotlabs\Web\Controller {
|
|||||||
intval(local_channel())
|
intval(local_channel())
|
||||||
);
|
);
|
||||||
if($r) {
|
if($r) {
|
||||||
$distinct = ' distinct ';
|
|
||||||
$item_thread_top = '';
|
$item_thread_top = '';
|
||||||
$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($r[0]['abook_xchan']) . "' or owner_xchan = '" . dbesc($r[0]['abook_xchan']) . "' ) $item_normal ) ";
|
$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($r[0]['abook_xchan']) . "' or owner_xchan = '" . dbesc($r[0]['abook_xchan']) . "' ) $item_normal ) ";
|
||||||
$title = replace_macros(get_markup_template("section_title.tpl"),array(
|
$title = replace_macros(get_markup_template("section_title.tpl"),array(
|
||||||
@ -274,7 +271,6 @@ class Network extends \Zotlabs\Web\Controller {
|
|||||||
dbesc($xchan)
|
dbesc($xchan)
|
||||||
);
|
);
|
||||||
if($r) {
|
if($r) {
|
||||||
$distinct = ' distinct ';
|
|
||||||
$item_thread_top = '';
|
$item_thread_top = '';
|
||||||
$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($xchan) . "' or owner_xchan = '" . dbesc($xchan) . "' ) $item_normal ) ";
|
$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($xchan) . "' or owner_xchan = '" . dbesc($xchan) . "' ) $item_normal ) ";
|
||||||
$title = replace_macros(get_markup_template("section_title.tpl"),array(
|
$title = replace_macros(get_markup_template("section_title.tpl"),array(
|
||||||
@ -381,7 +377,6 @@ class Network extends \Zotlabs\Web\Controller {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if($conv) {
|
if($conv) {
|
||||||
$distinct = ' distinct ';
|
|
||||||
$item_thread_top = '';
|
$item_thread_top = '';
|
||||||
$sql_extra .= sprintf(" AND parent IN (SELECT distinct(parent) from item where ( author_xchan like '%s' or item_mentionsme = 1 )) ",
|
$sql_extra .= sprintf(" AND parent IN (SELECT distinct(parent) from item where ( author_xchan like '%s' or item_mentionsme = 1 )) ",
|
||||||
dbesc(protect_sprintf($channel['channel_hash']))
|
dbesc(protect_sprintf($channel['channel_hash']))
|
||||||
@ -487,7 +482,7 @@ class Network extends \Zotlabs\Web\Controller {
|
|||||||
if($load) {
|
if($load) {
|
||||||
|
|
||||||
// Fetch a page full of parent items for this page
|
// 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 )
|
left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
|
||||||
$net_query
|
$net_query
|
||||||
WHERE true $uids $item_thread_top $item_normal
|
WHERE true $uids $item_thread_top $item_normal
|
||||||
|
@ -224,7 +224,7 @@ class Pubstream extends \Zotlabs\Web\Controller {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$r = q("SELECT distinct parent AS item_id, $ordering FROM item
|
$r = q("SELECT parent AS item_id FROM item
|
||||||
left join abook on item.author_xchan = abook.abook_xchan
|
left join abook on item.author_xchan = abook.abook_xchan
|
||||||
$net_query
|
$net_query
|
||||||
WHERE true $uids $item_normal_update
|
WHERE true $uids $item_normal_update
|
||||||
|
Reference in New Issue
Block a user