- performance improvement: skip SEARCH command when mailbox is empty and SE...

alecpl

2010-06-04 309f49f09bc8b663a3ddf834ca0e79f909a0928c

- performance improvement: skip SEARCH command when mailbox is empty and SEARCH is called just after SELECT

 program/include/rcube_imap.php

@@ -476,11 +476,7 @@
                $search_str .= " UNSEEN";
            // get message count using SEARCH
            // not very performant but more precise (using UNDELETED)
            // disable THREADS for this request
            $threads = $this->threading;
            $this->threading = false;
            $index = $this->_search_index($mailbox, $search_str);
            $this->threading = $threads;
            $index = $this->conn->search($mailbox, $search_str);

            $count = is_array($index) ? count($index) : 0;


 program/include/rcube_imap_generic.php

@@ -1584,10 +1584,17 @@

    function search($folder, $criteria, $return_uid=false)
    {
        $old_sel = $this->selected;

        if (!$this->select($folder)) {
            return false;
        }

        // return empty result when folder is empty and we're just after SELECT
        if ($old_sel != $folder && !$this->exists) {
            return array();
        }

        $data = '';
        $query = 'srch1 ' . ($return_uid ? 'UID ' : '') . 'SEARCH ' . chop($criteria);