Changeset 94722 in spip-zone for _plugins_/acces_restreint

Timestamp:

Jan 23, 2016, 2:57:58 PM (5 years ago)

Author:

cedric@…

Message:

Perf issue : forcer les sous-requetes en uncorrelated ​http://stackoverflow.com/questions/6135376/mysql-select-where-field-in-subquery-extremely-slow-why#6157797

Location:

_plugins_/acces_restreint/trunk

Files:

• paquet.xml (modified) (1 diff)
• public/accesrestreint.php (modified) (5 diffs)

_plugins_/acces_restreint/trunk/paquet.xml

@@ -2 +2 @@
         prefix="accesrestreint"
         categorie="auteur"
-        version="3.13.6"
+        version="3.14.0"
         etat="dev"
         compatibilite="[3.0.0;3.1.*]"

_plugins_/acces_restreint/trunk/public/accesrestreint.php

@@ -139 +139 @@
 function accesrestreint_articles_accessibles_where($primary, $_publique=''){
         # hack : on utilise zzz pour eviter que l'optimiseur ne confonde avec un morceau de la requete principale
-        $where =  "array('NOT IN','$primary','('.sql_get_select('zzza.id_article','spip_articles as zzza',".accesrestreint_rubriques_accessibles_where('zzza.id_rubrique','',$_publique).",'','','','',\$connect).')')";
+        $where =  "array('NOT IN','$primary','(SELECT * FROM('.sql_get_select('zzza.id_article','spip_articles as zzza',".accesrestreint_rubriques_accessibles_where('zzza.id_rubrique','',$_publique).",'','','','',\$connect).') AS subquery)')";
         $where = "array('AND', $where, ".accesrestreint_objets_accessibles_where('articles', $primary, 'not', $_publique).")";
         return $where;
@@ -153 +153 @@
 function accesrestreint_breves_accessibles_where($primary, $_publique=''){
         # hack : on utilise zzz pour eviter que l'optimiseur ne confonde avec un morceau de la requete principale
-        $where = "array('NOT IN','$primary','('.sql_get_select('zzzb.id_breve','spip_breves as zzzb',".accesrestreint_rubriques_accessibles_where('zzzb.id_rubrique','',$_publique).",'','','','',\$connect).')')";
+        $where = "array('NOT IN','$primary','(SELECT * FROM('.sql_get_select('zzzb.id_breve','spip_breves as zzzb',".accesrestreint_rubriques_accessibles_where('zzzb.id_rubrique','',$_publique).",'','','','',\$connect).') AS subquery)')";
         $where = "array('AND', $where, ".accesrestreint_objets_accessibles_where('breves', $primary, 'not', $_publique).")";
         return $where;
@@ -167 +167 @@
 function accesrestreint_syndic_articles_accessibles_where($primary, $_publique=''){
         # hack : on utilise zzz pour eviter que l'optimiseur ne confonde avec un morceau de la requete principale
-        $where = "array('NOT IN','$primary','('.sql_get_select('zzzs.id_syndic','spip_syndic as zzzs',".accesrestreint_rubriques_accessibles_where('zzzs.id_rubrique','',$_publique).",'','','','',\$connect).')')";
+        $where = "array('NOT IN','$primary','(SELECT * FROM('.sql_get_select('zzzs.id_syndic','spip_syndic as zzzs',".accesrestreint_rubriques_accessibles_where('zzzs.id_rubrique','',$_publique).",'','','','',\$connect).') AS subquery)')";
         $where = "array('AND', $where, ".accesrestreint_objets_accessibles_where('syndic', $primary, 'not', $_publique).")";
         return $where;
@@ -192 +192 @@
         $where = "array('OR',$where,sql_in('zzzf.objet',\"'rubrique','article','breve'\",'NOT',\$connect))";
         
-        return "array('IN','$primary','('.sql_get_select('zzzf.id_forum','spip_forum as zzzf',array($where),'','','','',\$connect).')')";
+        return "array('IN','$primary','(SELECT * FROM('.sql_get_select('zzzf.id_forum','spip_forum as zzzf',array($where),'','','','',\$connect).') AS subquery)')";
 }
 
@@ -212 +212 @@
         
         $where = "array('OR',
-        array('IN','$primary','('.sql_get_select('zzzd.id_document','spip_documents_liens as zzzd',array($where),'','','','',\$connect).')'),
-        array('NOT IN','$primary','('.sql_get_select('zzzd.id_document','spip_documents_liens as zzzd','','','','','',\$connect).')')
+        array('IN','$primary','(SELECT * FROM('.sql_get_select('zzzd.id_document','spip_documents_liens as zzzd',array($where),'','','','',\$connect).') AS subquery)'),
+        array('NOT IN','$primary','(SELECT * FROM('.sql_get_select('zzzd.id_document','spip_documents_liens as zzzd','','','','','',\$connect).') AS subquery)')
         )";