Updated: Refactor content2 list and list_count fetch to ensure langua…

…ge mask is omitted for database performance
ezpublishlegacy · Jan 29, 2017 · ff7abdc · ff7abdc
1 parent 0176fd3
commit ff7abdc
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 9 deletions.
diff --git a/...nsion/ezecosystem/classes/kerneloverride/nolanguage/ezcontentobjecttreenodenolanguage.php b/...nsion/ezecosystem/classes/kerneloverride/nolanguage/ezcontentobjecttreenodenolanguage.php
@@ -1341,6 +1341,9 @@ static function createAttributeFilterSQLStrings( &$attributeFilter, &$sortingInf
                 {
                     if ( $justFilterCount > 0 )
                         $filterSQL['where'] .= "                            ( " . $attibuteFilterJoinSQL . " ) AND ";
+                        // EZE - KERNEL HACK TO REMOVE PERFORMANCE PROBLEMS WITH LANGUAGES. THIS CHANGE REMOVES SECTION ATTRIBUTE FILTER TRAILING AND STRING IN QUERY.
+                        // $filterSQL['where'] .= "                            ( " . $attibuteFilterJoinSQL . " ) ";
+
                 }
             } // end of 'if ( is_array( $filterArray ) )'
         }
@@ -1831,7 +1834,8 @@ static function createShowInvisibleSQLString( $useSettings, $fetchHidden = true
             $showInvisible = eZContentObjectTreeNodeNoLanguage::showInvisibleNodes();
 
         if ( !$showInvisible )
-            $showInvisibleNodesCond = 'AND ezcontentobject_tree.is_invisible = 0';
+            $showInvisibleNodesCond = ' ezcontentobject_tree.is_invisible = 0';
+            //$showInvisibleNodesCond = 'AND ezcontentobject_tree.is_invisible = 0';
 
         return $showInvisibleNodesCond;
     }
@@ -1865,7 +1869,7 @@ static function getLimitationList( &$limitation )
         {
             return $limitation;
         }
-        
+
         $currentUser = eZUser::currentUser();
         $currentUserID = $currentUser->attribute( 'contentobject_id' );
         $limitationList = array();
@@ -1963,6 +1967,7 @@ static function subTreeByNodeID( $params = false, $nodeID = 0 )
         }
 
         $attributeFilter         = eZContentObjectTreeNodeNoLanguage::createAttributeFilterSQLStrings( $params['AttributeFilter'], $sortingInfo, $language );
+
         if ( $attributeFilter === false )
         {
             return null;
@@ -2001,7 +2006,12 @@ static function subTreeByNodeID( $params = false, $nodeID = 0 )
         }
 
         $languageFilter = eZContentLanguage::languagesSQLFilter( 'ezcontentobject' );
-        $objectNameLanguageFilter = eZContentLanguage::sqlFilter( 'ezcontentobject_name', 'ezcontentobject' );
+
+        // EZE -KERNEL HACK - Disabled per content2 module fetch function is lang removed for db performance
+        // $languageFilter = eZContentLanguage::languagesSQLFilter( 'ezcontentobject' );
+        $languageFilter = '';
+        // $objectNameLanguageFilter = eZContentLanguage::sqlFilter( 'ezcontentobject_name', 'ezcontentobject' );
+        $objectNameLanguageFilter = '';
 
         if ( $language )
         {
@@ -2045,7 +2055,8 @@ static function subTreeByNodeID( $params = false, $nodeID = 0 )
             "$objectNameLanguageFilter " .
             "$showInvisibleNodesCond " .
             "$sqlPermissionChecking[where] " .
-            "$objectNameFilterSQL AND " .
+            // "$objectNameFilterSQL AND " .
+            "$objectNameFilterSQL " .
             "$languageFilter " .
             $groupBySQL;
 
@@ -2055,7 +2066,7 @@ static function subTreeByNodeID( $params = false, $nodeID = 0 )
         $db = eZDB::instance();
 
         $server = count( $sqlPermissionChecking['temp_tables'] ) > 0 ? eZDBInterface::SERVER_SLAVE : false;
-
+//print_r( $query ); die();
         $nodeListArray = $db->arrayQuery( $query, array( 'offset' => $offset,
                                                          'limit'  => $limit ),
                                                   $server );
@@ -2438,8 +2449,12 @@ static function subTreeCountByNodeID( $params = array(), $nodeID )
             $mainNodeOnlyCond = 'ezcontentobject_tree.node_id = ezcontentobject_tree.main_node_id AND';
         }
 
-        $languageFilter = ' AND '.eZContentLanguage::languagesSQLFilter( 'ezcontentobject' );
-        $objectNameLanguageFilter = eZContentLanguage::sqlFilter( 'ezcontentobject_name', 'ezcontentobject' );
+        // EZE - KERNEL PATCH - Disabled to prevent language usage query slowdown
+        //$languageFilter = ' AND '.eZContentLanguage::languagesSQLFilter( 'ezcontentobject' );
+        $languageFilter = '';
+
+        // $objectNameLanguageFilter = eZContentLanguage::sqlFilter( 'ezcontentobject_name', 'ezcontentobject' );
+        $objectNameLanguageFilter = '';
 
         if ( $language )
         {
@@ -2450,6 +2465,15 @@ static function subTreeCountByNodeID( $params = array(), $nodeID )
         $attributeFilterParam = isset( $params['AttributeFilter'] ) ? $params['AttributeFilter'] : false;
         $sortingInfo = array( 'sortCount' => 0, 'attributeJoinCount' => 0 );
         $attributeFilter = eZContentObjectTreeNodeNoLanguage::createAttributeFilterSQLStrings( $attributeFilterParam, $sortingInfo, $language );
+
+        // EZE - KERNEL PATCH - Disabled to prevent language usage query slowdown
+        $replaceStringAnd = ' AND';
+        $replaceStringAndPos = strrpos( $attributeFilter['where'], $replaceStringAnd );
+        if( $replaceStringAndPos !== false )
+        {
+            $$attributeFilter['where'] = substr_replace( $attributeFilter['where'], '', $replaceStringAndPos, strlen( $replaceStringAnd ) );
+        }
+
         if ( $attributeFilter === false )
         {
             return null;

diff --git a/ezpublish_legacy/extension/ezecosystem/design/eze/templates/parts/homepage.tpl b/ezpublish_legacy/extension/ezecosystem/design/eze/templates/parts/homepage.tpl
@@ -263,7 +263,7 @@
                      $home_page_fetch_sort_array_attribute_forum_only = array( array( 'attribute', false(), $home_page_forum_topic_publication_date ), array( 'published', false() ) )
                      $home_page_fetch_sort_array_published = array( 'published', false() )
                      $home_page_fetch_sort_array = $home_page_fetch_sort_array_published
-                     $children = fetch( 'content', 'list', hash( 'parent_node_id', $home_page_root_node_id,
+                     $children = fetch( 'content2', 'list', hash( 'parent_node_id', $home_page_root_node_id,
                                                                  'attribute_filter', array( 'and', array( 'section', '!=', $home_page_section_github ), array( 'section', '!=', $home_page_section_planet ), array( 'section', '!=', $home_page_section_issues ), array( 'section', '!=', $home_page_section_forums ) ),
                                                                  'extended_attribute_filter', hash( 'id', 'BcDateTimeExtendedFilter', 'params', hash( 'published', makedate( 1, 1, currentdate()|datetime( 'custom', '%Y' ) ) ) ),
                                                                  'offset', $view_parameters.offset,

diff --git a/ezpublish_legacy/extension/ezecosystem/modules/content2/function_definition.php b/ezpublish_legacy/extension/ezecosystem/modules/content2/function_definition.php
@@ -197,7 +197,7 @@
 
 $FunctionList['list'] = array( 'name' => 'list',
                                'operation_types' => array( 'read' ),
-                               'call_method' => array( 'class' => 'eZContentFunctionCollection',
+                               'call_method' => array( 'class' => 'eZContentFunctionCollectionNoLanguage',
                                                        'method' => 'fetchObjectTree' ),
                                'parameter_type' => 'standard',
                                'parameters' => array( array( 'name' => 'parent_node_id',