From 9703b1903409771a6c4d05e0d38dff9941d3750c Mon Sep 17 00:00:00 2001
From: Christoffer Vig <christoffer.vig@comperiosearch.com>
Date: Thu, 28 May 2015 18:00:21 +0200
Subject: [PATCH 1/4] no need for custom sort when sort by _score

---
 src/kibana/plugins/discover/controllers/discover.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/kibana/plugins/discover/controllers/discover.js b/src/kibana/plugins/discover/controllers/discover.js
index e02a8d9cac91..d1422beeaa2f 100644
--- a/src/kibana/plugins/discover/controllers/discover.js
+++ b/src/kibana/plugins/discover/controllers/discover.js
@@ -321,6 +321,7 @@ define(function (require) {
        */
       var sortBy = (function () {
         if (!_.isArray(sort)) return 'implicit';
+        else if (sort[0] === '_score') return 'implicit';
         else if (sort[0] === timeField) return 'time';
         else return 'non-time';
       }());

From 5077e2b8012c1ea4de580f5389809b590cb98708 Mon Sep 17 00:00:00 2001
From: Jim Unger <jim.unger@elastic.co>
Date: Wed, 22 Jul 2015 11:51:20 -0500
Subject: [PATCH 2/4] Require a single segment request when sorting by _score

---
 .../courier/fetch/request/_segmented_handle.js           | 1 +
 src/kibana/components/courier/fetch/request/segmented.js | 9 +++++++++
 src/kibana/plugins/discover/controllers/discover.js      | 1 +
 3 files changed, 11 insertions(+)

diff --git a/src/kibana/components/courier/fetch/request/_segmented_handle.js b/src/kibana/components/courier/fetch/request/_segmented_handle.js
index bc45848f11ed..f898dd4f05cb 100644
--- a/src/kibana/components/courier/fetch/request/_segmented_handle.js
+++ b/src/kibana/components/courier/fetch/request/_segmented_handle.js
@@ -21,6 +21,7 @@ define(function (require) {
       // export a couple methods from the request
       this.setDirection = _.bindKey(req, 'setDirection');
       this.setSize = _.bindKey(req, 'setSize');
+      this.setMaxSegments = _.bindKey(req, 'setMaxSegments');
     }
 
     return SegmentedHandle;
diff --git a/src/kibana/components/courier/fetch/request/segmented.js b/src/kibana/components/courier/fetch/request/segmented.js
index 9ee42707a42a..17d7d1326f56 100644
--- a/src/kibana/components/courier/fetch/request/segmented.js
+++ b/src/kibana/components/courier/fetch/request/segmented.js
@@ -118,6 +118,15 @@ define(function (require) {
      ** SegmentedReq specific methods
      *********/
 
+    /**
+     * Set the sort total number of segments to emit
+     *
+     * @param {number}
+     */
+    SegmentedReq.prototype.setMaxSegments = function (maxSegments) {
+      this._maxSegments = _.parseInt(maxSegments);
+    };
+
     /**
      * Set the sort direction for the request.
      *
diff --git a/src/kibana/plugins/discover/controllers/discover.js b/src/kibana/plugins/discover/controllers/discover.js
index 7e5657f976f2..df6f69401864 100644
--- a/src/kibana/plugins/discover/controllers/discover.js
+++ b/src/kibana/plugins/discover/controllers/discover.js
@@ -332,6 +332,7 @@ define(function (require) {
       }
 
       $scope.updateTime();
+      if (sort[0] === '_score') segmented.setMaxSegments(1);
       segmented.setDirection(sortBy === 'time' ? (sort[1] || 'desc') : 'desc');
       segmented.setSize(sortBy === 'time' ? $scope.opts.sampleSize : false);
 

From ecf90740f7a1cd6c5d674cca72caa351fababf15 Mon Sep 17 00:00:00 2001
From: Jim Unger <jim.unger@elastic.co>
Date: Tue, 28 Jul 2015 12:17:48 -0500
Subject: [PATCH 3/4] Adds bounds checking to maxSegments assignment

---
 src/kibana/components/courier/fetch/request/segmented.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/kibana/components/courier/fetch/request/segmented.js b/src/kibana/components/courier/fetch/request/segmented.js
index 17d7d1326f56..b6db4ebf6fe5 100644
--- a/src/kibana/components/courier/fetch/request/segmented.js
+++ b/src/kibana/components/courier/fetch/request/segmented.js
@@ -124,7 +124,7 @@ define(function (require) {
      * @param {number}
      */
     SegmentedReq.prototype.setMaxSegments = function (maxSegments) {
-      this._maxSegments = _.parseInt(maxSegments);
+      this._maxSegments = Math.max(_.parseInt(maxSegments), 1);
     };
 
     /**

From 0ab4a45c3fbf151edab1f1d3a1e929708971fa42 Mon Sep 17 00:00:00 2001
From: Jim Unger <jim.unger@elastic.co>
Date: Thu, 30 Jul 2015 11:00:11 -0700
Subject: [PATCH 4/4] Fixes issue with incorrect _score values in doc table

---
 src/kibana/components/doc_table/doc_table.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kibana/components/doc_table/doc_table.html b/src/kibana/components/doc_table/doc_table.html
index 81f80613d409..7d608e3d0c1f 100644
--- a/src/kibana/components/doc_table/doc_table.html
+++ b/src/kibana/components/doc_table/doc_table.html
@@ -11,7 +11,7 @@
         sorting="sorting">
       </thead>
       <tbody>
-        <tr ng-repeat="row in page|limitTo:limit track by row._index+row._type+row._id"
+        <tr ng-repeat="row in page|limitTo:limit track by row._index+row._type+row._id+row._score"
           kbn-table-row="row"
           columns="columns"
           sorting="sorting"
@@ -30,7 +30,7 @@
       sorting="sorting">
     </thead>
     <tbody>
-      <tr ng-repeat="row in hits|limitTo:limit track by row._index+row._type+row._id"
+      <tr ng-repeat="row in hits|limitTo:limit track by row._index+row._type+row._id+row._score"
         kbn-table-row="row"
         columns="columns"
         sorting="sorting"