Bugfix: Search out of memory error

Should have been using a post iterator Closes ThinkUpLLC#665, closes ThinkUpLLC#666
boonebgorges · Mar 8, 2011 · 4d2e8a2 · 4d2e8a2
1 parent 8363336
commit 4d2e8a2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/tests/TestOfPostMySQLDAO.php b/tests/TestOfPostMySQLDAO.php
@@ -534,6 +534,7 @@ public function testGetAllPostIterators() {
         $dao = new PostMySQLDAO();
         $posts_it = $dao->getAllPostsIterator(18, 'twitter', 10);
         $cnt = 0;
+        $this->assertIsA($posts_it,'PostIterator');
         foreach($posts_it as $key => $value) {
             $cnt++;
         }

diff --git a/webapp/_lib/controller/class.GridController.php b/webapp/_lib/controller/class.GridController.php
@@ -104,6 +104,10 @@ public function authControl() {
                     }
                     echo '{"status":"success","posts": [' . "\n";
                     $cnt = 0;
+                    // lets make sure we have a post iterator, and not just a list of posts
+                    if( get_class($posts_it) != 'PostIterator' ) {
+                        throw Exception("Grid Search should use a PostIterator to conserve memory");
+                    } 
                     foreach($posts_it as $key => $value) {
                         $cnt++;
                         $data = array('id' => $cnt, 'text' => $value->post_text,

diff --git a/webapp/_lib/model/class.PostMySQLDAO.php b/webapp/_lib/model/class.PostMySQLDAO.php
@@ -585,7 +585,8 @@ public function getAllPosts($author_id, $network, $count, $page=1, $include_repl
     }
 
     public function getAllPostsIterator($author_id, $network, $count, $include_replies=true) {
-        return $this->getAllPostsByUserID($author_id, $network, $count, "pub_date", "DESC", $include_replies, $iterator = true);
+        return $this->getAllPostsByUserID($author_id, $network, $count, "pub_date", "DESC", $include_replies, $page = 1,
+        $iterator = true);
     }
 
     public function getAllQuestionPosts($author_id, $network, $count, $page=1) {
@@ -655,7 +656,9 @@ private function getAllPostsByUserID($author_id, $network, $count, $order_by="pu
             ':limit'=>$count,
             ':start_on_record'=>(int)$start_on_record
         );
+
         $ps = $this->execute($q, $vars);
+
         if($iterator) {
             return (new PostIterator($ps));
         }