use seek pagination instead of offset

- slightly better performance - easier to read than extra explicitely requested entries for fixing fossar#774
niol · Jan 2, 2017 · 1aff08c · 1aff08c
1 parent 12fedd2
commit 1aff08c
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 14 deletions.
diff --git a/daos/mysql/Items.php b/daos/mysql/Items.php
@@ -233,9 +233,34 @@ public function get($options = array()) {
             $where[] = "items.updatetime > :updatedsince ";
         }
 
+        // seek pagination (alternative to offset)
+        if( isset($options['offset_from_datetime'])
+            && strlen($options['offset_from_datetime']) > 0
+            && isset($options['offset_from_id'])
+            && is_numeric($options['offset_from_id']) ) {
+
+            $params[':offset_from_datetime'] = array(
+                $options['offset_from_datetime'], \PDO::PARAM_STR
+            );
+            $params[':offset_from_id'] = array(
+                $options['offset_from_id'], \PDO::PARAM_INT
+            );
+            $ltgt = null;
+            if( $order == 'ASC' )
+                $ltgt = '>';
+            else
+                $ltgt = '<';
+
+            $where[] = "(items.datetime, items.id) $ltgt (:offset_from_datetime, :offset_from_id)";
+        }
+
         $where_ids = '';
         // extra ids to include in stream
-        if( isset($options['extra_ids']) ) {
+        if( isset($options['extra_ids'])
+            && count($options['extra_ids']) > 0
+            // limit the query to a sensible max
+            && count($options['extra_ids']) <= \F3::get('items_perpage') ) {
+
             $extra_ids_stmt = $this->stmt->intRowMatches('items.id',
                                                          $options['extra_ids']);
             if( !is_null($extra_ids_stmt) )

diff --git a/public/js/selfoss-base.js b/public/js/selfoss-base.js
@@ -13,6 +13,8 @@ var selfoss = {
      */
     filter: {
         offset: 0,
+        offset_from_datetime: null,
+        offset_from_id: null,
         itemsPerPage: 0,
         search: '',
         type: 'newest',
@@ -147,6 +149,19 @@ var selfoss = {
             return true;
         return false;
     },
+
+
+    /**
+     * reset filter
+     *
+     * @return void
+     */
+    filterReset: function() {
+        selfoss.filter.offset = 0;
+        selfoss.filter.offset_from_datetime = null;
+        selfoss.filter.offset_from_id = null;
+        selfoss.filter.extra_ids.length = 0;
+    },
 
 
     /**
@@ -434,8 +449,7 @@ var selfoss = {
 
         // close opened entry and list
         location.hash = selfoss.events.path;
-        selfoss.filter.extra_ids.length = 0;
-        selfoss.filter.offset = 0;
+        selfoss.filterReset();
 
         $.ajax({
             url: $('base').attr('href') + 'mark',

diff --git a/public/js/selfoss-events-entries.js b/public/js/selfoss-events-entries.js
@@ -139,7 +139,9 @@ selfoss.events.entries = function(e) {
     // more
     $('.stream-more').unbind('click').click(function () {
         var streamMore = $(this);
-        selfoss.filter.offset += selfoss.filter.itemsPerPage;
+        var lastEntry = $('.entry').filter(':last');
+        selfoss.filter.offset_from_datetime = lastEntry.data('entry-datetime');
+        selfoss.filter.offset_from_id = lastEntry.data('entry-id');
 
         streamMore.addClass('loading');
         $.ajax({

diff --git a/public/js/selfoss-events-entriestoolbar.js b/public/js/selfoss-events-entriestoolbar.js
@@ -192,10 +192,6 @@ selfoss.events.entriesToolbar = function(parent) {
                 url: $('base').attr('href') + (unread ? 'mark/' : 'unmark/') + id,
                 data: { ajax: true },
                 type: 'POST',
-                success: function(data) {
-                    if( unread )
-                        selfoss.filter.extra_ids.push(id);
-                },
                 error: function(jqXHR, textStatus, errorThrown) {
                     // rollback ui changes
                     updateStats(!unread);

diff --git a/public/js/selfoss-events-search.js b/public/js/selfoss-events-search.js
@@ -36,8 +36,7 @@ selfoss.events.search = function() {
 
         // execute search
         $('#search').removeClass('active');
-        selfoss.filter.offset = 0;
-        selfoss.filter.extra_ids.length = 0;
+        selfoss.filterReset();
         selfoss.filter.search = term;
         selfoss.reloadList();
 
@@ -90,8 +89,7 @@ selfoss.events.search = function() {
             return;
         }
 
-        selfoss.filter.offset = 0;
-        selfoss.filter.extra_ids.length = 0;
+        selfoss.filterReset();
         selfoss.filter.search = '';
         $('#search-list').hide();
         $('#search-list').html('');

diff --git a/public/js/selfoss-events.js b/public/js/selfoss-events.js
@@ -89,11 +89,11 @@ selfoss.events = {
                 var sourceId = parseInt(selfoss.events.subsection.substr(7));
                 if( sourceId ) {
                     selfoss.filter.source = sourceId;
+                    selfoss.filter.sourcesNav = true;
                 }
             }
 
-            selfoss.filter.offset = 0;
-            selfoss.filter.extra_ids.length = 0;
+            selfoss.filterReset();
 
             $('#nav-filter-'+selfoss.events.section).click();
             selfoss.reloadList();

diff --git a/templates/item.phtml b/templates/item.phtml
@@ -22,6 +22,7 @@
 <div id="entry<?PHP echo $this->item['id']; ?>"
      data-entry-id="<?PHP echo $this->item['id']; ?>"
      data-entry-source="<?PHP echo $this->item['source']; ?>"
+     data-entry-datetime="<?PHP echo $this->item['datetime']; ?>"
      class="entry
             <?PHP echo $this->item['unread']==1 ? 'unread' : ''; ?>" role="article">