Merge lp:~mmcm/akiban-server/full-text-search-sort into lp:~akiban-technologies/akiban-server/trunk

[Mike McMahon]

Address the recent test failures due to unpredictable ordering returned by full text queries.

Give an explicit Sort order: first by relevance, then by hkey.

Puts expected results back to the order they had before begin changed for asynchronous update, where there were only given an order that was somewhat more likely, but still depended on the number of times the updater ran.

[Nathan Williams (nwilliams)]

Makes sense.

review: Approve

=== modified file 'src/main/java/com/akiban/server/service/text/FullTextCursor.java'
--- src/main/java/com/akiban/server/service/text/FullTextCursor.java	2013-04-05 20:33:47 +0000
+++ src/main/java/com/akiban/server/service/text/FullTextCursor.java	2013-04-25 17:14:26 +0000
@@ -35,6 +35,8 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.ScoreDoc;
 import org.apache.lucene.search.SearcherManager;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.SortField;
 import org.apache.lucene.search.TopDocs;
 import org.apache.lucene.util.BytesRef;
 
@@ -55,6 +57,10 @@
     private TopDocs results;
     private int position;
 
+    public static final Sort SORT = new Sort(SortField.FIELD_SCORE,
+                                             new SortField(IndexedField.KEY_FIELD,
+                                                           SortField.Type.STRING));
+
     private static final Logger logger = LoggerFactory.getLogger(FullTextCursor.class);
 
     public FullTextCursor(QueryContext context, HKeyRowType rowType, 
@@ -78,7 +84,7 @@
         }
         else {
             try {
-                results = searcher.search(query, limit);
+                results = searcher.search(query, limit, SORT);
             }
             catch (IOException ex) {
                 throw new AkibanInternalException("Error searching index", ex);

=== modified file 'src/test/resources/com/akiban/rest/text/name.expected'
--- src/test/resources/com/akiban/rest/text/name.expected	2013-04-17 16:23:40 +0000
+++ src/test/resources/com/akiban/rest/text/name.expected	2013-04-25 17:14:26 +0000
@@ -1,10 +1,10 @@
 [
   {
+    "name": "John Smith",
+    "cid": 1
+  },
+  {
     "name": "Jane Smith",
     "cid": 3
-  },
-  {
-    "name": "John Smith",
-    "cid": 1
   }
 ]

=== modified file 'src/test/resources/com/akiban/rest/text/wildcard.expected'
--- src/test/resources/com/akiban/rest/text/wildcard.expected	2013-04-17 16:23:40 +0000
+++ src/test/resources/com/akiban/rest/text/wildcard.expected	2013-04-25 17:14:26 +0000
@@ -1,14 +1,14 @@
 [
   {
+    "name": "John Smith",
+    "cid": 1
+  },
+  {
     "name": "Jane Smith",
     "cid": 3
   },
   {
     "name": "Jonathan Smyth",
     "cid": 4
-  },
-  {
-    "name": "John Smith",
-    "cid": 1
   }
 ]